inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged DEV to HEAD

Browse Source 
52182: MT: Remove some unused code and add @Override for DAO methods
   52183: ALF-19172: Disable sys:undeletable aspect while deleting test's tenants
   52274: Allow post-test tenant deletion by implementing hacks against ALF-19155


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@52284 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2013-07-09 13:45:58 +00:00
parent 437ba4e516
commit e4cd0465bb
4 changed files with 20 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
source/java/org/alfresco/repo/domain/tenant/AbstractTenantAdminDAOImpl.java
View File

@@ -77,6 +77,7 @@ public abstract class AbstractTenantAdminDAOImpl implements TenantAdminDAO
this.tenantEntityCache = new EntityLookupCache<String, TenantEntity, Serializable>(tenantEntityDaoCallback);
}
@Override
public TenantEntity createTenant(TenantEntity entity)
{
ParameterCheck.mandatory("entity", entity);
@@ -96,6 +97,7 @@ public abstract class AbstractTenantAdminDAOImpl implements TenantAdminDAO
return entityPair.getSecond();
}
@Override
public TenantEntity getTenant(String tenantDomain)
{
return getTenantImpl(tenantDomain);
@@ -116,11 +118,13 @@ public abstract class AbstractTenantAdminDAOImpl implements TenantAdminDAO
return entityPair.getSecond();
}
@Override
public List<TenantEntity> listTenants()
{
return getTenantEntities();
}
@Override
public TenantUpdateEntity getTenantForUpdate(String tenantDomain)
{
TenantEntity entity = getTenantImpl(tenantDomain);
@@ -140,6 +144,7 @@ public abstract class AbstractTenantAdminDAOImpl implements TenantAdminDAO
return updateEntity;
}
@Override
public void updateTenant(TenantUpdateEntity entity)
{
ParameterCheck.mandatory("entity", entity);
@@ -153,6 +158,7 @@ public abstract class AbstractTenantAdminDAOImpl implements TenantAdminDAO
}
}
@Override
public void deleteTenant(String tenantDomain)
{
ParameterCheck.mandatoryString("tenantDomain", tenantDomain);
@@ -184,23 +190,27 @@ public abstract class AbstractTenantAdminDAOImpl implements TenantAdminDAO
}
}
@Override
public Serializable getValueKey(TenantEntity value)
{
return null;
}
@Override
public Pair<String, TenantEntity> createValue(TenantEntity value)
{
TenantEntity entity = createTenantEntity(value);
return convertEntityToPair(entity);
}
@Override
public Pair<String, TenantEntity> findByKey(String key)
{
TenantEntity entity = getTenantEntity(key);
return convertEntityToPair(entity);
}
@Override
public Pair<String, TenantEntity> findByValue(TenantEntity value)
{
if ((value == null) || (value.getTenantDomain() == null))
@@ -210,16 +220,19 @@ public abstract class AbstractTenantAdminDAOImpl implements TenantAdminDAO
return convertEntityToPair(getTenantEntity(value.getTenantDomain()));
}
@Override
public int updateValue(String tenantDomain, TenantEntity value)
{
return updateTenantEntity(value);
}
@Override
public int deleteByKey(String tenantDomain)
{
return deleteTenantEntity(tenantDomain);
}
@Override
public int deleteByValue(TenantEntity value)
{
throw new UnsupportedOperationException("deleteByValue");