Author: reschke
Date: Wed Jul 18 14:16:25 2018
New Revision: 1836172
URL: http://svn.apache.org/viewvc?rev=1836172&view=rev
Log:
OAK-7511: get rid of JSR 305 dependency - use jetbrains nullability annotations
instead - oak-authorization-cug
Modified:
jackrabbit/oak/trunk/oak-authorization-cug/pom.xml
jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/CugExclude.java
jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/AbstractTreePermission.java
jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugAccessControlManager.java
jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugConfiguration.java
jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugContext.java
jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugExcludeImpl.java
jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugImporter.java
jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugPermissionProvider.java
jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugPolicyImpl.java
jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugTreePermission.java
jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugUtil.java
jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugValidatorProvider.java
jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/EmptyCugTreePermission.java
jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/NestedCugHook.java
jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/SupportedPaths.java
jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/TopLevelPaths.java
jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/package-info.java
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/AbstractCugTest.java
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugAccessControlManagerTest.java
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugConfigurationTest.java
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugExcludeImplTest.java
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugImportBaseTest.java
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugPermissionProviderTest.java
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugPolicyImplTest.java
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugSecurityProvider.java
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugTreePermissionTest.java
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugUtilTest.java
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugValidatorTest.java
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/NestedCugHookTest.java
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/VersionTest.java
Modified: jackrabbit/oak/trunk/oak-authorization-cug/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-authorization-cug/pom.xml?rev=1836172&r1=1836171&r2=1836172&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-authorization-cug/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-authorization-cug/pom.xml Wed Jul 18 14:16:25 2018
@@ -132,10 +132,10 @@
<scope>provided</scope>
</dependency>
- <!-- Findbugs annotations -->
+ <!-- Nullability annotations -->
<dependency>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
+ <groupId>org.jetbrains</groupId>
+ <artifactId>annotations</artifactId>
</dependency>
<!-- Test dependencies -->
@@ -183,4 +183,4 @@
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
Modified:
jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/CugExclude.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/CugExclude.java?rev=1836172&r1=1836171&r2=1836172&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/CugExclude.java
(original)
+++
jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/CugExclude.java
Wed Jul 18 14:16:25 2018
@@ -18,11 +18,10 @@ package org.apache.jackrabbit.oak.spi.se
import java.security.Principal;
import java.util.Set;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.oak.spi.security.principal.AdminPrincipal;
import org.apache.jackrabbit.oak.spi.security.principal.SystemPrincipal;
import org.apache.jackrabbit.oak.spi.security.principal.SystemUserPrincipal;
+import org.jetbrains.annotations.NotNull;
import org.osgi.annotation.versioning.ProviderType;
/**
@@ -32,7 +31,7 @@ import org.osgi.annotation.versioning.Pr
@ProviderType
public interface CugExclude {
- boolean isExcluded(@Nonnull Set<Principal> principals);
+ boolean isExcluded(@NotNull Set<Principal> principals);
/**
* Default implementation of the {@link CugExclude} interface that excludes
@@ -46,7 +45,7 @@ public interface CugExclude {
class Default implements CugExclude {
@Override
- public boolean isExcluded(@Nonnull Set<Principal> principals) {
+ public boolean isExcluded(@NotNull Set<Principal> principals) {
if (principals.isEmpty()) {
return true;
}
@@ -61,4 +60,4 @@ public interface CugExclude {
return false;
}
}
-}
\ No newline at end of file
+}
Modified:
jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/AbstractTreePermission.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/AbstractTreePermission.java?rev=1836172&r1=1836171&r2=1836172&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/AbstractTreePermission.java
(original)
+++
jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/AbstractTreePermission.java
Wed Jul 18 14:16:25 2018
@@ -16,12 +16,11 @@
*/
package org.apache.jackrabbit.oak.spi.security.authorization.cug.impl;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.oak.api.Tree;
import org.apache.jackrabbit.oak.plugins.tree.TreeType;
import
org.apache.jackrabbit.oak.spi.security.authorization.permission.TreePermission;
import org.apache.jackrabbit.oak.spi.state.NodeState;
+import org.jetbrains.annotations.NotNull;
abstract class AbstractTreePermission implements TreePermission {
@@ -29,15 +28,15 @@ abstract class AbstractTreePermission im
final TreeType type;
final CugPermissionProvider permissionProvider;
- AbstractTreePermission(@Nonnull Tree tree, @Nonnull TreeType type,
@Nonnull CugPermissionProvider permissionProvider) {
+ AbstractTreePermission(@NotNull Tree tree, @NotNull TreeType type,
@NotNull CugPermissionProvider permissionProvider) {
this.tree = tree;
this.type = type;
this.permissionProvider = permissionProvider;
}
- @Nonnull
+ @NotNull
@Override
- public TreePermission getChildPermission(@Nonnull String childName,
@Nonnull NodeState childState) {
+ public TreePermission getChildPermission(@NotNull String childName,
@NotNull NodeState childState) {
return permissionProvider.getTreePermission(tree, type, childName,
childState, this);
}
-}
\ No newline at end of file
+}
Modified:
jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugAccessControlManager.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugAccessControlManager.java?rev=1836172&r1=1836171&r2=1836172&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugAccessControlManager.java
(original)
+++
jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugAccessControlManager.java
Wed Jul 18 14:16:25 2018
@@ -21,9 +21,6 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Set;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import javax.jcr.RepositoryException;
import javax.jcr.security.AccessControlException;
import javax.jcr.security.AccessControlPolicy;
@@ -55,6 +52,8 @@ import org.apache.jackrabbit.oak.spi.sec
import org.apache.jackrabbit.oak.spi.security.principal.PrincipalConfiguration;
import org.apache.jackrabbit.oak.spi.security.principal.PrincipalImpl;
import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeConstants;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -72,10 +71,10 @@ class CugAccessControlManager extends Ab
private final ConfigurationParameters config;
private final PrincipalManager principalManager;
- public CugAccessControlManager(@Nonnull Root root,
- @Nonnull NamePathMapper namePathMapper,
- @Nonnull SecurityProvider securityProvider,
- @Nonnull Set<String> supportedPaths) {
+ public CugAccessControlManager(@NotNull Root root,
+ @NotNull NamePathMapper namePathMapper,
+ @NotNull SecurityProvider securityProvider,
+ @NotNull Set<String> supportedPaths) {
super(root, namePathMapper, securityProvider);
this.supportedPaths = supportedPaths;
@@ -86,7 +85,7 @@ class CugAccessControlManager extends Ab
//-----------------------------------------------< AccessControlManager
>---
- @Nonnull
+ @NotNull
@Override
public Privilege[] getSupportedPrivileges(@Nullable String absPath) throws
RepositoryException {
if (isSupportedPath(getOakPath(absPath))) {
@@ -221,7 +220,7 @@ class CugAccessControlManager extends Ab
//--------------------------------------------------------< PolicyOwner
>---
@Override
- public boolean defines(@Nullable String absPath, @Nonnull
AccessControlPolicy accessControlPolicy) {
+ public boolean defines(@Nullable String absPath, @NotNull
AccessControlPolicy accessControlPolicy) {
return isValidPolicy(absPath, accessControlPolicy);
}
@@ -238,13 +237,13 @@ class CugAccessControlManager extends Ab
}
}
- @CheckForNull
- private CugPolicy getCugPolicy(@Nonnull String oakPath) throws
RepositoryException {
+ @Nullable
+ private CugPolicy getCugPolicy(@NotNull String oakPath) throws
RepositoryException {
return getCugPolicy(oakPath, getTree(oakPath,
Permissions.READ_ACCESS_CONTROL, true));
}
- @CheckForNull
- private CugPolicy getCugPolicy(@Nonnull String oakPath, @Nonnull Tree
tree) {
+ @Nullable
+ private CugPolicy getCugPolicy(@NotNull String oakPath, @NotNull Tree
tree) {
Tree cug = tree.getChild(REP_CUG_POLICY);
if (CugUtil.definesCug(cug)) {
return new CugPolicyImpl(oakPath, getNamePathMapper(),
principalManager, CugUtil.getImportBehavior(config), getPrincipals(cug));
@@ -253,7 +252,7 @@ class CugAccessControlManager extends Ab
}
}
- private Set<Principal> getPrincipals(@Nonnull Tree cugTree) {
+ private Set<Principal> getPrincipals(@NotNull Tree cugTree) {
PropertyState property = cugTree.getProperty(REP_PRINCIPAL_NAMES);
if (property == null) {
return Collections.emptySet();
@@ -269,11 +268,11 @@ class CugAccessControlManager extends Ab
}
}
- private static boolean isValidPolicy(@Nullable String absPath, @Nonnull
AccessControlPolicy policy) {
+ private static boolean isValidPolicy(@Nullable String absPath, @NotNull
AccessControlPolicy policy) {
return policy instanceof CugPolicyImpl && ((CugPolicyImpl)
policy).getPath().equals(absPath);
}
- private static void checkValidPolicy(@Nullable String absPath, @Nonnull
AccessControlPolicy policy) throws AccessControlException {
+ private static void checkValidPolicy(@Nullable String absPath, @NotNull
AccessControlPolicy policy) throws AccessControlException {
if (!(policy instanceof CugPolicyImpl)) {
throw new AccessControlException("Unsupported policy
implementation: " + policy);
}
@@ -283,4 +282,4 @@ class CugAccessControlManager extends Ab
throw new AccessControlException("Path mismatch: Expected " +
cug.getPath() + ", Found: " + absPath);
}
}
-}
\ No newline at end of file
+}
Modified:
jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugConfiguration.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugConfiguration.java?rev=1836172&r1=1836171&r2=1836172&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugConfiguration.java
(original)
+++
jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugConfiguration.java
Wed Jul 18 14:16:25 2018
@@ -23,7 +23,6 @@ import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import javax.annotation.Nonnull;
import javax.jcr.RepositoryException;
import javax.jcr.security.AccessControlManager;
@@ -70,6 +69,7 @@ import org.apache.jackrabbit.oak.spi.sta
import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.apache.jackrabbit.oak.spi.state.NodeStore;
import org.apache.jackrabbit.oak.spi.xml.ProtectedItemImporter;
+import org.jetbrains.annotations.NotNull;
import static
org.apache.jackrabbit.oak.spi.security.RegistrationConstants.OAK_SECURITY_NAME;
@@ -117,25 +117,25 @@ public class CugConfiguration extends Co
super();
}
- public CugConfiguration(@Nonnull SecurityProvider securityProvider) {
+ public CugConfiguration(@NotNull SecurityProvider securityProvider) {
super(securityProvider, securityProvider.getParameters(NAME));
}
- @Nonnull
+ @NotNull
@Override
- public AccessControlManager getAccessControlManager(@Nonnull Root root,
@Nonnull NamePathMapper namePathMapper) {
+ public AccessControlManager getAccessControlManager(@NotNull Root root,
@NotNull NamePathMapper namePathMapper) {
return new CugAccessControlManager(root, namePathMapper,
getSecurityProvider(), supportedPaths);
}
- @Nonnull
+ @NotNull
@Override
public RestrictionProvider getRestrictionProvider() {
return RestrictionProvider.EMPTY;
}
- @Nonnull
+ @NotNull
@Override
- public PermissionProvider getPermissionProvider(@Nonnull Root root,
@Nonnull String workspaceName, @Nonnull Set<Principal> principals) {
+ public PermissionProvider getPermissionProvider(@NotNull Root root,
@NotNull String workspaceName, @NotNull Set<Principal> principals) {
ConfigurationParameters params = getParameters();
boolean enabled =
params.getConfigValue(CugConstants.PARAM_CUG_ENABLED, false);
@@ -146,13 +146,13 @@ public class CugConfiguration extends Co
}
}
- @Nonnull
+ @NotNull
@Override
public String getName() {
return AuthorizationConfiguration.NAME;
}
- @Nonnull
+ @NotNull
@Override
public RepositoryInitializer getRepositoryInitializer() {
return builder -> {
@@ -168,32 +168,32 @@ public class CugConfiguration extends Co
};
}
- @Nonnull
+ @NotNull
@Override
- public List<? extends CommitHook> getCommitHooks(@Nonnull String
workspaceName) {
+ public List<? extends CommitHook> getCommitHooks(@NotNull String
workspaceName) {
return Collections.singletonList(new NestedCugHook());
}
- @Nonnull
+ @NotNull
@Override
- public List<? extends ValidatorProvider> getValidators(@Nonnull String
workspaceName, @Nonnull Set<Principal> principals, @Nonnull MoveTracker
moveTracker) {
+ public List<? extends ValidatorProvider> getValidators(@NotNull String
workspaceName, @NotNull Set<Principal> principals, @NotNull MoveTracker
moveTracker) {
return ImmutableList.of(new CugValidatorProvider());
}
- @Nonnull
+ @NotNull
@Override
public List<ProtectedItemImporter> getProtectedItemImporters() {
return Collections.<ProtectedItemImporter>singletonList(new
CugImporter(mountInfoProvider));
}
- @Nonnull
+ @NotNull
@Override
public Context getContext() {
return CugContext.INSTANCE;
}
@Override
- public void setParameters(@Nonnull ConfigurationParameters config) {
+ public void setParameters(@NotNull ConfigurationParameters config) {
super.setParameters(config);
supportedPaths = CugUtil.getSupportedPaths(config, mountInfoProvider);
}
@@ -230,12 +230,12 @@ public class CugConfiguration extends Co
}
//--------------------------------------------------------------------------
- @Nonnull
+ @NotNull
private CugExclude getExclude() {
return (exclude == null) ? new CugExclude.Default() : exclude;
}
- static boolean registerCugNodeTypes(@Nonnull final Root root) {
+ static boolean registerCugNodeTypes(@NotNull final Root root) {
try {
ReadOnlyNodeTypeManager ntMgr = new ReadOnlyNodeTypeManager() {
@Override
@@ -254,4 +254,4 @@ public class CugConfiguration extends Co
}
return false;
}
-}
\ No newline at end of file
+}
Modified:
jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugContext.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugContext.java?rev=1836172&r1=1836171&r2=1836172&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugContext.java
(original)
+++
jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugContext.java
Wed Jul 18 14:16:25 2018
@@ -16,13 +16,12 @@
*/
package org.apache.jackrabbit.oak.spi.security.authorization.cug.impl;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.Tree;
import org.apache.jackrabbit.oak.plugins.tree.TreeLocation;
import org.apache.jackrabbit.oak.spi.security.Context;
import org.apache.jackrabbit.util.Text;
+import org.jetbrains.annotations.NotNull;
/**
* CUG specific {@code Context} implementation.
@@ -34,22 +33,22 @@ final class CugContext implements Contex
static final Context INSTANCE = new CugContext();
@Override
- public boolean definesProperty(@Nonnull Tree parent, @Nonnull
PropertyState property) {
+ public boolean definesProperty(@NotNull Tree parent, @NotNull
PropertyState property) {
return CugUtil.definesCug(parent, property);
}
@Override
- public boolean definesContextRoot(@Nonnull Tree tree) {
+ public boolean definesContextRoot(@NotNull Tree tree) {
return CugUtil.definesCug(tree);
}
@Override
- public boolean definesTree(@Nonnull Tree tree) {
+ public boolean definesTree(@NotNull Tree tree) {
return CugUtil.definesCug(tree);
}
@Override
- public boolean definesLocation(@Nonnull TreeLocation location) {
+ public boolean definesLocation(@NotNull TreeLocation location) {
PropertyState p = location.getProperty();
Tree tree = (p == null) ? location.getTree() :
location.getParent().getTree();
if (tree != null) {
@@ -61,7 +60,7 @@ final class CugContext implements Contex
}
@Override
- public boolean definesInternal(@Nonnull Tree tree) {
+ public boolean definesInternal(@NotNull Tree tree) {
return false;
}
-}
\ No newline at end of file
+}
Modified:
jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugExcludeImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugExcludeImpl.java?rev=1836172&r1=1836171&r2=1836172&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugExcludeImpl.java
(original)
+++
jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugExcludeImpl.java
Wed Jul 18 14:16:25 2018
@@ -20,8 +20,6 @@ import java.security.Principal;
import java.util.Collections;
import java.util.Map;
import java.util.Set;
-import javax.annotation.Nonnull;
-
import com.google.common.collect.ImmutableSet;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
@@ -31,6 +29,7 @@ import org.apache.felix.scr.annotations.
import org.apache.felix.scr.annotations.Service;
import org.apache.jackrabbit.oak.commons.PropertiesUtil;
import org.apache.jackrabbit.oak.spi.security.authorization.cug.CugExclude;
+import org.jetbrains.annotations.NotNull;
/**
* Extension of the default {@link
org.apache.jackrabbit.oak.spi.security.authorization.cug.CugExclude}
@@ -55,7 +54,7 @@ public class CugExcludeImpl extends CugE
private Set<String> principalNames = Collections.emptySet();
@Override
- public boolean isExcluded(@Nonnull Set<Principal> principals) {
+ public boolean isExcluded(@NotNull Set<Principal> principals) {
if (super.isExcluded(principals)) {
return true;
}
@@ -79,7 +78,7 @@ public class CugExcludeImpl extends CugE
setPrincipalNames(properties);
}
- private void setPrincipalNames(@Nonnull Map<String, Object> properties) {
+ private void setPrincipalNames(@NotNull Map<String, Object> properties) {
this.principalNames =
ImmutableSet.copyOf(PropertiesUtil.toStringArray(properties.get("principalNames"),
new String[0]));
}
-}
\ No newline at end of file
+}
Modified:
jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugImporter.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugImporter.java?rev=1836172&r1=1836171&r2=1836172&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugImporter.java
(original)
+++
jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugImporter.java
Wed Jul 18 14:16:25 2018
@@ -20,7 +20,6 @@ import java.security.AccessControlExcept
import java.security.Principal;
import java.util.HashSet;
import java.util.Set;
-import javax.annotation.Nonnull;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
import javax.jcr.nodetype.PropertyDefinition;
@@ -41,6 +40,7 @@ import org.apache.jackrabbit.oak.spi.xml
import org.apache.jackrabbit.oak.spi.xml.ProtectedPropertyImporter;
import org.apache.jackrabbit.oak.spi.xml.ReferenceChangeTracker;
import org.apache.jackrabbit.oak.spi.xml.TextValue;
+import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -60,13 +60,13 @@ class CugImporter implements ProtectedPr
private PrincipalManager principalManager;
- CugImporter(@Nonnull MountInfoProvider mountInfoProvider) {
+ CugImporter(@NotNull MountInfoProvider mountInfoProvider) {
this.mountInfoProvider = mountInfoProvider;
}
//----------------------------------------------< ProtectedItemImporter
>---
@Override
- public boolean init(@Nonnull Session session, @Nonnull Root root, @Nonnull
NamePathMapper namePathMapper, boolean isWorkspaceImport, int uuidBehavior,
@Nonnull ReferenceChangeTracker referenceTracker, @Nonnull SecurityProvider
securityProvider) {
+ public boolean init(@NotNull Session session, @NotNull Root root, @NotNull
NamePathMapper namePathMapper, boolean isWorkspaceImport, int uuidBehavior,
@NotNull ReferenceChangeTracker referenceTracker, @NotNull SecurityProvider
securityProvider) {
if (initialized) {
throw new IllegalStateException("Already initialized");
}
@@ -96,7 +96,7 @@ class CugImporter implements ProtectedPr
//------------------------------------------< ProtectedPropertyImporter
>---
@Override
- public boolean handlePropInfo(@Nonnull Tree parent, @Nonnull PropInfo
protectedPropInfo, @Nonnull PropertyDefinition def) throws RepositoryException {
+ public boolean handlePropInfo(@NotNull Tree parent, @NotNull PropInfo
protectedPropInfo, @NotNull PropertyDefinition def) throws RepositoryException {
if (CugUtil.definesCug(parent) && isValid(protectedPropInfo, def) &&
CugUtil.isSupportedPath(parent.getPath(), supportedPaths)) {
Set<String> principalNames = new HashSet<>();
for (TextValue txtValue : protectedPropInfo.getTextValues()) {
@@ -128,7 +128,7 @@ class CugImporter implements ProtectedPr
}
@Override
- public void propertiesCompleted(@Nonnull Tree protectedParent) throws
IllegalStateException, RepositoryException {
+ public void propertiesCompleted(@NotNull Tree protectedParent) throws
IllegalStateException, RepositoryException {
if (CugUtil.definesCug(protectedParent) &&
!protectedParent.hasProperty(REP_PRINCIPAL_NAMES)) {
// remove the rep:cugPolicy node if mandatory property is missing
// (which may also happen upon an attempt to create a cug at an
unsupported path).
@@ -138,10 +138,10 @@ class CugImporter implements ProtectedPr
}
//--------------------------------------------------------------------------
- private boolean isValid(@Nonnull PropInfo propInfo, @Nonnull
PropertyDefinition def) {
+ private boolean isValid(@NotNull PropInfo propInfo, @NotNull
PropertyDefinition def) {
if (REP_PRINCIPAL_NAMES.equals(propInfo.getName())) {
return def.isMultiple() &&
NT_REP_CUG_POLICY.equals(def.getDeclaringNodeType().getName());
}
return false;
}
-}
\ No newline at end of file
+}
Modified:
jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugPermissionProvider.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugPermissionProvider.java?rev=1836172&r1=1836171&r2=1836172&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugPermissionProvider.java
(original)
+++
jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugPermissionProvider.java
Wed Jul 18 14:16:25 2018
@@ -19,10 +19,6 @@ package org.apache.jackrabbit.oak.spi.se
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.collect.ImmutableSet;
import org.apache.jackrabbit.JcrConstants;
import org.apache.jackrabbit.oak.api.PropertyState;
@@ -47,6 +43,8 @@ import org.apache.jackrabbit.oak.spi.sec
import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeConstants;
import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.apache.jackrabbit.oak.spi.state.NodeStateUtils;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
class CugPermissionProvider implements AggregatedPermissionProvider,
CugConstants {
@@ -72,13 +70,13 @@ class CugPermissionProvider implements A
private final RootProvider rootProvider;
private final TreeProvider treeProvider;
- CugPermissionProvider(@Nonnull Root root,
- @Nonnull String workspaceName,
- @Nonnull Set<Principal> principals,
- @Nonnull Set<String> supportedPaths,
- @Nonnull Context ctx,
- @Nonnull RootProvider rootProvider,
- @Nonnull TreeProvider treeProvider) {
+ CugPermissionProvider(@NotNull Root root,
+ @NotNull String workspaceName,
+ @NotNull Set<Principal> principals,
+ @NotNull Set<String> supportedPaths,
+ @NotNull Context ctx,
+ @NotNull RootProvider rootProvider,
+ @NotNull TreeProvider treeProvider) {
this.root = root;
this.rootProvider = rootProvider;
this.treeProvider = treeProvider;
@@ -98,14 +96,14 @@ class CugPermissionProvider implements A
topPaths = new TopLevelPaths(immutableRoot);
}
- @Nonnull
- TreePermission getTreePermission(@Nonnull Tree parent, @Nonnull TreeType
parentType, @Nonnull String childName, @Nonnull NodeState childState, @Nonnull
AbstractTreePermission parentPermission) {
+ @NotNull
+ TreePermission getTreePermission(@NotNull Tree parent, @NotNull TreeType
parentType, @NotNull String childName, @NotNull NodeState childState, @NotNull
AbstractTreePermission parentPermission) {
Tree t = treeProvider.createReadOnlyTree(parent, childName,
childState);
TreeType type = typeProvider.getType(t, parentType);
return getTreePermission(t, type, parentPermission);
}
- boolean isAllow(@Nonnull Tree cugTree) {
+ boolean isAllow(@NotNull Tree cugTree) {
PropertyState princNamesState =
cugTree.getProperty(REP_PRINCIPAL_NAMES);
if (princNamesState != null) {
for (String pName : princNamesState.getValue(Type.STRINGS)) {
@@ -127,7 +125,7 @@ class CugPermissionProvider implements A
topPaths = new TopLevelPaths(immutableRoot);
}
- @Nonnull
+ @NotNull
@Override
public Set<String> getPrivileges(@Nullable Tree tree) {
if (tree != null && canRead(tree)) {
@@ -138,7 +136,7 @@ class CugPermissionProvider implements A
}
@Override
- public boolean hasPrivileges(@Nullable Tree tree, @Nonnull String...
privilegeNames) {
+ public boolean hasPrivileges(@Nullable Tree tree, @NotNull String...
privilegeNames) {
if (tree == null) {
return false;
}
@@ -150,15 +148,15 @@ class CugPermissionProvider implements A
return canRead(tree);
}
- @Nonnull
+ @NotNull
@Override
public RepositoryPermission getRepositoryPermission() {
return RepositoryPermission.EMPTY;
}
- @Nonnull
+ @NotNull
@Override
- public TreePermission getTreePermission(@Nonnull Tree tree, @Nonnull
TreePermission parentPermission) {
+ public TreePermission getTreePermission(@NotNull Tree tree, @NotNull
TreePermission parentPermission) {
if (TreePermission.NO_RECOURSE == parentPermission) {
throw new IllegalStateException("Attempt to create tree permission
for path '"+ tree.getPath() +"', which is either not supported or doesn't
contain any CUGs.");
}
@@ -168,7 +166,7 @@ class CugPermissionProvider implements A
}
@Override
- public boolean isGranted(@Nonnull Tree tree, PropertyState property, long
permissions) {
+ public boolean isGranted(@NotNull Tree tree, PropertyState property, long
permissions) {
if (isRead(permissions)) {
return canRead(tree);
} else {
@@ -177,7 +175,7 @@ class CugPermissionProvider implements A
}
@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);
if (ctx.definesLocation(location) ||
NodeStateUtils.isHiddenPath(oakPath)) {
return false;
@@ -188,7 +186,7 @@ class CugPermissionProvider implements A
}
//---------------------------------------< AggregatedPermissionProvider
>---
- @Nonnull
+ @NotNull
@Override
public PrivilegeBits supportedPrivileges(@Nullable Tree tree, @Nullable
PrivilegeBits privilegeBits) {
if (tree == null) {
@@ -226,7 +224,7 @@ class CugPermissionProvider implements A
}
@Override
- public long supportedPermissions(@Nonnull TreeLocation location, long
permissions) {
+ public long supportedPermissions(@NotNull TreeLocation location, long
permissions) {
long supported = permissions & Permissions.READ;
if (supported != Permissions.NO_PERMISSION &&
includesCug(getTreeFromLocation(location))) {
return supported;
@@ -236,7 +234,7 @@ class CugPermissionProvider implements A
}
@Override
- public long supportedPermissions(@Nonnull TreePermission treePermission,
@Nullable PropertyState property, long permissions) {
+ public long supportedPermissions(@NotNull TreePermission treePermission,
@Nullable PropertyState property, long permissions) {
long supported = permissions & Permissions.READ;
if (supported != Permissions.NO_PERMISSION && (treePermission
instanceof CugTreePermission) && ((CugTreePermission)
treePermission).isInCug()) {
return supported;
@@ -246,7 +244,7 @@ class CugPermissionProvider implements A
}
@Override
- public boolean isGranted(@Nonnull TreeLocation location, long permissions)
{
+ public boolean isGranted(@NotNull TreeLocation location, long permissions)
{
if (isRead(permissions)) {
Tree tree = getTreeFromLocation(location);
if (tree != null) {
@@ -256,8 +254,8 @@ class CugPermissionProvider implements A
return false;
}
- @Nonnull
- public TreePermission getTreePermission(@Nonnull Tree immutableTree,
@Nonnull TreeType type, @Nonnull TreePermission parentPermission) {
+ @NotNull
+ public TreePermission getTreePermission(@NotNull Tree immutableTree,
@NotNull TreeType type, @NotNull TreePermission parentPermission) {
if (!isSupportedType(type) || !topPaths.hasAny()) {
return TreePermission.NO_RECOURSE;
}
@@ -289,7 +287,7 @@ class CugPermissionProvider implements A
//--------------------------------------------------------------------------
- private static boolean isJcrSystemPath(@Nonnull Tree tree) {
+ private static boolean isJcrSystemPath(@NotNull Tree tree) {
return JcrConstants.JCR_SYSTEM.equals(tree.getName());
}
@@ -297,11 +295,11 @@ class CugPermissionProvider implements A
return permission == Permissions.READ_NODE || permission ==
Permissions.READ_PROPERTY || permission == Permissions.READ;
}
- private static boolean isSupportedType(@Nonnull TreeType type) {
+ private static boolean isSupportedType(@NotNull TreeType type) {
return type == TreeType.DEFAULT || type == TreeType.VERSION;
}
- private boolean includesCug(@CheckForNull Tree tree) {
+ private boolean includesCug(@Nullable Tree tree) {
if (tree != null) {
Tree immutableTree = getImmutableTree(tree);
TreeType type = typeProvider.getType(immutableTree);
@@ -312,11 +310,11 @@ class CugPermissionProvider implements A
return false;
}
- private boolean includes(@Nonnull String path) {
+ private boolean includes(@NotNull String path) {
return supportedPaths.includes(path);
}
- private boolean mayContain(@Nonnull String path) {
+ private boolean mayContain(@NotNull String path) {
return supportedPaths.mayContainCug(path) && topPaths.contains(path);
}
@@ -330,8 +328,8 @@ class CugPermissionProvider implements A
* @return the {@code tree} holding the CUG policy that effects the
specified
* path or {@code null} if no such policy exists.
*/
- @CheckForNull
- private Tree getCugRoot(@Nonnull Tree immutableTree, @Nonnull TreeType
type) {
+ @Nullable
+ private Tree getCugRoot(@NotNull Tree immutableTree, @NotNull TreeType
type) {
Tree tree = immutableTree;
String p = immutableTree.getPath();
if (TreeType.VERSION == type &&
!ReadOnlyVersionManager.isVersionStoreTree(tree)) {
@@ -361,7 +359,7 @@ class CugPermissionProvider implements A
return null;
}
- private boolean canRead(@Nonnull Tree tree) {
+ private boolean canRead(@NotNull Tree tree) {
Tree immutableTree = getImmutableTree(tree);
TreeType type = typeProvider.getType(immutableTree);
if (!isSupportedType(type) || !topPaths.hasAny()) {
@@ -377,13 +375,13 @@ class CugPermissionProvider implements A
return false;
}
- @Nonnull
- private Tree getImmutableTree(@Nonnull Tree tree) {
+ @NotNull
+ private Tree getImmutableTree(@NotNull Tree tree) {
return TreeUtil.isReadOnlyTree(tree) ? tree :
immutableRoot.getTree(tree.getPath());
}
- @CheckForNull
- private static Tree getTreeFromLocation(@Nonnull TreeLocation location) {
+ @Nullable
+ private static Tree getTreeFromLocation(@NotNull TreeLocation location) {
Tree tree = (location.getProperty() == null) ? location.getTree() :
location.getParent().getTree();
while (tree == null && !PathUtils.denotesRoot(location.getPath())) {
location = location.getParent();
@@ -392,8 +390,8 @@ class CugPermissionProvider implements A
return tree;
}
- @Nonnull
- private TreePermission createVersionPermission(@Nonnull Tree tree,
@Nonnull TreeType type, @Nonnull TreePermission parent, boolean
parentIsCugPermission) {
+ @NotNull
+ private TreePermission createVersionPermission(@NotNull Tree tree,
@NotNull TreeType type, @NotNull TreePermission parent, boolean
parentIsCugPermission) {
if (ReadOnlyVersionManager.isVersionStoreTree(tree)) {
if (parentIsCugPermission) {
return new CugTreePermission(tree, type, parent, this);
@@ -445,11 +443,11 @@ class CugPermissionProvider implements A
}
}
- @Nonnull
+ @NotNull
private ReadOnlyVersionManager getVersionManager() {
if (versionManager == null) {
versionManager = ReadOnlyVersionManager.getInstance(immutableRoot,
NamePathMapper.DEFAULT);
}
return versionManager;
}
-}
\ No newline at end of file
+}
Modified:
jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugPolicyImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugPolicyImpl.java?rev=1836172&r1=1836171&r2=1836172&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugPolicyImpl.java
(original)
+++
jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugPolicyImpl.java
Wed Jul 18 14:16:25 2018
@@ -20,8 +20,6 @@ import java.security.Principal;
import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
import javax.jcr.security.AccessControlException;
import com.google.common.base.Strings;
@@ -31,6 +29,8 @@ import org.apache.jackrabbit.api.securit
import org.apache.jackrabbit.oak.namepath.NamePathMapper;
import org.apache.jackrabbit.oak.spi.security.authorization.cug.CugPolicy;
import org.apache.jackrabbit.oak.spi.xml.ImportBehavior;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -49,14 +49,14 @@ class CugPolicyImpl implements CugPolicy
private final Set<Principal> principals = new HashSet<>();
- CugPolicyImpl(@Nonnull String oakPath, @Nonnull NamePathMapper
namePathMapper,
- @Nonnull PrincipalManager principalManager, int
importBehavior) {
+ CugPolicyImpl(@NotNull String oakPath, @NotNull NamePathMapper
namePathMapper,
+ @NotNull PrincipalManager principalManager, int
importBehavior) {
this(oakPath, namePathMapper, principalManager, importBehavior,
Collections.<Principal>emptySet());
}
- CugPolicyImpl(@Nonnull String oakPath, @Nonnull NamePathMapper
namePathMapper,
- @Nonnull PrincipalManager principalManager, int
importBehavior,
- @Nonnull Set<Principal> principals) {
+ CugPolicyImpl(@NotNull String oakPath, @NotNull NamePathMapper
namePathMapper,
+ @NotNull PrincipalManager principalManager, int
importBehavior,
+ @NotNull Set<Principal> principals) {
ImportBehavior.nameFromValue(importBehavior);
this.oakPath = oakPath;
this.namePathMapper = namePathMapper;
@@ -65,14 +65,14 @@ class CugPolicyImpl implements CugPolicy
this.principals.addAll(principals);
}
- @Nonnull
+ @NotNull
@Override
public Set<Principal> getPrincipals() {
return Sets.newHashSet(principals);
}
@Override
- public boolean addPrincipals(@Nonnull Principal... principals) throws
AccessControlException {
+ public boolean addPrincipals(@NotNull Principal... principals) throws
AccessControlException {
boolean modified = false;
for (Principal principal : principals) {
if (isValidPrincipal(principal)) {
@@ -83,7 +83,7 @@ class CugPolicyImpl implements CugPolicy
}
@Override
- public boolean removePrincipals(@Nonnull Principal... principals) {
+ public boolean removePrincipals(@NotNull Principal... principals) {
boolean modified = false;
for (Principal principal : principals) {
if (principal != null) {
@@ -117,7 +117,7 @@ class CugPolicyImpl implements CugPolicy
* if {@link org.apache.jackrabbit.oak.spi.xml.ImportBehavior#ABORT} is
* configured and this principal is not known to the repository.
*/
- private boolean isValidPrincipal(@CheckForNull Principal principal) throws
AccessControlException {
+ private boolean isValidPrincipal(@Nullable Principal principal) throws
AccessControlException {
if (principal == null) {
log.debug("Ignoring null principal.");
return false;
@@ -149,4 +149,4 @@ class CugPolicyImpl implements CugPolicy
}
return isValid;
}
-}
\ No newline at end of file
+}
Modified:
jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugTreePermission.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugTreePermission.java?rev=1836172&r1=1836171&r2=1836172&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugTreePermission.java
(original)
+++
jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugTreePermission.java
Wed Jul 18 14:16:25 2018
@@ -16,14 +16,13 @@
*/
package org.apache.jackrabbit.oak.spi.security.authorization.cug.impl;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.Tree;
import org.apache.jackrabbit.oak.plugins.tree.TreeType;
import
org.apache.jackrabbit.oak.spi.security.authorization.permission.Permissions;
import
org.apache.jackrabbit.oak.spi.security.authorization.permission.TreePermission;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
/**
* {@code TreePermission} implementation for all tree located within one of the
@@ -34,14 +33,14 @@ final class CugTreePermission extends Ab
private final TreePermission parent;
private Status status;
- CugTreePermission(@Nonnull Tree tree, @Nonnull TreeType type, @Nonnull
TreePermission parent,
- @Nonnull CugPermissionProvider permissionProvider) {
+ CugTreePermission(@NotNull Tree tree, @NotNull TreeType type, @NotNull
TreePermission parent,
+ @NotNull CugPermissionProvider permissionProvider) {
super(tree, type, permissionProvider);
this.parent = parent;
}
- CugTreePermission(@Nonnull Tree tree, @Nonnull TreeType type, @Nonnull
TreePermission parent,
- @Nonnull CugPermissionProvider permissionProvider,
boolean inCug, boolean canRead, boolean hasNestedCug) {
+ CugTreePermission(@NotNull Tree tree, @NotNull TreeType type, @NotNull
TreePermission parent,
+ @NotNull CugPermissionProvider permissionProvider,
boolean inCug, boolean canRead, boolean hasNestedCug) {
super(tree, type, permissionProvider);
this.parent = parent;
status = new Status(inCug, canRead, hasNestedCug);
@@ -92,7 +91,7 @@ final class CugTreePermission extends Ab
}
}
- private static boolean neverNested(@CheckForNull CugTreePermission
parentCugPerm) {
+ private static boolean neverNested(@Nullable CugTreePermission
parentCugPerm) {
if (parentCugPerm != null) {
Status st = parentCugPerm.status;
return st != null && st.inCug && !st.hasNested;
@@ -108,7 +107,7 @@ final class CugTreePermission extends Ab
}
@Override
- public boolean canRead(@Nonnull PropertyState property) {
+ public boolean canRead(@NotNull PropertyState property) {
return isAllow();
}
@@ -128,7 +127,7 @@ final class CugTreePermission extends Ab
}
@Override
- public boolean isGranted(long permissions, @Nonnull PropertyState
property) {
+ public boolean isGranted(long permissions, @NotNull PropertyState
property) {
return permissions == Permissions.READ_PROPERTY && isAllow();
}
@@ -147,4 +146,4 @@ final class CugTreePermission extends Ab
this.hasNested = hasNested;
}
}
-}
\ No newline at end of file
+}
Modified:
jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugUtil.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugUtil.java?rev=1836172&r1=1836171&r2=1836172&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugUtil.java
(original)
+++
jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugUtil.java
Wed Jul 18 14:16:25 2018
@@ -17,10 +17,6 @@
package org.apache.jackrabbit.oak.spi.security.authorization.cug.impl;
import java.util.Set;
-import javax.annotation.CheckForNull;
-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;
@@ -34,6 +30,8 @@ import org.apache.jackrabbit.oak.spi.sta
import org.apache.jackrabbit.oak.spi.xml.ImportBehavior;
import org.apache.jackrabbit.oak.spi.xml.ProtectedItemImporter;
import org.apache.jackrabbit.util.Text;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -46,20 +44,20 @@ final class CugUtil implements CugConsta
private CugUtil(){}
- public static boolean hasCug(@Nonnull Tree tree) {
+ public static boolean hasCug(@NotNull Tree tree) {
return tree.exists() && tree.hasChild(REP_CUG_POLICY);
}
- public static boolean hasCug(@CheckForNull NodeState state) {
+ public static boolean hasCug(@Nullable NodeState state) {
return state != null && state.hasChildNode(REP_CUG_POLICY);
}
- public static boolean hasCug(@CheckForNull NodeBuilder builder) {
+ public static boolean hasCug(@Nullable NodeBuilder builder) {
return builder != null && builder.hasChildNode(REP_CUG_POLICY);
}
- @CheckForNull
- public static Tree getCug(@Nonnull Tree tree) {
+ @Nullable
+ public static Tree getCug(@NotNull Tree tree) {
Tree cugTree = (CugUtil.hasCug(tree)) ? tree.getChild(REP_CUG_POLICY)
: null;
if (cugTree != null &&
NT_REP_CUG_POLICY.equals(TreeUtil.getPrimaryTypeName(cugTree))) {
return cugTree;
@@ -68,23 +66,23 @@ final class CugUtil implements CugConsta
}
}
- public static boolean definesCug(@Nonnull Tree tree) {
+ public static boolean definesCug(@NotNull Tree tree) {
return tree.exists() && REP_CUG_POLICY.equals(tree.getName()) &&
NT_REP_CUG_POLICY.equals(TreeUtil.getPrimaryTypeName(tree));
}
- public static boolean definesCug(@Nonnull String name, @Nonnull NodeState
state) {
+ public static boolean definesCug(@NotNull String name, @NotNull NodeState
state) {
return REP_CUG_POLICY.equals(name) &&
NT_REP_CUG_POLICY.equals(NodeStateUtils.getPrimaryTypeName(state));
}
- public static boolean definesCug(@Nonnull Tree tree, @Nonnull
PropertyState property) {
+ public static boolean definesCug(@NotNull Tree tree, @NotNull
PropertyState property) {
return REP_PRINCIPAL_NAMES.equals(property.getName()) &&
definesCug(tree);
}
- public static boolean hasNestedCug(@Nonnull Tree cugTree) {
+ public static boolean hasNestedCug(@NotNull Tree cugTree) {
return cugTree.hasProperty(CugConstants.HIDDEN_NESTED_CUGS);
}
- public static boolean isSupportedPath(@Nullable String oakPath, @Nonnull
Set<String> supportedPaths) {
+ public static boolean isSupportedPath(@Nullable String oakPath, @NotNull
Set<String> supportedPaths) {
if (oakPath == null) {
return false;
} else {
@@ -97,7 +95,7 @@ final class CugUtil implements CugConsta
return false;
}
- public static Set<String> getSupportedPaths(@Nonnull
ConfigurationParameters params, @Nonnull MountInfoProvider mountInfoProvider) {
+ public static Set<String> getSupportedPaths(@NotNull
ConfigurationParameters params, @NotNull MountInfoProvider mountInfoProvider) {
Set<String> supportedPaths =
params.getConfigValue(CugConstants.PARAM_CUG_SUPPORTED_PATHS,
ImmutableSet.of());
if (!supportedPaths.isEmpty() &&
mountInfoProvider.hasNonDefaultMounts()) {
for (Mount mount : mountInfoProvider.getNonDefaultMounts()) {
@@ -119,4 +117,4 @@ final class CugUtil implements CugConsta
String importBehaviorStr =
config.getConfigValue(ProtectedItemImporter.PARAM_IMPORT_BEHAVIOR,
ImportBehavior.NAME_ABORT);
return ImportBehavior.valueFromString(importBehaviorStr);
}
-}
\ No newline at end of file
+}
Modified:
jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugValidatorProvider.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugValidatorProvider.java?rev=1836172&r1=1836171&r2=1836172&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugValidatorProvider.java
(original)
+++
jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugValidatorProvider.java
Wed Jul 18 14:16:25 2018
@@ -16,8 +16,6 @@
*/
package org.apache.jackrabbit.oak.spi.security.authorization.cug.impl;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.JcrConstants;
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.api.PropertyState;
@@ -31,6 +29,7 @@ import org.apache.jackrabbit.oak.spi.com
import org.apache.jackrabbit.oak.spi.commit.VisibleValidator;
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.oak.api.CommitFailedException.ACCESS_CONTROL;
@@ -48,7 +47,7 @@ class CugValidatorProvider extends Valid
return new CommitFailedException(ACCESS_CONTROL, code, message);
}
- private void validateCugNode(@Nonnull NodeState parent, @Nonnull NodeState
nodeState) throws CommitFailedException {
+ private void validateCugNode(@NotNull NodeState parent, @NotNull NodeState
nodeState) throws CommitFailedException {
if
(!NT_REP_CUG_POLICY.equals(NodeStateUtils.getPrimaryTypeName(nodeState))) {
throw accessViolation(21, "Reserved name 'rep:cugPolicy' must only
be used for nodes of type 'rep:CugPolicy'.");
}
@@ -71,7 +70,7 @@ class CugValidatorProvider extends Valid
private final String parentName;
private final boolean isNodetypeTree;
- private CugValidator(@Nonnull String parentName, @Nonnull NodeState
parentAfter, boolean isNodetypeTree) {
+ private CugValidator(@NotNull String parentName, @NotNull NodeState
parentAfter, boolean isNodetypeTree) {
this.parentAfter = parentAfter;
this.parentName = parentName;
this.isNodetypeTree = isNodetypeTree;
@@ -114,4 +113,4 @@ class CugValidatorProvider extends Valid
return new VisibleValidator(new CugValidator(name, after,
isNodetypeTree(this, name)), true, true);
}
}
-}
\ No newline at end of file
+}
Modified:
jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/EmptyCugTreePermission.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/EmptyCugTreePermission.java?rev=1836172&r1=1836171&r2=1836172&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/EmptyCugTreePermission.java
(original)
+++
jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/EmptyCugTreePermission.java
Wed Jul 18 14:16:25 2018
@@ -16,11 +16,10 @@
*/
package org.apache.jackrabbit.oak.spi.security.authorization.cug.impl;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.Tree;
import org.apache.jackrabbit.oak.plugins.tree.TreeType;
+import org.jetbrains.annotations.NotNull;
/**
* Same as {@link
org.apache.jackrabbit.oak.spi.security.authorization.permission.TreePermission#EMPTY}
@@ -32,7 +31,7 @@ import org.apache.jackrabbit.oak.plugins
*/
final class EmptyCugTreePermission extends AbstractTreePermission {
- EmptyCugTreePermission(@Nonnull Tree tree, @Nonnull TreeType type,
@Nonnull CugPermissionProvider permissionProvider) {
+ EmptyCugTreePermission(@NotNull Tree tree, @NotNull TreeType type,
@NotNull CugPermissionProvider permissionProvider) {
super(tree, type, permissionProvider);
}
@@ -44,7 +43,7 @@ final class EmptyCugTreePermission exten
}
@Override
- public boolean canRead(@Nonnull PropertyState property) {
+ public boolean canRead(@NotNull PropertyState property) {
return false;
}
@@ -64,7 +63,7 @@ final class EmptyCugTreePermission exten
}
@Override
- public boolean isGranted(long permissions, @Nonnull PropertyState
property) {
+ public boolean isGranted(long permissions, @NotNull PropertyState
property) {
return false;
}
-}
\ No newline at end of file
+}
Modified:
jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/NestedCugHook.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/NestedCugHook.java?rev=1836172&r1=1836171&r2=1836172&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/NestedCugHook.java
(original)
+++
jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/NestedCugHook.java
Wed Jul 18 14:16:25 2018
@@ -18,9 +18,6 @@ package org.apache.jackrabbit.oak.spi.se
import java.util.List;
import java.util.Set;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
@@ -36,6 +33,8 @@ import org.apache.jackrabbit.oak.spi.sta
import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.apache.jackrabbit.oak.spi.state.NodeStateUtils;
import org.apache.jackrabbit.util.Text;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -61,7 +60,7 @@ class NestedCugHook implements PostValid
private Set<String> deletedCUGs = Sets.newHashSet();
//-------------------------------------------------< PostValidationHook
>---
- @Nonnull
+ @NotNull
@Override
public NodeState processCommit(NodeState before, NodeState after,
CommitInfo info) throws CommitFailedException {
NodeBuilder builder = after.builder();
@@ -78,7 +77,7 @@ class NestedCugHook implements PostValid
//------------------------------------------------------------< private
>---
- private static long addNestedCugPath(@Nonnull NodeBuilder parentBuilder,
@Nonnull NodeBuilder builder, @Nonnull String pathWithNewCug) {
+ private static long addNestedCugPath(@NotNull NodeBuilder parentBuilder,
@NotNull NodeBuilder builder, @NotNull String pathWithNewCug) {
PropertyState ps = parentBuilder.getProperty(HIDDEN_NESTED_CUGS);
PropertyBuilder<String> pb = getHiddenPropertyBuilder(ps);
if (ps != null) {
@@ -106,7 +105,7 @@ class NestedCugHook implements PostValid
return pb.count();
}
- private static int removeNestedCugPath(@Nonnull NodeBuilder parentBuilder,
@Nonnull String toRemove, @Nonnull Iterable<String> toReconnect) {
+ private static int removeNestedCugPath(@NotNull NodeBuilder parentBuilder,
@NotNull String toRemove, @NotNull Iterable<String> toReconnect) {
PropertyState ps = parentBuilder.getProperty(HIDDEN_NESTED_CUGS);
PropertyBuilder<String> pb = getHiddenPropertyBuilder(ps);
if (pb.hasValue(toRemove)) {
@@ -140,7 +139,7 @@ class NestedCugHook implements PostValid
private NodeBuilder afterBuilder;
private boolean afterHoldsCug;
- private Diff(@Nonnull NodeState rootBefore, @Nonnull NodeBuilder
rootAfter) {
+ private Diff(@NotNull NodeState rootBefore, @NotNull NodeBuilder
rootAfter) {
parentDiff = null;
isRoot = true;
path = PathUtils.ROOT_PATH;
@@ -151,7 +150,7 @@ class NestedCugHook implements PostValid
afterHoldsCug = CugUtil.hasCug(rootAfter);
}
- private Diff(@Nonnull Diff parentDiff, @Nonnull String name, @Nullable
NodeState before, @Nullable NodeBuilder after) {
+ private Diff(@NotNull Diff parentDiff, @NotNull String name, @Nullable
NodeState before, @Nullable NodeBuilder after) {
this.parentDiff = parentDiff;
isRoot = false;
path = PathUtils.concat(parentDiff.path, name);
@@ -270,4 +269,4 @@ class NestedCugHook implements PostValid
return true;
}
}
-}
\ No newline at end of file
+}
Modified:
jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/SupportedPaths.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/SupportedPaths.java?rev=1836172&r1=1836171&r2=1836172&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/SupportedPaths.java
(original)
+++
jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/SupportedPaths.java
Wed Jul 18 14:16:25 2018
@@ -17,9 +17,8 @@
package org.apache.jackrabbit.oak.spi.security.authorization.cug.impl;
import java.util.Set;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.oak.commons.PathUtils;
+import org.jetbrains.annotations.NotNull;
class SupportedPaths {
@@ -28,7 +27,7 @@ class SupportedPaths {
private final boolean includesRootPath;
- SupportedPaths(@Nonnull Set<String> supportedPaths) {
+ SupportedPaths(@NotNull Set<String> supportedPaths) {
this.supportedPaths = supportedPaths.toArray(new
String[supportedPaths.size()]);
supportedAltPaths = new String[supportedPaths.size()];
@@ -52,7 +51,7 @@ class SupportedPaths {
* @return {@code true} if the specified {@code path} is equal to or a
* descendant of one of the configured supported paths.
*/
- boolean includes(@Nonnull String path) {
+ boolean includes(@NotNull String path) {
if (supportedPaths.length == 0) {
return false;
}
@@ -82,7 +81,7 @@ class SupportedPaths {
* @return {@code true} if there exists a configured supported path that is
* a descendant of the given {@code path}.
*/
- boolean mayContainCug(@Nonnull String path) {
+ boolean mayContainCug(@NotNull String path) {
if (supportedPaths.length == 0) {
return false;
}
@@ -97,4 +96,4 @@ class SupportedPaths {
}
return false;
}
-}
\ No newline at end of file
+}
Modified:
jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/TopLevelPaths.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/TopLevelPaths.java?rev=1836172&r1=1836171&r2=1836172&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/TopLevelPaths.java
(original)
+++
jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/TopLevelPaths.java
Wed Jul 18 14:16:25 2018
@@ -16,8 +16,6 @@
*/
package org.apache.jackrabbit.oak.spi.security.authorization.cug.impl;
-import javax.annotation.Nonnull;
-
import com.google.common.collect.Iterables;
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.Root;
@@ -25,6 +23,7 @@ import org.apache.jackrabbit.oak.api.Tre
import org.apache.jackrabbit.oak.api.Type;
import org.apache.jackrabbit.oak.commons.PathUtils;
import org.apache.jackrabbit.util.Text;
+import org.jetbrains.annotations.NotNull;
/**
* Utility class to determine the top-level CUG paths as recorded on the root
@@ -53,7 +52,7 @@ class TopLevelPaths implements CugConsta
return hasAny;
}
- boolean contains(@Nonnull String path) {
+ boolean contains(@NotNull String path) {
if (!hasAny()) {
return false;
}
@@ -90,4 +89,4 @@ class TopLevelPaths implements CugConsta
}
return false;
}
-}
\ No newline at end of file
+}
Modified:
jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/package-info.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/package-info.java?rev=1836172&r1=1836171&r2=1836172&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/package-info.java
(original)
+++
jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/package-info.java
Wed Jul 18 14:16:25 2018
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-@Version("2.0.1")
+@Version("2.0.2")
package org.apache.jackrabbit.oak.spi.security.authorization.cug;
-import org.osgi.annotation.versioning.Version;
\ No newline at end of file
+import org.osgi.annotation.versioning.Version;
Modified:
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/AbstractCugTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/AbstractCugTest.java?rev=1836172&r1=1836171&r2=1836172&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/AbstractCugTest.java
(original)
+++
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/AbstractCugTest.java
Wed Jul 18 14:16:25 2018
@@ -19,7 +19,6 @@ package org.apache.jackrabbit.oak.spi.se
import java.security.Principal;
import java.util.Set;
import java.util.UUID;
-import javax.annotation.Nonnull;
import javax.jcr.RepositoryException;
import javax.jcr.SimpleCredentials;
import javax.jcr.security.AccessControlList;
@@ -51,6 +50,7 @@ import org.apache.jackrabbit.oak.spi.sec
import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeConstants;
import org.apache.jackrabbit.oak.util.NodeUtil;
import org.apache.jackrabbit.util.Text;
+import org.jetbrains.annotations.NotNull;
import static org.junit.Assert.assertTrue;
@@ -147,7 +147,7 @@ public class AbstractCugTest extends Abs
return ConfigurationParameters.of(AuthorizationConfiguration.NAME,
CUG_CONFIG);
}
- CugPermissionProvider createCugPermissionProvider(@Nonnull Set<String>
supportedPaths, @Nonnull Principal... principals) {
+ CugPermissionProvider createCugPermissionProvider(@NotNull Set<String>
supportedPaths, @NotNull Principal... principals) {
return new CugPermissionProvider(root,
root.getContentSession().getWorkspaceName(), ImmutableSet.copyOf(principals),
supportedPaths, getConfig(AuthorizationConfiguration.class).getContext(),
getRootProvider(), getTreeProvider());
}
@@ -190,7 +190,7 @@ public class AbstractCugTest extends Abs
root.commit();
}
- void createCug(@Nonnull String absPath, @Nonnull Principal principal)
throws RepositoryException {
+ void createCug(@NotNull String absPath, @NotNull Principal principal)
throws RepositoryException {
AccessControlManager acMgr = getAccessControlManager(root);
AccessControlPolicyIterator it = acMgr.getApplicablePolicies(absPath);
while (it.hasNext()) {
@@ -204,7 +204,7 @@ public class AbstractCugTest extends Abs
throw new IllegalStateException("Unable to create CUG at " + absPath);
}
- static void createCug(@Nonnull Root root, @Nonnull String path, @Nonnull
String principalName) throws RepositoryException {
+ static void createCug(@NotNull Root root, @NotNull String path, @NotNull
String principalName) throws RepositoryException {
Tree tree = root.getTree(path);
Preconditions.checkState(tree.exists());
@@ -226,7 +226,7 @@ public class AbstractCugTest extends Abs
return login(new SimpleCredentials(TEST_USER2_ID,
TEST_USER2_ID.toCharArray()));
}
- static void assertCugPermission(@Nonnull TreePermission tp, boolean
isSupportedPath) {
+ static void assertCugPermission(@NotNull TreePermission tp, boolean
isSupportedPath) {
if (isSupportedPath) {
assertTrue(tp instanceof CugTreePermission);
} else {
@@ -234,9 +234,9 @@ public class AbstractCugTest extends Abs
}
}
- static TreePermission getTreePermission(@Nonnull Root root,
- @Nonnull String path,
- @Nonnull PermissionProvider pp) {
+ static TreePermission getTreePermission(@NotNull Root root,
+ @NotNull String path,
+ @NotNull PermissionProvider pp) {
Tree t = root.getTree("/");
TreePermission tp = pp.getTreePermission(t, TreePermission.EMPTY);
for (String segm : PathUtils.elements(path)) {
@@ -245,4 +245,4 @@ public class AbstractCugTest extends Abs
}
return tp;
}
-}
\ No newline at end of file
+}
Modified:
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugAccessControlManagerTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugAccessControlManagerTest.java?rev=1836172&r1=1836171&r2=1836172&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugAccessControlManagerTest.java
(original)
+++
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugAccessControlManagerTest.java
Wed Jul 18 14:16:25 2018
@@ -21,7 +21,6 @@ import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import javax.annotation.Nonnull;
import javax.jcr.PathNotFoundException;
import javax.jcr.RepositoryException;
import javax.jcr.security.AccessControlException;
@@ -48,6 +47,7 @@ import org.apache.jackrabbit.oak.spi.sec
import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeConstants;
import org.apache.jackrabbit.oak.spi.xml.ImportBehavior;
import org.apache.jackrabbit.oak.util.NodeUtil;
+import org.jetbrains.annotations.NotNull;
import org.junit.Test;
import static org.junit.Assert.assertArrayEquals;
@@ -68,11 +68,11 @@ public class CugAccessControlManagerTest
cugAccessControlManager = new CugAccessControlManager(root,
NamePathMapper.DEFAULT, getSecurityProvider(),
ImmutableSet.copyOf(SUPPORTED_PATHS));
}
- private CugPolicy createCug(@Nonnull String path) {
+ private CugPolicy createCug(@NotNull String path) {
return new CugPolicyImpl(path, NamePathMapper.DEFAULT,
getPrincipalManager(root), ImportBehavior.ABORT);
}
- private CugPolicy getApplicableCug(@Nonnull String path) throws
RepositoryException {
+ private CugPolicy getApplicableCug(@NotNull String path) throws
RepositoryException {
return (CugPolicy)
cugAccessControlManager.getApplicablePolicies(path).nextAccessControlPolicy();
}
@@ -426,19 +426,19 @@ public class CugAccessControlManagerTest
private static final InvalidCug INSTANCE = new InvalidCug();
- @Nonnull
+ @NotNull
@Override
public Set<Principal> getPrincipals() {
return Collections.emptySet();
}
@Override
- public boolean addPrincipals(@Nonnull Principal... principals) {
+ public boolean addPrincipals(@NotNull Principal... principals) {
return false;
}
@Override
- public boolean removePrincipals(@Nonnull Principal... principals) {
+ public boolean removePrincipals(@NotNull Principal... principals) {
return false;
}
@@ -447,4 +447,4 @@ public class CugAccessControlManagerTest
return null;
}
}
-}
\ No newline at end of file
+}
Modified:
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugConfigurationTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugConfigurationTest.java?rev=1836172&r1=1836171&r2=1836172&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugConfigurationTest.java
(original)
+++
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugConfigurationTest.java
Wed Jul 18 14:16:25 2018
@@ -19,7 +19,6 @@ package org.apache.jackrabbit.oak.spi.se
import java.security.Principal;
import java.util.List;
import java.util.Set;
-import javax.annotation.Nonnull;
import javax.jcr.security.AccessControlManager;
import com.google.common.collect.ImmutableList;
@@ -40,6 +39,7 @@ import org.apache.jackrabbit.oak.spi.sec
import org.apache.jackrabbit.oak.spi.security.principal.SystemPrincipal;
import org.apache.jackrabbit.oak.spi.security.principal.SystemUserPrincipal;
import org.apache.jackrabbit.oak.spi.xml.ProtectedItemImporter;
+import org.jetbrains.annotations.NotNull;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
@@ -217,7 +217,7 @@ public class CugConfigurationTest extend
assertSupportedPaths(cugConfiguration, "/changed");
}
- private static void assertSupportedPaths(@Nonnull CugConfiguration
configuration, @Nonnull String... paths) throws Exception {
+ private static void assertSupportedPaths(@NotNull CugConfiguration
configuration, @NotNull String... paths) throws Exception {
Set<String> expected = ImmutableSet.copyOf(paths);
assertEquals(expected,
configuration.getParameters().getConfigValue(CugConstants.PARAM_CUG_SUPPORTED_PATHS,
ImmutableSet.of()));
}
Modified:
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugExcludeImplTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugExcludeImplTest.java?rev=1836172&r1=1836171&r2=1836172&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugExcludeImplTest.java
(original)
+++
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugExcludeImplTest.java
Wed Jul 18 14:16:25 2018
@@ -22,12 +22,11 @@ import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-import javax.annotation.Nonnull;
-
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
import org.apache.jackrabbit.oak.spi.security.authorization.cug.CugExclude;
import org.apache.jackrabbit.oak.spi.security.principal.PrincipalImpl;
+import org.jetbrains.annotations.NotNull;
import org.junit.Test;
import static org.junit.Assert.assertFalse;
@@ -43,7 +42,7 @@ public class CugExcludeImplTest extends
return new CugExcludeImpl();
}
- private void activate(@Nonnull Map<String, Object> map) {
+ private void activate(@NotNull Map<String, Object> map) {
((CugExcludeImpl) exclude).activate(map);
}
@@ -92,4 +91,4 @@ public class CugExcludeImplTest extends
}
assertTrue(exclude.isExcluded(ImmutableSet.<Principal>of(new
PrincipalImpl("other"))));
}
-}
\ No newline at end of file
+}
Modified:
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugImportBaseTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugImportBaseTest.java?rev=1836172&r1=1836171&r2=1836172&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugImportBaseTest.java
(original)
+++
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugImportBaseTest.java
Wed Jul 18 14:16:25 2018
@@ -19,8 +19,6 @@ package org.apache.jackrabbit.oak.spi.se
import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.util.Set;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import javax.jcr.ImportUUIDBehavior;
import javax.jcr.Node;
import javax.jcr.Repository;
@@ -48,6 +46,8 @@ import org.apache.jackrabbit.oak.spi.sec
import org.apache.jackrabbit.oak.spi.security.principal.PrincipalImpl;
import org.apache.jackrabbit.oak.spi.security.user.UserConstants;
import org.apache.jackrabbit.oak.spi.xml.ProtectedItemImporter;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -140,7 +140,7 @@ public abstract class CugImportBaseTest
}
}
- @Nonnull
+ @NotNull
private ConfigurationParameters getConfigurationParameters() {
String importBehavior = getImportBehavior();
if (importBehavior != null) {
@@ -189,7 +189,7 @@ public abstract class CugImportBaseTest
}
}
- static void assertPrincipalNames(@Nonnull Set<String>
expectedPrincipalNames, @Nonnull Value[] principalNames) {
+ static void assertPrincipalNames(@NotNull Set<String>
expectedPrincipalNames, @NotNull Value[] principalNames) {
assertEquals(expectedPrincipalNames.size(), principalNames.length);
Set<String> result =
ImmutableSet.copyOf(Iterables.transform(ImmutableSet.copyOf(principalNames),
new Function<Value, String>() {
@Nullable
@@ -340,4 +340,4 @@ public abstract class CugImportBaseTest
assertTrue(getImportSession().getRootNode().hasNode("child"));
assertFalse(getImportSession().getRootNode().hasNode("child/rep:cugPolicy"));
}
-}
\ No newline at end of file
+}
Modified:
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugPermissionProviderTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugPermissionProviderTest.java?rev=1836172&r1=1836171&r2=1836172&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugPermissionProviderTest.java
(original)
+++
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugPermissionProviderTest.java
Wed Jul 18 14:16:25 2018
@@ -21,7 +21,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import javax.annotation.Nonnull;
import javax.jcr.AccessDeniedException;
import javax.jcr.GuestCredentials;
import javax.jcr.Session;
@@ -43,6 +42,7 @@ 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.util.NodeUtil;
+import org.jetbrains.annotations.NotNull;
import org.junit.Before;
import org.junit.Test;
@@ -158,7 +158,7 @@ public class CugPermissionProviderTest e
}
}
- private static void assertPrivilegeBits(@Nonnull PrivilegeBits expected,
@Nonnull PrivilegeBits toTest) {
+ private static void assertPrivilegeBits(@NotNull PrivilegeBits expected,
@NotNull PrivilegeBits toTest) {
assertEquals(expected, toTest.unmodifiable());
}
@@ -625,4 +625,4 @@ public class CugPermissionProviderTest e
assertFalse(cugPermProvider.isGranted(p, Session.ACTION_ADD_NODE));
assertFalse(cugPermProvider.isGranted(p, Session.ACTION_READ + ',' +
Session.ACTION_ADD_NODE));
}
-}
\ No newline at end of file
+}
Modified:
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugPolicyImplTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugPolicyImplTest.java?rev=1836172&r1=1836171&r2=1836172&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugPolicyImplTest.java
(original)
+++
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugPolicyImplTest.java
Wed Jul 18 14:16:25 2018
@@ -19,7 +19,6 @@ package org.apache.jackrabbit.oak.spi.se
import java.security.Principal;
import java.util.Iterator;
import java.util.Set;
-import javax.annotation.Nonnull;
import javax.jcr.security.AccessControlException;
import com.google.common.collect.ImmutableMap;
@@ -34,6 +33,7 @@ import org.apache.jackrabbit.oak.spi.sec
import org.apache.jackrabbit.oak.spi.security.principal.EveryonePrincipal;
import org.apache.jackrabbit.oak.spi.security.principal.PrincipalImpl;
import org.apache.jackrabbit.oak.spi.xml.ImportBehavior;
+import org.jetbrains.annotations.NotNull;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
@@ -59,7 +59,7 @@ public class CugPolicyImplTest extends A
return new CugPolicyImpl(path, NamePathMapper.DEFAULT,
principalManager, ImportBehavior.ABORT);
}
- private CugPolicyImpl createCugPolicy(@Nonnull Set<Principal> principals) {
+ private CugPolicyImpl createCugPolicy(@NotNull Set<Principal> principals) {
return new CugPolicyImpl(path, NamePathMapper.DEFAULT,
principalManager, ImportBehavior.ABORT, principals);
}
@@ -218,4 +218,4 @@ public class CugPolicyImplTest extends A
public void testInvalidImportBehavior() {
CugPolicy cug = new CugPolicyImpl(path, NamePathMapper.DEFAULT,
principalManager, -1, principals);
}
-}
\ No newline at end of file
+}
