From a4fb9b8032e9e1bf3ba0820a3d820676ca6cb778 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Andreas=20M=C3=BCller?= <a.mueller@bgbm.org>
Date: Fri, 9 Mar 2012 13:51:42 +0000
Subject: [PATCH] implemented findId in IService

---
 .../java/eu/etaxonomy/cdm/api/service/IService.java | 10 ++++++++++
 .../eu/etaxonomy/cdm/api/service/ServiceBase.java   | 13 +++++++++++--
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IService.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IService.java
index b3df76c4fa..2711b2900d 100644
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IService.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IService.java
@@ -110,6 +110,16 @@ public interface IService<T extends ICdmBase>{
 	 */
 	public T find(UUID uuid);
 	
+	/**
+	 * Return a persisted entity that matches the database identifier
+	 * supplied as an argument, or null if the entity does not exist
+	 * 
+	 * @param id the database identifier of the entity required
+	 * @return an entity of type <T>, or null if the entity does not exist
+	 */
+	public T find(int id);
+	
+	
 	// FIXME should we expose this method?
 	public Session getSession();
 	
diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ServiceBase.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ServiceBase.java
index a116f1b216..36a99a5936 100644
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ServiceBase.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ServiceBase.java
@@ -22,7 +22,6 @@ import org.hibernate.LockMode;
 import org.hibernate.Session;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.core.Authentication;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -79,12 +78,22 @@ public abstract class ServiceBase<T extends CdmBase, DAO extends ICdmEntityDao<T
 	public List<T> find(Set<UUID> uuidSet) {
 		return dao.findByUuid(uuidSet);
 	}
-
+	
+	@Transactional(readOnly = true)
+	public List<T> findById(Set<Integer> idSet) {  //can't be called find(Set<Integer>) as this conflicts with find(Set<UUID)
+		return dao.findById(idSet);
+	}
+	
 	@Transactional(readOnly = true)
 	public T find(UUID uuid) {
 		return dao.findByUuid(uuid);
 	}
 	
+	@Transactional(readOnly = true)
+	public T find(int id) {
+		return dao.findById(id);
+	}
+	
 	@Transactional(readOnly = true)
 	public Session getSession() {
 		return dao.getSession();
-- 
2.34.1