Fix some errors and warnings reported by IntelliJ code inspection (#3656)

* Fix some possible bugs and warnings reported by IntelliJ code-inspection

Author: doxiao

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

@@ -155,10 +155,9 @@ public static void initAll(@Namespaces(3) List<String> namespaces) {
     //Start oracleDB
     logger.info("Start Oracle DB with namespace: {0}, dbListenerPort:{1}",
         domain2Namespace, dbListenerPort);
-    assertDoesNotThrow(() -> {
-      startOracleDB(DB_IMAGE_TO_USE_IN_SPEC, getNextFreePort(), domain2Namespace, dbListenerPort);
-      String.format("Failed to start Oracle DB");
-    });
+    assertDoesNotThrow(
+        () -> startOracleDB(DB_IMAGE_TO_USE_IN_SPEC, getNextFreePort(), domain2Namespace, dbListenerPort),
+        "Failed to start Oracle DB");
     dbNodePort = getDBNodePort(domain2Namespace, "oracledb");
     logger.info("DB Node Port = {0}", dbNodePort);
 
@@ -208,16 +207,12 @@ private static void updatePropertyFile() {
       Files.copy(source2, target.resolve(source2.getFileName()), StandardCopyOption.REPLACE_EXISTING);
     });
 
-    assertDoesNotThrow(() -> {
-      addToPropertyFile(WDT_MODEL_DOMAIN1_PROPS, domain1Namespace);
-      String.format("Failed to update %s with namespace %s",
-          WDT_MODEL_DOMAIN1_PROPS, domain1Namespace);
-    });
-    assertDoesNotThrow(() -> {
-      addToPropertyFile(WDT_MODEL_DOMAIN2_PROPS, domain2Namespace);
-      String.format("Failed to update %s with namespace %s",
-          WDT_MODEL_DOMAIN2_PROPS, domain2Namespace);
-    });
+    assertDoesNotThrow(
+        () -> addToPropertyFile(WDT_MODEL_DOMAIN1_PROPS, domain1Namespace),
+        String.format("Failed to update %s with namespace %s", WDT_MODEL_DOMAIN1_PROPS, domain1Namespace));
+    assertDoesNotThrow(
+        () -> addToPropertyFile(WDT_MODEL_DOMAIN2_PROPS, domain2Namespace),
+        String.format("Failed to update %s with namespace %s", WDT_MODEL_DOMAIN2_PROPS, domain2Namespace));
 
   }
 

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

@@ -333,6 +333,7 @@ void testReplicasTooHighNegative() {
       logger.info("Patching cluster resource using patch string {0} ", patchStr);
       assertFalse(patchClusterCustomResource(clusterResName, domainNamespace,
           patch, V1Patch.PATCH_FORMAT_JSON_PATCH), "Patch cluster should fail");
+      testPassed = true;
     } finally {
       if (!testPassed) {
         LoggingUtil.generateLog(this, ns);
@@ -694,7 +695,7 @@ void testMSBootFailureStatus() {
       assertDoesNotThrow(() -> setupDBandRCUschema(DB_IMAGE_TO_USE_IN_SPEC, FMWINFRA_IMAGE_TO_USE_IN_SPEC,
           rcuSchemaPrefix, domainNamespace, getNextFreePort(), dbUrl, dbListenerPort),
           String.format("Failed to create RCU schema for prefix %s in the namespace %s with "
-              + "dbUrl %s, dbListenerPost $s", rcuSchemaPrefix, domainNamespace, dbUrl, dbListenerPort));
+              + "dbUrl %s, dbListenerPost %s", rcuSchemaPrefix, domainNamespace, dbUrl, dbListenerPort));
 
       // create RCU access secret
       logger.info("Creating RCU access secret: {0}, with prefix: {1}, dbUrl: {2}, schemapassword: {3})",

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

@@ -189,13 +189,12 @@ public static void init(@Namespaces(4) List<String> namespaces) {
 
     logger.info("install and verify Elasticsearch");
     elasticsearchParams = assertDoesNotThrow(() -> installAndVerifyElasticsearch(elasticSearchNs),
-            String.format("Failed to install Elasticsearch"));
+            "Failed to install Elasticsearch");
     assertNotNull(elasticsearchParams, "Failed to install Elasticsearch");
 
     // install and verify Kibana
     logger.info("install and verify Kibana");
-    kibanaParams = assertDoesNotThrow(() -> installAndVerifyKibana(elasticSearchNs),
-        String.format("Failed to install Kibana"));
+    kibanaParams = assertDoesNotThrow(() -> installAndVerifyKibana(elasticSearchNs), "Failed to install Kibana");
     assertNotNull(kibanaParams, "Failed to install Kibana");
 
     // install and verify Operator
@@ -300,7 +299,7 @@ void testLogLevelSearch() {
     // verify log level query results
     withStandardRetryPolicy.untilAsserted(
         () -> assertTrue(verifyCountsHitsInSearchResults(queryCriteria, regex, LOGSTASH_INDEX_KEY, true),
-            String.format("Query logs of level=INFO failed")));
+            "Query logs of level=INFO failed"));
 
     logger.info("Query logs of level=INFO succeeded");
   }

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

