Modified: jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionEntry.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionEntry.java?rev=1846014&r1=1846013&r2=1846014&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionEntry.java (original) +++ jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionEntry.java Wed Nov 7 13:57:55 2018 @@ -16,9 +16,6 @@ */ package org.apache.jackrabbit.oak.security.authorization.permission; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import com.google.common.base.Objects; import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.api.Tree; @@ -27,6 +24,8 @@ import org.apache.jackrabbit.oak.spi.sec import org.apache.jackrabbit.oak.spi.security.authorization.restriction.RestrictionPattern; import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeBits; import org.apache.jackrabbit.util.Text; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; final class PermissionEntry implements Comparable<PermissionEntry>, PermissionConstants { @@ -55,9 +54,9 @@ final class PermissionEntry implements C */ final RestrictionPattern restriction; - PermissionEntry(@Nonnull String path, boolean isAllow, int index, - @Nonnull PrivilegeBits privilegeBits, - @Nonnull RestrictionPattern restriction) { + PermissionEntry(@NotNull String path, boolean isAllow, int index, + @NotNull PrivilegeBits privilegeBits, + @NotNull RestrictionPattern restriction) { this.path = path; this.isAllow = isAllow; this.index = index; @@ -65,11 +64,11 @@ final class PermissionEntry implements C this.restriction = restriction; } - boolean matches(@Nonnull Tree tree, @Nullable PropertyState property) { + boolean matches(@NotNull Tree tree, @Nullable PropertyState property) { return restriction == RestrictionPattern.EMPTY || restriction.matches(tree, property); } - boolean matches(@Nonnull String treePath) { + boolean matches(@NotNull String treePath) { return restriction == RestrictionPattern.EMPTY || restriction.matches(treePath); } @@ -77,12 +76,12 @@ final class PermissionEntry implements C return restriction == RestrictionPattern.EMPTY || restriction.matches(); } - boolean matchesParent(@Nonnull String parentPath) { + boolean matchesParent(@NotNull String parentPath) { return Text.isDescendantOrEqual(path, parentPath) && (restriction == RestrictionPattern.EMPTY || restriction.matches(parentPath)); } @Override - public int compareTo(@Nonnull PermissionEntry pe) { + public int compareTo(@NotNull PermissionEntry pe) { if (Objects.equal(path, pe.path)) { // reverse order if (index == pe.index) { @@ -122,4 +121,4 @@ final class PermissionEntry implements C public int hashCode() { return Objects.hashCode(privilegeBits, index, path, isAllow, restriction); } -} \ No newline at end of file +}
Modified: jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionEntryCache.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionEntryCache.java?rev=1846014&r1=1846013&r2=1846014&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionEntryCache.java (original) +++ jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionEntryCache.java Wed Nov 7 13:57:55 2018 @@ -21,7 +21,7 @@ import java.util.HashMap; import java.util.Map; import java.util.Set; import java.util.TreeSet; -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; /** * {@code PermissionEntryCache} caches the permission entries of principals. @@ -39,9 +39,9 @@ class PermissionEntryCache { private final Map<String, PrincipalPermissionEntries> entries = new HashMap<String, PrincipalPermissionEntries>(); - @Nonnull - PrincipalPermissionEntries getEntries(@Nonnull PermissionStore store, - @Nonnull String principalName) { + @NotNull + PrincipalPermissionEntries getEntries(@NotNull PermissionStore store, + @NotNull String principalName) { PrincipalPermissionEntries ppe = entries.get(principalName); if (ppe == null) { ppe = store.load(principalName); @@ -55,9 +55,9 @@ class PermissionEntryCache { return ppe; } - void load(@Nonnull PermissionStore store, - @Nonnull Map<String, Collection<PermissionEntry>> pathEntryMap, - @Nonnull String principalName) { + void load(@NotNull PermissionStore store, + @NotNull Map<String, Collection<PermissionEntry>> pathEntryMap, + @NotNull String principalName) { // todo: conditionally load entries if too many PrincipalPermissionEntries ppe = getEntries(store, principalName); for (Map.Entry<String, Collection<PermissionEntry>> e: ppe.getEntries().entrySet()) { @@ -71,10 +71,10 @@ class PermissionEntryCache { } } - void load(@Nonnull PermissionStore store, - @Nonnull Collection<PermissionEntry> ret, - @Nonnull String principalName, - @Nonnull String path) { + void load(@NotNull PermissionStore store, + @NotNull Collection<PermissionEntry> ret, + @NotNull String principalName, + @NotNull String path) { PrincipalPermissionEntries ppe = entries.get(principalName); if (ppe == null) { ppe = new PrincipalPermissionEntries(); @@ -94,8 +94,8 @@ class PermissionEntryCache { } } - long getNumEntries(@Nonnull PermissionStore store, - @Nonnull String principalName, + long getNumEntries(@NotNull PermissionStore store, + @NotNull String principalName, long max) { PrincipalPermissionEntries ppe = entries.get(principalName); return ppe == null @@ -103,7 +103,7 @@ class PermissionEntryCache { : ppe.getEntries().size(); } - void flush(@Nonnull Set<String> principalNames) { + void flush(@NotNull Set<String> principalNames) { entries.keySet().removeAll(principalNames); } -} \ No newline at end of file +} Modified: jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionEntryProvider.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionEntryProvider.java?rev=1846014&r1=1846013&r2=1846014&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionEntryProvider.java (original) +++ jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionEntryProvider.java Wed Nov 7 13:57:55 2018 @@ -19,9 +19,8 @@ package org.apache.jackrabbit.oak.securi import java.util.Collection; import java.util.Iterator; -import javax.annotation.Nonnull; - import org.apache.jackrabbit.oak.api.Tree; +import org.jetbrains.annotations.NotNull; /** * {@code PermissionEntryProvider} provides permission entries for a given set of principals. @@ -29,11 +28,11 @@ import org.apache.jackrabbit.oak.api.Tre */ interface PermissionEntryProvider { - @Nonnull - Iterator<PermissionEntry> getEntryIterator(@Nonnull EntryPredicate predicate); + @NotNull + Iterator<PermissionEntry> getEntryIterator(@NotNull EntryPredicate predicate); - @Nonnull - Collection<PermissionEntry> getEntries(@Nonnull Tree accessControlledTree); + @NotNull + Collection<PermissionEntry> getEntries(@NotNull Tree accessControlledTree); void flush(); -} \ No newline at end of file +} Modified: jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionEntryProviderImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionEntryProviderImpl.java?rev=1846014&r1=1846013&r2=1846014&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionEntryProviderImpl.java (original) +++ jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionEntryProviderImpl.java Wed Nov 7 13:57:55 2018 @@ -24,14 +24,13 @@ import java.util.Iterator; import java.util.Map; import java.util.Set; import java.util.TreeSet; -import javax.annotation.Nonnull; - import com.google.common.base.Strings; import org.apache.jackrabbit.commons.iterator.AbstractLazyIterator; import org.apache.jackrabbit.oak.api.Tree; import org.apache.jackrabbit.oak.commons.LongUtils; import org.apache.jackrabbit.oak.spi.security.ConfigurationParameters; import org.apache.jackrabbit.oak.spi.security.authorization.accesscontrol.AccessControlConstants; +import org.jetbrains.annotations.NotNull; class PermissionEntryProviderImpl implements PermissionEntryProvider { @@ -62,8 +61,8 @@ class PermissionEntryProviderImpl implem private Map<String, Collection<PermissionEntry>> pathEntryMap; - PermissionEntryProviderImpl(@Nonnull PermissionStore store, @Nonnull PermissionEntryCache cache, - @Nonnull Set<String> principalNames, @Nonnull ConfigurationParameters options) { + PermissionEntryProviderImpl(@NotNull PermissionStore store, @NotNull PermissionEntryCache cache, + @NotNull Set<String> principalNames, @NotNull ConfigurationParameters options) { this.store = store; this.cache = cache; this.principalNames = Collections.unmodifiableSet(principalNames); @@ -120,8 +119,8 @@ class PermissionEntryProviderImpl implem } @Override - @Nonnull - public Iterator<PermissionEntry> getEntryIterator(@Nonnull EntryPredicate predicate) { + @NotNull + public Iterator<PermissionEntry> getEntryIterator(@NotNull EntryPredicate predicate) { if (existingNames.isEmpty()) { return Collections.emptyIterator(); } else { @@ -130,8 +129,8 @@ class PermissionEntryProviderImpl implem } @Override - @Nonnull - public Collection<PermissionEntry> getEntries(@Nonnull Tree accessControlledTree) { + @NotNull + public Collection<PermissionEntry> getEntries(@NotNull Tree accessControlledTree) { if (existingNames.isEmpty()) { return Collections.emptyList(); } else if (pathEntryMap != null) { @@ -145,8 +144,8 @@ class PermissionEntryProviderImpl implem } //------------------------------------------------------------< private >--- - @Nonnull - private Collection<PermissionEntry> getEntries(@Nonnull String path) { + @NotNull + private Collection<PermissionEntry> getEntries(@NotNull String path) { if (existingNames.isEmpty()) { return Collections.emptyList(); } else if (pathEntryMap != null) { @@ -157,8 +156,8 @@ class PermissionEntryProviderImpl implem } } - @Nonnull - private Collection<PermissionEntry> loadEntries(@Nonnull String path) { + @NotNull + private Collection<PermissionEntry> loadEntries(@NotNull String path) { Collection<PermissionEntry> ret = new TreeSet<PermissionEntry>(); for (String name : existingNames) { cache.load(store, ret, name, path); @@ -176,7 +175,7 @@ class PermissionEntryProviderImpl implem // the next oak path for which to retrieve permission entries private String path; - private EntryIterator(@Nonnull EntryPredicate predicate) { + private EntryIterator(@NotNull EntryPredicate predicate) { this.predicate = predicate; this.path = Strings.nullToEmpty(predicate.getPath()); } @@ -201,4 +200,4 @@ class PermissionEntryProviderImpl implem return next; } } -} \ No newline at end of file +} Modified: jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionHook.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionHook.java?rev=1846014&r1=1846013&r2=1846014&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionHook.java (original) +++ jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionHook.java Wed Nov 7 13:57:55 2018 @@ -18,8 +18,6 @@ package org.apache.jackrabbit.oak.securi import java.util.HashMap; import java.util.Map; -import javax.annotation.Nonnull; - import org.apache.jackrabbit.oak.api.CommitFailedException; import org.apache.jackrabbit.oak.plugins.nodetype.TypePredicate; import org.apache.jackrabbit.oak.plugins.tree.RootProvider; @@ -36,6 +34,7 @@ import org.apache.jackrabbit.oak.spi.sta import org.apache.jackrabbit.oak.spi.state.NodeBuilder; import org.apache.jackrabbit.oak.spi.state.NodeState; import org.apache.jackrabbit.oak.spi.state.NodeStateUtils; +import org.jetbrains.annotations.NotNull; import static org.apache.jackrabbit.JcrConstants.JCR_SYSTEM; import static org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState.EMPTY_NODE; @@ -81,9 +80,9 @@ public class PermissionHook implements P private Map<String, PermissionStoreEditor> modified = new HashMap<String, PermissionStoreEditor>(); private Map<String, PermissionStoreEditor> deleted = new HashMap<String, PermissionStoreEditor>(); - public PermissionHook(@Nonnull String workspaceName, @Nonnull RestrictionProvider restrictionProvider, - @Nonnull MountInfoProvider mountInfoProvider, @Nonnull RootProvider rootProvider, - @Nonnull TreeProvider treeProvider) { + public PermissionHook(@NotNull String workspaceName, @NotNull RestrictionProvider restrictionProvider, + @NotNull MountInfoProvider mountInfoProvider, @NotNull RootProvider rootProvider, + @NotNull TreeProvider treeProvider) { this.workspaceName = workspaceName; this.restrictionProvider = restrictionProvider; this.mountInfoProvider = mountInfoProvider; @@ -92,7 +91,7 @@ public class PermissionHook implements P } //---------------------------------------------------------< CommitHook >--- - @Nonnull + @NotNull @Override public NodeState processCommit( NodeState before, NodeState after, CommitInfo info) @@ -131,13 +130,13 @@ public class PermissionHook implements P deleted.clear(); } - @Nonnull + @NotNull private static NodeBuilder getPermissionStore(NodeBuilder rootBuilder) { // permission root has been created during workspace initialization return rootBuilder.getChildNode(JCR_SYSTEM).getChildNode(REP_PERMISSION_STORE); } - @Nonnull + @NotNull private NodeBuilder getPermissionRoot(String path) { Mount m = mountInfoProvider.getMountByPath(path); return permissionStore.getChildNode(MountPermissionProvider.getPermissionRootName(m, workspaceName)); @@ -215,7 +214,7 @@ public class PermissionHook implements P return true; } - private PermissionStoreEditor createPermissionStoreEditor(@Nonnull String nodeName, @Nonnull NodeState nodeState) { + private PermissionStoreEditor createPermissionStoreEditor(@NotNull String nodeName, @NotNull NodeState nodeState) { return new PermissionStoreEditor(parentPath, nodeName, nodeState, getPermissionRoot(parentPath), isACE, isGrantACE, bitsProvider, restrictionProvider, treeProvider); } } Modified: jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionProviderImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionProviderImpl.java?rev=1846014&r1=1846013&r2=1846014&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionProviderImpl.java (original) +++ jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionProviderImpl.java Wed Nov 7 13:57:55 2018 @@ -18,9 +18,6 @@ package org.apache.jackrabbit.oak.securi import java.security.Principal; import java.util.Set; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.api.Root; import org.apache.jackrabbit.oak.api.Tree; @@ -41,6 +38,8 @@ import org.apache.jackrabbit.oak.spi.sec import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeBits; import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeBitsProvider; import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeConstants; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; public class PermissionProviderImpl implements PermissionProvider, AccessControlConstants, PermissionConstants, AggregatedPermissionProvider { @@ -62,13 +61,13 @@ public class PermissionProviderImpl impl private Root immutableRoot; - public PermissionProviderImpl(@Nonnull Root root, - @Nonnull String workspaceName, - @Nonnull Set<Principal> principals, - @Nonnull RestrictionProvider restrictionProvider, - @Nonnull ConfigurationParameters options, - @Nonnull Context ctx, - @Nonnull RootProvider rootProvider) { + public PermissionProviderImpl(@NotNull Root root, + @NotNull String workspaceName, + @NotNull Set<Principal> principals, + @NotNull RestrictionProvider restrictionProvider, + @NotNull ConfigurationParameters options, + @NotNull Context ctx, + @NotNull RootProvider rootProvider) { this.root = root; this.workspaceName = workspaceName; this.principals = principals; @@ -86,36 +85,36 @@ public class PermissionProviderImpl impl getCompiledPermissions().refresh(immutableRoot, workspaceName); } - @Nonnull + @NotNull @Override public Set<String> getPrivileges(@Nullable Tree tree) { return getCompiledPermissions().getPrivileges(PermissionUtil.getImmutableTree(tree, immutableRoot)); } @Override - public boolean hasPrivileges(@Nullable Tree tree, @Nonnull String... privilegeNames) { + public boolean hasPrivileges(@Nullable Tree tree, @NotNull String... privilegeNames) { return getCompiledPermissions().hasPrivileges(PermissionUtil.getImmutableTree(tree, immutableRoot), privilegeNames); } - @Nonnull + @NotNull @Override public RepositoryPermission getRepositoryPermission() { return getCompiledPermissions().getRepositoryPermission(); } - @Nonnull + @NotNull @Override - public TreePermission getTreePermission(@Nonnull Tree tree, @Nonnull TreePermission parentPermission) { + public TreePermission getTreePermission(@NotNull Tree tree, @NotNull TreePermission parentPermission) { return getCompiledPermissions().getTreePermission(PermissionUtil.getImmutableTree(tree, immutableRoot), parentPermission); } @Override - public boolean isGranted(@Nonnull Tree tree, @Nullable PropertyState property, long permissions) { + public boolean isGranted(@NotNull Tree tree, @Nullable PropertyState property, long permissions) { return getCompiledPermissions().isGranted(PermissionUtil.getImmutableTree(tree, immutableRoot), property, permissions); } @Override - public boolean isGranted(@Nonnull String oakPath, @Nonnull String jcrActions) { + public boolean isGranted(@NotNull String oakPath, @NotNull String jcrActions) { TreeLocation location = TreeLocation.create(immutableRoot, oakPath); boolean isAcContent = ctx.definesLocation(location); long permissions = Permissions.getPermissions(jcrActions, location, isAcContent); @@ -124,7 +123,7 @@ public class PermissionProviderImpl impl } //---------------------------------------< AggregatedPermissionProvider >--- - @Nonnull + @NotNull @Override public PrivilegeBits supportedPrivileges(@Nullable Tree tree, @Nullable PrivilegeBits privilegeBits) { return (privilegeBits != null) ? privilegeBits : new PrivilegeBitsProvider(immutableRoot).getBits(PrivilegeConstants.JCR_ALL); @@ -136,23 +135,23 @@ public class PermissionProviderImpl impl } @Override - public long supportedPermissions(@Nonnull TreeLocation location, long permissions) { + public long supportedPermissions(@NotNull TreeLocation location, long permissions) { return permissions; } @Override - public long supportedPermissions(@Nonnull TreePermission treePermission, @Nullable PropertyState property, long permissions) { + public long supportedPermissions(@NotNull TreePermission treePermission, @Nullable PropertyState property, long permissions) { return permissions; } @Override - public boolean isGranted(@Nonnull TreeLocation location, long permissions) { + public boolean isGranted(@NotNull TreeLocation location, long permissions) { return isGranted(location, location.getPath(), permissions); } - @Nonnull + @NotNull @Override - public TreePermission getTreePermission(@Nonnull Tree tree, @Nonnull TreeType type, @Nonnull TreePermission parentPermission) { + public TreePermission getTreePermission(@NotNull Tree tree, @NotNull TreeType type, @NotNull TreePermission parentPermission) { return getCompiledPermissions().getTreePermission(PermissionUtil.getImmutableTree(tree, immutableRoot), type, parentPermission); } @@ -178,11 +177,11 @@ public class PermissionProviderImpl impl return new PermissionStoreImpl(root, workspaceName, restrictionProvider); } - private static boolean isVersionStorePath(@Nonnull String oakPath) { + private static boolean isVersionStorePath(@NotNull String oakPath) { return oakPath.startsWith(VersionConstants.VERSION_STORE_PATH); } - private boolean isGranted(@Nonnull TreeLocation location, @Nonnull String oakPath, long permissions) { + private boolean isGranted(@NotNull TreeLocation location, @NotNull String oakPath, long permissions) { boolean isGranted = false; PropertyState property = location.getProperty(); Tree tree = (property == null) ? location.getTree() : location.getParent().getTree(); Modified: jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionStore.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionStore.java?rev=1846014&r1=1846013&r2=1846014&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionStore.java (original) +++ jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionStore.java Wed Nov 7 13:57:55 2018 @@ -18,11 +18,9 @@ package org.apache.jackrabbit.oak.securi import java.util.Collection; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import org.apache.jackrabbit.oak.api.Root; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * The permission store is used to store and provide access control permissions for principals. It is responsible to @@ -42,14 +40,14 @@ interface PermissionStore { * @param path access controlled path. * @return the given {@code entries}, a new collection or {@code null} */ - @CheckForNull - Collection<PermissionEntry> load(@Nullable Collection<PermissionEntry> entries, @Nonnull String principalName, @Nonnull String path); + @Nullable + Collection<PermissionEntry> load(@Nullable Collection<PermissionEntry> entries, @NotNull String principalName, @NotNull String path); - @Nonnull - PrincipalPermissionEntries load(@Nonnull String principalName); + @NotNull + PrincipalPermissionEntries load(@NotNull String principalName); - long getNumEntries(@Nonnull String principalName, long max); + long getNumEntries(@NotNull String principalName, long max); - void flush(@Nonnull Root root); + void flush(@NotNull Root root); } Modified: jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionStoreEditor.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionStoreEditor.java?rev=1846014&r1=1846013&r2=1846014&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionStoreEditor.java (original) +++ jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionStoreEditor.java Wed Nov 7 13:57:55 2018 @@ -20,8 +20,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.Set; -import javax.annotation.Nonnull; - import com.google.common.base.Objects; import com.google.common.base.Strings; import com.google.common.collect.Maps; @@ -41,6 +39,7 @@ import org.apache.jackrabbit.oak.spi.sec import org.apache.jackrabbit.oak.spi.state.NodeBuilder; import org.apache.jackrabbit.oak.spi.state.NodeState; import org.apache.jackrabbit.util.Text; +import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -58,12 +57,12 @@ final class PermissionStoreEditor implem private final Map<String, List<AcEntry>> entries = Maps.newHashMap(); private final NodeBuilder permissionRoot; - PermissionStoreEditor(@Nonnull String aclPath, @Nonnull String name, - @Nonnull NodeState node, @Nonnull NodeBuilder permissionRoot, - @Nonnull TypePredicate isACE, @Nonnull TypePredicate isGrantACE, - @Nonnull PrivilegeBitsProvider bitsProvider, - @Nonnull RestrictionProvider restrictionProvider, - @Nonnull TreeProvider treeProvider) { + PermissionStoreEditor(@NotNull String aclPath, @NotNull String name, + @NotNull NodeState node, @NotNull NodeBuilder permissionRoot, + @NotNull TypePredicate isACE, @NotNull TypePredicate isGrantACE, + @NotNull PrivilegeBitsProvider bitsProvider, + @NotNull RestrictionProvider restrictionProvider, + @NotNull TreeProvider treeProvider) { this.permissionRoot = permissionRoot; if (name.equals(REP_REPO_POLICY)) { accessControlledPath = ""; @@ -226,11 +225,11 @@ final class PermissionStoreEditor implem private final class JcrAllAcEntry extends AcEntry { - private JcrAllAcEntry(@Nonnull NodeState node, - @Nonnull String accessControlledPath, + private JcrAllAcEntry(@NotNull NodeState node, + @NotNull String accessControlledPath, int index, boolean isAllow, - @Nonnull PrivilegeBits privilegeBits, - @Nonnull Set<Restriction> restrictions) { + @NotNull PrivilegeBits privilegeBits, + @NotNull Set<Restriction> restrictions) { super(node, accessControlledPath, index, isAllow, privilegeBits, restrictions); } @@ -250,9 +249,9 @@ final class PermissionStoreEditor implem private final int index; private int hashCode = -1; - private AcEntry(@Nonnull NodeState node, @Nonnull String accessControlledPath, int index, - boolean isAllow, @Nonnull PrivilegeBits privilegeBits, - @Nonnull Set<Restriction> restrictions) { + private AcEntry(@NotNull NodeState node, @NotNull String accessControlledPath, int index, + boolean isAllow, @NotNull PrivilegeBits privilegeBits, + @NotNull Set<Restriction> restrictions) { this.accessControlledPath = accessControlledPath; this.index = index; Modified: jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionStoreImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionStoreImpl.java?rev=1846014&r1=1846013&r2=1846014&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionStoreImpl.java (original) +++ jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionStoreImpl.java Wed Nov 7 13:57:55 2018 @@ -21,10 +21,6 @@ import java.util.HashMap; import java.util.Map; import java.util.TreeSet; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.api.Root; import org.apache.jackrabbit.oak.api.Tree; @@ -35,6 +31,8 @@ import org.apache.jackrabbit.oak.spi.sec import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeBitsProvider; import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeConstants; import org.apache.jackrabbit.oak.plugins.tree.TreeUtil; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -64,20 +62,20 @@ class PermissionStoreImpl implements Per } @Override - public void flush(@Nonnull Root root) { + public void flush(@NotNull Root root) { principalTreeMap.clear(); reset(root); } - private void reset(@Nonnull Root root) { + private void reset(@NotNull Root root) { permissionsTree = PermissionUtil.getPermissionsRoot(root, permissionRootName); allBits = new PrivilegeBitsProvider(root).getBits(PrivilegeConstants.JCR_ALL); } //----------------------------------------------------< PermissionStore >--- @Override - @CheckForNull - public Collection<PermissionEntry> load(@Nullable Collection<PermissionEntry> entries, @Nonnull String principalName, @Nonnull String path) { + @Nullable + public Collection<PermissionEntry> load(@Nullable Collection<PermissionEntry> entries, @NotNull String principalName, @NotNull String path) { Tree principalRoot = getPrincipalRoot(principalName); if (principalRoot != null) { String name = PermissionUtil.getEntryName(path); @@ -99,15 +97,15 @@ class PermissionStoreImpl implements Per } @Override - public long getNumEntries(@Nonnull String principalName, long max) { + public long getNumEntries(@NotNull String principalName, long max) { // we ignore the hash-collisions here Tree tree = getPrincipalRoot(principalName); return tree == null ? 0 : tree.getChildrenCount(max); } @Override - @Nonnull - public PrincipalPermissionEntries load(@Nonnull String principalName) { + @NotNull + public PrincipalPermissionEntries load(@NotNull String principalName) { long t0 = System.nanoTime(); PrincipalPermissionEntries ret = new PrincipalPermissionEntries(); Tree principalRoot = getPrincipalRoot(principalName); @@ -125,8 +123,8 @@ class PermissionStoreImpl implements Per } //------------------------------------------------------------< private >--- - @CheckForNull - private Tree getPrincipalRoot(@Nonnull String principalName) { + @Nullable + private Tree getPrincipalRoot(@NotNull String principalName) { if (principalTreeMap.containsKey(principalName)) { return principalTreeMap.get(principalName); } else { @@ -139,8 +137,8 @@ class PermissionStoreImpl implements Per } } - private void loadPermissionEntries(@Nonnull Tree tree, - @Nonnull Map<String, Collection<PermissionEntry>> pathEntryMap) { + private void loadPermissionEntries(@NotNull Tree tree, + @NotNull Map<String, Collection<PermissionEntry>> pathEntryMap) { String path = TreeUtil.getString(tree, PermissionConstants.REP_ACCESS_CONTROLLED_PATH); if (path != null) { Collection<PermissionEntry> entries = pathEntryMap.get(path); @@ -160,10 +158,10 @@ class PermissionStoreImpl implements Per } } - @CheckForNull - private Collection<PermissionEntry> loadPermissionEntries(@Nonnull String path, + @Nullable + private Collection<PermissionEntry> loadPermissionEntries(@NotNull String path, @Nullable Collection<PermissionEntry> ret, - @Nonnull Tree tree) { + @NotNull Tree tree) { for (Tree ace : tree.getChildren()) { if (ace.getName().charAt(0) != 'c') { if (ret == null) { @@ -175,9 +173,9 @@ class PermissionStoreImpl implements Per return ret; } - @Nonnull - private PermissionEntry createPermissionEntry(@Nonnull String path, - @Nonnull Tree entryTree) { + @NotNull + private PermissionEntry createPermissionEntry(@NotNull String path, + @NotNull Tree entryTree) { PropertyState ps = entryTree.getProperty(REP_PRIVILEGE_BITS); PrivilegeBits bits = (isJcrAll(ps)) ? allBits : PrivilegeBits.getInstance(ps); boolean isAllow = TreeUtil.getBoolean(entryTree, REP_IS_ALLOW); @@ -188,7 +186,7 @@ class PermissionStoreImpl implements Per restrictionProvider.getPattern(path, entryTree)); } - private static boolean isJcrAll(@CheckForNull PropertyState property) { + private static boolean isJcrAll(@Nullable PropertyState property) { return property != null && property.count() == 1 && property.getValue(Type.LONG, 0) == DYNAMIC_ALL_BITS; } } Modified: jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionStoreValidatorProvider.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionStoreValidatorProvider.java?rev=1846014&r1=1846013&r2=1846014&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionStoreValidatorProvider.java (original) +++ jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionStoreValidatorProvider.java Wed Nov 7 13:57:55 2018 @@ -16,8 +16,6 @@ */ package org.apache.jackrabbit.oak.security.authorization.permission; -import javax.annotation.Nonnull; - import org.apache.jackrabbit.oak.spi.commit.CommitInfo; import org.apache.jackrabbit.oak.spi.commit.FailingValidator; import org.apache.jackrabbit.oak.spi.commit.SubtreeValidator; @@ -25,6 +23,7 @@ import org.apache.jackrabbit.oak.spi.com import org.apache.jackrabbit.oak.spi.commit.ValidatorProvider; import org.apache.jackrabbit.oak.spi.security.authorization.permission.PermissionConstants; import org.apache.jackrabbit.oak.spi.state.NodeState; +import org.jetbrains.annotations.NotNull; import static org.apache.jackrabbit.JcrConstants.JCR_SYSTEM; @@ -33,7 +32,7 @@ import static org.apache.jackrabbit.JcrC */ public class PermissionStoreValidatorProvider extends ValidatorProvider implements PermissionConstants { - @Nonnull + @NotNull @Override public Validator getRootValidator( NodeState before, NodeState after, CommitInfo info) { Modified: jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionUtil.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionUtil.java?rev=1846014&r1=1846013&r2=1846014&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionUtil.java (original) +++ jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionUtil.java Wed Nov 7 13:57:55 2018 @@ -19,10 +19,6 @@ package org.apache.jackrabbit.oak.securi import java.security.Principal; import java.util.Collections; import java.util.Set; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import com.google.common.base.Strings; import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.api.Root; @@ -35,6 +31,8 @@ import org.apache.jackrabbit.oak.spi.sec import org.apache.jackrabbit.oak.spi.security.principal.SystemPrincipal; import org.apache.jackrabbit.oak.spi.state.NodeBuilder; import org.apache.jackrabbit.util.Text; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * Utility methods to evaluate permissions. @@ -43,8 +41,8 @@ public final class PermissionUtil implem private PermissionUtil() {} - @CheckForNull - public static String getParentPathOrNull(@Nonnull final String path) { + @Nullable + public static String getParentPathOrNull(@NotNull final String path) { if (path.length() <= 1) { return null; } else { @@ -57,33 +55,33 @@ public final class PermissionUtil implem } } - @Nonnull + @NotNull public static String getEntryName(@Nullable String accessControlledPath) { String path = Strings.nullToEmpty(accessControlledPath); return String.valueOf(path.hashCode()); } - public static boolean checkACLPath(@Nonnull NodeBuilder node, @Nonnull String path) { + public static boolean checkACLPath(@NotNull NodeBuilder node, @NotNull String path) { PropertyState property = node.getProperty(REP_ACCESS_CONTROLLED_PATH); return property != null && path.equals(property.getValue(Type.STRING)); } - public static boolean checkACLPath(@Nonnull Tree node, @Nonnull String path) { + public static boolean checkACLPath(@NotNull Tree node, @NotNull String path) { PropertyState property = node.getProperty(REP_ACCESS_CONTROLLED_PATH); return property != null && path.equals(property.getValue(Type.STRING)); } - @Nonnull - public static Tree getPermissionsRoot(@Nonnull Root root, @Nonnull String permissionRootName) { + @NotNull + public static Tree getPermissionsRoot(@NotNull Root root, @NotNull String permissionRootName) { return root.getTree(PERMISSIONS_STORE_PATH + '/' + permissionRootName); } - @Nonnull - public static Tree getPrincipalRoot(@Nonnull Tree permissionsTree, @Nonnull String principalName) { + @NotNull + public static Tree getPrincipalRoot(@NotNull Tree permissionsTree, @NotNull String principalName) { return permissionsTree.getChild(Text.escapeIllegalJcrChars(principalName)); } - public static boolean isAdminOrSystem(@Nonnull Set<Principal> principals, @Nonnull ConfigurationParameters config) { + public static boolean isAdminOrSystem(@NotNull Set<Principal> principals, @NotNull ConfigurationParameters config) { if (principals.contains(SystemPrincipal.INSTANCE)) { return true; } else { @@ -97,7 +95,7 @@ public final class PermissionUtil implem } } - @CheckForNull + @Nullable public static String getPath(@Nullable Tree parentBefore, @Nullable Tree parentAfter) { String path = null; if (parentBefore != null) { @@ -108,11 +106,11 @@ public final class PermissionUtil implem return path; } - public static Tree getImmutableTree(@Nullable Tree tree, @Nonnull Root immutableRoot) { + public static Tree getImmutableTree(@Nullable Tree tree, @NotNull Root immutableRoot) { if (tree instanceof ImmutableTree) { return tree; } else { return (tree == null) ? null : immutableRoot.getTree(tree.getPath()); } } -} \ No newline at end of file +} Modified: jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionValidator.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionValidator.java?rev=1846014&r1=1846013&r2=1846014&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionValidator.java (original) +++ jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionValidator.java Wed Nov 7 13:57:55 2018 @@ -16,10 +16,6 @@ */ package org.apache.jackrabbit.oak.security.authorization.permission; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import org.apache.jackrabbit.JcrConstants; import org.apache.jackrabbit.oak.api.CommitFailedException; import org.apache.jackrabbit.oak.api.PropertyState; @@ -39,6 +35,8 @@ import org.apache.jackrabbit.oak.spi.sec import org.apache.jackrabbit.oak.spi.state.NodeState; import org.apache.jackrabbit.oak.spi.state.NodeStateUtils; import org.apache.jackrabbit.oak.plugins.tree.TreeUtil; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import static com.google.common.base.Preconditions.checkNotNull; import static org.apache.jackrabbit.JcrConstants.JCR_CREATED; @@ -64,10 +62,10 @@ class PermissionValidator extends Defaul private final long permission; - PermissionValidator(@Nonnull NodeState rootBefore, - @Nonnull NodeState rootAfter, - @Nonnull PermissionProvider permissionProvider, - @Nonnull PermissionValidatorProvider provider) { + PermissionValidator(@NotNull NodeState rootBefore, + @NotNull NodeState rootAfter, + @NotNull PermissionProvider permissionProvider, + @NotNull PermissionValidatorProvider provider) { this.parentBefore = provider.createReadOnlyTree(rootBefore); this.parentAfter = provider.createReadOnlyTree(rootAfter); this.parentPermission = permissionProvider.getTreePermission(parentBefore, TreePermission.EMPTY); @@ -84,7 +82,7 @@ class PermissionValidator extends Defaul PermissionValidator(@Nullable Tree parentBefore, @Nullable Tree parentAfter, @Nullable TreePermission parentPermission, - @Nonnull PermissionValidator parentValidator) { + @NotNull PermissionValidator parentValidator) { this.parentBefore = parentBefore; this.parentAfter = parentAfter; this.parentPermission = parentPermission; @@ -167,31 +165,31 @@ class PermissionValidator extends Defaul } //-------------------------------------------------< internal / private >--- - @Nonnull + @NotNull PermissionValidator createValidator(@Nullable Tree parentBefore, @Nullable Tree parentAfter, - @Nonnull TreePermission parentPermission, - @Nonnull PermissionValidator parentValidator) { + @NotNull TreePermission parentPermission, + @NotNull PermissionValidator parentValidator) { return new PermissionValidator(parentBefore, parentAfter, parentPermission, parentValidator); } - @CheckForNull + @Nullable Tree getParentAfter() { return parentAfter; } - @CheckForNull + @Nullable Tree getParentBefore() { return parentBefore; } - @Nonnull + @NotNull PermissionProvider getPermissionProvider() { return permissionProvider; } - @CheckForNull - Validator checkPermissions(@Nonnull Tree tree, boolean isBefore, + @Nullable + Validator checkPermissions(@NotNull Tree tree, boolean isBefore, long defaultPermission) throws CommitFailedException { long toTest = getPermission(tree, defaultPermission); if (Permissions.isRepositoryPermission(toTest)) { @@ -219,8 +217,8 @@ class PermissionValidator extends Defaul } } - private void checkPermissions(@Nonnull Tree parent, - @Nonnull PropertyState property, + private void checkPermissions(@NotNull Tree parent, + @NotNull PropertyState property, long defaultPermission) throws CommitFailedException { if (NodeStateUtils.isHidden(property.getName())) { // ignore any hidden properties (except for OAK_CHILD_ORDER which has @@ -242,15 +240,15 @@ class PermissionValidator extends Defaul } } - @Nonnull + @NotNull private Validator nextValidator(@Nullable Tree parentBefore, @Nullable Tree parentAfter, - @Nonnull TreePermission treePermission) { + @NotNull TreePermission treePermission) { Validator validator = createValidator(parentBefore, parentAfter, treePermission, this); return new VisibleValidator(validator, true, false); } - private long getPermission(@Nonnull Tree tree, long defaultPermission) { + private long getPermission(@NotNull Tree tree, long defaultPermission) { if (permission != Permissions.NO_PERMISSION) { return permission; } @@ -267,7 +265,7 @@ class PermissionValidator extends Defaul return perm; } - private long getPermission(@Nonnull Tree parent, @Nonnull PropertyState propertyState, long defaultPermission) { + private long getPermission(@NotNull Tree parent, @NotNull PropertyState propertyState, long defaultPermission) { if (permission != Permissions.NO_PERMISSION) { return permission; } @@ -313,7 +311,7 @@ class PermissionValidator extends Defaul } } - private boolean isImmutableProperty(@Nonnull String name, @Nonnull Tree parent) { + private boolean isImmutableProperty(@NotNull String name, @NotNull Tree parent) { // NOTE: we cannot rely on autocreated/protected definition as this // doesn't reveal if a given property is expected to be never modified // after creation. @@ -326,11 +324,11 @@ class PermissionValidator extends Defaul } } - private boolean testUserPermission(@Nonnull Tree tree) { + private boolean testUserPermission(@NotNull Tree tree) { return provider.getUserContext().definesTree(tree) && !provider.requiresJr2Permissions(Permissions.USER_MANAGEMENT); } - private boolean testAccessControlPermission(@Nonnull Tree tree) { + private boolean testAccessControlPermission(@NotNull Tree tree) { return provider.getAccessControlContext().definesTree(tree); } @@ -339,7 +337,7 @@ class PermissionValidator extends Defaul VersionConstants.REP_VERSIONSTORAGE.equals(TreeUtil.getPrimaryTypeName(tree)); } - @CheckForNull + @Nullable private Tree getVersionHistoryTree(Tree versionstorageTree) throws CommitFailedException { Tree versionHistory = null; for (Tree child : versionstorageTree.getChildren()) { @@ -354,12 +352,12 @@ class PermissionValidator extends Defaul return versionHistory; } - private boolean isIndexDefinition(@Nonnull Tree tree) { + private boolean isIndexDefinition(@NotNull Tree tree) { return tree.getPath().contains(IndexConstants.INDEX_DEFINITIONS_NAME); } - @CheckForNull - private static NodeState getNodeState(@Nonnull Tree tree) { + @Nullable + private static NodeState getNodeState(@NotNull Tree tree) { if (tree instanceof ImmutableTree) { return ((ImmutableTree) tree).getNodeState(); } else { Modified: jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionValidatorProvider.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionValidatorProvider.java?rev=1846014&r1=1846013&r2=1846014&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionValidatorProvider.java (original) +++ jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionValidatorProvider.java Wed Nov 7 13:57:55 2018 @@ -18,8 +18,6 @@ package org.apache.jackrabbit.oak.securi import java.security.Principal; import java.util.Set; -import javax.annotation.Nonnull; - import org.apache.jackrabbit.oak.api.Root; import org.apache.jackrabbit.oak.api.Tree; import org.apache.jackrabbit.oak.plugins.tree.RootProvider; @@ -37,6 +35,7 @@ import org.apache.jackrabbit.oak.spi.sec import org.apache.jackrabbit.oak.spi.security.authorization.permission.Permissions; import org.apache.jackrabbit.oak.spi.security.user.UserConfiguration; import org.apache.jackrabbit.oak.spi.state.NodeState; +import org.jetbrains.annotations.NotNull; /** * {@code ValidatorProvider} implementation for permission evaluation associated @@ -58,9 +57,9 @@ public class PermissionValidatorProvider private Context acCtx; private Context userCtx; - public PermissionValidatorProvider(@Nonnull SecurityProvider securityProvider, @Nonnull String workspaceName, - @Nonnull Set<Principal> principals, @Nonnull MoveTracker moveTracker, - @Nonnull RootProvider rootProvider, @Nonnull TreeProvider treeProvider) { + public PermissionValidatorProvider(@NotNull SecurityProvider securityProvider, @NotNull String workspaceName, + @NotNull Set<Principal> principals, @NotNull MoveTracker moveTracker, + @NotNull RootProvider rootProvider, @NotNull TreeProvider treeProvider) { this.securityProvider = securityProvider; this.acConfig = securityProvider.getConfiguration(AuthorizationConfiguration.class); @@ -78,7 +77,7 @@ public class PermissionValidatorProvider //--------------------------------------------------< ValidatorProvider >--- - @Override @Nonnull + @Override @NotNull public Validator getRootValidator( NodeState before, NodeState after, CommitInfo info) { PermissionProvider pp = acConfig.getPermissionProvider(createReadOnlyRoot(before), workspaceName, principals); @@ -110,11 +109,11 @@ public class PermissionValidatorProvider return Permissions.includes(jr2Permissions, permission); } - Root createReadOnlyRoot(@Nonnull NodeState nodeState) { + Root createReadOnlyRoot(@NotNull NodeState nodeState) { return rootProvider.createReadOnlyRoot(nodeState); } - Tree createReadOnlyTree(@Nonnull NodeState nodeState) { + Tree createReadOnlyTree(@NotNull NodeState nodeState) { return treeProvider.createReadOnlyTree(nodeState); } } Modified: jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PrincipalPermissionEntries.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PrincipalPermissionEntries.java?rev=1846014&r1=1846013&r2=1846014&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PrincipalPermissionEntries.java (original) +++ jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PrincipalPermissionEntries.java Wed Nov 7 13:57:55 2018 @@ -23,8 +23,8 @@ import java.util.HashMap; import java.util.LinkedHashMap; import java.util.Map; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * {@code PermissionEntries} holds the permission entries of one principal @@ -68,21 +68,21 @@ class PrincipalPermissionEntries { this.fullyLoaded = fullyLoaded; } - @Nonnull + @NotNull Map<String, Collection<PermissionEntry>> getEntries() { return entries; } @Nullable - Collection<PermissionEntry> getEntriesByPath(@Nonnull String path) { + Collection<PermissionEntry> getEntriesByPath(@NotNull String path) { return (emptyPaths.containsKey(path)) ? emptySet() : entries.get(path); } - void putEntriesByPath(@Nonnull String path, @Nonnull Collection<PermissionEntry> pathEntries) { + void putEntriesByPath(@NotNull String path, @NotNull Collection<PermissionEntry> pathEntries) { entries.put(path, pathEntries); } - void rememberNotAccessControlled(@Nonnull String path) { + void rememberNotAccessControlled(@NotNull String path) { emptyPaths.put(path, null); } -} \ No newline at end of file +} Modified: jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/RepoPolicyTreePermission.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/RepoPolicyTreePermission.java?rev=1846014&r1=1846013&r2=1846014&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/RepoPolicyTreePermission.java (original) +++ jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/RepoPolicyTreePermission.java Wed Nov 7 13:57:55 2018 @@ -16,13 +16,12 @@ */ package org.apache.jackrabbit.oak.security.authorization.permission; -import javax.annotation.Nonnull; - import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.spi.security.authorization.permission.Permissions; import org.apache.jackrabbit.oak.spi.security.authorization.permission.RepositoryPermission; import org.apache.jackrabbit.oak.spi.security.authorization.permission.TreePermission; import org.apache.jackrabbit.oak.spi.state.NodeState; +import org.jetbrains.annotations.NotNull; /** * {@code TreePermission} implementation for the access control policy coverying @@ -53,9 +52,9 @@ final class RepoPolicyTreePermission imp } //-----------------------------------------------------< TreePermission >--- - @Nonnull + @NotNull @Override - public TreePermission getChildPermission(@Nonnull String childName, @Nonnull NodeState childState) { + public TreePermission getChildPermission(@NotNull String childName, @NotNull NodeState childState) { return getChildPermission(); } @@ -65,7 +64,7 @@ final class RepoPolicyTreePermission imp } @Override - public boolean canRead(@Nonnull PropertyState property) { + public boolean canRead(@NotNull PropertyState property) { return getReadStatus().allowsThis(); } @@ -85,7 +84,7 @@ final class RepoPolicyTreePermission imp } @Override - public boolean isGranted(long permissions, @Nonnull PropertyState property) { + public boolean isGranted(long permissions, @NotNull PropertyState property) { return repoPermission.isGranted(permissions); } Modified: jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/VersionTreePermission.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/VersionTreePermission.java?rev=1846014&r1=1846013&r2=1846014&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/VersionTreePermission.java (original) +++ jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/VersionTreePermission.java Wed Nov 7 13:57:55 2018 @@ -17,8 +17,6 @@ package org.apache.jackrabbit.oak.security.authorization.permission; import java.util.Set; -import javax.annotation.Nonnull; - import com.google.common.collect.ImmutableSet; import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.api.Tree; @@ -27,6 +25,7 @@ import org.apache.jackrabbit.oak.spi.ver import org.apache.jackrabbit.oak.spi.security.authorization.permission.TreePermission; import org.apache.jackrabbit.oak.spi.state.NodeState; import org.apache.jackrabbit.oak.plugins.tree.TreeUtil; +import org.jetbrains.annotations.NotNull; /** * {@link TreePermission} implementations for those items in the version storage @@ -41,12 +40,12 @@ class VersionTreePermission implements T private final Tree versionTree; private final TreePermission versionablePermission; - VersionTreePermission(@Nonnull Tree versionTree, @Nonnull TreePermission versionablePermission) { + VersionTreePermission(@NotNull Tree versionTree, @NotNull TreePermission versionablePermission) { this.versionTree = versionTree; this.versionablePermission = versionablePermission; } - VersionTreePermission createChildPermission(@Nonnull Tree versionTree) { + VersionTreePermission createChildPermission(@NotNull Tree versionTree) { TreePermission delegatee; if (JCR_FROZENNODE.equals(versionTree.getName()) || NT_NAMES.contains(TreeUtil.getPrimaryTypeName(versionTree))) { delegatee = versionablePermission; @@ -58,9 +57,9 @@ class VersionTreePermission implements T //-----------------------------------------------------< TreePermission >--- - @Nonnull + @NotNull @Override - public TreePermission getChildPermission(@Nonnull String childName, @Nonnull NodeState childState) { + public TreePermission getChildPermission(@NotNull String childName, @NotNull NodeState childState) { return createChildPermission(new ImmutableTree((ImmutableTree) versionTree, childName, childState)); } @@ -70,7 +69,7 @@ class VersionTreePermission implements T } @Override - public boolean canRead(@Nonnull PropertyState property) { + public boolean canRead(@NotNull PropertyState property) { return versionablePermission.canRead(property); } @@ -90,7 +89,7 @@ class VersionTreePermission implements T } @Override - public boolean isGranted(long permissions, @Nonnull PropertyState property) { + public boolean isGranted(long permissions, @NotNull PropertyState property) { return versionablePermission.isGranted(permissions, property); } -} \ No newline at end of file +} Modified: jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/restriction/GlobPattern.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/restriction/GlobPattern.java?rev=1846014&r1=1846013&r2=1846014&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/restriction/GlobPattern.java (original) +++ jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/restriction/GlobPattern.java Wed Nov 7 13:57:55 2018 @@ -16,8 +16,6 @@ */ package org.apache.jackrabbit.oak.security.authorization.restriction; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; import javax.jcr.security.AccessControlException; import com.google.common.base.Objects; @@ -26,6 +24,8 @@ import org.apache.jackrabbit.oak.api.Tre import org.apache.jackrabbit.oak.commons.PathUtils; import org.apache.jackrabbit.oak.spi.security.authorization.restriction.RestrictionPattern; import org.apache.jackrabbit.util.Text; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import static com.google.common.base.Preconditions.checkNotNull; @@ -89,7 +89,7 @@ final class GlobPattern implements Restr private final Pattern pattern; - private GlobPattern(@Nonnull String path, @Nonnull String restriction) { + private GlobPattern(@NotNull String path, @NotNull String restriction) { this.path = checkNotNull(path); this.restriction = restriction; @@ -114,11 +114,11 @@ final class GlobPattern implements Restr } } - static GlobPattern create(@Nonnull String nodePath, @Nonnull String restrictions) { + static GlobPattern create(@NotNull String nodePath, @NotNull String restrictions) { return new GlobPattern(nodePath, restrictions); } - static void validate(@Nonnull String restriction) throws AccessControlException { + static void validate(@NotNull String restriction) throws AccessControlException { int cnt = 0; for (int i = 0; i < restriction.length(); i++) { if (WILDCARD_CHAR == restriction.charAt(i)) { @@ -132,13 +132,13 @@ final class GlobPattern implements Restr //-------------------------------------------------< RestrictionPattern >--- @Override - public boolean matches(@Nonnull Tree tree, @Nullable PropertyState property) { + public boolean matches(@NotNull Tree tree, @Nullable PropertyState property) { String itemPath = (property == null) ? tree.getPath() : PathUtils.concat(tree.getPath(), property.getName()); return matches(itemPath); } @Override - public boolean matches(@Nonnull String path) { + public boolean matches(@NotNull String path) { return pattern.matches(path); } @@ -185,7 +185,7 @@ final class GlobPattern implements Restr * Base for PathPattern and WildcardPattern */ private abstract class Pattern { - abstract boolean matches(@Nonnull String toMatch); + abstract boolean matches(@NotNull String toMatch); } /** @@ -195,12 +195,12 @@ final class GlobPattern implements Restr private final String patternStr; - private PathPattern(@Nonnull String patternStr) { + private PathPattern(@NotNull String patternStr) { this.patternStr = patternStr; } @Override - boolean matches(@Nonnull String toMatch) { + boolean matches(@NotNull String toMatch) { if (patternStr.isEmpty()) { return path.equals(toMatch); } else { @@ -219,13 +219,13 @@ final class GlobPattern implements Restr private final String patternEnd; private final char[] patternChars; - private WildcardPattern(@Nonnull String patternStr, @Nullable String patternEnd) { + private WildcardPattern(@NotNull String patternStr, @Nullable String patternEnd) { patternChars = patternStr.toCharArray(); this.patternEnd = patternEnd; } @Override - boolean matches(@Nonnull String toMatch) { + boolean matches(@NotNull String toMatch) { if (patternEnd != null && !toMatch.endsWith(patternEnd)) { // shortcut: verify if end of pattern matches end of toMatch return false; Modified: jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/restriction/ItemNamePattern.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/restriction/ItemNamePattern.java?rev=1846014&r1=1846013&r2=1846014&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/restriction/ItemNamePattern.java (original) +++ jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/restriction/ItemNamePattern.java Wed Nov 7 13:57:55 2018 @@ -17,14 +17,13 @@ package org.apache.jackrabbit.oak.security.authorization.restriction; import java.util.Set; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import com.google.common.collect.ImmutableSet; import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.api.Tree; import org.apache.jackrabbit.oak.commons.PathUtils; import org.apache.jackrabbit.oak.spi.security.authorization.restriction.RestrictionPattern; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * Implementation of the {@link RestrictionPattern} interface that returns @@ -42,7 +41,7 @@ class ItemNamePattern implements Restric } @Override - public boolean matches(@Nonnull Tree tree, @Nullable PropertyState property) { + public boolean matches(@NotNull Tree tree, @Nullable PropertyState property) { if (property != null) { return names.contains(property.getName()); } else { @@ -51,7 +50,7 @@ class ItemNamePattern implements Restric } @Override - public boolean matches(@Nonnull String path) { + public boolean matches(@NotNull String path) { return (PathUtils.denotesRoot(path) ? false : names.contains(PathUtils.getName(path))); } @@ -92,4 +91,4 @@ class ItemNamePattern implements Restric } return false; } -} \ No newline at end of file +} Modified: jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/restriction/NodeTypePattern.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/restriction/NodeTypePattern.java?rev=1846014&r1=1846013&r2=1846014&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/restriction/NodeTypePattern.java (original) +++ jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/restriction/NodeTypePattern.java Wed Nov 7 13:57:55 2018 @@ -17,14 +17,13 @@ package org.apache.jackrabbit.oak.security.authorization.restriction; import java.util.Set; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import com.google.common.collect.ImmutableSet; import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.api.Tree; import org.apache.jackrabbit.oak.spi.security.authorization.restriction.RestrictionPattern; import org.apache.jackrabbit.oak.plugins.tree.TreeUtil; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -41,17 +40,17 @@ class NodeTypePattern implements Restric private final Set<String> nodeTypeNames; - NodeTypePattern(@Nonnull Iterable<String> nodeTypeNames) { + NodeTypePattern(@NotNull Iterable<String> nodeTypeNames) { this.nodeTypeNames = ImmutableSet.copyOf(nodeTypeNames); } @Override - public boolean matches(@Nonnull Tree tree, @Nullable PropertyState property) { + public boolean matches(@NotNull Tree tree, @Nullable PropertyState property) { return nodeTypeNames.contains(TreeUtil.getPrimaryTypeName(tree)); } @Override - public boolean matches(@Nonnull String path) { + public boolean matches(@NotNull String path) { log.debug("Unable to validate node type restriction."); return false; } @@ -93,4 +92,4 @@ class NodeTypePattern implements Restric } return false; } -} \ No newline at end of file +} Modified: jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/restriction/PrefixPattern.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/restriction/PrefixPattern.java?rev=1846014&r1=1846013&r2=1846014&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/restriction/PrefixPattern.java (original) +++ jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/restriction/PrefixPattern.java Wed Nov 7 13:57:55 2018 @@ -17,14 +17,13 @@ package org.apache.jackrabbit.oak.security.authorization.restriction; import java.util.Set; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import com.google.common.collect.ImmutableSet; import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.api.Tree; import org.apache.jackrabbit.oak.spi.security.authorization.restriction.RestrictionPattern; import org.apache.jackrabbit.util.Text; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -40,12 +39,12 @@ class PrefixPattern implements Restricti private final Set<String> prefixes; - PrefixPattern(@Nonnull Iterable<String> prefixes) { + PrefixPattern(@NotNull Iterable<String> prefixes) { this.prefixes = ImmutableSet.copyOf(prefixes); } @Override - public boolean matches(@Nonnull Tree tree, @Nullable PropertyState property) { + public boolean matches(@NotNull Tree tree, @Nullable PropertyState property) { String name = (property != null) ? property.getName() : tree.getName(); String prefix = Text.getNamespacePrefix(name); if (!prefix.isEmpty()) { @@ -59,7 +58,7 @@ class PrefixPattern implements Restricti } @Override - public boolean matches(@Nonnull String path) { + public boolean matches(@NotNull String path) { log.debug("Unable to validate node type restriction."); return false; } @@ -101,4 +100,4 @@ class PrefixPattern implements Restricti } return false; } -} \ No newline at end of file +} Modified: jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/restriction/PrincipalRestrictionProvider.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/restriction/PrincipalRestrictionProvider.java?rev=1846014&r1=1846013&r2=1846014&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/restriction/PrincipalRestrictionProvider.java (original) +++ jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/restriction/PrincipalRestrictionProvider.java Wed Nov 7 13:57:55 2018 @@ -19,8 +19,6 @@ package org.apache.jackrabbit.oak.securi import java.util.HashSet; import java.util.Iterator; import java.util.Set; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; import javax.jcr.PropertyType; import javax.jcr.RepositoryException; import javax.jcr.Value; @@ -37,6 +35,8 @@ import org.apache.jackrabbit.oak.spi.sec import org.apache.jackrabbit.oak.spi.security.authorization.restriction.RestrictionImpl; import org.apache.jackrabbit.oak.spi.security.authorization.restriction.RestrictionPattern; import org.apache.jackrabbit.oak.spi.security.authorization.restriction.RestrictionProvider; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * Restriction provider implementation used for editing access control by @@ -53,7 +53,7 @@ public class PrincipalRestrictionProvide this.base = base; } - @Nonnull + @NotNull @Override public Set<RestrictionDefinition> getSupportedRestrictions(@Nullable String oakPath) { Set<RestrictionDefinition> definitions = new HashSet<RestrictionDefinition>(base.getSupportedRestrictions(oakPath)); @@ -61,9 +61,9 @@ public class PrincipalRestrictionProvide return definitions; } - @Nonnull + @NotNull @Override - public Restriction createRestriction(@Nullable String oakPath, @Nonnull String oakName, @Nonnull Value value) throws RepositoryException { + public Restriction createRestriction(@Nullable String oakPath, @NotNull String oakName, @NotNull Value value) throws RepositoryException { if (REP_NODE_PATH.equals(oakName) && PropertyType.PATH == value.getType()) { return new RestrictionImpl(PropertyStates.createProperty(oakName, value), true); } else { @@ -71,15 +71,15 @@ public class PrincipalRestrictionProvide } } - @Nonnull + @NotNull @Override - public Restriction createRestriction(@Nullable String oakPath, @Nonnull String oakName, @Nonnull Value... values) throws RepositoryException { + public Restriction createRestriction(@Nullable String oakPath, @NotNull String oakName, @NotNull Value... values) throws RepositoryException { return base.createRestriction(oakPath, oakName, values); } - @Nonnull + @NotNull @Override - public Set<Restriction> readRestrictions(@Nullable String oakPath, @Nonnull Tree aceTree) { + public Set<Restriction> readRestrictions(@Nullable String oakPath, @NotNull Tree aceTree) { Set<Restriction> restrictions = new HashSet<Restriction>(base.readRestrictions(oakPath, aceTree)); String value = (oakPath == null) ? "" : oakPath; PropertyState nodePathProp = PropertyStates.createProperty(REP_NODE_PATH, value, Type.PATH); @@ -100,19 +100,19 @@ public class PrincipalRestrictionProvide } @Override - public void validateRestrictions(String oakPath, @Nonnull Tree aceTree) throws RepositoryException { + public void validateRestrictions(String oakPath, @NotNull Tree aceTree) throws RepositoryException { base.validateRestrictions(oakPath, aceTree); } - @Nonnull + @NotNull @Override - public RestrictionPattern getPattern(@Nullable String oakPath, @Nonnull Tree tree) { + public RestrictionPattern getPattern(@Nullable String oakPath, @NotNull Tree tree) { return base.getPattern(oakPath, tree); } - @Nonnull + @NotNull @Override - public RestrictionPattern getPattern(@Nullable String oakPath, @Nonnull Set<Restriction> restrictions) { + public RestrictionPattern getPattern(@Nullable String oakPath, @NotNull Set<Restriction> restrictions) { return base.getPattern(oakPath, restrictions); } -} \ No newline at end of file +} Modified: jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/restriction/RestrictionProviderImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/restriction/RestrictionProviderImpl.java?rev=1846014&r1=1846013&r2=1846014&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/restriction/RestrictionProviderImpl.java (original) +++ jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/restriction/RestrictionProviderImpl.java Wed Nov 7 13:57:55 2018 @@ -22,8 +22,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.Set; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; import javax.jcr.security.AccessControlException; import com.google.common.collect.ImmutableMap; @@ -37,6 +35,8 @@ import org.apache.jackrabbit.oak.spi.sec import org.apache.jackrabbit.oak.spi.security.authorization.restriction.RestrictionDefinitionImpl; import org.apache.jackrabbit.oak.spi.security.authorization.restriction.RestrictionPattern; import org.apache.jackrabbit.oak.spi.security.authorization.restriction.RestrictionProvider; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.osgi.service.component.annotations.Component; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -80,9 +80,9 @@ public class RestrictionProviderImpl ext //------------------------------------------------< RestrictionProvider >--- - @Nonnull + @NotNull @Override - public RestrictionPattern getPattern(String oakPath, @Nonnull Tree tree) { + public RestrictionPattern getPattern(String oakPath, @NotNull Tree tree) { if (oakPath == null) { return RestrictionPattern.EMPTY; } else { @@ -108,9 +108,9 @@ public class RestrictionProviderImpl ext } } - @Nonnull + @NotNull @Override - public RestrictionPattern getPattern(@Nullable String oakPath, @Nonnull Set<Restriction> restrictions) { + public RestrictionPattern getPattern(@Nullable String oakPath, @NotNull Set<Restriction> restrictions) { if (oakPath == null || restrictions.isEmpty()) { return RestrictionPattern.EMPTY; } else { @@ -134,7 +134,7 @@ public class RestrictionProviderImpl ext } @Override - public void validateRestrictions(String oakPath, @Nonnull Tree aceTree) throws AccessControlException { + public void validateRestrictions(String oakPath, @NotNull Tree aceTree) throws AccessControlException { super.validateRestrictions(oakPath, aceTree); Tree restrictionsTree = getRestrictionsTree(aceTree); Modified: jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/restriction/WhiteboardRestrictionProvider.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/restriction/WhiteboardRestrictionProvider.java?rev=1846014&r1=1846013&r2=1846014&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/restriction/WhiteboardRestrictionProvider.java (original) +++ jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/restriction/WhiteboardRestrictionProvider.java Wed Nov 7 13:57:55 2018 @@ -18,8 +18,6 @@ package org.apache.jackrabbit.oak.securi import java.util.Set; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; import javax.jcr.RepositoryException; import javax.jcr.Value; @@ -30,6 +28,8 @@ import org.apache.jackrabbit.oak.spi.sec import org.apache.jackrabbit.oak.spi.security.authorization.restriction.RestrictionPattern; import org.apache.jackrabbit.oak.spi.security.authorization.restriction.RestrictionProvider; import org.apache.jackrabbit.oak.spi.whiteboard.AbstractServiceTracker; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * Dynamic {@link RestrictionProvider} based on the available @@ -43,27 +43,27 @@ public class WhiteboardRestrictionProvid super(RestrictionProvider.class); } - @Nonnull + @NotNull @Override public Set<RestrictionDefinition> getSupportedRestrictions(@Nullable String oakPath) { return getProvider().getSupportedRestrictions(oakPath); } - @Nonnull + @NotNull @Override - public Restriction createRestriction(@Nullable String oakPath, @Nonnull String oakName, @Nonnull Value value) throws RepositoryException { + public Restriction createRestriction(@Nullable String oakPath, @NotNull String oakName, @NotNull Value value) throws RepositoryException { return getProvider().createRestriction(oakPath, oakName, value); } - @Nonnull + @NotNull @Override - public Restriction createRestriction(@Nullable String oakPath, @Nonnull String oakName, @Nonnull Value... values) throws RepositoryException { + public Restriction createRestriction(@Nullable String oakPath, @NotNull String oakName, @NotNull Value... values) throws RepositoryException { return getProvider().createRestriction(oakPath, oakName, values); } - @Nonnull + @NotNull @Override - public Set<Restriction> readRestrictions(@Nullable String oakPath, @Nonnull Tree aceTree) { + public Set<Restriction> readRestrictions(@Nullable String oakPath, @NotNull Tree aceTree) { return getProvider().readRestrictions(oakPath, aceTree); } @@ -73,19 +73,19 @@ public class WhiteboardRestrictionProvid } @Override - public void validateRestrictions(@Nullable String oakPath, @Nonnull Tree aceTree) throws RepositoryException { + public void validateRestrictions(@Nullable String oakPath, @NotNull Tree aceTree) throws RepositoryException { getProvider().validateRestrictions(oakPath, aceTree); } - @Nonnull + @NotNull @Override - public RestrictionPattern getPattern(@Nullable String oakPath, @Nonnull Tree tree) { + public RestrictionPattern getPattern(@Nullable String oakPath, @NotNull Tree tree) { return getProvider().getPattern(oakPath, tree); } - @Nonnull + @NotNull @Override - public RestrictionPattern getPattern(@Nullable String oakPath, @Nonnull Set<Restriction> restrictions) { + public RestrictionPattern getPattern(@Nullable String oakPath, @NotNull Set<Restriction> restrictions) { return getProvider().getPattern(oakPath, restrictions); } @@ -93,4 +93,4 @@ public class WhiteboardRestrictionProvid private RestrictionProvider getProvider() { return CompositeRestrictionProvider.newInstance(getServices()); } -} \ No newline at end of file +}
