migrated cache related classes to another package
authorCherian Mathew <c.mathew@bgbm.org>
Tue, 27 Jan 2015 09:29:44 +0000 (09:29 +0000)
committerCherian Mathew <c.mathew@bgbm.org>
Tue, 27 Jan 2015 09:29:44 +0000 (09:29 +0000)
.gitattributes
eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/cache/CdmServiceCacher.java
eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/cache/CachedCommonServiceImpl.java [moved from eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/cache/CachedCommonServiceImpl.java with 97% similarity]
eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/cache/CdmClientCacheException.java [moved from eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/cache/CdmClientCacheException.java with 81% similarity]
eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/cache/CdmEntityCacheKey.java [moved from eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/cache/CdmEntityCacheKey.java with 96% similarity]
eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/cache/CdmModelCacher.java [moved from eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/cache/CdmModelCacher.java with 99% similarity]
eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/cache/CdmModelFieldPropertyFromClass.java [moved from eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/cache/CdmModelFieldPropertyFromClass.java with 95% similarity]
eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/cache/CdmRemoteCacheManager.java [moved from eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/cache/CdmRemoteCacheManager.java with 98% similarity]
eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/cache/CdmTransientEntityCacher.java [moved from eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/cache/CdmTransientEntityCacher.java with 90% similarity]
eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/cache/ICachedCommonService.java [moved from eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/cache/ICachedCommonService.java with 89% similarity]

index 75cb8662541b77363bcd93cfe981c2392b731b05..86691e2f5b8b75a3113c90efece13f2de6446501 100644 (file)
@@ -335,17 +335,17 @@ eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/Cdm
 eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationRemoteController.java -text
 eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/RemotingMonitoredGenericApplicationContext.java -text
 eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/RemotingMonitoredListableBeanFactory.java -text
-eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/cache/CachedCommonServiceImpl.java -text
-eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/cache/CdmClientCacheException.java -text
-eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/cache/CdmEntityCacheKey.java -text
-eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/cache/CdmModelCacher.java -text
-eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/cache/CdmModelFieldPropertyFromClass.java -text
-eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/cache/CdmRemoteCacheManager.java -text
 eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/cache/CdmServiceCacher.java -text
-eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/cache/CdmTransientEntityCacher.java -text
-eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/cache/ICachedCommonService.java -text
 eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/CdmEagerLoadingException.java -text
 eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/CdmRemotingException.java -text
+eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/cache/CachedCommonServiceImpl.java -text
+eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/cache/CdmClientCacheException.java -text
+eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/cache/CdmEntityCacheKey.java -text
+eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/cache/CdmModelCacher.java -text
+eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/cache/CdmModelFieldPropertyFromClass.java -text
+eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/cache/CdmRemoteCacheManager.java -text
+eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/cache/CdmTransientEntityCacher.java -text
+eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/cache/ICachedCommonService.java -text
 eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/server/CDMServerException.java -text
 eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/source/CdmPersistentRemoteSource.java -text
 eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/source/CdmRemoteSource.java -text
index db7d0ed79b6a31ec66edcca30b0e755738ab38a4..78678a82efa7f7c5a7a046888d861acb2f5c7b7d 100644 (file)
@@ -5,9 +5,9 @@ import java.util.UUID;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import eu.etaxonomy.cdm.api.cache.CdmCacher;
 import eu.etaxonomy.cdm.api.service.ITermService;
 import eu.etaxonomy.cdm.model.common.CdmBase;
