refactoring due to change in cache package name

diff --git a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationRemoteConfiguration.java b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationRemoteConfiguration.java
index 7de578e929398cd26df62aa9ede1728f44d77f84..fbbb8e5afedce70e297aa830d0ca779ff5415a48 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationRemoteConfiguration.java
+++ b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationRemoteConfiguration.java
@@ -18,10 +18,10 @@ import org.springframework.stereotype.Component;
 import org.springframework.transaction.PlatformTransactionManager;\r
 import org.springframework.transaction.TransactionStatus;\r
 \r
-import eu.etaxonomy.cdm.api.cache.ICachedCommonService;\r
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;\r
 import eu.etaxonomy.cdm.api.conversation.ConversationHolderMock;\r
 import eu.etaxonomy.cdm.ext.geo.IEditGeoService;\r
+import eu.etaxonomy.taxeditor.remoting.cache.ICachedCommonService;\r
 import eu.etaxonomy.taxeditor.session.ICdmEntitySessionManager;\r
 \r
 \r

diff --git a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationRemoteController.java b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationRemoteController.java
index c5cbdd058ee22b73dc2dd3754e13f371c274eb66..f3abb5b7d84711f442550c5ba6594c3ad751b676 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationRemoteController.java
+++ b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationRemoteController.java
@@ -27,10 +27,10 @@ import org.springframework.core.io.Resource;
 import eu.etaxonomy.cdm.api.application.CdmApplicationController;
 import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration;
 import eu.etaxonomy.cdm.api.application.RemotingMonitoredGenericApplicationContext;
-import eu.etaxonomy.cdm.api.cache.CdmModelCacher;
 import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;
 import eu.etaxonomy.cdm.common.monitor.NullProgressMonitor;
 import eu.etaxonomy.cdm.common.monitor.SubProgressMonitor;
+import eu.etaxonomy.taxeditor.remoting.cache.CdmModelCacher;
 import eu.etaxonomy.taxeditor.remoting.source.ICdmRemoteSource;
 import eu.etaxonomy.taxeditor.session.CdmEntitySessionManager;
 import eu.etaxonomy.taxeditor.session.ICdmEntitySessionManager;

diff --git a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/CdmEntitySession.java b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/CdmEntitySession.java
index d51698857fb47c9935894775ed9f7fb119fd8634..cb710533885954243cf62a6b0bdcb3f181e08c2d 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/CdmEntitySession.java
+++ b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/CdmEntitySession.java
@@ -13,14 +13,8 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import eu.etaxonomy.cdm.api.cache.CdmTransientEntityCacher;
-import eu.etaxonomy.cdm.api.service.ICommonService;
-import eu.etaxonomy.cdm.api.service.IService;
 import eu.etaxonomy.cdm.model.common.CdmBase;
-import eu.etaxonomy.cdm.model.common.OriginalSourceBase;
+import eu.etaxonomy.taxeditor.remoting.cache.CdmTransientEntityCacher;
 
 
 /**
@@ -31,30 +25,30 @@ import eu.etaxonomy.cdm.model.common.OriginalSourceBase;
 
 public class CdmEntitySession<T extends CdmBase> implements ICdmEntitySession<T>  {
 
-    
+
        private CdmEntitySessionManager cdmEntitySessionManager;
-       
-       private ISessionEventListener sessionOwner;
-               
-       private CdmTransientEntityCacher cdmTransientEntityCacher;      
-       
-       private List<T> rootEntities;
-       
+
+       private final ISessionEventListener sessionOwner;
+
+       private final CdmTransientEntityCacher cdmTransientEntityCacher;
+
+       private final List<T> rootEntities;
+
        CdmEntitySession(ISessionEventListener sessionOwner, CdmEntitySessionManager cdmEntitySessionManager) {
                this.sessionOwner = sessionOwner;
                this.cdmTransientEntityCacher = new CdmTransientEntityCacher(sessionOwner, cdmEntitySessionManager);
                this.rootEntities = new ArrayList<T>();
-               
+
                cdmEntitySessionManager.addToOwnerSessionMap(sessionOwner, this);
        }
 
-       
+
        /* (non-Javadoc)
         * @see eu.etaxonomy.taxeditor.session.ICdmEntitySession#load(T)
         */
        @Override
