added prefix for guava cache classes

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

@@ -60,12 +60,15 @@ public final class CacheConfigurations
   private static final Logger logger =
     LoggerFactory.getLogger(CacheConfigurations.class);
 
+  //~--- constructors ---------------------------------------------------------
+
+  /**
+   * Constructs ...
+   *
+   */
+  private CacheConfigurations() {}
+
   //~--- methods --------------------------------------------------------------
-  private CacheConfigurations()
-  {
-  }
-
-  
 
   /**
    * Method description

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

@@ -69,7 +69,7 @@ public class GuavaCache<K, V> implements Cache<K, V>
    *
    * @param configuration
    */
-  public GuavaCache(NamedCacheConfiguration configuration)
+  public GuavaCache(GuavaNamedCacheConfiguration configuration)
   {
     this(configuration, configuration.getName());
   }
@@ -81,7 +81,7 @@ public class GuavaCache<K, V> implements Cache<K, V>
    * @param configuration
    * @param name
    */
-  public GuavaCache(CacheConfiguration configuration, String name)
+  public GuavaCache(GuavaCacheConfiguration configuration, String name)
   {
     this(GuavaCaches.create(configuration, name),
       configuration.getCopyStrategy(), name);

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

@@ -46,7 +46,7 @@ import javax.xml.bind.annotation.XmlRootElement;
  */
 @XmlRootElement(name = "cache")
 @XmlAccessorType(XmlAccessType.FIELD)
-public class CacheConfiguration implements Serializable
+public class GuavaCacheConfiguration implements Serializable
 {
 
   /** Field description */

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

@@ -60,7 +60,7 @@ import javax.xml.bind.JAXBException;
  *
  * @author Sebastian Sdorra
  */
-public class CacheConfigurationReader
+public class GuavaCacheConfigurationReader
 {
 
   /** Field description */
@@ -77,7 +77,7 @@ public class CacheConfigurationReader
    * the logger for CacheConfigurationReader
    */
   private static final Logger logger =
-    LoggerFactory.getLogger(CacheConfigurationReader.class);
+    LoggerFactory.getLogger(GuavaCacheConfigurationReader.class);
 
   //~--- constructors ---------------------------------------------------------
 
@@ -85,11 +85,12 @@ public class CacheConfigurationReader
    * Constructs ...
    *
    */
-  public CacheConfigurationReader()
+  public GuavaCacheConfigurationReader()
   {
     try
     {
-      this.context = JAXBContext.newInstance(CacheManagerConfiguration.class);
+      this.context =
+        JAXBContext.newInstance(GuavaCacheManagerConfiguration.class);
     }
     catch (JAXBException ex)
     {
@@ -106,7 +107,7 @@ public class CacheConfigurationReader
    *
    * @return
    */
-  public CacheManagerConfiguration read()
+  public GuavaCacheManagerConfiguration read()
   {
     URL defaultConfigUrl = getDefaultResource();
 
@@ -116,15 +117,15 @@ public class CacheConfigurationReader
         "could not find default cache configuration");
     }
 
-    CacheManagerConfiguration config = readConfiguration(defaultConfigUrl,
+    GuavaCacheManagerConfiguration config = readConfiguration(defaultConfigUrl,
                                               true);
 
     Iterator<URL> it = getModuleResources();
 
     while (it.hasNext())
     {
-      CacheManagerConfiguration moduleConfig = readConfiguration(it.next(),
+      GuavaCacheManagerConfiguration moduleConfig =
-                                                 false);
+        readConfiguration(it.next(), false);
 
       if (moduleConfig != null)
       {
@@ -138,7 +139,7 @@ public class CacheConfigurationReader
     {
       try
       {
-        CacheManagerConfiguration manualConfig =
+        GuavaCacheManagerConfiguration manualConfig =
           readConfiguration(manualFile.toURI().toURL(), false);
 
         config = merge(config, manualConfig);
@@ -167,7 +168,7 @@ public class CacheConfigurationReader
   @VisibleForTesting
   protected URL getDefaultResource()
   {
-    return CacheConfigurationReader.class.getResource(DEFAULT);
+    return GuavaCacheConfigurationReader.class.getResource(DEFAULT);
   }
 
   /**
@@ -208,12 +209,12 @@ public class CacheConfigurationReader
    *
    * @return
    */
-  private Map<String, NamedCacheConfiguration> createNamedCacheMap(
+  private Map<String, GuavaNamedCacheConfiguration> createNamedCacheMap(
-    List<NamedCacheConfiguration> caches)
+    List<GuavaNamedCacheConfiguration> caches)
   {
-    Map<String, NamedCacheConfiguration> map = Maps.newLinkedHashMap();
+    Map<String, GuavaNamedCacheConfiguration> map = Maps.newLinkedHashMap();
 
-    for (NamedCacheConfiguration ncc : caches)
+    for (GuavaNamedCacheConfiguration ncc : caches)
     {
       map.put(ncc.getName(), ncc);
     }
@@ -230,11 +231,11 @@ public class CacheConfigurationReader
    *
    * @return
    */
-  private CacheManagerConfiguration merge(CacheManagerConfiguration config,
+  private GuavaCacheManagerConfiguration merge(
-    CacheManagerConfiguration other)
+    GuavaCacheManagerConfiguration config, GuavaCacheManagerConfiguration other)
   {
-    CacheConfiguration defaultCache = config.getDefaultCache();
+    GuavaCacheConfiguration defaultCache = config.getDefaultCache();
-    Map<String, NamedCacheConfiguration> namedCaches =
+    Map<String, GuavaNamedCacheConfiguration> namedCaches =
       createNamedCacheMap(config.getCaches());
 
     if (other.getDefaultCache() != null)
@@ -242,14 +243,14 @@ public class CacheConfigurationReader
       defaultCache = other.getDefaultCache();
     }
 
-    List<NamedCacheConfiguration> otherNamedCaches = other.getCaches();
+    List<GuavaNamedCacheConfiguration> otherNamedCaches = other.getCaches();
 
-    for (NamedCacheConfiguration ncc : otherNamedCaches)
+    for (GuavaNamedCacheConfiguration ncc : otherNamedCaches)
     {
       namedCaches.put(ncc.getName(), ncc);
     }
 
-    return new CacheManagerConfiguration(defaultCache,
+    return new GuavaCacheManagerConfiguration(defaultCache,
       ImmutableList.copyOf(namedCaches.values()));
   }
 
@@ -262,14 +263,16 @@ public class CacheConfigurationReader
    *
    * @return
    */
-  private CacheManagerConfiguration readConfiguration(URL url, boolean fail)
+  private GuavaCacheManagerConfiguration readConfiguration(URL url,
+    boolean fail)
   {
-    CacheManagerConfiguration config = null;
+    GuavaCacheManagerConfiguration config = null;
 
     try
     {
       config =
-        (CacheManagerConfiguration) context.createUnmarshaller().unmarshal(url);
+        (GuavaCacheManagerConfiguration) context.createUnmarshaller().unmarshal(
+          url);
     }
     catch (JAXBException ex)
     {

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

@@ -67,12 +67,12 @@ public class GuavaCacheManager implements CacheManager
    */
   public GuavaCacheManager()
   {
-    CacheConfigurationReader reader = new CacheConfigurationReader();
+    GuavaCacheConfigurationReader reader = new GuavaCacheConfigurationReader();
-    CacheManagerConfiguration config = reader.read();
+    GuavaCacheManagerConfiguration config = reader.read();
 
     defaultConfiguration = config.getDefaultCache();
 
-    for (NamedCacheConfiguration ncc : config.getCaches())
+    for (GuavaNamedCacheConfiguration ncc : config.getCaches())
     {
       cacheMap.put(ncc.getName(), new GuavaCache(ncc));
     }
@@ -139,5 +139,5 @@ public class GuavaCacheManager implements CacheManager
   private Map<String, GuavaCache> cacheMap = Maps.newConcurrentMap();
 
   /** Field description */
-  private CacheConfiguration defaultConfiguration;
+  private GuavaCacheConfiguration defaultConfiguration;
 }

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

@@ -47,14 +47,14 @@ import javax.xml.bind.annotation.XmlRootElement;
  */
 @XmlRootElement(name = "caches")
 @XmlAccessorType(XmlAccessType.FIELD)
-public class CacheManagerConfiguration
+public class GuavaCacheManagerConfiguration
 {
 
   /**
    * Constructs ...
    *
    */
-  public CacheManagerConfiguration() {}
+  public GuavaCacheManagerConfiguration() {}
 
   /**
    * Constructs ...
@@ -63,8 +63,8 @@ public class CacheManagerConfiguration
    * @param defaultCache
    * @param caches
    */
-  public CacheManagerConfiguration(CacheConfiguration defaultCache,
+  public GuavaCacheManagerConfiguration(GuavaCacheConfiguration defaultCache,
-    List<NamedCacheConfiguration> caches)
+    List<GuavaNamedCacheConfiguration> caches)
   {
     this.defaultCache = defaultCache;
     this.caches = caches;
@@ -78,11 +78,13 @@ public class CacheManagerConfiguration
    *
    * @return
    */
-  public List<NamedCacheConfiguration> getCaches()
+  public List<GuavaNamedCacheConfiguration> getCaches()
+  {
+    if (caches == null)
     {
-    if ( caches == null ){
       caches = Collections.EMPTY_LIST;
     }
+
     return caches;
   }
 
@@ -92,7 +94,7 @@ public class CacheManagerConfiguration
    *
    * @return
    */
-  public CacheConfiguration getDefaultCache()
+  public GuavaCacheConfiguration getDefaultCache()
   {
     return defaultCache;
   }
@@ -101,9 +103,9 @@ public class CacheManagerConfiguration
 
   /** Field description */
   @XmlElement(name = "cache")
-  private List<NamedCacheConfiguration> caches;
+  private List<GuavaNamedCacheConfiguration> caches;
 
   /** Field description */
   @XmlElement(name = "defaultCache")
-  private CacheConfiguration defaultCache;
+  private GuavaCacheConfiguration defaultCache;
 }

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

@@ -75,7 +75,7 @@ public final class GuavaCaches
    * @return
    */
   public static com.google.common.cache.Cache create(
-    CacheConfiguration configuration, String name)
+    GuavaCacheConfiguration configuration, String name)
   {
     CacheBuilder<Object, Object> builder = CacheBuilder.newBuilder();
 

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

@@ -44,7 +44,7 @@ import javax.xml.bind.annotation.XmlRootElement;
  */
 @XmlRootElement(name = "cache")
 @XmlAccessorType(XmlAccessType.FIELD)
-public class NamedCacheConfiguration extends CacheConfiguration
+public class GuavaNamedCacheConfiguration extends GuavaCacheConfiguration
 {
 
   /** Field description */