Return-Path: 
 <cloudstack-commits-return-9049-apmail-incubator-cloudstack-commits-archive=incubator.apache.org@incubator.apache.org>
X-Original-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org
Delivered-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 1E07FD52F
	for <apmail-incubator-cloudstack-commits-archive@minotaur.apache.org>;
 Fri, 25 Jan 2013 03:31:59 +0000 (UTC)
Received: (qmail 98058 invoked by uid 500); 25 Jan 2013 03:31:58 -0000
Delivered-To: apmail-incubator-cloudstack-commits-archive@incubator.apache.org
Received: (qmail 97866 invoked by uid 500); 25 Jan 2013 03:31:58 -0000
Mailing-List: contact cloudstack-commits-help@incubator.apache.org;
 run by ezmlm
Precedence: bulk
List-Help: <mailto:cloudstack-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:cloudstack-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:cloudstack-commits@incubator.apache.org>
List-Id: <cloudstack-commits.incubator.apache.org>
Reply-To: cloudstack-dev@incubator.apache.org
Delivered-To: mailing list cloudstack-commits@incubator.apache.org
Received: (qmail 95631 invoked by uid 99); 25 Jan 2013 03:31:48 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 25 Jan 2013 03:31:48 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id 2B1E6825186; Fri, 25 Jan 2013 03:31:46 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: bhaisaab@apache.org
To: cloudstack-commits@incubator.apache.org
X-Mailer: ASF-Git Admin Mailer
Subject: [32/50] [abbrv] git commit: EntityManager: Implement method to search
 by uuid including removed entities
Message-Id: <20130125033147.2B1E6825186@tyr.zones.apache.org>
Date: Fri, 25 Jan 2013 03:31:46 +0000 (UTC)

EntityManager: Implement method to search by uuid including removed entities

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/b335684e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/b335684e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/b335684e

Branch: refs/heads/javelin
Commit: b335684ec5122d65a79ca45b10d508e760d31945
Parents: 3c335bd
Author: Rohit Yadav <bhaisaab@apache.org>
Authored: Wed Jan 23 14:55:26 2013 -0800
Committer: Rohit Yadav <bhaisaab@apache.org>
Committed: Wed Jan 23 14:57:41 2013 -0800

----------------------------------------------------------------------
 api/src/com/cloud/dao/EntityManager.java        |    9 +++++++++
 server/src/com/cloud/dao/EntityManagerImpl.java |    7 +++++++
 2 files changed, 16 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b335684e/api/src/com/cloud/dao/EntityManager.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/dao/EntityManager.java b/api/src/com/cloud/dao/EntityManager.java
index 4e4b9c2..b8fdaa7 100644
--- a/api/src/com/cloud/dao/EntityManager.java
+++ b/api/src/com/cloud/dao/EntityManager.java
@@ -48,6 +48,15 @@ public interface EntityManager {
     public <T> T findByUuid(Class<T> entityType, String uuid);
 
     /**
+     * Finds a unique entity by uuid string
+     * @param <T> entity class
+     * @param entityType type of entity you're looking for.
+     * @param uuid the unique id
+     * @return T if found, null if not.
+     */
+    public <T> T findByUuidIncludingRemoved(Class<T> entityType, String uuid);
+
+    /**
      * Finds an entity by external id which is always String
      * @param <T> entity class
      * @param entityType type of entity you're looking for.

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b335684e/server/src/com/cloud/dao/EntityManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/dao/EntityManagerImpl.java b/server/src/com/cloud/dao/EntityManagerImpl.java
index 2eee445..1d88192 100644
--- a/server/src/com/cloud/dao/EntityManagerImpl.java
+++ b/server/src/com/cloud/dao/EntityManagerImpl.java
@@ -52,6 +52,13 @@ public class EntityManagerImpl implements EntityManager, Manager {
     }
 
     @Override
+    public <T> T findByUuidIncludingRemoved(Class<T> entityType, String uuid) {
+        // Finds and returns a unique VO using uuid, null if entity not found in db
+        GenericDao<? extends T, String> dao = (GenericDao<? extends T, String>)GenericDaoBase.getDao(entityType);
+        return dao.findByUuidIncludingRemoved(uuid);
+    }
+
+    @Override
     public <T> T findByXId(Class<T> entityType, String xid) {
         return null;
     }