improve generics for collection save in service and dao layer

[cdmlib.git] / cdmlib-persistence / src / main / java / eu / etaxonomy / cdm / persistence / dao / hibernate / common / CdmEntityDaoBase.java

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 6fd6cb0a70bbff17fec02f2dfdbcfb55d1ffdc93..19cef6d825d06f65bea9f15a2b3fcb58ed80793c 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
@@ -136,7 +136,7 @@ public abstract class CdmEntityDaoBase<T extends CdmBase>
     // TODO: why does this use saveCdmObject_ which actually savesOrUpdateds\r
     // data ?\r
     @Override\r
-    public Map<UUID, T> saveAll(Collection<T> cdmObjCollection) {\r
+    public Map<UUID, T> saveAll(Collection<? extends T> cdmObjCollection) {\r
         int types = cdmObjCollection.getClass().getTypeParameters().length;\r
         if (types > 0) {\r
             if (logger.isDebugEnabled()) {\r
@@ -145,7 +145,7 @@ public abstract class CdmEntityDaoBase<T extends CdmBase>
         }\r
 \r
         Map<UUID, T> resultMap = new HashMap<>();\r
-        Iterator<T> iterator = cdmObjCollection.iterator();\r
+        Iterator<? extends T> iterator = cdmObjCollection.iterator();\r
         int i = 0;\r
         while (iterator.hasNext()) {\r
             if (((i % 2000) == 0) && (i > 0)) {\r
@@ -514,9 +514,6 @@ public abstract class CdmEntityDaoBase<T extends CdmBase>
         return result;\r
     }\r
 \r
-    /**\r
-     * {@inheritDoc}\r
-     */\r
     @Override\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
@@ -776,7 +773,7 @@ public abstract class CdmEntityDaoBase<T extends CdmBase>
     }\r
 \r
     @Override\r
-    public T loadProxy(int id){\r
+    public T loadWithoutInitializing(int id){\r
         return this.getSession().load(type, id);\r
     }\r
 \r