committing merged history from local git svn clone:

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

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/AgentServiceImpl.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/AgentServiceImpl.java
index 9e3df384110b5678f18a33db16ae610b3f22f441..cb79690e60ccaae6f69ac2e0606b3da8374b1e1e 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/AgentServiceImpl.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/AgentServiceImpl.java
@@ -1,3 +1,4 @@
+// $Id$\r
 /**\r
 * Copyright (C) 2007 EDIT\r
 * European Distributed Institute of Taxonomy \r
@@ -10,23 +11,24 @@
 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.agent.Address;\r
 import eu.etaxonomy.cdm.model.agent.AgentBase;\r
 import eu.etaxonomy.cdm.model.agent.Institution;\r
 import eu.etaxonomy.cdm.model.agent.InstitutionalMembership;\r
 import eu.etaxonomy.cdm.model.agent.Person;\r
 import eu.etaxonomy.cdm.model.agent.Team;\r
+import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase;\r
+import eu.etaxonomy.cdm.model.common.UuidAndTitleCache;\r
 import eu.etaxonomy.cdm.persistence.dao.agent.IAgentDao;\r
 \r
 \r
@@ -36,32 +38,16 @@ import eu.etaxonomy.cdm.persistence.dao.agent.IAgentDao;
  *\r
  */\r
 @Service\r
-@Transactional\r
+@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)\r
 public class AgentServiceImpl extends IdentifiableServiceBase<AgentBase,IAgentDao> implements IAgentService {\r
-    @SuppressWarnings("unused")\r
-       private static final Logger logger = Logger.getLogger(AgentServiceImpl.class);\r
+    private static final Logger logger = Logger.getLogger(AgentServiceImpl.class);\r
        \r
 \r
-       public List<AgentBase> findAgentsByTitle(String title) {\r
-               return super.findCdmObjectsByTitle(title);\r
-       }\r
-\r
-       public AgentBase getAgentByUuid(UUID uuid) {\r
-               return dao.findByUuid(uuid);\r
-       }\r
-\r
-       public UUID saveAgent(AgentBase agent) {\r
-               return super.saveCdmObject(agent);\r
-       }\r
-       \r
-       @Transactional(readOnly = false)\r
-       public Map<UUID, AgentBase> saveAgentAll(Collection<? extends AgentBase> agentCollection){\r
-               return saveCdmObjectAll(agentCollection);\r
-       }\r
-\r
-       \r
-       public List<AgentBase> getAllAgents(int limit, int start){\r
-               return dao.list(limit, start);\r
+       /**\r
+        * Constructor\r
+        */\r
+       public AgentServiceImpl(){\r
+               if (logger.isDebugEnabled()) { logger.debug("Load AgentService Bean"); }\r
        }\r
        \r
        public List<Institution> searchInstitutionByCode(String code) {\r
@@ -101,5 +87,31 @@ public class AgentServiceImpl extends IdentifiableServiceBase<AgentBase,IAgentDa
                return new DefaultPagerImpl<Person>(pageNumber, numberOfResults, pageSize, results);\r
        }\r
 \r
-       \r
+       public Pager<Address> getAddresses(AgentBase agent, Integer pageSize, Integer pageNumber) {\r
+               Integer numberOfResults = dao.countAddresses(agent);\r
+               \r
+               List<Address> results = new ArrayList<Address>();\r
+               if(numberOfResults > 0) { // no point checking again\r
+                       results = dao.getAddresses(agent, pageSize, pageNumber); \r
+               }\r
+                       \r
+               return new DefaultPagerImpl<Address>(pageNumber, numberOfResults, pageSize, results);\r
+       }\r
+\r
+       /* (non-Javadoc)\r
+        * @see eu.etaxonomy.cdm.api.service.IAgentService#getTeamOrPersonBaseUuidAndNomenclaturalTitle()\r
+        */\r
+       public List<UuidAndTitleCache<Team>> getTeamUuidAndNomenclaturalTitle() {\r
+               return dao.getTeamUuidAndNomenclaturalTitle();\r
+       }\r
+\r
+       @Override\r
+       public List<UuidAndTitleCache<Person>> getPersonUuidAndTitleCache() {\r
+               return dao.getPersonUuidAndTitleCache();\r
+       }\r
+\r
+       @Override\r
+       public List<UuidAndTitleCache<Team>> getTeamUuidAndTitleCache() {\r
+               return dao.getTeamUuidAndTitleCache();\r
+       }       \r
 }\r