Revert merge to d70f025

4 files changed, 8 insertions, 60 deletions

diff --git a/sonar-home/src/main/java/org/sonar/home/cache/PersistentCache.java b/sonar-home/src/main/java/org/sonar/home/cache/PersistentCache.java
index 3ceeaa47f3d..a5d88ffcbe9 100644
--- a/sonar-home/src/main/java/org/sonar/home/cache/PersistentCache.java
+++ b/sonar-home/src/main/java/org/sonar/home/cache/PersistentCache.java
@@ -52,19 +52,15 @@ public class PersistentCache {
   // eviction strategy is to expire entries after modification once a time duration has elapsed
   private final long defaultDurationToExpireMs;
   private final Log log;
-  private boolean forceUpdate;
+  private final boolean forceUpdate;
 
   public PersistentCache(Path baseDir, long defaultDurationToExpireMs, Log log, boolean forceUpdate) {
     this.baseDir = baseDir;
     this.defaultDurationToExpireMs = defaultDurationToExpireMs;
     this.log = log;
+    this.forceUpdate = forceUpdate;
 
-    reconfigure(forceUpdate);
     log.info("cache: " + baseDir + ", default expiration time (ms): " + defaultDurationToExpireMs);
-  }
-
-  public void reconfigure(boolean forceUpdate) {
-    this.forceUpdate = forceUpdate;
 
     if (forceUpdate) {
       log.debug("cache: forcing update");
diff --git a/sonar-home/src/main/java/org/sonar/home/cache/PersistentCacheBuilder.java b/sonar-home/src/main/java/org/sonar/home/cache/PersistentCacheBuilder.java
index c58dc53bbd6..c8fcf06d4d0 100644
--- a/sonar-home/src/main/java/org/sonar/home/cache/PersistentCacheBuilder.java
+++ b/sonar-home/src/main/java/org/sonar/home/cache/PersistentCacheBuilder.java
@@ -30,19 +30,17 @@ import java.nio.file.Paths;
 import java.util.concurrent.TimeUnit;
 
 public class PersistentCacheBuilder {
-  private static final long DEFAULT_EXPIRE_DURATION = TimeUnit.MILLISECONDS.convert(1L, TimeUnit.DAYS);
-  private static final String DIR_NAME = "ws_cache";
-
   private boolean forceUpdate = false;
   private Path cachePath = null;
   private Log log = new StandardLog();
+  private String name = "ws_cache";
 
   public PersistentCache build() {
     if (cachePath == null) {
       setSonarHome(findHome());
     }
 
-    return new PersistentCache(cachePath, DEFAULT_EXPIRE_DURATION, log, forceUpdate);
+    return new PersistentCache(cachePath, TimeUnit.MILLISECONDS.convert(1L, TimeUnit.DAYS), log, forceUpdate);
   }
 
   public PersistentCacheBuilder setLog(Log log) {
@@ -52,7 +50,7 @@ public class PersistentCacheBuilder {
 
   public PersistentCacheBuilder setSonarHome(@Nullable Path p) {
     if (p != null) {
-      this.cachePath = p.resolve(DIR_NAME);
+      this.cachePath = p.resolve(name);
     }
     return this;
   }
diff --git a/sonar-home/src/main/java/org/sonar/home/log/LogListener.java b/sonar-home/src/main/java/org/sonar/home/log/LogListener.java
deleted file mode 100644
index fa11374fdc4..00000000000
--- a/sonar-home/src/main/java/org/sonar/home/log/LogListener.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * SonarQube, open source software quality management tool.
- * Copyright (C) 2008-2014 SonarSource
- * mailto:contact AT sonarsource DOT com
- *
- * SonarQube 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.
- *
- * SonarQube 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.
- */
-package org.sonar.home.log;
-
-public interface LogListener {
-  void log(String msg, Level level);
-  
-  enum Level {
-    ERROR, WARN, INFO, DEBUG, TRACE;
-  }
-}
diff --git a/sonar-home/src/test/java/org/sonar/home/cache/PersistentCacheTest.java b/sonar-home/src/test/java/org/sonar/home/cache/PersistentCacheTest.java
index e9abb0bc609..5f1e3424642 100644
--- a/sonar-home/src/test/java/org/sonar/home/cache/PersistentCacheTest.java
+++ b/sonar-home/src/test/java/org/sonar/home/cache/PersistentCacheTest.java
@@ -19,13 +19,12 @@
  */
 package org.sonar.home.cache;
 
-import org.apache.commons.io.FileUtils;
-
 import org.sonar.home.log.Slf4jLog;
 import org.junit.Rule;
 import org.junit.rules.TemporaryFolder;
 
 import java.io.File;
+import java.nio.file.Path;
 import java.util.concurrent.Callable;
 
 import static org.mockito.Mockito.when;
@@ -97,25 +96,8 @@ public class PersistentCacheTest {
   }
 
   @Test
-  public void testReconfigure() throws Exception {
-    cache = new PersistentCache(tmp.getRoot().toPath(), Long.MAX_VALUE, log, true);
-    assertCacheHit(false);
-    assertCacheHit(false);
-
-    File root = tmp.getRoot();
-    FileUtils.deleteQuietly(root);
-
-    // should re-create cache directory and start using the cache
-    cache.reconfigure(false);
-    assertThat(root).exists();
-
-    assertCacheHit(false);
-    assertCacheHit(true);
-  }
-
-  @Test
   public void testExpiration() throws Exception {
-    // negative time to make sure it is expired on the second call
+    //negative time to make sure it is expired on the second call
     cache = new PersistentCache(tmp.getRoot().toPath(), -100, log, false);
     assertCacheHit(false);
     assertCacheHit(false);
@@ -136,7 +118,7 @@ public class PersistentCacheTest {
       return VALUE;
     }
   }
-
+  
   /**
    * WSCache should be transparent regarding exceptions: if an exception is thrown by the value loader, it should pass through
    * the cache to the original caller using the cache.