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 
52232: Introduce filter to select only enabled tenants (ALF-19172)
   52233: Missed file for rev 52232 (ALF-19172)
   52246: MT: Make lowercasing of tenant domain a little more explicit
   52247: MT: Clean up imports, redundant non-Javadoc and add @Override


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@52288 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2013-07-09 13:56:14 +00:00
parent b687de2f80
commit 5c06b15604
12 changed files with 839 additions and 745 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -105,11 +105,12 @@ public abstract class AbstractTenantAdminDAOImpl implements TenantAdminDAO
private TenantEntity getTenantImpl(String tenantDomain)
{
tenantDomain = tenantDomain.toLowerCase();
Pair<String, TenantEntity> entityPair = tenantEntityCache.getByKey(tenantDomain);
if (entityPair == null)
{
// try lower-case to make sure
entityPair = tenantEntityCache.getByKey(tenantDomain.toLowerCase());
entityPair = tenantEntityCache.getByKey(tenantDomain);
if (entityPair == null)
{
return null;
@@ -119,9 +120,16 @@ public abstract class AbstractTenantAdminDAOImpl implements TenantAdminDAO
}
@Override
public List<TenantEntity> listTenants()
public List<TenantEntity> listTenants(boolean enabledOnly)
{
return getTenantEntities();
if (enabledOnly)
{
return getTenantEntities(Boolean.TRUE);
}
else
{
return getTenantEntities(null);
}
}
@Override
@@ -241,7 +249,10 @@ public abstract class AbstractTenantAdminDAOImpl implements TenantAdminDAO
protected abstract TenantEntity createTenantEntity(TenantEntity tenantEntity);
protected abstract TenantEntity getTenantEntity(String tenantDomain);
protected abstract List<TenantEntity> getTenantEntities();
/**
* @param enabled Enabled or disabled tenants or <tt>null</tt> for no filter
*/
protected abstract List<TenantEntity> getTenantEntities(Boolean enabled);
protected abstract int updateTenantEntity(TenantEntity tenantEntity);
protected abstract int deleteTenantEntity(String tenantDomain);
}