Author: angela
Date: Tue Apr 23 12:39:44 2019
New Revision: 1858005
URL: http://svn.apache.org/viewvc?rev=1858005&view=rev
Log:
OAK-8265 : Add nullable/notnull annotations to
org.apache.jackrabbit.oak.security.authorization.permission.*
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/AllPermissions.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/ChildOrderDiff.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/MountPermissionProvider.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/NumEntries.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionCache.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionCacheBuilder.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionHook.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionProviderImpl.java
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/authorization/permission/PermissionStoreImpl.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionStoreValidatorProvider.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionUtil.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionValidator.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionValidatorProvider.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/RepoPolicyTreePermission.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/VersionTreePermission.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/VersionablePathHook.java
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/AllPermissions.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/AllPermissions.java?rev=1858005&r1=1858004&r2=1858005&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/AllPermissions.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/AllPermissions.java
Tue Apr 23 12:39:44 2019
@@ -39,6 +39,7 @@ final class AllPermissions implements Co
private AllPermissions() {
}
+ @NotNull
static CompiledPermissions getInstance() {
return INSTANCE;
}
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/ChildOrderDiff.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/ChildOrderDiff.java?rev=1858005&r1=1858004&r2=1858005&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/ChildOrderDiff.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/ChildOrderDiff.java
Tue Apr 23 12:39:44 2019
@@ -21,6 +21,7 @@ import java.util.Set;
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.Type;
import org.apache.jackrabbit.oak.plugins.tree.TreeConstants;
+import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import static com.google.common.collect.Sets.newLinkedHashSet;
@@ -44,7 +45,7 @@ final class ChildOrderDiff {
* reorder happened; {@code null} otherwise.
*/
@Nullable
- static String firstReordered(PropertyState before, PropertyState after) {
+ static String firstReordered(@NotNull PropertyState before, @NotNull
PropertyState after) {
Set<String> afterNames = newLinkedHashSet(after.getValue(Type.NAMES));
Set<String> beforeNames =
newLinkedHashSet(before.getValue(Type.NAMES));
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/MountPermissionProvider.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/MountPermissionProvider.java?rev=1858005&r1=1858004&r2=1858005&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/MountPermissionProvider.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/MountPermissionProvider.java
Tue Apr 23 12:39:44 2019
@@ -54,9 +54,9 @@ public class MountPermissionProvider ext
this.mountInfoProvider = providerCtx.getMountInfoProvider();
}
+ @NotNull
@Override
- protected PermissionStore getPermissionStore(Root root, String
workspaceName,
- RestrictionProvider restrictionProvider) {
+ protected PermissionStore getPermissionStore(@NotNull Root root, @NotNull
String workspaceName, @NotNull RestrictionProvider restrictionProvider) {
List<PermissionStoreImpl> stores = newArrayList();
stores.add(new PermissionStoreImpl(root, workspaceName,
restrictionProvider));
for (Mount m : mountInfoProvider.getNonDefaultMounts()) {
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/NumEntries.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/NumEntries.java?rev=1858005&r1=1858004&r2=1858005&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/NumEntries.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/NumEntries.java
Tue Apr 23 12:39:44 2019
@@ -17,6 +17,7 @@
package org.apache.jackrabbit.oak.security.authorization.permission;
import com.google.common.base.Objects;
+import org.jetbrains.annotations.NotNull;
final class NumEntries {
@@ -48,6 +49,7 @@ final class NumEntries {
}
}
+ @NotNull
static NumEntries valueOf(long size, boolean isExact) {
if (size == 0) {
// if size is zero we assume that this is the correct value
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionCache.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionCache.java?rev=1858005&r1=1858004&r2=1858005&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionCache.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionCache.java
Tue Apr 23 12:39:44 2019
@@ -22,7 +22,9 @@ import org.jetbrains.annotations.NotNull
interface PermissionCache {
+ @NotNull
Collection<PermissionEntry> getEntries(@NotNull String path);
+ @NotNull
Collection<PermissionEntry> getEntries(@NotNull Tree accessControlledTree);
}
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionCacheBuilder.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionCacheBuilder.java?rev=1858005&r1=1858004&r2=1858005&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionCacheBuilder.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionCacheBuilder.java
Tue Apr 23 12:39:44 2019
@@ -89,6 +89,7 @@ final class PermissionCacheBuilder {
return existingNames.isEmpty();
}
+ @NotNull
PermissionCache build() {
checkState(initialized);
if (existingNames.isEmpty()) {
@@ -120,7 +121,6 @@ final class PermissionCacheBuilder {
} else {
return new DefaultPermissionCache(store, peCache, existingNames);
}
-
}
//------------------------------------< PermissionCache Implementations
>---
@@ -140,6 +140,7 @@ final class PermissionCacheBuilder {
this.existingNames = existingNames;
}
+ @NotNull
@Override
public Collection<PermissionEntry> getEntries(@NotNull String path) {
Collection<PermissionEntry> ret = new TreeSet<>();
@@ -149,6 +150,7 @@ final class PermissionCacheBuilder {
return ret;
}
+ @NotNull
@Override
public Collection<PermissionEntry> getEntries(@NotNull Tree
accessControlledTree) {
return
(accessControlledTree.hasChild(AccessControlConstants.REP_POLICY)) ?
@@ -166,16 +168,18 @@ final class PermissionCacheBuilder {
private static final class PathEntryMapCache implements PermissionCache {
private final Map<String, Collection<PermissionEntry>> pathEntryMap;
- PathEntryMapCache(Map<String, Collection<PermissionEntry>>
pathEntryMap) {
+ PathEntryMapCache(@NotNull Map<String, Collection<PermissionEntry>>
pathEntryMap) {
this.pathEntryMap = pathEntryMap;
}
+ @NotNull
@Override
public Collection<PermissionEntry> getEntries(@NotNull String path) {
Collection<PermissionEntry> entries = pathEntryMap.get(path);
return (entries != null) ? entries :
Collections.<PermissionEntry>emptyList();
}
+ @NotNull
@Override
public Collection<PermissionEntry> getEntries(@NotNull Tree
accessControlledTree) {
Collection<PermissionEntry> entries =
pathEntryMap.get(accessControlledTree.getPath());
@@ -192,11 +196,13 @@ final class PermissionCacheBuilder {
private static final PermissionCache INSTANCE = new EmptyCache();
+ @NotNull
@Override
public Collection<PermissionEntry> getEntries(@NotNull String path) {
return Collections.<PermissionEntry>emptyList();
}
+ @NotNull
@Override
public Collection<PermissionEntry> getEntries(@NotNull Tree
accessControlledTree) {
return Collections.<PermissionEntry>emptyList();
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionHook.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionHook.java?rev=1858005&r1=1858004&r2=1858005&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionHook.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionHook.java
Tue Apr 23 12:39:44 2019
@@ -93,8 +93,7 @@ public class PermissionHook implements P
//---------------------------------------------------------< CommitHook
>---
@NotNull
@Override
- public NodeState processCommit(
- NodeState before, NodeState after, CommitInfo info) {
+ public NodeState processCommit(NodeState before, NodeState after,
CommitInfo info) {
NodeBuilder rootAfter = after.builder();
permissionStore = getPermissionStore(rootAfter);
@@ -130,13 +129,13 @@ public class PermissionHook implements P
}
@NotNull
- private static NodeBuilder getPermissionStore(NodeBuilder rootBuilder) {
+ private static NodeBuilder getPermissionStore(@NotNull NodeBuilder
rootBuilder) {
// permission root has been created during workspace initialization
return
rootBuilder.getChildNode(JCR_SYSTEM).getChildNode(REP_PERMISSION_STORE);
}
@NotNull
- private NodeBuilder getPermissionRoot(String path) {
+ private NodeBuilder getPermissionRoot(@NotNull String path) {
Mount m = mountInfoProvider.getMountByPath(path);
return
permissionStore.getChildNode(MountPermissionProvider.getPermissionRootName(m,
workspaceName));
}
@@ -145,7 +144,7 @@ public class PermissionHook implements P
private final String parentPath;
- private Diff(String parentPath) {
+ private Diff(@NotNull String parentPath) {
this.parentPath = parentPath;
}
@@ -213,6 +212,7 @@ public class PermissionHook implements P
return true;
}
+ @NotNull
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/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionProviderImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionProviderImpl.java?rev=1858005&r1=1858004&r2=1858005&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionProviderImpl.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionProviderImpl.java
Tue Apr 23 12:39:44 2019
@@ -172,8 +172,8 @@ public class PermissionProviderImpl impl
return cp;
}
- protected PermissionStore getPermissionStore(Root root, String
workspaceName,
- RestrictionProvider restrictionProvider) {
+ @NotNull
+ protected PermissionStore getPermissionStore(@NotNull Root root, @NotNull
String workspaceName, @NotNull RestrictionProvider restrictionProvider) {
return new PermissionStoreImpl(root, workspaceName,
restrictionProvider);
}
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=1858005&r1=1858004&r2=1858005&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
Tue Apr 23 12:39:44 2019
@@ -93,6 +93,7 @@ final class PermissionStoreEditor implem
}
}
+ @NotNull
String getPath() {
return accessControlledPath;
}
@@ -101,7 +102,7 @@ final class PermissionStoreEditor implem
return entries.isEmpty();
}
- void removePermissionEntries(PermissionStoreEditor otherEditor) {
+ void removePermissionEntries(@NotNull PermissionStoreEditor otherEditor) {
entries.keySet().removeAll(otherEditor.entries.keySet());
}
@@ -215,7 +216,7 @@ final class PermissionStoreEditor implem
}
}
- private void updateEntries(NodeBuilder parent, List<AcEntry> list) {
+ private void updateEntries(@NotNull NodeBuilder parent, @NotNull
List<AcEntry> list) {
// remove old entries
for (String childName : parent.getChildNodeNames()) {
if (childName.charAt(0) != 'c') {
@@ -266,7 +267,7 @@ final class PermissionStoreEditor implem
this.restrictions = restrictions;
}
- private void writeToPermissionStore(NodeBuilder parent) {
+ private void writeToPermissionStore(@NotNull NodeBuilder parent) {
NodeBuilder n = parent.child(String.valueOf(index))
.setProperty(JCR_PRIMARYTYPE, NT_REP_PERMISSIONS,
Type.NAME)
.setProperty(REP_IS_ALLOW, isAllow)
@@ -276,6 +277,7 @@ final class PermissionStoreEditor implem
}
}
+ @NotNull
PropertyState getPrivilegeBitsProperty() {
return JcrAllUtil.asPropertyState(REP_PRIVILEGE_BITS,
privilegeBits, bitsProvider);
}
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionStoreImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionStoreImpl.java?rev=1858005&r1=1858004&r2=1858005&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionStoreImpl.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionStoreImpl.java
Tue Apr 23 12:39:44 2019
@@ -53,7 +53,7 @@ class PermissionStoreImpl implements Per
private Tree permissionsTree;
private PrivilegeBitsProvider bitsProvider;
- PermissionStoreImpl(Root root, String permissionRootName,
RestrictionProvider restrictionProvider) {
+ PermissionStoreImpl(@NotNull Root root, @NotNull String
permissionRootName, @NotNull RestrictionProvider restrictionProvider) {
this.permissionRootName = permissionRootName;
this.restrictionProvider = restrictionProvider;
reset(root);
@@ -169,6 +169,7 @@ class PermissionStoreImpl implements Per
}
}
+ @NotNull
private Collection<PermissionEntry> loadPermissionEntries(@NotNull String
path,
@NotNull Tree
tree) {
Collection<PermissionEntry> ret = new TreeSet<>();
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionStoreValidatorProvider.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionStoreValidatorProvider.java?rev=1858005&r1=1858004&r2=1858005&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionStoreValidatorProvider.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionStoreValidatorProvider.java
Tue Apr 23 12:39:44 2019
@@ -34,8 +34,7 @@ public class PermissionStoreValidatorPro
@NotNull
@Override
- public Validator getRootValidator(
- NodeState before, NodeState after, CommitInfo info) {
+ public Validator getRootValidator(NodeState before, NodeState after,
CommitInfo info) {
FailingValidator validator = new FailingValidator(
"Constraint", 41, "Attempt to modify permission store.");
return new SubtreeValidator(validator, JCR_SYSTEM,
REP_PERMISSION_STORE);
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionUtil.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionUtil.java?rev=1858005&r1=1858004&r2=1858005&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionUtil.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionUtil.java
Tue Apr 23 12:39:44 2019
@@ -106,6 +106,7 @@ public final class PermissionUtil implem
return path;
}
+ @Nullable
public static Tree getReadOnlyTree(@Nullable Tree tree, @NotNull Root
readOnlyRoot) {
if (tree instanceof ReadOnly) {
return tree;
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionValidator.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionValidator.java?rev=1858005&r1=1858004&r2=1858005&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionValidator.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionValidator.java
Tue Apr 23 12:39:44 2019
@@ -333,13 +333,13 @@ class PermissionValidator extends Defaul
return provider.getAccessControlContext().definesTree(tree);
}
- private boolean isVersionstorageTree(Tree tree) {
+ private boolean isVersionstorageTree(@NotNull Tree tree) {
return permission == Permissions.VERSION_MANAGEMENT &&
VersionConstants.REP_VERSIONSTORAGE.equals(TreeUtil.getPrimaryTypeName(tree));
}
@Nullable
- private Tree getVersionHistoryTree(Tree versionstorageTree) throws
CommitFailedException {
+ private Tree getVersionHistoryTree(@NotNull Tree versionstorageTree)
throws CommitFailedException {
Tree versionHistory = null;
for (Tree child : versionstorageTree.getChildren()) {
if
(VersionConstants.NT_VERSIONHISTORY.equals(TreeUtil.getPrimaryTypeName(child)))
{
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionValidatorProvider.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionValidatorProvider.java?rev=1858005&r1=1858004&r2=1858005&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionValidatorProvider.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionValidatorProvider.java
Tue Apr 23 12:39:44 2019
@@ -71,10 +71,9 @@ public class PermissionValidatorProvider
}
//--------------------------------------------------< ValidatorProvider
>---
-
- @Override @NotNull
- public Validator getRootValidator(
- NodeState before, NodeState after, CommitInfo info) {
+ @NotNull
+ @Override
+ public Validator getRootValidator(NodeState before, NodeState after,
CommitInfo info) {
PermissionProvider pp =
acConfig.getPermissionProvider(createReadOnlyRoot(before), workspaceName,
principals);
if (moveTracker.isEmpty()) {
return new PermissionValidator(before, after, pp, this);
@@ -84,7 +83,7 @@ public class PermissionValidatorProvider
}
//--------------------------------------------------------------------------
-
+ @NotNull
Context getAccessControlContext() {
if (acCtx == null) {
acCtx = acConfig.getContext();
@@ -92,6 +91,7 @@ public class PermissionValidatorProvider
return acCtx;
}
+ @NotNull
Context getUserContext() {
if (userCtx == null) {
UserConfiguration uc =
providerCtx.getSecurityProvider().getConfiguration(UserConfiguration.class);
@@ -100,6 +100,7 @@ public class PermissionValidatorProvider
return userCtx;
}
+ @NotNull
TreeProvider getTreeProvider() {
return providerCtx.getTreeProvider();
}
@@ -108,10 +109,12 @@ public class PermissionValidatorProvider
return Permissions.includes(jr2Permissions, permission);
}
+ @NotNull
Root createReadOnlyRoot(@NotNull NodeState nodeState) {
return providerCtx.getRootProvider().createReadOnlyRoot(nodeState);
}
+ @NotNull
Tree createReadOnlyTree(@NotNull NodeState nodeState) {
return providerCtx.getTreeProvider().createReadOnlyTree(nodeState);
}
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/RepoPolicyTreePermission.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/RepoPolicyTreePermission.java?rev=1858005&r1=1858004&r2=1858005&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/RepoPolicyTreePermission.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/RepoPolicyTreePermission.java
Tue Apr 23 12:39:44 2019
@@ -43,10 +43,11 @@ final class RepoPolicyTreePermission imp
private RepositoryPermission repoPermission;
private ReadStatus readStatus;
- RepoPolicyTreePermission(RepositoryPermission repoPermission) {
+ RepoPolicyTreePermission(@NotNull RepositoryPermission repoPermission) {
this.repoPermission = repoPermission;
}
+ @NotNull
TreePermission getChildPermission() {
return this;
}
@@ -88,6 +89,7 @@ final class RepoPolicyTreePermission imp
return repoPermission.isGranted(permissions);
}
+ @NotNull
private ReadStatus getReadStatus() {
if (readStatus == null) {
boolean canRead =
repoPermission.isGranted(Permissions.READ_ACCESS_CONTROL);
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/VersionTreePermission.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/VersionTreePermission.java?rev=1858005&r1=1858004&r2=1858005&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/VersionTreePermission.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/VersionTreePermission.java
Tue Apr 23 12:39:44 2019
@@ -47,6 +47,7 @@ class VersionTreePermission implements T
this.treeProvider = treeProvider;
}
+ @NotNull
VersionTreePermission createChildPermission(@NotNull Tree versionTree) {
TreePermission delegatee;
if (JCR_FROZENNODE.equals(versionTree.getName()) ||
NT_NAMES.contains(TreeUtil.getPrimaryTypeName(versionTree))) {
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/VersionablePathHook.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/VersionablePathHook.java?rev=1858005&r1=1858004&r2=1858005&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/VersionablePathHook.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/VersionablePathHook.java
Tue Apr 23 12:39:44 2019
@@ -127,7 +127,7 @@ public class VersionablePathHook impleme
before, new Diff(versionManager, ntMgr, node, exceptions));
}
- private boolean setVersionablePath(PropertyState after) {
+ private boolean setVersionablePath(@NotNull PropertyState after) {
if (JcrConstants.JCR_VERSIONHISTORY.equals(after.getName()) &&
nodeAfter.isVersionable(ntMgr)) {
NodeBuilder vhBuilder;
try {
@@ -158,17 +158,17 @@ public class VersionablePathHook impleme
private final String path;
private final NodeBuilder builder;
- private Node(NodeBuilder rootBuilder) {
+ private Node(@NotNull NodeBuilder rootBuilder) {
this.path = "/";
this.builder = rootBuilder;
}
- private Node(Node parent, String name) {
+ private Node(@NotNull Node parent, @NotNull String name) {
this.builder = parent.builder.child(name);
this.path = PathUtils.concat(parent.path, name);
}
- private boolean isVersionable(ReadOnlyNodeTypeManager ntMgr) {
+ private boolean isVersionable(@NotNull ReadOnlyNodeTypeManager ntMgr) {
// this is not 100% correct, because t.getPath() will
// not return the correct path for node after, but is
// sufficient to check if it is versionable
