Code cleanup

Author: henryju

lib/src/main/java/org/sonarsource/scanner/lib/ScannerEngineBootstrapper.java

@@ -21,15 +21,11 @@
 
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.Collections;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Objects;
-import java.util.Set;
 import javax.annotation.Nullable;
-import org.sonarsource.scanner.lib.internal.ClassloadRules;
 import org.sonarsource.scanner.lib.internal.InternalProperties;
 import org.sonarsource.scanner.lib.internal.IsolatedLauncherFactory;
 import org.sonarsource.scanner.lib.internal.OsResolver;
@@ -95,9 +91,6 @@ public ScannerEngineBootstrapper setBootstrapProperty(String key, String value)
    */
   public ScannerEngineFacade bootstrap() {
     initBootstrapDefaultValues();
-    Set<String> unmaskRules = new HashSet<>();
-    unmaskRules.add("org.sonarsource.scanner.lib.internal.batch.");
-    ClassloadRules rules = new ClassloadRules(Collections.emptySet(), unmaskRules);
     var properties = Map.copyOf(bootstrapProperties);
     var isSonarCloud = isSonarCloud(properties);
     var isSimulation = properties.containsKey(InternalProperties.SCANNER_DUMP_TO_FILE);
@@ -115,7 +108,7 @@ public ScannerEngineFacade bootstrap() {
       var launcher = scannerEngineLauncherFactory.createLauncher(serverConnection, fileCache, properties);
       return new NewScannerEngineFacade(properties, launcher, isSonarCloud, serverVersion);
     } else {
-      var launcher = launcherFactory.createLauncher(rules, serverConnection, fileCache);
+      var launcher = launcherFactory.createLauncher(serverConnection, fileCache);
       return new InProcessScannerEngineFacade(properties, launcher, false, serverVersion);
     }
   }

lib/src/main/java/org/sonarsource/scanner/lib/internal/IsolatedLauncherFactory.java

@@ -21,7 +21,10 @@
 
 import java.net.URLClassLoader;
 import java.nio.file.Path;
+import java.util.Collections;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 import java.util.stream.Collectors;
 import javax.annotation.Nullable;
 import org.slf4j.Logger;
@@ -58,7 +61,10 @@ private IsolatedClassloader createClassLoader(List<Path> jarFiles, ClassloadRule
     return classloader;
   }
 
-  public IsolatedLauncherAndClassloader createLauncher(ClassloadRules rules, ServerConnection serverConnection, FileCache fileCache) {
+  public IsolatedLauncherAndClassloader createLauncher(ServerConnection serverConnection, FileCache fileCache) {
+    Set<String> unmaskRules = new HashSet<>();
+    unmaskRules.add("org.sonarsource.scanner.lib.internal.batch.");
+    ClassloadRules rules = new ClassloadRules(Collections.emptySet(), unmaskRules);
     LegacyScannerEngineDownloader legacyScannerEngineDownloader = new LegacyScannerEngineDownloaderFactory(serverConnection, fileCache).create();
     return createLauncher(legacyScannerEngineDownloader, rules);
   }

lib/src/main/java/org/sonarsource/scanner/lib/internal/ScannerEngineLauncher.java

@@ -27,15 +27,11 @@
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.sonarsource.scanner.lib.ScannerProperties;
 import org.sonarsource.scanner.lib.internal.cache.CachedFile;
 
 public class ScannerEngineLauncher {
 
-  private static final Logger LOG = LoggerFactory.getLogger(ScannerEngineLauncher.class);
-
   private static final String JSON_FIELD_SCANNER_PROPERTIES = "scannerProperties";
   private final JavaRunner javaRunner;
   private final CachedFile scannerEngineJar;

lib/src/test/java/org/sonarsource/scanner/lib/ScannerEngineBootstrapperTest.java

@@ -29,7 +29,6 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 import org.mockito.Mockito;
-import org.sonarsource.scanner.lib.internal.ClassloadRules;
 import org.sonarsource.scanner.lib.internal.InternalProperties;
 import org.sonarsource.scanner.lib.internal.IsolatedLauncherFactory;
 import org.sonarsource.scanner.lib.internal.ScannerEngineLauncher;
@@ -103,15 +102,15 @@ void should_use_new_bootstrapping_with_sonarqube_10_6() throws Exception {
   @Test
   void should_use_old_bootstrapping_with_sonarqube_10_5() throws Exception {
     IsolatedLauncherFactory launcherFactory = mock(IsolatedLauncherFactory.class);
-    when(launcherFactory.createLauncher(any(ClassloadRules.class), eq(serverConnection), any(FileCache.class)))
+    when(launcherFactory.createLauncher(eq(serverConnection), any(FileCache.class)))
       .thenReturn(mock(IsolatedLauncherFactory.IsolatedLauncherAndClassloader.class));
 
     ScannerEngineBootstrapper bootstrapper = new ScannerEngineBootstrapper("Gradle", "3.1", system, serverConnection,
       launcherFactory, scannerEngineLauncherFactory);
     when(serverConnection.callRestApi("/analysis/version")).thenReturn("10.5");
 
     try (var scannerEngineFacade = bootstrapper.setBootstrapProperty(ScannerProperties.HOST_URL, "http://localhost").bootstrap()) {
-      verify(launcherFactory).createLauncher(any(ClassloadRules.class), eq(serverConnection), any(FileCache.class));
+      verify(launcherFactory).createLauncher(eq(serverConnection), any(FileCache.class));
       assertThat(scannerEngineFacade.isSonarCloud()).isFalse();
       assertThat(scannerEngineFacade.getServerVersion()).isEqualTo("10.5");
     }