From e6ae42359cd5dee5291b59ca61ae5755a7a36d5a Mon Sep 17 00:00:00 2001
From: =?utf8?q?Andreas=20M=C3=BCller?= <a.mueller@bgbm.org>
Date: Wed, 9 Feb 2022 22:32:39 +0100
Subject: [PATCH] improve generics for collection save in service and dao layer

---
 .../etaxonomy/cdm/persistence/dao/common/ICdmEntityDao.java   | 2 +-
 .../persistence/dao/hibernate/common/CdmEntityDaoBase.java    | 4 ++--
 .../src/main/java/eu/etaxonomy/cdm/api/service/IService.java  | 2 +-
 .../eu/etaxonomy/cdm/api/service/RegistrationServiceImpl.java | 2 +-
 .../main/java/eu/etaxonomy/cdm/api/service/ServiceBase.java   | 2 +-
 .../main/java/eu/etaxonomy/cdm/api/service/UserService.java   | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

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 4fb0b79ee0..4a8830225d 100644
--- 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
@@ -106,7 +106,7 @@ public interface ICdmEntityDao<T extends CdmBase> {
 
     public Session getSession() throws DataAccessException;
 
-    public Map<UUID, T> saveAll(Collection<T> cdmObjCollection) throws DataAccessException;
+    public Map<UUID, T> saveAll(Collection<? extends T> cdmObjCollection) throws DataAccessException;
 
     public Map<UUID, T> saveOrUpdateAll(Collection<T> cdmObjCollection);
 
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 32c77c8dcc..19cef6d825 100644
--- 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
     // data ?
     @Override
-    public Map<UUID, T> saveAll(Collection<T> cdmObjCollection) {
+    public Map<UUID, T> saveAll(Collection<? extends T> cdmObjCollection) {
         int types = cdmObjCollection.getClass().getTypeParameters().length;
         if (types > 0) {
             if (logger.isDebugEnabled()) {
@@ -145,7 +145,7 @@ public abstract class CdmEntityDaoBase<T extends CdmBase>
         }
 
         Map<UUID, T> resultMap = new HashMap<>();
-        Iterator<T> iterator = cdmObjCollection.iterator();
+        Iterator<? extends T> iterator = cdmObjCollection.iterator();
         int i = 0;
         while (iterator.hasNext()) {
             if (((i % 2000) == 0) && (i > 0)) {
diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IService.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IService.java
index 9dd481a11d..eaceff742b 100644
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IService.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IService.java
@@ -310,7 +310,7 @@ public interface IService<T extends ICdmBase>{
      * @return A Map containing the new entities, keyed using the generated UUID's
      *         of those entities
      */
-    public Map<UUID,T> save(Collection<T> newInstances);
+    public Map<UUID,T> save(Collection<? extends T> newInstances);
 
     /**
      * Save a new entity (persists the entity)
diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/RegistrationServiceImpl.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/RegistrationServiceImpl.java
index 1d10168eb1..26f2fac00e 100644
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/RegistrationServiceImpl.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/RegistrationServiceImpl.java
@@ -222,7 +222,7 @@ public class RegistrationServiceImpl extends AnnotatableServiceBase<Registration
     }
 
     @Override
-    public Map<UUID, Registration> save(Collection<Registration> newInstances) {
+    public Map<UUID, Registration> save(Collection<? extends Registration> newInstances) {
         Map<UUID, Registration> regs = new HashMap<>();
         for(Registration newInstance : newInstances) {
             Registration reg = save(newInstance);
diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ServiceBase.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ServiceBase.java
index 8d9dad18cd..4e685ce6c5 100644
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ServiceBase.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ServiceBase.java
@@ -281,7 +281,7 @@ public abstract class ServiceBase<T extends CdmBase, DAO extends ICdmEntityDao<T
 
     @Override
     @Transactional(readOnly = false)
-    public Map<UUID, T> save(Collection<T> newInstances) {
+    public Map<UUID, T> save(Collection<? extends T> newInstances) {
         return dao.saveAll(newInstances);
     }
 
diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/UserService.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/UserService.java
index 24f4c220e7..8573a7aa2a 100644
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/UserService.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/UserService.java
@@ -310,7 +310,7 @@ public class UserService extends ServiceBase<User,IUserDao> implements IUserServ
     @Override
     @Transactional(readOnly=false)
     @PreAuthorize("hasRole('ROLE_ADMIN') or hasRole('ROLE_USER_MANAGER')")
-    public Map<UUID, User> save(Collection<User> newInstances) {
+    public Map<UUID, User> save(Collection<? extends User> newInstances) {
         Map<UUID, User> users = new HashMap<UUID, User>();
     	for (User user: newInstances){
         	createUser(user);
-- 
2.34.1