Move classes of the old bootstrapping to their own package

henryju · henryju · commit 9699b781ff15 · 2024-12-19T17:17:04.000+01:00
diff --git a/lib/src/main/java/org/sonarsource/scanner/lib/ScannerEngineBootstrapper.java b/lib/src/main/java/org/sonarsource/scanner/lib/ScannerEngineBootstrapper.java
@@ -34,10 +34,11 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.sonarsource.scanner.lib.internal.InternalProperties;
-import org.sonarsource.scanner.lib.internal.IsolatedLauncherFactory;
 import org.sonarsource.scanner.lib.internal.cache.FileCache;
 import org.sonarsource.scanner.lib.internal.facade.forked.NewScannerEngineFacade;
 import org.sonarsource.scanner.lib.internal.facade.forked.ScannerEngineLauncherFactory;
+import org.sonarsource.scanner.lib.internal.facade.inprocess.InProcessScannerEngineFacade;
+import org.sonarsource.scanner.lib.internal.facade.inprocess.IsolatedLauncherFactory;
 import org.sonarsource.scanner.lib.internal.http.HttpConfig;
 import org.sonarsource.scanner.lib.internal.http.ScannerHttpClient;
 import org.sonarsource.scanner.lib.internal.http.ssl.CertificateStore;
diff --git a/lib/src/main/java/org/sonarsource/scanner/lib/internal/facade/inprocess/BootstrapIndexDownloader.java b/lib/src/main/java/org/sonarsource/scanner/lib/internal/facade/inprocess/BootstrapIndexDownloader.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonarsource.scanner.lib.internal;
+package org.sonarsource.scanner.lib.internal.facade.inprocess;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/lib/src/main/java/org/sonarsource/scanner/lib/internal/facade/inprocess/ClassloadRules.java b/lib/src/main/java/org/sonarsource/scanner/lib/internal/facade/inprocess/ClassloadRules.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonarsource.scanner.lib.internal;
+package org.sonarsource.scanner.lib.internal.facade.inprocess;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/lib/src/main/java/org/sonarsource/scanner/lib/internal/facade/inprocess/InProcessScannerEngineFacade.java b/lib/src/main/java/org/sonarsource/scanner/lib/internal/facade/inprocess/InProcessScannerEngineFacade.java
@@ -17,18 +17,17 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonarsource.scanner.lib;
+package org.sonarsource.scanner.lib.internal.facade.inprocess;
 
 import java.util.Map;
 import javax.annotation.Nullable;
-import org.sonarsource.scanner.lib.internal.IsolatedLauncherFactory;
-import org.sonarsource.scanner.lib.internal.Slf4jLogOutputAdapter;
+import org.sonarsource.scanner.lib.ScannerEngineFacade;
 
