svn commit: r1466992 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/AccessControlManagerImpl.java

[an...@apache.org]

Author: angela
Date: Thu Apr 11 17:28:10 2013
New Revision: 1466992

URL: http://svn.apache.org/r1466992
Log:
OAK-707 : resolve obsolete TODOs

Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/AccessControlManagerImpl.java

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/AccessControlManagerImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/AccessControlManagerImpl.java?rev=1466992&r1=1466991&r2=1466992&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/AccessControlManagerImpl.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/AccessControlManagerImpl.java Thu Apr 11 17:28:10 2013
@@ -29,7 +29,6 @@ import javax.annotation.Nullable;
 import javax.jcr.AccessDeniedException;
 import javax.jcr.PathNotFoundException;
 import javax.jcr.RepositoryException;
-import javax.jcr.UnsupportedRepositoryOperationException;
 import javax.jcr.query.Query;
 import javax.jcr.security.AccessControlException;
 import javax.jcr.security.AccessControlList;
@@ -469,7 +468,6 @@ public class AccessControlManagerImpl im
 
     @Nonnull
     private Result searchAces(@Nonnull Set<Principal> principals) throws RepositoryException {
-        // TODO: replace XPATH
         // TODO: specify sort order
         StringBuilder stmt = new StringBuilder("/jcr:root");
         stmt.append("//element(*,");
@@ -531,11 +529,7 @@ public class AccessControlManagerImpl im
     }
 
     @Nonnull
-    private Privilege[] getPrivileges(@Nullable String absPath, @Nullable PermissionProvider provider) throws RepositoryException {
-        // TODO : OAK-707
-        if (provider == null) {
-            throw new UnsupportedRepositoryOperationException();
-        }
+    private Privilege[] getPrivileges(@Nullable String absPath, @Nonnull PermissionProvider provider) throws RepositoryException {
         Tree tree = (absPath == null) ? null : getTree(getOakPath(absPath), Permissions.NO_PERMISSION);
         Set<String> pNames = provider.getPrivileges(tree);
         if (pNames.isEmpty()) {
@@ -550,11 +544,7 @@ public class AccessControlManagerImpl im
     }
 
     private boolean hasPrivileges(@Nullable String absPath, @Nonnull Privilege[] privileges,
-                                  @Nullable PermissionProvider provider) throws RepositoryException {
-        // TODO : OAK-707
-        if (provider == null) {
-            throw new UnsupportedRepositoryOperationException();
-        }
+                                  @Nonnull PermissionProvider provider) throws RepositoryException {
         Tree tree = (absPath == null) ? null : getTree(getOakPath(absPath), Permissions.NO_PERMISSION);
         Set<String> privilegeNames = new HashSet<String>(privileges.length);
         for (Privilege privilege : privileges) {