cleanup

Author: Daan Hoogland

plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/command/LdapListUsersCmd.java

@@ -180,9 +180,7 @@ private void traceUserList() {
     }
 
     private List<LdapUserResponse> applyUserFilter(List<LdapUserResponse> ldapResponses) {
-        if(logger.isTraceEnabled()) {
-            logger.trace("applying filter: {} or {}.", this.getListTypeString(), this.getUserFilter());
-        }
+        logger.trace("applying filter: {} or {}.", this.getListTypeString(), this.getUserFilter());
         return getUserFilter().filter(this,ldapResponses);
     }
 
@@ -214,9 +212,7 @@ boolean isACloudStackUser(final LdapUser ldapUser) {
     }
 
     boolean isACloudStackUser(final LdapUserResponse ldapUser) {
-        if(logger.isTraceEnabled()) {
-            logger.trace("checking response : {}", ldapUser.toString());
-        }
+        logger.trace("checking response : {}", ldapUser.toString());
         String username = ldapUser.getUsername();
         return isACloudStackUser(username);
     }

plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/command/LinkDomainToLdapCmd.java

@@ -115,7 +115,7 @@ public void execute() throws ServerApiException {
                         logger.debug("an account with name {} already exists in the domain {} with id {}", admin, _domainService.getDomain(domainId), domainId);
                     }
                 } else {
-                    logger.debug("ldap user with username {} is disabled in the given group/ou", admin);
+                    logger.debug("ldap user with username {} is disabled in the given Group/OU", admin);
                 }
             }
             response.setObjectName("LinkDomainToLdap");

plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/OpenLdapUserManagerImpl.java

@@ -109,9 +109,7 @@ private String generateSearchFilter(final String username, Long domainId) {
                 ldapGroupsFilter +
                 principleGroupFilter +
                 ")";
-        if (logger.isTraceEnabled()) {
-            logger.trace("constructed ldap query: {}", returnString);
-        }
+        logger.trace("constructed ldap query: {}", returnString);
         return returnString;
     }
 
@@ -280,9 +278,7 @@ public LdapUser searchUser(final String basedn, final String searchString, final
         searchControls.setReturningAttributes(_ldapConfiguration.getReturnAttributes(domainId));
 
         NamingEnumeration<SearchResult> results = context.search(basedn, searchString, searchControls);
-        if(logger.isDebugEnabled()) {
-            logger.debug("searching user(s) with filter: \"{}\"", searchString);
-        }
+        logger.debug("searching user(s) with filter: \"{}\"", searchString);
         final List<LdapUser> users = new ArrayList<>();
         while (results.hasMoreElements()) {
             final SearchResult result = results.nextElement();

plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/dao/LdapConfigurationDaoImpl.java

@@ -68,12 +68,6 @@ public LdapConfigurationVO find(String hostname, int port, Long domainId) {
         return findOneBy(sc);
     }
 
-    @Override
-    public LdapConfigurationVO find(String hostname, int port, Long domainId, boolean listAll) {
-        SearchCriteria<LdapConfigurationVO> sc = getSearchCriteria(null, hostname, port, domainId, listAll);
-        return findOneBy(sc);
-    }
-
     @Override
     public Pair<List<LdapConfigurationVO>, Integer> searchConfigurations(final String hostname, final int port, final Long domainId) {
         SearchCriteria<LdapConfigurationVO> sc = getSearchCriteria(null, hostname, port, domainId, false);