saveOrUpdate(Collection)

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 ad55db53b662aadab25b709f0fd617fb2db16030..abf9aa90f43f874e6c83df0edb4665e9c014d146 100644 (file)
--- 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
@@ -230,6 +230,15 @@ public interface IService<T extends CdmBase>{
         */\r
        public UUID saveOrUpdate(T transientObject);\r
        \r
         */\r
        public UUID saveOrUpdate(T transientObject);\r
        \r

+       /**\r
+        * Save new entities or update the persistent state of existing \r
+        * transient entities that have been persisted previously\r
+        * \r
+        * @param transientObjects the entities to be persisted\r
+        * @return The unique identifier of the persisted entity\r
+        */\r
+       public Map<UUID,T> saveOrUpdate(Collection<T> transientObjects);\r
+       \r

     /**\r
         * Update the persistent state of an existing transient entity \r
         * that has been persisted previously\r
     /**\r
         * Update the persistent state of an existing transient entity \r
         * that has been persisted previously\r

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IdentifiableServiceBase.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IdentifiableServiceBase.java
index de8d0bb42df27fbe47772668dbefb744bba8c17f..8eb1609b220ac3fb3af9a393c0ce5c03f87e1885 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IdentifiableServiceBase.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IdentifiableServiceBase.java
@@ -193,7 +193,7 @@ public abstract class IdentifiableServiceBase<T extends IdentifiableEntity,DAO e
                                        }
                                }
                        }
                                        }
                                }
                        }

-                       saveOrUpdateAll(entitiesToUpdate);
+                       saveOrUpdate(entitiesToUpdate);

                        
                }
        }
                        
                }
        }

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 f72cf4e71d3d97dd596fba88bb2bd15b67c7d496..6e169d66ae6e7e95ce8ecc6f61a8e30ecbf60813 100644 (file)
--- 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
@@ -155,7 +155,7 @@ public abstract class ServiceBase<T extends CdmBase, DAO extends ICdmEntityDao<T
        }\r
        \r
        @Transactional(readOnly = false)\r
        }\r
        \r
        @Transactional(readOnly = false)\r

-       public Map<UUID, T> saveOrUpdateAll(Collection<T> transientInstances) {\r
+       public Map<UUID, T> saveOrUpdate(Collection<T> transientInstances) {\r

                return dao.saveOrUpdateAll(transientInstances);\r
        }\r
 \r
                return dao.saveOrUpdateAll(transientInstances);\r
        }\r
 \r