unify list and listByAbbrev methods (cont.)

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 30a1a68bdc6be6fadfab3d790d9f406b9f919522..1b01ec3d78c09ebf75bb078d5a37f330149e4bb7 100644 (file)
--- 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 <S extends DefinedTermBase> List<S> list(Class<S> clazz, List<TermVocabulary> vocs, Integer limit, String pattern, TermSearchField type) {
-        return list(clazz, vocs, 0, limit, pattern, MatchMode.BEGINNING, type);
-    }
-
     @Override
     public <S extends DefinedTermBase> List<S> list(Class<S> clazz, List<TermVocabulary> 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 6475c24563853f8ccc2280dfe155cea679ac8798..e3e559557a3ca9b009d23abdf5f571a77f76d6f2 100644 (file)
--- 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 <S extends DefinedTermBase> List<S> list(Class<S> clazz, List<TermVocabulary> vocs, Integer pageNumber, Integer limit, String pattern, MatchMode matchmode, TermSearchField type);
 
-    public <S extends DefinedTermBase> List<S> list(Class<S> clazz, List<TermVocabulary> 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 4a4c0c124dfaf6e81508be393bfa9421a91633df..84947a2836dfef2bca01874319b8fdfa4f027fec 100644 (file)
--- 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<TermVocabulary> 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")