X-Git-Url: https://dev.e-taxonomy.eu/gitweb/cdmlib.git/blobdiff_plain/d3d4afa45e55dbc09ec131640215da5c32891804..fdf9eec2eb7b4806e1a1cdc4020db83ce65345bc:/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 b9a62e17a6..509535861f 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
@@ -68,8 +68,8 @@ public abstract class ServiceBase<T extends CdmBase, DAO extends ICdmEntityDao<T
 
     @Override
     @Transactional(readOnly = false)
-    public UUID delete(T persistentObject) throws ReferencedObjectUndeletableException {
-        return dao.delete(persistentObject);
+    public String delete(T persistentObject) {
+        return dao.delete(persistentObject).toString();
     }
 
     @Override
@@ -116,7 +116,7 @@ public abstract class ServiceBase<T extends CdmBase, DAO extends ICdmEntityDao<T
 
     @Override
     @Transactional(readOnly = true)
-    public  List<T> list(Class<? extends T> type, Integer limit, Integer start, List<OrderHint> orderHints, List<String> propertyPaths){
+    public <S extends T> List<S> list(Class<S> type, Integer limit, Integer start, List<OrderHint> orderHints, List<String> propertyPaths){
         return dao.list(type,limit, start, orderHints,propertyPaths);
     }
 
@@ -140,15 +140,15 @@ public abstract class ServiceBase<T extends CdmBase, DAO extends ICdmEntityDao<T
 
     @Override
     @Transactional(readOnly = true)
-    public  Pager<T> page(Class<? extends T> type, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths){
+    public  <S extends T> Pager<S> page(Class<S> type, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths){
         Integer numberOfResults = dao.count(type);
-        List<T> results = new ArrayList<T>();
+        List<S> results = new ArrayList<S>();
         pageNumber = pageNumber == null ? 0 : pageNumber;
         if(numberOfResults > 0) { // no point checking again  //TODO use AbstractPagerImpl.hasResultsInRange(numberOfResults, pageNumber, pageSize)
             Integer start = pageSize == null ? 0 : pageSize * pageNumber;
             results = dao.list(type, pageSize, start, orderHints,propertyPaths);
         }
-        return new DefaultPagerImpl<T>(pageNumber, numberOfResults, pageSize, results);
+        return new DefaultPagerImpl<S>(pageNumber, numberOfResults, pageSize, results);
     }
 
     @Override
@@ -212,5 +212,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) {
         return dao.list(example, includeProperties, limit, start, orderHints, propertyPaths);
     }
+    
+    
 
 }