-       public <T extends Object> T load(T obj) {               
-               return (T) cdmTransientEntityCacher.load(obj,true);
+       public <T extends Object> T load(T obj) {
+               return cdmTransientEntityCacher.load(obj,true);
        }
 
 
@@ -62,7 +56,7 @@ public class CdmEntitySession<T extends CdmBase> implements ICdmEntitySession<T>
         * @see eu.etaxonomy.taxeditor.session.ICdmEntitySession#load(T)
         */
        @Override
-       public <T extends CdmBase> T load(T cdmBase) {          
+       public <T extends CdmBase> T load(T cdmBase) {
                return (T)cdmTransientEntityCacher.load(cdmBase,true);
        }
 
@@ -71,22 +65,23 @@ public class CdmEntitySession<T extends CdmBase> implements ICdmEntitySession<T>
         */
        @Override
        public <T extends CdmBase> Collection<T> load(Collection<T> cdmBaseList) {
-               
+
                return cdmTransientEntityCacher.load(cdmBaseList,true);
        }
-       
+
        /* (non-Javadoc)
         * @see eu.etaxonomy.taxeditor.session.ICdmEntitySession#setEntitiesAsLatest()
         */
        @Override
        public void setEntitiesAsLatest() {
-               List<CdmBase> entities = cdmTransientEntityCacher.getAllEntities();
-               for(CdmBase entity : entities) {
-                       cdmEntitySessionManager.setEntityAsLatest(entity);
-               }
+           //FIXME:Remoting need to think more about whether we really need this
+//             List<CdmBase> entities = cdmTransientEntityCacher.getAllEntities();
+//             for(CdmBase entity : entities) {
+//                     cdmEntitySessionManager.setEntityAsLatest(entity);
+//             }
        }
-       
-       
+
+
        /* (non-Javadoc)
         * @see eu.etaxonomy.taxeditor.session.ICdmEntitySession#dispose()
         */
@@ -95,7 +90,7 @@ public class CdmEntitySession<T extends CdmBase> implements ICdmEntitySession<T>
                rootEntities.clear();
                cdmTransientEntityCacher.dispose();
        }
-               
-       
+
+
 
 }

diff --git a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/CdmEntitySessionManager.java b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/CdmEntitySessionManager.java
index 1ede0f803507402198ba198bce79e097076a7ebc..09db9858a6c847c3659cc1723625cd7ca0bbf800 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/CdmEntitySessionManager.java
+++ b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/CdmEntitySessionManager.java
@@ -16,7 +16,6 @@ import java.util.Map;
 import org.apache.log4j.Logger;
 import org.springframework.stereotype.Component;
 
-import eu.etaxonomy.cdm.api.cache.CdmTransientEntityCacher;
 import eu.etaxonomy.cdm.model.common.CdmBase;
 
 /**
@@ -24,36 +23,34 @@ import eu.etaxonomy.cdm.model.common.CdmBase;
  * @date 16 Oct 2014
  *
  */
