diff --git a/scm-webapp/src/main/java/sonia/scm/cache/CacheConfigurations.java b/scm-webapp/src/main/java/sonia/scm/cache/CacheConfigurations.java index ae56117bc5..2ebf1bdb77 100644 --- a/scm-webapp/src/main/java/sonia/scm/cache/CacheConfigurations.java +++ b/scm-webapp/src/main/java/sonia/scm/cache/CacheConfigurations.java @@ -60,13 +60,16 @@ public final class CacheConfigurations private static final Logger logger = LoggerFactory.getLogger(CacheConfigurations.class); - //~--- methods -------------------------------------------------------------- - private CacheConfigurations() - { - } + //~--- constructors --------------------------------------------------------- + + /** + * Constructs ... + * + */ + private CacheConfigurations() {} + + //~--- methods -------------------------------------------------------------- - - /** * Method description * diff --git a/scm-webapp/src/main/java/sonia/scm/cache/GuavaCache.java b/scm-webapp/src/main/java/sonia/scm/cache/GuavaCache.java index 082bc6df1c..10ba782bc2 100644 --- a/scm-webapp/src/main/java/sonia/scm/cache/GuavaCache.java +++ b/scm-webapp/src/main/java/sonia/scm/cache/GuavaCache.java @@ -69,7 +69,7 @@ public class GuavaCache implements Cache * * @param configuration */ - public GuavaCache(NamedCacheConfiguration configuration) + public GuavaCache(GuavaNamedCacheConfiguration configuration) { this(configuration, configuration.getName()); } @@ -81,7 +81,7 @@ public class GuavaCache implements Cache * @param configuration * @param name */ - public GuavaCache(CacheConfiguration configuration, String name) + public GuavaCache(GuavaCacheConfiguration configuration, String name) { this(GuavaCaches.create(configuration, name), configuration.getCopyStrategy(), name); diff --git a/scm-webapp/src/main/java/sonia/scm/cache/CacheConfiguration.java b/scm-webapp/src/main/java/sonia/scm/cache/GuavaCacheConfiguration.java similarity index 98% rename from scm-webapp/src/main/java/sonia/scm/cache/CacheConfiguration.java rename to scm-webapp/src/main/java/sonia/scm/cache/GuavaCacheConfiguration.java index a01ca2eccb..d39fd4eab2 100644 --- a/scm-webapp/src/main/java/sonia/scm/cache/CacheConfiguration.java +++ b/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 */ diff --git a/scm-webapp/src/main/java/sonia/scm/cache/CacheConfigurationReader.java b/scm-webapp/src/main/java/sonia/scm/cache/GuavaCacheConfigurationReader.java similarity index 78% rename from scm-webapp/src/main/java/sonia/scm/cache/CacheConfigurationReader.java rename to scm-webapp/src/main/java/sonia/scm/cache/GuavaCacheConfigurationReader.java index 43fe88ff58..59eb12951e 100644 --- a/scm-webapp/src/main/java/sonia/scm/cache/CacheConfigurationReader.java +++ b/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, - true); + GuavaCacheManagerConfiguration config = readConfiguration(defaultConfigUrl, + true); Iterator it = getModuleResources(); while (it.hasNext()) { - CacheManagerConfiguration moduleConfig = readConfiguration(it.next(), - false); + GuavaCacheManagerConfiguration moduleConfig = + 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 createNamedCacheMap( - List caches) + private Map createNamedCacheMap( + List caches) { - Map map = Maps.newLinkedHashMap(); + Map 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, - CacheManagerConfiguration other) + private GuavaCacheManagerConfiguration merge( + GuavaCacheManagerConfiguration config, GuavaCacheManagerConfiguration other) { - CacheConfiguration defaultCache = config.getDefaultCache(); - Map namedCaches = + GuavaCacheConfiguration defaultCache = config.getDefaultCache(); + Map namedCaches = createNamedCacheMap(config.getCaches()); if (other.getDefaultCache() != null) @@ -242,14 +243,14 @@ public class CacheConfigurationReader defaultCache = other.getDefaultCache(); } - List otherNamedCaches = other.getCaches(); + List 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) { diff --git a/scm-webapp/src/main/java/sonia/scm/cache/GuavaCacheManager.java b/scm-webapp/src/main/java/sonia/scm/cache/GuavaCacheManager.java index 0cf964c0d5..74b8e8f254 100644 --- a/scm-webapp/src/main/java/sonia/scm/cache/GuavaCacheManager.java +++ b/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(); - CacheManagerConfiguration config = reader.read(); + GuavaCacheConfigurationReader reader = new GuavaCacheConfigurationReader(); + 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 cacheMap = Maps.newConcurrentMap(); /** Field description */ - private CacheConfiguration defaultConfiguration; + private GuavaCacheConfiguration defaultConfiguration; } diff --git a/scm-webapp/src/main/java/sonia/scm/cache/CacheManagerConfiguration.java b/scm-webapp/src/main/java/sonia/scm/cache/GuavaCacheManagerConfiguration.java similarity index 85% rename from scm-webapp/src/main/java/sonia/scm/cache/CacheManagerConfiguration.java rename to scm-webapp/src/main/java/sonia/scm/cache/GuavaCacheManagerConfiguration.java index e0d8c8b4d4..cb9c306bdf 100644 --- a/scm-webapp/src/main/java/sonia/scm/cache/CacheManagerConfiguration.java +++ b/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, - List caches) + public GuavaCacheManagerConfiguration(GuavaCacheConfiguration defaultCache, + List caches) { this.defaultCache = defaultCache; this.caches = caches; @@ -78,11 +78,13 @@ public class CacheManagerConfiguration * * @return */ - public List getCaches() + public List 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 caches; + private List caches; /** Field description */ @XmlElement(name = "defaultCache") - private CacheConfiguration defaultCache; + private GuavaCacheConfiguration defaultCache; } diff --git a/scm-webapp/src/main/java/sonia/scm/cache/GuavaCaches.java b/scm-webapp/src/main/java/sonia/scm/cache/GuavaCaches.java index 1aba642ab0..42b36a6fd6 100644 --- a/scm-webapp/src/main/java/sonia/scm/cache/GuavaCaches.java +++ b/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 builder = CacheBuilder.newBuilder(); diff --git a/scm-webapp/src/main/java/sonia/scm/cache/NamedCacheConfiguration.java b/scm-webapp/src/main/java/sonia/scm/cache/GuavaNamedCacheConfiguration.java similarity index 97% rename from scm-webapp/src/main/java/sonia/scm/cache/NamedCacheConfiguration.java rename to scm-webapp/src/main/java/sonia/scm/cache/GuavaNamedCacheConfiguration.java index 162a449b1d..a8ae2ac8c5 100644 --- a/scm-webapp/src/main/java/sonia/scm/cache/NamedCacheConfiguration.java +++ b/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 */