From: Andreas Müller Date: Thu, 8 Jan 2015 10:42:05 +0000 (+0000) Subject: update Transient services X-Git-Tag: 3.6.0~268 X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/7c1862cdb30110122030de2fca937b346592afb9?hp=40125273bb9009b5e4cfc6d1470827204f1dd3b4 update Transient services --- 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 eb6962944..f57ae29eb 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 @@ -33,6 +33,7 @@ import eu.etaxonomy.cdm.model.agent.InstitutionalMembership; import eu.etaxonomy.cdm.model.agent.Person; import eu.etaxonomy.cdm.model.agent.Team; 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.IdentifiableSource; import eu.etaxonomy.cdm.model.common.LSID; @@ -57,13 +58,13 @@ import eu.etaxonomy.cdm.strategy.merge.IMergeStrategy; */ public class TransientAgentService implements IAgentService { - private IAgentService defaultAgentService; + private IAgentService defaultService; /** * @param defaultAgentService */ public TransientAgentService(IAgentService defaultAgentService) { - this.defaultAgentService = defaultAgentService; + this.defaultService = defaultAgentService; } /** @@ -77,7 +78,7 @@ public class TransientAgentService implements IAgentService { */ @Override public Pager> pageAuditEvents(AgentBase t, Integer pageSize, Integer pageNumber, AuditEventSort sort, List propertyPaths) { - return defaultAgentService.pageAuditEvents(t, pageSize, pageNumber, sort, propertyPaths); + return defaultService.pageAuditEvents(t, pageSize, pageNumber, sort, propertyPaths); } /** @@ -92,7 +93,7 @@ public class TransientAgentService implements IAgentService { */ @Override public Pager getAnnotations(AgentBase annotatedObj, MarkerType status, Integer pageSize, Integer pageNumber, List orderHints, List propertyPaths) { - return defaultAgentService.getAnnotations(annotatedObj, status, pageSize, pageNumber, orderHints, propertyPaths); + return defaultService.getAnnotations(annotatedObj, status, pageSize, pageNumber, orderHints, propertyPaths); } /** @@ -102,7 +103,7 @@ public class TransientAgentService implements IAgentService { */ @Override public List searchInstitutionByCode(String code) { - return defaultAgentService.searchInstitutionByCode(code); + return defaultService.searchInstitutionByCode(code); } /** @@ -114,7 +115,7 @@ public class TransientAgentService implements IAgentService { */ @Override public Pager getInstitutionalMemberships(Person person, Integer pageSize, Integer pageNumber) { - return defaultAgentService.getInstitutionalMemberships(person, pageSize, pageNumber); + return defaultService.getInstitutionalMemberships(person, pageSize, pageNumber); } /** @@ -123,7 +124,7 @@ public class TransientAgentService implements IAgentService { */ @Override public void clear() { - defaultAgentService.clear(); + defaultService.clear(); } /** @@ -133,7 +134,7 @@ public class TransientAgentService implements IAgentService { */ @Override public void lock(AgentBase t, LockOptions lockOptions) { - defaultAgentService.lock(t, lockOptions); + defaultService.lock(t, lockOptions); } /** @@ -144,7 +145,7 @@ public class TransientAgentService implements IAgentService { */ @Override public void refresh(AgentBase t, LockOptions lockOptions, List propertyPaths) { - defaultAgentService.refresh(t, lockOptions, propertyPaths); + defaultService.refresh(t, lockOptions, propertyPaths); } /** @@ -156,7 +157,7 @@ public class TransientAgentService implements IAgentService { */ @Override public Pager getMembers(Team team, Integer pageSize, Integer pageNumber) { - return defaultAgentService.getMembers(team, pageSize, pageNumber); + return defaultService.getMembers(team, pageSize, pageNumber); } /** @@ -165,7 +166,7 @@ public class TransientAgentService implements IAgentService { */ @Override public void updateTitleCache() { - defaultAgentService.updateTitleCache(); + defaultService.updateTitleCache(); } /** @@ -175,7 +176,7 @@ public class TransientAgentService implements IAgentService { */ @Override public AuditEventRecord getNextAuditEvent(AgentBase t) { - return defaultAgentService.getNextAuditEvent(t); + return defaultService.getNextAuditEvent(t); } /** @@ -190,7 +191,7 @@ public class TransientAgentService implements IAgentService { */ @Override public Pager getMarkers(AgentBase annotatableEntity, Boolean technical, Integer pageSize, Integer pageNumber, List orderHints, List propertyPaths) { - return defaultAgentService.getMarkers(annotatableEntity, technical, pageSize, pageNumber, orderHints, propertyPaths); + return defaultService.getMarkers(annotatableEntity, technical, pageSize, pageNumber, orderHints, propertyPaths); } /** @@ -202,7 +203,7 @@ public class TransientAgentService implements IAgentService { */ @Override public void updateTitleCache(Class clazz, Integer stepSize, IIdentifiableEntityCacheStrategy cacheStrategy, IProgressMonitor monitor) { - defaultAgentService.updateTitleCache(clazz, stepSize, cacheStrategy, monitor); + defaultService.updateTitleCache(clazz, stepSize, cacheStrategy, monitor); } /** @@ -214,7 +215,7 @@ public class TransientAgentService implements IAgentService { */ @Override public Pager
getAddresses(AgentBase agent, Integer pageSize, Integer pageNumber) { - return defaultAgentService.getAddresses(agent, pageSize, pageNumber); + return defaultService.getAddresses(agent, pageSize, pageNumber); } /** @@ -224,7 +225,7 @@ public class TransientAgentService implements IAgentService { */ @Override public AuditEventRecord getPreviousAuditEvent(AgentBase t) { - return defaultAgentService.getPreviousAuditEvent(t); + return defaultService.getPreviousAuditEvent(t); } /** @@ -234,7 +235,7 @@ public class TransientAgentService implements IAgentService { */ @Override public int count(Class clazz) { - return defaultAgentService.count(clazz); + return defaultService.count(clazz); } /** @@ -249,7 +250,7 @@ public class TransientAgentService implements IAgentService { */ @Override public Pager search(Class clazz, String queryString, Integer pageSize, Integer pageNumber, List orderHints, List propertyPaths) { - return defaultAgentService.search(clazz, queryString, pageSize, pageNumber, orderHints, propertyPaths); + return defaultService.search(clazz, queryString, pageSize, pageNumber, orderHints, propertyPaths); } /** @@ -266,7 +267,7 @@ public class TransientAgentService implements IAgentService { */ @Override public Pager> pageAuditEvents(Class clazz, AuditEvent from, AuditEvent to, List criteria, Integer pageSize, Integer pageValue, AuditEventSort sort, List propertyPaths) { - return defaultAgentService.pageAuditEvents(clazz, from, to, criteria, pageSize, pageValue, sort, propertyPaths); + return defaultService.pageAuditEvents(clazz, from, to, criteria, pageSize, pageValue, sort, propertyPaths); } /** @@ -276,7 +277,7 @@ public class TransientAgentService implements IAgentService { */ @Override public AgentBase find(LSID lsid) { - return defaultAgentService.find(lsid); + return defaultService.find(lsid); } /** @@ -286,7 +287,7 @@ public class TransientAgentService implements IAgentService { */ @Override public DeleteResult delete(AgentBase persistentObject) { - return defaultAgentService.delete(persistentObject); + return defaultService.delete(persistentObject); } /** @@ -300,7 +301,7 @@ public class TransientAgentService implements IAgentService { */ @Override public List groupMarkers(Class clazz, Boolean technical, Integer pageSize, Integer pageNumber, List propertyPaths) { - return defaultAgentService.groupMarkers(clazz, technical, pageSize, pageNumber, propertyPaths); + return defaultService.groupMarkers(clazz, technical, pageSize, pageNumber, propertyPaths); } /** @@ -310,7 +311,7 @@ public class TransientAgentService implements IAgentService { */ @Override public boolean exists(UUID uuid) { - return defaultAgentService.exists(uuid); + return defaultService.exists(uuid); } /** @@ -321,7 +322,7 @@ public class TransientAgentService implements IAgentService { */ @Override public AgentBase replace(AgentBase x, AgentBase y) { - return defaultAgentService.replace(x, y); + return defaultService.replace(x, y); } /** @@ -331,7 +332,7 @@ public class TransientAgentService implements IAgentService { */ @Override public List find(Set uuidSet) { - return defaultAgentService.find(uuidSet); + return defaultService.find(uuidSet); } /** @@ -344,7 +345,7 @@ public class TransientAgentService implements IAgentService { */ @Override public Pager getSources(AgentBase t, Integer pageSize, Integer pageNumber, List propertyPaths) { - return defaultAgentService.getSources(t, pageSize, pageNumber, propertyPaths); + return defaultService.getSources(t, pageSize, pageNumber, propertyPaths); } /** @@ -354,7 +355,7 @@ public class TransientAgentService implements IAgentService { */ @Override public AgentBase find(UUID uuid) { - return defaultAgentService.find(uuid); + return defaultService.find(uuid); } /** @@ -363,7 +364,7 @@ public class TransientAgentService implements IAgentService { */ @Override public List> getPersonUuidAndTitleCache() { - return defaultAgentService.getPersonUuidAndTitleCache(); + return defaultService.getPersonUuidAndTitleCache(); } /** @@ -372,7 +373,7 @@ public class TransientAgentService implements IAgentService { */ @Override public List> getTeamUuidAndTitleCache() { - return defaultAgentService.getTeamUuidAndTitleCache(); + return defaultService.getTeamUuidAndTitleCache(); } /** @@ -382,7 +383,7 @@ public class TransientAgentService implements IAgentService { */ @Override public AgentBase find(int id) { - return defaultAgentService.find(id); + return defaultService.find(id); } /** @@ -395,7 +396,7 @@ public class TransientAgentService implements IAgentService { */ @Override public Pager getRights(AgentBase t, Integer pageSize, Integer pageNumber, List propertyPaths) { - return defaultAgentService.getRights(t, pageSize, pageNumber, propertyPaths); + return defaultService.getRights(t, pageSize, pageNumber, propertyPaths); } /** @@ -406,7 +407,7 @@ public class TransientAgentService implements IAgentService { */ @Override public int countMarkers(Class clazz, Boolean technical) { - return defaultAgentService.countMarkers(clazz, technical); + return defaultService.countMarkers(clazz, technical); } /** @@ -415,7 +416,7 @@ public class TransientAgentService implements IAgentService { */ @Override public List> getTeamUuidAndNomenclaturalTitle() { - return defaultAgentService.getTeamUuidAndNomenclaturalTitle(); + return defaultService.getTeamUuidAndNomenclaturalTitle(); } /** @@ -425,7 +426,7 @@ public class TransientAgentService implements IAgentService { */ @Override public List findById(Set idSet) { - return defaultAgentService.findById(idSet); + return defaultService.findById(idSet); } /** @@ -434,7 +435,7 @@ public class TransientAgentService implements IAgentService { */ @Override public List> getInstitutionUuidAndTitleCache() { - return defaultAgentService.getInstitutionUuidAndTitleCache(); + return defaultService.getInstitutionUuidAndTitleCache(); } /** @@ -446,7 +447,7 @@ public class TransientAgentService implements IAgentService { */ @Override public ISourceable getSourcedObjectByIdInSource(Class clazz, String idInSource, String idNamespace) { - return defaultAgentService.getSourcedObjectByIdInSource(clazz, idInSource, idNamespace); + return defaultService.getSourcedObjectByIdInSource(clazz, idInSource, idNamespace); } /** @@ -455,7 +456,7 @@ public class TransientAgentService implements IAgentService { */ @Override public Session getSession() { - return defaultAgentService.getSession(); + return defaultService.getSession(); } /** @@ -464,7 +465,7 @@ public class TransientAgentService implements IAgentService { */ @Override public List> getUuidAndTitleCache() { - return defaultAgentService.getUuidAndTitleCache(); + return defaultService.getUuidAndTitleCache(); } /** @@ -478,7 +479,7 @@ public class TransientAgentService implements IAgentService { */ @Override public List group(Class clazz, Integer limit, Integer start, List groups, List propertyPaths) { - return defaultAgentService.group(clazz, limit, start, groups, propertyPaths); + return defaultService.group(clazz, limit, start, groups, propertyPaths); } /** @@ -495,7 +496,7 @@ public class TransientAgentService implements IAgentService { */ @Override public Pager findByTitle(Class clazz, String queryString, MatchMode matchmode, List criteria, Integer pageSize, Integer pageNumber, List orderHints, List propertyPaths) { - return defaultAgentService.findByTitle(clazz, queryString, matchmode, criteria, pageSize, pageNumber, orderHints, propertyPaths); + return defaultService.findByTitle(clazz, queryString, matchmode, criteria, pageSize, pageNumber, orderHints, propertyPaths); } /** @@ -509,7 +510,7 @@ public class TransientAgentService implements IAgentService { */ @Override public List list(Class type, Integer limit, Integer start, List orderHints, List propertyPaths) { - return defaultAgentService.list(type, limit, start, orderHints, propertyPaths); + return defaultService.list(type, limit, start, orderHints, propertyPaths); } /** @@ -519,7 +520,7 @@ public class TransientAgentService implements IAgentService { */ @Override public Pager findByTitle(IIdentifiableEntityServiceConfigurator configurator) { - return defaultAgentService.findByTitle(configurator); + return defaultService.findByTitle(configurator); } /** @@ -532,7 +533,7 @@ public class TransientAgentService implements IAgentService { */ @Override public Integer countByTitle(Class clazz, String queryString, MatchMode matchmode, List criteria) { - return defaultAgentService.countByTitle(clazz, queryString, matchmode, criteria); + return defaultService.countByTitle(clazz, queryString, matchmode, criteria); } /** @@ -542,7 +543,7 @@ public class TransientAgentService implements IAgentService { */ @Override public AgentBase load(UUID uuid) { - return defaultAgentService.load(uuid); + return defaultService.load(uuid); } /** @@ -553,7 +554,7 @@ public class TransientAgentService implements IAgentService { */ @Override public AgentBase load(UUID uuid, List propertyPaths) { - return defaultAgentService.load(uuid, propertyPaths); + return defaultService.load(uuid, propertyPaths); } /** @@ -563,7 +564,7 @@ public class TransientAgentService implements IAgentService { */ @Override public Integer countByTitle(IIdentifiableEntityServiceConfigurator configurator) { - return defaultAgentService.countByTitle(configurator); + return defaultService.countByTitle(configurator); } /** @@ -573,7 +574,7 @@ public class TransientAgentService implements IAgentService { */ @Override public AgentBase merge(AgentBase transientObject) { - return defaultAgentService.merge(transientObject); + return defaultService.merge(transientObject); } /** @@ -590,7 +591,7 @@ public class TransientAgentService implements IAgentService { */ @Override public List listByTitle(Class clazz, String queryString, MatchMode matchmode, List criteria, Integer pageSize, Integer pageNumber, List orderHints, List propertyPaths) { - return defaultAgentService.listByTitle(clazz, queryString, matchmode, criteria, pageSize, pageNumber, orderHints, propertyPaths); + return defaultService.listByTitle(clazz, queryString, matchmode, criteria, pageSize, pageNumber, orderHints, propertyPaths); } /** @@ -604,7 +605,7 @@ public class TransientAgentService implements IAgentService { */ @Override public Pager page(Class type, Integer pageSize, Integer pageNumber, List orderHints, List propertyPaths) { - return defaultAgentService.page(type, pageSize, pageNumber, orderHints, propertyPaths); + return defaultService.page(type, pageSize, pageNumber, orderHints, propertyPaths); } /** @@ -614,7 +615,7 @@ public class TransientAgentService implements IAgentService { */ @Override public UUID refresh(AgentBase persistentObject) { - return defaultAgentService.refresh(persistentObject); + return defaultService.refresh(persistentObject); } /** @@ -631,7 +632,7 @@ public class TransientAgentService implements IAgentService { */ @Override public List listByReferenceTitle(Class clazz, String queryString, MatchMode matchmode, List criteria, Integer pageSize, Integer pageNumber, List orderHints, List propertyPaths) { - return defaultAgentService.listByReferenceTitle(clazz, queryString, matchmode, criteria, pageSize, pageNumber, orderHints, propertyPaths); + return defaultService.listByReferenceTitle(clazz, queryString, matchmode, criteria, pageSize, pageNumber, orderHints, propertyPaths); } /** @@ -643,7 +644,7 @@ public class TransientAgentService implements IAgentService { */ @Override public List rows(String tableName, int limit, int start) { - return defaultAgentService.rows(tableName, limit, start); + return defaultService.rows(tableName, limit, start); } /** @@ -693,7 +694,7 @@ public class TransientAgentService implements IAgentService { */ @Override public UUID update(AgentBase transientObject) { - return defaultAgentService.update(transientObject); + return defaultService.update(transientObject); } /** @@ -708,7 +709,7 @@ public class TransientAgentService implements IAgentService { */ @Override public List list(AgentBase example, Set includeProperties, Integer limit, Integer start, List orderHints, List propertyPaths) { - return defaultAgentService.list(example, includeProperties, limit, start, orderHints, propertyPaths); + return defaultService.list(example, includeProperties, limit, start, orderHints, propertyPaths); } /** @@ -720,7 +721,7 @@ public class TransientAgentService implements IAgentService { */ @Override public int deduplicate(Class clazz, IMatchStrategy matchStrategy, IMergeStrategy mergeStrategy) { - return defaultAgentService.deduplicate(clazz, matchStrategy, mergeStrategy); + return defaultService.deduplicate(clazz, matchStrategy, mergeStrategy); } /** @@ -735,7 +736,7 @@ public class TransientAgentService implements IAgentService { */ @Override public Pager findTitleCache(Class clazz, String queryString, Integer pageSize, Integer pageNumber, List orderHints, MatchMode matchMode) { - return defaultAgentService.findTitleCache(clazz, queryString, pageSize, pageNumber, orderHints, matchMode); + return defaultService.findTitleCache(clazz, queryString, pageSize, pageNumber, orderHints, matchMode); } @Override @@ -747,9 +748,12 @@ public class TransientAgentService implements IAgentService { @Override public AgentBase findWithoutFlush(UUID uuid) { - return defaultAgentService.findWithoutFlush(uuid); + return defaultService.findWithoutFlush(uuid); }; - + @Override + public List listByIdentifier(Class clazz, String identifier, DefinedTerm identifierType, MatchMode matchmode, Integer pageSize, Integer pageNumber, List orderHints, List propertyPaths){ + return defaultService.listByIdentifier(clazz, identifier, identifierType, matchmode, pageSize, pageNumber, orderHints, propertyPaths); + } } 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 a5e586377..ff1e8f702 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 @@ -27,6 +27,7 @@ import eu.etaxonomy.cdm.api.service.config.IIdentifiableEntityServiceConfigurato import eu.etaxonomy.cdm.api.service.pager.Pager; import eu.etaxonomy.cdm.common.monitor.IProgressMonitor; 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.IdentifiableSource; import eu.etaxonomy.cdm.model.common.LSID; @@ -57,13 +58,13 @@ import eu.etaxonomy.cdm.strategy.merge.IMergeStrategy; */ public class TransientClassificationService implements IClassificationService { - private final IClassificationService defaultClassificationService; + private final IClassificationService defaultService; /** * @param defaultClassificationService */ public TransientClassificationService(IClassificationService defaultClassificationService) { - this.defaultClassificationService = defaultClassificationService; + this.defaultService = defaultClassificationService; } /** @@ -77,7 +78,7 @@ public class TransientClassificationService implements IClassificationService { */ @Override public Pager> pageAuditEvents(Classification t, Integer pageSize, Integer pageNumber, AuditEventSort sort, List propertyPaths) { - return defaultClassificationService.pageAuditEvents(t, pageSize, pageNumber, sort, propertyPaths); + return defaultService.pageAuditEvents(t, pageSize, pageNumber, sort, propertyPaths); } /** @@ -92,7 +93,7 @@ public class TransientClassificationService implements IClassificationService { */ @Override public Pager getAnnotations(Classification annotatedObj, MarkerType status, Integer pageSize, Integer pageNumber, List orderHints, List propertyPaths) { - return defaultClassificationService.getAnnotations(annotatedObj, status, pageSize, pageNumber, orderHints, propertyPaths); + return defaultService.getAnnotations(annotatedObj, status, pageSize, pageNumber, orderHints, propertyPaths); } /** @@ -102,7 +103,7 @@ public class TransientClassificationService implements IClassificationService { */ @Override public TaxonNode getTaxonNodeByUuid(UUID uuid) { - return defaultClassificationService.getTaxonNodeByUuid(uuid); + return defaultService.getTaxonNodeByUuid(uuid); } /** @@ -112,7 +113,7 @@ public class TransientClassificationService implements IClassificationService { */ @Override public ITaxonTreeNode getTreeNodeByUuid(UUID uuid) { - return defaultClassificationService.getTreeNodeByUuid(uuid); + return defaultService.getTreeNodeByUuid(uuid); } /** @@ -121,7 +122,7 @@ public class TransientClassificationService implements IClassificationService { */ @Override public void clear() { - defaultClassificationService.clear(); + defaultService.clear(); } /** @@ -134,7 +135,7 @@ public class TransientClassificationService implements IClassificationService { */ @Override public List listClassifications(Integer limit, Integer start, List orderHints, List propertyPaths) { - return defaultClassificationService.listClassifications(limit, start, orderHints, propertyPaths); + return defaultService.listClassifications(limit, start, orderHints, propertyPaths); } /** @@ -144,7 +145,7 @@ public class TransientClassificationService implements IClassificationService { */ @Override public void lock(Classification t, LockOptions lockOptions) { - defaultClassificationService.lock(t, lockOptions); + defaultService.lock(t, lockOptions); } /** @@ -155,7 +156,7 @@ public class TransientClassificationService implements IClassificationService { */ @Override public void refresh(Classification t, LockOptions lockOptions, List propertyPaths) { - defaultClassificationService.refresh(t, lockOptions, propertyPaths); + defaultService.refresh(t, lockOptions, propertyPaths); } /** @@ -169,7 +170,7 @@ public class TransientClassificationService implements IClassificationService { @Deprecated @Override public TaxonNode loadTaxonNodeByTaxon(Taxon taxon, UUID classificationUuid, List propertyPaths) { - return defaultClassificationService.loadTaxonNodeByTaxon(taxon, classificationUuid, propertyPaths); + return defaultService.loadTaxonNodeByTaxon(taxon, classificationUuid, propertyPaths); } /** @@ -178,7 +179,7 @@ public class TransientClassificationService implements IClassificationService { */ @Override public void updateTitleCache() { - defaultClassificationService.updateTitleCache(); + defaultService.updateTitleCache(); } /** @@ -188,7 +189,7 @@ public class TransientClassificationService implements IClassificationService { */ @Override public AuditEventRecord getNextAuditEvent(Classification t) { - return defaultClassificationService.getNextAuditEvent(t); + return defaultService.getNextAuditEvent(t); } /** @@ -203,7 +204,7 @@ public class TransientClassificationService implements IClassificationService { */ @Override public Pager getMarkers(Classification annotatableEntity, Boolean technical, Integer pageSize, Integer pageNumber, List orderHints, List propertyPaths) { - return defaultClassificationService.getMarkers(annotatableEntity, technical, pageSize, pageNumber, orderHints, propertyPaths); + return defaultService.getMarkers(annotatableEntity, technical, pageSize, pageNumber, orderHints, propertyPaths); } /** @@ -215,7 +216,7 @@ public class TransientClassificationService implements IClassificationService { */ @Override public void updateTitleCache(Class clazz, Integer stepSize, IIdentifiableEntityCacheStrategy cacheStrategy, IProgressMonitor monitor) { - defaultClassificationService.updateTitleCache(clazz, stepSize, cacheStrategy, monitor); + defaultService.updateTitleCache(clazz, stepSize, cacheStrategy, monitor); } /** @@ -228,7 +229,7 @@ public class TransientClassificationService implements IClassificationService { @Deprecated @Override public TaxonNode loadTaxonNode(TaxonNode taxonNode, List propertyPaths) { - return defaultClassificationService.loadTaxonNode(taxonNode, propertyPaths); + return defaultService.loadTaxonNode(taxonNode, propertyPaths); } /** @@ -238,7 +239,7 @@ public class TransientClassificationService implements IClassificationService { */ @Override public AuditEventRecord getPreviousAuditEvent(Classification t) { - return defaultClassificationService.getPreviousAuditEvent(t); + return defaultService.getPreviousAuditEvent(t); } /** @@ -254,7 +255,7 @@ public class TransientClassificationService implements IClassificationService { @Deprecated @Override public List loadRankSpecificRootNodes(Classification classification, Rank rank, Integer limit, Integer start, List propertyPaths) { - return defaultClassificationService.loadRankSpecificRootNodes(classification, rank, limit, start, propertyPaths); + return defaultService.loadRankSpecificRootNodes(classification, rank, limit, start, propertyPaths); } /** @@ -264,7 +265,7 @@ public class TransientClassificationService implements IClassificationService { */ @Override public int count(Class clazz) { - return defaultClassificationService.count(clazz); + return defaultService.count(clazz); } /** @@ -281,7 +282,7 @@ public class TransientClassificationService implements IClassificationService { */ @Override public Pager> pageAuditEvents(Class clazz, AuditEvent from, AuditEvent to, List criteria, Integer pageSize, Integer pageValue, AuditEventSort sort, List propertyPaths) { - return defaultClassificationService.pageAuditEvents(clazz, from, to, criteria, pageSize, pageValue, sort, propertyPaths); + return defaultService.pageAuditEvents(clazz, from, to, criteria, pageSize, pageValue, sort, propertyPaths); } /** @@ -291,7 +292,7 @@ public class TransientClassificationService implements IClassificationService { */ @Override public Classification find(LSID lsid) { - return defaultClassificationService.find(lsid); + return defaultService.find(lsid); } /** @@ -301,7 +302,7 @@ public class TransientClassificationService implements IClassificationService { */ @Override public DeleteResult delete(Classification persistentObject) { - return defaultClassificationService.delete(persistentObject); + return defaultService.delete(persistentObject); } /** @@ -315,7 +316,7 @@ public class TransientClassificationService implements IClassificationService { */ @Override public List groupMarkers(Class clazz, Boolean technical, Integer pageSize, Integer pageNumber, List propertyPaths) { - return defaultClassificationService.groupMarkers(clazz, technical, pageSize, pageNumber, propertyPaths); + return defaultService.groupMarkers(clazz, technical, pageSize, pageNumber, propertyPaths); } /** @@ -325,7 +326,7 @@ public class TransientClassificationService implements IClassificationService { */ @Override public boolean exists(UUID uuid) { - return defaultClassificationService.exists(uuid); + return defaultService.exists(uuid); } /** @@ -336,7 +337,7 @@ public class TransientClassificationService implements IClassificationService { */ @Override public Classification replace(Classification x, Classification y) { - return defaultClassificationService.replace(x, y); + return defaultService.replace(x, y); } /** @@ -346,7 +347,7 @@ public class TransientClassificationService implements IClassificationService { */ @Override public List find(Set uuidSet) { - return defaultClassificationService.find(uuidSet); + return defaultService.find(uuidSet); } /** @@ -359,7 +360,7 @@ public class TransientClassificationService implements IClassificationService { */ @Override public Pager getSources(Classification t, Integer pageSize, Integer pageNumber, List propertyPaths) { - return defaultClassificationService.getSources(t, pageSize, pageNumber, propertyPaths); + return defaultService.getSources(t, pageSize, pageNumber, propertyPaths); } /** @@ -373,7 +374,7 @@ public class TransientClassificationService implements IClassificationService { */ @Override public List listRankSpecificRootNodes(Classification classification, Rank rank, Integer pageSize, Integer pageIndex, List propertyPaths) { - return defaultClassificationService.listRankSpecificRootNodes(classification, rank, pageSize, pageIndex, propertyPaths); + return defaultService.listRankSpecificRootNodes(classification, rank, pageSize, pageIndex, propertyPaths); } /** @@ -383,7 +384,7 @@ public class TransientClassificationService implements IClassificationService { */ @Override public Classification find(UUID uuid) { - return defaultClassificationService.find(uuid); + return defaultService.find(uuid); } /** @@ -393,7 +394,7 @@ public class TransientClassificationService implements IClassificationService { */ @Override public Classification find(int id) { - return defaultClassificationService.find(id); + return defaultService.find(id); } /** @@ -406,7 +407,7 @@ public class TransientClassificationService implements IClassificationService { */ @Override public Pager getRights(Classification t, Integer pageSize, Integer pageNumber, List propertyPaths) { - return defaultClassificationService.getRights(t, pageSize, pageNumber, propertyPaths); + return defaultService.getRights(t, pageSize, pageNumber, propertyPaths); } /** @@ -417,7 +418,7 @@ public class TransientClassificationService implements IClassificationService { */ @Override public int countMarkers(Class clazz, Boolean technical) { - return defaultClassificationService.countMarkers(clazz, technical); + return defaultService.countMarkers(clazz, technical); } /** @@ -427,7 +428,7 @@ public class TransientClassificationService implements IClassificationService { */ @Override public List findById(Set idSet) { - return defaultClassificationService.findById(idSet); + return defaultService.findById(idSet); } /** @@ -439,7 +440,7 @@ public class TransientClassificationService implements IClassificationService { */ @Override public ISourceable getSourcedObjectByIdInSource(Class clazz, String idInSource, String idNamespace) { - return defaultClassificationService.getSourcedObjectByIdInSource(clazz, idInSource, idNamespace); + return defaultService.getSourcedObjectByIdInSource(clazz, idInSource, idNamespace); } /** @@ -453,7 +454,7 @@ public class TransientClassificationService implements IClassificationService { */ @Override public Pager pageRankSpecificRootNodes(Classification classification, Rank rank, Integer pageSize, Integer pageIndex, List propertyPaths) { - return defaultClassificationService.pageRankSpecificRootNodes(classification, rank, pageSize, pageIndex, propertyPaths); + return defaultService.pageRankSpecificRootNodes(classification, rank, pageSize, pageIndex, propertyPaths); } /** @@ -462,7 +463,7 @@ public class TransientClassificationService implements IClassificationService { */ @Override public Session getSession() { - return defaultClassificationService.getSession(); + return defaultService.getSession(); } /** @@ -471,7 +472,7 @@ public class TransientClassificationService implements IClassificationService { */ @Override public List> getUuidAndTitleCache() { - return defaultClassificationService.getUuidAndTitleCache(); + return defaultService.getUuidAndTitleCache(); } /** @@ -485,7 +486,7 @@ public class TransientClassificationService implements IClassificationService { */ @Override public List group(Class clazz, Integer limit, Integer start, List groups, List propertyPaths) { - return defaultClassificationService.group(clazz, limit, start, groups, propertyPaths); + return defaultService.group(clazz, limit, start, groups, propertyPaths); } /** @@ -502,7 +503,7 @@ public class TransientClassificationService implements IClassificationService { */ @Override public Pager findByTitle(Class clazz, String queryString, MatchMode matchmode, List criteria, Integer pageSize, Integer pageNumber, List orderHints, List propertyPaths) { - return defaultClassificationService.findByTitle(clazz, queryString, matchmode, criteria, pageSize, pageNumber, orderHints, propertyPaths); + return defaultService.findByTitle(clazz, queryString, matchmode, criteria, pageSize, pageNumber, orderHints, propertyPaths); } /** @@ -514,7 +515,7 @@ public class TransientClassificationService implements IClassificationService { */ @Override public List loadTreeBranch(TaxonNode taxonNode, Rank baseRank, List propertyPaths) { - return defaultClassificationService.loadTreeBranch(taxonNode, baseRank, propertyPaths); + return defaultService.loadTreeBranch(taxonNode, baseRank, propertyPaths); } /** @@ -528,7 +529,7 @@ public class TransientClassificationService implements IClassificationService { */ @Override public List list(Class type, Integer limit, Integer start, List orderHints, List propertyPaths) { - return defaultClassificationService.list(type, limit, start, orderHints, propertyPaths); + return defaultService.list(type, limit, start, orderHints, propertyPaths); } /** @@ -541,7 +542,7 @@ public class TransientClassificationService implements IClassificationService { */ @Override public List loadTreeBranchToTaxon(Taxon taxon, Classification classification, Rank baseRank, List propertyPaths) { - return defaultClassificationService.loadTreeBranchToTaxon(taxon, classification, baseRank, propertyPaths); + return defaultService.loadTreeBranchToTaxon(taxon, classification, baseRank, propertyPaths); } /** @@ -551,7 +552,7 @@ public class TransientClassificationService implements IClassificationService { */ @Override public Pager findByTitle(IIdentifiableEntityServiceConfigurator configurator) { - return defaultClassificationService.findByTitle(configurator); + return defaultService.findByTitle(configurator); } /** @@ -564,7 +565,7 @@ public class TransientClassificationService implements IClassificationService { */ @Override public Integer countByTitle(Class clazz, String queryString, MatchMode matchmode, List criteria) { - return defaultClassificationService.countByTitle(clazz, queryString, matchmode, criteria); + return defaultService.countByTitle(clazz, queryString, matchmode, criteria); } /** @@ -574,7 +575,7 @@ public class TransientClassificationService implements IClassificationService { */ @Override public Classification load(UUID uuid) { - return defaultClassificationService.load(uuid); + return defaultService.load(uuid); } /** @@ -585,7 +586,7 @@ public class TransientClassificationService implements IClassificationService { */ @Override public Classification load(UUID uuid, List propertyPaths) { - return defaultClassificationService.load(uuid, propertyPaths); + return defaultService.load(uuid, propertyPaths); } /** @@ -595,7 +596,7 @@ public class TransientClassificationService implements IClassificationService { */ @Override public Integer countByTitle(IIdentifiableEntityServiceConfigurator configurator) { - return defaultClassificationService.countByTitle(configurator); + return defaultService.countByTitle(configurator); } /** @@ -605,7 +606,7 @@ public class TransientClassificationService implements IClassificationService { */ @Override public Classification merge(Classification transientObject) { - return defaultClassificationService.merge(transientObject); + return defaultService.merge(transientObject); } /** @@ -622,7 +623,7 @@ public class TransientClassificationService implements IClassificationService { */ @Override public List listByTitle(Class clazz, String queryString, MatchMode matchmode, List criteria, Integer pageSize, Integer pageNumber, List orderHints, List propertyPaths) { - return defaultClassificationService.listByTitle(clazz, queryString, matchmode, criteria, pageSize, pageNumber, orderHints, propertyPaths); + return defaultService.listByTitle(clazz, queryString, matchmode, criteria, pageSize, pageNumber, orderHints, propertyPaths); } /** @@ -636,7 +637,7 @@ public class TransientClassificationService implements IClassificationService { */ @Override public Pager page(Class type, Integer pageSize, Integer pageNumber, List orderHints, List propertyPaths) { - return defaultClassificationService.page(type, pageSize, pageNumber, orderHints, propertyPaths); + return defaultService.page(type, pageSize, pageNumber, orderHints, propertyPaths); } /** @@ -649,7 +650,7 @@ public class TransientClassificationService implements IClassificationService { @Deprecated @Override public List loadChildNodesOfTaxonNode(TaxonNode taxonNode, List propertyPaths) { - return defaultClassificationService.loadChildNodesOfTaxonNode(taxonNode, propertyPaths); + return defaultService.loadChildNodesOfTaxonNode(taxonNode, propertyPaths); } /** @@ -659,7 +660,7 @@ public class TransientClassificationService implements IClassificationService { */ @Override public List> getTaxonNodeUuidAndTitleCacheOfAcceptedTaxaByClassification(Classification classification) { - return defaultClassificationService.getTaxonNodeUuidAndTitleCacheOfAcceptedTaxaByClassification(classification); + return defaultService.getTaxonNodeUuidAndTitleCacheOfAcceptedTaxaByClassification(classification); } /** @@ -677,7 +678,7 @@ public class TransientClassificationService implements IClassificationService { @Deprecated @Override public Map> getAllMediaForChildNodes(Taxon taxon, Classification taxTree, List propertyPaths, int size, int height, int widthOrDuration, String[] mimeTypes) { - return defaultClassificationService.getAllMediaForChildNodes(taxon, taxTree, propertyPaths, size, height, widthOrDuration, mimeTypes); + return defaultService.getAllMediaForChildNodes(taxon, taxTree, propertyPaths, size, height, widthOrDuration, mimeTypes); } /** @@ -687,7 +688,7 @@ public class TransientClassificationService implements IClassificationService { */ @Override public UUID refresh(Classification persistentObject) { - return defaultClassificationService.refresh(persistentObject); + return defaultService.refresh(persistentObject); } /** @@ -704,7 +705,7 @@ public class TransientClassificationService implements IClassificationService { */ @Override public List listByReferenceTitle(Class clazz, String queryString, MatchMode matchmode, List criteria, Integer pageSize, Integer pageNumber, List orderHints, List propertyPaths) { - return defaultClassificationService.listByReferenceTitle(clazz, queryString, matchmode, criteria, pageSize, pageNumber, orderHints, propertyPaths); + return defaultService.listByReferenceTitle(clazz, queryString, matchmode, criteria, pageSize, pageNumber, orderHints, propertyPaths); } /** @@ -719,7 +720,7 @@ public class TransientClassificationService implements IClassificationService { */ @Override public Map> getAllMediaForChildNodes(TaxonNode taxonNode, List propertyPaths, int size, int height, int widthOrDuration, String[] mimeTypes) { - return defaultClassificationService.getAllMediaForChildNodes(taxonNode, propertyPaths, size, height, widthOrDuration, mimeTypes); + return defaultService.getAllMediaForChildNodes(taxonNode, propertyPaths, size, height, widthOrDuration, mimeTypes); } /** @@ -731,7 +732,7 @@ public class TransientClassificationService implements IClassificationService { */ @Override public List rows(String tableName, int limit, int start) { - return defaultClassificationService.rows(tableName, limit, start); + return defaultService.rows(tableName, limit, start); } /** @@ -753,7 +754,7 @@ public class TransientClassificationService implements IClassificationService { @Deprecated @Override public UUID removeTaxonNode(TaxonNode taxonNode) { - return defaultClassificationService.removeTaxonNode(taxonNode); + return defaultService.removeTaxonNode(taxonNode); } /** @@ -807,7 +808,7 @@ public class TransientClassificationService implements IClassificationService { */ @Override public UUID removeTreeNode(ITaxonTreeNode treeNode) { - return defaultClassificationService.removeTreeNode(treeNode); + return defaultService.removeTreeNode(treeNode); } /** @@ -822,7 +823,7 @@ public class TransientClassificationService implements IClassificationService { */ @Override public Pager search(Class clazz, String queryString, Integer pageSize, Integer pageNumber, List orderHints, List propertyPaths) { - return defaultClassificationService.search(clazz, queryString, pageSize, pageNumber, orderHints, propertyPaths); + return defaultService.search(clazz, queryString, pageSize, pageNumber, orderHints, propertyPaths); } /** @@ -851,7 +852,7 @@ public class TransientClassificationService implements IClassificationService { */ @Override public List getAllNodes() { - return defaultClassificationService.getAllNodes(); + return defaultService.getAllNodes(); } /** @@ -861,7 +862,7 @@ public class TransientClassificationService implements IClassificationService { */ @Override public UUID update(Classification transientObject) { - return defaultClassificationService.update(transientObject); + return defaultService.update(transientObject); } /** @@ -876,7 +877,7 @@ public class TransientClassificationService implements IClassificationService { */ @Override public List list(Classification example, Set includeProperties, Integer limit, Integer start, List orderHints, List propertyPaths) { - return defaultClassificationService.list(example, includeProperties, limit, start, orderHints, propertyPaths); + return defaultService.list(example, includeProperties, limit, start, orderHints, propertyPaths); } /** @@ -888,7 +889,7 @@ public class TransientClassificationService implements IClassificationService { */ @Override public int deduplicate(Class clazz, IMatchStrategy matchStrategy, IMergeStrategy mergeStrategy) { - return defaultClassificationService.deduplicate(clazz, matchStrategy, mergeStrategy); + return defaultService.deduplicate(clazz, matchStrategy, mergeStrategy); } /** @@ -903,7 +904,7 @@ public class TransientClassificationService implements IClassificationService { */ @Override public Pager findTitleCache(Class clazz, String queryString, Integer pageSize, Integer pageNumber, List orderHints, MatchMode matchMode) { - return defaultClassificationService.findTitleCache(clazz, queryString, pageSize, pageNumber, orderHints, matchMode); + return defaultService.findTitleCache(clazz, queryString, pageSize, pageNumber, orderHints, matchMode); } /* (non-Javadoc) @@ -912,7 +913,7 @@ public class TransientClassificationService implements IClassificationService { @Override public List listChildNodesOfTaxon(UUID taxonUuid, UUID classificationUuid, Integer pageSize, Integer pageIndex, List propertyPaths) { - return defaultClassificationService.listChildNodesOfTaxon(taxonUuid, classificationUuid, pageSize, pageIndex, propertyPaths); + return defaultService.listChildNodesOfTaxon(taxonUuid, classificationUuid, pageSize, pageIndex, propertyPaths); } @Override @@ -924,9 +925,12 @@ public class TransientClassificationService implements IClassificationService { @Override public Classification findWithoutFlush(UUID uuid) { - return defaultClassificationService.findWithoutFlush(uuid); + return defaultService.findWithoutFlush(uuid); } - + @Override + public List listByIdentifier(Class clazz, String identifier, DefinedTerm identifierType, MatchMode matchmode, Integer pageSize, Integer pageNumber, List orderHints, List propertyPaths){ + return defaultService.listByIdentifier(clazz, identifier, identifierType, matchmode, pageSize, pageNumber, orderHints, propertyPaths); + } } 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 b5c5e6f17..5a241ae82 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 @@ -26,6 +26,7 @@ import eu.etaxonomy.cdm.api.service.config.IIdentifiableEntityServiceConfigurato import eu.etaxonomy.cdm.api.service.pager.Pager; import eu.etaxonomy.cdm.common.monitor.IProgressMonitor; 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.IdentifiableSource; import eu.etaxonomy.cdm.model.common.LSID; @@ -697,5 +698,8 @@ public class TransientCollectionService implements ICollectionService { return defaultService.list(example, includeProperties, limit, start, orderHints, propertyPaths); } - + @Override + public List listByIdentifier(Class clazz, String identifier, DefinedTerm identifierType, MatchMode matchmode, Integer pageSize, Integer pageNumber, List orderHints, List propertyPaths){ + return defaultService.listByIdentifier(clazz, identifier, identifierType, matchmode, pageSize, pageNumber, orderHints, propertyPaths); + } } 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 f80c4cb8a..0a9492765 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 @@ -67,13 +67,13 @@ import eu.etaxonomy.cdm.strategy.merge.IMergeStrategy; */ public class TransientDescriptionService implements IDescriptionService { - private final IDescriptionService defaultDescriptionService; + private final IDescriptionService defaultService; /** * @param defaultDescriptionService */ public TransientDescriptionService(IDescriptionService defaultDescriptionService) { - this.defaultDescriptionService = defaultDescriptionService; + this.defaultService = defaultDescriptionService; } /** @@ -87,7 +87,7 @@ public class TransientDescriptionService implements IDescriptionService { */ @Override public Pager> pageAuditEvents(DescriptionBase t, Integer pageSize, Integer pageNumber, AuditEventSort sort, List propertyPaths) { - return defaultDescriptionService.pageAuditEvents(t, pageSize, pageNumber, sort, propertyPaths); + return defaultService.pageAuditEvents(t, pageSize, pageNumber, sort, propertyPaths); } /** @@ -102,7 +102,7 @@ public class TransientDescriptionService implements IDescriptionService { */ @Override public Pager getAnnotations(DescriptionBase annotatedObj, MarkerType status, Integer pageSize, Integer pageNumber, List orderHints, List propertyPaths) { - return defaultDescriptionService.getAnnotations(annotatedObj, status, pageSize, pageNumber, orderHints, propertyPaths); + return defaultService.getAnnotations(annotatedObj, status, pageSize, pageNumber, orderHints, propertyPaths); } /** @@ -111,7 +111,7 @@ public class TransientDescriptionService implements IDescriptionService { */ @Override public void clear() { - defaultDescriptionService.clear(); + defaultService.clear(); } /** @@ -121,7 +121,7 @@ public class TransientDescriptionService implements IDescriptionService { */ @Override public void lock(DescriptionBase t, LockOptions lockOptions) { - defaultDescriptionService.lock(t, lockOptions); + defaultService.lock(t, lockOptions); } /** @@ -132,7 +132,7 @@ public class TransientDescriptionService implements IDescriptionService { */ @Override public void refresh(DescriptionBase t, LockOptions lockOptions, List propertyPaths) { - defaultDescriptionService.refresh(t, lockOptions, propertyPaths); + defaultService.refresh(t, lockOptions, propertyPaths); } /** @@ -141,7 +141,7 @@ public class TransientDescriptionService implements IDescriptionService { */ @Override public void updateTitleCache() { - defaultDescriptionService.updateTitleCache(); + defaultService.updateTitleCache(); } /** @@ -151,7 +151,7 @@ public class TransientDescriptionService implements IDescriptionService { */ @Override public AuditEventRecord getNextAuditEvent(DescriptionBase t) { - return defaultDescriptionService.getNextAuditEvent(t); + return defaultService.getNextAuditEvent(t); } /** @@ -162,7 +162,7 @@ public class TransientDescriptionService implements IDescriptionService { @Deprecated @Override public TermVocabulary getDefaultFeatureVocabulary() { - return defaultDescriptionService.getDefaultFeatureVocabulary(); + return defaultService.getDefaultFeatureVocabulary(); } /** @@ -177,7 +177,7 @@ public class TransientDescriptionService implements IDescriptionService { */ @Override public Pager getMarkers(DescriptionBase annotatableEntity, Boolean technical, Integer pageSize, Integer pageNumber, List orderHints, List propertyPaths) { - return defaultDescriptionService.getMarkers(annotatableEntity, technical, pageSize, pageNumber, orderHints, propertyPaths); + return defaultService.getMarkers(annotatableEntity, technical, pageSize, pageNumber, orderHints, propertyPaths); } /** @@ -189,7 +189,7 @@ public class TransientDescriptionService implements IDescriptionService { @Deprecated @Override public TermVocabulary getFeatureVocabulary(UUID uuid) { - return defaultDescriptionService.getFeatureVocabulary(uuid); + return defaultService.getFeatureVocabulary(uuid); } /** @@ -201,7 +201,7 @@ public class TransientDescriptionService implements IDescriptionService { */ @Override public void updateTitleCache(Class clazz, Integer stepSize, IIdentifiableEntityCacheStrategy cacheStrategy, IProgressMonitor monitor) { - defaultDescriptionService.updateTitleCache(clazz, stepSize, cacheStrategy, monitor); + defaultService.updateTitleCache(clazz, stepSize, cacheStrategy, monitor); } /** @@ -211,7 +211,7 @@ public class TransientDescriptionService implements IDescriptionService { */ @Override public AuditEventRecord getPreviousAuditEvent(DescriptionBase t) { - return defaultDescriptionService.getPreviousAuditEvent(t); + return defaultService.getPreviousAuditEvent(t); } /** @@ -221,7 +221,7 @@ public class TransientDescriptionService implements IDescriptionService { */ @Override public DescriptionElementBase getDescriptionElementByUuid(UUID uuid) { - return defaultDescriptionService.getDescriptionElementByUuid(uuid); + return defaultService.getDescriptionElementByUuid(uuid); } /** @@ -231,7 +231,7 @@ public class TransientDescriptionService implements IDescriptionService { */ @Override public int count(Class clazz) { - return defaultDescriptionService.count(clazz); + return defaultService.count(clazz); } /** @@ -242,7 +242,7 @@ public class TransientDescriptionService implements IDescriptionService { */ @Override public DescriptionElementBase loadDescriptionElement(UUID uuid, List propertyPaths) { - return defaultDescriptionService.loadDescriptionElement(uuid, propertyPaths); + return defaultService.loadDescriptionElement(uuid, propertyPaths); } /** @@ -259,7 +259,7 @@ public class TransientDescriptionService implements IDescriptionService { */ @Override public Pager> pageAuditEvents(Class clazz, AuditEvent from, AuditEvent to, List criteria, Integer pageSize, Integer pageValue, AuditEventSort sort, List propertyPaths) { - return defaultDescriptionService.pageAuditEvents(clazz, from, to, criteria, pageSize, pageValue, sort, propertyPaths); + return defaultService.pageAuditEvents(clazz, from, to, criteria, pageSize, pageValue, sort, propertyPaths); } /** @@ -269,7 +269,7 @@ public class TransientDescriptionService implements IDescriptionService { */ @Override public DescriptionBase find(LSID lsid) { - return defaultDescriptionService.find(lsid); + return defaultService.find(lsid); } /** @@ -279,7 +279,7 @@ public class TransientDescriptionService implements IDescriptionService { */ @Override public DeleteResult delete(DescriptionBase persistentObject) { - return defaultDescriptionService.delete(persistentObject); + return defaultService.delete(persistentObject); } /** @@ -293,7 +293,7 @@ public class TransientDescriptionService implements IDescriptionService { */ @Override public List groupMarkers(Class clazz, Boolean technical, Integer pageSize, Integer pageNumber, List propertyPaths) { - return defaultDescriptionService.groupMarkers(clazz, technical, pageSize, pageNumber, propertyPaths); + return defaultService.groupMarkers(clazz, technical, pageSize, pageNumber, propertyPaths); } /** @@ -303,7 +303,7 @@ public class TransientDescriptionService implements IDescriptionService { */ @Override public boolean exists(UUID uuid) { - return defaultDescriptionService.exists(uuid); + return defaultService.exists(uuid); } /** @@ -314,7 +314,7 @@ public class TransientDescriptionService implements IDescriptionService { */ @Override public DescriptionBase replace(DescriptionBase x, DescriptionBase y) { - return defaultDescriptionService.replace(x, y); + return defaultService.replace(x, y); } /** @@ -334,7 +334,7 @@ public class TransientDescriptionService implements IDescriptionService { */ @Override public List find(Set uuidSet) { - return defaultDescriptionService.find(uuidSet); + return defaultService.find(uuidSet); } /** @@ -357,7 +357,7 @@ public class TransientDescriptionService implements IDescriptionService { */ @Override public Pager getSources(DescriptionBase t, Integer pageSize, Integer pageNumber, List propertyPaths) { - return defaultDescriptionService.getSources(t, pageSize, pageNumber, propertyPaths); + return defaultService.getSources(t, pageSize, pageNumber, propertyPaths); } /** @@ -367,7 +367,7 @@ public class TransientDescriptionService implements IDescriptionService { */ @Override public UUID deleteDescriptionElement(DescriptionElementBase descriptionElement) { - return defaultDescriptionService.deleteDescriptionElement(descriptionElement); + return defaultService.deleteDescriptionElement(descriptionElement); } /** @@ -377,7 +377,7 @@ public class TransientDescriptionService implements IDescriptionService { */ @Override public DescriptionBase find(UUID uuid) { - return defaultDescriptionService.find(uuid); + return defaultService.find(uuid); } /** @@ -394,7 +394,7 @@ public class TransientDescriptionService implements IDescriptionService { */ @Override public Pager page(Class type, Boolean hasMedia, Boolean hasText, Set feature, Integer pageSize, Integer pageNumber, List orderHints, List propertyPaths) { - return defaultDescriptionService.page(type, hasMedia, hasText, feature, pageSize, pageNumber, orderHints, propertyPaths); + return defaultService.page(type, hasMedia, hasText, feature, pageSize, pageNumber, orderHints, propertyPaths); } /** @@ -404,7 +404,7 @@ public class TransientDescriptionService implements IDescriptionService { */ @Override public DescriptionBase find(int id) { - return defaultDescriptionService.find(id); + return defaultService.find(id); } /** @@ -417,7 +417,7 @@ public class TransientDescriptionService implements IDescriptionService { */ @Override public Pager getRights(DescriptionBase t, Integer pageSize, Integer pageNumber, List propertyPaths) { - return defaultDescriptionService.getRights(t, pageSize, pageNumber, propertyPaths); + return defaultService.getRights(t, pageSize, pageNumber, propertyPaths); } /** @@ -428,7 +428,7 @@ public class TransientDescriptionService implements IDescriptionService { */ @Override public int countMarkers(Class clazz, Boolean technical) { - return defaultDescriptionService.countMarkers(clazz, technical); + return defaultService.countMarkers(clazz, technical); } /** @@ -438,7 +438,7 @@ public class TransientDescriptionService implements IDescriptionService { */ @Override public List findById(Set idSet) { - return defaultDescriptionService.findById(idSet); + return defaultService.findById(idSet); } /** @@ -450,7 +450,7 @@ public class TransientDescriptionService implements IDescriptionService { */ @Override public ISourceable getSourcedObjectByIdInSource(Class clazz, String idInSource, String idNamespace) { - return defaultDescriptionService.getSourcedObjectByIdInSource(clazz, idInSource, idNamespace); + return defaultService.getSourcedObjectByIdInSource(clazz, idInSource, idNamespace); } /** @@ -459,7 +459,7 @@ public class TransientDescriptionService implements IDescriptionService { */ @Override public Session getSession() { - return defaultDescriptionService.getSession(); + return defaultService.getSession(); } /** @@ -468,7 +468,7 @@ public class TransientDescriptionService implements IDescriptionService { */ @Override public List> getUuidAndTitleCache() { - return defaultDescriptionService.getUuidAndTitleCache(); + return defaultService.getUuidAndTitleCache(); } /** @@ -482,7 +482,7 @@ public class TransientDescriptionService implements IDescriptionService { */ @Override public List group(Class clazz, Integer limit, Integer start, List groups, List propertyPaths) { - return defaultDescriptionService.group(clazz, limit, start, groups, propertyPaths); + return defaultService.group(clazz, limit, start, groups, propertyPaths); } /** @@ -495,7 +495,7 @@ public class TransientDescriptionService implements IDescriptionService { */ @Override public int count(Class type, Boolean hasImages, Boolean hasText, Set feature) { - return defaultDescriptionService.count(type, hasImages, hasText, feature); + return defaultService.count(type, hasImages, hasText, feature); } /** @@ -512,7 +512,7 @@ public class TransientDescriptionService implements IDescriptionService { */ @Override public Pager findByTitle(Class clazz, String queryString, MatchMode matchmode, List criteria, Integer pageSize, Integer pageNumber, List orderHints, List propertyPaths) { - return defaultDescriptionService.findByTitle(clazz, queryString, matchmode, criteria, pageSize, pageNumber, orderHints, propertyPaths); + return defaultService.findByTitle(clazz, queryString, matchmode, criteria, pageSize, pageNumber, orderHints, propertyPaths); } /** @@ -526,7 +526,7 @@ public class TransientDescriptionService implements IDescriptionService { */ @Override public List list(Class type, Integer limit, Integer start, List orderHints, List propertyPaths) { - return defaultDescriptionService.list(type, limit, start, orderHints, propertyPaths); + return defaultService.list(type, limit, start, orderHints, propertyPaths); } /** @@ -543,7 +543,7 @@ public class TransientDescriptionService implements IDescriptionService { @Deprecated @Override public Pager getDescriptionElements(DescriptionBase description, Set features, Class type, Integer pageSize, Integer pageNumber, List propertyPaths) { - return defaultDescriptionService.getDescriptionElements(description, features, type, pageSize, pageNumber, propertyPaths); + return defaultService.getDescriptionElements(description, features, type, pageSize, pageNumber, propertyPaths); } /** @@ -553,7 +553,7 @@ public class TransientDescriptionService implements IDescriptionService { */ @Override public Pager findByTitle(IIdentifiableEntityServiceConfigurator configurator) { - return defaultDescriptionService.findByTitle(configurator); + return defaultService.findByTitle(configurator); } /** @@ -566,7 +566,7 @@ public class TransientDescriptionService implements IDescriptionService { */ @Override public Integer countByTitle(Class clazz, String queryString, MatchMode matchmode, List criteria) { - return defaultDescriptionService.countByTitle(clazz, queryString, matchmode, criteria); + return defaultService.countByTitle(clazz, queryString, matchmode, criteria); } /** @@ -576,7 +576,7 @@ public class TransientDescriptionService implements IDescriptionService { */ @Override public DescriptionBase load(UUID uuid) { - return defaultDescriptionService.load(uuid); + return defaultService.load(uuid); } /** @@ -587,7 +587,7 @@ public class TransientDescriptionService implements IDescriptionService { */ @Override public DescriptionBase load(UUID uuid, List propertyPaths) { - return defaultDescriptionService.load(uuid, propertyPaths); + return defaultService.load(uuid, propertyPaths); } /** @@ -597,7 +597,7 @@ public class TransientDescriptionService implements IDescriptionService { */ @Override public Integer countByTitle(IIdentifiableEntityServiceConfigurator configurator) { - return defaultDescriptionService.countByTitle(configurator); + return defaultService.countByTitle(configurator); } /** @@ -607,7 +607,7 @@ public class TransientDescriptionService implements IDescriptionService { */ @Override public DescriptionBase merge(DescriptionBase transientObject) { - return defaultDescriptionService.merge(transientObject); + return defaultService.merge(transientObject); } /** @@ -623,7 +623,7 @@ public class TransientDescriptionService implements IDescriptionService { */ @Override public Pager pageDescriptionElements(DescriptionBase description, Class descriptionType, Set features, Class type, Integer pageSize, Integer pageNumber, List propertyPaths) { - return defaultDescriptionService.pageDescriptionElements(description, descriptionType, features, type, pageSize, pageNumber, propertyPaths); + return defaultService.pageDescriptionElements(description, descriptionType, features, type, pageSize, pageNumber, propertyPaths); } /** @@ -640,7 +640,7 @@ public class TransientDescriptionService implements IDescriptionService { */ @Override public List listByTitle(Class clazz, String queryString, MatchMode matchmode, List criteria, Integer pageSize, Integer pageNumber, List orderHints, List propertyPaths) { - return defaultDescriptionService.listByTitle(clazz, queryString, matchmode, criteria, pageSize, pageNumber, orderHints, propertyPaths); + return defaultService.listByTitle(clazz, queryString, matchmode, criteria, pageSize, pageNumber, orderHints, propertyPaths); } /** @@ -654,7 +654,7 @@ public class TransientDescriptionService implements IDescriptionService { */ @Override public Pager page(Class type, Integer pageSize, Integer pageNumber, List orderHints, List propertyPaths) { - return defaultDescriptionService.page(type, pageSize, pageNumber, orderHints, propertyPaths); + return defaultService.page(type, pageSize, pageNumber, orderHints, propertyPaths); } /** @@ -664,7 +664,7 @@ public class TransientDescriptionService implements IDescriptionService { */ @Override public UUID refresh(DescriptionBase persistentObject) { - return defaultDescriptionService.refresh(persistentObject); + return defaultService.refresh(persistentObject); } /** @@ -681,7 +681,7 @@ public class TransientDescriptionService implements IDescriptionService { */ @Override public List listByReferenceTitle(Class clazz, String queryString, MatchMode matchmode, List criteria, Integer pageSize, Integer pageNumber, List orderHints, List propertyPaths) { - return defaultDescriptionService.listByReferenceTitle(clazz, queryString, matchmode, criteria, pageSize, pageNumber, orderHints, propertyPaths); + return defaultService.listByReferenceTitle(clazz, queryString, matchmode, criteria, pageSize, pageNumber, orderHints, propertyPaths); } /** @@ -698,7 +698,7 @@ public class TransientDescriptionService implements IDescriptionService { @Deprecated @Override public List listDescriptionElements(DescriptionBase description, Set features, Class type, Integer pageSize, Integer pageNumber, List propertyPaths) { - return defaultDescriptionService.listDescriptionElements(description, features, type, pageSize, pageNumber, propertyPaths); + return defaultService.listDescriptionElements(description, features, type, pageSize, pageNumber, propertyPaths); } /** @@ -710,7 +710,7 @@ public class TransientDescriptionService implements IDescriptionService { */ @Override public List rows(String tableName, int limit, int start) { - return defaultDescriptionService.rows(tableName, limit, start); + return defaultService.rows(tableName, limit, start); } /** @@ -755,7 +755,7 @@ public class TransientDescriptionService implements IDescriptionService { */ @Override public Pager search(Class clazz, String queryString, Integer pageSize, Integer pageNumber, List orderHints, List propertyPaths) { - return defaultDescriptionService.search(clazz, queryString, pageSize, pageNumber, orderHints, propertyPaths); + return defaultService.search(clazz, queryString, pageSize, pageNumber, orderHints, propertyPaths); } /** @@ -775,7 +775,7 @@ public class TransientDescriptionService implements IDescriptionService { */ @Override public UUID update(DescriptionBase transientObject) { - return defaultDescriptionService.update(transientObject); + return defaultService.update(transientObject); } /** @@ -791,7 +791,7 @@ public class TransientDescriptionService implements IDescriptionService { */ @Override public List listDescriptionElements(DescriptionBase description, Class descriptionType, Set features, Class type, Integer pageSize, Integer pageNumber, List propertyPaths) { - return defaultDescriptionService.listDescriptionElements(description, descriptionType, features, type, pageSize, pageNumber, propertyPaths); + return defaultService.listDescriptionElements(description, descriptionType, features, type, pageSize, pageNumber, propertyPaths); } /** @@ -806,7 +806,7 @@ public class TransientDescriptionService implements IDescriptionService { */ @Override public List list(DescriptionBase example, Set includeProperties, Integer limit, Integer start, List orderHints, List propertyPaths) { - return defaultDescriptionService.list(example, includeProperties, limit, start, orderHints, propertyPaths); + return defaultService.list(example, includeProperties, limit, start, orderHints, propertyPaths); } /** @@ -818,7 +818,7 @@ public class TransientDescriptionService implements IDescriptionService { */ @Override public int deduplicate(Class clazz, IMatchStrategy matchStrategy, IMergeStrategy mergeStrategy) { - return defaultDescriptionService.deduplicate(clazz, matchStrategy, mergeStrategy); + return defaultService.deduplicate(clazz, matchStrategy, mergeStrategy); } /** @@ -833,7 +833,7 @@ public class TransientDescriptionService implements IDescriptionService { */ @Override public Pager getDescriptionElementAnnotations(DescriptionElementBase annotatedObj, MarkerType status, Integer pageSize, Integer pageNumber, List orderHints, List propertyPaths) { - return defaultDescriptionService.getDescriptionElementAnnotations(annotatedObj, status, pageSize, pageNumber, orderHints, propertyPaths); + return defaultService.getDescriptionElementAnnotations(annotatedObj, status, pageSize, pageNumber, orderHints, propertyPaths); } /** @@ -848,7 +848,7 @@ public class TransientDescriptionService implements IDescriptionService { */ @Override public Pager findTitleCache(Class clazz, String queryString, Integer pageSize, Integer pageNumber, List orderHints, MatchMode matchMode) { - return defaultDescriptionService.findTitleCache(clazz, queryString, pageSize, pageNumber, orderHints, matchMode); + return defaultService.findTitleCache(clazz, queryString, pageSize, pageNumber, orderHints, matchMode); } /** @@ -863,7 +863,7 @@ public class TransientDescriptionService implements IDescriptionService { */ @Override public Pager pageTaxonDescriptions(Taxon taxon, Set scopes, Set geographicalScope, Integer pageSize, Integer pageNumber, List propertyPaths) { - return defaultDescriptionService.pageTaxonDescriptions(taxon, scopes, geographicalScope, pageSize, pageNumber, propertyPaths); + return defaultService.pageTaxonDescriptions(taxon, scopes, geographicalScope, pageSize, pageNumber, propertyPaths); } /** @@ -879,7 +879,7 @@ public class TransientDescriptionService implements IDescriptionService { */ @Override public Pager pageTaxonDescriptions(Taxon taxon, Set scopes, Set geographicalScope, Set markerTypes, Integer pageSize, Integer pageNumber, List propertyPaths) { - return defaultDescriptionService.pageTaxonDescriptions(taxon, scopes, geographicalScope, markerTypes, pageSize, pageNumber, propertyPaths); + return defaultService.pageTaxonDescriptions(taxon, scopes, geographicalScope, markerTypes, pageSize, pageNumber, propertyPaths); } /** @@ -894,7 +894,7 @@ public class TransientDescriptionService implements IDescriptionService { */ @Override public List listTaxonDescriptions(Taxon taxon, Set scopes, Set geographicalScope, Integer pageSize, Integer pageNumber, List propertyPaths) { - return defaultDescriptionService.listTaxonDescriptions(taxon, scopes, geographicalScope, pageSize, pageNumber, propertyPaths); + return defaultService.listTaxonDescriptions(taxon, scopes, geographicalScope, pageSize, pageNumber, propertyPaths); } /** @@ -910,7 +910,7 @@ public class TransientDescriptionService implements IDescriptionService { */ @Override public List listTaxonDescriptions(Taxon taxon, Set scopes, Set geographicalScope, Set markerTypes, Integer pageSize, Integer pageNumber, List propertyPaths) { - return defaultDescriptionService.listTaxonDescriptions(taxon, scopes, geographicalScope, markerTypes, pageSize, pageNumber, propertyPaths); + return defaultService.listTaxonDescriptions(taxon, scopes, geographicalScope, markerTypes, pageSize, pageNumber, propertyPaths); } /** @@ -925,7 +925,7 @@ public class TransientDescriptionService implements IDescriptionService { */ @Override public List listTaxonDescriptionMedia(UUID taxonUuid, boolean limitToGalleries, Set markerTypes, Integer pageSize, Integer pageNumber, List propertyPaths) { - return defaultDescriptionService.listTaxonDescriptionMedia(taxonUuid, limitToGalleries, markerTypes, pageSize, pageNumber, propertyPaths); + return defaultService.listTaxonDescriptionMedia(taxonUuid, limitToGalleries, markerTypes, pageSize, pageNumber, propertyPaths); } /** @@ -937,7 +937,7 @@ public class TransientDescriptionService implements IDescriptionService { */ @Override public int countTaxonDescriptionMedia(UUID taxonUuid, boolean limitToGalleries, Set markerTypes) { - return defaultDescriptionService.countTaxonDescriptionMedia(taxonUuid, limitToGalleries, markerTypes); + return defaultService.countTaxonDescriptionMedia(taxonUuid, limitToGalleries, markerTypes); } /** @@ -950,7 +950,7 @@ public class TransientDescriptionService implements IDescriptionService { */ @Override public Pager getTaxonNameDescriptions(TaxonNameBase name, Integer pageSize, Integer pageNumber, List propertyPaths) { - return defaultDescriptionService.getTaxonNameDescriptions(name, pageSize, pageNumber, propertyPaths); + return defaultService.getTaxonNameDescriptions(name, pageSize, pageNumber, propertyPaths); } /** @@ -965,7 +965,7 @@ public class TransientDescriptionService implements IDescriptionService { */ @Override public Pager searchDescriptionByDistribution(Set namedAreas, PresenceAbsenceTerm presence, Integer pageSize, Integer pageNumber, List orderHints, List propertyPaths) { - return defaultDescriptionService.searchDescriptionByDistribution(namedAreas, presence, pageSize, pageNumber, orderHints, propertyPaths); + return defaultService.searchDescriptionByDistribution(namedAreas, presence, pageSize, pageNumber, orderHints, propertyPaths); } /** @@ -980,7 +980,7 @@ public class TransientDescriptionService implements IDescriptionService { */ @Override public Pager searchElements(Class clazz, String queryString, Integer pageSize, Integer pageNumber, List orderHints, List propertyPaths) { - return defaultDescriptionService.searchElements(clazz, queryString, pageSize, pageNumber, orderHints, propertyPaths); + return defaultService.searchElements(clazz, queryString, pageSize, pageNumber, orderHints, propertyPaths); } /** @@ -993,7 +993,7 @@ public class TransientDescriptionService implements IDescriptionService { */ @Override public Pager getMedia(DescriptionElementBase descriptionElement, Integer pageSize, Integer pageNumber, List propertyPaths) { - return defaultDescriptionService.getMedia(descriptionElement, pageSize, pageNumber, propertyPaths); + return defaultService.getMedia(descriptionElement, pageSize, pageNumber, propertyPaths); } /** @@ -1010,7 +1010,7 @@ public class TransientDescriptionService implements IDescriptionService { @Deprecated @Override public List getDescriptionElementsForTaxon(Taxon taxon, Set features, Class type, Integer pageSize, Integer pageNumber, List propertyPaths) { - return defaultDescriptionService.getDescriptionElementsForTaxon(taxon, features, type, pageSize, pageNumber, propertyPaths); + return defaultService.getDescriptionElementsForTaxon(taxon, features, type, pageSize, pageNumber, propertyPaths); } /** @@ -1025,7 +1025,7 @@ public class TransientDescriptionService implements IDescriptionService { */ @Override public List listDescriptionElementsForTaxon(Taxon taxon, Set features, Class type, Integer pageSize, Integer pageNumber, List propertyPaths) { - return defaultDescriptionService.listDescriptionElementsForTaxon(taxon, features, type, pageSize, pageNumber, propertyPaths); + return defaultService.listDescriptionElementsForTaxon(taxon, features, type, pageSize, pageNumber, propertyPaths); } /** @@ -1040,7 +1040,7 @@ public class TransientDescriptionService implements IDescriptionService { */ @Override public Pager pageDescriptionElementsForTaxon(Taxon taxon, Set features, Class type, Integer pageSize, Integer pageNumber, List propertyPaths) { - return defaultDescriptionService.pageDescriptionElementsForTaxon(taxon, features, type, pageSize, pageNumber, propertyPaths); + return defaultService.pageDescriptionElementsForTaxon(taxon, features, type, pageSize, pageNumber, propertyPaths); } /** @@ -1053,7 +1053,7 @@ public class TransientDescriptionService implements IDescriptionService { */ @Override public String generateNaturalLanguageDescription(FeatureTree featureTree, TaxonDescription description, List preferredLanguages, String separator) { - return defaultDescriptionService.generateNaturalLanguageDescription(featureTree, description, preferredLanguages, separator); + return defaultService.generateNaturalLanguageDescription(featureTree, description, preferredLanguages, separator); } /** @@ -1065,7 +1065,7 @@ public class TransientDescriptionService implements IDescriptionService { @Deprecated @Override public boolean hasStructuredData(DescriptionBase description) { - return defaultDescriptionService.hasStructuredData(description); + return defaultService.hasStructuredData(description); } /** @@ -1076,7 +1076,7 @@ public class TransientDescriptionService implements IDescriptionService { */ @Override public void moveDescriptionElementsToDescription(Collection descriptionElements, DescriptionBase targetDescription, boolean isPaste) { - defaultDescriptionService.moveDescriptionElementsToDescription(descriptionElements, targetDescription, isPaste); + defaultService.moveDescriptionElementsToDescription(descriptionElements, targetDescription, isPaste); } /* (non-Javadoc) @@ -1084,7 +1084,7 @@ public class TransientDescriptionService implements IDescriptionService { */ @Override public Pager pageNamedAreasInUse(Integer pageSize, Integer pageNumber, List propertyPaths) { - return defaultDescriptionService.pageNamedAreasInUse(pageSize, pageNumber, propertyPaths); + return defaultService.pageNamedAreasInUse(pageSize, pageNumber, propertyPaths); } /* (non-Javadoc) @@ -1092,7 +1092,7 @@ public class TransientDescriptionService implements IDescriptionService { */ @Override public DistributionTree getOrderedDistributions(Set taxonDescriptions, boolean subAreaPreference, boolean statusOrderPreference, Set hideMarkedAreas, Set omitLevels, List propertyPaths) { - return defaultDescriptionService.getOrderedDistributions(taxonDescriptions, subAreaPreference, statusOrderPreference, hideMarkedAreas, omitLevels, propertyPaths); + return defaultService.getOrderedDistributions(taxonDescriptions, subAreaPreference, statusOrderPreference, hideMarkedAreas, omitLevels, propertyPaths); } @Override @@ -1104,7 +1104,11 @@ public class TransientDescriptionService implements IDescriptionService { @Override public DescriptionBase findWithoutFlush(UUID uuid) { - return defaultDescriptionService.findWithoutFlush(uuid); + return defaultService.findWithoutFlush(uuid); + } + + @Override + public List listByIdentifier(Class clazz, String identifier, DefinedTerm identifierType, MatchMode matchmode, Integer pageSize, Integer pageNumber, List orderHints, List propertyPaths){ + return defaultService.listByIdentifier(clazz, identifier, identifierType, matchmode, pageSize, pageNumber, orderHints, propertyPaths); } - } 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 c676f03ee..ad053c684 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 @@ -35,6 +35,7 @@ import eu.etaxonomy.cdm.api.service.search.SearchResult; import eu.etaxonomy.cdm.common.monitor.IProgressMonitor; import eu.etaxonomy.cdm.model.common.Annotation; import eu.etaxonomy.cdm.model.common.CdmBase; +import eu.etaxonomy.cdm.model.common.DefinedTerm; import eu.etaxonomy.cdm.model.common.ISourceable; import eu.etaxonomy.cdm.model.common.IdentifiableSource; import eu.etaxonomy.cdm.model.common.LSID; @@ -75,13 +76,13 @@ import eu.etaxonomy.cdm.strategy.merge.IMergeStrategy; */ public class TransientNameService implements INameService { - private INameService defaultNameService; + private INameService defaultService; /** * */ public TransientNameService(INameService defaultNameService) { - this.defaultNameService = defaultNameService; + this.defaultService = defaultNameService; } /** @@ -95,7 +96,7 @@ public class TransientNameService implements INameService { */ @Override public Pager> pageAuditEvents(TaxonNameBase t, Integer pageSize, Integer pageNumber, AuditEventSort sort, List propertyPaths) { - return defaultNameService.pageAuditEvents(t, pageSize, pageNumber, sort, propertyPaths); + return defaultService.pageAuditEvents(t, pageSize, pageNumber, sort, propertyPaths); } /** @@ -110,7 +111,7 @@ public class TransientNameService implements INameService { */ @Override public Pager getAnnotations(TaxonNameBase annotatedObj, MarkerType status, Integer pageSize, Integer pageNumber, List orderHints, List propertyPaths) { - return defaultNameService.getAnnotations(annotatedObj, status, pageSize, pageNumber, orderHints, propertyPaths); + return defaultService.getAnnotations(annotatedObj, status, pageSize, pageNumber, orderHints, propertyPaths); } /** @@ -119,7 +120,7 @@ public class TransientNameService implements INameService { */ @Override public void clear() { - defaultNameService.clear(); + defaultService.clear(); } /** @@ -129,7 +130,7 @@ public class TransientNameService implements INameService { */ @Override public void lock(TaxonNameBase t, LockOptions lockOptions) { - defaultNameService.lock(t, lockOptions); + defaultService.lock(t, lockOptions); } /** @@ -140,7 +141,7 @@ public class TransientNameService implements INameService { */ @Override public void refresh(TaxonNameBase t, LockOptions lockOptions, List propertyPaths) { - defaultNameService.refresh(t, lockOptions, propertyPaths); + defaultService.refresh(t, lockOptions, propertyPaths); } /** @@ -149,7 +150,7 @@ public class TransientNameService implements INameService { */ @Override public void updateTitleCache() { - defaultNameService.updateTitleCache(); + defaultService.updateTitleCache(); } /** @@ -159,7 +160,7 @@ public class TransientNameService implements INameService { */ @Override public AuditEventRecord getNextAuditEvent(TaxonNameBase t) { - return defaultNameService.getNextAuditEvent(t); + return defaultService.getNextAuditEvent(t); } /** @@ -174,7 +175,7 @@ public class TransientNameService implements INameService { */ @Override public Pager getMarkers(TaxonNameBase annotatableEntity, Boolean technical, Integer pageSize, Integer pageNumber, List orderHints, List propertyPaths) { - return defaultNameService.getMarkers(annotatableEntity, technical, pageSize, pageNumber, orderHints, propertyPaths); + return defaultService.getMarkers(annotatableEntity, technical, pageSize, pageNumber, orderHints, propertyPaths); } /** @@ -186,7 +187,7 @@ public class TransientNameService implements INameService { */ @Override public void updateTitleCache(Class clazz, Integer stepSize, IIdentifiableEntityCacheStrategy cacheStrategy, IProgressMonitor monitor) { - defaultNameService.updateTitleCache(clazz, stepSize, cacheStrategy, monitor); + defaultService.updateTitleCache(clazz, stepSize, cacheStrategy, monitor); } /** @@ -196,7 +197,7 @@ public class TransientNameService implements INameService { */ @Override public AuditEventRecord getPreviousAuditEvent(TaxonNameBase t) { - return defaultNameService.getPreviousAuditEvent(t); + return defaultService.getPreviousAuditEvent(t); } /** @@ -206,7 +207,7 @@ public class TransientNameService implements INameService { */ @Override public int count(Class clazz) { - return defaultNameService.count(clazz); + return defaultService.count(clazz); } /** @@ -218,7 +219,7 @@ public class TransientNameService implements INameService { */ @Override public DeleteResult delete(TaxonNameBase name, NameDeletionConfigurator config) { - return defaultNameService.delete(name, config); + return defaultService.delete(name, config); } /** @@ -235,7 +236,7 @@ public class TransientNameService implements INameService { */ @Override public Pager> pageAuditEvents(Class clazz, AuditEvent from, AuditEvent to, List criteria, Integer pageSize, Integer pageValue, AuditEventSort sort, List propertyPaths) { - return defaultNameService.pageAuditEvents(clazz, from, to, criteria, pageSize, pageValue, sort, propertyPaths); + return defaultService.pageAuditEvents(clazz, from, to, criteria, pageSize, pageValue, sort, propertyPaths); } /** @@ -245,7 +246,7 @@ public class TransientNameService implements INameService { */ @Override public TaxonNameBase find(LSID lsid) { - return defaultNameService.find(lsid); + return defaultService.find(lsid); } /** @@ -255,7 +256,7 @@ public class TransientNameService implements INameService { */ @Override public DeleteResult delete(TaxonNameBase persistentObject) { - return defaultNameService.delete(persistentObject); + return defaultService.delete(persistentObject); } /** @@ -269,7 +270,7 @@ public class TransientNameService implements INameService { */ @Override public List groupMarkers(Class clazz, Boolean technical, Integer pageSize, Integer pageNumber, List propertyPaths) { - return defaultNameService.groupMarkers(clazz, technical, pageSize, pageNumber, propertyPaths); + return defaultService.groupMarkers(clazz, technical, pageSize, pageNumber, propertyPaths); } /** @@ -279,7 +280,7 @@ public class TransientNameService implements INameService { */ @Override public boolean exists(UUID uuid) { - return defaultNameService.exists(uuid); + return defaultService.exists(uuid); } /** @@ -289,7 +290,7 @@ public class TransientNameService implements INameService { */ @Override public void deleteTypeDesignation(TaxonNameBase name, TypeDesignationBase typeDesignation) { - defaultNameService.deleteTypeDesignation(name, typeDesignation); + defaultService.deleteTypeDesignation(name, typeDesignation); } /** @@ -300,7 +301,7 @@ public class TransientNameService implements INameService { */ @Override public TaxonNameBase replace(TaxonNameBase x, TaxonNameBase y) { - return defaultNameService.replace(x, y); + return defaultService.replace(x, y); } /** @@ -310,7 +311,7 @@ public class TransientNameService implements INameService { */ @Override public List find(Set uuidSet) { - return defaultNameService.find(uuidSet); + return defaultService.find(uuidSet); } /** @@ -323,7 +324,7 @@ public class TransientNameService implements INameService { */ @Override public Pager getSources(TaxonNameBase t, Integer pageSize, Integer pageNumber, List propertyPaths) { - return defaultNameService.getSources(t, pageSize, pageNumber, propertyPaths); + return defaultService.getSources(t, pageSize, pageNumber, propertyPaths); } /** @@ -343,7 +344,7 @@ public class TransientNameService implements INameService { */ @Override public TaxonNameBase find(UUID uuid) { - return defaultNameService.find(uuid); + return defaultService.find(uuid); } /** @@ -373,7 +374,7 @@ public class TransientNameService implements INameService { */ @Override public TaxonNameBase find(int id) { - return defaultNameService.find(id); + return defaultService.find(id); } /** @@ -386,7 +387,7 @@ public class TransientNameService implements INameService { */ @Override public Pager getRights(TaxonNameBase t, Integer pageSize, Integer pageNumber, List propertyPaths) { - return defaultNameService.getRights(t, pageSize, pageNumber, propertyPaths); + return defaultService.getRights(t, pageSize, pageNumber, propertyPaths); } /** @@ -397,7 +398,7 @@ public class TransientNameService implements INameService { */ @Override public int countMarkers(Class clazz, Boolean technical) { - return defaultNameService.countMarkers(clazz, technical); + return defaultService.countMarkers(clazz, technical); } /** @@ -408,7 +409,7 @@ public class TransientNameService implements INameService { */ @Override public List getAllNomenclaturalStatus(int limit, int start) { - return defaultNameService.getAllNomenclaturalStatus(limit, start); + return defaultService.getAllNomenclaturalStatus(limit, start); } /** @@ -419,7 +420,7 @@ public class TransientNameService implements INameService { */ @Override public List getAllTypeDesignations(int limit, int start) { - return defaultNameService.getAllTypeDesignations(limit, start); + return defaultService.getAllTypeDesignations(limit, start); } /** @@ -429,7 +430,7 @@ public class TransientNameService implements INameService { */ @Override public List findById(Set idSet) { - return defaultNameService.findById(idSet); + return defaultService.findById(idSet); } /** @@ -439,7 +440,7 @@ public class TransientNameService implements INameService { */ @Override public List getNamesByName(String name) { - return defaultNameService.getNamesByName(name); + return defaultService.getNamesByName(name); } /** @@ -449,7 +450,7 @@ public class TransientNameService implements INameService { */ @Override public List getNamesByNameCache(String nameCache) { - return defaultNameService.getNamesByNameCache(nameCache); + return defaultService.getNamesByNameCache(nameCache); } /** @@ -461,7 +462,7 @@ public class TransientNameService implements INameService { */ @Override public ISourceable getSourcedObjectByIdInSource(Class clazz, String idInSource, String idNamespace) { - return defaultNameService.getSourcedObjectByIdInSource(clazz, idInSource, idNamespace); + return defaultService.getSourcedObjectByIdInSource(clazz, idInSource, idNamespace); } /** @@ -470,7 +471,7 @@ public class TransientNameService implements INameService { */ @Override public Session getSession() { - return defaultNameService.getSession(); + return defaultService.getSession(); } /** @@ -479,7 +480,7 @@ public class TransientNameService implements INameService { */ @Override public List> getUuidAndTitleCache() { - return defaultNameService.getUuidAndTitleCache(); + return defaultService.getUuidAndTitleCache(); } /** @@ -493,7 +494,7 @@ public class TransientNameService implements INameService { */ @Override public List group(Class clazz, Integer limit, Integer start, List groups, List propertyPaths) { - return defaultNameService.group(clazz, limit, start, groups, propertyPaths); + return defaultService.group(clazz, limit, start, groups, propertyPaths); } /** @@ -505,7 +506,7 @@ public class TransientNameService implements INameService { */ @Override public List findNamesByTitleCache(String titleCache, MatchMode matchMode, List propertyPaths) { - return defaultNameService.findNamesByTitleCache(titleCache, matchMode, propertyPaths); + return defaultService.findNamesByTitleCache(titleCache, matchMode, propertyPaths); } /** @@ -517,7 +518,7 @@ public class TransientNameService implements INameService { */ @Override public List findNamesByNameCache(String nameCache, MatchMode matchMode, List propertyPaths) { - return defaultNameService.findNamesByNameCache(nameCache, matchMode, propertyPaths); + return defaultService.findNamesByNameCache(nameCache, matchMode, propertyPaths); } /** @@ -534,7 +535,7 @@ public class TransientNameService implements INameService { */ @Override public Pager findByTitle(Class clazz, String queryString, MatchMode matchmode, List criteria, Integer pageSize, Integer pageNumber, List orderHints, List propertyPaths) { - return defaultNameService.findByTitle(clazz, queryString, matchmode, criteria, pageSize, pageNumber, orderHints, propertyPaths); + return defaultService.findByTitle(clazz, queryString, matchmode, criteria, pageSize, pageNumber, orderHints, propertyPaths); } /** @@ -545,7 +546,7 @@ public class TransientNameService implements INameService { */ @Override public NonViralName findNameByUuid(UUID uuid, List propertyPaths) { - return defaultNameService.findNameByUuid(uuid, propertyPaths); + return defaultService.findNameByUuid(uuid, propertyPaths); } /** @@ -556,7 +557,7 @@ public class TransientNameService implements INameService { */ @Override public List getNamesByName(String name, CdmBase sessionObject) { - return defaultNameService.getNamesByName(name, sessionObject); + return defaultService.getNamesByName(name, sessionObject); } /** @@ -574,7 +575,7 @@ public class TransientNameService implements INameService { */ @Override public List> findByNameFuzzySearch(String name, float accuracy, List languages, boolean highlightFragments, List propertyPaths, int maxNoOfResults) throws CorruptIndexException, IOException, ParseException { - return defaultNameService.findByNameFuzzySearch(name, accuracy, languages, highlightFragments, propertyPaths, maxNoOfResults); + return defaultService.findByNameFuzzySearch(name, accuracy, languages, highlightFragments, propertyPaths, maxNoOfResults); } /** @@ -588,7 +589,7 @@ public class TransientNameService implements INameService { */ @Override public List list(Class type, Integer limit, Integer start, List orderHints, List propertyPaths) { - return defaultNameService.list(type, limit, start, orderHints, propertyPaths); + return defaultService.list(type, limit, start, orderHints, propertyPaths); } /** @@ -598,7 +599,7 @@ public class TransientNameService implements INameService { */ @Override public Pager findByTitle(IIdentifiableEntityServiceConfigurator configurator) { - return defaultNameService.findByTitle(configurator); + return defaultService.findByTitle(configurator); } /** @@ -611,7 +612,7 @@ public class TransientNameService implements INameService { */ @Override public Integer countByTitle(Class clazz, String queryString, MatchMode matchmode, List criteria) { - return defaultNameService.countByTitle(clazz, queryString, matchmode, criteria); + return defaultService.countByTitle(clazz, queryString, matchmode, criteria); } /** @@ -621,7 +622,7 @@ public class TransientNameService implements INameService { */ @Override public TaxonNameBase load(UUID uuid) { - return defaultNameService.load(uuid); + return defaultService.load(uuid); } /** @@ -638,7 +639,7 @@ public class TransientNameService implements INameService { */ @Override public List findByNameFuzzySearch(String name, float accuracy, List languages, boolean highlightFragments, int maxNoOfResults) throws CorruptIndexException, IOException, ParseException { - return defaultNameService.findByNameFuzzySearch(name, accuracy, languages, highlightFragments, maxNoOfResults); + return defaultService.findByNameFuzzySearch(name, accuracy, languages, highlightFragments, maxNoOfResults); } /** @@ -649,7 +650,7 @@ public class TransientNameService implements INameService { */ @Override public TaxonNameBase load(UUID uuid, List propertyPaths) { - return defaultNameService.load(uuid, propertyPaths); + return defaultService.load(uuid, propertyPaths); } /** @@ -659,7 +660,7 @@ public class TransientNameService implements INameService { */ @Override public Integer countByTitle(IIdentifiableEntityServiceConfigurator configurator) { - return defaultNameService.countByTitle(configurator); + return defaultService.countByTitle(configurator); } /** @@ -669,7 +670,7 @@ public class TransientNameService implements INameService { */ @Override public TaxonNameBase merge(TaxonNameBase transientObject) { - return defaultNameService.merge(transientObject); + return defaultService.merge(transientObject); } /** @@ -686,7 +687,7 @@ public class TransientNameService implements INameService { */ @Override public List listByTitle(Class clazz, String queryString, MatchMode matchmode, List criteria, Integer pageSize, Integer pageNumber, List orderHints, List propertyPaths) { - return defaultNameService.listByTitle(clazz, queryString, matchmode, criteria, pageSize, pageNumber, orderHints, propertyPaths); + return defaultService.listByTitle(clazz, queryString, matchmode, criteria, pageSize, pageNumber, orderHints, propertyPaths); } /** @@ -700,7 +701,7 @@ public class TransientNameService implements INameService { */ @Override public Pager page(Class type, Integer pageSize, Integer pageNumber, List orderHints, List propertyPaths) { - return defaultNameService.page(type, pageSize, pageNumber, orderHints, propertyPaths); + return defaultService.page(type, pageSize, pageNumber, orderHints, propertyPaths); } /** @@ -717,7 +718,7 @@ public class TransientNameService implements INameService { */ @Override public List findByFuzzyNameCacheSearch(String name, float accuracy, List languages, boolean highlightFragments, int maxNoOfResults) throws CorruptIndexException, IOException, ParseException { - return defaultNameService.findByFuzzyNameCacheSearch(name, accuracy, languages, highlightFragments, maxNoOfResults); + return defaultService.findByFuzzyNameCacheSearch(name, accuracy, languages, highlightFragments, maxNoOfResults); } /** @@ -734,7 +735,7 @@ public class TransientNameService implements INameService { */ @Override public List findByNameExactSearch(String name, boolean wildcard, List languages, boolean highlightFragments, int maxNoOfResults) throws CorruptIndexException, IOException, ParseException { - return defaultNameService.findByNameExactSearch(name, wildcard, languages, highlightFragments, maxNoOfResults); + return defaultService.findByNameExactSearch(name, wildcard, languages, highlightFragments, maxNoOfResults); } /** @@ -744,7 +745,7 @@ public class TransientNameService implements INameService { */ @Override public UUID refresh(TaxonNameBase persistentObject) { - return defaultNameService.refresh(persistentObject); + return defaultService.refresh(persistentObject); } /** @@ -761,7 +762,7 @@ public class TransientNameService implements INameService { */ @Override public List listByReferenceTitle(Class clazz, String queryString, MatchMode matchmode, List criteria, Integer pageSize, Integer pageNumber, List orderHints, List propertyPaths) { - return defaultNameService.listByReferenceTitle(clazz, queryString, matchmode, criteria, pageSize, pageNumber, orderHints, propertyPaths); + return defaultService.listByReferenceTitle(clazz, queryString, matchmode, criteria, pageSize, pageNumber, orderHints, propertyPaths); } /** @@ -773,7 +774,7 @@ public class TransientNameService implements INameService { */ @Override public List rows(String tableName, int limit, int start) { - return defaultNameService.rows(tableName, limit, start); + return defaultService.rows(tableName, limit, start); } /** @@ -803,7 +804,7 @@ public class TransientNameService implements INameService { */ @Override public List findNamesByTitle(String title) { - return defaultNameService.findNamesByTitle(title); + return defaultService.findNamesByTitle(title); } /** @@ -814,7 +815,7 @@ public class TransientNameService implements INameService { */ @Override public List findNamesByTitle(String title, CdmBase sessionObject) { - return defaultNameService.findNamesByTitle(title, sessionObject); + return defaultService.findNamesByTitle(title, sessionObject); } /** @@ -835,7 +836,7 @@ public class TransientNameService implements INameService { */ @Override public List getAllHomotypicalGroups(int limit, int start) { - return defaultNameService.getAllHomotypicalGroups(limit, start); + return defaultService.getAllHomotypicalGroups(limit, start); } /** @@ -848,7 +849,7 @@ public class TransientNameService implements INameService { @Deprecated @Override public List getAllRelationships(int limit, int start) { - return defaultNameService.getAllRelationships(limit, start); + return defaultService.getAllRelationships(limit, start); } /** @@ -868,7 +869,7 @@ public class TransientNameService implements INameService { */ @Override public UUID update(TaxonNameBase transientObject) { - return defaultNameService.update(transientObject); + return defaultService.update(transientObject); } /** @@ -883,7 +884,7 @@ public class TransientNameService implements INameService { */ @Override public List list(TaxonNameBase example, Set includeProperties, Integer limit, Integer start, List orderHints, List propertyPaths) { - return defaultNameService.list(example, includeProperties, limit, start, orderHints, propertyPaths); + return defaultService.list(example, includeProperties, limit, start, orderHints, propertyPaths); } /** @@ -895,7 +896,7 @@ public class TransientNameService implements INameService { */ @Override public int deduplicate(Class clazz, IMatchStrategy matchStrategy, IMergeStrategy mergeStrategy) { - return defaultNameService.deduplicate(clazz, matchStrategy, mergeStrategy); + return defaultService.deduplicate(clazz, matchStrategy, mergeStrategy); } /** @@ -911,7 +912,7 @@ public class TransientNameService implements INameService { */ @Override public List listNameRelationships(TaxonNameBase name, Direction direction, NameRelationshipType type, Integer pageSize, Integer pageNumber, List orderHints, List propertyPaths) { - return defaultNameService.listNameRelationships(name, direction, type, pageSize, pageNumber, orderHints, propertyPaths); + return defaultService.listNameRelationships(name, direction, type, pageSize, pageNumber, orderHints, propertyPaths); } /** @@ -926,7 +927,7 @@ public class TransientNameService implements INameService { */ @Override public Pager findTitleCache(Class clazz, String queryString, Integer pageSize, Integer pageNumber, List orderHints, MatchMode matchMode) { - return defaultNameService.findTitleCache(clazz, queryString, pageSize, pageNumber, orderHints, matchMode); + return defaultService.findTitleCache(clazz, queryString, pageSize, pageNumber, orderHints, matchMode); } /** @@ -942,7 +943,7 @@ public class TransientNameService implements INameService { */ @Override public Pager pageNameRelationships(TaxonNameBase name, Direction direction, NameRelationshipType type, Integer pageSize, Integer pageNumber, List orderHints, List propertyPaths) { - return defaultNameService.pageNameRelationships(name, direction, type, pageSize, pageNumber, orderHints, propertyPaths); + return defaultService.pageNameRelationships(name, direction, type, pageSize, pageNumber, orderHints, propertyPaths); } /** @@ -959,7 +960,7 @@ public class TransientNameService implements INameService { @Deprecated @Override public List listFromNameRelationships(TaxonNameBase name, NameRelationshipType type, Integer pageSize, Integer pageNumber, List orderHints, List propertyPaths) { - return defaultNameService.listFromNameRelationships(name, type, pageSize, pageNumber, orderHints, propertyPaths); + return defaultService.listFromNameRelationships(name, type, pageSize, pageNumber, orderHints, propertyPaths); } /** @@ -976,7 +977,7 @@ public class TransientNameService implements INameService { @Deprecated @Override public Pager pageFromNameRelationships(TaxonNameBase name, NameRelationshipType type, Integer pageSize, Integer pageNumber, List orderHints, List propertyPaths) { - return defaultNameService.pageFromNameRelationships(name, type, pageSize, pageNumber, orderHints, propertyPaths); + return defaultService.pageFromNameRelationships(name, type, pageSize, pageNumber, orderHints, propertyPaths); } /** @@ -993,7 +994,7 @@ public class TransientNameService implements INameService { @Deprecated @Override public List listToNameRelationships(TaxonNameBase name, NameRelationshipType type, Integer pageSize, Integer pageNumber, List orderHints, List propertyPaths) { - return defaultNameService.listToNameRelationships(name, type, pageSize, pageNumber, orderHints, propertyPaths); + return defaultService.listToNameRelationships(name, type, pageSize, pageNumber, orderHints, propertyPaths); } /** @@ -1010,7 +1011,7 @@ public class TransientNameService implements INameService { @Deprecated @Override public Pager pageToNameRelationships(TaxonNameBase name, NameRelationshipType type, Integer pageSize, Integer pageNumber, List orderHints, List propertyPaths) { - return defaultNameService.pageToNameRelationships(name, type, pageSize, pageNumber, orderHints, propertyPaths); + return defaultService.pageToNameRelationships(name, type, pageSize, pageNumber, orderHints, propertyPaths); } /** @@ -1025,7 +1026,7 @@ public class TransientNameService implements INameService { */ @Override public Pager getHybridNames(NonViralName name, HybridRelationshipType type, Integer pageSize, Integer pageNumber, List orderHints, List propertyPaths) { - return defaultNameService.getHybridNames(name, type, pageSize, pageNumber, orderHints, propertyPaths); + return defaultService.getHybridNames(name, type, pageSize, pageNumber, orderHints, propertyPaths); } /** @@ -1038,7 +1039,7 @@ public class TransientNameService implements INameService { */ @Override public Pager getTypeDesignations(TaxonNameBase name, SpecimenTypeDesignationStatus status, Integer pageSize, Integer pageNumber) { - return defaultNameService.getTypeDesignations(name, status, pageSize, pageNumber); + return defaultService.getTypeDesignations(name, status, pageSize, pageNumber); } /** @@ -1052,7 +1053,7 @@ public class TransientNameService implements INameService { */ @Override public Pager getTypeDesignations(TaxonNameBase name, SpecimenTypeDesignationStatus status, Integer pageSize, Integer pageNumber, List propertyPaths) { - return defaultNameService.getTypeDesignations(name, status, pageSize, pageNumber, propertyPaths); + return defaultService.getTypeDesignations(name, status, pageSize, pageNumber, propertyPaths); } /** @@ -1070,7 +1071,7 @@ public class TransientNameService implements INameService { */ @Override public Pager searchNames(String uninomial, String infraGenericEpithet, String specificEpithet, String infraspecificEpithet, Rank rank, Integer pageSize, Integer pageNumber, List orderHints, List propertyPaths) { - return defaultNameService.searchNames(uninomial, infraGenericEpithet, specificEpithet, infraspecificEpithet, rank, pageSize, pageNumber, orderHints, propertyPaths); + return defaultService.searchNames(uninomial, infraGenericEpithet, specificEpithet, infraspecificEpithet, rank, pageSize, pageNumber, orderHints, propertyPaths); } /** @@ -1085,7 +1086,7 @@ public class TransientNameService implements INameService { */ @Override public Pager search(Class clazz, String queryString, Integer pageSize, Integer pageNumber, List orderHints, List propertyPaths) { - return defaultNameService.search(clazz, queryString, pageSize, pageNumber, orderHints, propertyPaths); + return defaultService.search(clazz, queryString, pageSize, pageNumber, orderHints, propertyPaths); } /** @@ -1094,7 +1095,7 @@ public class TransientNameService implements INameService { */ @Override public List getUuidAndTitleCacheOfNames() { - return defaultNameService.getUuidAndTitleCacheOfNames(); + return defaultService.getUuidAndTitleCacheOfNames(); } /** @@ -1111,7 +1112,7 @@ public class TransientNameService implements INameService { */ @Override public Pager findByName(Class clazz, String queryString, MatchMode matchmode, List criteria, Integer pageSize, Integer pageNumber, List orderHints, List propertyPaths) { - return defaultNameService.findByName(clazz, queryString, matchmode, criteria, pageSize, pageNumber, orderHints, propertyPaths); + return defaultService.findByName(clazz, queryString, matchmode, criteria, pageSize, pageNumber, orderHints, propertyPaths); } /** @@ -1121,7 +1122,7 @@ public class TransientNameService implements INameService { */ @Override public HomotypicalGroup findHomotypicalGroup(UUID uuid) { - return defaultNameService.findHomotypicalGroup(uuid); + return defaultService.findHomotypicalGroup(uuid); } /** @@ -1131,7 +1132,7 @@ public class TransientNameService implements INameService { */ @Override public List getTaggedName(UUID uuid) { - return defaultNameService.getTaggedName(uuid); + return defaultService.getTaggedName(uuid); } @Override @@ -1143,7 +1144,12 @@ public class TransientNameService implements INameService { @Override public TaxonNameBase findWithoutFlush(UUID uuid) { - return defaultNameService.findWithoutFlush(uuid); + return defaultService.findWithoutFlush(uuid); + } + + @Override + public List listByIdentifier(Class clazz, String identifier, DefinedTerm identifierType, MatchMode matchmode, Integer pageSize, Integer pageNumber, List orderHints, List propertyPaths){ + return defaultService.listByIdentifier(clazz, identifier, identifierType, matchmode, pageSize, pageNumber, orderHints, propertyPaths); } 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 c79b991b3..2aa6a49b2 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 @@ -39,6 +39,7 @@ import eu.etaxonomy.cdm.api.service.util.TaxonRelationshipEdge; import eu.etaxonomy.cdm.common.monitor.IProgressMonitor; import eu.etaxonomy.cdm.model.common.Annotation; import eu.etaxonomy.cdm.model.common.CdmBase; +import eu.etaxonomy.cdm.model.common.DefinedTerm; import eu.etaxonomy.cdm.model.common.ICdmBase; import eu.etaxonomy.cdm.model.common.ISourceable; import eu.etaxonomy.cdm.model.common.IdentifiableSource; @@ -989,5 +990,10 @@ public class TransientOccurenceService implements IOccurrenceService { List propertyPaths) { return defaultService.listDescriptionsWithDescriptionSpecimen(specimen, limit, start, orderHints, propertyPaths); } + + @Override + public List listByIdentifier(Class clazz, String identifier, DefinedTerm identifierType, MatchMode matchmode, Integer pageSize, Integer pageNumber, List orderHints, List propertyPaths){ + return defaultService.listByIdentifier(clazz, identifier, identifierType, matchmode, pageSize, pageNumber, orderHints, propertyPaths); + } } 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 9a8602bcd..4e43da1a5 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 @@ -27,6 +27,7 @@ import eu.etaxonomy.cdm.api.service.config.IIdentifiableEntityServiceConfigurato import eu.etaxonomy.cdm.api.service.pager.Pager; import eu.etaxonomy.cdm.common.monitor.IProgressMonitor; 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.IdentifiableSource; import eu.etaxonomy.cdm.model.common.LSID; @@ -53,13 +54,13 @@ import eu.etaxonomy.cdm.strategy.merge.IMergeStrategy; */ public class TransientReferenceService implements IReferenceService { - private IReferenceService defaultReferenceService; + private IReferenceService defaultService; /** * @param defaultReferenceService */ public TransientReferenceService(IReferenceService defaultReferenceService) { - this.defaultReferenceService = defaultReferenceService; + this.defaultService = defaultReferenceService; } /** @@ -74,7 +75,7 @@ public class TransientReferenceService implements IReferenceService { */ @Override public Pager search(Class clazz, String queryString, Integer pageSize, Integer pageNumber, List orderHints, List propertyPaths) { - return defaultReferenceService.search(clazz, queryString, pageSize, pageNumber, orderHints, propertyPaths); + return defaultService.search(clazz, queryString, pageSize, pageNumber, orderHints, propertyPaths); } /** @@ -88,7 +89,7 @@ public class TransientReferenceService implements IReferenceService { */ @Override public Pager> pageAuditEvents(Reference t, Integer pageSize, Integer pageNumber, AuditEventSort sort, List propertyPaths) { - return defaultReferenceService.pageAuditEvents(t, pageSize, pageNumber, sort, propertyPaths); + return defaultService.pageAuditEvents(t, pageSize, pageNumber, sort, propertyPaths); } /** @@ -103,7 +104,7 @@ public class TransientReferenceService implements IReferenceService { */ @Override public Pager getAnnotations(Reference annotatedObj, MarkerType status, Integer pageSize, Integer pageNumber, List orderHints, List propertyPaths) { - return defaultReferenceService.getAnnotations(annotatedObj, status, pageSize, pageNumber, orderHints, propertyPaths); + return defaultService.getAnnotations(annotatedObj, status, pageSize, pageNumber, orderHints, propertyPaths); } /** @@ -112,7 +113,7 @@ public class TransientReferenceService implements IReferenceService { */ @Override public void clear() { - defaultReferenceService.clear(); + defaultService.clear(); } /** @@ -122,7 +123,7 @@ public class TransientReferenceService implements IReferenceService { */ @Override public void lock(Reference t, LockOptions lockOptions) { - defaultReferenceService.lock(t, lockOptions); + defaultService.lock(t, lockOptions); } /** @@ -133,7 +134,7 @@ public class TransientReferenceService implements IReferenceService { */ @Override public void refresh(Reference t, LockOptions lockOptions, List propertyPaths) { - defaultReferenceService.refresh(t, lockOptions, propertyPaths); + defaultService.refresh(t, lockOptions, propertyPaths); } /** @@ -142,7 +143,7 @@ public class TransientReferenceService implements IReferenceService { */ @Override public void updateTitleCache() { - defaultReferenceService.updateTitleCache(); + defaultService.updateTitleCache(); } /** @@ -152,7 +153,7 @@ public class TransientReferenceService implements IReferenceService { */ @Override public AuditEventRecord getNextAuditEvent(Reference t) { - return defaultReferenceService.getNextAuditEvent(t); + return defaultService.getNextAuditEvent(t); } /** @@ -167,7 +168,7 @@ public class TransientReferenceService implements IReferenceService { */ @Override public Pager getMarkers(Reference annotatableEntity, Boolean technical, Integer pageSize, Integer pageNumber, List orderHints, List propertyPaths) { - return defaultReferenceService.getMarkers(annotatableEntity, technical, pageSize, pageNumber, orderHints, propertyPaths); + return defaultService.getMarkers(annotatableEntity, technical, pageSize, pageNumber, orderHints, propertyPaths); } /** @@ -176,7 +177,7 @@ public class TransientReferenceService implements IReferenceService { */ @Override public List> getUuidAndTitle() { - return defaultReferenceService.getUuidAndTitle(); + return defaultService.getUuidAndTitle(); } /** @@ -188,7 +189,7 @@ public class TransientReferenceService implements IReferenceService { */ @Override public void updateTitleCache(Class clazz, Integer stepSize, IIdentifiableEntityCacheStrategy cacheStrategy, IProgressMonitor monitor) { - defaultReferenceService.updateTitleCache(clazz, stepSize, cacheStrategy, monitor); + defaultService.updateTitleCache(clazz, stepSize, cacheStrategy, monitor); } /** @@ -198,7 +199,7 @@ public class TransientReferenceService implements IReferenceService { */ @Override public AuditEventRecord getPreviousAuditEvent(Reference t) { - return defaultReferenceService.getPreviousAuditEvent(t); + return defaultService.getPreviousAuditEvent(t); } /** @@ -207,7 +208,7 @@ public class TransientReferenceService implements IReferenceService { */ @Override public List getAllReferencesForPublishing() { - return defaultReferenceService.getAllReferencesForPublishing(); + return defaultService.getAllReferencesForPublishing(); } /** @@ -217,7 +218,7 @@ public class TransientReferenceService implements IReferenceService { */ @Override public int count(Class clazz) { - return defaultReferenceService.count(clazz); + return defaultService.count(clazz); } /** @@ -226,7 +227,7 @@ public class TransientReferenceService implements IReferenceService { */ @Override public List getAllNomenclaturalReferences() { - return defaultReferenceService.getAllNomenclaturalReferences(); + return defaultService.getAllNomenclaturalReferences(); } /** @@ -238,7 +239,7 @@ public class TransientReferenceService implements IReferenceService { */ @Override public List listCoveredTaxa(Reference reference, boolean includeSubordinateReferences, List propertyPaths) { - return defaultReferenceService.listCoveredTaxa(reference, includeSubordinateReferences, propertyPaths); + return defaultService.listCoveredTaxa(reference, includeSubordinateReferences, propertyPaths); } /** @@ -255,7 +256,7 @@ public class TransientReferenceService implements IReferenceService { */ @Override public Pager> pageAuditEvents(Class clazz, AuditEvent from, AuditEvent to, List criteria, Integer pageSize, Integer pageValue, AuditEventSort sort, List propertyPaths) { - return defaultReferenceService.pageAuditEvents(clazz, from, to, criteria, pageSize, pageValue, sort, propertyPaths); + return defaultService.pageAuditEvents(clazz, from, to, criteria, pageSize, pageValue, sort, propertyPaths); } /** @@ -265,7 +266,7 @@ public class TransientReferenceService implements IReferenceService { */ @Override public Reference find(LSID lsid) { - return defaultReferenceService.find(lsid); + return defaultService.find(lsid); } /** @@ -275,7 +276,7 @@ public class TransientReferenceService implements IReferenceService { */ @Override public DeleteResult delete(Reference persistentObject) { - return defaultReferenceService.delete(persistentObject); + return defaultService.delete(persistentObject); } /** @@ -289,7 +290,7 @@ public class TransientReferenceService implements IReferenceService { */ @Override public List groupMarkers(Class clazz, Boolean technical, Integer pageSize, Integer pageNumber, List propertyPaths) { - return defaultReferenceService.groupMarkers(clazz, technical, pageSize, pageNumber, propertyPaths); + return defaultService.groupMarkers(clazz, technical, pageSize, pageNumber, propertyPaths); } /** @@ -299,7 +300,7 @@ public class TransientReferenceService implements IReferenceService { */ @Override public boolean exists(UUID uuid) { - return defaultReferenceService.exists(uuid); + return defaultService.exists(uuid); } /** @@ -310,7 +311,7 @@ public class TransientReferenceService implements IReferenceService { */ @Override public Reference replace(Reference x, Reference y) { - return defaultReferenceService.replace(x, y); + return defaultService.replace(x, y); } /** @@ -320,7 +321,7 @@ public class TransientReferenceService implements IReferenceService { */ @Override public List find(Set uuidSet) { - return defaultReferenceService.find(uuidSet); + return defaultService.find(uuidSet); } /** @@ -333,7 +334,7 @@ public class TransientReferenceService implements IReferenceService { */ @Override public Pager getSources(Reference t, Integer pageSize, Integer pageNumber, List propertyPaths) { - return defaultReferenceService.getSources(t, pageSize, pageNumber, propertyPaths); + return defaultService.getSources(t, pageSize, pageNumber, propertyPaths); } /** @@ -343,7 +344,7 @@ public class TransientReferenceService implements IReferenceService { */ @Override public Reference find(UUID uuid) { - return defaultReferenceService.find(uuid); + return defaultService.find(uuid); } /** @@ -353,7 +354,7 @@ public class TransientReferenceService implements IReferenceService { */ @Override public Reference find(int id) { - return defaultReferenceService.find(id); + return defaultService.find(id); } /** @@ -366,7 +367,7 @@ public class TransientReferenceService implements IReferenceService { */ @Override public Pager getRights(Reference t, Integer pageSize, Integer pageNumber, List propertyPaths) { - return defaultReferenceService.getRights(t, pageSize, pageNumber, propertyPaths); + return defaultService.getRights(t, pageSize, pageNumber, propertyPaths); } /** @@ -377,7 +378,7 @@ public class TransientReferenceService implements IReferenceService { */ @Override public int countMarkers(Class clazz, Boolean technical) { - return defaultReferenceService.countMarkers(clazz, technical); + return defaultService.countMarkers(clazz, technical); } /** @@ -387,7 +388,7 @@ public class TransientReferenceService implements IReferenceService { */ @Override public List findById(Set idSet) { - return defaultReferenceService.findById(idSet); + return defaultService.findById(idSet); } /** @@ -399,7 +400,7 @@ public class TransientReferenceService implements IReferenceService { */ @Override public ISourceable getSourcedObjectByIdInSource(Class clazz, String idInSource, String idNamespace) { - return defaultReferenceService.getSourcedObjectByIdInSource(clazz, idInSource, idNamespace); + return defaultService.getSourcedObjectByIdInSource(clazz, idInSource, idNamespace); } /** @@ -408,7 +409,7 @@ public class TransientReferenceService implements IReferenceService { */ @Override public Session getSession() { - return defaultReferenceService.getSession(); + return defaultService.getSession(); } /** @@ -417,7 +418,7 @@ public class TransientReferenceService implements IReferenceService { */ @Override public List> getUuidAndTitleCache() { - return defaultReferenceService.getUuidAndTitleCache(); + return defaultService.getUuidAndTitleCache(); } /** @@ -431,7 +432,7 @@ public class TransientReferenceService implements IReferenceService { */ @Override public List group(Class clazz, Integer limit, Integer start, List groups, List propertyPaths) { - return defaultReferenceService.group(clazz, limit, start, groups, propertyPaths); + return defaultService.group(clazz, limit, start, groups, propertyPaths); } /** @@ -448,7 +449,7 @@ public class TransientReferenceService implements IReferenceService { */ @Override public Pager findByTitle(Class clazz, String queryString, MatchMode matchmode, List criteria, Integer pageSize, Integer pageNumber, List orderHints, List propertyPaths) { - return defaultReferenceService.findByTitle(clazz, queryString, matchmode, criteria, pageSize, pageNumber, orderHints, propertyPaths); + return defaultService.findByTitle(clazz, queryString, matchmode, criteria, pageSize, pageNumber, orderHints, propertyPaths); } /** @@ -462,7 +463,7 @@ public class TransientReferenceService implements IReferenceService { */ @Override public List list(Class type, Integer limit, Integer start, List orderHints, List propertyPaths) { - return defaultReferenceService.list(type, limit, start, orderHints, propertyPaths); + return defaultService.list(type, limit, start, orderHints, propertyPaths); } /** @@ -472,7 +473,7 @@ public class TransientReferenceService implements IReferenceService { */ @Override public Pager findByTitle(IIdentifiableEntityServiceConfigurator configurator) { - return defaultReferenceService.findByTitle(configurator); + return defaultService.findByTitle(configurator); } /** @@ -485,7 +486,7 @@ public class TransientReferenceService implements IReferenceService { */ @Override public Integer countByTitle(Class clazz, String queryString, MatchMode matchmode, List criteria) { - return defaultReferenceService.countByTitle(clazz, queryString, matchmode, criteria); + return defaultService.countByTitle(clazz, queryString, matchmode, criteria); } /** @@ -495,7 +496,7 @@ public class TransientReferenceService implements IReferenceService { */ @Override public Reference load(UUID uuid) { - return defaultReferenceService.load(uuid); + return defaultService.load(uuid); } /** @@ -506,7 +507,7 @@ public class TransientReferenceService implements IReferenceService { */ @Override public Reference load(UUID uuid, List propertyPaths) { - return defaultReferenceService.load(uuid, propertyPaths); + return defaultService.load(uuid, propertyPaths); } /** @@ -516,7 +517,7 @@ public class TransientReferenceService implements IReferenceService { */ @Override public Integer countByTitle(IIdentifiableEntityServiceConfigurator configurator) { - return defaultReferenceService.countByTitle(configurator); + return defaultService.countByTitle(configurator); } /** @@ -526,7 +527,7 @@ public class TransientReferenceService implements IReferenceService { */ @Override public Reference merge(Reference transientObject) { - return defaultReferenceService.merge(transientObject); + return defaultService.merge(transientObject); } /** @@ -543,7 +544,7 @@ public class TransientReferenceService implements IReferenceService { */ @Override public List listByTitle(Class clazz, String queryString, MatchMode matchmode, List criteria, Integer pageSize, Integer pageNumber, List orderHints, List propertyPaths) { - return defaultReferenceService.listByTitle(clazz, queryString, matchmode, criteria, pageSize, pageNumber, orderHints, propertyPaths); + return defaultService.listByTitle(clazz, queryString, matchmode, criteria, pageSize, pageNumber, orderHints, propertyPaths); } /** @@ -557,7 +558,7 @@ public class TransientReferenceService implements IReferenceService { */ @Override public Pager page(Class type, Integer pageSize, Integer pageNumber, List orderHints, List propertyPaths) { - return defaultReferenceService.page(type, pageSize, pageNumber, orderHints, propertyPaths); + return defaultService.page(type, pageSize, pageNumber, orderHints, propertyPaths); } /** @@ -567,7 +568,7 @@ public class TransientReferenceService implements IReferenceService { */ @Override public UUID refresh(Reference persistentObject) { - return defaultReferenceService.refresh(persistentObject); + return defaultService.refresh(persistentObject); } /** @@ -584,7 +585,7 @@ public class TransientReferenceService implements IReferenceService { */ @Override public List listByReferenceTitle(Class clazz, String queryString, MatchMode matchmode, List criteria, Integer pageSize, Integer pageNumber, List orderHints, List propertyPaths) { - return defaultReferenceService.listByReferenceTitle(clazz, queryString, matchmode, criteria, pageSize, pageNumber, orderHints, propertyPaths); + return defaultService.listByReferenceTitle(clazz, queryString, matchmode, criteria, pageSize, pageNumber, orderHints, propertyPaths); } /** @@ -596,7 +597,7 @@ public class TransientReferenceService implements IReferenceService { */ @Override public List rows(String tableName, int limit, int start) { - return defaultReferenceService.rows(tableName, limit, start); + return defaultService.rows(tableName, limit, start); } /** @@ -646,7 +647,7 @@ public class TransientReferenceService implements IReferenceService { */ @Override public UUID update(Reference transientObject) { - return defaultReferenceService.update(transientObject); + return defaultService.update(transientObject); } /** @@ -661,7 +662,7 @@ public class TransientReferenceService implements IReferenceService { */ @Override public List list(Reference example, Set includeProperties, Integer limit, Integer start, List orderHints, List propertyPaths) { - return defaultReferenceService.list(example, includeProperties, limit, start, orderHints, propertyPaths); + return defaultService.list(example, includeProperties, limit, start, orderHints, propertyPaths); } /** @@ -673,7 +674,7 @@ public class TransientReferenceService implements IReferenceService { */ @Override public int deduplicate(Class clazz, IMatchStrategy matchStrategy, IMergeStrategy mergeStrategy) { - return defaultReferenceService.deduplicate(clazz, matchStrategy, mergeStrategy); + return defaultService.deduplicate(clazz, matchStrategy, mergeStrategy); } /** @@ -688,7 +689,7 @@ public class TransientReferenceService implements IReferenceService { */ @Override public Pager findTitleCache(Class clazz, String queryString, Integer pageSize, Integer pageNumber, List orderHints, MatchMode matchMode) { - return defaultReferenceService.findTitleCache(clazz, queryString, pageSize, pageNumber, orderHints, matchMode); + return defaultService.findTitleCache(clazz, queryString, pageSize, pageNumber, orderHints, matchMode); } @Override @@ -700,8 +701,12 @@ public class TransientReferenceService implements IReferenceService { @Override public Reference findWithoutFlush(UUID uuid) { - return defaultReferenceService.findWithoutFlush(uuid); + return defaultService.findWithoutFlush(uuid); + } + + @Override + public List listByIdentifier(Class clazz, String identifier, DefinedTerm identifierType, MatchMode matchmode, Integer pageSize, Integer pageNumber, List orderHints, List propertyPaths){ + return defaultService.listByIdentifier(clazz, identifier, identifierType, matchmode, pageSize, pageNumber, orderHints, propertyPaths); } - } 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 477d713dd..fe3c6cefc 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 @@ -43,6 +43,7 @@ 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.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; @@ -91,13 +92,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 +112,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 +127,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 +136,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public void clear() { - defaultTaxonService.clear(); + defaultService.clear(); } /** @@ -145,7 +146,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public void lock(TaxonBase t, LockOptions lockOptions) { - defaultTaxonService.lock(t, lockOptions); + defaultService.lock(t, lockOptions); } /** @@ -156,7 +157,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 +166,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public void updateTitleCache() { - defaultTaxonService.updateTitleCache(); + defaultService.updateTitleCache(); } /** @@ -175,7 +176,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public AuditEventRecord getNextAuditEvent(TaxonBase t) { - return defaultTaxonService.getNextAuditEvent(t); + return defaultService.getNextAuditEvent(t); } /** @@ -190,7 +191,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 +203,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 +213,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public AuditEventRecord getPreviousAuditEvent(TaxonBase t) { - return defaultTaxonService.getPreviousAuditEvent(t); + return defaultService.getPreviousAuditEvent(t); } /** @@ -222,7 +223,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public int count(Class clazz) { - return defaultTaxonService.count(clazz); + return defaultService.count(clazz); } /** @@ -239,7 +240,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 +250,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public TaxonBase find(LSID lsid) { - return defaultTaxonService.find(lsid); + return defaultService.find(lsid); } /** @@ -259,7 +260,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public DeleteResult delete(TaxonBase persistentObject) { - return defaultTaxonService.delete(persistentObject); + return defaultService.delete(persistentObject); } /** @@ -273,7 +274,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 +284,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public boolean exists(UUID uuid) { - return defaultTaxonService.exists(uuid); + return defaultService.exists(uuid); } @@ -295,7 +296,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 +306,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public List find(Set uuidSet) { - return defaultTaxonService.find(uuidSet); + return defaultService.find(uuidSet); } /** @@ -318,7 +319,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 +333,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 +343,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public TaxonBase find(UUID uuid) { - return defaultTaxonService.find(uuid); + return defaultService.find(uuid); } /** @@ -358,7 +359,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 +369,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public TaxonBase find(int id) { - return defaultTaxonService.find(id); + return defaultService.find(id); } /** @@ -381,7 +382,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 +393,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 +403,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public List findById(Set idSet) { - return defaultTaxonService.findById(idSet); + return defaultService.findById(idSet); } /** @@ -414,7 +415,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 +424,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public Session getSession() { - return defaultTaxonService.getSession(); + return defaultService.getSession(); } /** @@ -432,7 +433,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public List> getUuidAndTitleCache() { - return defaultTaxonService.getUuidAndTitleCache(); + return defaultService.getUuidAndTitleCache(); } /** @@ -446,7 +447,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 +458,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 +475,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 +486,7 @@ public class TransientTaxonService implements ITaxonService { @Deprecated @Override public OrderedTermVocabulary getTaxonRelationshipTypeVocabulary() { - return defaultTaxonService.getTaxonRelationshipTypeVocabulary(); + return defaultService.getTaxonRelationshipTypeVocabulary(); } /** @@ -496,7 +497,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 +507,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public void swapSynonymAndAcceptedTaxon(Synonym synonym, Taxon acceptedTaxon) { - defaultTaxonService.swapSynonymAndAcceptedTaxon(synonym, acceptedTaxon); + defaultService.swapSynonymAndAcceptedTaxon(synonym, acceptedTaxon); } /** @@ -520,7 +521,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 +531,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public Pager findByTitle(IIdentifiableEntityServiceConfigurator configurator) { - return defaultTaxonService.findByTitle(configurator); + return defaultService.findByTitle(configurator); } /** @@ -546,7 +547,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 +560,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 +570,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public TaxonBase load(UUID uuid) { - return defaultTaxonService.load(uuid); + return defaultService.load(uuid); } /** @@ -580,7 +581,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 +591,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public Integer countByTitle(IIdentifiableEntityServiceConfigurator configurator) { - return defaultTaxonService.countByTitle(configurator); + return defaultService.countByTitle(configurator); } /** @@ -600,7 +601,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public TaxonBase merge(TaxonBase transientObject) { - return defaultTaxonService.merge(transientObject); + return defaultService.merge(transientObject); } /** @@ -617,7 +618,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 +632,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 +642,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public UUID refresh(TaxonBase persistentObject) { - return defaultTaxonService.refresh(persistentObject); + return defaultService.refresh(persistentObject); } /** @@ -655,7 +656,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 +673,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 +685,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 +706,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 +739,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 +759,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public UUID update(TaxonBase transientObject) { - return defaultTaxonService.update(transientObject); + return defaultService.update(transientObject); } /** @@ -773,7 +774,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 +791,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 +803,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 +818,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 +833,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 +848,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 +863,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 +878,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 +893,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 +906,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 +921,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 +936,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 +947,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 +958,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 +973,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 +990,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 +1007,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 +1017,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public Pager findTaxaAndNames(IFindTaxaAndNamesConfigurator configurator) { - return defaultTaxonService.findTaxaAndNames(configurator); + return defaultService.findTaxaAndNames(configurator); } /** @@ -1039,7 +1040,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,7 +1061,7 @@ 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); } @@ -1072,7 +1073,7 @@ public class TransientTaxonService implements ITaxonService { 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); + return defaultService.findByDistribution(areaFilter, statusFilter, classification, pageSize, pageNumber, orderHints, propertyPaths); } @@ -1085,7 +1086,7 @@ public class TransientTaxonService implements ITaxonService { 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); + return defaultService.findTaxaAndNamesByFullText(searchModes, queryString, classification, namedAreas, distributionStatus, languages, highlightFragments, pageSize, pageNumber, orderHints, propertyPaths); } /** @@ -1107,7 +1108,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); } /** @@ -1123,7 +1124,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); } /** @@ -1138,7 +1139,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); } /** @@ -1154,7 +1155,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); } /** @@ -1164,7 +1165,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public List findTaxaByID(Set listOfIDs) { - return defaultTaxonService.findTaxaByID(listOfIDs); + return defaultService.findTaxaByID(listOfIDs); } /** @@ -1175,7 +1176,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public TaxonBase findTaxonByUuid(UUID uuid, List propertyPaths) { - return defaultTaxonService.findTaxonByUuid(uuid, propertyPaths); + return defaultService.findTaxonByUuid(uuid, propertyPaths); } /** @@ -1184,7 +1185,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public int countAllRelationships() { - return defaultTaxonService.countAllRelationships(); + return defaultService.countAllRelationships(); } /** @@ -1194,7 +1195,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public List findIdenticalTaxonNames(List propertyPath) { - return defaultTaxonService.findIdenticalTaxonNames(propertyPath); + return defaultService.findIdenticalTaxonNames(propertyPath); } /** @@ -1204,7 +1205,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public List findIdenticalTaxonNameIds(List propertyPath) { - return defaultTaxonService.findIdenticalTaxonNameIds(propertyPath); + return defaultService.findIdenticalTaxonNameIds(propertyPath); } /** @@ -1214,7 +1215,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public String getPhylumName(TaxonNameBase name) { - return defaultTaxonService.getPhylumName(name); + return defaultService.getPhylumName(name); } /** @@ -1224,7 +1225,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public long deleteSynonymRelationships(Synonym syn) { - return defaultTaxonService.deleteSynonymRelationships(syn); + return defaultService.deleteSynonymRelationships(syn); } /** @@ -1240,7 +1241,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); } /** @@ -1250,7 +1251,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public Taxon findBestMatchingTaxon(String taxonName) { - return defaultTaxonService.findBestMatchingTaxon(taxonName); + return defaultService.findBestMatchingTaxon(taxonName); } /** @@ -1260,7 +1261,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public Taxon findBestMatchingTaxon(MatchingTaxonConfigurator config) { - return defaultTaxonService.findBestMatchingTaxon(config); + return defaultService.findBestMatchingTaxon(config); } /** @@ -1270,7 +1271,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public Synonym findBestMatchingSynonym(String taxonName) { - return defaultTaxonService.findBestMatchingSynonym(taxonName); + return defaultService.findBestMatchingSynonym(taxonName); } /** @@ -1279,7 +1280,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public List> getUuidAndTitleCacheTaxon() { - return defaultTaxonService.getUuidAndTitleCacheTaxon(); + return defaultService.getUuidAndTitleCacheTaxon(); } /** @@ -1288,7 +1289,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public List> getUuidAndTitleCacheSynonym() { - return defaultTaxonService.getUuidAndTitleCacheSynonym(); + return defaultService.getUuidAndTitleCacheSynonym(); } /** @@ -1298,7 +1299,7 @@ public class TransientTaxonService implements ITaxonService { */ @Override public List> findTaxaAndNamesForEditor(IFindTaxaAndNamesConfigurator configurator) { - return defaultTaxonService.findTaxaAndNamesForEditor(configurator); + return defaultService.findTaxaAndNamesForEditor(configurator); } /** @@ -1311,7 +1312,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); } /** @@ -1323,27 +1324,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 @@ -1352,7 +1353,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) @@ -1361,7 +1362,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) @@ -1370,7 +1371,7 @@ 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 @@ -1389,7 +1390,7 @@ public class TransientTaxonService implements ITaxonService { @Override public TaxonBase findWithoutFlush(UUID uuid) { - return defaultTaxonService.findWithoutFlush(uuid); + return defaultService.findWithoutFlush(uuid); } /* (non-Javadoc) @@ -1397,10 +1398,14 @@ public class TransientTaxonService implements ITaxonService { */ @Override public List findTaxaByName(MatchingTaxonConfigurator config) { - return defaultTaxonService.findTaxaByName(config); + return defaultService.findTaxaByName(config); } - + + @Override + public List listByIdentifier(Class clazz, String identifier, DefinedTerm identifierType, MatchMode matchmode, Integer pageSize, Integer pageNumber, List orderHints, List propertyPaths){ + return defaultService.listByIdentifier(clazz, identifier, identifierType, matchmode, pageSize, pageNumber, orderHints, propertyPaths); + } 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 4ef033f96..73f46968f 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 @@ -31,6 +31,7 @@ import eu.etaxonomy.cdm.api.service.config.TermDeletionConfigurator; import eu.etaxonomy.cdm.api.service.pager.Pager; import eu.etaxonomy.cdm.common.monitor.IProgressMonitor; import eu.etaxonomy.cdm.model.common.Annotation; +import eu.etaxonomy.cdm.model.common.DefinedTerm; import eu.etaxonomy.cdm.model.common.DefinedTermBase; import eu.etaxonomy.cdm.model.common.ISourceable; import eu.etaxonomy.cdm.model.common.IdentifiableSource; @@ -65,13 +66,13 @@ import eu.etaxonomy.cdm.strategy.merge.IMergeStrategy; */ public class TransientTermService implements ITermService { - private final ITermService defaultTermService; + private final ITermService defaultService; /** * @param defaultTermService */ public TransientTermService(ITermService defaultTermService) { - this.defaultTermService = defaultTermService; + this.defaultService = defaultTermService; } /** @@ -85,7 +86,7 @@ public class TransientTermService implements ITermService { */ @Override public Pager> pageAuditEvents(DefinedTermBase t, Integer pageSize, Integer pageNumber, AuditEventSort sort, List propertyPaths) { - return defaultTermService.pageAuditEvents(t, pageSize, pageNumber, sort, propertyPaths); + return defaultService.pageAuditEvents(t, pageSize, pageNumber, sort, propertyPaths); } /** @@ -100,7 +101,7 @@ public class TransientTermService implements ITermService { */ @Override public Pager getAnnotations(DefinedTermBase annotatedObj, MarkerType status, Integer pageSize, Integer pageNumber, List orderHints, List propertyPaths) { - return defaultTermService.getAnnotations(annotatedObj, status, pageSize, pageNumber, orderHints, propertyPaths); + return defaultService.getAnnotations(annotatedObj, status, pageSize, pageNumber, orderHints, propertyPaths); } /** @@ -109,7 +110,7 @@ public class TransientTermService implements ITermService { */ @Override public void clear() { - defaultTermService.clear(); + defaultService.clear(); } /** @@ -119,7 +120,7 @@ public class TransientTermService implements ITermService { */ @Override public void lock(DefinedTermBase t, LockOptions lockOptions) { - defaultTermService.lock(t, lockOptions); + defaultService.lock(t, lockOptions); } /** @@ -129,7 +130,7 @@ public class TransientTermService implements ITermService { */ @Override public DefinedTermBase getByUri(URI uri) { - return defaultTermService.getByUri(uri); + return defaultService.getByUri(uri); } /** @@ -140,7 +141,7 @@ public class TransientTermService implements ITermService { */ @Override public void refresh(DefinedTermBase t, LockOptions lockOptions, List propertyPaths) { - defaultTermService.refresh(t, lockOptions, propertyPaths); + defaultService.refresh(t, lockOptions, propertyPaths); } /** @@ -161,7 +162,7 @@ public class TransientTermService implements ITermService { */ @Override public List getAllLanguageStrings(int limit, int start) { - return defaultTermService.getAllLanguageStrings(limit, start); + return defaultService.getAllLanguageStrings(limit, start); } /** @@ -172,7 +173,7 @@ public class TransientTermService implements ITermService { */ @Override public List getAllRepresentations(int limit, int start) { - return defaultTermService.getAllRepresentations(limit, start); + return defaultService.getAllRepresentations(limit, start); } /** @@ -181,7 +182,7 @@ public class TransientTermService implements ITermService { */ @Override public void updateTitleCache() { - defaultTermService.updateTitleCache(); + defaultService.updateTitleCache(); } /** @@ -191,7 +192,7 @@ public class TransientTermService implements ITermService { */ @Override public AuditEventRecord getNextAuditEvent(DefinedTermBase t) { - return defaultTermService.getNextAuditEvent(t); + return defaultService.getNextAuditEvent(t); } /** @@ -201,7 +202,7 @@ public class TransientTermService implements ITermService { */ @Override public Language getLanguageByIso(String iso639) { - return defaultTermService.getLanguageByIso(iso639); + return defaultService.getLanguageByIso(iso639); } /** @@ -211,7 +212,7 @@ public class TransientTermService implements ITermService { */ @Override public List getLanguagesByLocale(Enumeration locales) { - return defaultTermService.getLanguagesByLocale(locales); + return defaultService.getLanguagesByLocale(locales); } /** @@ -221,7 +222,7 @@ public class TransientTermService implements ITermService { */ @Override public NamedArea getAreaByTdwgAbbreviation(String tdwgAbbreviation) { - return defaultTermService.getAreaByTdwgAbbreviation(tdwgAbbreviation); + return defaultService.getAreaByTdwgAbbreviation(tdwgAbbreviation); } /** @@ -236,7 +237,7 @@ public class TransientTermService implements ITermService { */ @Override public Pager getMarkers(DefinedTermBase annotatableEntity, Boolean technical, Integer pageSize, Integer pageNumber, List orderHints, List propertyPaths) { - return defaultTermService.getMarkers(annotatableEntity, technical, pageSize, pageNumber, orderHints, propertyPaths); + return defaultService.getMarkers(annotatableEntity, technical, pageSize, pageNumber, orderHints, propertyPaths); } /** @@ -248,7 +249,7 @@ public class TransientTermService implements ITermService { */ @Override public Pager getMedia(DefinedTermBase definedTerm, Integer pageSize, Integer pageNumber) { - return defaultTermService.getMedia(definedTerm, pageSize, pageNumber); + return defaultService.getMedia(definedTerm, pageSize, pageNumber); } /** @@ -260,7 +261,7 @@ public class TransientTermService implements ITermService { */ @Override public void updateTitleCache(Class clazz, Integer stepSize, IIdentifiableEntityCacheStrategy cacheStrategy, IProgressMonitor monitor) { - defaultTermService.updateTitleCache(clazz, stepSize, cacheStrategy, monitor); + defaultService.updateTitleCache(clazz, stepSize, cacheStrategy, monitor); } /** @@ -270,7 +271,7 @@ public class TransientTermService implements ITermService { */ @Override public AuditEventRecord getPreviousAuditEvent(DefinedTermBase t) { - return defaultTermService.getPreviousAuditEvent(t); + return defaultService.getPreviousAuditEvent(t); } /** @@ -280,7 +281,7 @@ public class TransientTermService implements ITermService { */ @Override public int count(Class clazz) { - return defaultTermService.count(clazz); + return defaultService.count(clazz); } /** @@ -295,7 +296,7 @@ public class TransientTermService implements ITermService { */ @Override public Pager list(NamedAreaLevel level, NamedAreaType type, Integer pageSize, Integer pageNumber, List orderHints, List propertyPaths) { - return defaultTermService.list(level, type, pageSize, pageNumber, orderHints, propertyPaths); + return defaultService.list(level, type, pageSize, pageNumber, orderHints, propertyPaths); } /** @@ -312,7 +313,7 @@ public class TransientTermService implements ITermService { */ @Override public Pager> pageAuditEvents(Class clazz, AuditEvent from, AuditEvent to, List criteria, Integer pageSize, Integer pageValue, AuditEventSort sort, List propertyPaths) { - return defaultTermService.pageAuditEvents(clazz, from, to, criteria, pageSize, pageValue, sort, propertyPaths); + return defaultService.pageAuditEvents(clazz, from, to, criteria, pageSize, pageValue, sort, propertyPaths); } /** @@ -322,7 +323,7 @@ public class TransientTermService implements ITermService { */ @Override public DefinedTermBase find(LSID lsid) { - return defaultTermService.find(lsid); + return defaultService.find(lsid); } /** @@ -332,7 +333,7 @@ public class TransientTermService implements ITermService { */ @Override public DeleteResult delete(DefinedTermBase persistentObject) { - return defaultTermService.delete(persistentObject); + return defaultService.delete(persistentObject); } /** @@ -346,7 +347,7 @@ public class TransientTermService implements ITermService { */ @Override public List groupMarkers(Class clazz, Boolean technical, Integer pageSize, Integer pageNumber, List propertyPaths) { - return defaultTermService.groupMarkers(clazz, technical, pageSize, pageNumber, propertyPaths); + return defaultService.groupMarkers(clazz, technical, pageSize, pageNumber, propertyPaths); } /** @@ -356,7 +357,7 @@ public class TransientTermService implements ITermService { */ @Override public boolean exists(UUID uuid) { - return defaultTermService.exists(uuid); + return defaultService.exists(uuid); } /** @@ -367,7 +368,7 @@ public class TransientTermService implements ITermService { */ @Override public DefinedTermBase replace(DefinedTermBase x, DefinedTermBase y) { - return defaultTermService.replace(x, y); + return defaultService.replace(x, y); } /** @@ -379,7 +380,7 @@ public class TransientTermService implements ITermService { */ @Override public Pager getGeneralizationOf(T definedTerm, Integer pageSize, Integer pageNumber) { - return defaultTermService.getGeneralizationOf(definedTerm, pageSize, pageNumber); + return defaultService.getGeneralizationOf(definedTerm, pageSize, pageNumber); } /** @@ -389,7 +390,7 @@ public class TransientTermService implements ITermService { */ @Override public List find(Set uuidSet) { - return defaultTermService.find(uuidSet); + return defaultService.find(uuidSet); } /** @@ -402,7 +403,7 @@ public class TransientTermService implements ITermService { */ @Override public Pager getSources(DefinedTermBase t, Integer pageSize, Integer pageNumber, List propertyPaths) { - return defaultTermService.getSources(t, pageSize, pageNumber, propertyPaths); + return defaultService.getSources(t, pageSize, pageNumber, propertyPaths); } /** @@ -412,7 +413,7 @@ public class TransientTermService implements ITermService { */ @Override public DefinedTermBase find(UUID uuid) { - return defaultTermService.find(uuid); + return defaultService.find(uuid); } /** @@ -425,7 +426,7 @@ public class TransientTermService implements ITermService { */ @Override public Pager getPartOf(Set definedTerms, Integer pageSize, Integer pageNumber, List propertyPaths) { - return defaultTermService.getPartOf(definedTerms, pageSize, pageNumber, propertyPaths); + return defaultService.getPartOf(definedTerms, pageSize, pageNumber, propertyPaths); } /** @@ -435,7 +436,7 @@ public class TransientTermService implements ITermService { */ @Override public DefinedTermBase find(int id) { - return defaultTermService.find(id); + return defaultService.find(id); } /** @@ -448,7 +449,7 @@ public class TransientTermService implements ITermService { */ @Override public Pager getRights(DefinedTermBase t, Integer pageSize, Integer pageNumber, List propertyPaths) { - return defaultTermService.getRights(t, pageSize, pageNumber, propertyPaths); + return defaultService.getRights(t, pageSize, pageNumber, propertyPaths); } /** @@ -459,7 +460,7 @@ public class TransientTermService implements ITermService { */ @Override public int countMarkers(Class clazz, Boolean technical) { - return defaultTermService.countMarkers(clazz, technical); + return defaultService.countMarkers(clazz, technical); } /** @@ -469,7 +470,7 @@ public class TransientTermService implements ITermService { */ @Override public List findById(Set idSet) { - return defaultTermService.findById(idSet); + return defaultService.findById(idSet); } /** @@ -482,7 +483,7 @@ public class TransientTermService implements ITermService { */ @Override public Pager getIncludes(Collection definedTerms, Integer pageSize, Integer pageNumber, List propertyPaths) { - return defaultTermService.getIncludes(definedTerms, pageSize, pageNumber, propertyPaths); + return defaultService.getIncludes(definedTerms, pageSize, pageNumber, propertyPaths); } /** @@ -494,7 +495,7 @@ public class TransientTermService implements ITermService { */ @Override public ISourceable getSourcedObjectByIdInSource(Class clazz, String idInSource, String idNamespace) { - return defaultTermService.getSourcedObjectByIdInSource(clazz, idInSource, idNamespace); + return defaultService.getSourcedObjectByIdInSource(clazz, idInSource, idNamespace); } /** @@ -503,7 +504,7 @@ public class TransientTermService implements ITermService { */ @Override public Session getSession() { - return defaultTermService.getSession(); + return defaultService.getSession(); } /** @@ -512,7 +513,7 @@ public class TransientTermService implements ITermService { */ @Override public List> getUuidAndTitleCache() { - return defaultTermService.getUuidAndTitleCache(); + return defaultService.getUuidAndTitleCache(); } /** @@ -526,7 +527,7 @@ public class TransientTermService implements ITermService { */ @Override public List group(Class clazz, Integer limit, Integer start, List groups, List propertyPaths) { - return defaultTermService.group(clazz, limit, start, groups, propertyPaths); + return defaultService.group(clazz, limit, start, groups, propertyPaths); } /** @@ -539,7 +540,7 @@ public class TransientTermService implements ITermService { */ @Override public Pager findByRepresentationText(String label, Class clazz, Integer pageSize, Integer pageNumber) { - return defaultTermService.findByRepresentationText(label, clazz, pageSize, pageNumber); + return defaultService.findByRepresentationText(label, clazz, pageSize, pageNumber); } /** @@ -556,7 +557,7 @@ public class TransientTermService implements ITermService { */ @Override public Pager findByTitle(Class clazz, String queryString, MatchMode matchmode, List criteria, Integer pageSize, Integer pageNumber, List orderHints, List propertyPaths) { - return defaultTermService.findByTitle(clazz, queryString, matchmode, criteria, pageSize, pageNumber, orderHints, propertyPaths); + return defaultService.findByTitle(clazz, queryString, matchmode, criteria, pageSize, pageNumber, orderHints, propertyPaths); } /** @@ -569,7 +570,7 @@ public class TransientTermService implements ITermService { */ @Override public Pager findByRepresentationAbbreviation(String abbrev, Class clazz, Integer pageSize, Integer pageNumber) { - return defaultTermService.findByRepresentationAbbreviation(abbrev, clazz, pageSize, pageNumber); + return defaultService.findByRepresentationAbbreviation(abbrev, clazz, pageSize, pageNumber); } /** @@ -583,7 +584,7 @@ public class TransientTermService implements ITermService { */ @Override public List list(Class type, Integer limit, Integer start, List orderHints, List propertyPaths) { - return defaultTermService.list(type, limit, start, orderHints, propertyPaths); + return defaultService.list(type, limit, start, orderHints, propertyPaths); } /** @@ -594,7 +595,7 @@ public class TransientTermService implements ITermService { */ @Override public DeleteResult delete(DefinedTermBase term, TermDeletionConfigurator config) { - return defaultTermService.delete(term, config); + return defaultService.delete(term, config); } /** @@ -604,7 +605,7 @@ public class TransientTermService implements ITermService { */ @Override public Pager findByTitle(IIdentifiableEntityServiceConfigurator configurator) { - return defaultTermService.findByTitle(configurator); + return defaultService.findByTitle(configurator); } /** @@ -617,7 +618,7 @@ public class TransientTermService implements ITermService { */ @Override public Integer countByTitle(Class clazz, String queryString, MatchMode matchmode, List criteria) { - return defaultTermService.countByTitle(clazz, queryString, matchmode, criteria); + return defaultService.countByTitle(clazz, queryString, matchmode, criteria); } /** @@ -627,7 +628,7 @@ public class TransientTermService implements ITermService { */ @Override public DefinedTermBase load(UUID uuid) { - return defaultTermService.load(uuid); + return defaultService.load(uuid); } /** @@ -638,7 +639,7 @@ public class TransientTermService implements ITermService { */ @Override public DefinedTermBase load(UUID uuid, List propertyPaths) { - return defaultTermService.load(uuid, propertyPaths); + return defaultService.load(uuid, propertyPaths); } /** @@ -648,7 +649,7 @@ public class TransientTermService implements ITermService { */ @Override public Integer countByTitle(IIdentifiableEntityServiceConfigurator configurator) { - return defaultTermService.countByTitle(configurator); + return defaultService.countByTitle(configurator); } /** @@ -658,7 +659,7 @@ public class TransientTermService implements ITermService { */ @Override public DefinedTermBase merge(DefinedTermBase transientObject) { - return defaultTermService.merge(transientObject); + return defaultService.merge(transientObject); } /** @@ -675,7 +676,7 @@ public class TransientTermService implements ITermService { */ @Override public List listByTitle(Class clazz, String queryString, MatchMode matchmode, List criteria, Integer pageSize, Integer pageNumber, List orderHints, List propertyPaths) { - return defaultTermService.listByTitle(clazz, queryString, matchmode, criteria, pageSize, pageNumber, orderHints, propertyPaths); + return defaultService.listByTitle(clazz, queryString, matchmode, criteria, pageSize, pageNumber, orderHints, propertyPaths); } /** @@ -689,7 +690,7 @@ public class TransientTermService implements ITermService { */ @Override public Pager page(Class type, Integer pageSize, Integer pageNumber, List orderHints, List propertyPaths) { - return defaultTermService.page(type, pageSize, pageNumber, orderHints, propertyPaths); + return defaultService.page(type, pageSize, pageNumber, orderHints, propertyPaths); } /** @@ -699,7 +700,7 @@ public class TransientTermService implements ITermService { */ @Override public UUID refresh(DefinedTermBase persistentObject) { - return defaultTermService.refresh(persistentObject); + return defaultService.refresh(persistentObject); } /** @@ -716,7 +717,7 @@ public class TransientTermService implements ITermService { */ @Override public List listByReferenceTitle(Class clazz, String queryString, MatchMode matchmode, List criteria, Integer pageSize, Integer pageNumber, List orderHints, List propertyPaths) { - return defaultTermService.listByReferenceTitle(clazz, queryString, matchmode, criteria, pageSize, pageNumber, orderHints, propertyPaths); + return defaultService.listByReferenceTitle(clazz, queryString, matchmode, criteria, pageSize, pageNumber, orderHints, propertyPaths); } /** @@ -728,7 +729,7 @@ public class TransientTermService implements ITermService { */ @Override public List rows(String tableName, int limit, int start) { - return defaultTermService.rows(tableName, limit, start); + return defaultService.rows(tableName, limit, start); } /** @@ -773,7 +774,7 @@ public class TransientTermService implements ITermService { */ @Override public Pager search(Class clazz, String queryString, Integer pageSize, Integer pageNumber, List orderHints, List propertyPaths) { - return defaultTermService.search(clazz, queryString, pageSize, pageNumber, orderHints, propertyPaths); + return defaultService.search(clazz, queryString, pageSize, pageNumber, orderHints, propertyPaths); } /** @@ -793,7 +794,7 @@ public class TransientTermService implements ITermService { */ @Override public UUID update(DefinedTermBase transientObject) { - return defaultTermService.update(transientObject); + return defaultService.update(transientObject); } /** @@ -808,7 +809,7 @@ public class TransientTermService implements ITermService { */ @Override public List list(DefinedTermBase example, Set includeProperties, Integer limit, Integer start, List orderHints, List propertyPaths) { - return defaultTermService.list(example, includeProperties, limit, start, orderHints, propertyPaths); + return defaultService.list(example, includeProperties, limit, start, orderHints, propertyPaths); } /** @@ -820,7 +821,7 @@ public class TransientTermService implements ITermService { */ @Override public int deduplicate(Class clazz, IMatchStrategy matchStrategy, IMergeStrategy mergeStrategy) { - return defaultTermService.deduplicate(clazz, matchStrategy, mergeStrategy); + return defaultService.deduplicate(clazz, matchStrategy, mergeStrategy); } /** @@ -835,19 +836,19 @@ public class TransientTermService implements ITermService { */ @Override public Pager findTitleCache(Class clazz, String queryString, Integer pageSize, Integer pageNumber, List orderHints, MatchMode matchMode) { - return defaultTermService.findTitleCache(clazz, queryString, pageSize, pageNumber, orderHints, matchMode); + return defaultService.findTitleCache(clazz, queryString, pageSize, pageNumber, orderHints, matchMode); } @Override public TERM findByIdInVocabulary(String id, UUID vocabularyUuid, Class clazz) { - return defaultTermService.findByIdInVocabulary(id, vocabularyUuid, clazz); + return defaultService.findByIdInVocabulary(id, vocabularyUuid, clazz); } @Override public DeleteResult isDeletable(DefinedTermBase object, DeleteConfiguratorBase config) { - return defaultTermService.isDeletable(object, config); + return defaultService.isDeletable(object, config); } /* (non-Javadoc) @@ -856,12 +857,18 @@ public class TransientTermService implements ITermService { @Override public List> listByTermType(TermType termType, Integer limit, Integer start, List orderHints, List propertyPaths) { - return defaultTermService.listByTermType(termType, limit, start, orderHints, propertyPaths); + return defaultService.listByTermType(termType, limit, start, orderHints, propertyPaths); } @Override public DefinedTermBase findWithoutFlush(UUID uuid) { - return defaultTermService.findWithoutFlush(uuid); + return defaultService.findWithoutFlush(uuid); + } + + + @Override + public List listByIdentifier(Class clazz, String identifier, DefinedTerm identifierType, MatchMode matchmode, Integer pageSize, Integer pageNumber, List orderHints, List propertyPaths){ + return defaultService.listByIdentifier(clazz, identifier, identifierType, matchmode, pageSize, pageNumber, orderHints, propertyPaths); } }