Merge branch 'develop' of ssh://dev.e-taxonomy.eu/var/git/cdmlib into develop

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

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/AnnotationService.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/AnnotationService.java
index 88dc863a2cf730aa37134c05fd3ae4bd431c105d..2d361b132894db1bc21ff1245120a9a3ff32455f 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/AnnotationService.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/AnnotationService.java
@@ -1,53 +1,73 @@
-// $Id$\r
-/**\r
- * Copyright (C) 2007 EDIT\r
- * European Distributed Institute of Taxonomy \r
- * http://www.e-taxonomy.eu\r
- * \r
- * The contents of this file are subject to the Mozilla Public License Version 1.1\r
- * See LICENSE.TXT at the top of this package for the full license terms.\r
- */\r
-\r
-package eu.etaxonomy.cdm.api.service;\r
-\r
-import java.util.ArrayList;\r
-import java.util.List;\r
-\r
-import org.springframework.beans.factory.annotation.Autowired;\r
-import org.springframework.stereotype.Service;\r
-import org.springframework.transaction.annotation.Propagation;\r
-import org.springframework.transaction.annotation.Transactional;\r
-\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.agent.Person;\r
-import eu.etaxonomy.cdm.model.common.Annotation;\r
-import eu.etaxonomy.cdm.model.common.MarkerType;\r
-import eu.etaxonomy.cdm.persistence.dao.hibernate.common.AnnotationDaoImpl;\r
-import eu.etaxonomy.cdm.persistence.query.OrderHint;\r
-\r
-@Service\r
-@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)\r
-public class AnnotationService extends AnnotatableServiceBase<Annotation, AnnotationDaoImpl> implements\r
-               IAnnotationService {\r
-\r
-       @Autowired\r
-       protected void setDao(AnnotationDaoImpl dao) {\r
-               this.dao = dao;\r
-       }\r
-\r
-       public int count(Person commentator, MarkerType status) {\r
-               return dao.count(commentator, status);\r
-       }\r
-\r
-       public Pager<Annotation> list(Person commentator, MarkerType status,Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {\r
-               Integer numberOfResults = dao.count(commentator, status);\r
-               \r
-               List<Annotation> results = new ArrayList<Annotation>();\r
-               if(numberOfResults > 0) { // no point checking again\r
-                       results = dao.list(commentator, status, pageSize, pageNumber, orderHints, propertyPaths);\r
-               }\r
-               \r
-               return new DefaultPagerImpl<Annotation>(pageNumber, numberOfResults, pageSize, results);\r
-       }\r
-}\r
+/**
+ * Copyright (C) 2007 EDIT
+ * European Distributed Institute of Taxonomy
+ * http://www.e-taxonomy.eu
+ *
+ * The contents of this file are subject to the Mozilla Public License Version 1.1
+ * See LICENSE.TXT at the top of this package for the full license terms.
+ */
+
+package eu.etaxonomy.cdm.api.service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import eu.etaxonomy.cdm.api.service.pager.Pager;
+import eu.etaxonomy.cdm.api.service.pager.impl.DefaultPagerImpl;
+import eu.etaxonomy.cdm.model.agent.Person;
+import eu.etaxonomy.cdm.model.common.Annotation;
+import eu.etaxonomy.cdm.model.common.MarkerType;
+import eu.etaxonomy.cdm.model.permission.User;
+import eu.etaxonomy.cdm.persistence.dao.hibernate.common.AnnotationDaoImpl;
+import eu.etaxonomy.cdm.persistence.query.OrderHint;
+
+@Service
+@Transactional(readOnly = true)
+public class AnnotationService extends AnnotatableServiceBase<Annotation, AnnotationDaoImpl> implements
+               IAnnotationService {
+
+       @Override
+    @Autowired
+       protected void setDao(AnnotationDaoImpl dao) {
+               this.dao = dao;
+       }
+
+       @Override
+    public long count(Person commentator, MarkerType status) {
+               return dao.count(commentator, status);
+       }
+
+       @Override
+    public Pager<Annotation> list(Person commentator, MarkerType status,Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
+               Long numberOfResults = dao.count(commentator, status);
+
+               List<Annotation> results = new ArrayList<Annotation>();
+               if(numberOfResults > 0) { // no point checking again //TODO use AbstractPagerImpl.hasResultsInRange(numberOfResults, pageNumber, pageSize)
+                       results = dao.list(commentator, status, pageSize, pageNumber, orderHints, propertyPaths);
+               }
+
+               return new DefaultPagerImpl<Annotation>(pageNumber, numberOfResults, pageSize, results);
+       }
+
+       @Override
+    public long count(User creator, MarkerType status) {
+               return dao.count(creator, status);
+       }
+
+       @Override
+    public Pager<Annotation> list(User creator, MarkerType status,     Integer pageSize, Integer pageNumber, List<OrderHint> orderHints,
+                       List<String> propertyPaths) {
+        long numberOfResults = dao.count(creator, status);
+
+               List<Annotation> results = new ArrayList<>();
+               if(numberOfResults > 0) { // no point checking again //TODO use AbstractPagerImpl.hasResultsInRange(numberOfResults, pageNumber, pageSize)
+                       results = dao.list(creator, status, pageSize, pageNumber, orderHints, propertyPaths);
+               }
+
+               return new DefaultPagerImpl<Annotation>(pageNumber, numberOfResults, pageSize, results);
+       }
+}