Adapt ICdmEntitySession to new includeIgnored parameter

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 185cc3f48e2a2300d9252c35ab0cee0686e5227a..76879b2b0d9f33b4a802fe5193bd00cec82b9c36 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
@@ -116,19 +116,19 @@ public class CdmEntitySession implements ICdmEntitySession  {
 
     @Override
     public <T extends CdmBase> EntityCacherDebugResult debug(T cdmBase) {
-        return debug(Arrays.asList(cdmBase));
+        return debug(Arrays.asList(cdmBase), true);
     }
 
     @Override
-    public <T extends CdmBase> eu.etaxonomy.cdm.cache.EntityCacherDebugResult debug(Collection<T> cdmBases) {
+    public <T extends CdmBase> EntityCacherDebugResult debug(Collection<T> rootEntities, boolean includeIgnored) {
         EntityCacherDebugResult entityCacherDebugResult =
-                new EntityCacherDebugResult(cdmTransientEntityCacher, cdmBases);
+                new EntityCacherDebugResult(cdmTransientEntityCacher, rootEntities, includeIgnored);
         return entityCacherDebugResult;
     }
 
     @Override
-    public <T extends CdmBase> EntityCacherDebugResult debug() {
-        return debug(getRootEntities());
+    public <T extends CdmBase> EntityCacherDebugResult debug(boolean includeIgnored) {
+        return debug(getRootEntities(), includeIgnored);
     }
 
     @Override

diff --git a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/ICdmEntitySession.java b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/ICdmEntitySession.java
index 91e9576b57566292a1bed5fcc834a4236c5ce5fb..fdb5166f1e587d07bb39137b5aff9810a276b14a 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/ICdmEntitySession.java
+++ b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/ICdmEntitySession.java
@@ -30,9 +30,9 @@ public interface ICdmEntitySession {
 
        public <T extends CdmBase> EntityCacherDebugResult debug(T cdmBase);
 
-       public <T extends CdmBase> EntityCacherDebugResult debug(Collection<T> cdmBase);
+       public <T extends CdmBase> EntityCacherDebugResult debug(Collection<T> cdmBase, boolean includeIgnored);
 
-       public <T extends CdmBase> EntityCacherDebugResult debug();
+       public <T extends CdmBase> EntityCacherDebugResult debug(boolean includeIgnored);
 
        public <T extends CdmBase> Collection<T> load(Collection<T> cdmBaseList, boolean update);
 

diff --git a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/NullSession.java b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/NullSession.java
index 4b12f0c8d5910a520410060ecb014a99037a6d6a..5f24b119a6ffe7ef0cbb6e999abb8676ee3b31f3 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/NullSession.java
+++ b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/NullSession.java
@@ -23,7 +23,6 @@ import net.sf.ehcache.statistics.LiveCacheStatistics;
 /**
  * @author cmathew
  * @date 30 Jul 2015
- *
  */
 public class NullSession implements ICdmEntitySession {
 
@@ -39,132 +38,83 @@ public class NullSession implements ICdmEntitySession {
         this.sessionOwner = sessionOwner;
     }
 
-    /* (non-Javadoc)
-     * @see eu.etaxonomy.taxeditor.session.ICdmEntitySession#getOwner()
-     */
     @Override
     public ICdmEntitySessionEnabled getOwner() {
         return sessionOwner;
     }
 
-    /* (non-Javadoc)
-     * @see eu.etaxonomy.taxeditor.session.ICdmEntitySession#getCacheStatistics()
-     */
     @Override
     public LiveCacheStatistics getCacheStatistics() {
-        // TODO Auto-generated method stub
         return null;
     }
 
-    /* (non-Javadoc)
-     * @see eu.etaxonomy.taxeditor.session.ICdmEntitySession#load(java.lang.Object, boolean)
-     */
     @Override
     public <O> O load(O obj, boolean update) {
         return obj;
     }
 
-    /* (non-Javadoc)
-     * @see eu.etaxonomy.taxeditor.session.ICdmEntitySession#load(eu.etaxonomy.cdm.model.common.CdmBase, boolean)
-     */
     @Override
     public <T extends CdmBase> T load(T cdmBase, boolean update) {
         return cdmBase;
     }
 
-    /* (non-Javadoc)
-     * @see eu.etaxonomy.taxeditor.session.ICdmEntitySession#load(eu.etaxonomy.cdm.api.service.UpdateResult, boolean)
-     */
     @Override
     public UpdateResult load(UpdateResult updateResult, boolean update) {
         return updateResult;
     }
 
-    /* (non-Javadoc)
-     * @see eu.etaxonomy.taxeditor.session.ICdmEntitySession#debug(eu.etaxonomy.cdm.model.common.CdmBase)
-     */
     @Override
     public <T extends CdmBase> EntityCacherDebugResult debug(T cdmBase) {
         return null;
     }
 
-    /* (non-Javadoc)
-     * @see eu.etaxonomy.taxeditor.session.ICdmEntitySession#debug(java.util.Collection)
-     */
     @Override
-    public <T extends CdmBase> EntityCacherDebugResult debug(Collection<T> cdmBase) {
+    public <T extends CdmBase> EntityCacherDebugResult debug(Collection<T> cdmBase, boolean includeIgnored) {
         return null;
     }
 
-    /* (non-Javadoc)
-     * @see eu.etaxonomy.taxeditor.session.ICdmEntitySession#debug()
-     */
     @Override
-    public <T extends CdmBase> EntityCacherDebugResult debug() {
+    public <T extends CdmBase> EntityCacherDebugResult debug(boolean includeIgnored) {
         return null;
     }
 
-    /* (non-Javadoc)
-     * @see eu.etaxonomy.taxeditor.session.ICdmEntitySession#load(java.util.Collection, boolean)
-     */
     @Override
     public <T extends CdmBase> Collection<T> load(Collection<T> cdmBaseList, boolean update) {
         return cdmBaseList;
     }
 
-    /* (non-Javadoc)
-     * @see eu.etaxonomy.taxeditor.session.ICdmEntitySession#setEntitiesAsLatest()
-     */
     @Override
     public void setEntitiesAsLatest() {
 
     }
 
-    /* (non-Javadoc)
-     * @see eu.etaxonomy.taxeditor.session.ICdmEntitySession#getRootEntities()
-     */
     @Override
     public <T extends CdmBase> Collection<T> getRootEntities() {
         return null;
     }
 
-    /* (non-Javadoc)
-     * @see eu.etaxonomy.taxeditor.session.ICdmEntitySession#dispose()
-     */
     @Override
     public void dispose() {
         cdmEntitySessionManager.remove(sessionOwner);
     }
 
-    /* (non-Javadoc)
-     * @see eu.etaxonomy.taxeditor.session.ICdmEntitySession#bind()
-     */
     @Override
     public void bind() {
         cdmEntitySessionManager.bindNullSession();
     }
 
-    /* (non-Javadoc)
-     * @see eu.etaxonomy.taxeditor.session.ICdmEntitySession#remoteLoad(eu.etaxonomy.cdm.api.service.IService, java.util.UUID)
-     */
     @Override
     public <T extends CdmBase> T remoteLoad(IService<T> service, UUID uuid) {
         T cdmBase = service.load(uuid);
         return load(cdmBase, false);
     }
 
-    /* (non-Javadoc)
-     * @see eu.etaxonomy.taxeditor.session.ICdmEntitySession#remoteLoad(eu.etaxonomy.cdm.api.service.IService, java.util.UUID, java.util.List)
-     */
     @Override
     public <T extends CdmBase> T remoteLoad(IService<T> service, UUID uuid, List<String> propertyPaths) {
         T cdmBase = service.load(uuid, propertyPaths);
         return load(cdmBase, false);
     }
 
-    /* (non-Javadoc)
-     * @see eu.etaxonomy.taxeditor.session.ICdmEntitySession#remoteSave(eu.etaxonomy.cdm.api.service.IService, eu.etaxonomy.cdm.model.common.CdmBase)
-     */
     @Override
     public <T extends CdmBase> UUID remoteSave(IService<T> service, T cdmBase) {
         UUID uuid = service.save(cdmBase).getUuid();
@@ -172,34 +122,22 @@ public class NullSession implements ICdmEntitySession {
         return uuid;
     }
 
-    /* (non-Javadoc)
-     * @see eu.etaxonomy.taxeditor.session.ICdmEntitySession#remoteUpdate(eu.etaxonomy.cdm.api.service.IService, eu.etaxonomy.cdm.model.common.CdmBase)
-     */
     @Override
     public <T extends CdmBase> T remoteUpdate(IService<T> service, T cdmBase) {
         T mergedCdmBase = service.merge(cdmBase, true).getMergedEntity();
         return mergedCdmBase;
     }
 
-    /* (non-Javadoc)
-     * @see eu.etaxonomy.taxeditor.session.ICdmEntitySession#isActive()
-     */
     @Override
     public boolean isActive() {
         return cdmEntitySessionManager.getActiveSession() == this;
     }
 
-    /* (non-Javadoc)
-     * @see eu.etaxonomy.taxeditor.session.ICdmEntitySession#update()
-     */
     @Override
     public <T extends CdmBase> void update() {
 
     }
 
-    /* (non-Javadoc)
-     * @see eu.etaxonomy.taxeditor.session.ICdmEntitySession#getPropertyPaths(java.lang.Object)
-     */
     @Override
     public List<String> getPropertyPaths(Object obj) {
         if(sessionOwner == null) {
@@ -212,18 +150,11 @@ public class NullSession implements ICdmEntitySession {
         return propertyPathsMap.get(obj);
     }
 
-    /* (non-Javadoc)
-     * @see eu.etaxonomy.taxeditor.session.ICdmEntitySession#addNewCdmEntity(eu.etaxonomy.cdm.model.common.CdmBase)
-     */
     @Override
     public void addNewCdmEntity(CdmBase newEntity) {
-        // TODO Auto-generated method stub
 
     }
 
-    /* (non-Javadoc)
-     * @see eu.etaxonomy.taxeditor.session.ICdmEntitySession#load(eu.etaxonomy.cdm.persistence.dto.MergeResult, boolean)
-     */
     @Override
     public <T extends CdmBase> MergeResult<T> load(MergeResult<T> mergeResult, boolean update) {
         return mergeResult;

diff --git a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/mock/MockCdmEntitySession.java b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/mock/MockCdmEntitySession.java
index 2b89d7342ec422ee7fe14cb99d77c83c4373d3f9..64c1bd5ff974570383273284d8411ae5af5f750d 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/mock/MockCdmEntitySession.java
+++ b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/mock/MockCdmEntitySession.java
@@ -101,13 +101,12 @@ public class MockCdmEntitySession implements ICdmEntitySession  {
     }
 
     @Override
-    public <T extends CdmBase> EntityCacherDebugResult debug(Collection<T> cdmBase) {
-
+    public <T extends CdmBase> EntityCacherDebugResult debug(Collection<T> cdmBase, boolean includeIgnored) {
         return null;
     }
 
     @Override
-    public <T extends CdmBase> EntityCacherDebugResult debug() {
+    public <T extends CdmBase> EntityCacherDebugResult debug(boolean includeIgnored) {
         return null;
     }