-@Component("cdmEntitySessionManager")
+@Component
 public class CdmEntitySessionManager implements ICdmEntitySessionManager {
        private static final Logger logger = Logger.getLogger(CdmEntitySessionManager.class);
 
-    private Map<ISessionEventListener, CdmEntitySession> ownerSessionMap = 
+    private final Map<ISessionEventListener, CdmEntitySession> ownerSessionMap =
                new HashMap<ISessionEventListener, CdmEntitySession>();
-    
-//    private HashMap<String, HashSet<CdmClientBase<T>>> entitiesMap = 
-//             new HashMap<String, HashSet<CdmClientBase<T>>>();
-    
-    private CdmTransientEntityCacher latestEntityCacher =
-               new CdmTransientEntityCacher("latestEntityCacher", this);
-    
+
+
     private ICdmEntitySession activeSession;
 
-   
-       
+
+    public CdmEntitySessionManager() {
+
+    }
+
        private ICdmEntitySession newSession(ISessionEventListener sessionOwner, boolean setAsActive) {
                CdmEntitySession session = ownerSessionMap.get(sessionOwner);
-               if(session == null) {           
+               if(session == null) {
                        session = new CdmEntitySession(sessionOwner, this);
                        addToOwnerSessionMap(sessionOwner, session);
                }
-               
+
                if(setAsActive) {
                        activeSession = session;
-               }               
+               }
                return session;
        }
-       
+
        /* (non-Javadoc)
         * @see eu.etaxonomy.taxeditor.session.ICdmEntitySessionManager#bind(eu.etaxonomy.taxeditor.session.ISessionEventListener)
         */
@@ -69,16 +66,16 @@ public class CdmEntitySessionManager implements ICdmEntitySessionManager {
                }
                activeSession = session;
        }
-       
+
        /* (non-Javadoc)
         * @see eu.etaxonomy.taxeditor.session.ICdmEntitySessionManager#load(eu.etaxonomy.taxeditor.session.ISessionEventListener, T)
         */
        @Override
        public <T extends Object> T load(ISessionEventListener sessionOwner, T obj) {
-               ICdmEntitySession session = newSession(sessionOwner,true);              
+               ICdmEntitySession session = newSession(sessionOwner,true);
                return (T) session.load(obj);
        }
-       
+
        /* (non-Javadoc)
         * @see eu.etaxonomy.taxeditor.session.ICdmEntitySessionManager#load(T)
         */
@@ -99,7 +96,7 @@ public class CdmEntitySessionManager implements ICdmEntitySessionManager {
                ICdmEntitySession session = newSession(sessionOwner,true);
                return (T)session.load(cdmBase);
        }
-       
+
        /* (non-Javadoc)
         * @see eu.etaxonomy.taxeditor.session.ICdmEntitySessionManager#load(T)
         */
@@ -110,7 +107,7 @@ public class CdmEntitySessionManager implements ICdmEntitySessionManager {
                }
                return (T)activeSession.load(cdmBase);
        }
-       
+
 
        /* (non-Javadoc)
         * @see eu.etaxonomy.taxeditor.session.ICdmEntitySessionManager#load(eu.etaxonomy.taxeditor.session.ISessionEventListener, java.util.Collection)
@@ -120,8 +117,8 @@ public class CdmEntitySessionManager implements ICdmEntitySessionManager {
                ICdmEntitySession session = newSession(sessionOwner,true);
                return session.load(cdmBaseList);
        }
-       
-       
+
+
        /* (non-Javadoc)
         * @see eu.etaxonomy.taxeditor.session.ICdmEntitySessionManager#load(java.util.Collection)
         */
@@ -133,7 +130,7 @@ public class CdmEntitySessionManager implements ICdmEntitySessionManager {
                return activeSession.load(cdmBaseList);
        }
 
-       
+
        /* (non-Javadoc)
         * @see eu.etaxonomy.taxeditor.session.ICdmEntitySessionManager#dispose(eu.etaxonomy.taxeditor.session.ISessionEventListener)
         */
@@ -144,23 +141,12 @@ public class CdmEntitySessionManager implements ICdmEntitySessionManager {
                        logger.info("No Session connected to owner, nothing to dispose");
                        return;
                }
-               session.dispose();      
+               session.dispose();
        }
-       
+
         void addToOwnerSessionMap(ISessionEventListener owner, CdmEntitySession session) {
                ownerSessionMap.put(owner, session);
        }
-       
 
