merge trunk into model change 3.6

[cdmlib.git] / cdmlib-services / src / main / java / eu / etaxonomy / cdm / api / service / ServiceBase.java

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 93900ae0a3dcfee6070d3c8d51bd32a5d65492a3..4e494d0f4f490ffdb1333f26945303e53f812548 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
@@ -18,14 +18,13 @@ import java.util.Set;
 import java.util.UUID;\r
 \r
 import org.apache.log4j.Logger;\r
-import org.hibernate.LockMode;\r
+import org.hibernate.LockOptions;\r
 import org.hibernate.Session;\r
 import org.springframework.context.ApplicationContext;\r
 import org.springframework.context.ApplicationContextAware;\r
 import org.springframework.dao.DataAccessException;\r
 import org.springframework.transaction.annotation.Transactional;\r
 \r
-import eu.etaxonomy.cdm.api.service.exception.ReferencedObjectUndeletableException;\r
 import eu.etaxonomy.cdm.api.service.pager.Pager;\r
 import eu.etaxonomy.cdm.api.service.pager.impl.DefaultPagerImpl;\r
 import eu.etaxonomy.cdm.model.common.CdmBase;\r
@@ -45,14 +44,14 @@ public abstract class ServiceBase<T extends CdmBase, DAO extends ICdmEntityDao<T
 \r
     @Override\r
     @Transactional(readOnly = true)\r
-    public void lock(T t, LockMode lockMode) {\r
-        dao.lock(t, lockMode);\r
+    public void lock(T t, LockOptions lockOptions) {\r
+        dao.lock(t, lockOptions);\r
     }\r
 \r
     @Override\r
     @Transactional(readOnly = true)\r
-    public void refresh(T t, LockMode lockMode, List<String> propertyPaths) {\r
-        dao.refresh(t, lockMode, propertyPaths);\r
+    public void refresh(T t, LockOptions lockOptions, List<String> propertyPaths) {\r
+        dao.refresh(t, lockOptions, propertyPaths);\r
     }\r
 \r
     @Override\r
@@ -101,13 +100,13 @@ public abstract class ServiceBase<T extends CdmBase, DAO extends ICdmEntityDao<T
     @Override\r
     @Transactional(readOnly = true)\r
     public T find(UUID uuid) {\r
-        return dao.findByUuid(uuid);\r
+        return uuid == null ? null : dao.findByUuid(uuid);\r
     }\r
-    \r
+\r
     @Override\r
     @Transactional(readOnly = true)\r
     public T findWithoutFlush(UUID uuid) {\r
-        return dao.findByUuidWithoutFlush(uuid);\r
+        return uuid == null ? null : dao.findByUuidWithoutFlush(uuid);\r
     }\r
 \r
     @Override\r
@@ -137,13 +136,13 @@ public abstract class ServiceBase<T extends CdmBase, DAO extends ICdmEntityDao<T
     @Override\r
     @Transactional(readOnly = true)\r
     public T load(UUID uuid) {\r
-        return dao.load(uuid);\r
+        return uuid == null ? null : dao.load(uuid);\r
     }\r
 \r
     @Override\r
     @Transactional(readOnly = true)\r
     public T load(UUID uuid, List<String> propertyPaths){\r
-        return dao.load(uuid, propertyPaths);\r
+        return uuid == null ? null : dao.load(uuid, propertyPaths);\r
     }\r
 \r
     @Override\r
@@ -226,7 +225,7 @@ public abstract class ServiceBase<T extends CdmBase, DAO extends ICdmEntityDao<T
     public List<T> list(T example, Set<String> includeProperties, Integer limit, Integer start, List<OrderHint> orderHints, List<String> propertyPaths) {\r
         return dao.list(example, includeProperties, limit, start, orderHints, propertyPaths);\r
     }\r
-    \r
-    \r
+\r
+\r
 \r
 }\r