@@ -170,13 +170,12 @@ public static void init(@Namespaces(3) List<String> namespaces) {
     }
     logger.info("install and verify Elasticsearch");
     elasticsearchParams = assertDoesNotThrow(() -> installAndVerifyElasticsearch(elasticSearchNs),
-            String.format("Failed to install Elasticsearch"));
+            "Failed to install Elasticsearch");
     assertNotNull(elasticsearchParams, "Failed to install Elasticsearch");
 
     // install and verify Kibana
     logger.info("install and verify Kibana");
-    kibanaParams = assertDoesNotThrow(() -> installAndVerifyKibana(elasticSearchNs),
-        String.format("Failed to install Kibana"));
+    kibanaParams = assertDoesNotThrow(() -> installAndVerifyKibana(elasticSearchNs), "Failed to install Kibana");
     assertNotNull(kibanaParams, "Failed to install Kibana");
 
     // install and verify Operator

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

@@ -23,6 +23,7 @@
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 
+import static java.nio.charset.StandardCharsets.UTF_8;
 import static oracle.weblogic.kubernetes.TestConstants.ADMIN_PASSWORD_DEFAULT;
 import static oracle.weblogic.kubernetes.TestConstants.ADMIN_USERNAME_DEFAULT;
 import static oracle.weblogic.kubernetes.TestConstants.DB_IMAGE_TO_USE_IN_SPEC;
