Skip to content

Commit 22218c0

Browse files
paulparkinsonpaulparkinson
authored
saga ws fixes (#318)
* observability work * observability work * dotnet work * dotnet work * dotnet work * dotnet work * dotnet work * observability, dotnet, go, etc. work - move kafka etc. build to nonjava * observability, dotnet, go, etc. work - move kafka etc. build to nonjava * observability, dotnet, go, etc. work - move kafka etc. build to nonjava * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * observability * enable teq * enable teq * enable teq * enable teq * enable teq * observability work * observability work * enable teq * enable teq * enable teq * observ * enable teq * observability dash * observability * osbservability * enable teq * enable teq * enable teq * obs * obs * enable teq * obs * enable teq * observ * obs * converged wording change * fix k6 command * correct workshop link * update workshop link * modifiy python impl to conn.autocommit = False * enable teq * various including security fix in inventory-nodejs * various including security fix in inventory-nodejs * various including security fix in inventory-nodejs * enable teq * inventory-micronaut * inventory-micronaut * inventory-quarkus * inventory-micronaut-native-image * upgrade helidon and db versions * mn and quarkus build wrappers * mn native-image build and deploy fixes * mn native-image build and deploy fixes * mn native-image use JsonObject instead of Jackson * dotnet vault work, etc. * vault work, various languages * Go OCI Vault/Secrets client * displaysetuplogs util script * displaysetuplogs util script * displaysetuplogs util script * displaysetuplogs util script * createsecretfromwallet * createsecretfromwallet * createsecretfromwallet * set order and inventory helidon versions back to 2.4.0 * travelagency readme * createsecretfromwallet * temp eventmesh and osaga java api * travelagencysaga * observability workshop and various fixes * travelagency saga ws work * saga ws work * saga ws * saga ws * saga ws * saga ws * saga ws * osaga ws * saga ws * saga ws * saga ws * saga ws * saga ws * saga ws * saga ws * obs ws * saga ws * saga ws * saga ws * saga ws * saga ws * saga ws * saga ws * saga ws * saga ws * saga ws * saga ws * saga ws * saga ws * saga ws * saga ws * saga ws * saga ws * saga ws * saga ws * saga ws * saga ws * saga ws * saga ws * saga ws * saga ws * saga ws * saga ws * saga ws * saga ws * saga ws * saga ws * saga ws
1 parent 86815c5 commit 22218c0

File tree

6 files changed

+38
-23
lines changed

6 files changed

+38
-23
lines changed

‎travelbooking/createDBLinksAndOsagaInfra.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ echo ____________________________________________________
8383
echo setting up DB links and OSaga infrastructure ...
8484
cd osaga-java-api
8585
mvn clean install
86-
#nohup java -jar
87-
java -jar target/osaga-java-api.jar | grep -v "WARNING"
86+
cp osaga-java-api.jar target/
87+
java -jar target/osaga-java-api.jar
8888
cd ../
8989

‎travelbooking/installGraalVMAndGetWallet.sh‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎travelbooking/osaga-java-api/osaga-java-api.jar‎

47.5 KB
Binary file not shown.

‎travelbooking/osaga-java-api/src/main/java/AQSaga/AQjmsSagaMessageListener.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,9 @@ public final void onMessage(Message message) {
8080
case 5: // OSAGA_RESPONSE
8181
response(sagaId, payload);
8282
break;
83+
case 8: // OSAGA_RESPONSE
84+
response(sagaId, payload);
85+
break;
8386
}
8487
}
8588
this.session.commit();

