minor issue with return type of listToTaxonRelationships() fixed

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/common/ICdmEntityDao.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/common/ICdmEntityDao.java
index 56b1fee65e0c9e4fb54ae1a485482b53f7461540..3bfa19843ba25cf39d00442423fcde909ad598bf 100644 (file)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/common/ICdmEntityDao.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/common/ICdmEntityDao.java
@@ -21,7 +21,6 @@ import org.hibernate.criterion.Criterion;
 import org.springframework.dao.DataAccessException;
 
 import eu.etaxonomy.cdm.model.common.CdmBase;
-import eu.etaxonomy.cdm.persistence.dao.initializer.IBeanInitializer;
 import eu.etaxonomy.cdm.persistence.dto.MergeResult;
 import eu.etaxonomy.cdm.persistence.query.Grouping;
 import eu.etaxonomy.cdm.persistence.query.MatchMode;
@@ -246,7 +245,7 @@ public interface ICdmEntityDao<T extends CdmBase> {
      * @return
      * @throws DataAccessException
      */
-    public List<T> list(Class<? extends T> type, List<Restriction<?>> restrictions, Integer limit, Integer start, List<OrderHint> orderHints, List<String> propertyPaths);
+    public <S extends T> List<S> list(Class<S> type, List<Restriction<?>> restrictions, Integer limit, Integer start, List<OrderHint> orderHints, List<String> propertyPaths);
 
     /**
      * Counts the Cdm entities matching the restrictions defined by

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/CdmEntityDaoBase.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/CdmEntityDaoBase.java
index c517fcdb09a491c01ead54c1a0770fbab9c37284..5ba09f7d9b2244fa4f8137bd3d5511d9673fa3c4 100644 (file)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/CdmEntityDaoBase.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/CdmEntityDaoBase.java
@@ -515,7 +515,7 @@ public abstract class CdmEntityDaoBase<T extends CdmBase> extends DaoBase implem
      * {@inheritDoc}\r
      */\r
     @Override\r
-    public List<T> list(Class<? extends T> type, List<Restriction<?>> restrictions, Integer limit, Integer start,\r
+    public <S extends T> List<S> list(Class<S> type, List<Restriction<?>> restrictions, Integer limit, Integer start,\r
             List<OrderHint> orderHints, List<String> propertyPaths) {\r
 \r
         Criteria criteria = createCriteria(type, restrictions, false);\r
@@ -524,7 +524,7 @@ public abstract class CdmEntityDaoBase<T extends CdmBase> extends DaoBase implem
         addOrder(criteria, orderHints);\r
 \r
         @SuppressWarnings("unchecked")\r
-        List<T> result = criteria.list();\r
+        List<S> result = criteria.list();\r
         defaultBeanInitializer.initializeAll(result, propertyPaths);\r
         return result;\r
     }\r

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/hibernate/CdmDataChangeEvent.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/hibernate/CdmDataChangeEvent.java
index 126643a40277b03d06659874fbd8903f9c5909d4..cb62969746890ed780394cc13a1f9c0829da07f8 100644 (file)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/hibernate/CdmDataChangeEvent.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/hibernate/CdmDataChangeEvent.java
@@ -57,9 +57,7 @@ public class CdmDataChangeEvent extends AbstractEvent{
     private final Serializable id;
     protected final EventType eventType;
 
-    /**
-     * @param source
-     */
+
     private CdmDataChangeEvent(
             CdmBase entity,
             Serializable id,

diff --git a/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/agent/AgentDaoImplTest.java b/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/agent/AgentDaoImplTest.java
index 8117811a26a9ed1cb9e79134a78295ed49283e33..f4273741bb7b2f36182814175b467ed119e353fc 100644 (file)
--- a/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/agent/AgentDaoImplTest.java
+++ b/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/agent/AgentDaoImplTest.java
@@ -264,7 +264,7 @@ public class AgentDaoImplTest extends CdmTransactionalIntegrationTest {
         Assert.assertNotNull("list() should return a list",result);
         Assert.assertEquals("list() should return 9 AgentBase entities in the current view", 9 ,result.size());
 
-        List<AgentBase>  personResults = agentDao.list(Person.class, restrictions, (Integer)null, (Integer)null, null, null);
+        List<Person>  personResults = agentDao.list(Person.class, restrictions, (Integer)null, (Integer)null, null, null);
         Assert.assertEquals("list() should return 5 Persons entities", 5, personResults.size());
 
         Restriction<String> givenNameExact = new Restriction<>("givenName", MatchMode.EXACT);