-class InProcessScannerEngineFacade extends ScannerEngineFacade {
+public class InProcessScannerEngineFacade extends ScannerEngineFacade {
 
   private final IsolatedLauncherFactory.IsolatedLauncherAndClassloader launcherAndCl;
 
-  InProcessScannerEngineFacade(Map<String, String> bootstrapProperties, IsolatedLauncherFactory.IsolatedLauncherAndClassloader launcherAndCl,
+  public InProcessScannerEngineFacade(Map<String, String> bootstrapProperties, IsolatedLauncherFactory.IsolatedLauncherAndClassloader launcherAndCl,
     boolean isSonarCloud, @Nullable String serverVersion) {
     super(bootstrapProperties, isSonarCloud, serverVersion, launcherAndCl.wasEngineCacheHit(), null);
     this.launcherAndCl = launcherAndCl;
diff --git a/lib/src/main/java/org/sonarsource/scanner/lib/internal/facade/inprocess/IsolatedClassloader.java b/lib/src/main/java/org/sonarsource/scanner/lib/internal/facade/inprocess/IsolatedClassloader.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonarsource.scanner.lib.internal;
+package org.sonarsource.scanner.lib.internal.facade.inprocess;
 
 import java.io.IOException;
 import java.net.MalformedURLException;
diff --git a/lib/src/main/java/org/sonarsource/scanner/lib/internal/facade/inprocess/IsolatedLauncherFactory.java b/lib/src/main/java/org/sonarsource/scanner/lib/internal/facade/inprocess/IsolatedLauncherFactory.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonarsource.scanner.lib.internal;
+package org.sonarsource.scanner.lib.internal.facade.inprocess;
 
 import java.net.URLClassLoader;
 import java.nio.file.Path;
@@ -33,7 +33,6 @@
 import org.sonarsource.scanner.lib.internal.cache.CachedFile;
 import org.sonarsource.scanner.lib.internal.cache.FileCache;
 import org.sonarsource.scanner.lib.internal.http.ScannerHttpClient;
-import org.sonarsource.scanner.lib.internal.util.TempCleaning;
 
 public class IsolatedLauncherFactory {
 
diff --git a/lib/src/main/java/org/sonarsource/scanner/lib/internal/facade/inprocess/IsolatedLauncherProxy.java b/lib/src/main/java/org/sonarsource/scanner/lib/internal/facade/inprocess/IsolatedLauncherProxy.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonarsource.scanner.lib.internal;
+package org.sonarsource.scanner.lib.internal.facade.inprocess;
 
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.InvocationTargetException;
diff --git a/lib/src/main/java/org/sonarsource/scanner/lib/internal/facade/inprocess/JarExtractor.java b/lib/src/main/java/org/sonarsource/scanner/lib/internal/facade/inprocess/JarExtractor.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonarsource.scanner.lib.internal;
+package org.sonarsource.scanner.lib.internal.facade.inprocess;
 
 import java.io.InputStream;
 import java.net.URL;
diff --git a/lib/src/main/java/org/sonarsource/scanner/lib/internal/facade/inprocess/LegacyScannerEngineDownloader.java b/lib/src/main/java/org/sonarsource/scanner/lib/internal/facade/inprocess/LegacyScannerEngineDownloader.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonarsource.scanner.lib.internal;
+package org.sonarsource.scanner.lib.internal.facade.inprocess;
 
 import java.io.IOException;
 import java.nio.file.Path;
@@ -27,9 +27,9 @@
 import java.util.stream.Collectors;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.sonarsource.scanner.lib.internal.BootstrapIndexDownloader.JarEntry;
 import org.sonarsource.scanner.lib.internal.cache.CachedFile;
 import org.sonarsource.scanner.lib.internal.cache.FileCache;
+import org.sonarsource.scanner.lib.internal.facade.inprocess.BootstrapIndexDownloader.JarEntry;
 import org.sonarsource.scanner.lib.internal.http.ScannerHttpClient;
 
 import static java.lang.String.format;
diff --git a/lib/src/main/java/org/sonarsource/scanner/lib/internal/facade/inprocess/LegacyScannerEngineDownloaderFactory.java b/lib/src/main/java/org/sonarsource/scanner/lib/internal/facade/inprocess/LegacyScannerEngineDownloaderFactory.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonarsource.scanner.lib.internal;
+package org.sonarsource.scanner.lib.internal.facade.inprocess;
 
 import org.sonarsource.scanner.lib.internal.cache.FileCache;
 import org.sonarsource.scanner.lib.internal.http.ScannerHttpClient;
diff --git a/lib/src/main/java/org/sonarsource/scanner/lib/internal/facade/inprocess/ScannerException.java b/lib/src/main/java/org/sonarsource/scanner/lib/internal/facade/inprocess/ScannerException.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonarsource.scanner.lib.internal;
+package org.sonarsource.scanner.lib.internal.facade.inprocess;
 
 public class ScannerException extends RuntimeException {
 
diff --git a/lib/src/main/java/org/sonarsource/scanner/lib/internal/facade/inprocess/Slf4jLogOutputAdapter.java b/lib/src/main/java/org/sonarsource/scanner/lib/internal/facade/inprocess/Slf4jLogOutputAdapter.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonarsource.scanner.lib.internal;
+package org.sonarsource.scanner.lib.internal.facade.inprocess;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/lib/src/main/java/org/sonarsource/scanner/lib/internal/facade/inprocess/TempCleaning.java b/lib/src/main/java/org/sonarsource/scanner/lib/internal/facade/inprocess/TempCleaning.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonarsource.scanner.lib.internal.util;
+package org.sonarsource.scanner.lib.internal.facade.inprocess;
 
 import java.io.IOException;
 import java.nio.file.Files;
@@ -26,7 +26,7 @@
 import java.util.stream.Stream;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.sonarsource.scanner.lib.internal.IsolatedLauncherFactory;
+import org.sonarsource.scanner.lib.internal.util.Utils;
 
 /**
  * The file sonar-runner-batch.jar is locked by the classloader on Windows and can't be dropped at the end of the execution.
diff --git a/lib/src/main/java/org/sonarsource/scanner/lib/internal/facade/inprocess/package-info.java b/lib/src/main/java/org/sonarsource/scanner/lib/internal/facade/inprocess/package-info.java
@@ -0,0 +1,21 @@
+/*
+ * SonarScanner Java Library
+ * Copyright (C) 2011-2024 SonarSource SA
+ * mailto:info AT sonarsource DOT com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+@javax.annotation.ParametersAreNonnullByDefault
+package org.sonarsource.scanner.lib.internal.facade.inprocess;
diff --git a/lib/src/test/java/org/sonarsource/scanner/lib/ScannerEngineBootstrapperTest.java b/lib/src/test/java/org/sonarsource/scanner/lib/ScannerEngineBootstrapperTest.java
@@ -35,10 +35,10 @@
 import org.junitpioneer.jupiter.RestoreSystemProperties;
 import org.mockito.Mockito;
 import org.sonarsource.scanner.lib.internal.InternalProperties;
-import org.sonarsource.scanner.lib.internal.IsolatedLauncherFactory;
 import org.sonarsource.scanner.lib.internal.cache.FileCache;
 import org.sonarsource.scanner.lib.internal.facade.forked.ScannerEngineLauncher;
 import org.sonarsource.scanner.lib.internal.facade.forked.ScannerEngineLauncherFactory;
+import org.sonarsource.scanner.lib.internal.facade.inprocess.IsolatedLauncherFactory;
 import org.sonarsource.scanner.lib.internal.http.HttpConfig;
 import org.sonarsource.scanner.lib.internal.http.ScannerHttpClient;
 import org.sonarsource.scanner.lib.internal.http.ssl.CertificateStore;
diff --git a/lib/src/test/java/org/sonarsource/scanner/lib/internal/facade/inprocess/BootstrapIndexDownloaderTest.java b/lib/src/test/java/org/sonarsource/scanner/lib/internal/facade/inprocess/BootstrapIndexDownloaderTest.java
@@ -17,14 +17,14 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonarsource.scanner.lib.internal;
+package org.sonarsource.scanner.lib.internal.facade.inprocess;
 
 import java.io.IOException;
 import java.util.Collection;
 import org.assertj.core.groups.Tuple;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.sonarsource.scanner.lib.internal.BootstrapIndexDownloader.JarEntry;
+import org.sonarsource.scanner.lib.internal.facade.inprocess.BootstrapIndexDownloader.JarEntry;
 import org.sonarsource.scanner.lib.internal.http.ScannerHttpClient;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/lib/src/test/java/org/sonarsource/scanner/lib/internal/facade/inprocess/ClassloadRulesTest.java b/lib/src/test/java/org/sonarsource/scanner/lib/internal/facade/inprocess/ClassloadRulesTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonarsource.scanner.lib.internal;
+package org.sonarsource.scanner.lib.internal.facade.inprocess;
 
 import java.util.HashSet;
 import java.util.Set;
diff --git a/lib/src/test/java/org/sonarsource/scanner/lib/internal/facade/inprocess/IsolatedClassloaderTest.java b/lib/src/test/java/org/sonarsource/scanner/lib/internal/facade/inprocess/IsolatedClassloaderTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonarsource.scanner.lib.internal;
+package org.sonarsource.scanner.lib.internal.facade.inprocess;
 
 import java.io.IOException;
 import java.net.MalformedURLException;
diff --git a/lib/src/test/java/org/sonarsource/scanner/lib/internal/facade/inprocess/IsolatedLauncherFactoryTest.java b/lib/src/test/java/org/sonarsource/scanner/lib/internal/facade/inprocess/IsolatedLauncherFactoryTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonarsource.scanner.lib.internal;
+package org.sonarsource.scanner.lib.internal.facade.inprocess;
 
 import java.util.HashSet;
 import java.util.Map;
@@ -26,7 +26,6 @@
 import org.junit.jupiter.api.Test;
 import org.sonarsource.scanner.lib.internal.batch.IsolatedLauncher;
 import org.sonarsource.scanner.lib.internal.batch.LogOutput;
-import org.sonarsource.scanner.lib.internal.util.TempCleaning;
 
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.Mockito.mock;
diff --git a/lib/src/test/java/org/sonarsource/scanner/lib/internal/facade/inprocess/IsolatedLauncherProxyTest.java b/lib/src/test/java/org/sonarsource/scanner/lib/internal/facade/inprocess/IsolatedLauncherProxyTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonarsource.scanner.lib.internal;
+package org.sonarsource.scanner.lib.internal.facade.inprocess;
 
 import java.net.URL;
 import java.net.URLClassLoader;
diff --git a/lib/src/test/java/org/sonarsource/scanner/lib/internal/facade/inprocess/JarExtractorTest.java b/lib/src/test/java/org/sonarsource/scanner/lib/internal/facade/inprocess/JarExtractorTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonarsource.scanner.lib.internal;
+package org.sonarsource.scanner.lib.internal.facade.inprocess;
 
 import java.nio.file.Files;
 import java.nio.file.Path;
diff --git a/lib/src/test/java/org/sonarsource/scanner/lib/internal/facade/inprocess/LegacyScannerEngineDownloaderFactoryTest.java b/lib/src/test/java/org/sonarsource/scanner/lib/internal/facade/inprocess/LegacyScannerEngineDownloaderFactoryTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonarsource.scanner.lib.internal;
+package org.sonarsource.scanner.lib.internal.facade.inprocess;
 
 import org.junit.jupiter.api.Test;
 import org.sonarsource.scanner.lib.internal.cache.FileCache;
diff --git a/lib/src/test/java/org/sonarsource/scanner/lib/internal/facade/inprocess/LegacyScannerEngineDownloaderTest.java b/lib/src/test/java/org/sonarsource/scanner/lib/internal/facade/inprocess/LegacyScannerEngineDownloaderTest.java
@@ -17,17 +17,17 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonarsource.scanner.lib.internal;
+package org.sonarsource.scanner.lib.internal.facade.inprocess;
 
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Collection;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
-import org.sonarsource.scanner.lib.internal.BootstrapIndexDownloader.JarEntry;
-import org.sonarsource.scanner.lib.internal.LegacyScannerEngineDownloader.ScannerFileDownloader;
 import org.sonarsource.scanner.lib.internal.cache.FileCache;
+import org.sonarsource.scanner.lib.internal.facade.inprocess.BootstrapIndexDownloader.JarEntry;
+import org.sonarsource.scanner.lib.internal.facade.inprocess.LegacyScannerEngineDownloader.ScannerFileDownloader;
 import org.sonarsource.scanner.lib.internal.http.ScannerHttpClient;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/lib/src/test/java/org/sonarsource/scanner/lib/internal/facade/inprocess/Slf4jLogOutputAdapterTest.java b/lib/src/test/java/org/sonarsource/scanner/lib/internal/facade/inprocess/Slf4jLogOutputAdapterTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonarsource.scanner.lib.internal;
+package org.sonarsource.scanner.lib.internal.facade.inprocess;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
diff --git a/lib/src/test/java/org/sonarsource/scanner/lib/internal/facade/inprocess/TempCleaningTest.java b/lib/src/test/java/org/sonarsource/scanner/lib/internal/facade/inprocess/TempCleaningTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonarsource.scanner.lib.internal.util;
+package org.sonarsource.scanner.lib.internal.facade.inprocess;
 
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
