create static read method for GuavaCacheConfigurationReader

scm-webapp/src/main/java/sonia/scm/cache/GuavaCacheConfigurationReader.java

@@ -85,7 +85,7 @@ public class GuavaCacheConfigurationReader
    * Constructs ...
    *
    */
-  public GuavaCacheConfigurationReader()
+  private GuavaCacheConfigurationReader()
   {
     try
     {
@@ -107,54 +107,9 @@ public class GuavaCacheConfigurationReader
    *
    * @return
    */
-  public GuavaCacheManagerConfiguration read()
+  public static GuavaCacheManagerConfiguration read()
   {
-    URL defaultConfigUrl = getDefaultResource();
+    return new GuavaCacheConfigurationReader().doRead();
-
-    if (defaultConfigUrl == null)
-    {
-      throw new IllegalStateException(
-        "could not find default cache configuration");
-    }
-
-    GuavaCacheManagerConfiguration config = readConfiguration(defaultConfigUrl,
-                                              true);
-
-    Iterator<URL> it = getModuleResources();
-
-    while (it.hasNext())
-    {
-      GuavaCacheManagerConfiguration moduleConfig =
-        readConfiguration(it.next(), false);
-
-      if (moduleConfig != null)
-      {
-        config = merge(config, moduleConfig);
-      }
-    }
-
-    File manualFile = getManualFileResource();
-
-    if (manualFile.exists())
-    {
-      try
-      {
-        GuavaCacheManagerConfiguration manualConfig =
-          readConfiguration(manualFile.toURI().toURL(), false);
-
-        config = merge(config, manualConfig);
-      }
-      catch (MalformedURLException ex)
-      {
-        logger.error("malformed url", ex);
-      }
-    }
-    else
-    {
-      logger.warn("could not find manual configuration at {}", manualFile);
-    }
-
-    return config;
   }
 
   //~--- get methods ----------------------------------------------------------
@@ -222,6 +177,62 @@ public class GuavaCacheConfigurationReader
     return map;
   }
 
+  /**
+   * Method description
+   *
+   *
+   * @return
+   */
+  private GuavaCacheManagerConfiguration doRead()
+  {
+    URL defaultConfigUrl = getDefaultResource();
+
+    if (defaultConfigUrl == null)
+    {
+      throw new IllegalStateException(
+        "could not find default cache configuration");
+    }
+
+    GuavaCacheManagerConfiguration config = readConfiguration(defaultConfigUrl,
+                                              true);
+
+    Iterator<URL> it = getModuleResources();
+
+    while (it.hasNext())
+    {
+      GuavaCacheManagerConfiguration moduleConfig =
+        readConfiguration(it.next(), false);
+
+      if (moduleConfig != null)
+      {
+        config = merge(config, moduleConfig);
+      }
+    }
+
+    File manualFile = getManualFileResource();
+
+    if (manualFile.exists())
+    {
+      try
+      {
+        GuavaCacheManagerConfiguration manualConfig =
+          readConfiguration(manualFile.toURI().toURL(), false);
+
+        config = merge(config, manualConfig);
+      }
+      catch (MalformedURLException ex)
+      {
+        logger.error("malformed url", ex);
+      }
+    }
+    else
+    {
+      logger.warn("could not find manual configuration at {}", manualFile);
+    }
+
+    return config;
+  }
+
   /**
    * Method description
    *

scm-webapp/src/main/java/sonia/scm/cache/GuavaCacheManager.java

@@ -33,6 +33,7 @@ package sonia.scm.cache;
 
 //~--- non-JDK imports --------------------------------------------------------
 
+import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.Maps;
 import com.google.inject.Singleton;
 
@@ -67,9 +68,18 @@ public class GuavaCacheManager implements CacheManager
    */
   public GuavaCacheManager()
   {
-    GuavaCacheConfigurationReader reader = new GuavaCacheConfigurationReader();
+    this(GuavaCacheConfigurationReader.read());
-    GuavaCacheManagerConfiguration config = reader.read();
+  }
 
+  /**
+   * Constructs ...
+   *
+   *
+   * @param config
+   */
+  @VisibleForTesting
+  protected GuavaCacheManager(GuavaCacheManagerConfiguration config)
+  {
     defaultConfiguration = config.getDefaultCache();
 
     for (GuavaNamedCacheConfiguration ncc : config.getCaches())