Fixes based on Sonar scanning

Author: rjeberhard

common/src/test/java/oracle/kubernetes/common/logging/CommonLoggingFacadeTest.java

@@ -1,4 +1,4 @@
-// Copyright (c) 2019, 2023, Oracle and/or its affiliates.
+// Copyright (c) 2019, 2025, 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.kubernetes.common.logging;
@@ -19,7 +19,7 @@ class CommonLoggingFacadeTest {
   CommonLoggingFacade loggingFacade;
 
   @BeforeEach
-  public void setup() {
+  void setup() {
     mockLogger = new MockLogger();
     loggingFacade = new CommonLoggingFacade(mockLogger);
   }
@@ -415,10 +415,12 @@ public MockLogger() {
       super("MockLogger", "Operator");
     }
 
+    @Override
     public void setLevel(Level level) {
       this.level = level;
     }
 
+    @Override
     public boolean isLoggable(Level level) {
       int levelValue = this.level.intValue();
       return level.intValue() >= levelValue && levelValue != Level.OFF.intValue();
@@ -433,6 +435,7 @@ public void logp(
       messageParams = params;
     }
 
+    @Override
     public void logp(
         Level level, String sourceClass, String sourceMethod, String msg, Throwable thrown) {
       logpCalled = true;
@@ -441,12 +444,14 @@ public void logp(
       messageLevel = level;
     }
 
+    @Override
     public void logp(Level level, String sourceClass, String sourceMethod, String msg) {
       logpCalled = true;
       message = msg;
       messageLevel = level;
     }
 
+    @Override
     public void logp(Level level, String sourceClass, String sourceMethod,
                      String msg, Object param1) {
       logpCalled = true;

common/src/test/java/oracle/kubernetes/common/utils/BaseTestUtils.java

@@ -1,4 +1,4 @@
-// Copyright (c) 2022, Oracle and/or its affiliates.
+// Copyright (c) 2022, 2025, 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.kubernetes.common.utils;
@@ -52,17 +52,17 @@ protected abstract static class TestLogHandler extends Handler {
     private List<String> messagesToTrack = new ArrayList<>();
 
     @Override
-    public void publish(LogRecord record) {
-      if (record.getThrown() != null && !shouldIgnore(record.getThrown())) {
-        throwable = record.getThrown();
+    public void publish(LogRecord rec) {
+      if (rec.getThrown() != null && !shouldIgnore(rec.getThrown())) {
+        throwable = rec.getThrown();
       }
-      if (shouldTrack(record)) {
-        logRecords.add(record);
+      if (shouldTrack(rec)) {
+        logRecords.add(rec);
       }
     }
 
-    private boolean shouldTrack(LogRecord record) {
-      return messagesToTrack == ALL_MESSAGES || messagesToTrack.contains(record.getMessage());
+    private boolean shouldTrack(LogRecord rec) {
+      return messagesToTrack == ALL_MESSAGES || messagesToTrack.contains(rec.getMessage());
     }
 
     boolean shouldIgnore(Throwable thrown) {
@@ -110,8 +110,8 @@ void throwUncheckedLogMessages() {
 
       SimpleFormatter formatter = new SimpleFormatter();
       List<String> messageKeys = new ArrayList<>();
-      for (LogRecord record : logRecords) {
-        messageKeys.add(formatter.format(record));
+      for (LogRecord rec : logRecords) {
+        messageKeys.add(formatter.format(rec));
       }
 
       throw new AssertionError("Unexpected log messages " + messageKeys);

common/src/test/java/oracle/kubernetes/common/utils/SchemaConversionUtilsTest.java

@@ -57,7 +57,7 @@ private static String getMD5Hash(String s) throws NoSuchAlgorithmException {
   }
 
   @BeforeEach
-  public void setUp() throws Exception {
+  void setUp() throws Exception {
     mementos.add(CommonTestUtils.silenceLogger());
     mementos.add(BaseTestUtils.silenceJsonPathLogger());
     v8Domain = readAsYaml(DOMAIN_V8_AUX_IMAGE30_YAML);
@@ -78,7 +78,7 @@ private static InputStream inputStreamFromClasspath(String path) {
   }
 
   @AfterEach
-  public void tearDown() throws Exception {
+  void tearDown() throws Exception {
     mementos.forEach(Memento::revert);
   }
 

domain-upgrader/src/test/java/oracle/kubernetes/operator/DomainUpgraderTest.java

@@ -35,7 +35,7 @@ class DomainUpgraderTest {
   private ByteArrayOutputStream bytes;
 
   @BeforeEach
-  public void setUp() throws NoSuchFieldException {
+  void setUp() throws NoSuchFieldException {
     mementos.add(CommonTestUtils.silenceLogger().collectLogMessages(logRecords, DOMAIN_UPGRADE_SUCCESS));
     mementos.add(StaticStubSupport.install(DomainUpgrader.class, "exitCall", new ExitIntConsumer()));
     bytes   = new ByteArrayOutputStream();
@@ -44,16 +44,14 @@ public void setUp() throws NoSuchFieldException {
   }
 
   @AfterEach
-  public void tearDown() {
+  void tearDown() {
     mementos.forEach(Memento::revert);
     System.setOut(console);
   }
 
   @Test
   void whenNoInputFileProvided_domainUpgraderExitsWithErrorStatus() {
-    ExitException thrown = Assertions.assertThrows(ExitException.class, () -> {
-      DomainUpgrader.main();
-    });
+    ExitException thrown = Assertions.assertThrows(ExitException.class, DomainUpgrader::main);
     assertThat(thrown.status, is(1));
   }
 

integration-tests/src/test/java/oracle/weblogic/domain/AuxiliaryImage.java

@@ -1,4 +1,4 @@
-// Copyright (c) 2021, 2022, Oracle and/or its affiliates.
+// Copyright (c) 2021, 2025, 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.domain;
@@ -80,7 +80,7 @@ public String getSourceWDTInstallHome() {
             .orElse(AUXILIARY_IMAGE_DEFAULT_SOURCE_WDT_INSTALL_HOME);
   }
 
-  public void setSourceWDTInstallHome() {
+  public void setSourceWDTInstallHome(String sourceWDTInstallHome) {
     this.sourceWDTInstallHome = sourceWDTInstallHome;
   }
 

integration-tests/src/test/java/oracle/weblogic/domain/Istio.java

@@ -21,7 +21,7 @@ public class Istio {
           + "pod is ready for application traffic. Defaults to 8888.")
   private Integer readinessPort = 8888;
 
-  public static Integer DEFAULT_REPLICATION_PORT = 4564;
+  public static final Integer DEFAULT_REPLICATION_PORT = 4564;
 
   @ApiModelProperty(
       "The operator will create a `T3` protocol WebLogic network access point on each WebLogic server "

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

@@ -84,7 +84,7 @@ class ItAddNewDynamicClusterUsingWlst {
    *                   JUnit engine parameter resolution mechanism
    */
   @BeforeAll
-  public static void initAll(@Namespaces(2) List<String> namespaces) {
+  static void initAll(@Namespaces(2) List<String> namespaces) {
     logger = getLogger();
 
     // get a unique operator namespace

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

@@ -1,4 +1,4 @@
-// Copyright (c) 2022, 2023, Oracle and/or its affiliates.
+// Copyright (c) 2022, 2025, 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;
@@ -99,7 +99,7 @@ class ItAuxV8DomainImplicitUpgrade {
    *                   JUnit engine parameter resolution mechanism
    */
   @BeforeAll
-  public static void initAll(@Namespaces(2) List<String> namespaces) {
+  static void initAll(@Namespaces(2) List<String> namespaces) {
     logger = getLogger();
 
     // get a new unique opNamespace
@@ -226,7 +226,7 @@ void testMultipleAuxImagesV8Domain() {
     logger.info("Run " + KUBERNETES_CLI + " to create the domain");
     CommandParams params = new CommandParams().defaults();
     params.command(KUBERNETES_CLI + " apply -f "
-            + Paths.get(WORK_DIR + "/domain.yaml").toString());
+            + Paths.get(WORK_DIR + "/domain.yaml"));
     boolean result = Command.withParams(params).execute();
     assertTrue(result, "Failed to create domain custom resource");
 
@@ -300,9 +300,6 @@ void testErrorPathV8DomainMissingWDTBinary() {
       deleteDomainResource(domainNamespace, domainUid);
     }
 
-    final String adminServerPodName = domainUid + "-admin-server";
-    final String managedServerPrefix = domainUid + "-managed-server";
-
     String missingWdtTag = "missing-wdtbinary-image";
     String missingWdtImage = MII_AUXILIARY_IMAGE_NAME + ":" +  missingWdtTag;
 
@@ -336,7 +333,7 @@ void testErrorPathV8DomainMissingWDTBinary() {
     logger.info("Run " + KUBERNETES_CLI + " to create the domain");
     CommandParams params = new CommandParams().defaults();
     params.command(KUBERNETES_CLI + " apply -f "
-            + Paths.get(WORK_DIR + "/domain.yaml").toString());
+            + Paths.get(WORK_DIR + "/domain.yaml"));
     boolean result = Command.withParams(params).execute();
     assertTrue(result, "Failed to create domain custom resource");
 
@@ -367,9 +364,6 @@ void testErrorPathV8DomainMissingDomainConfig() {
       deleteDomainResource(domainNamespace, domainUid);
     }
 
-    final String adminServerPodName = domainUid + "-admin-server";
-    final String managedServerPrefix = domainUid + "-managed-server";
-
     String missingModelTag = "missing-model-image";
     String missingModelImage = MII_AUXILIARY_IMAGE_NAME + ":" + missingModelTag;
 
@@ -402,7 +396,7 @@ void testErrorPathV8DomainMissingDomainConfig() {
     logger.info("Run " + KUBERNETES_CLI + " to create the domain");
     CommandParams params = new CommandParams().defaults();
     params.command(KUBERNETES_CLI + " apply -f "
-            + Paths.get(WORK_DIR + "/domain.yaml").toString());
+            + Paths.get(WORK_DIR + "/domain.yaml"));
     boolean result = Command.withParams(params).execute();
     assertTrue(result, "Failed to create domain custom resource");
 
@@ -430,9 +424,6 @@ void testErrorPathV8DomainFilePermission() {
       deleteDomainResource(domainNamespace, domainUid);
     }
 
-    final String adminServerPodName = domainUid + "-admin-server";
-    final String managedServerPrefix = domainUid + "-managed-server";
-
     String permModelTag = "perm-model-image";
     String permModelImage = MII_AUXILIARY_IMAGE_NAME + ":" + permModelTag;
 
@@ -472,7 +463,7 @@ void testErrorPathV8DomainFilePermission() {
     logger.info("Run " + KUBERNETES_CLI + " to create the domain");
     CommandParams params = new CommandParams().defaults();
     params.command(KUBERNETES_CLI + " apply -f "
-            + Paths.get(WORK_DIR + "/domain.yaml").toString());
+            + Paths.get(WORK_DIR + "/domain.yaml"));
     boolean result = Command.withParams(params).execute();
     assertTrue(result, "Failed to create domain custom resource");
 
@@ -545,12 +536,11 @@ void testUpdateBaseImageV8AuxDomain() {
     logger.info("Run " + KUBERNETES_CLI + " to create the domain");
     CommandParams params = new CommandParams().defaults();
     params.command(KUBERNETES_CLI + " apply -f "
-            + Paths.get(WORK_DIR + "/domain.yaml").toString());
+            + Paths.get(WORK_DIR + "/domain.yaml"));
     boolean result = Command.withParams(params).execute();
     assertTrue(result, "Failed to create domain custom resource");
 
-    String operatorPodName =
-        assertDoesNotThrow(() -> getOperatorPodName(OPERATOR_RELEASE_NAME, opNamespace));
+    assertDoesNotThrow(() -> getOperatorPodName(OPERATOR_RELEASE_NAME, opNamespace));
     logger.info("Wait for admin server pod {0} to be ready in namespace {1}",
         adminServerPodName, domainNamespace);
     checkPodReadyAndServiceExists(adminServerPodName, domainUid, domainNamespace);

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

@@ -1,4 +1,4 @@
-// Copyright (c) 2020, 2024, Oracle and/or its affiliates.
+// Copyright (c) 2020, 2025, 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;
@@ -9,7 +9,6 @@
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
-import java.util.Map;
 
 import io.kubernetes.client.openapi.ApiException;
 import io.kubernetes.client.openapi.models.V1EnvVar;
@@ -91,15 +90,13 @@ class ItCoherenceTests {
   private static final String COHERENCE_IMAGE_NAME = "coherence-image";
 
   private static String domainUid = "coherence-domain";
-  private static String clusterName = "cluster-1";
   private static String adminServerPodName = domainUid + "-admin-server";
   private static String managedServerPrefix = domainUid + "-managed-server";
   private static String containerName = "weblogic-server";
   private static int replicaCount = 2;
 
   private static String opNamespace = null;
   private static String domainNamespace = null;
-  private static Map<String, Object> secretNameMap;
   private static LoggingFacade logger = null;
 
   /**
@@ -109,7 +106,7 @@ class ItCoherenceTests {
    *                   JUnit engine parameter resolution mechanism
    */
   @BeforeAll
-  public static void init(@Namespaces(2) List<String> namespaces) {
+  static void init(@Namespaces(2) List<String> namespaces) {
     logger = getLogger();
 
     // get a new unique opNamespace
@@ -197,15 +194,15 @@ private void copyCohProxyClientAppToPods() {
           () -> deleteDirectories(domainNamespace, serverName,
               null, true, dirsToMake),
           String.format("Failed to delete dir %s in pod %s in namespace %s ",
-              dirsToMake.toString(), serverName, domainNamespace));
+              dirsToMake, serverName, domainNamespace));
       logger.info("Deleted dir {0} in Pod {1} in namespace {2} ",
           dirsToMake.toString(), serverName, domainNamespace);
 
       assertDoesNotThrow(
           () -> makeDirectories(domainNamespace, serverName,
               null, true, dirsToMake),
           String.format("Failed to create dir %s in pod %s in namespace %s ",
-              dirsToMake.toString(), serverName, domainNamespace));
+              dirsToMake, serverName, domainNamespace));
       logger.info("Created dir {0} in Pod {1} in namespace {2} ",
           dirsToMake.toString(), serverName, domainNamespace);
 

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

@@ -1,4 +1,4 @@
-// Copyright (c) 2020, 2024, Oracle and/or its affiliates.
+// Copyright (c) 2020, 2025, 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;
@@ -7,7 +7,6 @@
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.net.InetAddress;
-import java.net.UnknownHostException;
 import java.net.http.HttpResponse;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -186,7 +185,7 @@ class ItConfigDistributionStrategy {
    * @param namespaces injected by JUnit
    */
   @BeforeAll
-  public void initAll(@Namespaces(3) List<String> namespaces) throws ApiException, IOException {
+  void initAll(@Namespaces(3) List<String> namespaces) throws ApiException, IOException {
     logger = getLogger();
 
     logger.info("Assign a unique namespace for operator");
@@ -264,7 +263,7 @@ public void initAll(@Namespaces(3) List<String> namespaces) throws ApiException,
    * Verify the default config before starting any test.
    */
   @BeforeEach
-  public void beforeEach() throws UnknownHostException, IOException, InterruptedException {
+  void beforeEach() {
     getDomainHealth();
     //check configuration values before override
     verifyConfigXMLOverride(false);
@@ -275,7 +274,7 @@ public void beforeEach() throws UnknownHostException, IOException, InterruptedEx
    * Delete the overrides and restart domain to get clean state.
    */
   @AfterEach
-  public void afterEach() throws IOException, InterruptedException {
+  void afterEach() {
     getDomainHealth();
     deleteConfigMap(overridecm, domainNamespace);
     String patchStr
@@ -933,7 +932,6 @@ private void verifyResourceJDBC1Override(boolean configUpdated) {
       }
       String baseUri = "http://" + hostAndPort + "/clusterview/ConfigServlet?";
       String appURI = "dsTest=true&dsName=" + dsName1 + "&" + "serverName=" + managedServerNameBase + i;
-      String dsConnectionPoolTestUrl = baseUri + appURI;
       testDatasource(appURI);
     }
   }
@@ -1189,21 +1187,19 @@ private void createFileInPod(String podName, String namespace, String password)
         + "CREATE USER 'root'@'" + ip + "' IDENTIFIED BY '" + password + "';\n"
         + "GRANT ALL PRIVILEGES ON *.* TO 'root'@'" + ip + "' WITH GRANT OPTION;\n"
         + "SELECT host, user FROM mysql.user;");
-    StringBuffer mysqlCmd = new StringBuffer("cat " + sourceFile.toString() + " | ");
+    StringBuffer mysqlCmd = new StringBuffer("cat " + sourceFile + " | ");
     mysqlCmd.append(KUBERNETES_CLI + " exec -i -n ");
     mysqlCmd.append(namespace);
     mysqlCmd.append(" ");
     mysqlCmd.append(podName);
     mysqlCmd.append(" -- /bin/bash -c \"");
     mysqlCmd.append("cat > /tmp/grant.sql\"");
-    //logger.info("mysql command {0}", mysqlCmd.toString());
     result = assertDoesNotThrow(() -> exec(new String(mysqlCmd), false));
-    //logger.info("mysql returned {0}", result.toString());
     logger.info("mysql returned EXIT value {0}", result.exitValue());
     assertEquals(0, result.exitValue(), "mysql execution fails");
   }
 
-  private void getDomainHealth() throws IOException, InterruptedException {
+  private void getDomainHealth() {
     testUntil(
         withStandardRetryPolicy,
         () -> {