oracle
diff --git a/‎travelbooking/installGraalVM.sh‎
Lines changed: 6 additions & 0 deletions b/‎travelbooking/installGraalVM.sh‎
Lines changed: 6 additions & 0 deletions
diff --git a/‎travelbooking/travelagency-java/pom.xml‎
Lines changed: 5 additions & 0 deletions b/‎travelbooking/travelagency-java/pom.xml‎
Lines changed: 5 additions & 0 deletions
diff --git a/‎travelbooking/travelagency-java/src/main/java/osaga/travelagency/TravelAgencyApplication.java‎
Lines changed: 26 additions & 25 deletions b/‎travelbooking/travelagency-java/src/main/java/osaga/travelagency/TravelAgencyApplication.java‎
Lines changed: 26 additions & 25 deletions
diff --git a/‎travelbooking/travelparticipant-java/src/main/java/osaga/travelagency/TravelParticipantApplication.java‎
Lines changed: 5 additions & 11 deletions b/‎travelbooking/travelparticipant-java/src/main/java/osaga/travelagency/TravelParticipantApplication.java‎
Lines changed: 5 additions & 11 deletions
@@ -0,0 +1,6 @@
+#!/bin/bash
+# Copyright (c) 2021 Oracle and/or its affiliates.
+# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+
+curl -sL https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-20.1.0/graalvm-ce-java11-linux-amd64-20.1.0.tar.gz | tar xz
+mv graalvm-ce-java11-20.1.0 ~/
@@ -77,6 +77,11 @@
 </plugins>
 </build>
 <dependencies>
+<dependency>
+<groupId>org.json</groupId>
+<artifactId>json</artifactId>
+<version>20211205</version>
+</dependency>
 <dependency>
 <groupId>javax.jms</groupId>
 <artifactId>javax.jms-api</artifactId>
 
@@ -4,27 +4,26 @@
 import oracle.ucp.jdbc.PoolDataSource;
 import oracle.ucp.jdbc.PoolDataSourceFactory;
 
-import javax.jms.JMSException;
-import java.io.IOException;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.sql.CallableStatement;
 import java.sql.Connection;
