etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

server: Get rid of db helpers that work with IdentityMapper 

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
This commit is contained in:
Rohit Yadav 2012-12-23 18:04:32 -08:00
parent 018b5215e0
commit 9d3ab8ded7
3 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
server/src/com/cloud/uuididentity/IdentityServiceImpl.java
View File

@ -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);
}

2
server/src/com/cloud/uuididentity/dao/IdentityDao.java
View File

@ -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);

7
server/src/com/cloud/uuididentity/dao/IdentityDaoImpl.java
View File

@ -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<IdentityVO, Long> 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);