implement list find method for user and group services (#2283 and #2284). Tests are...

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

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/AnnotatableServiceBase.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/AnnotatableServiceBase.java
index ee52745bc1dcdbe998d72c4f86bfb961a804dffc..04b189965d6db0f1b0a9c4df127832ddf5752c6f 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/AnnotatableServiceBase.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/AnnotatableServiceBase.java
@@ -19,6 +19,7 @@ import eu.etaxonomy.cdm.api.service.pager.Pager;
 import eu.etaxonomy.cdm.api.service.pager.impl.DefaultPagerImpl;\r
 import eu.etaxonomy.cdm.model.common.AnnotatableEntity;\r
 import eu.etaxonomy.cdm.model.common.Annotation;\r
+import eu.etaxonomy.cdm.model.common.Marker;\r
 import eu.etaxonomy.cdm.model.common.MarkerType;\r
 import eu.etaxonomy.cdm.persistence.dao.common.IAnnotatableDao;\r
 import eu.etaxonomy.cdm.persistence.query.OrderHint;\r
@@ -30,10 +31,33 @@ public abstract class AnnotatableServiceBase<T extends AnnotatableEntity,DAO ext
                Integer numberOfResults = dao.countAnnotations(annotatedObj, status);\r
                \r
                List<Annotation> results = new ArrayList<Annotation>();\r
-               if(numberOfResults > 0) { // no point checking again\r
+               if(numberOfResults > 0) { // no point checking again //TODO use AbstractPagerImpl.hasResultsInRange(numberOfResults, pageNumber, pageSize)\r
                        results = dao.getAnnotations(annotatedObj, status, pageSize, pageNumber, orderHints, propertyPaths); \r
                }\r
                \r
                return new DefaultPagerImpl<Annotation>(pageNumber, numberOfResults, pageSize, results);\r
        }\r
+       \r
+       @Transactional(readOnly = true)\r
+    public Pager<Marker> getMarkers(T annotatableEntity, Boolean technical, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {\r
+        Integer numberOfResults = dao.countMarkers(annotatableEntity, technical);\r
+               \r
+               List<Marker> results = new ArrayList<Marker>();\r
+               if(numberOfResults > 0) { // no point checking again //TODO use AbstractPagerImpl.hasResultsInRange(numberOfResults, pageNumber, pageSize)\r
+                       results = dao.getMarkers(annotatableEntity, technical, pageSize, pageNumber, orderHints, propertyPaths);\r
+               }\r
+               \r
+               return new DefaultPagerImpl<Marker>(pageNumber, numberOfResults, pageSize, results);\r
+    }\r
+       \r
+\r
+       @Transactional(readOnly = true)\r
+       public List<Object[]> groupMarkers(Class<? extends T> clazz, Boolean technical, Integer pageSize, Integer pageNumber, List<String> propertyPaths) {\r
+               return dao.groupMarkers(clazz, technical, pageSize, pageNumber, propertyPaths);\r
+       }\r
+\r
+       @Transactional(readOnly = true)\r
+       public int countMarkers(Class<? extends T> clazz, Boolean technical) {\r
+               return dao.countMarkers(clazz, technical);\r
+       }\r
 }\r