Allon Mureinik has uploaded a new change for review. Change subject: core: DbUserCacheManager: Remove FQDN ......................................................................
core: DbUserCacheManager: Remove FQDN Remove FQDNs and replaced with imports, for better readability. Change-Id: I8957ad7fa0317b84fd82bdd891d9dd984d9ebc26 Signed-off-by: Allon Mureinik <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DbUserCacheManager.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapBrokerUtils.java 2 files changed, 10 insertions(+), 8 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/06/12606/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DbUserCacheManager.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DbUserCacheManager.java index 1fe5b35..79761ab 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DbUserCacheManager.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DbUserCacheManager.java @@ -1,8 +1,11 @@ package org.ovirt.engine.core.bll; +import java.util.ArrayList; import java.util.Collection; +import java.util.HashMap; import java.util.HashSet; import java.util.List; +import java.util.Map; import java.util.concurrent.TimeUnit; import org.apache.commons.lang.StringUtils; @@ -159,16 +162,15 @@ List<String> domainsList = LdapBrokerUtils.getDomainsList(true); List<DbUser> filteredUsers = LinqUtils.filter(allUsers, new UsersPerDomainPredicate(domainsList)); - java.util.HashMap<String, java.util.HashMap<Guid, DbUser>> userByDomains = - new java.util.HashMap<String, java.util.HashMap<Guid, DbUser>>(); + Map<String, Map<Guid, DbUser>> userByDomains = new HashMap<String, Map<Guid, DbUser>>(); /** * Filter all users by domains */ for (DbUser user : filteredUsers) { - java.util.HashMap<Guid, DbUser> domainUser; + Map<Guid, DbUser> domainUser; if (!userByDomains.containsKey(user.getdomain())) { - domainUser = new java.util.HashMap<Guid, DbUser>(); + domainUser = new HashMap<Guid, DbUser>(); userByDomains.put(user.getdomain(), domainUser); } else { domainUser = userByDomains.get(user.getdomain()); @@ -181,11 +183,11 @@ * refresh users in each domain separately */ for (String domain : userByDomains.keySet()) { - java.util.ArrayList<LdapUser> adUsers = - (java.util.ArrayList<LdapUser>) LdapFactory.getInstance(domain) + List<LdapUser> adUsers = + (List<LdapUser>) LdapFactory.getInstance(domain) .RunAdAction( AdActionType.GetAdUserByUserIdList, - new LdapSearchByUserIdListParameters(domain, new java.util.ArrayList<Guid>(userByDomains + new LdapSearchByUserIdListParameters(domain, new ArrayList<Guid>(userByDomains .get(domain).keySet()),false)).getReturnValue(); HashSet<Guid> updatedUsers = new HashSet<Guid>(); if (adUsers == null) { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapBrokerUtils.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapBrokerUtils.java index f97dca2..98e0111 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapBrokerUtils.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapBrokerUtils.java @@ -291,7 +291,7 @@ } } - public static void performGroupPopulationForUsers(ArrayList<LdapUser> adUsers, + public static void performGroupPopulationForUsers(List<LdapUser> adUsers, String domain, List<LdapGroup> updatedGroups) { Domain domainObject = UsersDomainsCacheManagerService.getInstance().getDomain(domain.toLowerCase()); -- To view, visit http://gerrit.ovirt.org/12606 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8957ad7fa0317b84fd82bdd891d9dd984d9ebc26 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Allon Mureinik <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
