Return-Path: 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 96FA9D528 for ; Fri, 25 Jan 2013 03:31:57 +0000 (UTC) Received: (qmail 96706 invoked by uid 500); 25 Jan 2013 03:31:56 -0000 Delivered-To: apmail-incubator-cloudstack-commits-archive@incubator.apache.org Received: (qmail 96594 invoked by uid 500); 25 Jan 2013 03:31:56 -0000 Mailing-List: contact cloudstack-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cloudstack-dev@incubator.apache.org Delivered-To: mailing list cloudstack-commits@incubator.apache.org Received: (qmail 95610 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 E6398825184; 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: [33/50] [abbrv] git commit: GenericDao: Add method to find by uuid string including removed entities Message-Id: <20130125033146.E6398825184@tyr.zones.apache.org> Date: Fri, 25 Jan 2013 03:31:46 +0000 (UTC) GenericDao: Add method to find by uuid string including removed entities Signed-off-by: Rohit Yadav Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/03d2c015 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/03d2c015 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/03d2c015 Branch: refs/heads/javelin Commit: 03d2c015ae70ff0f50adeb9551feca8d27752321 Parents: b335684 Author: Rohit Yadav Authored: Wed Jan 23 14:55:55 2013 -0800 Committer: Rohit Yadav Committed: Wed Jan 23 14:57:41 2013 -0800 ---------------------------------------------------------------------- utils/src/com/cloud/utils/db/GenericDao.java | 3 +++ utils/src/com/cloud/utils/db/GenericDaoBase.java | 8 ++++++++ 2 files changed, 11 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/03d2c015/utils/src/com/cloud/utils/db/GenericDao.java ---------------------------------------------------------------------- diff --git a/utils/src/com/cloud/utils/db/GenericDao.java b/utils/src/com/cloud/utils/db/GenericDao.java index 15d04b7..31a25fd 100755 --- a/utils/src/com/cloud/utils/db/GenericDao.java +++ b/utils/src/com/cloud/utils/db/GenericDao.java @@ -57,6 +57,9 @@ public interface GenericDao { // Finds one unique VO using uuid T findByUuid(String uuid); + + // Finds one unique VO using uuid including removed entities + T findByUuidIncludingRemoved(String uuid); /** * @return VO object ready to be used for update. It won't have any fields filled in. http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/03d2c015/utils/src/com/cloud/utils/db/GenericDaoBase.java ---------------------------------------------------------------------- diff --git a/utils/src/com/cloud/utils/db/GenericDaoBase.java b/utils/src/com/cloud/utils/db/GenericDaoBase.java index 880e9de..0d73b90 100755 --- a/utils/src/com/cloud/utils/db/GenericDaoBase.java +++ b/utils/src/com/cloud/utils/db/GenericDaoBase.java @@ -922,6 +922,14 @@ public abstract class GenericDaoBase implements Gene } @Override @DB(txn=false) + @SuppressWarnings("unchecked") + public T findByUuidIncludingRemoved(final String uuid) { + SearchCriteria sc = createSearchCriteria(); + sc.addAnd("uuid", SearchCriteria.Op.EQ, uuid); + return findOneIncludingRemovedBy(sc); + } + + @Override @DB(txn=false) public T findByIdIncludingRemoved(ID id) { return findById(id, true, null); }