merge trunk into model change 3.6

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

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IdentificationKeyServiceImpl.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IdentificationKeyServiceImpl.java
index fc1b9cb9a4d39861f1d929f6dc6ad38f19f67281..b141ee912c60f60687e3eb857c6078f354f27684 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IdentificationKeyServiceImpl.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IdentificationKeyServiceImpl.java
@@ -5,7 +5,6 @@ import java.util.List;
 \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
@@ -27,6 +26,7 @@ public class IdentificationKeyServiceImpl implements IIdentificationKeyService {
         this.dao = dao;\r
     }\r
 \r
+    @Override\r
     public Pager<IIdentificationKey> page(Integer pageSize, Integer pageNumber,        List<String> propertyPaths) {\r
         Integer numberOfResults = dao.count();\r
         List<IIdentificationKey> results = new ArrayList<IIdentificationKey>();\r
@@ -39,16 +39,17 @@ public class IdentificationKeyServiceImpl implements IIdentificationKeyService {
     }\r
 \r
 \r
+    @Override\r
     public <T extends IIdentificationKey> Pager<T> findKeysConvering(TaxonBase taxon,\r
             Class<T> type, Integer pageSize,\r
             Integer pageNumber, List<String> propertyPaths) {\r
 \r
-        Integer numberOfResults = dao.countByTaxonomicScope(taxon, type).intValue();\r
+        Long numberOfResults = dao.countByTaxonomicScope(taxon, type);\r
         List<T> results = new ArrayList<T>();\r
         if(AbstractPagerImpl.hasResultsInRange(numberOfResults, pageNumber, pageSize)){\r
             results = dao.findByTaxonomicScope(taxon, type, pageSize, pageNumber, propertyPaths);\r
         }\r
-        return new DefaultPagerImpl<T>(pageNumber, numberOfResults, pageSize, results);\r
+        return new DefaultPagerImpl<T>(pageNumber, numberOfResults.intValue(), pageSize, results);\r
     }\r
 \r
 }\r