svn commit: r1833119 - /jackrabbit/oak/trunk/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/authorization/models/simplifiedroles/ThreeRolesAuthorizationConfiguration.java

[angela]

Author: angela
Date: Thu Jun  7 12:27:34 2018
New Revision: 1833119

URL: http://svn.apache.org/viewvc?rev=1833119&view=rev
Log:
minor improvement to exercise code

Modified:
    
jackrabbit/oak/trunk/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/authorization/models/simplifiedroles/ThreeRolesAuthorizationConfiguration.java

Modified: 
jackrabbit/oak/trunk/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/authorization/models/simplifiedroles/ThreeRolesAuthorizationConfiguration.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/authorization/models/simplifiedroles/ThreeRolesAuthorizationConfiguration.java?rev=1833119&r1=1833118&r2=1833119&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/authorization/models/simplifiedroles/ThreeRolesAuthorizationConfiguration.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/authorization/models/simplifiedroles/ThreeRolesAuthorizationConfiguration.java
 Thu Jun  7 12:27:34 2018
@@ -59,8 +59,6 @@ import org.apache.jackrabbit.oak.spi.sec
 import 
org.apache.jackrabbit.oak.spi.security.authorization.permission.EmptyPermissionProvider;
 import 
org.apache.jackrabbit.oak.spi.security.authorization.permission.PermissionProvider;
 import 
org.apache.jackrabbit.oak.spi.security.authorization.restriction.RestrictionProvider;
-import org.apache.jackrabbit.oak.spi.security.principal.AdminPrincipal;
-import org.apache.jackrabbit.oak.spi.security.principal.SystemPrincipal;
 import org.apache.jackrabbit.oak.spi.state.ApplyDiff;
 import org.apache.jackrabbit.oak.spi.state.NodeState;
 import org.apache.jackrabbit.oak.spi.state.NodeStore;
@@ -70,7 +68,7 @@ import org.slf4j.LoggerFactory;
 
 import static 
org.apache.jackrabbit.oak.spi.security.RegistrationConstants.OAK_SECURITY_NAME;
 
-@Component(metatype = true, policy = 
org.apache.felix.scr.annotations.ConfigurationPolicy.REQUIRE)
+@Component(metatype = true, immediate = true, policy = 
org.apache.felix.scr.annotations.ConfigurationPolicy.REQUIRE)
 @Service({AuthorizationConfiguration.class, 
org.apache.jackrabbit.oak.spi.security.SecurityConfiguration.class})
 @Properties({
         @Property(name = "supportedPath",
@@ -120,7 +118,7 @@ public class ThreeRolesAuthorizationConf
     @Nonnull
     @Override
     public PermissionProvider getPermissionProvider(@Nonnull Root root, 
@Nonnull String workspaceName, @Nonnull Set<Principal> principals) {
-        if (supportedPath == null || isAdminOrSystem(principals)) {
+        if (supportedPath == null) {
             return EmptyPermissionProvider.getInstance();
         } else {
             return new ThreeRolesPermissionProvider(root, principals, 
supportedPath, getContext(), getRootProvider());
@@ -227,19 +225,6 @@ public class ThreeRolesAuthorizationConf
         };
     }
 
-    private static boolean isAdminOrSystem(@Nonnull Set<Principal> principals) 
{
-        if (principals.contains(SystemPrincipal.INSTANCE)) {
-            return true;
-        } else {
-            for (Principal principal : principals) {
-                if (principal instanceof AdminPrincipal) {
-                    return true;
-                }
-            }
-            return false;
-        }
-    }
-
     @Override
     public void setParameters(@Nonnull ConfigurationParameters config) {
         super.setParameters(config);