Merge pull request #590 from Netcentric/bugfix/554-improve-performance-of-unmanagedAcePathsRegex

Improve Performance of unmanagedAcePathsRegex

Author: ghenzler

Diff for: accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configmodel/AuthorizablesConfig.java

@@ -8,8 +8,10 @@
  */
 package biz.netcentric.cq.tools.actool.configmodel;
 
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedHashSet;
+import java.util.Map;
 import java.util.Set;
 
 import org.apache.commons.lang3.StringUtils;
@@ -18,18 +20,18 @@
 public class AuthorizablesConfig extends LinkedHashSet<AuthorizableConfigBean> {
     private static final long serialVersionUID = -253685832563496002L;
 
-    public AuthorizableConfigBean getAuthorizableConfig(String authorizableId) {
-        for (AuthorizableConfigBean authorizableConfigBean : this) {
-            if (StringUtils.equals(authorizableConfigBean.getAuthorizableId(), authorizableId)) {
-                return authorizableConfigBean;
-            }
-        }
-        return null;
+    private Map<String, AuthorizableConfigBean> configBeansByPrincipalId = new HashMap<>();
+    
+    @Override
+    public boolean add(AuthorizableConfigBean configBean) {
+        AuthorizableConfigBean previous = configBeansByPrincipalId.put(configBean.getPrincipalName(), configBean);
+        assert previous == null;
+        return super.add(configBean);
     }
 
-    public AuthorizableConfigBean getAuthorizableConfigByPrincipalName(String principalName) {
+    public AuthorizableConfigBean getAuthorizableConfig(String authorizableId) {
         for (AuthorizableConfigBean authorizableConfigBean : this) {
-            if (StringUtils.equals(authorizableConfigBean.getPrincipalName(), principalName)) {
+            if (StringUtils.equals(authorizableConfigBean.getAuthorizableId(), authorizableId)) {
                 return authorizableConfigBean;
             }
         }
@@ -67,7 +69,7 @@ public Set<String> removeUnmanagedPrincipalNamesAtPath(String path, Set<String>
 
         Set<String> filteredPrincipals = new HashSet<String>();
         for (String principal : principals) {
-            AuthorizableConfigBean authorizableConfig = getAuthorizableConfigByPrincipalName(principal);
+            AuthorizableConfigBean authorizableConfig = configBeansByPrincipalId.get(principal);
             if (authorizableConfig == null /* happens if migrateFrom is used, #290 */
                     || authorizableConfig.managesPath(path, defaultUnmanagedAcePathsRegex)) {
                 filteredPrincipals.add(principal);