+import eu.etaxonomy.taxeditor.remoting.cache.CdmTransientEntityCacher;
 
 /**
  * Class which uses CDM services to cache cdm entities
@@ -25,12 +25,12 @@ public class CdmServiceCacher extends CdmCacher {
 
        @Autowired
        ITermService termService;
-       
+
        @Override
        protected void setup() {
-               CdmTransientEntityCacher.setDefaultCacher(this);                
+               CdmTransientEntityCacher.setDefaultCacher(this);
        }
-       
+
        @Override
        protected CdmBase findByUuid(UUID uuid) {
                CdmBase term = termService.findWithoutFlush(uuid);
similarity index 97%
rename from eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/cache/CachedCommonServiceImpl.java
rename to eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/cache/CachedCommonServiceImpl.java
index e7b6c6d6d2ca97951404d22735d6660445e19efd..58a06981711cf0ce0e20947ac99186698be8786b 100644 (file)
@@ -7,7 +7,7 @@
 * The contents of this file are subject to the Mozilla Public License Version 1.1
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
-package eu.etaxonomy.cdm.api.cache;
+package eu.etaxonomy.taxeditor.remoting.cache;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -31,8 +31,8 @@ import eu.etaxonomy.cdm.api.service.ICommonService;
 import eu.etaxonomy.cdm.model.common.CdmBase;
 import eu.etaxonomy.cdm.model.common.PersistentMultiLanguageText;
 import eu.etaxonomy.taxeditor.remoting.CdmRemotingException;
+import eu.etaxonomy.taxeditor.remoting.cache.CdmTransientEntityCacher.CollectionType;
 import eu.etaxonomy.taxeditor.session.ICdmEntitySessionManager;
-import eu.etaxonomy.cdm.api.cache.CdmTransientEntityCacher.CollectionType;;
 
 /**
  * @author cmathew
similarity index 90%
rename from eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/cache/CdmTransientEntityCacher.java
rename to eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/cache/CdmTransientEntityCacher.java
index 8dd40f0f87ff445fb7214c61387efa18db455f5a..e182787806c87fc8fdce2319e61ca23614039beb 100644 (file)
@@ -7,12 +7,9 @@
  * The contents of this file are subject to the Mozilla Public License Version 1.1
  * See LICENSE.TXT at the top of this package for the full license terms.
  */
-package eu.etaxonomy.cdm.api.cache;
+package eu.etaxonomy.taxeditor.remoting.cache;
 
-import java.io.Serializable;
 import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashSet;
@@ -20,10 +17,8 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.UUID;
 
 import javassist.util.proxy.ProxyFactory;
-
 import net.sf.ehcache.Cache;
 import net.sf.ehcache.Element;
 import net.sf.ehcache.config.CacheConfiguration;
@@ -31,23 +26,21 @@ import net.sf.ehcache.store.MemoryStoreEvictionPolicy;
 
 import org.apache.log4j.Logger;
 import org.hibernate.collection.spi.PersistentCollection;
-import org.hibernate.proxy.pojo.javassist.JavassistLazyInitializer;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ReflectionUtils;
 
