Author: echatellier Date: 2014-07-31 18:38:29 +0200 (Thu, 31 Jul 2014) New Revision: 455 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/455 Log: Update user and group from ldap and remove non real user and real groups Added: trunk/faxtomail-service/src/main/resources/db/migration/V1_0_0_454__add_ldap_config.sql Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/AbstractFaxToMailTopiaDao.java trunk/faxtomail-persistence/src/main/xmi/faxtomail.zargo trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationService.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/LdapService.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ReferentielService.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/UserService.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIHandler.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/ConfigurationAction.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/LdapAction.java Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/AbstractFaxToMailTopiaDao.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/AbstractFaxToMailTopiaDao.java 2014-07-31 14:19:39 UTC (rev 454) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/AbstractFaxToMailTopiaDao.java 2014-07-31 16:38:29 UTC (rev 455) @@ -24,6 +24,8 @@ * #L% */ +import java.util.Collection; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -33,6 +35,20 @@ public abstract class AbstractFaxToMailTopiaDao<E extends TopiaEntity> extends AbstractTopiaDao<E> { + /** + * Find all entity for current table not contained in provided collection. + * + * @param others others elements + * @return remaining elements + */ + public List<E> forNotIn(Collection<E> others) { + String query = "FROM " + getEntityClass().getName() + " E" + + " WHERE E not in (:others)"; + Map<String, Object> args = new HashMap<>(); + args.put("others", others); + return findAll(query, args); + } + public <K> List<K> find(String hql, Map<String, Object> hqlParameters, PaginationParameter pager) { return super.find(hql, hqlParameters, pager); } Modified: trunk/faxtomail-persistence/src/main/xmi/faxtomail.zargo =================================================================== (Binary files differ) Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationService.java 2014-07-31 14:19:39 UTC (rev 454) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationService.java 2014-07-31 16:38:29 UTC (rev 455) @@ -430,11 +430,6 @@ emailAccountTopiaDao.deleteAll(emailAccountMap.values()); } - public List<FaxToMailUser> getAllUsers() { - FaxToMailUserTopiaDao faxToMailUserDao = getPersistenceContext().getFaxToMailUserDao(); - return faxToMailUserDao.forAll().setOrderByArguments(FaxToMailUser.PROPERTY_FIRST_NAME, FaxToMailUser.PROPERTY_LAST_NAME).findAll(); - } - public void saveUserFolders(Map<String, Collection<MailFolder>> userFolders) { FaxToMailUserTopiaDao faxToMailUserTopiaDao = getPersistenceContext().getFaxToMailUserDao(); @@ -453,11 +448,6 @@ getPersistenceContext().commit(); } - public List<FaxToMailUserGroup> getAllGroups() { - FaxToMailUserGroupTopiaDao faxToMailUserGroupDao = getPersistenceContext().getFaxToMailUserGroupDao(); - return faxToMailUserGroupDao.forAll().setOrderByArguments(FaxToMailUserGroup.PROPERTY_COMPLETE_NAME).findAll(); - } - public ExtensionCommand getExtensionCommand(String extension) { ExtensionCommandTopiaDao extensionCommandDao = getPersistenceContext().getExtensionCommandDao(); ExtensionCommand result = extensionCommandDao.findByExtension(extension); Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/LdapService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/LdapService.java 2014-07-31 14:19:39 UTC (rev 454) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/LdapService.java 2014-07-31 16:38:29 UTC (rev 455) @@ -24,7 +24,10 @@ * #L% */ +import java.util.Collection; +import java.util.HashMap; import java.util.List; +import java.util.Map; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; @@ -42,7 +45,6 @@ import com.franciaflex.faxtomail.services.service.ldap.AuthenticationException; import com.unboundid.ldap.sdk.LDAPConnection; import com.unboundid.ldap.sdk.LDAPException; -import com.unboundid.ldap.sdk.LDAPSearchException; import com.unboundid.ldap.sdk.SearchResult; import com.unboundid.ldap.sdk.SearchResultEntry; import com.unboundid.ldap.sdk.SearchScope; @@ -52,28 +54,6 @@ private static final Log log = LogFactory.getLog(LdapService.class); /** - * Retourne le nombre d'utilisateur en base. - * - * @return user count - */ - public long getUserCount() { - FaxToMailUserTopiaDao faxtomailUserDao = getPersistenceContext().getFaxToMailUserDao(); - long result = faxtomailUserDao.count(); - return result; - } - - /** - * Retourne le nombre de groupe en base. - * - * @return group count - */ - public long getGroupCount() { - FaxToMailUserGroupTopiaDao faxtomailUserGroupDao = getPersistenceContext().getFaxToMailUserGroupDao(); - long result = faxtomailUserGroupDao.count(); - return result; - } - - /** * Update all user and group from ldap. */ public void updateLdapData() { @@ -85,33 +65,77 @@ getApplicationConfig().getLdapUser(), getApplicationConfig().getLdapPassword()); if (connection.isConnected()) { - String baseDN = "OU=Utilisateurs,OU=Mac-Groupe,DC=mac-groupe,DC=net"; - // on recupere d'abord les organisationUnit - SearchResult unitResult = connection.search(baseDN, SearchScope.SUB, "(objectClass=organizationalUnit)"); - List<SearchResultEntry> unitEntries = unitResult.getSearchEntries(); + + FaxToMailUserTopiaDao faxtomailUserDao = getPersistenceContext().getFaxToMailUserDao(); + FaxToMailUserGroupTopiaDao faxtomailUserGroupDao = getPersistenceContext().getFaxToMailUserGroupDao(); + + // cache group DN > faxtomail user group instance + Map<String, FaxToMailUserGroup> groupCache = new HashMap<>(); + // cache user DN > faxtomail user instance + Map<String, FaxToMailUser> userCache = new HashMap<>(); + + // get all groups + String groupsBaseDN = "OU=Mac-Groupe,DC=mac-groupe,DC=net"; + String groupsFilter = "(objectCategory=CN=Group,CN=Schema,CN=Configuration,DC=mac-groupe,DC=net)"; + SearchResult groupsResult = connection.search(groupsBaseDN, SearchScope.SUB, groupsFilter); + List<SearchResultEntry> groupEntries = groupsResult.getSearchEntries(); + for (SearchResultEntry groupEntry : groupEntries) { + String groupDN = groupEntry.getDN(); + String groupPath = getGroupCompleteName(groupDN); + String groupName = StringUtils.substringAfterLast(groupPath, "/"); + FaxToMailUserGroup userGroup = faxtomailUserGroupDao.forNameEquals(groupName).findUniqueOrNull(); + if (userGroup == null) { + userGroup = faxtomailUserGroupDao.create( + FaxToMailUserGroup.PROPERTY_NAME, groupName, + FaxToMailUserGroup.PROPERTY_COMPLETE_NAME, groupPath); + } + groupCache.put(groupDN, userGroup); + } + + // get all users ( + String usersBaseDN = "OU=Mac-Groupe,DC=mac-groupe,DC=net"; + String usersFilter = "(objectCategory=CN=Person,CN=Schema,CN=Configuration,DC=mac-groupe,DC=net)"; + // on recupere d'abord les organisationUnit pour fractionner les requettes + // sinon au dela de 1000 resultats ca veux plus + SearchResult usersResult = connection.search(usersBaseDN, SearchScope.SUB, "(objectClass=organizationalUnit)"); + List<SearchResultEntry> unitEntries = usersResult.getSearchEntries(); for (SearchResultEntry unitEntry : unitEntries) { if (log.isDebugEnabled()) { log.debug("Search for unit " + unitEntry.getDN()); } - SearchResult userResult = connection.search(unitEntry.getDN(), SearchScope.ONE, "(objectClass=user)"); + SearchResult userResult = connection.search(unitEntry.getDN(), SearchScope.ONE, usersFilter); List<SearchResultEntry> userEntries = userResult.getSearchEntries(); for (SearchResultEntry userEntry : userEntries) { String login = userEntry.getAttributeValue("sAMAccountName"); + String userDN = userEntry.getDN(); if (login == null) { if (log.isWarnEnabled()) { - log.warn("Null sAMAccountName for DN " + userEntry.getDN()); + log.warn("Null sAMAccountName for DN " + userDN); } } else { login = login.toLowerCase(); - updateUserFormLdap(userEntry, login); + FaxToMailUser user = updateUserFormLdap(connection, userEntry, login, groupCache); + userCache.put(userDN, user); } } } + // make remaining user and groups in database as 'hidden' + Collection<FaxToMailUser> usersToHide = faxtomailUserDao.forNotIn(userCache.values()); + for (FaxToMailUser userToHide : usersToHide) { + userToHide.setHidden(true); + faxtomailUserDao.update(userToHide); + } + Collection<FaxToMailUserGroup> userGroupsToHide = faxtomailUserGroupDao.forNotIn(groupCache.values()); + for (FaxToMailUserGroup userGroupToHide : userGroupsToHide) { + userGroupToHide.setHidden(true); + faxtomailUserGroupDao.update(userGroupToHide); + } getPersistenceContext().commit(); } + } catch (LDAPException ex) { throw new RuntimeException("Can't connect to ldap", ex); } finally { @@ -195,7 +219,6 @@ searchEntry = searchResult.getSearchEntries().get(0); userDN = searchEntry.getDN(); } - adminConnect.close(); } if (searchEntry != null) { @@ -207,7 +230,7 @@ if (userConnect.isConnected()) { // update in database - result = updateUserFormLdap(searchEntry, login); + result = updateUserFormLdap(adminConnect, searchEntry, login, null); getPersistenceContext().commit(); userConnect.close(); @@ -217,6 +240,7 @@ } else { throw new AuthenticationException("Utilisateur inconnu : " + login); } + adminConnect.close(); } catch (LDAPException ex) { if (log.isWarnEnabled()) { @@ -257,19 +281,20 @@ if (!searchResult.getSearchEntries().isEmpty()) { searchEntry = searchResult.getSearchEntries().get(0); } - adminConnect.close(); + } else { throw new AuthenticationException("Utilisateur inconnu : " + login); } if( searchEntry != null ) { // update in database - result = updateUserFormLdap(searchEntry, login); + result = updateUserFormLdap(adminConnect, searchEntry, login, null); getPersistenceContext().commit(); - } else { throw new AuthenticationException("Utilisateur inconnu : " + login); } + + adminConnect.close(); } catch (LDAPException ex) { if (log.isWarnEnabled()) { log.warn("Can't login to ldap", ex); @@ -282,12 +307,14 @@ /** * Update user (or create) in database from ldap search result entry. * + * @param adminConnect admin connection used to load groups content * @param searchEntry entry containing data * @param login login + * @param groupCache group cache when mass update (can be null) * @return updated user - * @throws LDAPSearchException + * @throws LDAPException */ - protected FaxToMailUser updateUserFormLdap(SearchResultEntry searchEntry, String login) throws LDAPSearchException { + protected FaxToMailUser updateUserFormLdap(LDAPConnection adminConnect, SearchResultEntry searchEntry, String login, Map<String, FaxToMailUserGroup> groupCache) throws LDAPException { FaxToMailUser user; @@ -300,6 +327,7 @@ user = new FaxToMailUserImpl(); user.setLogin(login); } + user.setHidden(false); // update other ldap fields String fullName = searchEntry.getAttributeValue("name"); @@ -321,15 +349,30 @@ String[] groups = searchEntry.getAttributeValues("memberOf"); if (ArrayUtils.isNotEmpty(groups)) { for (String group : groups) { - String groupPath = getGroupCompleteName(group); - String groupName = StringUtils.substringAfterLast(groupPath, "/"); - FaxToMailUserGroup userGroup = faxtomailUserGroupDao.forNameEquals(groupName).findUniqueOrNull(); - if (userGroup == null) { - userGroup = faxtomailUserGroupDao.create( - FaxToMailUserGroup.PROPERTY_NAME, groupName, - FaxToMailUserGroup.PROPERTY_COMPLETE_NAME, groupPath); + + // en mass-update, on a le cache + if (groupCache != null) { + FaxToMailUserGroup userGroup = groupCache.get(group); + if (userGroup != null) { + user.addUserGroups(userGroup); + } + } else { + // parmis tous les groupes, on n'utilise que ceux qui sont de la catégories + // CN=Group,CN=Schema,CN=Configuration,DC=mac-groupe,DC=net + SearchResultEntry groupSearchEntry = adminConnect.getEntry(group); + String objectCategory = groupSearchEntry.getAttributeValue("objectCategory"); + if ("CN=Group,CN=Schema,CN=Configuration,DC=mac-groupe,DC=net".equals(objectCategory)) { + String groupPath = getGroupCompleteName(group); + String groupName = StringUtils.substringAfterLast(groupPath, "/"); + FaxToMailUserGroup userGroup = faxtomailUserGroupDao.forNameEquals(groupName).findUniqueOrNull(); + if (userGroup == null) { + userGroup = faxtomailUserGroupDao.create( + FaxToMailUserGroup.PROPERTY_NAME, groupName, + FaxToMailUserGroup.PROPERTY_COMPLETE_NAME, groupPath); + } + user.addUserGroups(userGroup); + } } - user.addUserGroups(userGroup); } } Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ReferentielService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ReferentielService.java 2014-07-31 14:19:39 UTC (rev 454) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ReferentielService.java 2014-07-31 16:38:29 UTC (rev 455) @@ -70,22 +70,22 @@ public List<DemandType> getAllDemandType() { DemandTypeTopiaDao dao = getPersistenceContext().getDemandTypeDao(); - return new ArrayList<>(dao.findAll()); + return dao.findAll(); } public List<Priority> getAllPriority() { PriorityTopiaDao dao = getPersistenceContext().getPriorityDao(); - return new ArrayList<>(dao.findAll()); + return dao.findAll(); } public List<Range> getAllRange() { RangeTopiaDao dao = getPersistenceContext().getRangeDao(); - return new ArrayList<>(dao.findAll()); + return dao.findAll(); } public List<EtatAttente> getAllEtatAttente() { EtatAttenteTopiaDao dao = getPersistenceContext().getEtatAttenteDao(); - return new ArrayList<>(dao.findAll()); + return dao.findAll(); } public Map<String, Long> getEtatAttentesUsage() { @@ -96,7 +96,7 @@ public List<Client> getAllClients() { ClientTopiaDao dao = getPersistenceContext().getClientDao(); - return new ArrayList<>(dao.findAll()); + return dao.findAll(); } public List<Client> importClients(InputStream inputStream) { Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/UserService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/UserService.java 2014-07-31 14:19:39 UTC (rev 454) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/UserService.java 2014-07-31 16:38:29 UTC (rev 455) @@ -24,7 +24,6 @@ * #L% */ -import java.util.ArrayList; import java.util.List; import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; @@ -38,9 +37,31 @@ */ public class UserService extends FaxToMailServiceSupport { - public List<FaxToMailUser> getAllUsers() { + /** + * Retourne le nombre d'utilisateur en base. + * + * @return user count + */ + public long getActiveUserCount() { + FaxToMailUserTopiaDao faxtomailUserDao = getPersistenceContext().getFaxToMailUserDao(); + long result = faxtomailUserDao.forHiddenEquals(false).count(); + return result; + } + + /** + * Retourne le nombre de groupe en base. + * + * @return group count + */ + public long getActiveGroupCount() { + FaxToMailUserGroupTopiaDao faxtomailUserGroupDao = getPersistenceContext().getFaxToMailUserGroupDao(); + long result = faxtomailUserGroupDao.forHiddenEquals(false).count(); + return result; + } + + public List<FaxToMailUser> getAllActiveUsers() { FaxToMailUserTopiaDao dao = getPersistenceContext().getFaxToMailUserDao(); - return new ArrayList<>(dao.findAll()); + return dao.forHiddenEquals(false).setOrderByArguments(FaxToMailUser.PROPERTY_FIRST_NAME, FaxToMailUser.PROPERTY_LAST_NAME).findAll(); } public FaxToMailUser getUserByLogin(String login) { @@ -49,9 +70,9 @@ return user; } - public List<FaxToMailUserGroup> getAllUserGroups() { + public List<FaxToMailUserGroup> getAllActiveUserGroups() { FaxToMailUserGroupTopiaDao dao = getPersistenceContext().getFaxToMailUserGroupDao(); - return new ArrayList<>(dao.findAll()); + return dao.forHiddenEquals(false).setOrderByArguments(FaxToMailUserGroup.PROPERTY_COMPLETE_NAME).findAll(); } public FaxToMailUser getUser(String topiaId) { Added: trunk/faxtomail-service/src/main/resources/db/migration/V1_0_0_454__add_ldap_config.sql =================================================================== --- trunk/faxtomail-service/src/main/resources/db/migration/V1_0_0_454__add_ldap_config.sql (rev 0) +++ trunk/faxtomail-service/src/main/resources/db/migration/V1_0_0_454__add_ldap_config.sql 2014-07-31 16:38:29 UTC (rev 455) @@ -0,0 +1,6 @@ + +-- add user and group hidden configuration +alter table FaxToMailUserGroup add column hidden ${booleanType}; +update FaxToMailUserGroup set hidden = 'f'; +alter table FaxToMailUser add column hidden ${booleanType}; +update FaxToMailUser set hidden = 'f'; Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUIHandler.java 2014-07-31 14:19:39 UTC (rev 454) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUIHandler.java 2014-07-31 16:38:29 UTC (rev 455) @@ -110,7 +110,7 @@ ReferentielService referentielService = getContext().getReferentielService(); - List<FaxToMailUser> users = getContext().getUserService().getAllUsers(); + List<FaxToMailUser> users = getContext().getUserService().getAllActiveUsers(); SearchUIModel model = getModel(); initBeanFilterableComboBox(ui.getTakenByComboBox(), users, Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIHandler.java 2014-07-31 14:19:39 UTC (rev 454) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIHandler.java 2014-07-31 16:38:29 UTC (rev 455) @@ -100,7 +100,7 @@ final ReferentielService referentielService = getContext().getReferentielService(); // this loading take 1,5 seconds - List<FaxToMailUser> users = getContext().getUserService().getAllUsers(); + List<FaxToMailUser> users = getContext().getUserService().getAllActiveUsers(); SearchUIModel model = getModel(); initBeanFilterableComboBox(ui.getTakenByComboBox(), users, Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/ConfigurationAction.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/ConfigurationAction.java 2014-07-31 14:19:39 UTC (rev 454) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/ConfigurationAction.java 2014-07-31 16:38:29 UTC (rev 455) @@ -51,6 +51,7 @@ import com.franciaflex.faxtomail.services.service.ConfigurationService; import com.franciaflex.faxtomail.services.service.MailFolderService; import com.franciaflex.faxtomail.services.service.ReferentielService; +import com.franciaflex.faxtomail.services.service.UserService; import com.franciaflex.faxtomail.web.FaxToMailActionSupport; import com.google.gson.reflect.TypeToken; import com.opensymphony.xwork2.Preparable; @@ -70,6 +71,8 @@ protected ConfigurationService configurationService; + protected UserService userService; + protected ReferentielService referentielService; protected MailFolderService mailFolderService; @@ -116,8 +119,8 @@ emailAccounts = configurationService.getEmailAccountsWithoutPasswords(); mailFilters = configurationService.getMailFilters(); configuration = configurationService.getConfiguration(); - users = configurationService.getAllUsers(); - groups = configurationService.getAllGroups(); + users = userService.getAllActiveUsers(); + groups = userService.getAllActiveUserGroups(); return INPUT; } @@ -135,6 +138,10 @@ this.configurationService = configurationService; } + public void setUserService(UserService userService) { + this.userService = userService; + } + public void setReferentielService(ReferentielService referentielService) { this.referentielService = referentielService; } Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/LdapAction.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/LdapAction.java 2014-07-31 14:19:39 UTC (rev 454) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/LdapAction.java 2014-07-31 16:38:29 UTC (rev 455) @@ -35,6 +35,7 @@ import com.franciaflex.faxtomail.persistence.entities.FaxToMailTopiaPersistenceContext; import com.franciaflex.faxtomail.services.FaxToMailServiceContext; import com.franciaflex.faxtomail.services.service.LdapService; +import com.franciaflex.faxtomail.services.service.UserService; import com.franciaflex.faxtomail.web.FaxToMailActionSupport; import com.opensymphony.xwork2.Preparable; @@ -49,7 +50,7 @@ private static final Log log = LogFactory.getLog(LdapAction.class); - protected LdapService ldapService; + protected UserService userService; protected long userCount; @@ -61,8 +62,8 @@ this.applicationContext = applicationContext; } - public void setLdapService(LdapService ldapService) { - this.ldapService = ldapService; + public void setUserService(UserService userService) { + this.userService = userService; } public long getUserCount() { @@ -84,8 +85,8 @@ @Override @Action("ldap-input") public String input() throws Exception { - userCount = ldapService.getUserCount(); - groupCount = ldapService.getGroupCount(); + userCount = userService.getActiveUserCount(); + groupCount = userService.getActiveGroupCount(); return INPUT; }