inventory-helidon fix (#73)

paulparkinson · RichardExley · renagranat · web-flow · commit 25512fd2bfb1 · 2021-05-20T13:45:46.000-04:00
* first-round

* second-set

* third-push

* push4

* push5

* push6

* push

* push

* push

* push

* fixes

* fixes

* fixes

* fixes

* fixes

* fixes

* fixes

* terra optimizations

* terra fixes

* env.sh and fixes

* docker login fix

* take out vaults for now

* fixes

* fixes

* fixes

* fixes

* fixes

* fixes

* fixes

* Deploy fixes and new terraform

* terraform reorg and fixes

* oci_core_services fix

* Update core.tf

* Update core.tf

* Update main-destroy.sh

* fixes

* Update core.tf

* fixes

* Update oke-setup.sh

* fixes

* Boost Node CPU and Memory

* Rename states for clarity

* Update containerengine.tf

* Update main-setup.sh

* Build perf and main-setup.sh restart

* fix

* compute shape and docker login enhancements

* Update main-setup.sh

* build perf tuning

* build fixes

* Update build-all.sh

* Update oci-cli-cs-key-auth.sh

* terraform 3 AD

* Update oci-cli-cs-key-auth.sh

* Update core.tf

* fixes

* Update core.tf

* fixes

Uncomment Internet Gateway
Comment DHCP settings
Move SSL creation to earlier
Add wait for OKE to warm up

* fixes

PropSetup
Back to single domain
Wait for OKE nodes
msdataworkshop alias
cwallet.sso name change
remove terraform-orig

* fixes

wallet.zip
VM.Standard.B1.1 image
Prune terraform status to 60 characters

* fixes

add cwallet.sso link
rm wallet folder (for security)

* fixes

Destroy new object
atp secrets wait for OKE
improved logging and setup handling

* minor fixes

* Fixes

Remove RUN_TYPE for now
Execute JAVA_BUILD and NON_JAVA_BUILD from main-setup

* Fixes

No Key Generated messages
Improve end of setup

* Update containerengine.tf

Change image shape

* Fixes

Hardening oke-setup
Different Shape

* Update oke-setup.sh

Hardening

* Parallel Destroy

Make destroy run in parallel

* chmod

* Update main-setup.sh

More hardening

* Update main-setup.sh

* Update oke-setup.sh

More defensive code

* Typo

* SODA build + cleanup

Replace SODA jar with maven dependency
Remove old scripts
Fix global deploy/undeploy scripts

* Reorg Jaeger

* Jaeger Fixes

* DB Prep in Setup and DB Name Changes

Moved DB Setup from Java to Shell
Change DB Name to o and i

* Fixes and Start of GB Integration

* DB Name Changes

* Update db-setup.sh

Fixes

* dotnet inventorylocation query

* Update main-setup.sh

* dotnet inventorylocation query

* Update db-setup.sh

* GB Integration and Prop Fixes

* fixes

* Update oci-cli-cs-key-auth.sh

* Removed DB Setup from UI

* Update oci-cli-cs-key-auth.sh

* Dot Net and Go

* Fixes

* Update main-setup.sh

* Manage Non-Java Builds Better

* inventory-go work

* Update main-destroy.sh

* inventory-go work

* inventory-go aq dequeue added

* Build Reorg

* Update main-setup.sh

Reorg password collection

* Update main-setup.sh

Minor fixes

* Minor Fixes

* Binding Changes

* Fixes

* Remove Legacy Code

Removed admin-helidon, atp-setup,
Removed initContainers from deployment yamls

* inventory-go working with pl/sql

* Fixed inventory-helidon-se

* Minor fixes

* Update main-setup.sh

* Update main-setup.sh

* Update main-setup.sh

* Update db-setup.sh

* Update main-setup.sh

* Update main-setup.sh

* Update db-setup.sh

* Update main-setup.sh

* Update main-setup.sh

* Update main-setup.sh

* Update db-setup.sh

* Fixes

go build.sh fix

* Update java-builds.sh

* Update non-java-builds.sh

* Update oke-setup.sh

* Update oke-setup.sh

* Update db-setup.sh

* Update non-java-builds.sh

* Update java-builds.sh

* Update non-java-builds.sh

* Update java-builds.sh

* Update db-setup.sh

* Update oke-setup.sh

* Update java-builds.sh

* Update non-java-builds.sh

* Update java-builds.sh

* Update non-java-builds.sh

* Update oke-setup.sh

* Simpler Approach

* Update main-setup.sh

* Update main-setup.sh

* Update main-setup.sh

* Update main-setup.sh

* Update main-setup.sh

* Update main-setup.sh

* Update main-setup.sh

Remove API Key based authentication as bug is fixed

* Update main-destroy.sh

Complete API Key removal

* Update destroy.sh

* Fix Inventory DotNet and Go

* Update logback.xml

Fixed inventory-helidon-se

* Update db-setup.sh

Protect password in it contains case special characters

* dotnet and go services: switch to polling for msgs

* verrazzano/multi-cloud work

* verrazzano comp files

* verrazzano/multi-cloud work

* verrazzano/multi-cloud work

* verrazzano/multi-cloud work

* verrazzano/multi-cloud work

* verrazzano/multi-cloud work

* verrazzano/multi-cloud work

* verrazzano/multi-cloud work

* verrazzano/multi-cloud work

* verrazzano/multi-cloud work

* verrazzano/multi-cloud work

* verrazzano/multi-cloud work

* verrazzano/multi-cloud work

* verrazzano/multi-cloud work

* verrazzano/multi-cloud work

* verrazzano/multi-cloud work

* verrazzano/multi-cloud work

* verrazzano/multi-cloud work

* verrazzano/multi-cloud work

* verrazzano/multi-cloud work

* verrazzano/multi-cloud work

* verrazzano/multi-cloud work

* verrazzano/multi-cloud work

* verrazzano/multi-cloud work

* polyglot inventory service mods

* verrazzano/multi-cloud work

* verrazzano/multi-cloud work

* verrazzano/multi-cloud work

* verrazzano/multi-cloud work

* verrazzano/multi-cloud work

* verrazzano/multi-cloud work

* verrazzano/multi-cloud work

* inventory-springboot

* inventory-helidon fix

Co-authored-by: RichardExley &lt;Richard.exley@oracle.com&gt;
Co-authored-by: irina granat &lt;irina.granat@oracle.com&gt;
diff --git a/grabdish/frontend-helidon/undeploy.sh b/grabdish/frontend-helidon/undeploy.sh
@@ -7,4 +7,4 @@ echo delete frontend deployment and service...
 
 kubectl delete deployment frontend-helidon -n msdataworkshop
 
-# kubectl delete service frontend -n msdataworkshop
+kubectl delete service frontend -n msdataworkshop
diff --git a/grabdish/inventory-helidon/src/main/java/io/helidon/data/examples/InventoryServiceOrderEventConsumer.java b/grabdish/inventory-helidon/src/main/java/io/helidon/data/examples/InventoryServiceOrderEventConsumer.java
@@ -35,7 +35,7 @@ public void run() {
         }
     }
 
