Merge branch 'xc-111152' into 'release/3.4'

backport - [wko-nightly] NumberFormatException in ItIstioSessionMigration to release/3.4

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

Author: rjeberhard

Jenkinsfile.kindnightly

@@ -105,7 +105,7 @@ pipeline {
     parameters {
         string(name: 'BRANCH',
                description: 'The branch to run the tests on',
-               defaultValue: 'main'
+               defaultValue: 'release/3.4'
         )
         choice(name: 'MAVEN_PROFILE_NAME',
                 description: 'Profile to use in mvn command to run the tests.  Possible values are kind-parallel (the default), kind-sequential and integration-tests.  Refer to weblogic-kubernetes-operator/integration-tests/pom.xml on the branch.',

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

@@ -1,4 +1,4 @@
-// Copyright (c) 2022, Oracle and/or its affiliates.
+// Copyright (c) 2022, 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;
@@ -181,7 +181,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;
@@ -194,7 +194,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);