svn commit: r1849104 - in /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security: authorization/permission/PermissionStoreEditor.java user/UserImporter.java

[angela]

Author: angela
Date: Mon Dec 17 15:38:26 2018
New Revision: 1849104

URL: http://svn.apache.org/viewvc?rev=1849104&view=rev
Log:
OAK-7944 : Minor improvements to oak security code base
- fix indention in PermissionStoreEditor
- use Map.computeIfMissing in getMembership call, move getIdentifierManager and 
getPrincipalManager to inner classes

Modified:
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionStoreEditor.java
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserImporter.java

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionStoreEditor.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionStoreEditor.java?rev=1849104&r1=1849103&r2=1849104&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionStoreEditor.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionStoreEditor.java
 Mon Dec 17 15:38:26 2018
@@ -274,8 +274,8 @@ final class PermissionStoreEditor implem
         private int hashCode = -1;
 
         AcEntry(@NotNull NodeState node, @NotNull String accessControlledPath, 
int index,
-                        boolean isAllow, @NotNull PrivilegeBits privilegeBits,
-                        @NotNull Set<Restriction> restrictions) {
+                boolean isAllow, @NotNull PrivilegeBits privilegeBits,
+                @NotNull Set<Restriction> restrictions) {
             this.accessControlledPath = accessControlledPath;
             this.index = index;
 

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserImporter.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserImporter.java?rev=1849104&r1=1849103&r2=1849104&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserImporter.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserImporter.java
 Mon Dec 17 15:38:26 2018
@@ -446,26 +446,8 @@ class UserImporter implements ProtectedP
 
     //------------------------------------------------------------< private 
>---
     @NotNull
-    private IdentifierManager getIdentifierManager() {
-        if (identifierManager == null) {
-            identifierManager = new IdentifierManager(root);
-        }
-        return identifierManager;
-    }
-
-    @NotNull
-    private PrincipalManager getPrincipalManager() {
-        return userManager.getPrincipalManager();
-    }
-
-    @NotNull
     private Membership getMembership(@NotNull String authId) {
-        Membership membership = memberships.get(authId);
-        if (membership == null) {
-            membership = new Membership(authId);
-            memberships.put(authId, membership);
-        }
-        return membership;
+        return memberships.computeIfAbsent(authId, k -> new 
Membership(authId));
     }
 
     private void checkInitialized() {
@@ -648,6 +630,14 @@ class UserImporter implements ProtectedP
                 userManager.onGroupUpdate(gr, false, true, memberContentIds, 
failedContentIds);
             }
         }
+
+        @NotNull
+        private IdentifierManager getIdentifierManager() {
+            if (identifierManager == null) {
+                identifierManager = new IdentifierManager(root);
+            }
+            return identifierManager;
+        }
     }
 
     /**
@@ -728,5 +718,10 @@ class UserImporter implements ProtectedP
                 userTree.setProperty(REP_IMPERSONATORS, nonExisting, 
Type.STRINGS);
             }
         }
+
+        @NotNull
+        private PrincipalManager getPrincipalManager() {
+            return userManager.getPrincipalManager();
+        }
     }
 }