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 / ReferenceServiceImpl.java

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ReferenceServiceImpl.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ReferenceServiceImpl.java
index 0db2f8e3d84ff4dcbd57ad10e8dc6f67596f1c3b..23beba00d4e3c59b5096a12e3285c5b1384e1e0c 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ReferenceServiceImpl.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ReferenceServiceImpl.java
@@ -10,30 +10,27 @@
 \r
 package eu.etaxonomy.cdm.api.service;\r
 \r
-import java.util.ArrayList;\r
-import java.util.Collection;\r
 import java.util.List;\r
-import java.util.Map;\r
-import java.util.UUID;\r
 \r
 import org.apache.log4j.Logger;\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.name.BotanicalName;\r
-import eu.etaxonomy.cdm.model.name.HybridRelationship;\r
-import eu.etaxonomy.cdm.model.name.HybridRelationshipType;\r
-import eu.etaxonomy.cdm.model.reference.ReferenceBase;\r
+import eu.etaxonomy.cdm.common.IProgressMonitor;\r
+import eu.etaxonomy.cdm.model.common.UuidAndTitleCache;\r
+import eu.etaxonomy.cdm.model.description.PolytomousKey;\r
+import eu.etaxonomy.cdm.model.name.TaxonNameBase;\r
+import eu.etaxonomy.cdm.model.reference.Reference;\r
+import eu.etaxonomy.cdm.model.taxon.TaxonBase;\r
 import eu.etaxonomy.cdm.persistence.dao.reference.IReferenceDao;\r
-import eu.etaxonomy.cdm.persistence.query.OrderHint;\r
+import eu.etaxonomy.cdm.strategy.cache.common.IIdentifiableEntityCacheStrategy;\r
 \r
 \r
 @Service\r
-@Transactional(readOnly = true)\r
-public class ReferenceServiceImpl extends IdentifiableServiceBase<ReferenceBase,IReferenceDao> implements IReferenceService {\r
+@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)\r
+public class ReferenceServiceImpl extends IdentifiableServiceBase<Reference,IReferenceDao> implements IReferenceService {\r
        \r
        static Logger logger = Logger.getLogger(ReferenceServiceImpl.class);\r
 \r
@@ -43,66 +40,44 @@ public class ReferenceServiceImpl extends IdentifiableServiceBase<ReferenceBase,
        public ReferenceServiceImpl(){\r
                if (logger.isDebugEnabled()) { logger.debug("Load ReferenceService Bean"); }\r
        }\r
-       \r
-       public ReferenceBase getReferenceByUuid(UUID uuid) {\r
-               return super.getCdmObjectByUuid(uuid); \r
-       }\r
-\r
-       public List<ReferenceBase> getReferencesByTitle(String title) {\r
-               return super.findCdmObjectsByTitle(title);\r
-       }\r
-       \r
-       public List<ReferenceBase> getReferencesByTitle(String title, Class<ReferenceBase> clazz) {\r
-               return super.findCdmObjectsByTitle(title, clazz);\r
-       }\r
-       \r
-       @Transactional(readOnly = false)\r
-       public UUID saveReference(ReferenceBase reference) {\r
-               return super.saveCdmObject(reference);\r
-       }\r
-\r
-       @Transactional(readOnly = false)\r
-       public Map<UUID, ReferenceBase> saveReferenceAll(Collection<ReferenceBase> referenceCollection){\r
-               return saveCdmObjectAll(referenceCollection);\r
-       }\r
 \r
        /* (non-Javadoc)\r
-        * @see eu.etaxonomy.cdm.api.service.IReferenceService#getAllReferences(int, int)\r
+        * @see eu.etaxonomy.cdm.api.service.IIdentifiableEntityService#updateTitleCache(java.lang.Integer, eu.etaxonomy.cdm.strategy.cache.common.IIdentifiableEntityCacheStrategy)\r
         */\r
-       @Deprecated\r
-       public List<ReferenceBase> getAllReferences(int limit, int start){\r
-                       return dao.list(limit, start);\r
-       }\r
-       \r
-       /* (non-Javadoc)\r
-        * @see eu.etaxonomy.cdm.api.service.IReferenceService#getAllReferences(java.lang.Integer, java.lang.Integer)\r
-        */\r
-       public Pager<ReferenceBase> getAllReferences(Integer pageSize, Integer pageNumber, List<OrderHint> orderHints) {\r
-        Integer numberOfResults = dao.count();\r
-               \r
-               List<ReferenceBase> results = new ArrayList<ReferenceBase>();\r
-               if(numberOfResults > 0) { // no point checking again\r
-                       Integer start = pageSize == null ? 0 : pageSize * (pageNumber - 1);\r
-                       results = dao.list(pageSize, start, orderHints); //TODO implement pager like method in dao?\r
+       @Override\r
+       public void updateTitleCache(Class<? extends Reference> clazz, Integer stepSize, IIdentifiableEntityCacheStrategy<Reference> cacheStrategy, IProgressMonitor monitor) {\r
+               if (clazz == null){\r
+                       clazz = Reference.class;\r
                }\r
-               return new DefaultPagerImpl<ReferenceBase>(pageNumber, numberOfResults, pageSize, results);\r
+               super.updateTitleCacheImpl(clazz, stepSize, cacheStrategy, monitor);\r
        }\r
 \r
-       public Pager<ReferenceBase> getAllReferences(Integer pageSize, Integer pageNumber) {\r
-               return getAllReferences(pageSize, pageNumber, null);\r
-       }\r
-\r
-       public void generateTitleCache() {\r
-               logger.warn("Not yet implemented");\r
-               // TODO Auto-generated method stub\r
-               \r
-       }\r
 \r
        @Autowired\r
        protected void setDao(IReferenceDao dao) {\r
                this.dao = dao;\r
        }\r
 \r
+       public List<UuidAndTitleCache<Reference>> getUuidAndTitle() {\r
+               \r
+               return dao.getUuidAndTitle();\r
+       }\r
+       \r
+       public List<Reference> getAllReferencesForPublishing(){\r
+               return dao.getAllNotNomenclaturalReferencesForPublishing();\r
+       }\r
+\r
+       public List<Reference> getAllNomenclaturalReferences() {\r
+               \r
+               return dao.getAllNomenclaturalReferences();\r
+       }\r
 \r
+       @Override\r
+       public List<TaxonBase> listCoveredTaxa(Reference reference, boolean includeSubordinateReferences, List<String> propertyPaths) {\r
+               \r
+               List<TaxonBase> taxonList = dao.listCoveredTaxa(reference, includeSubordinateReferences, propertyPaths);\r
+               \r
+               return taxonList;\r
+       }\r
 \r
 }\r