‎travelbooking/osaga-java-api/src/main/java/AQSaga/util/CreateDBLinksAndSagaInfra.java‎

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,16 @@ private static void uploadWalletAndCreateDBLink(String tnsAdmin, String localUse
3838
String linkName, String linkhostname, String linkport,
3939
String linkservice_name, String linkssl_server_cert_dn,
4040
boolean isCoordinator) throws Exception {
41+
boolean skipdblinks = System.getenv("skipdblinks") != null && System.getenv("skipdblinks").equals("true");
42+
boolean skipinstallSaga = System.getenv("skipinstallSaga") != null && System.getenv("skipinstallSaga").equals("true");
43+
boolean skipbrokerinstall = System.getenv("skipbrokerinstall") != null && System.getenv("skipbrokerinstall").equals("true");
4144
System.out.println(
42-
"tnsAdmin = " + tnsAdmin + "\nlocalUser = " + localUser + "\nlocalPW = " + localPW +
45+
"tnsAdmin = " + tnsAdmin + "\nlocalUser = " + localUser +
4346
"\nurl = " + url + "\ncredName = " + credName +
44-
"\nremoteUser = " + remoteUser + "\nremotePW = " + remotePW +
47+
"\nremoteUser = " + remoteUser +
4548
"\nlinkName = " + linkName + "\nlinkhostname = " + linkhostname + "\nlinkport = " + linkport +
46-
"\nlinkservice_name = " + linkservice_name + "\nlinkssl_server_cert_dn = " + linkssl_server_cert_dn);
49+
"\nlinkservice_name = " + linkservice_name + "\nlinkssl_server_cert_dn = " + linkssl_server_cert_dn
50+
);
4751
System.setProperty("oracle.jdbc.fanEnabled", "false");
4852
PoolDataSource poolDataSource = PoolDataSourceFactory.getPoolDataSource();
4953
poolDataSource.setConnectionFactoryClassName("oracle.jdbc.pool.OracleDataSource");
@@ -52,19 +56,21 @@ private static void uploadWalletAndCreateDBLink(String tnsAdmin, String localUse
5256
poolDataSource.setPassword(localPW);
5357
Connection conn = poolDataSource.getConnection();
5458
System.out.println("Connection:" + conn + " url:" + url);
55-
createDBLink(tnsAdmin, url, credName, remoteUser, remotePW, linkName, linkhostname, linkport, linkservice_name, linkssl_server_cert_dn, conn);
56-
installSaga(conn, url);
59+
if (!skipdblinks)
60+
createDBLink(tnsAdmin, url, credName, remoteUser, remotePW, linkName, linkhostname, linkport, linkservice_name, linkssl_server_cert_dn, conn);
61+
if (!skipinstallSaga)
62+
installSaga(conn, url);
5763
if (isCoordinator) {
5864
System.out.println("Creating wrappers...");
5965
conn.prepareStatement(OsagaInfra.createBEGINSAGAWRAPPER).execute();
6066
conn.prepareStatement(OsagaInfra.createEnrollParticipant).execute();
6167
System.out.println("Finished creating wrappers.");
6268
System.out.println("Creating broker...");
63-
conn.prepareStatement("{call dbms_saga_adm.add_broker(broker_name => 'TEST')}").execute();
69+
if (!skipbrokerinstall) conn.prepareStatement("{call dbms_saga_adm.add_broker(broker_name => 'TEST')}").execute();
6470
System.out.println("Finished creating broker.");
6571
System.out.println("Creating coordinator...");
6672
//Note that if the coordinator is co-located with the broker, dblink_to_broker should be NULL
67-
conn.prepareStatement("{dbms_saga_adm.add_coordinator( " +
73+
conn.prepareStatement("{call dbms_saga_adm.add_coordinator( " +
6874
"coordinator_name => 'TravelCoordinator', " +
6975
"dblink_to_broker => null, " +
7076
"mailbox_schema => 'admin', " +
@@ -95,7 +101,13 @@ private static void createDBLink(String tnsAdmin, String url, String credName, S
95101
preparedStatement.setString(1, credName);
96102
preparedStatement.setString(2, remoteUser);
97103
preparedStatement.setString(3, remotePW);
98-
preparedStatement.execute();
104+
try {
105+
preparedStatement.execute();
106+
} catch (SQLException sqlex) {
107+
if (sqlex.getMessage().contains("already exists")) {
108+
System.out.println("Credential for dblink already exists, proceeding... ");
109+
}
110+
}
99111
System.out.println("credName created = " + credName + " from url = " + url );
100112

101113
preparedStatement = conn.prepareStatement(OsagaInfra.CREATE_DBLINK_SQL);

‎travelbooking/travelagency-java/src/main/java/osaga/travelagency/TravelAgencyApplication.java‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
public class TravelAgencyApplication {
1818

19-
public static void main(String[] args) throws Exception {
19+
public static void main (String[] args) throws Exception {
2020
setProperty("oracle.jdbc.fanEnabled", "false");
2121
new TravelAgencyApplication().bookTravel();
2222
}
@@ -130,9 +130,18 @@ public String request(String sagaId, String payload) {
130130
public void response(String sagaId, String payload) {
131131
out.println("Response received:" + payload);
132132
JSONObject obj = new JSONObject(payload);
133-
if (obj.getString("HotelJava") != null) hotelStatus = "replyReceived";
134-
else if (obj.getString("CarJava") != null) carStatus = "replyReceived";
135-
else if (obj.getString("FlightJava") != null) flightStatus = "replyReceived";
133+
if (obj.getString("HotelJava") != null) {
134+
out.println("TravelAgencyTestListener.response HotelJava");
135+
hotelStatus = "replyReceived";
136+
}
137+
else if (obj.getString("CarJava") != null) {
138+
out.println("TravelAgencyTestListener.response CarJava");
139+
carStatus = "replyReceived";
140+
}
141+
else if (obj.getString("FlightJava") != null) {
142+
out.println("TravelAgencyTestListener.response FlightJava");
143+
flightStatus = "replyReceived";
144+
}
136145
}
137146

138147
@Override

0 commit comments

Comments
 (0)