Cleanup CdmTermCacher and CdmCacher

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/cache/CdmCacher.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/cache/CdmCacher.java
index 62f58ab15261b7010537495db7b8626354082515..e1520048c18c033985d43a56a0de968c1c64ee98 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/cache/CdmCacher.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/cache/CdmCacher.java
@@ -2,14 +2,14 @@ package eu.etaxonomy.cdm.api.cache;
 
 import java.util.UUID;
 
+import eu.etaxonomy.cdm.model.ICdmUuidCacher;
+import eu.etaxonomy.cdm.model.common.CdmBase;
 import net.sf.ehcache.Cache;
 import net.sf.ehcache.CacheManager;
 import net.sf.ehcache.Element;
 import net.sf.ehcache.config.CacheConfiguration;
 import net.sf.ehcache.config.CacheConfiguration.CacheEventListenerFactoryConfiguration;
 import net.sf.ehcache.store.MemoryStoreEvictionPolicy;
-import eu.etaxonomy.cdm.model.ICdmUuidCacher;
-import eu.etaxonomy.cdm.model.common.CdmBase;
 
 /**
  * CDM Entity Cacher class based on EhCache.
@@ -65,12 +65,12 @@ public abstract class CdmCacher implements ICdmUuidCacher {
         // For a better understanding on how to size caches, refer to
         // http://ehcache.org/documentation/configuration/cache-size
         return new CacheConfiguration(DEFAULT_CACHE_NAME, 500)
-        .memoryStoreEvictionPolicy(MemoryStoreEvictionPolicy.LFU)
-        .eternal(false)
-        // default ttl and tti set to 2 hours
-        .timeToLiveSeconds(60*60*2)
-        .timeToIdleSeconds(60*60*2)
-        .statistics(true);
+                .memoryStoreEvictionPolicy(MemoryStoreEvictionPolicy.LFU)
+                .eternal(false)
+                // default ttl and tti set to 2 hours
+                .timeToLiveSeconds(60*60*2)
+                .timeToIdleSeconds(60*60*2)
+                .statistics(true);
 
     }
 
@@ -102,9 +102,6 @@ public abstract class CdmCacher implements ICdmUuidCacher {
         return getDefaultCache().get(uuid);
     }
 
-    /* (non-Javadoc)
-     * @see eu.etaxonomy.cdm.model.ICdmCacher#put(java.util.UUID, eu.etaxonomy.cdm.model.common.CdmBase)
-     */
     @Override
     public  void put(UUID uuid, CdmBase cdmEntity) {
         CdmBase cachedCdmEntity = getFromCache(uuid);
@@ -113,11 +110,6 @@ public abstract class CdmCacher implements ICdmUuidCacher {
         }
     }
 
-
-
-    /* (non-Javadoc)
-     * @see eu.etaxonomy.cdm.remote.cache.ICdmCacher#load(java.util.UUID)
-     */
     @Override
     public CdmBase load(UUID uuid) {
         Element e = getCacheElement(uuid);
@@ -141,9 +133,6 @@ public abstract class CdmCacher implements ICdmUuidCacher {
     }
 
 
-    /* (non-Javadoc)
-     * @see eu.etaxonomy.cdm.model.ICdmCacher#getFromCache(java.util.UUID)
-     */
     @Override
     public  CdmBase getFromCache(UUID uuid) {
         Element e = getCacheElement(uuid);
@@ -154,20 +143,12 @@ public abstract class CdmCacher implements ICdmUuidCacher {
         }
     }
 
-
-    /* (non-Javadoc)
-     * @see eu.etaxonomy.cdm.model.ICdmCacher#getFromCache(eu.etaxonomy.cdm.model.common.CdmBase)
-     */
     @Override
     public CdmBase getFromCache(CdmBase cdmBase) {
         return getFromCache(cdmBase.getUuid());
     }
 
 
-
-    /* (non-Javadoc)
-     * @see eu.etaxonomy.cdm.model.ICdmCacher#put(eu.etaxonomy.cdm.model.common.CdmBase)
-     */
     @Override
     public void put(CdmBase cdmEntity) {
         if(cdmEntity != null) {
@@ -175,27 +156,15 @@ public abstract class CdmCacher implements ICdmUuidCacher {
         }
     }
 
-    /* (non-Javadoc)
-     * @see eu.etaxonomy.cdm.model.ICdmCacher#load(eu.etaxonomy.cdm.model.common.CdmBase)
-     */
     @Override
     public abstract CdmBase load(CdmBase cdmEntity);
 
 
-
-
-    /* (non-Javadoc)
-     * @see eu.etaxonomy.cdm.model.ICdmCacher#exists(java.util.UUID)
-     */
     @Override
     public boolean exists(UUID uuid) {
         return getCacheElement(uuid) != null;
     }
 
-
-    /* (non-Javadoc)
-     * @see eu.etaxonomy.cdm.model.ICdmCacher#exists(eu.etaxonomy.cdm.model.common.CdmBase)
-     */
     @Override
     public boolean exists(CdmBase cdmBase) {
         if(cdmBase != null) {
@@ -205,9 +174,6 @@ public abstract class CdmCacher implements ICdmUuidCacher {
 
     }
 
-    /* (non-Javadoc)
-     * @see eu.etaxonomy.cdm.model.ICdmCacher#existsAndIsNotNull(java.util.UUID)
-     */
     @Override
     public boolean existsAndIsNotNull(UUID uuid) {
         Element e = getCacheElement(uuid);
@@ -226,6 +192,4 @@ public abstract class CdmCacher implements ICdmUuidCacher {
      */
     protected abstract CdmBase findByUuid(UUID uuid);
 
-
-
 }

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/cache/CdmTermCacher.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/cache/CdmTermCacher.java
index a0dd738063f2a870be535342df88f213b69184e4..6343406faf84faf03b6eb028185d98415eebb989 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/cache/CdmTermCacher.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/cache/CdmTermCacher.java
@@ -27,19 +27,12 @@ public class CdmTermCacher extends CdmCacher {
         DefinedTermBase.setCacher(this);
        }
 
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.cdm.api.cache.CdmCacher#findByUuid(java.util.UUID)
-        */
        @Override
        protected  CdmBase findByUuid(UUID uuid) {
                return termService.findWithoutFlush(uuid);
        }
 
 
-
-    /* (non-Javadoc)
-     * @see eu.etaxonomy.cdm.model.ICdmCacher#isCachable(eu.etaxonomy.cdm.model.common.CdmBase)
-     */
     @Override
     public boolean isCachable(CdmBase cdmEntity) {
         if(cdmEntity != null && cdmEntity instanceof DefinedTermBase) {
@@ -48,9 +41,6 @@ public class CdmTermCacher extends CdmCacher {
         return false;
     }
 
-    /* (non-Javadoc)
-     * @see eu.etaxonomy.cdm.api.cache.CdmCacher#load(eu.etaxonomy.cdm.model.common.CdmBase)
-     */
     @Override
     public CdmBase load(CdmBase cdmEntity) {
 
@@ -62,9 +52,4 @@ public class CdmTermCacher extends CdmCacher {
         return cachedCdmEntity;
 
     }
-
-
-
-
-
 }