X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/blobdiff_plain/1bf80c0c5daafa3cf40d34be966146731c669fb9..62ad723fc6d3c58744d823b5527509eb8183bbdf:/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTaxonService.java 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 e5cf609ec..388dc636c 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 @@ -34,6 +34,7 @@ import eu.etaxonomy.cdm.api.service.config.IncludedTaxonConfiguration; import eu.etaxonomy.cdm.api.service.config.MatchingTaxonConfigurator; import eu.etaxonomy.cdm.api.service.config.SynonymDeletionConfigurator; import eu.etaxonomy.cdm.api.service.config.TaxonDeletionConfigurator; +import eu.etaxonomy.cdm.api.service.dto.FindByIdentifierDTO; import eu.etaxonomy.cdm.api.service.dto.IncludedTaxaDTO; import eu.etaxonomy.cdm.api.service.exception.DataChangeNoRollbackException; import eu.etaxonomy.cdm.api.service.exception.HomotypicalGroupChangeException; @@ -42,7 +43,9 @@ import eu.etaxonomy.cdm.api.service.search.LuceneMultiSearchException; import eu.etaxonomy.cdm.api.service.search.SearchResult; import eu.etaxonomy.cdm.api.service.util.TaxonRelationshipEdge; import eu.etaxonomy.cdm.common.monitor.IProgressMonitor; +import eu.etaxonomy.cdm.model.agent.AgentBase; import eu.etaxonomy.cdm.model.common.Annotation; +import eu.etaxonomy.cdm.model.common.DefinedTerm; import eu.etaxonomy.cdm.model.common.ISourceable; import eu.etaxonomy.cdm.model.common.IdentifiableEntity; import eu.etaxonomy.cdm.model.common.IdentifiableSource; @@ -56,7 +59,7 @@ import eu.etaxonomy.cdm.model.common.RelationshipBase.Direction; import eu.etaxonomy.cdm.model.common.UuidAndTitleCache; import eu.etaxonomy.cdm.model.description.DescriptionElementBase; import eu.etaxonomy.cdm.model.description.Feature; -import eu.etaxonomy.cdm.model.description.PresenceAbsenceTermBase; +import eu.etaxonomy.cdm.model.description.PresenceAbsenceTerm; import eu.etaxonomy.cdm.model.location.NamedArea; import eu.etaxonomy.cdm.model.media.Media; import eu.etaxonomy.cdm.model.media.MediaRepresentation; @@ -91,13 +94,13 @@ import eu.etaxonomy.cdm.strategy.merge.IMergeStrategy; */ public class TransientTaxonService implements ITaxonService { - private final ITaxonService defaultTaxonService; + private final ITaxonService defaultService; /** * @param defaultTaxonService */ public TransientTaxonService(ITaxonService defaultTaxonService) { - this.defaultTaxonService = defaultTaxonService; + this.defaultService = defaultTaxonService; } /** @@ -111,7 +114,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public Pager> pageAuditEvents(TaxonBase t, Integer pageSize, Integer pageNumber, AuditEventSort sort, List propertyPaths) { - return defaultTaxonService.pageAuditEvents(t, pageSize, pageNumber, sort, propertyPaths); + return defaultService.pageAuditEvents(t, pageSize, pageNumber, sort, propertyPaths); } /** @@ -126,7 +129,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public Pager getAnnotations(TaxonBase annotatedObj, MarkerType status, Integer pageSize, Integer pageNumber, List orderHints, List propertyPaths) { - return defaultTaxonService.getAnnotations(annotatedObj, status, pageSize, pageNumber, orderHints, propertyPaths); + return defaultService.getAnnotations(annotatedObj, status, pageSize, pageNumber, orderHints, propertyPaths); } /** @@ -135,7 +138,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public void clear() { - defaultTaxonService.clear(); + defaultService.clear(); } /** @@ -145,7 +148,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public void lock(TaxonBase t, LockOptions lockOptions) { - defaultTaxonService.lock(t, lockOptions); + defaultService.lock(t, lockOptions); } /** @@ -156,7 +159,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public void refresh(TaxonBase t, LockOptions lockOptions, List propertyPaths) { - defaultTaxonService.refresh(t, lockOptions, propertyPaths); + defaultService.refresh(t, lockOptions, propertyPaths); } /** @@ -165,7 +168,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public void updateTitleCache() { - defaultTaxonService.updateTitleCache(); + defaultService.updateTitleCache(); } /** @@ -175,7 +178,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public AuditEventRecord getNextAuditEvent(TaxonBase t) { - return defaultTaxonService.getNextAuditEvent(t); + return defaultService.getNextAuditEvent(t); } /** @@ -190,7 +193,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public Pager getMarkers(TaxonBase annotatableEntity, Boolean technical, Integer pageSize, Integer pageNumber, List orderHints, List propertyPaths) { - return defaultTaxonService.getMarkers(annotatableEntity, technical, pageSize, pageNumber, orderHints, propertyPaths); + return defaultService.getMarkers(annotatableEntity, technical, pageSize, pageNumber, orderHints, propertyPaths); } /** @@ -202,7 +205,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public void updateTitleCache(Class clazz, Integer stepSize, IIdentifiableEntityCacheStrategy cacheStrategy, IProgressMonitor monitor) { - defaultTaxonService.updateTitleCache(clazz, stepSize, cacheStrategy, monitor); + defaultService.updateTitleCache(clazz, stepSize, cacheStrategy, monitor); } /** @@ -212,7 +215,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public AuditEventRecord getPreviousAuditEvent(TaxonBase t) { - return defaultTaxonService.getPreviousAuditEvent(t); + return defaultService.getPreviousAuditEvent(t); } /** @@ -222,7 +225,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public int count(Class clazz) { - return defaultTaxonService.count(clazz); + return defaultService.count(clazz); } /** @@ -239,7 +242,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public Pager> pageAuditEvents(Class clazz, AuditEvent from, AuditEvent to, List criteria, Integer pageSize, Integer pageValue, AuditEventSort sort, List propertyPaths) { - return defaultTaxonService.pageAuditEvents(clazz, from, to, criteria, pageSize, pageValue, sort, propertyPaths); + return defaultService.pageAuditEvents(clazz, from, to, criteria, pageSize, pageValue, sort, propertyPaths); } /** @@ -249,7 +252,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public TaxonBase find(LSID lsid) { - return defaultTaxonService.find(lsid); + return defaultService.find(lsid); } /** @@ -259,7 +262,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public DeleteResult delete(TaxonBase persistentObject) { - return defaultTaxonService.delete(persistentObject); + return defaultService.delete(persistentObject); } /** @@ -273,7 +276,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public List groupMarkers(Class clazz, Boolean technical, Integer pageSize, Integer pageNumber, List propertyPaths) { - return defaultTaxonService.groupMarkers(clazz, technical, pageSize, pageNumber, propertyPaths); + return defaultService.groupMarkers(clazz, technical, pageSize, pageNumber, propertyPaths); } /** @@ -283,7 +286,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public boolean exists(UUID uuid) { - return defaultTaxonService.exists(uuid); + return defaultService.exists(uuid); } @@ -295,7 +298,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public TaxonBase replace(TaxonBase x, TaxonBase y) { - return defaultTaxonService.replace(x, y); + return defaultService.replace(x, y); } /** @@ -305,7 +308,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public List find(Set uuidSet) { - return defaultTaxonService.find(uuidSet); + return defaultService.find(uuidSet); } /** @@ -318,7 +321,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public Pager getSources(TaxonBase t, Integer pageSize, Integer pageNumber, List propertyPaths) { - return defaultTaxonService.getSources(t, pageSize, pageNumber, propertyPaths); + return defaultService.getSources(t, pageSize, pageNumber, propertyPaths); } /** @@ -332,7 +335,7 @@ public class TransientTaxonService implements ITaxonService { @Deprecated @Override public List getRootTaxa(Reference sec, CdmFetch cdmFetch, boolean onlyWithChildren) { - return defaultTaxonService.getRootTaxa(sec, cdmFetch, onlyWithChildren); + return defaultService.getRootTaxa(sec, cdmFetch, onlyWithChildren); } /** @@ -342,7 +345,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public TaxonBase find(UUID uuid) { - return defaultTaxonService.find(uuid); + return defaultService.find(uuid); } /** @@ -358,7 +361,7 @@ public class TransientTaxonService implements ITaxonService { @Deprecated @Override public List getRootTaxa(Rank rank, Reference sec, boolean onlyWithChildren, boolean withMisapplications, List propertyPaths) { - return defaultTaxonService.getRootTaxa(rank, sec, onlyWithChildren, withMisapplications, propertyPaths); + return defaultService.getRootTaxa(rank, sec, onlyWithChildren, withMisapplications, propertyPaths); } /** @@ -368,7 +371,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public TaxonBase find(int id) { - return defaultTaxonService.find(id); + return defaultService.find(id); } /** @@ -381,7 +384,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public Pager getRights(TaxonBase t, Integer pageSize, Integer pageNumber, List propertyPaths) { - return defaultTaxonService.getRights(t, pageSize, pageNumber, propertyPaths); + return defaultService.getRights(t, pageSize, pageNumber, propertyPaths); } /** @@ -392,7 +395,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public int countMarkers(Class clazz, Boolean technical) { - return defaultTaxonService.countMarkers(clazz, technical); + return defaultService.countMarkers(clazz, technical); } /** @@ -402,7 +405,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public List findById(Set idSet) { - return defaultTaxonService.findById(idSet); + return defaultService.findById(idSet); } /** @@ -414,7 +417,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public ISourceable getSourcedObjectByIdInSource(Class clazz, String idInSource, String idNamespace) { - return defaultTaxonService.getSourcedObjectByIdInSource(clazz, idInSource, idNamespace); + return defaultService.getSourcedObjectByIdInSource(clazz, idInSource, idNamespace); } /** @@ -423,7 +426,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public Session getSession() { - return defaultTaxonService.getSession(); + return defaultService.getSession(); } /** @@ -432,7 +435,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public List> getUuidAndTitleCache() { - return defaultTaxonService.getUuidAndTitleCache(); + return defaultService.getUuidAndTitleCache(); } /** @@ -446,7 +449,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public List group(Class clazz, Integer limit, Integer start, List groups, List propertyPaths) { - return defaultTaxonService.group(clazz, limit, start, groups, propertyPaths); + return defaultService.group(clazz, limit, start, groups, propertyPaths); } /** @@ -457,7 +460,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public List getAllRelationships(int limit, int start) { - return defaultTaxonService.getAllRelationships(limit, start); + return defaultService.getAllRelationships(limit, start); } /** @@ -474,7 +477,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public Pager findByTitle(Class clazz, String queryString, MatchMode matchmode, List criteria, Integer pageSize, Integer pageNumber, List orderHints, List propertyPaths) { - return defaultTaxonService.findByTitle(clazz, queryString, matchmode, criteria, pageSize, pageNumber, orderHints, propertyPaths); + return defaultService.findByTitle(clazz, queryString, matchmode, criteria, pageSize, pageNumber, orderHints, propertyPaths); } /** @@ -485,7 +488,7 @@ public class TransientTaxonService implements ITaxonService { @Deprecated @Override public OrderedTermVocabulary getTaxonRelationshipTypeVocabulary() { - return defaultTaxonService.getTaxonRelationshipTypeVocabulary(); + return defaultService.getTaxonRelationshipTypeVocabulary(); } /** @@ -496,7 +499,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public List searchTaxaByName(String name, Reference sec) { - return defaultTaxonService.searchTaxaByName(name, sec); + return defaultService.searchTaxaByName(name, sec); } /** @@ -506,7 +509,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public void swapSynonymAndAcceptedTaxon(Synonym synonym, Taxon acceptedTaxon) { - defaultTaxonService.swapSynonymAndAcceptedTaxon(synonym, acceptedTaxon); + defaultService.swapSynonymAndAcceptedTaxon(synonym, acceptedTaxon); } /** @@ -520,7 +523,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public List list(Class type, Integer limit, Integer start, List orderHints, List propertyPaths) { - return defaultTaxonService.list(type, limit, start, orderHints, propertyPaths); + return defaultService.list(type, limit, start, orderHints, propertyPaths); } /** @@ -530,7 +533,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public Pager findByTitle(IIdentifiableEntityServiceConfigurator configurator) { - return defaultTaxonService.findByTitle(configurator); + return defaultService.findByTitle(configurator); } /** @@ -546,7 +549,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public Taxon changeSynonymToAcceptedTaxon(Synonym synonym, Taxon acceptedTaxon, boolean deleteSynonym, boolean copyCitationInfo, Reference citation, String microCitation) throws HomotypicalGroupChangeException { - return defaultTaxonService.changeSynonymToAcceptedTaxon(synonym, acceptedTaxon, deleteSynonym, copyCitationInfo, citation, microCitation); + return defaultService.changeSynonymToAcceptedTaxon(synonym, acceptedTaxon, deleteSynonym, copyCitationInfo, citation, microCitation); } /** @@ -559,7 +562,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public Integer countByTitle(Class clazz, String queryString, MatchMode matchmode, List criteria) { - return defaultTaxonService.countByTitle(clazz, queryString, matchmode, criteria); + return defaultService.countByTitle(clazz, queryString, matchmode, criteria); } /** @@ -569,7 +572,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public TaxonBase load(UUID uuid) { - return defaultTaxonService.load(uuid); + return defaultService.load(uuid); } /** @@ -580,7 +583,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public TaxonBase load(UUID uuid, List propertyPaths) { - return defaultTaxonService.load(uuid, propertyPaths); + return defaultService.load(uuid, propertyPaths); } /** @@ -590,7 +593,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public Integer countByTitle(IIdentifiableEntityServiceConfigurator configurator) { - return defaultTaxonService.countByTitle(configurator); + return defaultService.countByTitle(configurator); } /** @@ -600,7 +603,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public TaxonBase merge(TaxonBase transientObject) { - return defaultTaxonService.merge(transientObject); + return defaultService.merge(transientObject); } /** @@ -617,7 +620,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public List listByTitle(Class clazz, String queryString, MatchMode matchmode, List criteria, Integer pageSize, Integer pageNumber, List orderHints, List propertyPaths) { - return defaultTaxonService.listByTitle(clazz, queryString, matchmode, criteria, pageSize, pageNumber, orderHints, propertyPaths); + return defaultService.listByTitle(clazz, queryString, matchmode, criteria, pageSize, pageNumber, orderHints, propertyPaths); } /** @@ -631,7 +634,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public Pager page(Class type, Integer pageSize, Integer pageNumber, List orderHints, List propertyPaths) { - return defaultTaxonService.page(type, pageSize, pageNumber, orderHints, propertyPaths); + return defaultService.page(type, pageSize, pageNumber, orderHints, propertyPaths); } /** @@ -641,7 +644,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public UUID refresh(TaxonBase persistentObject) { - return defaultTaxonService.refresh(persistentObject); + return defaultService.refresh(persistentObject); } /** @@ -655,7 +658,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public Taxon changeSynonymToRelatedTaxon(Synonym synonym, Taxon toTaxon, TaxonRelationshipType taxonRelationshipType, Reference reference, String microReference) { - return defaultTaxonService.changeSynonymToRelatedTaxon(synonym, toTaxon, taxonRelationshipType, reference, microReference); + return defaultService.changeSynonymToRelatedTaxon(synonym, toTaxon, taxonRelationshipType, reference, microReference); } /** @@ -672,7 +675,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public List listByReferenceTitle(Class clazz, String queryString, MatchMode matchmode, List criteria, Integer pageSize, Integer pageNumber, List orderHints, List propertyPaths) { - return defaultTaxonService.listByReferenceTitle(clazz, queryString, matchmode, criteria, pageSize, pageNumber, orderHints, propertyPaths); + return defaultService.listByReferenceTitle(clazz, queryString, matchmode, criteria, pageSize, pageNumber, orderHints, propertyPaths); } /** @@ -684,7 +687,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public List rows(String tableName, int limit, int start) { - return defaultTaxonService.rows(tableName, limit, start); + return defaultService.rows(tableName, limit, start); } /** @@ -705,7 +708,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public long deleteSynonymRelationships(Synonym syn, Taxon taxon) { - return defaultTaxonService.deleteSynonymRelationships(syn, taxon); + return defaultService.deleteSynonymRelationships(syn, taxon); } /** @@ -738,7 +741,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public void changeHomotypicalGroupOfSynonym(Synonym synonym, HomotypicalGroup newHomotypicalGroup, Taxon targetTaxon, boolean removeFromOtherTaxa, boolean setBasionymRelationIfApplicable) { - defaultTaxonService.changeHomotypicalGroupOfSynonym(synonym, newHomotypicalGroup, targetTaxon, removeFromOtherTaxa, setBasionymRelationIfApplicable); + defaultService.changeHomotypicalGroupOfSynonym(synonym, newHomotypicalGroup, targetTaxon, removeFromOtherTaxa, setBasionymRelationIfApplicable); } /** @@ -758,7 +761,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public UUID update(TaxonBase transientObject) { - return defaultTaxonService.update(transientObject); + return defaultService.update(transientObject); } /** @@ -773,7 +776,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public List list(TaxonBase example, Set includeProperties, Integer limit, Integer start, List orderHints, List propertyPaths) { - return defaultTaxonService.list(example, includeProperties, limit, start, orderHints, propertyPaths); + return defaultService.list(example, includeProperties, limit, start, orderHints, propertyPaths); } /** @@ -790,7 +793,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public SynonymRelationship moveSynonymToAnotherTaxon(SynonymRelationship oldSynonymRelation, Taxon newTaxon, boolean moveHomotypicGroup, SynonymRelationshipType newSynonymRelationshipType, Reference newReference, String newReferenceDetail, boolean keepReference) throws HomotypicalGroupChangeException { - return defaultTaxonService.moveSynonymToAnotherTaxon(oldSynonymRelation, newTaxon, moveHomotypicGroup, newSynonymRelationshipType, newReference, newReferenceDetail, keepReference); + return defaultService.moveSynonymToAnotherTaxon(oldSynonymRelation, newTaxon, moveHomotypicGroup, newSynonymRelationshipType, newReference, newReferenceDetail, keepReference); } /** @@ -802,7 +805,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public int deduplicate(Class clazz, IMatchStrategy matchStrategy, IMergeStrategy mergeStrategy) { - return defaultTaxonService.deduplicate(clazz, matchStrategy, mergeStrategy); + return defaultService.deduplicate(clazz, matchStrategy, mergeStrategy); } /** @@ -817,7 +820,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public Pager findTitleCache(Class clazz, String queryString, Integer pageSize, Integer pageNumber, List orderHints, MatchMode matchMode) { - return defaultTaxonService.findTitleCache(clazz, queryString, pageSize, pageNumber, orderHints, matchMode); + return defaultService.findTitleCache(clazz, queryString, pageSize, pageNumber, orderHints, matchMode); } /** @@ -832,7 +835,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public List listToTaxonRelationships(Taxon taxon, TaxonRelationshipType type, Integer pageSize, Integer pageNumber, List orderHints, List propertyPaths) { - return defaultTaxonService.listToTaxonRelationships(taxon, type, pageSize, pageNumber, orderHints, propertyPaths); + return defaultService.listToTaxonRelationships(taxon, type, pageSize, pageNumber, orderHints, propertyPaths); } /** @@ -847,7 +850,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public Pager pageToTaxonRelationships(Taxon taxon, TaxonRelationshipType type, Integer pageSize, Integer pageNumber, List orderHints, List propertyPaths) { - return defaultTaxonService.pageToTaxonRelationships(taxon, type, pageSize, pageNumber, orderHints, propertyPaths); + return defaultService.pageToTaxonRelationships(taxon, type, pageSize, pageNumber, orderHints, propertyPaths); } /** @@ -862,7 +865,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public List listFromTaxonRelationships(Taxon taxon, TaxonRelationshipType type, Integer pageSize, Integer pageNumber, List orderHints, List propertyPaths) { - return defaultTaxonService.listFromTaxonRelationships(taxon, type, pageSize, pageNumber, orderHints, propertyPaths); + return defaultService.listFromTaxonRelationships(taxon, type, pageSize, pageNumber, orderHints, propertyPaths); } /** @@ -877,7 +880,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public Pager pageFromTaxonRelationships(Taxon taxon, TaxonRelationshipType type, Integer pageSize, Integer pageNumber, List orderHints, List propertyPaths) { - return defaultTaxonService.pageFromTaxonRelationships(taxon, type, pageSize, pageNumber, orderHints, propertyPaths); + return defaultService.pageFromTaxonRelationships(taxon, type, pageSize, pageNumber, orderHints, propertyPaths); } /** @@ -892,7 +895,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public Set listRelatedTaxa(Taxon taxon, Set includeRelationships, Integer maxDepth, Integer limit, Integer start, List propertyPaths) { - return defaultTaxonService.listRelatedTaxa(taxon, includeRelationships, maxDepth, limit, start, propertyPaths); + return defaultService.listRelatedTaxa(taxon, includeRelationships, maxDepth, limit, start, propertyPaths); } /** @@ -905,7 +908,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public List listClassifications(TaxonBase taxonBase, Integer limit, Integer start, List propertyPaths) { - return defaultTaxonService.listClassifications(taxonBase, limit, start, propertyPaths); + return defaultService.listClassifications(taxonBase, limit, start, propertyPaths); } /** @@ -920,7 +923,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public Pager getSynonyms(Synonym synonym, SynonymRelationshipType type, Integer pageSize, Integer pageNumber, List orderHints, List propertyPaths) { - return defaultTaxonService.getSynonyms(synonym, type, pageSize, pageNumber, orderHints, propertyPaths); + return defaultService.getSynonyms(synonym, type, pageSize, pageNumber, orderHints, propertyPaths); } /** @@ -935,7 +938,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public Pager getSynonyms(Taxon taxon, SynonymRelationshipType type, Integer pageSize, Integer pageNumber, List orderHints, List propertyPaths) { - return defaultTaxonService.getSynonyms(taxon, type, pageSize, pageNumber, orderHints, propertyPaths); + return defaultService.getSynonyms(taxon, type, pageSize, pageNumber, orderHints, propertyPaths); } /** @@ -946,7 +949,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public List getHomotypicSynonymsByHomotypicGroup(Taxon taxon, List propertyPaths) { - return defaultTaxonService.getHomotypicSynonymsByHomotypicGroup(taxon, propertyPaths); + return defaultService.getHomotypicSynonymsByHomotypicGroup(taxon, propertyPaths); } /** @@ -957,7 +960,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public List> getHeterotypicSynonymyGroups(Taxon taxon, List propertyPaths) { - return defaultTaxonService.getHeterotypicSynonymyGroups(taxon, propertyPaths); + return defaultService.getHeterotypicSynonymyGroups(taxon, propertyPaths); } /** @@ -972,7 +975,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public Pager search(Class clazz, String queryString, Integer pageSize, Integer pageNumber, List orderHints, List propertyPaths) { - return defaultTaxonService.search(clazz, queryString, pageSize, pageNumber, orderHints, propertyPaths); + return defaultService.search(clazz, queryString, pageSize, pageNumber, orderHints, propertyPaths); } /** @@ -989,7 +992,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public Pager findTaxaByName(Class clazz, String uninomial, String infragenericEpithet, String specificEpithet, String infraspecificEpithet, Rank rank, Integer pageSize, Integer pageNumber) { - return defaultTaxonService.findTaxaByName(clazz, uninomial, infragenericEpithet, specificEpithet, infraspecificEpithet, rank, pageSize, pageNumber); + return defaultService.findTaxaByName(clazz, uninomial, infragenericEpithet, specificEpithet, infraspecificEpithet, rank, pageSize, pageNumber); } /** @@ -1006,7 +1009,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public List listTaxaByName(Class clazz, String uninomial, String infragenericEpithet, String specificEpithet, String infraspecificEpithet, Rank rank, Integer pageSize, Integer pageNumber) { - return defaultTaxonService.listTaxaByName(clazz, uninomial, infragenericEpithet, specificEpithet, infraspecificEpithet, rank, pageSize, pageNumber); + return defaultService.listTaxaByName(clazz, uninomial, infragenericEpithet, specificEpithet, infraspecificEpithet, rank, pageSize, pageNumber); } /** @@ -1016,7 +1019,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public Pager findTaxaAndNames(IFindTaxaAndNamesConfigurator configurator) { - return defaultTaxonService.findTaxaAndNames(configurator); + return defaultService.findTaxaAndNames(configurator); } /** @@ -1039,7 +1042,7 @@ public class TransientTaxonService implements ITaxonService { @Deprecated @Override public Pager> findByEverythingFullText(String queryString, Classification classification, List languages, boolean highlightFragments, Integer pageSize, Integer pageNumber, List orderHints, List propertyPaths) throws CorruptIndexException, IOException, ParseException, LuceneMultiSearchException { - return defaultTaxonService.findByEverythingFullText(queryString, classification, languages, highlightFragments, pageSize, pageNumber, orderHints, propertyPaths); + return defaultService.findByEverythingFullText(queryString, classification, languages, highlightFragments, pageSize, pageNumber, orderHints, propertyPaths); } /** @@ -1060,49 +1063,32 @@ public class TransientTaxonService implements ITaxonService { */ @Override public Pager> findByFullText(Class clazz, String queryString, Classification classification, List languages, boolean highlightFragments, Integer pageSize, Integer pageNumber, List orderHints, List propertyPaths) throws CorruptIndexException, IOException, ParseException { - return defaultTaxonService.findByFullText(clazz, queryString, classification, languages, highlightFragments, pageSize, pageNumber, orderHints, propertyPaths); + return defaultService.findByFullText(clazz, queryString, classification, languages, highlightFragments, pageSize, pageNumber, orderHints, propertyPaths); } - /** - * @param areaFilter - * @param statusFilter - * @param classification - * @param pageSize - * @param pageNumber - * @param orderHints - * @param propertyPaths - * @return - * @throws IOException - * @throws ParseException + + /* (non-Javadoc) * @see eu.etaxonomy.cdm.api.service.ITaxonService#findByDistribution(java.util.List, java.util.List, eu.etaxonomy.cdm.model.taxon.Classification, java.lang.Integer, java.lang.Integer, java.util.List, java.util.List) */ @Override - public Pager> findByDistribution(List areaFilter, List> statusFilter, Classification classification, Integer pageSize, Integer pageNumber, List orderHints, List propertyPaths) throws IOException, ParseException { - return defaultTaxonService.findByDistribution(areaFilter, statusFilter, classification, pageSize, pageNumber, orderHints, propertyPaths); + public Pager> findByDistribution(List areaFilter, + List statusFilter, Classification classification, Integer pageSize, + Integer pageNumber, List orderHints, List propertyPaths) throws IOException, + ParseException { + return defaultService.findByDistribution(areaFilter, statusFilter, classification, pageSize, pageNumber, orderHints, propertyPaths); } - /** - * @param searchModes - * @param queryString - * @param classification - * @param namedAreas - * @param distributionStatus - * @param languages - * @param highlightFragments - * @param pageSize - * @param pageNumber - * @param orderHints - * @param propertyPaths - * @return - * @throws CorruptIndexException - * @throws IOException - * @throws ParseException - * @throws LuceneMultiSearchException + + /* (non-Javadoc) * @see eu.etaxonomy.cdm.api.service.ITaxonService#findTaxaAndNamesByFullText(java.util.EnumSet, java.lang.String, eu.etaxonomy.cdm.model.taxon.Classification, java.util.Set, java.util.Set, java.util.List, boolean, java.lang.Integer, java.lang.Integer, java.util.List, java.util.List) */ @Override - public Pager> findTaxaAndNamesByFullText(EnumSet searchModes, String queryString, Classification classification, Set namedAreas, Set> distributionStatus, List languages, boolean highlightFragments, Integer pageSize, Integer pageNumber, List orderHints, List propertyPaths) throws CorruptIndexException, IOException, ParseException, LuceneMultiSearchException { - return defaultTaxonService.findTaxaAndNamesByFullText(searchModes, queryString, classification, namedAreas, distributionStatus, languages, highlightFragments, pageSize, pageNumber, orderHints, propertyPaths); + public Pager> findTaxaAndNamesByFullText(EnumSet searchModes, + String queryString, Classification classification, Set namedAreas, + Set distributionStatus, List languages, boolean highlightFragments, + Integer pageSize, Integer pageNumber, List orderHints, List propertyPaths) + throws CorruptIndexException, IOException, ParseException, LuceneMultiSearchException { + return defaultService.findTaxaAndNamesByFullText(searchModes, queryString, classification, namedAreas, distributionStatus, languages, highlightFragments, pageSize, pageNumber, orderHints, propertyPaths); } /** @@ -1124,7 +1110,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public Pager> findByDescriptionElementFullText(Class clazz, String queryString, Classification classification, List features, List languages, boolean highlightFragments, Integer pageSize, Integer pageNumber, List orderHints, List propertyPaths) throws CorruptIndexException, IOException, ParseException { - return defaultTaxonService.findByDescriptionElementFullText(clazz, queryString, classification, features, languages, highlightFragments, pageSize, pageNumber, orderHints, propertyPaths); + return defaultService.findByDescriptionElementFullText(clazz, queryString, classification, features, languages, highlightFragments, pageSize, pageNumber, orderHints, propertyPaths); } /** @@ -1140,7 +1126,7 @@ public class TransientTaxonService implements ITaxonService { @Deprecated @Override public List getAllMedia(Taxon taxon, int size, int height, int widthOrDuration, String[] mimeTypes) { - return defaultTaxonService.getAllMedia(taxon, size, height, widthOrDuration, mimeTypes); + return defaultService.getAllMedia(taxon, size, height, widthOrDuration, mimeTypes); } /** @@ -1155,7 +1141,7 @@ public class TransientTaxonService implements ITaxonService { @Deprecated @Override public List listTaxonDescriptionMedia(Taxon taxon, Set includeRelationships, boolean limitToGalleries, List propertyPath) { - return defaultTaxonService.listTaxonDescriptionMedia(taxon, includeRelationships, limitToGalleries, propertyPath); + return defaultService.listTaxonDescriptionMedia(taxon, includeRelationships, limitToGalleries, propertyPath); } /** @@ -1171,7 +1157,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public List listMedia(Taxon taxon, Set includeRelationships, Boolean limitToGalleries, Boolean includeTaxonDescriptions, Boolean includeOccurrences, Boolean includeTaxonNameDescriptions, List propertyPath) { - return defaultTaxonService.listMedia(taxon, includeRelationships, limitToGalleries, includeTaxonDescriptions, includeOccurrences, includeTaxonNameDescriptions, propertyPath); + return defaultService.listMedia(taxon, includeRelationships, limitToGalleries, includeTaxonDescriptions, includeOccurrences, includeTaxonNameDescriptions, propertyPath); } /** @@ -1181,7 +1167,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public List findTaxaByID(Set listOfIDs) { - return defaultTaxonService.findTaxaByID(listOfIDs); + return defaultService.findTaxaByID(listOfIDs); } /** @@ -1192,7 +1178,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public TaxonBase findTaxonByUuid(UUID uuid, List propertyPaths) { - return defaultTaxonService.findTaxonByUuid(uuid, propertyPaths); + return defaultService.findTaxonByUuid(uuid, propertyPaths); } /** @@ -1201,7 +1187,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public int countAllRelationships() { - return defaultTaxonService.countAllRelationships(); + return defaultService.countAllRelationships(); } /** @@ -1211,7 +1197,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public List findIdenticalTaxonNames(List propertyPath) { - return defaultTaxonService.findIdenticalTaxonNames(propertyPath); + return defaultService.findIdenticalTaxonNames(propertyPath); } /** @@ -1221,7 +1207,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public List findIdenticalTaxonNameIds(List propertyPath) { - return defaultTaxonService.findIdenticalTaxonNameIds(propertyPath); + return defaultService.findIdenticalTaxonNameIds(propertyPath); } /** @@ -1231,7 +1217,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public String getPhylumName(TaxonNameBase name) { - return defaultTaxonService.getPhylumName(name); + return defaultService.getPhylumName(name); } /** @@ -1241,7 +1227,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public long deleteSynonymRelationships(Synonym syn) { - return defaultTaxonService.deleteSynonymRelationships(syn); + return defaultService.deleteSynonymRelationships(syn); } /** @@ -1257,7 +1243,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public List listSynonymRelationships(TaxonBase taxonBase, SynonymRelationshipType type, Integer pageSize, Integer pageNumber, List orderHints, List propertyPaths, Direction direction) { - return defaultTaxonService.listSynonymRelationships(taxonBase, type, pageSize, pageNumber, orderHints, propertyPaths, direction); + return defaultService.listSynonymRelationships(taxonBase, type, pageSize, pageNumber, orderHints, propertyPaths, direction); } /** @@ -1267,7 +1253,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public Taxon findBestMatchingTaxon(String taxonName) { - return defaultTaxonService.findBestMatchingTaxon(taxonName); + return defaultService.findBestMatchingTaxon(taxonName); } /** @@ -1277,7 +1263,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public Taxon findBestMatchingTaxon(MatchingTaxonConfigurator config) { - return defaultTaxonService.findBestMatchingTaxon(config); + return defaultService.findBestMatchingTaxon(config); } /** @@ -1287,7 +1273,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public Synonym findBestMatchingSynonym(String taxonName) { - return defaultTaxonService.findBestMatchingSynonym(taxonName); + return defaultService.findBestMatchingSynonym(taxonName); } /** @@ -1296,7 +1282,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public List> getUuidAndTitleCacheTaxon() { - return defaultTaxonService.getUuidAndTitleCacheTaxon(); + return defaultService.getUuidAndTitleCacheTaxon(); } /** @@ -1305,7 +1291,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public List> getUuidAndTitleCacheSynonym() { - return defaultTaxonService.getUuidAndTitleCacheSynonym(); + return defaultService.getUuidAndTitleCacheSynonym(); } /** @@ -1314,8 +1300,8 @@ public class TransientTaxonService implements ITaxonService { * @see eu.etaxonomy.cdm.api.service.ITaxonService#findTaxaAndNamesForEditor(eu.etaxonomy.cdm.api.service.config.IFindTaxaAndNamesConfigurator) */ @Override - public List> findTaxaAndNamesForEditor(IFindTaxaAndNamesConfigurator configurator) { - return defaultTaxonService.findTaxaAndNamesForEditor(configurator); + public List> findTaxaAndNamesForEditor(IFindTaxaAndNamesConfigurator configurator) { + return defaultService.findTaxaAndNamesForEditor(configurator); } /** @@ -1328,7 +1314,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public List createInferredSynonyms(Taxon taxon, Classification tree, SynonymRelationshipType type, boolean doWithMisappliedNames) { - return defaultTaxonService.createInferredSynonyms(taxon, tree, type, doWithMisappliedNames); + return defaultService.createInferredSynonyms(taxon, tree, type, doWithMisappliedNames); } /** @@ -1340,27 +1326,27 @@ public class TransientTaxonService implements ITaxonService { */ @Override public List createAllInferredSynonyms(Taxon taxon, Classification tree, boolean doWithMisappliedNames) { - return defaultTaxonService.createAllInferredSynonyms(taxon, tree, doWithMisappliedNames); + return defaultService.createAllInferredSynonyms(taxon, tree, doWithMisappliedNames); } @Override public DeleteResult deleteSynonym(Synonym arg0, SynonymDeletionConfigurator arg1) { - return defaultTaxonService.deleteSynonym(arg0, arg1); + return defaultService.deleteSynonym(arg0, arg1); } @Override public DeleteResult deleteSynonym(Synonym arg0, Taxon arg1, SynonymDeletionConfigurator arg2) { - return defaultTaxonService.deleteSynonym(arg0, arg1, arg2); + return defaultService.deleteSynonym(arg0, arg1, arg2); } @Override public DeleteResult deleteTaxon(Taxon arg0, TaxonDeletionConfigurator arg1, Classification arg2) { - return defaultTaxonService.deleteTaxon(arg0, arg1, arg2); + return defaultService.deleteTaxon(arg0, arg1, arg2); } @Override public List> getSynonymsByHomotypicGroup(Taxon taxon, List propertyPaths) { - return defaultTaxonService.getSynonymsByHomotypicGroup(taxon, propertyPaths); + return defaultService.getSynonymsByHomotypicGroup(taxon, propertyPaths); } @Override @@ -1369,7 +1355,7 @@ public class TransientTaxonService implements ITaxonService { SynonymRelationshipType synonymRelationshipType) throws DataChangeNoRollbackException { - return defaultTaxonService.changeRelatedTaxonToSynonym(fromTaxon, toTaxon, oldRelationshipType, synonymRelationshipType); + return defaultService.changeRelatedTaxonToSynonym(fromTaxon, toTaxon, oldRelationshipType, synonymRelationshipType); } /* (non-Javadoc) @@ -1378,7 +1364,7 @@ public class TransientTaxonService implements ITaxonService { @Override public Pager pageAcceptedTaxaFor(UUID synonymUuid, UUID classificationUuid, Integer pageSize, Integer pageNumber, List orderHints, List propertyPaths) { - return defaultTaxonService.pageAcceptedTaxaFor(synonymUuid, classificationUuid, pageSize, pageNumber, orderHints, propertyPaths); + return defaultService.pageAcceptedTaxaFor(synonymUuid, classificationUuid, pageSize, pageNumber, orderHints, propertyPaths); } /* (non-Javadoc) @@ -1387,11 +1373,11 @@ public class TransientTaxonService implements ITaxonService { @Override public List listAcceptedTaxaFor(UUID synonymUuid, UUID classificationUuid, Integer pageSize, Integer pageNumber, List orderHints, List propertyPaths) { - return defaultTaxonService.listAcceptedTaxaFor(synonymUuid, classificationUuid, pageSize, pageNumber, orderHints, propertyPaths); + return defaultService.listAcceptedTaxaFor(synonymUuid, classificationUuid, pageSize, pageNumber, orderHints, propertyPaths); } @Override - public List isDeletable(TaxonBase object, + public DeleteResult isDeletable(TaxonBase object, DeleteConfiguratorBase config) { // TODO Auto-generated method stub return null; @@ -1406,7 +1392,7 @@ public class TransientTaxonService implements ITaxonService { @Override public TaxonBase findWithoutFlush(UUID uuid) { - return defaultTaxonService.findWithoutFlush(uuid); + return defaultService.findWithoutFlush(uuid); } /* (non-Javadoc) @@ -1414,10 +1400,13 @@ public class TransientTaxonService implements ITaxonService { */ @Override public List findTaxaByName(MatchingTaxonConfigurator config) { - return defaultTaxonService.findTaxaByName(config); + return defaultService.findTaxaByName(config); } - + @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); + }