From 79e8baa5bf5ebf288a5cbffdf18817a30fb954d9 Mon Sep 17 00:00:00 2001 From: Patrick Plitzner Date: Mon, 15 Jun 2015 16:11:56 +0200 Subject: [PATCH] - added transient service methods --- .../TransientAgentService.java | 10 +++- .../TransientClassificationService.java | 8 +++ .../TransientCollectionService.java | 8 +++ .../TransientDescriptionService.java | 54 +++++++++++++++++-- .../TransientNameService.java | 33 +++++++++--- .../TransientOccurenceService.java | 8 +++ .../TransientReferenceService.java | 12 ++++- .../TransientTaxonService.java | 36 +++++++++++-- .../TransientTermService.java | 10 +++- 9 files changed, 159 insertions(+), 20 deletions(-) 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 a604e1bbd..6f93cf255 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 @@ -60,7 +60,7 @@ import eu.etaxonomy.cdm.strategy.merge.MergeException; */ public class TransientAgentService implements IAgentService { - private IAgentService defaultService; + private final IAgentService defaultService; /** * @param defaultAgentService @@ -770,4 +770,12 @@ public class TransientAgentService implements IAgentService { return defaultService.convertTeam2Person(arg0); } + /** + * {@inheritDoc} + */ + @Override + public DeleteResult delete(UUID arg0) { + return defaultService.delete(arg0); + } + } 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 5e33668e5..7cee4d85b 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 @@ -70,6 +70,14 @@ public class TransientClassificationService implements IClassificationService { this.defaultService = defaultClassificationService; } + /** + * {@inheritDoc} + */ + @Override + public DeleteResult delete(UUID arg0) { + return defaultService.delete(arg0); + } + /** * @param t * @param pageSize 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 310c39c99..7d22b8e0c 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 @@ -55,6 +55,14 @@ public class TransientCollectionService implements ICollectionService { private final ICollectionService defaultService; + /** + * {@inheritDoc} + */ + @Override + public DeleteResult delete(UUID arg0) { + return defaultService.delete(arg0); + } + /* (non-Javadoc) * @see eu.etaxonomy.cdm.api.service.IService#save(eu.etaxonomy.cdm.model.common.ICdmBase) */ 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 f804d48ef..ff2cdc1e3 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 @@ -23,6 +23,7 @@ import org.hibernate.envers.query.criteria.AuditCriterion; import eu.etaxonomy.cdm.api.service.DeleteResult; import eu.etaxonomy.cdm.api.service.DistributionTree; import eu.etaxonomy.cdm.api.service.IDescriptionService; +import eu.etaxonomy.cdm.api.service.UpdateResult; import eu.etaxonomy.cdm.api.service.config.DeleteConfiguratorBase; import eu.etaxonomy.cdm.api.service.config.IIdentifiableEntityServiceConfigurator; import eu.etaxonomy.cdm.api.service.dto.FindByIdentifierDTO; @@ -1106,11 +1107,6 @@ public class TransientDescriptionService implements IDescriptionService { return defaultService.findByIdentifier(clazz, identifier, identifierType, matchmode, includeEntity, pageSize, pageNumber, propertyPaths); } - @Override - public UUID deleteDescription(DescriptionBase description) { - return defaultService.deleteDescription(description); - } - /* (non-Javadoc) * @see eu.etaxonomy.cdm.api.service.IDescriptionService#pageNamedAreasInUse(boolean, java.lang.Integer, java.lang.Integer) */ @@ -1118,4 +1114,52 @@ public class TransientDescriptionService implements IDescriptionService { public Pager pageNamedAreasInUse(boolean includeAllParents, Integer pageSize, Integer pageNumber) { return defaultService.pageNamedAreasInUse(includeAllParents, pageSize, pageNumber); } + + /** + * {@inheritDoc} + */ + @Override + public DeleteResult delete(UUID arg0) { + return defaultService.delete(arg0); + } + + /** + * {@inheritDoc} + */ + @Override + public DeleteResult deleteDescription(DescriptionBase arg0) { + return defaultService.deleteDescription(arg0); + } + + /** + * {@inheritDoc} + */ + @Override + public DeleteResult deleteDescription(UUID arg0) { + return defaultService.deleteDescription(arg0); + } + + /** + * {@inheritDoc} + */ + @Override + public UUID deleteDescriptionElement(UUID arg0) { + return defaultService.deleteDescriptionElement(arg0); + } + + /** + * {@inheritDoc} + */ + @Override + public UpdateResult moveTaxonDescriptions(Taxon arg0, Taxon arg1) { + return defaultService.moveTaxonDescriptions(arg0, arg1); + } + + /** + * {@inheritDoc} + */ + @Override + public UpdateResult moveTaxonDescriptions(UUID arg0, UUID arg1) { + return defaultService.moveTaxonDescriptions(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 7daa4e43f..267831d4a 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 @@ -26,6 +26,7 @@ import org.hibernate.envers.query.criteria.AuditCriterion; import eu.etaxonomy.cdm.api.service.DeleteResult; import eu.etaxonomy.cdm.api.service.INameService; +import eu.etaxonomy.cdm.api.service.UpdateResult; import eu.etaxonomy.cdm.api.service.config.DeleteConfiguratorBase; import eu.etaxonomy.cdm.api.service.config.IIdentifiableEntityServiceConfigurator; import eu.etaxonomy.cdm.api.service.config.NameDeletionConfigurator; @@ -78,7 +79,7 @@ import eu.etaxonomy.cdm.strategy.merge.IMergeStrategy; */ public class TransientNameService implements INameService { - private INameService defaultService; + private final INameService defaultService; /** * @@ -1148,25 +1149,41 @@ public class TransientNameService implements INameService { public TaxonNameBase findWithoutFlush(UUID uuid) { return defaultService.findWithoutFlush(uuid); } - - + + @Override public Pager> findByIdentifier(Class clazz, String identifier, DefinedTerm identifierType, MatchMode matchmode, boolean includeEntity, Integer pageSize, Integer pageNumber, List propertyPaths){ return defaultService.findByIdentifier(clazz, identifier, identifierType, matchmode, includeEntity, pageSize, pageNumber, propertyPaths); } - + @Override public List> getNameRecords() { - + return defaultService.getNameRecords(); } - - - + /** + * {@inheritDoc} + */ + @Override + public DeleteResult delete(UUID arg0) { + return defaultService.delete(arg0); + } + + /** + * {@inheritDoc} + */ + @Override + public UpdateResult setAsGroupsBasionym(UUID arg0) { + return defaultService.setAsGroupsBasionym(arg0); + } + + + + } 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 40a46f02b..f12b34a94 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 @@ -1056,4 +1056,12 @@ public class TransientOccurenceService implements IOccurrenceService { return defaultService.getAllHierarchyDerivatives(specimen); } + /** + * {@inheritDoc} + */ + @Override + public DeleteResult delete(UUID arg0) { + return defaultService.delete(arg0); + } + } 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 1cb2f4869..c4181efa0 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 @@ -55,7 +55,7 @@ import eu.etaxonomy.cdm.strategy.merge.IMergeStrategy; */ public class TransientReferenceService implements IReferenceService { - private IReferenceService defaultService; + private final IReferenceService defaultService; /** * @param defaultReferenceService @@ -704,10 +704,18 @@ public class TransientReferenceService implements IReferenceService { public Reference findWithoutFlush(UUID uuid) { return defaultService.findWithoutFlush(uuid); } - + @Override public Pager> findByIdentifier(Class clazz, String identifier, DefinedTerm identifierType, MatchMode matchmode, boolean includeEntity, Integer pageSize, Integer pageNumber, List propertyPaths){ return defaultService.findByIdentifier(clazz, identifier, identifierType, matchmode, includeEntity, pageSize, pageNumber, propertyPaths); } + /** + * {@inheritDoc} + */ + @Override + public DeleteResult delete(UUID arg0) { + return defaultService.delete(arg0); + } + } 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 b26a6e84f..bced71d45 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 @@ -27,6 +27,7 @@ import org.hibernate.envers.query.criteria.AuditCriterion; import eu.etaxonomy.cdm.api.service.DeleteResult; import eu.etaxonomy.cdm.api.service.ITaxonService; import eu.etaxonomy.cdm.api.service.TaxaAndNamesSearchMode; +import eu.etaxonomy.cdm.api.service.UpdateResult; import eu.etaxonomy.cdm.api.service.config.DeleteConfiguratorBase; import eu.etaxonomy.cdm.api.service.config.IFindTaxaAndNamesConfigurator; import eu.etaxonomy.cdm.api.service.config.IIdentifiableEntityServiceConfigurator; @@ -1418,9 +1419,9 @@ public class TransientTaxonService implements ITaxonService { return defaultService.findByIdentifier(clazz, identifier, identifierType, subtreeFilter, matchmode, includeEntity, pageSize, pageNumber, propertyPaths); } - - + + @@ -1431,11 +1432,40 @@ public class TransientTaxonService implements ITaxonService { SynonymRelationshipType newSynonymRelationshipType, Reference reference, String referenceDetail, boolean keepReference) throws HomotypicalGroupChangeException { - + return defaultService.moveSynonymToAnotherTaxon(oldSynonymRelation, newTaxonUUID, moveHomotypicGroup, newSynonymRelationshipType, reference, referenceDetail, keepReference); } + /** + * {@inheritDoc} + */ + @Override + public DeleteResult delete(UUID arg0) { + return defaultService.delete(arg0); + } + + /** + * {@inheritDoc} + */ + @Override + public DeleteResult deleteSynonym(UUID arg0, UUID arg1, SynonymDeletionConfigurator arg2) { + return defaultService.deleteSynonym(arg0, arg1, arg2); + } + /** + * {@inheritDoc} + */ + @Override + public DeleteResult deleteTaxon(UUID arg0, TaxonDeletionConfigurator arg1, UUID arg2) { + return defaultService.deleteTaxon(arg0, arg1, arg2); + } + /** + * {@inheritDoc} + */ + @Override + public UpdateResult swapSynonymAndAcceptedTaxon(UUID arg0, UUID arg1) { + return defaultService.swapSynonymAndAcceptedTaxon(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 4ade24305..552d205fe 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 @@ -865,11 +865,19 @@ public class TransientTermService implements ITermService { public DefinedTermBase findWithoutFlush(UUID uuid) { return defaultService.findWithoutFlush(uuid); } - + @Override public Pager> findByIdentifier(Class clazz, String identifier, DefinedTerm identifierType, MatchMode matchmode, boolean includeEntity, Integer pageSize, Integer pageNumber, List propertyPaths){ return defaultService.findByIdentifier(clazz, identifier, identifierType, matchmode, includeEntity, pageSize, pageNumber, propertyPaths); } + /** + * {@inheritDoc} + */ + @Override + public DeleteResult delete(UUID arg0) { + return defaultService.delete(arg0); + } + } -- 2.34.1