SONAR-4748 Refactoring of new TempFolder component

12 files changed, 52 insertions, 47 deletions

diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BatchPluginRepository.java b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BatchPluginRepository.java
index 762525fd992..e0e7be4ffcb 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BatchPluginRepository.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BatchPluginRepository.java
@@ -30,7 +30,7 @@ import org.sonar.api.Plugin;
 import org.sonar.api.config.Settings;
 import org.sonar.api.platform.PluginMetadata;
 import org.sonar.api.platform.PluginRepository;
-import org.sonar.api.utils.TempUtils;
+import org.sonar.api.utils.TempFolder;
 import org.sonar.core.plugins.PluginClassloaders;
 import org.sonar.core.plugins.PluginInstaller;
 import org.sonar.core.plugins.RemotePlugin;
@@ -54,10 +54,10 @@ public class BatchPluginRepository implements PluginRepository {
   private Map<String, PluginMetadata> metadataByKey;
   private Settings settings;
   private PluginClassloaders classLoaders;
-  private TempUtils tempDirectories;
+  private TempFolder tempDirectories;
   private final AnalysisMode analysisMode;
 
-  public BatchPluginRepository(PluginDownloader pluginDownloader, TempUtils tempDirectories, Settings settings, AnalysisMode analysisMode) {
+  public BatchPluginRepository(PluginDownloader pluginDownloader, TempFolder tempDirectories, Settings settings, AnalysisMode analysisMode) {
     this.pluginDownloader = pluginDownloader;
     this.tempDirectories = tempDirectories;
     this.settings = settings;
@@ -77,7 +77,7 @@ public class BatchPluginRepository implements PluginRepository {
       if (filter.accepts(remote.getKey())) {
         List<File> pluginFiles = pluginDownloader.downloadPlugin(remote);
         List<File> extensionFiles = pluginFiles.subList(1, pluginFiles.size());
-        File targetDir = tempDirectories.createDirectory("plugins/" + remote.getKey());
+        File targetDir = tempDirectories.newDir("plugins/" + remote.getKey());
         LOG.debug("Installing plugin {} into {}", remote.getKey(), targetDir.getAbsolutePath());
         PluginMetadata metadata = extractor.install(pluginFiles.get(0), remote.isCore(), extensionFiles, targetDir);
         if (StringUtils.isBlank(metadata.getBasePlugin()) || filter.accepts(metadata.getBasePlugin())) {
diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BootstrapContainer.java b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BootstrapContainer.java
index 163d9a86ec3..abfd8de5fc2 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BootstrapContainer.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BootstrapContainer.java
@@ -87,7 +87,7 @@ public class BootstrapContainer extends ComponentContainer {
       Logback.class,
       ServerMetadata.class,
       org.sonar.batch.ServerMetadata.class,
-      BatchTempUtils.class,
+      new TempFolderProvider(),
       HttpDownloader.class,
       UriReader.class,
       new FileCacheProvider());
diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/PreviewDatabase.java b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/PreviewDatabase.java
index 3ba51cd2f1a..09c70872f75 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/PreviewDatabase.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/PreviewDatabase.java
@@ -30,7 +30,7 @@ import org.sonar.api.config.Settings;
 import org.sonar.api.database.DatabaseProperties;
 import org.sonar.api.utils.HttpDownloader.HttpException;
 import org.sonar.api.utils.SonarException;
-import org.sonar.api.utils.TempUtils;
+import org.sonar.api.utils.TempFolder;
 
 import java.io.File;
 import java.net.SocketTimeoutException;
@@ -51,10 +51,10 @@ public class PreviewDatabase implements BatchComponent {
 
   private final Settings settings;
   private final ServerClient server;
-  private final TempUtils tempUtils;
+  private final TempFolder tempUtils;
   private final AnalysisMode mode;
 
-  public PreviewDatabase(Settings settings, ServerClient server, TempUtils tempUtils, AnalysisMode mode) {
+  public PreviewDatabase(Settings settings, ServerClient server, TempFolder tempUtils, AnalysisMode mode) {
     this.settings = settings;
     this.server = server;
     this.tempUtils = tempUtils;
@@ -63,7 +63,7 @@ public class PreviewDatabase implements BatchComponent {
 
   public void start() {
     if (mode.isPreview()) {
-      File databaseFile = tempUtils.createTempFile("preview", ".h2.db");
+      File databaseFile = tempUtils.newFile("preview", ".h2.db");
 
       int readTimeoutSec = getReadTimeout();
       downloadDatabase(databaseFile, readTimeoutSec * 1000);
diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BatchTempUtils.java b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/TempFolderProvider.java
index d31e9691f8e..fc773552216 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BatchTempUtils.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/TempFolderProvider.java
@@ -20,15 +20,17 @@
 package org.sonar.batch.bootstrap;
 
 import org.apache.commons.io.FileUtils;
+import org.picocontainer.injectors.ProviderAdapter;
 import org.sonar.api.CoreProperties;
-import org.sonar.core.utils.AbstractTempUtils;
+import org.sonar.api.utils.TempFolder;
+import org.sonar.api.utils.internal.DefaultTempFolder;
 
 import java.io.File;
 import java.io.IOException;
 
-public class BatchTempUtils extends AbstractTempUtils {
+public class TempFolderProvider extends ProviderAdapter {
 
-  public BatchTempUtils(BootstrapSettings bootstrapSettings) {
+  public TempFolder provide(BootstrapSettings bootstrapSettings) {
     String workingDirPath = bootstrapSettings.property(CoreProperties.WORKING_DIRECTORY, CoreProperties.WORKING_DIRECTORY_DEFAULT_VALUE);
     File workingDir = new File(workingDirPath);
     File tempDir = new File(workingDir, "tmp");
@@ -37,7 +39,7 @@ public class BatchTempUtils extends AbstractTempUtils {
     } catch (IOException e) {
       throw new IllegalStateException("Unable to create root temp directory " + tempDir, e);
     }
-    setTempDir(tempDir);
+    return new DefaultTempFolder(tempDir);
   }
 
 }
diff --git a/sonar-batch/src/main/java/org/sonar/batch/index/Caches.java b/sonar-batch/src/main/java/org/sonar/batch/index/Caches.java
index 7783e62380c..0a985e2ed5d 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/index/Caches.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/index/Caches.java
@@ -30,7 +30,7 @@ import org.apache.commons.io.FileUtils;
 import org.picocontainer.Startable;
 import org.slf4j.LoggerFactory;
 import org.sonar.api.BatchComponent;
-import org.sonar.api.utils.TempUtils;
+import org.sonar.api.utils.TempFolder;
 
 import java.io.File;
 import java.io.Serializable;
@@ -48,16 +48,16 @@ public class Caches implements BatchComponent, Startable {
   private File tempDir;
   private Persistit persistit;
   private Volume volume;
-  private final TempUtils tempUtils;
+  private final TempFolder tempFolder;
 
-  public Caches(TempUtils tempUtils) {
-    this.tempUtils = tempUtils;
+  public Caches(TempFolder tempFolder) {
+    this.tempFolder = tempFolder;
     initPersistit();
   }
 
   private void initPersistit() {
     try {
-      tempDir = tempUtils.createTempDirectory("caches");
+      tempDir = tempFolder.newDir("caches");
       persistit = new Persistit();
       persistit.setPersistitLogger(new Slf4jAdapter(LoggerFactory.getLogger("PERSISTIT")));
       Properties props = new Properties();
diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/ModuleFileSystemInitializer.java b/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/ModuleFileSystemInitializer.java
index 8b3d726c6d4..9bd7dce15c9 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/ModuleFileSystemInitializer.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/ModuleFileSystemInitializer.java
@@ -24,7 +24,7 @@ import org.apache.commons.io.FileUtils;
 import org.sonar.api.BatchComponent;
 import org.sonar.api.batch.bootstrap.ProjectDefinition;
 import org.sonar.api.scan.filesystem.PathResolver;
-import org.sonar.api.utils.TempUtils;
+import org.sonar.api.utils.TempFolder;
 
 import java.io.File;
 import java.util.List;
@@ -41,7 +41,7 @@ public class ModuleFileSystemInitializer implements BatchComponent {
   private List<File> additionalSourceFiles;
   private List<File> additionalTestFiles;
 
-  public ModuleFileSystemInitializer(ProjectDefinition module, TempUtils tempUtils, PathResolver pathResolver) {
+  public ModuleFileSystemInitializer(ProjectDefinition module, TempFolder tempUtils, PathResolver pathResolver) {
     baseDir = module.getBaseDir();
     buildDir = module.getBuildDir();
     initWorkingDir(module, tempUtils);
@@ -50,10 +50,10 @@ public class ModuleFileSystemInitializer implements BatchComponent {
     initTests(module, pathResolver);
   }
 
-  private void initWorkingDir(ProjectDefinition module, TempUtils tempUtils) {
+  private void initWorkingDir(ProjectDefinition module, TempFolder tempUtils) {
     workingDir = module.getWorkDir();
     if (workingDir == null) {
-      workingDir = tempUtils.createTempDirectory("work");
+      workingDir = tempUtils.newDir("work");
     } else {
       try {
         FileUtils.forceMkdir(workingDir);
diff --git a/sonar-batch/src/test/java/org/sonar/batch/bootstrap/BatchPluginRepositoryTest.java b/sonar-batch/src/test/java/org/sonar/batch/bootstrap/BatchPluginRepositoryTest.java
index 1b13dbbf591..952426ed91d 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/bootstrap/BatchPluginRepositoryTest.java
+++ b/sonar-batch/src/test/java/org/sonar/batch/bootstrap/BatchPluginRepositoryTest.java
@@ -28,7 +28,7 @@ import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 import org.sonar.api.CoreProperties;
 import org.sonar.api.config.Settings;
-import org.sonar.api.utils.TempUtils;
+import org.sonar.api.utils.TempFolder;
 import org.sonar.core.plugins.RemotePlugin;
 import org.sonar.core.plugins.RemotePluginFile;
 import org.sonar.test.TestUtils;
@@ -64,9 +64,9 @@ public class BatchPluginRepositoryTest {
 
   @Test
   public void shouldLoadPlugin() throws IOException {
-    TempUtils tempDirs = mock(TempUtils.class);
+    TempFolder tempDirs = mock(TempFolder.class);
     File toDir = temp.newFolder();
-    when(tempDirs.createDirectory("plugins/checkstyle")).thenReturn(toDir);
+    when(tempDirs.newDir("plugins/checkstyle")).thenReturn(toDir);
     RemotePlugin checkstyle = new RemotePlugin("checkstyle", true);
 
     PluginDownloader downloader = mock(PluginDownloader.class);
@@ -84,11 +84,11 @@ public class BatchPluginRepositoryTest {
 
   @Test
   public void shouldLoadPluginExtension() throws IOException {
-    TempUtils tempDirs = mock(TempUtils.class);
+    TempFolder tempDirs = mock(TempFolder.class);
     File toDir1 = temp.newFolder();
     File toDir2 = temp.newFolder();
-    when(tempDirs.createDirectory("plugins/checkstyle")).thenReturn(toDir1);
-    when(tempDirs.createDirectory("plugins/checkstyleextensions")).thenReturn(toDir2);
+    when(tempDirs.newDir("plugins/checkstyle")).thenReturn(toDir1);
+    when(tempDirs.newDir("plugins/checkstyleextensions")).thenReturn(toDir2);
     RemotePlugin checkstyle = new RemotePlugin("checkstyle", true);
     RemotePlugin checkstyleExt = new RemotePlugin("checkstyleextensions", false);
 
@@ -109,9 +109,9 @@ public class BatchPluginRepositoryTest {
 
   @Test
   public void shouldLoadPluginDeprecatedExtensions() throws IOException {
-    TempUtils tempDirs = mock(TempUtils.class);
+    TempFolder tempDirs = mock(TempFolder.class);
     File toDir = temp.newFolder();
-    when(tempDirs.createDirectory("plugins/checkstyle")).thenReturn(toDir);
+    when(tempDirs.newDir("plugins/checkstyle")).thenReturn(toDir);
     RemotePlugin checkstyle = new RemotePlugin("checkstyle", true);
     checkstyle.getFiles().add(new RemotePluginFile("checkstyle-ext.xml", "fakemd5"));
 
@@ -131,11 +131,11 @@ public class BatchPluginRepositoryTest {
 
   @Test
   public void shouldExcludePluginAndItsExtensions() throws IOException {
-    BatchTempUtils tempDirs = mock(BatchTempUtils.class);
+    TempFolder tempDirs = mock(TempFolder.class);
     File toDir1 = temp.newFolder();
     File toDir2 = temp.newFolder();
-    when(tempDirs.createDirectory("plugins/checkstyle")).thenReturn(toDir1);
-    when(tempDirs.createDirectory("plugins/checkstyleextensions")).thenReturn(toDir2);
+    when(tempDirs.newDir("plugins/checkstyle")).thenReturn(toDir1);
+    when(tempDirs.newDir("plugins/checkstyleextensions")).thenReturn(toDir2);
     RemotePlugin checkstyle = new RemotePlugin("checkstyle", true);
     RemotePlugin checkstyleExt = new RemotePlugin("checkstyleextensions", false);
 
diff --git a/sonar-batch/src/test/java/org/sonar/batch/bootstrap/BootstrapContainerTest.java b/sonar-batch/src/test/java/org/sonar/batch/bootstrap/BootstrapContainerTest.java
index 3e62bf619cd..d8944ab5340 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/bootstrap/BootstrapContainerTest.java
+++ b/sonar-batch/src/test/java/org/sonar/batch/bootstrap/BootstrapContainerTest.java
@@ -26,6 +26,7 @@ import org.sonar.api.BatchExtension;
 import org.sonar.api.Plugin;
 import org.sonar.api.SonarPlugin;
 import org.sonar.api.platform.PluginMetadata;
+import org.sonar.api.utils.TempFolder;
 import org.sonar.core.config.Logback;
 
 import java.util.Arrays;
@@ -46,7 +47,7 @@ public class BootstrapContainerTest {
     container.doBeforeStart();
 
     assertThat(container.getComponentByType(Logback.class)).isNotNull();
-    assertThat(container.getComponentByType(BatchTempUtils.class)).isNotNull();
+    assertThat(container.getComponentByType(TempFolder.class)).isNotNull();
   }
 
   @Test
diff --git a/sonar-batch/src/test/java/org/sonar/batch/bootstrap/PreviewDatabaseTest.java b/sonar-batch/src/test/java/org/sonar/batch/bootstrap/PreviewDatabaseTest.java
index d0a0ff569f9..a9209088726 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/bootstrap/PreviewDatabaseTest.java
+++ b/sonar-batch/src/test/java/org/sonar/batch/bootstrap/PreviewDatabaseTest.java
@@ -30,7 +30,7 @@ import org.sonar.api.config.Settings;
 import org.sonar.api.database.DatabaseProperties;
 import org.sonar.api.utils.HttpDownloader;
 import org.sonar.api.utils.SonarException;
-import org.sonar.api.utils.TempUtils;
+import org.sonar.api.utils.TempFolder;
 
 import java.io.File;
 import java.net.SocketTimeoutException;
@@ -45,7 +45,7 @@ import static org.mockito.Mockito.when;
 public class PreviewDatabaseTest {
   Settings settings;
   ServerClient server = mock(ServerClient.class);
-  TempUtils tempUtils = mock(TempUtils.class);
+  TempFolder tempUtils = mock(TempFolder.class);
   File databaseFile;
   private AnalysisMode mode;
 
@@ -58,7 +58,7 @@ public class PreviewDatabaseTest {
   @Before
   public void setUp() throws Exception {
     databaseFile = temp.newFile("preview.h2.db");
-    when(tempUtils.createTempFile("preview", ".h2.db")).thenReturn(databaseFile);
+    when(tempUtils.newFile("preview", ".h2.db")).thenReturn(databaseFile);
     settings = new Settings();
     settings.setProperty(CoreProperties.PROJECT_KEY_PROPERTY, "group:project");
 
diff --git a/sonar-batch/src/test/java/org/sonar/batch/bootstrap/BatchTempUtilsTest.java b/sonar-batch/src/test/java/org/sonar/batch/bootstrap/TempFolderProviderTest.java
index 04005adea68..8596dd33afd 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/bootstrap/BatchTempUtilsTest.java
+++ b/sonar-batch/src/test/java/org/sonar/batch/bootstrap/TempFolderProviderTest.java
@@ -25,12 +25,14 @@ import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.junit.rules.TemporaryFolder;
 import org.sonar.api.CoreProperties;
+import org.sonar.api.utils.TempFolder;
+import org.sonar.api.utils.internal.DefaultTempFolder;
 
 import java.io.File;
 
 import static org.fest.assertions.Assertions.assertThat;
 
-public class BatchTempUtilsTest {
+public class TempFolderProviderTest {
 
   @Rule
   public ExpectedException throwable = ExpectedException.none();
@@ -41,14 +43,14 @@ public class BatchTempUtilsTest {
   @Test
   public void createTempFolder() throws Exception {
     File workingDir = temp.newFolder();
-    BatchTempUtils tempUtils = new BatchTempUtils(new BootstrapSettings(
+    TempFolder tempFolder = new TempFolderProvider().provide(new BootstrapSettings(
       new BootstrapProperties(ImmutableMap.of(CoreProperties.WORKING_DIRECTORY, workingDir.getAbsolutePath()))));
-    tempUtils.createTempDirectory();
-    tempUtils.createTempFile();
+    tempFolder.newDir();
+    tempFolder.newFile();
     assertThat(new File(workingDir, "tmp")).exists();
     assertThat(new File(workingDir, "tmp").list()).hasSize(2);
 
-    tempUtils.stop();
+    ((DefaultTempFolder) tempFolder).stop();
     assertThat(new File(workingDir, "tmp")).doesNotExist();
   }
 }
diff --git a/sonar-batch/src/test/java/org/sonar/batch/index/CachesTest.java b/sonar-batch/src/test/java/org/sonar/batch/index/CachesTest.java
index eafec808dc8..c8d5fc7dc0e 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/index/CachesTest.java
+++ b/sonar-batch/src/test/java/org/sonar/batch/index/CachesTest.java
@@ -26,9 +26,9 @@ import org.junit.ClassRule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 import org.sonar.api.CoreProperties;
-import org.sonar.batch.bootstrap.BatchTempUtils;
 import org.sonar.batch.bootstrap.BootstrapProperties;
 import org.sonar.batch.bootstrap.BootstrapSettings;
+import org.sonar.batch.bootstrap.TempFolderProvider;
 
 import java.io.File;
 import java.io.IOException;
@@ -49,7 +49,7 @@ public class CachesTest {
     } catch (IOException e) {
       throw new RuntimeException(e);
     }
-    return new Caches(new BatchTempUtils(bootstrapSettings));
+    return new Caches(new TempFolderProvider().provide(bootstrapSettings));
   }
 
   Caches caches;
diff --git a/sonar-batch/src/test/java/org/sonar/batch/scan/filesystem/ModuleFileSystemInitializerTest.java b/sonar-batch/src/test/java/org/sonar/batch/scan/filesystem/ModuleFileSystemInitializerTest.java
index 3662390946a..0c75ab3d89b 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/scan/filesystem/ModuleFileSystemInitializerTest.java
+++ b/sonar-batch/src/test/java/org/sonar/batch/scan/filesystem/ModuleFileSystemInitializerTest.java
@@ -26,7 +26,7 @@ import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 import org.sonar.api.batch.bootstrap.ProjectDefinition;
 import org.sonar.api.scan.filesystem.PathResolver;
-import org.sonar.api.utils.TempUtils;
+import org.sonar.api.utils.TempFolder;
 
 import java.io.File;
 import java.io.IOException;
@@ -47,7 +47,7 @@ public class ModuleFileSystemInitializerTest {
     File workDir = temp.newFolder("work");
     ProjectDefinition module = ProjectDefinition.create().setBaseDir(baseDir).setWorkDir(workDir);
 
-    ModuleFileSystemInitializer initializer = new ModuleFileSystemInitializer(module, mock(TempUtils.class), pathResolver);
+    ModuleFileSystemInitializer initializer = new ModuleFileSystemInitializer(module, mock(TempFolder.class), pathResolver);
 
     assertThat(initializer.baseDir().getCanonicalPath()).isEqualTo(baseDir.getCanonicalPath());
     assertThat(initializer.workingDir().getCanonicalPath()).isEqualTo(workDir.getCanonicalPath());
@@ -73,7 +73,7 @@ public class ModuleFileSystemInitializerTest {
       .addTestDirs("src/test/java", "src/test/unknown")
       .addBinaryDir("target/classes");
 
-    ModuleFileSystemInitializer initializer = new ModuleFileSystemInitializer(project, mock(TempUtils.class), pathResolver);
+    ModuleFileSystemInitializer initializer = new ModuleFileSystemInitializer(project, mock(TempFolder.class), pathResolver);
 
     assertThat(initializer.baseDir().getCanonicalPath()).isEqualTo(baseDir.getCanonicalPath());
     assertThat(initializer.buildDir().getCanonicalPath()).isEqualTo(buildDir.getCanonicalPath());