-import java.util.HashMap;
-import java.util.Map;
+
+import org.json.*;
 
 import static java.lang.System.*;
 
 
 public class TravelAgencyApplication {
 
-Map<String, TravelBookingSaga> sagaParticipantReplies = new HashMap();
-
 public static void main(String[] args) throws Exception {
 setProperty("oracle.jdbc.fanEnabled", "false");
 new TravelAgencyApplication().bookTravel();
 }
 
+//very simple single requests (ie does not support concurrent requests)
+String flightStatus = "", hotelStatus = "", carStatus = "";
+
 public void bookTravel() throws Exception {
 //Get all values...
 String password = PromptUtil.getValueFromPromptSecure("Enter password", null);
@@ -64,12 +63,11 @@ public void bookTravel() throws Exception {
 runSaga(initiator, saga);
 }
 
-private void runSaga(String initiator, AQjmsSaga saga) throws JMSException, IOException {
+private void runSaga(String initiator, AQjmsSaga saga) throws Exception {
 out.println("Beginning saga...");
 String sagaId = saga.beginSaga(initiator);
 out.println("Saga begun sagaId:" + sagaId);
 
-//Prompt for coordinator...
 //	String coordinator = PromptUtil.getValueFromPrompt("Enter coordinator name", "TravelCoordinator");
 String coordinator = "TravelCoordinator";
 
@@ -82,33 +80,44 @@ private void runSaga(String initiator, AQjmsSaga saga) throws JMSException, IOEx
 String payload = "[{\"flight\" : \"myflight\"}]";
 out.println("Enrolling Flight(Java) participant in sagaId:" + sagaId);
 saga.enrollParticipant(sagaId, "admin", initiator, "FlightJava", coordinator, payload);
+ flightStatus = "waitingforreply";
 }
 if (isAddHotel) {
 String payload = "[{\"hotel\" : \"myhotel\"}]";
 out.println("Enrolling Hotel(Java) participant in sagaId:" + sagaId);
 saga.enrollParticipant(sagaId, "admin", initiator, "HotelJava", coordinator, payload);
+hotelStatus = "waitingforreply";
 }
 if (isAddCar) {
 String payload = "[{\"car\" : \"mycar\"}]";
 out.println("Enrolling Car(Java) participant in sagaId:" + sagaId);
 saga.enrollParticipant(sagaId, "admin", initiator, "CarJava", coordinator, payload);
+carStatus = "waitingforreply";
+}
+boolean isAllRepliesReceived = false;
+while (flightStatus.equals("waitingforreply") || hotelStatus.equals("waitingforreply") || carStatus.equals("waitingforreply")) {
+Thread.sleep(3 * 1000);
 }
-
-//todo wait/poll for all replies
-out.println("----> Hit enter once all replies are received ");
-in.read();
 String commitOrRollback = PromptUtil.getValueFromPrompt("Commit or Rollback Saga? (c or r)", "r");
 if (commitOrRollback.equalsIgnoreCase("c")) {
 log("about to commit");
 saga.commitSaga(sagaId, initiator);
 log("finished commit");
+createParticipantStatesForSagaId(sagaId);
 } else {
 log("about to rollback");
 saga.rollbackSaga(sagaId, initiator);
 log("finished rollback");
+createParticipantStatesForSagaId(sagaId);
 }
 }
 
+private void createParticipantStatesForSagaId(String sagaId) {
+flightStatus = "";
+hotelStatus = "";
+carStatus = "";
+}
+
 
 public class TravelAgencyTestListener extends AQjmsSagaMessageListener{
 
@@ -119,15 +128,11 @@ public String request(String sagaId, String payload) {
 
 @Override
 public void response(String sagaId, String payload) {
-err.println(payload);
-out.println("Got re!");
-synchronized (sagaParticipantReplies) {
-TravelBookingSaga travelBookingSaga = sagaParticipantReplies.get(sagaId);
-if (travelBookingSaga == null) {
-TravelBookingSaga newTravelBookingSaga = new TravelBookingSaga();
-newTravelBookingSaga.carStatus = payload;
-}
-}
+out.println("Response received:" + payload);
+JSONObject obj = new JSONObject(payload);
+if (obj.getString("HotelJava") != null) hotelStatus = "replyReceived";
+else if (obj.getString("CarJava") != null) carStatus = "replyReceived";
+else if (obj.getString("FlightJava") != null) flightStatus = "replyReceived";
 }
 
 @Override
@@ -153,10 +158,6 @@ public void afterRollback(String sagaId) {
 }
 
 
-class TravelBookingSaga {
-String hotelStatus, carStatus, flightStatus;
-}
-
 void log (String msg) {
 out.println("TravelAgencyApplication.log msg:" + msg);
 }
 
@@ -4,10 +4,6 @@
 import AQSaga.AQjmsSagaMessageListener;
 import oracle.ucp.jdbc.PoolDataSource;
 import oracle.ucp.jdbc.PoolDataSourceFactory;
-//import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-//import org.springframework.boot.autoconfigure.SpringBootApplication;
-//import org.springframework.context.annotation.ComponentScan;
-//import org.springframework.context.annotation.Configuration;
 
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -16,12 +12,10 @@
 
 import static java.lang.System.out;
 
-//@Configuration
-//@EnableAutoConfiguration
-//@ComponentScan
-//@SpringBootApplication
 public class TravelParticipantApplication {
 
+String participant;
+
 public static void main(String[] args) throws Exception {
 System.setProperty("oracle.jdbc.fanEnabled", "false");
 new TravelParticipantApplication().participate();
@@ -37,7 +31,7 @@ public void participate() throws Exception {
 String user = "admin";
 out.println("TravelParticipantApplication jdbcUrl:" + jdbcUrl);
 
-String participant = PromptUtil.getValueFromPrompt("Enter participant type (1) HotelJava, (2) CarJava, or (3) FlightJava", "1");
+participant = PromptUtil.getValueFromPrompt("Enter participant type (1) HotelJava, (2) CarJava, or (3) FlightJava", "1");
 if (participant.equalsIgnoreCase("2")) participant = "CarJava";
 else if (participant.equalsIgnoreCase("3")) participant = "FlightJava";
 else participant = "HotelJava";
@@ -77,9 +71,9 @@ public String request(String sagaId, String payload) {
 System.out.println("request called sagaId = " + sagaId + ", payload = " + payload);
 System.out.println("Tickets remaining : " + --tickets);
 if(tickets >= 0)
-return "[{\"result\":\"success\"}]";
+return "{\"" + participant + "\":\"success\"}";
 else
-return "[{\"result\":\"failure\"}]";
+return "{\"" + participant + "\":\"failed\"}";
 }
 
 @Override