property paths for derived unit

[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 452f0328b06b286abec85713bdc6130f5ca62bb7..3846bcff7b9b0d9cd0125eb092052c204ece8c06 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,15 +19,14 @@ 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
 \r
-@Transactional(readOnly = true)\r
 public abstract class AnnotatableServiceBase<T extends AnnotatableEntity,DAO extends IAnnotatableDao<T>> extends VersionableServiceBase<T, DAO>\r
                implements IAnnotatableService<T> {\r
-       \r
-       @Transactional\r
+       @Transactional(readOnly = true)\r
        public Pager<Annotation> getAnnotations(T annotatedObj, MarkerType status, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {\r
                Integer numberOfResults = dao.countAnnotations(annotatedObj, status);\r
                \r
@@ -38,4 +37,27 @@ public abstract class AnnotatableServiceBase<T extends AnnotatableEntity,DAO ext
                \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\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