From: Cherian Mathew Date: Thu, 8 Oct 2015 09:12:39 +0000 (+0200) Subject: Update root entity merge calls to use new merge method. X-Git-Tag: 3.12.0^2~108^2~1 X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/6c95dd3da1111d8eb67ffeeadc42510e3725c056 Update root entity merge calls to use new merge method. --- diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/AgentEditorInput.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/AgentEditorInput.java index cff075cc2..6423cece7 100644 --- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/AgentEditorInput.java +++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/AgentEditorInput.java @@ -148,7 +148,7 @@ public class AgentEditorInput extends AbstractBulkEditorInput @Override public TeamOrPersonBase save(TeamOrPersonBase entity) { if(CdmStore.getCurrentSessionManager().isRemoting()) { - return (TeamOrPersonBase) CdmStore.getService(IAgentService.class).merge(entity, true); + return (TeamOrPersonBase) CdmStore.getService(IAgentService.class).merge(entity, true).getMergedEntity(); } else { CdmStore.getService(IAgentService.class).saveOrUpdate(entity) ; return entity; diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/GroupEditorInput.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/GroupEditorInput.java index 6e44e52f6..008293998 100644 --- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/GroupEditorInput.java +++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/GroupEditorInput.java @@ -63,7 +63,7 @@ public class GroupEditorInput extends AbstractBulkEditorInput { @Override public Group save(Group entity) { if(CdmStore.getCurrentSessionManager().isRemoting()) { - return CdmStore.getService(IGroupService.class).merge(entity, true) ; + return CdmStore.getService(IGroupService.class).merge(entity, true).getMergedEntity(); } else { CdmStore.getService(IGroupService.class).saveOrUpdate(entity); return entity; diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/NameEditorInput.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/NameEditorInput.java index 8b56ea1a8..6116162d2 100644 --- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/NameEditorInput.java +++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/NameEditorInput.java @@ -119,7 +119,7 @@ public class NameEditorInput extends AbstractBulkEditorInput { @Override public TaxonNameBase save(TaxonNameBase entity) { if(CdmStore.getCurrentSessionManager().isRemoting()) { - return CdmStore.getService(INameService.class).merge(entity, true) ; + return CdmStore.getService(INameService.class).merge(entity, true).getMergedEntity(); } else { CdmStore.getService(INameService.class).saveOrUpdate(entity); return entity; diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/OccurrenceEditorInput.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/OccurrenceEditorInput.java index e219a500f..929379d27 100644 --- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/OccurrenceEditorInput.java +++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/OccurrenceEditorInput.java @@ -138,7 +138,7 @@ public class OccurrenceEditorInput extends AbstractBulkEditorInput save(SpecimenOrObservationBase entity) { if(CdmStore.getCurrentSessionManager().isRemoting()) { - return CdmStore.getService(IOccurrenceService.class).merge(entity, true) ; + return CdmStore.getService(IOccurrenceService.class).merge(entity, true).getMergedEntity(); } else { CdmStore.getService(IOccurrenceService.class).save(entity); return entity; diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/ReferenceEditorInput.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/ReferenceEditorInput.java index 32df06a57..8b8c11360 100644 --- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/ReferenceEditorInput.java +++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/ReferenceEditorInput.java @@ -140,7 +140,7 @@ public class ReferenceEditorInput extends AbstractBulkEditorInput { @Override public Reference save(Reference entity) { if(CdmStore.getCurrentSessionManager().isRemoting()) { - return CdmStore.getService(IReferenceService.class).merge(entity, true); + return CdmStore.getService(IReferenceService.class).merge(entity, true).getMergedEntity(); } else { CdmStore.getService(IReferenceService.class).saveOrUpdate(entity); return entity; diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/TaxonEditorInput.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/TaxonEditorInput.java index 4f8473544..aa6dd1537 100644 --- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/TaxonEditorInput.java +++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/TaxonEditorInput.java @@ -72,7 +72,7 @@ public class TaxonEditorInput extends AbstractBulkEditorInput{ @Override public TaxonBase save(TaxonBase entity) { if(CdmStore.getCurrentSessionManager().isRemoting()) { - return CdmStore.getService(ITaxonService.class).merge(entity, true); + return CdmStore.getService(ITaxonService.class).merge(entity, true).getMergedEntity(); } else { CdmStore.getService(ITaxonService.class).saveOrUpdate(entity); return entity; diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/UserEditorInput.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/UserEditorInput.java index bcbff535c..72dd138a4 100644 --- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/UserEditorInput.java +++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/UserEditorInput.java @@ -63,7 +63,7 @@ public class UserEditorInput extends AbstractBulkEditorInput { @Override public User save(User entity) { if(CdmStore.getCurrentSessionManager().isRemoting()) { - return CdmStore.getService(IUserService.class).merge(entity, true); + return CdmStore.getService(IUserService.class).merge(entity, true).getMergedEntity(); } else { CdmStore.getService(IUserService.class).saveOrUpdate(entity); return entity; diff --git a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/service/CdmServiceRequestExecutor.java b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/service/CdmServiceRequestExecutor.java index 8084eac89..fa0a4f14f 100644 --- a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/service/CdmServiceRequestExecutor.java +++ b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/service/CdmServiceRequestExecutor.java @@ -12,6 +12,7 @@ import org.springframework.stereotype.Component; import eu.etaxonomy.cdm.api.application.CdmApplicationRemoteController; import eu.etaxonomy.cdm.api.application.CdmApplicationState; import eu.etaxonomy.cdm.api.service.UpdateResult; +import eu.etaxonomy.cdm.persistence.dto.MergeResult; import eu.etaxonomy.taxeditor.session.ICdmEntitySessionManager; @Component @@ -53,7 +54,13 @@ public class CdmServiceRequestExecutor extends CdmAuthenticatedHttpInvokerReques if("merge".equals(currentRemoteInvocation.getMethodName()) || "save".equals(currentRemoteInvocation.getMethodName()) || "findWithUpdate".equals(currentRemoteInvocation.getMethodName())) { - rir = new RemoteInvocationResult(cdmEntitySessionManager.load(rir.getValue(), true)); + if(rir.getValue() instanceof MergeResult) { + MergeResult result = (MergeResult) rir.getValue(); + cdmEntitySessionManager.load(result.getMergedEntity(), true); + cdmEntitySessionManager.load(result.getNewEntities(), true); + } else { + rir = new RemoteInvocationResult(cdmEntitySessionManager.load(rir.getValue(), true)); + } } else if(rir.getValue() instanceof UpdateResult){ UpdateResult result = (UpdateResult)rir.getValue(); if(result.isOk()){ 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 85c7d33bb..5fdfafa9d 100644 --- 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 @@ -247,7 +247,7 @@ public class CdmEntitySession implements ICdmEntitySession { */ @Override public T remoteUpdate(IService service, T cdmBase) { - T mergedCdmBase = service.merge(cdmBase, true); + T mergedCdmBase = service.merge(cdmBase, true).getMergedEntity(); return mergedCdmBase; } 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 65b8e7c24..615f32a46 100644 --- 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 @@ -177,7 +177,7 @@ public class NullSession implements ICdmEntitySession { */ @Override public T remoteUpdate(IService service, T cdmBase) { - T mergedCdmBase = service.merge(cdmBase, true); + T mergedCdmBase = service.merge(cdmBase, true).getMergedEntity(); return mergedCdmBase; } diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/group/authority/CdmAuthorityEditorInput.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/group/authority/CdmAuthorityEditorInput.java index 59fa37378..fa78b41d8 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/group/authority/CdmAuthorityEditorInput.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/group/authority/CdmAuthorityEditorInput.java @@ -158,7 +158,7 @@ public class CdmAuthorityEditorInput extends CdmEntitySessionInput implements IE @Override public void merge() { if(CdmStore.getCurrentSessionManager().isRemoting()) { - group = CdmStore.getService(IGroupService.class).merge(group, true); + group = CdmStore.getService(IGroupService.class).merge(group, true).getMergedEntity(); } } } diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/PolytomousKeyEditorInput.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/PolytomousKeyEditorInput.java index e76738ff7..7a190f432 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/PolytomousKeyEditorInput.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/PolytomousKeyEditorInput.java @@ -92,7 +92,7 @@ public class PolytomousKeyEditorInput extends AbstractIdentificationEditorInput< @Override public void merge() { if(CdmStore.getCurrentSessionManager().isRemoting()) { - key = CdmStore.getService(IPolytomousKeyService.class).merge(key,true); + key = CdmStore.getService(IPolytomousKeyService.class).merge(key,true).getMergedEntity(); } } diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientAgentService.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientAgentService.java index c128ec4fd..e7b41f28e 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientAgentService.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientAgentService.java @@ -44,6 +44,7 @@ import eu.etaxonomy.cdm.model.media.Rights; import eu.etaxonomy.cdm.model.view.AuditEvent; import eu.etaxonomy.cdm.model.view.AuditEventRecord; import eu.etaxonomy.cdm.persistence.dao.common.AuditEventSort; +import eu.etaxonomy.cdm.persistence.dto.MergeResult; import eu.etaxonomy.cdm.persistence.dto.UuidAndTitleCache; import eu.etaxonomy.cdm.persistence.query.Grouping; import eu.etaxonomy.cdm.persistence.query.MatchMode; @@ -793,19 +794,21 @@ public class TransientAgentService implements IAgentService { } /* (non-Javadoc) - * @see eu.etaxonomy.cdm.api.service.IService#merge(eu.etaxonomy.cdm.model.common.ICdmBase, boolean) + * @see eu.etaxonomy.cdm.api.service.IService#merge(java.util.List, boolean) */ @Override - public AgentBase merge(AgentBase arg0, boolean arg1) { + public List> merge(List arg0, boolean arg1) { return defaultService.merge(arg0, arg1); } /* (non-Javadoc) - * @see eu.etaxonomy.cdm.api.service.IService#merge(java.util.List, boolean) + * @see eu.etaxonomy.cdm.api.service.IService#merge(eu.etaxonomy.cdm.model.common.ICdmBase, boolean) */ @Override - public List merge(List arg0, boolean arg1) { - return defaultService.merge(arg0, arg1); + public MergeResult merge(AgentBase arg0, boolean arg1) { + return defaultService.merge(arg0, arg1); } + + } diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientClassificationService.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientClassificationService.java index 426d05d1c..2a2f6f72c 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientClassificationService.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientClassificationService.java @@ -46,6 +46,7 @@ import eu.etaxonomy.cdm.model.taxon.TaxonNode; import eu.etaxonomy.cdm.model.view.AuditEvent; import eu.etaxonomy.cdm.model.view.AuditEventRecord; import eu.etaxonomy.cdm.persistence.dao.common.AuditEventSort; +import eu.etaxonomy.cdm.persistence.dto.MergeResult; import eu.etaxonomy.cdm.persistence.dto.UuidAndTitleCache; import eu.etaxonomy.cdm.persistence.query.Grouping; import eu.etaxonomy.cdm.persistence.query.MatchMode; @@ -951,21 +952,20 @@ public class TransientClassificationService implements IClassificationService { } /* (non-Javadoc) - * @see eu.etaxonomy.cdm.api.service.IService#merge(eu.etaxonomy.cdm.model.common.ICdmBase, boolean) + * @see eu.etaxonomy.cdm.api.service.IService#merge(java.util.List, boolean) */ @Override - public Classification merge(Classification arg0, boolean arg1) { + public List> merge(List arg0, boolean arg1) { return defaultService.merge(arg0, arg1); } /* (non-Javadoc) - * @see eu.etaxonomy.cdm.api.service.IService#merge(java.util.List, boolean) + * @see eu.etaxonomy.cdm.api.service.IService#merge(eu.etaxonomy.cdm.model.common.ICdmBase, boolean) */ @Override - public List merge(List arg0, boolean arg1) { + public MergeResult merge(Classification arg0, boolean arg1) { return defaultService.merge(arg0, arg1); } - } diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientCollectionService.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientCollectionService.java index 6ff656705..b1154d517 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientCollectionService.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientCollectionService.java @@ -38,6 +38,7 @@ import eu.etaxonomy.cdm.model.occurrence.Collection; import eu.etaxonomy.cdm.model.view.AuditEvent; import eu.etaxonomy.cdm.model.view.AuditEventRecord; import eu.etaxonomy.cdm.persistence.dao.common.AuditEventSort; +import eu.etaxonomy.cdm.persistence.dto.MergeResult; import eu.etaxonomy.cdm.persistence.dto.UuidAndTitleCache; import eu.etaxonomy.cdm.persistence.query.Grouping; import eu.etaxonomy.cdm.persistence.query.MatchMode; @@ -727,19 +728,20 @@ public class TransientCollectionService implements ICollectionService { } /* (non-Javadoc) - * @see eu.etaxonomy.cdm.api.service.IService#merge(eu.etaxonomy.cdm.model.common.ICdmBase, boolean) + * @see eu.etaxonomy.cdm.api.service.IService#merge(java.util.List, boolean) */ @Override - public Collection merge(Collection arg0, boolean arg1) { + public List> merge(List arg0, boolean arg1) { return defaultService.merge(arg0, arg1); } /* (non-Javadoc) - * @see eu.etaxonomy.cdm.api.service.IService#merge(java.util.List, boolean) + * @see eu.etaxonomy.cdm.api.service.IService#merge(eu.etaxonomy.cdm.model.common.ICdmBase, boolean) */ @Override - public List merge(List arg0, boolean arg1) { + public MergeResult merge(Collection arg0, boolean arg1) { return defaultService.merge(arg0, arg1); } + } diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientDescriptionService.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientDescriptionService.java index 62291f364..3a7df7f38 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientDescriptionService.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientDescriptionService.java @@ -54,6 +54,7 @@ import eu.etaxonomy.cdm.model.taxon.Taxon; import eu.etaxonomy.cdm.model.view.AuditEvent; import eu.etaxonomy.cdm.model.view.AuditEventRecord; import eu.etaxonomy.cdm.persistence.dao.common.AuditEventSort; +import eu.etaxonomy.cdm.persistence.dto.MergeResult; import eu.etaxonomy.cdm.persistence.dto.TermDto; import eu.etaxonomy.cdm.persistence.dto.UuidAndTitleCache; import eu.etaxonomy.cdm.persistence.query.Grouping; @@ -1197,25 +1198,21 @@ public class TransientDescriptionService implements IDescriptionService { } /* (non-Javadoc) - * @see eu.etaxonomy.cdm.api.service.IService#merge(eu.etaxonomy.cdm.model.common.ICdmBase, boolean) + * @see eu.etaxonomy.cdm.api.service.IService#merge(java.util.List, boolean) */ @Override - public DescriptionBase merge(DescriptionBase arg0, boolean arg1) { + public List> merge(List arg0, boolean arg1) { return defaultService.merge(arg0, arg1); } /* (non-Javadoc) - * @see eu.etaxonomy.cdm.api.service.IService#merge(java.util.List, boolean) + * @see eu.etaxonomy.cdm.api.service.IService#merge(eu.etaxonomy.cdm.model.common.ICdmBase, boolean) */ @Override - public List merge(List arg0, boolean arg1) { - + public MergeResult merge(DescriptionBase arg0, boolean arg1) { return defaultService.merge(arg0, arg1); } - - - } diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientNameService.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientNameService.java index 6e112f58e..731c43f76 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientNameService.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientNameService.java @@ -63,6 +63,7 @@ import eu.etaxonomy.cdm.model.name.TypeDesignationBase; import eu.etaxonomy.cdm.model.view.AuditEvent; import eu.etaxonomy.cdm.model.view.AuditEventRecord; import eu.etaxonomy.cdm.persistence.dao.common.AuditEventSort; +import eu.etaxonomy.cdm.persistence.dto.MergeResult; import eu.etaxonomy.cdm.persistence.dto.UuidAndTitleCache; import eu.etaxonomy.cdm.persistence.query.Grouping; import eu.etaxonomy.cdm.persistence.query.MatchMode; @@ -1199,18 +1200,19 @@ public class TransientNameService implements INameService { } /* (non-Javadoc) - * @see eu.etaxonomy.cdm.api.service.IService#merge(eu.etaxonomy.cdm.model.common.ICdmBase, boolean) + * @see eu.etaxonomy.cdm.api.service.IService#merge(java.util.List, boolean) */ @Override - public TaxonNameBase merge(TaxonNameBase arg0, boolean arg1) { + public List> merge(List arg0, boolean arg1) { return defaultService.merge(arg0, arg1); } /* (non-Javadoc) - * @see eu.etaxonomy.cdm.api.service.IService#merge(java.util.List, boolean) + * @see eu.etaxonomy.cdm.api.service.IService#merge(eu.etaxonomy.cdm.model.common.ICdmBase, boolean) */ @Override - public List merge(List arg0, boolean arg1) { + public MergeResult merge(TaxonNameBase arg0, boolean arg1) { return defaultService.merge(arg0, arg1); } + } diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientOccurenceService.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientOccurenceService.java index 6d2bdc085..64dded36b 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientOccurenceService.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientOccurenceService.java @@ -70,6 +70,7 @@ import eu.etaxonomy.cdm.model.taxon.TaxonBase; import eu.etaxonomy.cdm.model.view.AuditEvent; import eu.etaxonomy.cdm.model.view.AuditEventRecord; import eu.etaxonomy.cdm.persistence.dao.common.AuditEventSort; +import eu.etaxonomy.cdm.persistence.dto.MergeResult; import eu.etaxonomy.cdm.persistence.dto.UuidAndTitleCache; import eu.etaxonomy.cdm.persistence.query.Grouping; import eu.etaxonomy.cdm.persistence.query.MatchMode; @@ -1053,27 +1054,26 @@ public class TransientOccurenceService implements IOccurrenceService { return defaultService.moveSequence(arg0, arg1, arg2); } - /* (non-Javadoc) - * @see eu.etaxonomy.cdm.api.service.IService#merge(eu.etaxonomy.cdm.model.common.ICdmBase, boolean) - */ @Override - public SpecimenOrObservationBase merge(SpecimenOrObservationBase arg0, boolean arg1) { - return defaultService.merge(arg0, arg1); + public Pager getMediainHierarchy(SpecimenOrObservationBase arg0, Integer arg1, Integer arg2, + List arg3) { + return defaultService.getMediainHierarchy(arg0, arg1, arg2, arg3); } /* (non-Javadoc) * @see eu.etaxonomy.cdm.api.service.IService#merge(java.util.List, boolean) */ @Override - public List merge(List arg0, boolean arg1) { + public List> merge(List arg0, boolean arg1) { return defaultService.merge(arg0, arg1); } + /* (non-Javadoc) + * @see eu.etaxonomy.cdm.api.service.IService#merge(eu.etaxonomy.cdm.model.common.ICdmBase, boolean) + */ @Override - public Pager getMediainHierarchy(SpecimenOrObservationBase arg0, Integer arg1, Integer arg2, - List arg3) { - // TODO Auto-generated method stub - return null; + public MergeResult merge(SpecimenOrObservationBase arg0, boolean arg1) { + return defaultService.merge(arg0, arg1); } /** diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientReferenceService.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientReferenceService.java index 48192e404..cb5c3b832 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientReferenceService.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientReferenceService.java @@ -40,6 +40,7 @@ import eu.etaxonomy.cdm.model.taxon.TaxonBase; import eu.etaxonomy.cdm.model.view.AuditEvent; import eu.etaxonomy.cdm.model.view.AuditEventRecord; import eu.etaxonomy.cdm.persistence.dao.common.AuditEventSort; +import eu.etaxonomy.cdm.persistence.dto.MergeResult; import eu.etaxonomy.cdm.persistence.dto.UuidAndTitleCache; import eu.etaxonomy.cdm.persistence.query.Grouping; import eu.etaxonomy.cdm.persistence.query.MatchMode; @@ -735,18 +736,20 @@ public class TransientReferenceService implements IReferenceService { } /* (non-Javadoc) - * @see eu.etaxonomy.cdm.api.service.IService#merge(eu.etaxonomy.cdm.model.common.ICdmBase, boolean) + * @see eu.etaxonomy.cdm.api.service.IService#merge(java.util.List, boolean) */ @Override - public Reference merge(Reference arg0, boolean arg1) { + public List> merge(List arg0, boolean arg1) { return defaultService.merge(arg0, arg1); } /* (non-Javadoc) - * @see eu.etaxonomy.cdm.api.service.IService#merge(java.util.List, boolean) + * @see eu.etaxonomy.cdm.api.service.IService#merge(eu.etaxonomy.cdm.model.common.ICdmBase, boolean) */ @Override - public List merge(List arg0, boolean arg1) { + public MergeResult merge(Reference arg0, boolean arg1) { return defaultService.merge(arg0, arg1); } + + } diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTaxonService.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTaxonService.java index b79f17f12..0ae7529f1 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTaxonService.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTaxonService.java @@ -79,6 +79,7 @@ import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType; import eu.etaxonomy.cdm.model.view.AuditEvent; import eu.etaxonomy.cdm.model.view.AuditEventRecord; import eu.etaxonomy.cdm.persistence.dao.common.AuditEventSort; +import eu.etaxonomy.cdm.persistence.dto.MergeResult; import eu.etaxonomy.cdm.persistence.dto.UuidAndTitleCache; import eu.etaxonomy.cdm.persistence.fetch.CdmFetch; import eu.etaxonomy.cdm.persistence.query.Grouping; @@ -1526,19 +1527,20 @@ public class TransientTaxonService implements ITaxonService { } /* (non-Javadoc) - * @see eu.etaxonomy.cdm.api.service.IService#merge(eu.etaxonomy.cdm.model.common.ICdmBase, boolean) + * @see eu.etaxonomy.cdm.api.service.IService#merge(java.util.List, boolean) */ @Override - public TaxonBase merge(TaxonBase arg0, boolean arg1) { + public List> merge(List arg0, boolean arg1) { return defaultService.merge(arg0, arg1); } /* (non-Javadoc) - * @see eu.etaxonomy.cdm.api.service.IService#merge(java.util.List, boolean) + * @see eu.etaxonomy.cdm.api.service.IService#merge(eu.etaxonomy.cdm.model.common.ICdmBase, boolean) */ @Override - public List merge(List arg0, boolean arg1) { + public MergeResult merge(TaxonBase arg0, boolean arg1) { return defaultService.merge(arg0, arg1); } + } diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTermService.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTermService.java index 3df4f2529..8e00b016f 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTermService.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTermService.java @@ -52,6 +52,7 @@ import eu.etaxonomy.cdm.model.media.Rights; import eu.etaxonomy.cdm.model.view.AuditEvent; import eu.etaxonomy.cdm.model.view.AuditEventRecord; import eu.etaxonomy.cdm.persistence.dao.common.AuditEventSort; +import eu.etaxonomy.cdm.persistence.dto.MergeResult; import eu.etaxonomy.cdm.persistence.dto.UuidAndTitleCache; import eu.etaxonomy.cdm.persistence.query.Grouping; import eu.etaxonomy.cdm.persistence.query.MatchMode; @@ -905,18 +906,19 @@ public class TransientTermService implements ITermService { } /* (non-Javadoc) - * @see eu.etaxonomy.cdm.api.service.IService#merge(eu.etaxonomy.cdm.model.common.ICdmBase, boolean) + * @see eu.etaxonomy.cdm.api.service.IService#merge(java.util.List, boolean) */ @Override - public DefinedTermBase merge(DefinedTermBase arg0, boolean arg1) { + public List> merge(List arg0, boolean arg1) { return defaultService.merge(arg0, arg1); } /* (non-Javadoc) - * @see eu.etaxonomy.cdm.api.service.IService#merge(java.util.List, boolean) + * @see eu.etaxonomy.cdm.api.service.IService#merge(eu.etaxonomy.cdm.model.common.ICdmBase, boolean) */ @Override - public List merge(List arg0, boolean arg1) { + public MergeResult merge(DefinedTermBase arg0, boolean arg1) { return defaultService.merge(arg0, arg1); } + } diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateViewEditorInput.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateViewEditorInput.java index f0d3afe2d..198b15a0f 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateViewEditorInput.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateViewEditorInput.java @@ -238,7 +238,7 @@ public class DerivateViewEditorInput extends CdmEntitySessionInput implements IE @Override public void merge() { if(CdmStore.getCurrentSessionManager().isRemoting()) { - List mergedEntities = CdmApplicationState.getCurrentAppConfig().getOccurrenceService().merge(new ArrayList(getRootEntities()), true); + CdmApplicationState.getCurrentAppConfig().getOccurrenceService().merge(new ArrayList(getRootEntities()), true); } } diff --git a/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/operation/TaxonNameEditorTest.java b/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/operation/TaxonNameEditorTest.java index 57aa4c410..baafa0718 100644 --- a/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/operation/TaxonNameEditorTest.java +++ b/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/operation/TaxonNameEditorTest.java @@ -193,11 +193,19 @@ public class TaxonNameEditorTest extends BaseOperationTest { Taxon grandChildTaxon = Taxon.NewInstance(null, null); TaxonNode grandChildTaxonNode = childTaxonNode.addChildTaxon(grandChildTaxon, null, null); - CdmStore.getService(ITaxonNodeService.class).merge(taxonNode, true); + + CdmStore.getService(ITaxonNodeService.class).merge(taxonNode,true); Assert.assertEquals(taxonNode.getChildNodes().get(0).getId(), childTaxonNode.getId()); + + Assert.assertTrue(childTaxonNode.treeIndex() != null); + Assert.assertEquals(taxonNode.getChildNodes().get(0).treeIndex(), childTaxonNode.treeIndex()); + Assert.assertFalse(childTaxon.getId() == 0); Assert.assertEquals(taxonNode.getChildNodes().get(0).getTaxon().getId(), childTaxon.getId()); + + Assert.assertTrue(grandChildTaxonNode.treeIndex() != null); Assert.assertEquals(taxonNode.getChildNodes().get(0).getChildNodes().get(0).getId(), grandChildTaxonNode.getId()); + Assert.assertFalse(grandChildTaxon.getId() == 0); Assert.assertEquals(taxonNode.getChildNodes().get(0).getChildNodes().get(0).getTaxon().getId(), grandChildTaxon.getId()); } diff --git a/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/session/CdmEntitySessionAwareTest.java b/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/session/CdmEntitySessionAwareTest.java index 82b9e94d1..842db316f 100644 --- a/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/session/CdmEntitySessionAwareTest.java +++ b/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/session/CdmEntitySessionAwareTest.java @@ -175,12 +175,12 @@ public class CdmEntitySessionAwareTest extends RemotingSessionAwareTest { PolytomousKeyNode grandChildNode = PolytomousKeyNode.NewInstance(); rootChildNode.addChild(grandChildNode); - pKey = polytomousKeyService.merge(pKey, true); + polytomousKeyService.merge(pKey, true); grandChildNode = pKey.getRoot().getChildAt(0).getChildAt(0); Assert.assertTrue(0 != grandChildNode.getId()); KeyStatement ks = KeyStatement.NewInstance("test"); grandChildNode.setStatement(ks); - pKey = polytomousKeyService.merge(pKey, true); + polytomousKeyService.merge(pKey, true); //grandChildNode = pKey.getRoot().getChildAt(0).getChildAt(0); //KeyStatement ks = grandChildNode.getStatement();