-       void setEntityAsLatest(CdmBase cdmBase) {               
-               latestEntityCacher.put(cdmBase);
-       }
-       
-       void promoteSessionEntitiesToLatest(ISessionEventListener owner) {
-               ICdmEntitySession session = ownerSessionMap.get(owner);
-               if(session != null) {
-                       session.setEntitiesAsLatest();
-               }
-       }
 
 }

diff --git a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/mock/MockCdmEntitySessionManager.java b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/mock/MockCdmEntitySessionManager.java
index d84b6ce6092b9f7a93a94cc7ac243239f0d28d7b..db9fcdbe9bf1aa28899a2ba6168e49e588dd48a1 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/mock/MockCdmEntitySessionManager.java
+++ b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/mock/MockCdmEntitySessionManager.java
@@ -2,11 +2,7 @@ package eu.etaxonomy.taxeditor.session.mock;
 
 import java.util.Collection;
 
-import org.springframework.stereotype.Component;
-
-import eu.etaxonomy.cdm.api.service.IService;
 import eu.etaxonomy.cdm.model.common.CdmBase;
-import eu.etaxonomy.taxeditor.session.ICdmEntitySession;
 import eu.etaxonomy.taxeditor.session.ICdmEntitySessionManager;
 import eu.etaxonomy.taxeditor.session.ISessionEventListener;
 
@@ -15,7 +11,7 @@ public class MockCdmEntitySessionManager implements ICdmEntitySessionManager {
 
 
        @Override
-       public void bind(ISessionEventListener sessionOwner) {          
+       public void bind(ISessionEventListener sessionOwner) {
        }
 
        @Override
@@ -52,7 +48,7 @@ public class MockCdmEntitySessionManager implements ICdmEntitySessionManager {
 
        @Override
        public void dispose(ISessionEventListener owner) {
-               
+
        }
 
 }

diff --git a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/org/hibernate/collection/internal/AbstractPersistentCollection.java b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/org/hibernate/collection/internal/AbstractPersistentCollection.java
index 273b2b4133c5041fb0033592431e62740428a3e4..47ab7b713cdacd24fc9b92159b17d7568b877cfe 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/org/hibernate/collection/internal/AbstractPersistentCollection.java
+++ b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/org/hibernate/collection/internal/AbstractPersistentCollection.java
@@ -60,9 +60,9 @@ import org.hibernate.type.Type;
 import org.jboss.logging.Logger;
 
 import eu.etaxonomy.cdm.api.application.CdmApplicationRemoteConfiguration;
-import eu.etaxonomy.cdm.api.cache.CachedCommonServiceImpl.CollectionField;
-import eu.etaxonomy.cdm.api.cache.ICachedCommonService;
 import eu.etaxonomy.taxeditor.remoting.CdmEagerLoadingException;
+import eu.etaxonomy.taxeditor.remoting.cache.ICachedCommonService;
+import eu.etaxonomy.taxeditor.remoting.cache.CachedCommonServiceImpl.CollectionField;
 
 /**
  * Base class implementing {@link org.hibernate.collection.spi.PersistentCollection}

diff --git a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/org/hibernate/proxy/AbstractLazyInitializer.java b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/org/hibernate/proxy/AbstractLazyInitializer.java
index 5c11354536e5fb33d842e6d8cffec2fe6893dd04..108bbec5ce408fb5a2ebef4fe8db6eb2830cf8a6 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/org/hibernate/proxy/AbstractLazyInitializer.java
+++ b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/org/hibernate/proxy/AbstractLazyInitializer.java
@@ -40,8 +40,8 @@ import org.hibernate.persister.entity.EntityPersister;
 import org.jboss.logging.Logger;
 
 import eu.etaxonomy.cdm.api.application.CdmApplicationRemoteConfiguration;
-import eu.etaxonomy.cdm.api.cache.ICachedCommonService;
 import eu.etaxonomy.cdm.model.common.CdmBase;
+import eu.etaxonomy.taxeditor.remoting.cache.ICachedCommonService;
 
 /**
  * Convenience base class for lazy initialization handlers.  Centralizes the basic plumbing of doing lazy