Merge branch 'xc-110858' into 'release/4.0'

backport fix NumberFormatException In ItIstioSessionMigration to release/4.0

See merge request weblogic-cloud/weblogic-kubernetes-operator!4348

Author: rjeberhard

integration-tests/src/test/java/oracle/weblogic/kubernetes/ItIstioSessionMigration.java

@@ -1,4 +1,4 @@
-// Copyright (c) 2021, 2022, Oracle and/or its affiliates.
+// Copyright (c) 2021, 2023, Oracle and/or its affiliates.
 // Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 package oracle.weblogic.kubernetes;
@@ -184,7 +184,12 @@ void testSessionMigrationIstioEnabled() {
     String primaryServerName = httpDataInfo.get(primaryServerAttr);
     String sessionCreateTime = httpDataInfo.get(sessionCreateTimeAttr);
     String countStr = httpDataInfo.get(countAttr);
-    int count = Optional.ofNullable(countStr).map(Integer::valueOf).orElse(managedServerPort);
+    int count;
+    if (countStr.equalsIgnoreCase("null")) {
+      count = managedServerPort;
+    } else {
+      count = Optional.ofNullable(countStr).map(Integer::valueOf).orElse(managedServerPort);
+    }
     logger.info("After patching the domain, the primary server changes to {0} "
         + ", session create time {1} and session state {2}",
         primaryServerName, sessionCreateTime, countStr);

integration-tests/src/test/java/oracle/weblogic/kubernetes/ItSessionMigration.java

@@ -1,4 +1,4 @@
-// Copyright (c) 2020, 2022, Oracle and/or its affiliates.
+// Copyright (c) 2020, 2023, Oracle and/or its affiliates.
 // Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 package oracle.weblogic.kubernetes;
@@ -197,7 +197,12 @@ void testSessionMigration() {
     String primaryServerName = httpDataInfo.get(primaryServerAttr);
     String sessionCreateTime = httpDataInfo.get(sessionCreateTimeAttr);
     String countStr = httpDataInfo.get(countAttr);
-    int count = Optional.ofNullable(countStr).map(Integer::valueOf).orElse(0);
+    int count;
+    if (countStr.equalsIgnoreCase("null")) {
+      count = 0;
+    } else {
+      count = Optional.ofNullable(countStr).map(Integer::valueOf).orElse(0);
+    }
     logger.info("After patching the domain, the primary server changes to {0} "
             + ", session create time {1} and session state {2}",
         primaryServerName, sessionCreateTime, countStr);