SONAR-6649 Move initialization of persistit caches to global context

3 files changed, 6 insertions, 11 deletions

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/utils/internal/DefaultTempFolder.java b/sonar-plugin-api/src/main/java/org/sonar/api/utils/internal/DefaultTempFolder.java
index 86582192407..de0ee3d7962 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/utils/internal/DefaultTempFolder.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/utils/internal/DefaultTempFolder.java
@@ -19,7 +19,6 @@
  */
 package org.sonar.api.utils.internal;
 
-import org.sonar.api.utils.ProjectTempFolder;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang.StringUtils;
 import org.sonar.api.utils.TempFolder;
@@ -30,21 +29,21 @@ import java.io.File;
 import java.io.IOException;
 import java.text.MessageFormat;
 
-public class DefaultTempFolder implements TempFolder, ProjectTempFolder {
+public class DefaultTempFolder implements TempFolder {
 
   /** Maximum loop count when creating temp directories. */
   private static final int TEMP_DIR_ATTEMPTS = 10000;
 
   private final File tempDir;
-  private final boolean cleanUp;
+  private final boolean deleteOnExit;
 
   public DefaultTempFolder(File tempDir) {
     this(tempDir, false);
   }
 
-  public DefaultTempFolder(File tempDir, boolean cleanUp) {
+  public DefaultTempFolder(File tempDir, boolean deleteOnExit) {
     this.tempDir = tempDir;
-    this.cleanUp = cleanUp;
+    this.deleteOnExit = deleteOnExit;
   }
 
   @Override
@@ -114,7 +113,7 @@ public class DefaultTempFolder implements TempFolder, ProjectTempFolder {
   }
 
   public void stop() {
-    if(cleanUp) {
+    if (deleteOnExit) {
       clean();
     }
   }
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/utils/internal/JUnitTempFolder.java b/sonar-plugin-api/src/main/java/org/sonar/api/utils/internal/JUnitTempFolder.java
index e5cda14785f..3a8c15bf474 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/utils/internal/JUnitTempFolder.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/utils/internal/JUnitTempFolder.java
@@ -19,8 +19,6 @@
  */
 package org.sonar.api.utils.internal;
 
-import org.sonar.api.utils.ProjectTempFolder;
-
 import org.apache.commons.lang.StringUtils;
 import org.junit.rules.ExternalResource;
 import org.junit.rules.TemporaryFolder;
@@ -53,7 +51,7 @@ import java.io.IOException;
  *
  * @since 5.1
  */
-public class JUnitTempFolder extends ExternalResource implements TempFolder, ProjectTempFolder {
+public class JUnitTempFolder extends ExternalResource implements TempFolder {
 
   private final TemporaryFolder junit = new TemporaryFolder();
 
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/utils/internal/TempFolderCleaner.java b/sonar-plugin-api/src/main/java/org/sonar/api/utils/internal/TempFolderCleaner.java
index 7697cf7d6de..9d70e919bb9 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/utils/internal/TempFolderCleaner.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/utils/internal/TempFolderCleaner.java
@@ -19,11 +19,9 @@
  */
 package org.sonar.api.utils.internal;
 
-import org.sonar.api.batch.BatchSide;
 import org.sonar.api.server.ServerSide;
 import org.sonar.api.utils.TempFolder;
 
-@BatchSide
 @ServerSide
 public class TempFolderCleaner {