Fix Sonar issues

Author: rjeberhard

build-helper-mojo/src/test/java/com/oracle/wls/buildhelper/FileCopyMojoTest.java

@@ -1,4 +1,4 @@
-// Copyright (c) 2020, 2022, 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 com.oracle.wls.buildhelper;
@@ -32,14 +32,14 @@ class FileCopyMojoTest {
   private MojoTestSupport mojoTestSupport;
 
   @BeforeEach
-  public void setUp() throws Exception {
+  void setUp() throws Exception {
     mojoTestSupport = new MojoTestSupport(FileCopyMojo.class);
     mementos.add(StaticStubSupport.install(FileCopyMojo.class, "executor", copyExecutorStub));
     mementos.add(SystemPropertySupport.preserve("user.dir"));
   }
 
   @AfterEach
-  public void tearDown() {
+  void tearDown() {
     mementos.forEach(Memento::revert);
   }
 

build-helper-mojo/src/test/java/com/oracle/wls/buildhelper/GitTagMojoTest.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 com.oracle.wls.buildhelper;
@@ -107,12 +107,12 @@ void whenGitResponseIsVersionOnly_createVersionProperty() throws Exception {
 
   @Test
   void publicConstructorSuppliesLiveExecutor() throws NoSuchFieldException, IllegalAccessException {
-    GitTagMojo mojo = new GitTagMojo();
+    GitTagMojo gitTagMojo = new GitTagMojo();
 
-    Field field = mojo.getClass().getDeclaredField("executor");
+    Field field = gitTagMojo.getClass().getDeclaredField("executor");
     field.setAccessible(true);
 
-    assertThat(field.get(mojo), instanceOf(GitTagExecutor.class));
+    assertThat(field.get(gitTagMojo), instanceOf(GitTagExecutor.class));
   }
 
   @SuppressWarnings("SameParameterValue")

build-helper-mojo/src/test/java/com/oracle/wls/buildhelper/InMemoryFileSystem.java

@@ -68,12 +68,13 @@ private void defineFileContents(String filePath, String contents) {
     if (!filePath.startsWith(SEPARATOR)) throw new RuntimeException("Must specify full absolute path");
     provider.fileContents.put(filePath, contents);
 
-    String directoryPath = "";
+    StringBuilder directoryPath = new StringBuilder();
     for (String name : filePath.split(SEPARATOR)) {
       if (name.isEmpty()) continue;
-      directoryPath += (SEPARATOR + name);
-      if (!provider.fileContents.containsKey(directoryPath))
-        provider.fileContents.put(directoryPath, DIRECTORY_OBJECT);
+      directoryPath.append(SEPARATOR).append(name);
+      String path = directoryPath.toString();
+      if (!provider.fileContents.containsKey(path))
+        provider.fileContents.put(path, DIRECTORY_OBJECT);
     }
   }
 

build-helper-mojo/src/test/java/com/oracle/wls/buildhelper/InMemoryFileSystemTest.java

@@ -16,14 +16,15 @@
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.nullValue;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 class InMemoryFileSystemTest {
   static final String CREATED_FILE = "/top/of/the/system/MyFile.txt";
   static final String CREATED_FILE_CONTENT = "some text";
 
   private final InMemoryFileSystem fileSystem = InMemoryFileSystem.createInstance();
-  private final Path SLASH = toPath("/");
+  private final Path slash = toPath("/");
 
   @BeforeEach
   void setUp() {
@@ -39,7 +40,7 @@ void canCreateDummyFile() {
   void canReadDummyFile() throws IOException {
     try (BufferedReader reader = Files.newBufferedReader(toPath(CREATED_FILE))) {
       assertThat(reader.readLine(), equalTo(CREATED_FILE_CONTENT));
-    };
+    }
   }
 
   @Test
@@ -75,7 +76,7 @@ void resolve_addsToParent() {
 
   @Test
   void rootDirIsSlash() {
-    assertThat(toPath("/a/b/c").getRoot(), equalTo(SLASH));
+    assertThat(toPath("/a/b/c").getRoot(), equalTo(slash));
   }
 
   @Test
@@ -90,12 +91,12 @@ void parentForRelativePath_isNull() {
 
   @Test
   void parentForTopLevelSubdirectory_isSlash() {
-    assertThat(toPath("/subdir").getParent(), equalTo(SLASH));
+    assertThat(toPath("/subdir").getParent(), equalTo(slash));
   }
 
   @Test
   void parentForSlash_isNull() {
-    assertThat(SLASH.getParent(), nullValue());
+    assertThat(slash.getParent(), nullValue());
   }
 
   private Path toPath(String filePath) {
@@ -137,6 +138,6 @@ private void writeToFile(String filePath, String contents) throws IOException {
   void whenParentDirectoryPresent_openFileForOutput() throws IOException {
     Files.createDirectories(fileSystem.getPath("/a/b/c"));
 
-    writeToFile("/a/b/c/NewFile.txt", "something that works");
+    assertDoesNotThrow(() -> writeToFile("/a/b/c/NewFile.txt", "something that works"));
   }
 }

build-helper-mojo/src/test/java/com/oracle/wls/buildhelper/JavaxToJakartaMojoTest.java

@@ -20,7 +20,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.function.Function;
-import java.util.stream.Collectors;
 
 import static org.apache.maven.plugins.annotations.LifecyclePhase.GENERATE_SOURCES;
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -29,11 +28,10 @@
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.hasItem;
-import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.notNullValue;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public class JavaxToJakartaMojoTest {
+class JavaxToJakartaMojoTest {
   static final String ROOT = "/project";
   static final String SOURCE_ROOT = ROOT + "/src/main/java";
   static final String GENERATED_SOURCE_ROOT = ROOT + "/target/generated-sources/jakarta";
@@ -51,7 +49,7 @@ public class JavaxToJakartaMojoTest {
   Function<String, Path> toPath = inMemoryFileSystem::getPath;
 
   @BeforeEach
-  public void setUp() throws Exception {
+  void setUp() throws Exception {
     mojoTestSupport = new MojoTestSupport(JavaxToJakartaMojo.class);
     mojoTestSupport.getParameterField("compileSourceRoots").set(mojo, List.of(SOURCE_ROOT));
     mojoTestSupport.getParameterField("generatedSourcesDirectory").set(mojo, new File(GENERATED_SOURCE_ROOT));
@@ -67,7 +65,7 @@ public void setUp() throws Exception {
   }
 
   @AfterEach
-  public void tearDown() {
+  void tearDown() {
     mementos.forEach(Memento::revert);
   }
 
@@ -109,7 +107,7 @@ void addsGeneratedSourceDirectory() throws MojoExecutionException, MojoFailureEx
 
   @Test
   void findsFilesToTransform() throws MojoFailureException {
-    assertThat(mojo.getFilesToTransform().map(this::toRelativePath).map(Path::toString).collect(Collectors.toList()),
+    assertThat(mojo.getFilesToTransform().map(this::toRelativePath).map(Path::toString).toList(),
           containsInAnyOrder("a/b/c/javax/Servlet1.java", "d/e/f/javax/Servlet2.java"));
   }
 
@@ -138,9 +136,4 @@ void createsJakartaFiles() throws MojoExecutionException, MojoFailureException {
   private Path getStandardCompileSourceRoot() {
     return projectRoot.resolve("src").resolve("main").resolve("java");
   }
-
-  private Path getAddedCompileSourceRoot() {
-    return projectRoot.resolve("target").resolve("generated-sources").resolve("jakarta");
-  }
-
 }

wls-exporter-core/src/main/java/com/oracle/wls/exporter/AuthenticatedCall.java

@@ -14,7 +14,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-import java.util.Set;
 import java.util.stream.Collectors;
 
 import com.oracle.wls.exporter.domain.MBeanSelector;

wls-exporter-core/src/main/java/com/oracle/wls/exporter/ErrorLog.java

@@ -1,4 +1,4 @@
-// Copyright (c) 2019, 2021, 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 com.oracle.wls.exporter;
@@ -18,7 +18,7 @@ public void log(Throwable throwable) {
 
     private String toLogMessage(Throwable throwable) {
         StringBuilder sb = new StringBuilder(throwable.getClass().getSimpleName());
-        if (throwable.getMessage() != null && throwable.getMessage().trim().length() > 0)
+        if (throwable.getMessage() != null && !throwable.getMessage().trim().isEmpty())
             sb.append(": ").append(throwable.getMessage());
 
         return sb.toString();

wls-exporter-core/src/main/java/com/oracle/wls/exporter/JsonEntity.java

@@ -1,4 +1,4 @@
-// Copyright (c) 2021, 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 com.oracle.wls.exporter;
@@ -76,5 +76,6 @@ public boolean isStreaming() {
   @Override
   @Deprecated
   public void consumeContent() {
+    // no-op
   }
 }

wls-exporter-core/src/main/java/com/oracle/wls/exporter/UrlBuilder.java

@@ -1,4 +1,4 @@
-// Copyright (c) 2020, 2022, 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 com.oracle.wls.exporter;
@@ -116,13 +116,13 @@ private WebHost selectHost() {
   }
 
   private Queue<WebHost> initializeHosts() {
-    final PriorityQueue<WebHost> hosts = new PriorityQueue<>(new PreferSuccesses());
+    final PriorityQueue<WebHost> webHosts = new PriorityQueue<>(new PreferSuccesses());
     for (String hostName : hostNames) {
       for (int port : ports) {
-        hosts.add(new WebHost(hostName, port));
+        webHosts.add(new WebHost(hostName, port));
       }
     }
-    return hosts;
+    return webHosts;
   }
 
   // Informs the builder that the last URL it supplied worked

wls-exporter-core/src/main/java/com/oracle/wls/exporter/WebAppConstants.java

@@ -1,4 +1,4 @@
-// Copyright (c) 2017, 2023, Oracle and/or its affiliates.
+// Copyright (c) 2017, 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 com.oracle.wls.exporter;