-    public void listenForOrderEvents() throws Exception {
+    public void listenForOrderEventsPLSQL() throws Exception {
         Connection connection = inventoryResource.atpInventoryPDB.getConnection();
         while (true) {
             System.out.println("InventoryServiceOrderEventConsumer.listenForOrderEvents with sproc");
@@ -51,11 +51,12 @@ public void listenForOrderEvents() throws Exception {
                 hadResults = cstmt.getMoreResults();
             }
             String outputValue = cstmt.getString(1); // index-based
+            connection.rollback();
             System.out.println("InventoryServiceOrderEventConsumer.listenForOrderEvents outputValue:" + outputValue);
         }
     }
 
-    public void listenForOrderEventsAQAPI() throws Exception {
+    public void listenForOrderEvents() throws Exception {
         QueueConnectionFactory qcfact = AQjmsFactory.getQueueConnectionFactory(inventoryResource.atpInventoryPDB);
         QueueSession qsess = null;
         QueueConnection qconn = null;
diff --git a/grabdish/order-helidon/src/main/java/io/helidon/data/examples/OrderResource.java b/grabdish/order-helidon/src/main/java/io/helidon/data/examples/OrderResource.java
@@ -6,7 +6,6 @@
  */
 package io.helidon.data.examples;
 
-import java.io.IOException;
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.util.HashMap;
diff --git a/grabdish/order-helidon/src/main/java/io/helidon/data/examples/OrderServiceEventConsumer.java b/grabdish/order-helidon/src/main/java/io/helidon/data/examples/OrderServiceEventConsumer.java
@@ -58,10 +58,11 @@ public void dolistenForMessages() throws JMSException {
                 String inventorylocation = inventory.getInventorylocation();
                 System.out.println("Lookup orderid:" + orderid + "(itemid:" + itemid + ")");
                 Order order = orderResource.orderServiceEventProducer.getOrderViaSODA(orderResource.atpOrderPdb, orderid);
-                if (order == null)
-                    throw new JMSException("Rollingback message as no orderDetail found for orderid:" + orderid +
-                                ". It may have been started by another server (eg if horizontally scaling) or " +
-                                " this server started the order but crashed. ");
+                if (order == null) {
+                    System.out.println("No orderDetail found for orderid:" + orderid);
+                    qsess.commit();
+                    continue;
+                }
                 boolean isSuccessfulInventoryCheck = !(inventorylocation == null || inventorylocation.equals("")
                         || inventorylocation.equals("inventorydoesnotexist")
                         || inventorylocation.equals("none"));

Original file line number	Diff line number	Diff line change
`@@ -7,4 +7,4 @@ echo delete frontend deployment and service...`
`7`	`7`
`8`	`8`	`kubectl delete deployment frontend-helidon -n msdataworkshop`
`9`	`9`
`10`		`-# kubectl delete service frontend -n msdataworkshop`
	`10`	`+kubectl delete service frontend -n msdataworkshop`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public void run() {`
`35`	`35`	`}`
`36`	`36`	`}`
`37`	`37`
`38`		`- public void listenForOrderEvents() throws Exception {`
	`38`	`+ public void listenForOrderEventsPLSQL() throws Exception {`
`39`	`39`	`Connection connection = inventoryResource.atpInventoryPDB.getConnection();`
`40`	`40`	`while (true) {`
`41`	`41`	`System.out.println("InventoryServiceOrderEventConsumer.listenForOrderEvents with sproc");`
`@@ -51,11 +51,12 @@ public void listenForOrderEvents() throws Exception {`
`51`	`51`	`hadResults = cstmt.getMoreResults();`
`52`	`52`	`}`
`53`	`53`	`String outputValue = cstmt.getString(1); // index-based`
	`54`	`+ connection.rollback();`
`54`	`55`	`System.out.println("InventoryServiceOrderEventConsumer.listenForOrderEvents outputValue:" + outputValue);`
`55`	`56`	`}`
`56`	`57`	`}`
`57`	`58`
`58`		`- public void listenForOrderEventsAQAPI() throws Exception {`
	`59`	`+ public void listenForOrderEvents() throws Exception {`
`59`	`60`	`QueueConnectionFactory qcfact = AQjmsFactory.getQueueConnectionFactory(inventoryResource.atpInventoryPDB);`
`60`	`61`	`QueueSession qsess = null;`
`61`	`62`	`QueueConnection qconn = null;`