SCANNERAPI-176 Remove temporary file on exit

Author: henryju

api/src/main/java/org/sonarsource/scanner/api/EmbeddedScanner.java

@@ -19,6 +19,7 @@
  */
 package org.sonarsource.scanner.api;
 
+import java.io.IOException;
 import java.nio.charset.Charset;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -119,11 +120,15 @@ public String serverVersion() {
 
   public void execute(Map<String, String> taskProps) {
     checkLauncherExists();
-    Map<String, String> allProps = new HashMap<>();
-    allProps.putAll(globalProperties);
-    allProps.putAll(taskProps);
-    initAnalysisProperties(allProps);
-    doExecute(allProps);
+    try (IsolatedLauncherFactory launcherFactoryToBeClosed = launcherFactory) {
+      Map<String, String> allProps = new HashMap<>();
+      allProps.putAll(globalProperties);
+      allProps.putAll(taskProps);
+      initAnalysisProperties(allProps);
+      doExecute(allProps);
+    } catch (IOException e) {
+      throw new IllegalStateException(e.getMessage(), e);
+    }
   }
 
   private void initGlobalDefaultValues() {

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

@@ -19,19 +19,22 @@
  */
 package org.sonarsource.scanner.api.internal;
 
+import java.io.Closeable;
 import java.io.File;
+import java.io.IOException;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
 import java.util.List;
 import java.util.Map;
 import org.sonarsource.scanner.api.internal.batch.IsolatedLauncher;
 import org.sonarsource.scanner.api.internal.cache.Logger;
 
-public class IsolatedLauncherFactory {
+public class IsolatedLauncherFactory implements Closeable {
   static final String ISOLATED_LAUNCHER_IMPL = "org.sonarsource.scanner.api.internal.batch.BatchIsolatedLauncher";
   private final TempCleaning tempCleaning;
   private final String launcherImplClassName;
   private final Logger logger;
+  private IsolatedClassloader cl;
 
   /**
    * For unit tests
@@ -46,7 +49,7 @@ public IsolatedLauncherFactory(Logger logger) {
     this(ISOLATED_LAUNCHER_IMPL, new TempCleaning(logger), logger);
   }
 
-  private ClassLoader createClassLoader(List<File> jarFiles, ClassloadRules maskRules) {
+  private IsolatedClassloader createClassLoader(List<File> jarFiles, ClassloadRules maskRules) {
     IsolatedClassloader classloader = new IsolatedClassloader(getClass().getClassLoader(), maskRules);
     classloader.addFiles(jarFiles);
 
@@ -72,7 +75,7 @@ IsolatedLauncher createLauncher(final JarDownloader jarDownloader, final Classlo
       try {
         List<File> jarFiles = jarDownloader.download();
         logger.debug("Create isolated classloader...");
-        ClassLoader cl = createClassLoader(jarFiles, rules);
+        cl = createClassLoader(jarFiles, rules);
         IsolatedLauncher objProxy = IsolatedLauncherProxy.create(cl, IsolatedLauncher.class, launcherImplClassName, logger);
         tempCleaning.clean();
 
@@ -83,4 +86,11 @@ IsolatedLauncher createLauncher(final JarDownloader jarDownloader, final Classlo
       }
     });
   }
+
+  @Override
+  public void close() throws IOException {
+    if (cl != null) {
+      cl.close();
+    }
+  }
 }

api/src/main/java/org/sonarsource/scanner/api/internal/JarExtractor.java

@@ -32,6 +32,7 @@ public Path extractToTemp(String filenameWithoutSuffix) {
     URL url = getClass().getResource("/" + filename);
     try {
       Path copy = Files.createTempFile(filenameWithoutSuffix, ".jar");
+      copy.toFile().deleteOnExit();
       try (InputStream in = url.openStream()) {
         Files.copy(in, copy, StandardCopyOption.REPLACE_EXISTING);
       }

api/src/test/java/org/sonarsource/scanner/api/internal/cache/FileCacheBuilderTest.java

@@ -22,11 +22,13 @@
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
+import org.apache.commons.lang.SystemUtils;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assume.assumeFalse;
 import static org.mockito.Mockito.mock;
 
 public class FileCacheBuilderTest {
@@ -54,6 +56,7 @@ public void user_home_property_can_be_null() {
 
   @Test
   public void user_home_property_can_be_a_symlink() throws IOException {
+    assumeFalse(SystemUtils.IS_OS_WINDOWS);
     File realSonarHome = temp.newFolder();
     File symlink = temp.newFolder();
     symlink.delete();

batch-interface/src/main/java/org/sonarsource/scanner/api/internal/batch/IsolatedLauncher.java

@@ -25,4 +25,5 @@ public interface IsolatedLauncher {
   void execute(Map<String, String> properties, LogOutput logOutput);
 
   String getVersion();
+
 }