From 740b283067f97fe04f32473ce57780db58829c16 Mon Sep 17 00:00:00 2001 From: Patrick Plitzner Date: Wed, 9 Dec 2015 08:59:03 +0100 Subject: [PATCH] Generalize term service method listByTermType() --- .../etaxonomy/cdm/persistence/dao/common/IDefinedTermDao.java | 2 +- .../persistence/dao/hibernate/common/DefinedTermDaoImpl.java | 2 +- .../main/java/eu/etaxonomy/cdm/api/service/ITermService.java | 2 +- .../main/java/eu/etaxonomy/cdm/api/service/TermServiceImpl.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/common/IDefinedTermDao.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/common/IDefinedTermDao.java index 73110b84bd..d2d6f157a6 100644 --- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/common/IDefinedTermDao.java +++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/common/IDefinedTermDao.java @@ -173,7 +173,7 @@ public interface IDefinedTermDao extends IIdentifiableDao, ITit * @param propertyPaths * @return a list containing the terms */ - public List> listByTermType(TermType termType, Integer limit, Integer start, List orderHints, List propertyPaths); + public List listByTermType(TermType termType, Integer limit, Integer start, List orderHints, List propertyPaths); public List listByTermClass(Class clazz, Integer limit, Integer start, List orderHints, List propertyPaths); diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/DefinedTermDaoImpl.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/DefinedTermDaoImpl.java index 893f4ced52..c0952676f8 100644 --- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/DefinedTermDaoImpl.java +++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/DefinedTermDaoImpl.java @@ -648,7 +648,7 @@ public class DefinedTermDaoImpl extends IdentifiableDaoBase imp * @see eu.etaxonomy.cdm.persistence.dao.common.IDefinedTermDao#listByTermType(eu.etaxonomy.cdm.model.common.TermType, java.lang.Integer, java.lang.Integer, java.util.List, java.util.List) */ @Override - public List> listByTermType(TermType termType, Integer limit, Integer start, + public List listByTermType(TermType termType, Integer limit, Integer start, List orderHints, List propertyPaths) { Query query = getSession().createQuery("select term from DefinedTermBase term where term.termType = :termType"); query.setParameter("termType", termType); diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ITermService.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ITermService.java index 0d0e085375..028bfc7191 100644 --- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ITermService.java +++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ITermService.java @@ -136,7 +136,7 @@ public interface ITermService extends IIdentifiableEntityService> listByTermType(TermType termType, Integer limit, Integer start, List orderHints, List propertyPaths); + public List listByTermType(TermType termType, Integer limit, Integer start, List orderHints, List propertyPaths); /** * Delete the given term according to the given delete configuration. 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 6ed5b21bb0..ab79534fd3 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 @@ -88,7 +88,7 @@ public class TermServiceImpl extends IdentifiableServiceBase> listByTermType(TermType termType, Integer limit, Integer start, + public List listByTermType(TermType termType, Integer limit, Integer start, List orderHints, List propertyPaths) { return dao.listByTermType(termType, limit, start, orderHints, propertyPaths); } -- 2.34.1