-import eu.etaxonomy.cdm.api.service.ICommonService;
+import eu.etaxonomy.cdm.api.cache.CdmServiceCacher;
 import eu.etaxonomy.cdm.model.common.CdmBase;
 import eu.etaxonomy.taxeditor.session.ICdmEntitySessionManager;
 
 /**
- * 
+ *
  * This cache guarantees that
  *  - all objects put will be ancestors of CdmBase
  *  - all CdmBase objects in the cache will be already de-proxied
- *  - after any CdmBase object is put in the cache, 
- *  all non-null / non-proxy CdmBase objects in the sub-graph 
+ *  - after any CdmBase object is put in the cache,
+ *  all non-null / non-proxy CdmBase objects in the sub-graph
  *  will also be present in the cache.
- *   
+ *
  * @author cmathew
  * @date 14 Oct 2014
  *
@@ -57,14 +50,14 @@ public class CdmTransientEntityCacher  {
 
        private static final Logger logger = Logger.getLogger(CdmTransientEntityCacher.class);
 
-    
+
     private ICdmEntitySessionManager cdmEntitySessionManager;
-    
+
        private static CdmServiceCacher cdmServiceCacher;
-    
+
        private String cacheId;
 
-       private Cache cache; 
+       private Cache cache;
 
        private Cache cdmlibModelCache;
 
@@ -80,15 +73,15 @@ public class CdmTransientEntityCacher  {
             return this.name().toLowerCase();
         }
     }
-    
+
        private CdmTransientEntityCacher() {
-               
+
        }
-       
+
        public CdmTransientEntityCacher(String cacheId, ICdmEntitySessionManager cdmEntitySessionManager) {
                this.cacheId = cacheId;
 
-               cache = new Cache(getEntityCacheConfiguration(cacheId));                
+               cache = new Cache(getEntityCacheConfiguration(cacheId));
                cdmServiceCacher.getDefaultCacheManager().addCache(cache);
 
                cdmlibModelCache = CdmRemoteCacheManager.getInstance().getCdmModelGetMethodsCache();
@@ -107,7 +100,7 @@ public class CdmTransientEntityCacher  {
        private CacheConfiguration getEntityCacheConfiguration(String cacheId) {
                // For a better understanding on how to size caches, refer to
                // http://ehcache.org/documentation/configuration/cache-size
-               return new CacheConfiguration(cacheId, 500)        
+               return new CacheConfiguration(cacheId, 500)
                .memoryStoreEvictionPolicy(MemoryStoreEvictionPolicy.LFU)
                .eternal(false)
                // default ttl and tti set to 2 hours
@@ -119,7 +112,7 @@ public class CdmTransientEntityCacher  {
        public static void setDefaultCacher(CdmServiceCacher css) {
                cdmServiceCacher = css;
        }
-       
+
        /**
         * Returns the cache corresponding to the cache id
         *
@@ -138,11 +131,11 @@ public class CdmTransientEntityCacher  {
                        return (T) load((Map<T,T>)obj, recursive);
                } else if (obj instanceof Collection) {
                        return (T) load((Collection<T>)obj, recursive);
-               } 
-               
+               }
+
                return obj;
        }
-       
+
        @SuppressWarnings("unchecked")
        private <T extends Object> T loadRecursive(T obj, Set<CdmBase> alreadyVisitedEntities) {
                if(obj instanceof CdmBase) {
@@ -151,13 +144,13 @@ public class CdmTransientEntityCacher  {
                        return (T) load((Map<T,T>)obj, alreadyVisitedEntities);
                } else if (obj instanceof Collection) {
                        return (T) load((Collection<T>)obj, alreadyVisitedEntities);
-               } 
-               
+               }
+
                logger.info("No caching yet for type " + obj.getClass().getName());
-               
+
                return obj;
        }
-       
+
        public <T extends Object> Map<T,T> load(Map<T,T> map, boolean recursive){
                if(isRecursiveEnabled && recursive) {
                        logger.info("---- starting recursive load for cdm entity map");
@@ -170,7 +163,7 @@ public class CdmTransientEntityCacher  {
                        return load(map, null);
                }
        }
-       
+
 
        private <T extends Object> Map<T,T> load(Map<T,T> map, Set<CdmBase> alreadyVisitedEntities){
         if(map == null || map.isEmpty()) {
@@ -182,15 +175,15 @@ public class CdmTransientEntityCacher  {
         Iterator<Map.Entry<T,T>> iter = map.entrySet().iterator();
         int i=0;
         while ( iter.hasNext() ) {
-            Map.Entry<T,T> e = (Map.Entry<T,T>) iter.next();
+            Map.Entry<T,T> e = iter.next();
             result[i++] = e.getKey();
             result[i++] = e.getValue();
         }
 
-        for(i=0; i<result.length;i++) {            
+        for(i=0; i<result.length;i++) {
                if(alreadyVisitedEntities == null) {
                        result[i] = load(result[i], false);
-               } else {                              
+               } else {
                        result[i] = loadRecursive(result[i], alreadyVisitedEntities);
                }
         }
@@ -203,7 +196,7 @@ public class CdmTransientEntityCacher  {
         }
         return map;
        }
-       
+
        public <T extends Object> Collection<T> load(Collection<T> collection, boolean recursive){
                Collection<T> loadedCollection;
                if(isRecursiveEnabled && recursive) {
@@ -215,10 +208,10 @@ public class CdmTransientEntityCacher  {
                        loadedCollection = cachedCollection;
                } else {
                        loadedCollection = load(collection, null);
-               }               
+               }
                return loadedCollection;
        }
-       
+
        @SuppressWarnings("unchecked")
        private <T extends Object> Collection<T> load(Collection<T> collection, Set<CdmBase> alreadyVisitedEntities){
                int length = collection.size();
@@ -228,22 +221,22 @@ public class CdmTransientEntityCacher  {
                while(collectionItr.hasNext()) {
                        if(alreadyVisitedEntities == null) {
                        result[count] = load(collectionItr.next(), false);
-               } else {                              
+               } else {
                        result[count] = loadRecursive(collectionItr.next(), alreadyVisitedEntities);
-               }       
+               }
                        count++;
                }
-               
+
                collection.clear();
-                                               
+
                for ( int i = 0; i < length; i++ ) {
                        collection.add((T)result[i]);
                }
-               
+
                return collection;
        }
 
-       
+
        /**
         * Puts the (Key,Value) pair of ({@link java.util.UUID}, {@link eu.etaxonomy.cdm.model.common.CdmBase}),
         * in the cache corresponding to the given cache id
@@ -252,7 +245,7 @@ public class CdmTransientEntityCacher  {
         * @param uuid
         * @param cdmEntity
         */
