X-Git-Url: https://dev.e-taxonomy.eu/gitweb/cdmlib.git/blobdiff_plain/86fe3d7c78252faa8318a39e631df3d0a3d89fa9..80f2190f78c77344b7685541088821dfd6f1a525:/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 25d9e8a80b..a431a1df29 100644
--- 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$
 /**
 * Copyright (C) 2007 EDIT
 * European Distributed Institute of Taxonomy 
@@ -10,24 +11,24 @@
 package eu.etaxonomy.cdm.api.service;
 
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.List;
-import java.util.Map;
-import java.util.UUID;
 
 import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
 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.Agent;
+import eu.etaxonomy.cdm.model.agent.Address;
+import eu.etaxonomy.cdm.model.agent.AgentBase;
 import eu.etaxonomy.cdm.model.agent.Institution;
 import eu.etaxonomy.cdm.model.agent.InstitutionalMembership;
 import eu.etaxonomy.cdm.model.agent.Person;
 import eu.etaxonomy.cdm.model.agent.Team;
-import eu.etaxonomy.cdm.model.common.Annotation;
+import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase;
+import eu.etaxonomy.cdm.model.common.UuidAndTitleCache;
 import eu.etaxonomy.cdm.persistence.dao.agent.IAgentDao;
 
 
@@ -37,32 +38,16 @@ import eu.etaxonomy.cdm.persistence.dao.agent.IAgentDao;
  *
  */
 @Service
-@Transactional
-public class AgentServiceImpl extends IdentifiableServiceBase<Agent,IAgentDao> implements IAgentService {
-    @SuppressWarnings("unused")
-	private static final Logger logger = Logger.getLogger(AgentServiceImpl.class);
+@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
+public class AgentServiceImpl extends IdentifiableServiceBase<AgentBase,IAgentDao> implements IAgentService {
+    private static final Logger logger = Logger.getLogger(AgentServiceImpl.class);
 	
 
-	public List<Agent> findAgentsByTitle(String title) {
-		return super.findCdmObjectsByTitle(title);
-	}
-
-	public Agent getAgentByUuid(UUID uuid) {
-		return dao.findByUuid(uuid);
-	}
-
-	public UUID saveAgent(Agent agent) {
-		return super.saveCdmObject(agent);
-	}
-	
-	@Transactional(readOnly = false)
-	public Map<UUID, Agent> saveAgentAll(Collection<? extends Agent> agentCollection){
-		return saveCdmObjectAll(agentCollection);
-	}
-
-	
-	public List<? extends Agent> getAllAgents(int limit, int start){
-		return dao.list(limit, start);
+	/**
+	 * Constructor
+	 */
+	public AgentServiceImpl(){
+		if (logger.isDebugEnabled()) { logger.debug("Load AgentService Bean"); }
 	}
 	
 	public List<Institution> searchInstitutionByCode(String code) {
@@ -102,5 +87,28 @@ public class AgentServiceImpl extends IdentifiableServiceBase<Agent,IAgentDao> i
 		return new DefaultPagerImpl<Person>(pageNumber, numberOfResults, pageSize, results);
 	}
 
-	
+	public Pager<Address> getAddresses(AgentBase agent, Integer pageSize, Integer pageNumber) {
+		Integer numberOfResults = dao.countAddresses(agent);
+		
+		List<Address> results = new ArrayList<Address>();
+		if(numberOfResults > 0) { // no point checking again
+			results = dao.getAddresses(agent, pageSize, pageNumber); 
+		}
+			
+		return new DefaultPagerImpl<Address>(pageNumber, numberOfResults, pageSize, results);
+	}
+
+	/* (non-Javadoc)
+	 * @see eu.etaxonomy.cdm.api.service.IAgentService#getPersonUuidAndNomenclaturalTitle()
+	 */
+	public List<UuidAndTitleCache<Person>> getPersonUuidAndNomenclaturalTitle() {
+		return dao.getPersonUuidAndNomenclaturalTitle();
+	}
+
+	/* (non-Javadoc)
+	 * @see eu.etaxonomy.cdm.api.service.IAgentService#getTeamOrPersonBaseUuidAndNomenclaturalTitle()
+	 */
+	public List<UuidAndTitleCache<TeamOrPersonBase>> getTeamOrPersonBaseUuidAndNomenclaturalTitle() {
+		return dao.getTeamOrPersonBaseUuidAndNomenclaturalTitle();
+	}	
 }