From b60ffd2e2dbeae97ad0b03fdab3211bbf710465a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andreas=20M=C3=BCller?= Date: Thu, 13 Apr 2023 15:11:49 +0200 Subject: [PATCH 1/1] unify list and listByAbbrev methods (cont.) --- .../persistence/dao/hibernate/term/DefinedTermDaoImpl.java | 5 ----- .../etaxonomy/cdm/persistence/dao/term/IDefinedTermDao.java | 2 -- .../java/eu/etaxonomy/cdm/api/service/TermServiceImpl.java | 3 ++- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/term/DefinedTermDaoImpl.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/term/DefinedTermDaoImpl.java index 30a1a68bdc..1b01ec3d78 100644 --- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/term/DefinedTermDaoImpl.java +++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/term/DefinedTermDaoImpl.java @@ -648,11 +648,6 @@ public class DefinedTermDaoImpl return deduplicateResult(super.list(type, limit, start, orderHints, propertyPath)); } - @Override - public List list(Class clazz, List vocs, Integer limit, String pattern, TermSearchField type) { - return list(clazz, vocs, 0, limit, pattern, MatchMode.BEGINNING, type); - } - @Override public List list(Class clazz, List vocs, Integer pageNumber, Integer limit, String pattern, MatchMode matchmode, TermSearchField abbrevType){ diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/term/IDefinedTermDao.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/term/IDefinedTermDao.java index 6475c24563..e3e559557a 100644 --- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/term/IDefinedTermDao.java +++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/term/IDefinedTermDao.java @@ -218,8 +218,6 @@ public interface IDefinedTermDao public List list(Class clazz, List vocs, Integer pageNumber, Integer limit, String pattern, MatchMode matchmode, TermSearchField type); - public List list(Class clazz, List vocs, Integer limit, String pattern, TermSearchField type); - /** * Returns all terms that are included in the given parent term resp. a part of the given term. * @param parentTerm the parent term diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TermServiceImpl.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TermServiceImpl.java index 4a4c0c124d..84947a2836 100644 --- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TermServiceImpl.java +++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TermServiceImpl.java @@ -64,6 +64,7 @@ import eu.etaxonomy.cdm.persistence.dao.term.IRepresentationDao; import eu.etaxonomy.cdm.persistence.dao.term.ITermCollectionDao; import eu.etaxonomy.cdm.persistence.dto.TermDto; import eu.etaxonomy.cdm.persistence.dto.UuidAndTitleCache; +import eu.etaxonomy.cdm.persistence.query.MatchMode; import eu.etaxonomy.cdm.persistence.query.OrderHint; import eu.etaxonomy.cdm.strategy.cache.common.IIdentifiableEntityCacheStrategy; @@ -488,7 +489,7 @@ public class TermServiceImpl @SuppressWarnings("rawtypes") List vocs = filterCollectionType(TermVocabulary.class, termCollections); if (!vocs.isEmpty() || CdmUtils.isNullSafeEmpty(termCollections)) { //search on all vocabularies if no filter is set - terms = dao.list(clazz, vocs, limit, pattern, type); //TODO lang still missing; + terms = dao.list(clazz, vocs, null, limit, pattern, MatchMode.BEGINNING, type); //TODO lang still missing; } @SuppressWarnings("rawtypes") -- 2.34.1