@@ -83,15 +84,12 @@ class ItFmwBigCMMiiDomain {
   private static String dbUrl = null;
   private static LoggingFacade logger = null;
 
-  private String domainUid = "jrfdomain-mii";
-  private String adminServerPodName = domainUid + "-admin-server";
-  private String managedServerPrefix = domainUid + "-managed-server";
-  private int replicaCount = 1;
-  private String adminSecretName = domainUid + "-weblogic-credentials";
-  private String encryptionSecretName = domainUid + "-encryptionsecret";
-  private String rcuaccessSecretName = domainUid + "-rcu-access";
-  private String opsswalletpassSecretName = domainUid + "-opss-wallet-password-secret";
-  private String opsswalletfileSecretName = domainUid + "opss-wallet-file-secret";
+  private final String domainUid = "jrfdomain-mii";
+  private final int replicaCount = 1;
+  private final String adminSecretName = domainUid + "-weblogic-credentials";
+  private final String encryptionSecretName = domainUid + "-encryptionsecret";
+  private final String rcuaccessSecretName = domainUid + "-rcu-access";
+  private final String opsswalletpassSecretName = domainUid + "-opss-wallet-password-secret";
   static int dbNodePort;
 
   /**
@@ -127,7 +125,7 @@ public static void initAll(@Namespaces(3) List<String> namespaces) {
     assertDoesNotThrow(() -> setupDBandRCUschema(DB_IMAGE_TO_USE_IN_SPEC, FMWINFRA_IMAGE_TO_USE_IN_SPEC,
         RCUSCHEMAPREFIX, dbNamespace, getNextFreePort(), dbUrl, dbListenerPort),
         String.format("Failed to create RCU schema for prefix %s in the namespace %s with "
-        + "dbUrl %s, dbListenerPost $s", RCUSCHEMAPREFIX, dbNamespace, dbUrl, dbListenerPort));
+        + "dbUrl %s, dbListenerPost %s", RCUSCHEMAPREFIX, dbNamespace, dbUrl, dbListenerPort));
 
     dbNodePort = getDBNodePort(dbNamespace, "oracledb");
     logger.info("DB Node Port = {0}", dbNodePort);
@@ -212,7 +210,7 @@ void testFmwBigCMModelInImage() {
         propVal.toString()), "Can't replace the string BIGDATAREPLACE in " + targetModelFile);
     assertDoesNotThrow(() -> replaceStringInFile(targetModelFile.toString(),
         "@@PROP:K8S_NODEPORT_HOST@@:@@PROP:DBPORT@@",
-        String.format("%s:%s", K8S_NODEPORT_HOST, Integer.toString(dbNodePort))),
+        String.format("%s:%s", K8S_NODEPORT_HOST, dbNodePort)),
         "Can't replace the string @@PROP:K8S_NODEPORT_HOST@@:@@PROP:DBPORT@@ in " + targetModelFile);
 
     final List<String> modelList = Collections.singletonList(targetModelFile.toString());
@@ -250,8 +248,8 @@ void testFmwBigCMModelInImage() {
         for (var item : items) {
           if (item.getMetadata().getName().contains("introspect")) {
             logger.info("Found ConfigMap " + item.getMetadata().getName());
-            logger.info("Found ConfigMap size " + item.toString().getBytes("UTF-8").length + " bytes");
-            cmTotalSize = cmTotalSize + item.toString().getBytes("UTF-8").length;
+            logger.info("Found ConfigMap size " + item.toString().getBytes(UTF_8).length + " bytes");
+            cmTotalSize = cmTotalSize + item.toString().getBytes(UTF_8).length;
             itemsCM.add(item);
           }
         }

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

@@ -131,7 +131,7 @@ public static void initAll(@Namespaces(3) List<String> namespaces) {
     assertDoesNotThrow(() -> setupDBandRCUschema(DB_IMAGE_TO_USE_IN_SPEC, FMWINFRA_IMAGE_TO_USE_IN_SPEC,
         RCUSCHEMAPREFIX, dbNamespace, getNextFreePort(), dbUrl, dbListenerPort),
         String.format("Failed to create RCU schema for prefix %s in the namespace %s with "
-        + "dbUrl %s, dbListenerPost $s", RCUSCHEMAPREFIX, dbNamespace, dbUrl, dbListenerPort));
+        + "dbUrl %s, dbListenerPost %s", RCUSCHEMAPREFIX, dbNamespace, dbUrl, dbListenerPort));
 
     // install operator and verify its running in ready state
     installAndVerifyOperator(opNamespace, domainNamespace);

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

@@ -127,7 +127,7 @@ public static void initAll(@Namespaces(3) List<String> namespaces) {
     assertDoesNotThrow(() -> setupDBandRCUschema(DB_IMAGE_TO_USE_IN_SPEC, FMWINFRA_IMAGE_TO_USE_IN_SPEC,
         RCUSCHEMAPREFIX, dbNamespace, getNextFreePort(), dbUrl, dbListenerPort),
         String.format("Failed to create RCU schema for prefix %s in the namespace %s with "
-        + "dbUrl %s, dbListenerPost $s", RCUSCHEMAPREFIX, dbNamespace, dbUrl, dbListenerPort));
+        + "dbUrl %s, dbListenerPost %s", RCUSCHEMAPREFIX, dbNamespace, dbUrl, dbListenerPort));
 
     // install operator and verify its running in ready state
     installAndVerifyOperator(opNamespace, jrfDomainNamespace);

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

@@ -123,7 +123,7 @@ public static void initAll(@Namespaces(3) List<String> namespaces) {
     assertDoesNotThrow(() -> setupDBandRCUschema(DB_IMAGE_TO_USE_IN_SPEC, FMWINFRA_IMAGE_TO_USE_IN_SPEC,
         RCUSCHEMAPREFIX, dbNamespace, getNextFreePort(), dbUrl, dbListenerPort),
         String.format("Failed to create RCU schema for prefix %s in the namespace %s with "
-        + "dbUrl %s, dbListenerPost $s", RCUSCHEMAPREFIX, dbNamespace, dbUrl, dbListenerPort));
+        + "dbUrl %s, dbListenerPost %s", RCUSCHEMAPREFIX, dbNamespace, dbUrl, dbListenerPort));
 
     logger.info("DB image: {0}, FMW image {1} used in the test",
         DB_IMAGE_TO_USE_IN_SPEC, FMWINFRA_IMAGE_TO_USE_IN_SPEC);

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

@@ -134,7 +134,7 @@ public static void initAll(@Namespaces(3) List<String> namespaces) {
     assertDoesNotThrow(() -> setupDBandRCUschema(DB_IMAGE_TO_USE_IN_SPEC, FMWINFRA_IMAGE_TO_USE_IN_SPEC,
         RCUSCHEMAPREFIX, dbNamespace, getNextFreePort(), dbUrl, dbListenerPort),
         String.format("Failed to create RCU schema for prefix %s in the namespace %s with "
-        + "dbUrl %s, dbListenerPost $s", RCUSCHEMAPREFIX, dbNamespace, dbUrl, dbListenerPort));
+        + "dbUrl %s, dbListenerPost %s", RCUSCHEMAPREFIX, dbNamespace, dbUrl, dbListenerPort));
 
     logger.info("DB image: {0}, FMW image {1} used in the test",
         DB_IMAGE_TO_USE_IN_SPEC, FMWINFRA_IMAGE_TO_USE_IN_SPEC);

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

@@ -136,7 +136,7 @@ public static void initAll(@Namespaces(3) List<String> namespaces) {
     assertDoesNotThrow(() -> setupDBandRCUschema(DB_IMAGE_TO_USE_IN_SPEC, FMWINFRA_IMAGE_TO_USE_IN_SPEC,
         RCUSCHEMAPREFIX, dbNamespace, getNextFreePort(), dbUrl, dbListenerPort),
         String.format("Failed to create RCU schema for prefix %s in the namespace %s with "
-        + "dbUrl %s, dbListenerPost $s", RCUSCHEMAPREFIX, dbNamespace, dbUrl, dbListenerPort));
+        + "dbUrl %s, dbListenerPost %s", RCUSCHEMAPREFIX, dbNamespace, dbUrl, dbListenerPort));
 
     // install operator and verify its running in ready state
     installAndVerifyOperator(opNamespace, fmwDomainNamespace);