diff --git a/server/src/com/cloud/uuididentity/IdentityServiceImpl.java b/server/src/com/cloud/uuididentity/IdentityServiceImpl.java index d2427a146cc..3cd2bc93290 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); } diff --git a/server/src/com/cloud/uuididentity/dao/IdentityDao.java b/server/src/com/cloud/uuididentity/dao/IdentityDao.java index 9429d1e47d0..e9149a0fe63 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 { - Long getIdentityId(IdentityMapper mapper, String identityString); Long getIdentityId(String tableName, String identityString); String getIdentityUuid(String tableName, String identityString); void initializeDefaultUuid(String tableName); diff --git a/server/src/com/cloud/uuididentity/dao/IdentityDaoImpl.java b/server/src/com/cloud/uuididentity/dao/IdentityDaoImpl.java index b50cc52ddf3..49d2fa77d08 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; @@ -42,12 +41,6 @@ public class IdentityDaoImpl extends GenericDaoBase implements public IdentityDaoImpl() { } - @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);