-       public CdmBase load(CdmBase cdmEntity, boolean recursive) {             
+       public CdmBase load(CdmBase cdmEntity, boolean recursive) {
                CdmBase loadedCdmBase;
                if(isRecursiveEnabled && recursive) {
                        logger.info("---- starting recursive load for cdm entity " + cdmEntity.getClass().getName() + " with id " + cdmEntity.getId());
@@ -263,37 +256,37 @@ public class CdmTransientEntityCacher  {
                        loadedCdmBase =  cb;
                } else {
                        loadedCdmBase = load(cdmEntity);
-               }               
+               }
                return loadedCdmBase;
-               
+
        }
 
-       
+
        private CdmBase load(CdmBase cdmEntity) {
                logger.info("loading object of type " + cdmEntity.getClass().getName() + " with id " + cdmEntity.getId());
 
                // start by looking up the cdm entity in the cache
                CdmBase cachedCdmEntity = getFromCache(cdmEntity);
-               
+
                if(cachedCdmEntity != null) {
                        // if cdm entity was found in cache then return ...
                        logger.info(" - object of type " + cdmEntity.getClass().getName() + " with id " + cdmEntity.getId() + " already exists");
                        return cachedCdmEntity;
-               } else {                
-                       // ... else save the entity in the cache        
+               } else {
+                       // ... else save the entity in the cache
                        getCache().put(new Element(generateKey(cdmEntity), cdmEntity));
                        logger.info(" - object of type " + cdmEntity.getClass().getName() + " with id " + cdmEntity.getId() + " put in cache");
                        return cdmEntity;
-               }         
+               }
        }
