From ba5fba939c1af0f936ac752da280fc040b5bdd09 Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Tue, 18 Dec 2012 16:22:37 -0800 Subject: [PATCH] api: Fix method name findByXId to findByUuid - findByXId is read as find using some external Id (used by external network devices for ex.) - what we really need is findByUuid that finds a unique VO using a uuid string Signed-off-by: Rohit Yadav --- utils/src/com/cloud/utils/db/GenericDao.java | 4 ++-- utils/src/com/cloud/utils/db/GenericDaoBase.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/utils/src/com/cloud/utils/db/GenericDao.java b/utils/src/com/cloud/utils/db/GenericDao.java index 082748a532a..2fae1afe43d 100755 --- a/utils/src/com/cloud/utils/db/GenericDao.java +++ b/utils/src/com/cloud/utils/db/GenericDao.java @@ -55,8 +55,8 @@ public interface GenericDao { T findById(ID id, boolean fresh); - // Finds a VO object using uuid - T findByXId(ID uuid); + // Finds one unique VO using uuid + T findByUuid(ID uuid); /** * @return VO object ready to be used for update. It won't have any fields filled in. diff --git a/utils/src/com/cloud/utils/db/GenericDaoBase.java b/utils/src/com/cloud/utils/db/GenericDaoBase.java index 6bc49bf963e..92e9e1c4405 100755 --- a/utils/src/com/cloud/utils/db/GenericDaoBase.java +++ b/utils/src/com/cloud/utils/db/GenericDaoBase.java @@ -915,7 +915,7 @@ public abstract class GenericDaoBase implements Gene @Override @DB(txn=false) @SuppressWarnings("unchecked") - public T findByXId(final ID uuid) { + public T findByUuid(final ID uuid) { SearchCriteria sc = createSearchCriteria(); sc.addAnd("uuid", SearchCriteria.Op.EQ, uuid); return findOneBy(sc);