server: Get rid of db helpers that work with IdentityMapper Signed-off-by: Rohit Yadav <[email protected]>
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/9d3ab8de Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/9d3ab8de Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/9d3ab8de Branch: refs/heads/api_refactoring Commit: 9d3ab8ded77f7dbba249b6cd6ef0edad7d80cabd Parents: 018b521 Author: Rohit Yadav <[email protected]> Authored: Sun Dec 23 18:04:32 2012 -0800 Committer: Rohit Yadav <[email protected]> Committed: Sun Dec 23 18:04:32 2012 -0800 ---------------------------------------------------------------------- .../cloud/uuididentity/IdentityServiceImpl.java | 5 ----- .../com/cloud/uuididentity/dao/IdentityDao.java | 2 -- .../cloud/uuididentity/dao/IdentityDaoImpl.java | 7 ------- 3 files changed, 0 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9d3ab8de/server/src/com/cloud/uuididentity/IdentityServiceImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/uuididentity/IdentityServiceImpl.java b/server/src/com/cloud/uuididentity/IdentityServiceImpl.java index d2427a1..3cd2bc9 100644 --- a/server/src/com/cloud/uuididentity/IdentityServiceImpl.java +++ b/server/src/com/cloud/uuididentity/IdentityServiceImpl.java @@ -21,7 +21,6 @@ import java.util.Map; import javax.ejb.Local; import javax.naming.ConfigurationException; -import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.IdentityService; import com.cloud.utils.component.Inject; import com.cloud.utils.component.Manager; @@ -33,10 +32,6 @@ public class IdentityServiceImpl implements Manager, IdentityService { @Inject private IdentityDao _identityDao; - public Long getIdentityId(IdentityMapper mapper, String identityString) { - return _identityDao.getIdentityId(mapper, identityString); - } - public Long getIdentityId(String tableName, String identityString) { return _identityDao.getIdentityId(tableName, identityString); } http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9d3ab8de/server/src/com/cloud/uuididentity/dao/IdentityDao.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/uuididentity/dao/IdentityDao.java b/server/src/com/cloud/uuididentity/dao/IdentityDao.java index 9429d1e..e9149a0 100644 --- a/server/src/com/cloud/uuididentity/dao/IdentityDao.java +++ b/server/src/com/cloud/uuididentity/dao/IdentityDao.java @@ -17,13 +17,11 @@ package com.cloud.uuididentity.dao; -import org.apache.cloudstack.api.IdentityMapper; import com.cloud.server.ResourceTag.TaggedResourceType; import com.cloud.utils.Pair; import com.cloud.utils.db.GenericDao; public interface IdentityDao extends GenericDao<IdentityVO, Long> { - Long getIdentityId(IdentityMapper mapper, String identityString); Long getIdentityId(String tableName, String identityString); String getIdentityUuid(String tableName, String identityString); void initializeDefaultUuid(String tableName); http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9d3ab8de/server/src/com/cloud/uuididentity/dao/IdentityDaoImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/uuididentity/dao/IdentityDaoImpl.java b/server/src/com/cloud/uuididentity/dao/IdentityDaoImpl.java index b50cc52..49d2fa7 100644 --- a/server/src/com/cloud/uuididentity/dao/IdentityDaoImpl.java +++ b/server/src/com/cloud/uuididentity/dao/IdentityDaoImpl.java @@ -27,7 +27,6 @@ import javax.ejb.Local; import org.apache.log4j.Logger; -import org.apache.cloudstack.api.IdentityMapper; import com.cloud.exception.InvalidParameterValueException; import com.cloud.server.ResourceTag.TaggedResourceType; import com.cloud.utils.Pair; @@ -43,12 +42,6 @@ public class IdentityDaoImpl extends GenericDaoBase<IdentityVO, Long> implements } @DB - public Long getIdentityId(IdentityMapper mapper, String identityString) { - assert(mapper.entityTableName() != null); - return getIdentityId(mapper.entityTableName(), identityString); - } - - @DB public Long getIdentityId(String tableName, String identityString) { assert(tableName != null); assert(identityString != null);