-       
+
        private CdmBase loadRecursive(CdmBase cdmEntity, Set<CdmBase> alreadyVisitedEntities) {
 
                CdmBase cachedCdmEntity = load(cdmEntity);
-               
+
                // we want to recursive through the cdmEntity (and not the cachedCdmEntity)
                // since there could be new initialized object in the cdmEntity sub-graph
-               
+
                // start by getting the fields from the cdm entity
                String className = cdmEntity.getClass().getName();
                CdmModelFieldPropertyFromClass cmgmfc = getFromCdmlibModelCache(className);
@@ -308,11 +301,11 @@ public class CdmTransientEntityCacher  {
                                // In the case that the returned is either a Collection or a Map
                                // the individual objects inside these also need to be loaded
                                // by calling the corresponding cachify method in the
-                               // CdmEntityCachingUtils   
+                               // CdmEntityCachingUtils
 
                                CdmBase cdmEntityInSubGraph = getCdmBaseTypeFieldValue(cdmEntity, cachedCdmEntity, field, alreadyVisitedEntities);
                                if(cdmEntityInSubGraph != null) {
-                                       if(!alreadyVisitedEntities.contains(cdmEntityInSubGraph)) {                                                                                             
+                                       if(!alreadyVisitedEntities.contains(cdmEntityInSubGraph)) {
                                                logger.info("recursive loading object of type " + cdmEntityInSubGraph.getClass().getName() + " with id " + cdmEntityInSubGraph.getId());
                                                loadRecursive(cdmEntityInSubGraph, alreadyVisitedEntities);
                                        } else {
@@ -327,17 +320,17 @@ public class CdmTransientEntityCacher  {
                return cachedCdmEntity;
        }
 
-       
-       private CdmBase getCdmBaseTypeFieldValue(CdmBase cdmEntity, 
-                       CdmBase cachedCdmEntity, 
+
+       private CdmBase getCdmBaseTypeFieldValue(CdmBase cdmEntity,
+                       CdmBase cachedCdmEntity,
                        String fieldName,
                        Set<CdmBase> alreadyVisitedEntities) {
-               
-               
+
+
                if(cachedCdmEntity == null) {
                        throw new CdmClientCacheException("When trying to set field value, the cached cdm entity cannot be null");
                }
-               
+
                Class<?> clazz = cdmEntity.getClass();
                try {
                        // this call will search in the provided class as well as
@@ -345,25 +338,25 @@ public class CdmTransientEntityCacher  {
                        Field field = ReflectionUtils.findField(clazz, fieldName);
 
                        if(field == null) {
-                               throw new CdmClientCacheException("Field '" + fieldName 
+                               throw new CdmClientCacheException("Field '" + fieldName
                                                + "' not found when searching in class '" + clazz.getName() + "' and its supercalsses");
                        }
                        field.setAccessible(true);
                        Object o = field.get(cdmEntity);
 
                        CdmBase cdmEntityInSubGraph = null;
-                       if(o != null 
-                                       && !ProxyFactory.isProxyClass(o.getClass()) 
+                       if(o != null
+                                       && !ProxyFactory.isProxyClass(o.getClass())
                                        && !(o instanceof PersistentCollection) ) {
 
-                               
+
                                if(CdmBase.class.isAssignableFrom(o.getClass())) {
                                        logger.info("found initialised cdm entity '" + fieldName + "' in object of type " + clazz.getName() + " with id " + cdmEntity.getId());
                                        cdmEntityInSubGraph  = (CdmBase)o;
                                        CdmBase cachedCdmEntityInSubGraph = getFromCache(cdmEntityInSubGraph);
 
                                        if(cachedCdmEntityInSubGraph != null) {
-                                               if(cachedCdmEntityInSubGraph != cdmEntityInSubGraph) {                          
+                                               if(cachedCdmEntityInSubGraph != cdmEntityInSubGraph) {
                                                        field.set(cachedCdmEntity, cachedCdmEntityInSubGraph);
                                                }
                                        } else {
@@ -374,7 +367,7 @@ public class CdmTransientEntityCacher  {
                                } else if(o instanceof Collection) {
                                        loadRecursive((Collection)o, alreadyVisitedEntities);
                                }
-                       } 
+                       }
                        // we return the original cdm entity in the sub graph because we
                        // want to continue to recurse on the input cdm entity graph
                        // and not the one in the cache
@@ -385,10 +378,10 @@ public class CdmTransientEntityCacher  {
                        throw new CdmClientCacheException(e);
                } catch (IllegalAccessException e) {
                        throw new CdmClientCacheException(e);
-               }        
+               }
        }
 
-       public void put(CdmBase cdmEntity) {            
+       public void put(CdmBase cdmEntity) {
                CdmEntityCacheKey id = new CdmEntityCacheKey(cdmEntity);
                Element cachedCdmEntityElement = getCacheElement(id);
 
@@ -399,8 +392,8 @@ public class CdmTransientEntityCacher  {
                                return;
                        }
                }
-               
-               getCache().put(new Element(id, cdmEntity));       
+
+               getCache().put(new Element(id, cdmEntity));
        }
 
 
@@ -432,28 +425,28 @@ public class CdmTransientEntityCacher  {
        }
 
        public CdmBase getFromCache(CdmBase cdmBase) {
-               
+
                CdmEntityCacheKey cacheId = generateKey(cdmBase);
                CdmBase cachedCdmEntity = getFromCache(cacheId);
 
                if(cachedCdmEntity == null) {
                        // ... then try the permanent (uuid-based) cache
-                       cachedCdmEntity = cdmServiceCacher.getFromCache(cdmBase.getUuid());             
+                       cachedCdmEntity = cdmServiceCacher.getFromCache(cdmBase.getUuid());
                }
 
                return cachedCdmEntity;
        }
-       
+
        public CdmBase getFromCache(CdmBase cdmBase, Class<? extends CdmBase> clazz) {
-               
-               cdmBase = CdmBase.deproxy(cdmBase, clazz);              
+
+               cdmBase = CdmBase.deproxy(cdmBase, clazz);
                CdmEntityCacheKey cacheId = generateKey(cdmBase);
 
                CdmBase cachedCdmEntity = getFromCache(cacheId);
 
                if(cachedCdmEntity == null) {
                        // ... then try the permanent (uuid-based) cache
-                       cachedCdmEntity = cdmServiceCacher.getFromCache(cdmBase.getUuid());             
+                       cachedCdmEntity = cdmServiceCacher.getFromCache(cdmBase.getUuid());
                }
 
                return cachedCdmEntity;
@@ -475,7 +468,7 @@ public class CdmTransientEntityCacher  {
        public boolean existsAndIsNotNull(CdmEntityCacheKey id) {
                return getFromCache(id) != null;
        }
-       
+
        public void dispose() {
                cache.removeAll();
                cache.flush();
similarity index 89%
rename from eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/cache/ICachedCommonService.java
rename to eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/cache/ICachedCommonService.java
index e3952fdf9f244d2031d2cde2a6a2c468b35fe74d..4b06c66a624aaa32db6ce69824fff9ed97b6cb14 100644 (file)
@@ -7,12 +7,12 @@
  * The contents of this file are subject to the Mozilla Public License Version 1.1
  * See LICENSE.TXT at the top of this package for the full license terms.
  */
-package eu.etaxonomy.cdm.api.cache;
+package eu.etaxonomy.taxeditor.remoting.cache;
 
 import org.hibernate.collection.spi.PersistentCollection;
 
-import eu.etaxonomy.cdm.api.cache.CachedCommonServiceImpl.CollectionField;
 import eu.etaxonomy.cdm.model.common.CdmBase;
+import eu.etaxonomy.taxeditor.remoting.cache.CachedCommonServiceImpl.CollectionField;
 
 /**
  * @author cmathew