You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by re...@apache.org on 2018/11/07 13:38:36 UTC
svn commit: r1846009 [2/2] - in /jackrabbit/oak/branches/1.8: ./
oak-authorization-cug/
oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/
oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/secu...
Modified: jackrabbit/oak/branches/1.8/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/branches/1.8/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugPolicyImplTest.java?rev=1846009&r1=1846008&r2=1846009&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugPolicyImplTest.java (original)
+++ jackrabbit/oak/branches/1.8/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugPolicyImplTest.java Wed Nov 7 13:38:35 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
+}
Modified: jackrabbit/oak/branches/1.8/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugSecurityProvider.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugSecurityProvider.java?rev=1846009&r1=1846008&r2=1846009&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugSecurityProvider.java (original)
+++ jackrabbit/oak/branches/1.8/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugSecurityProvider.java Wed Nov 7 13:38:35 2018
@@ -16,19 +16,18 @@
*/
package org.apache.jackrabbit.oak.spi.security.authorization.cug.impl;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.oak.security.authorization.composite.CompositeAuthorizationConfiguration;
import org.apache.jackrabbit.oak.security.internal.SecurityProviderBuilder;
import org.apache.jackrabbit.oak.spi.security.ConfigurationParameters;
import org.apache.jackrabbit.oak.spi.security.SecurityProvider;
import org.apache.jackrabbit.oak.spi.security.authorization.AuthorizationConfiguration;
+import org.jetbrains.annotations.NotNull;
final class CugSecurityProvider {
private CugSecurityProvider() {}
- public static SecurityProvider newTestSecurityProvider(@Nonnull ConfigurationParameters configuration) {
+ public static SecurityProvider newTestSecurityProvider(@NotNull ConfigurationParameters configuration) {
CugConfiguration cugConfiguration = new CugConfiguration();
ConfigurationParameters params = configuration.getConfigValue(AuthorizationConfiguration.NAME, ConfigurationParameters.EMPTY);
@@ -37,7 +36,7 @@ final class CugSecurityProvider {
return new SecurityProviderBuilder().with(configuration).with(cugConfiguration, AuthorizationConfiguration.class).build();
}
- public static CugConfiguration getCugConfiguration(@Nonnull SecurityProvider securityProvider) {
+ public static CugConfiguration getCugConfiguration(@NotNull SecurityProvider securityProvider) {
AuthorizationConfiguration ac = securityProvider.getConfiguration(AuthorizationConfiguration.class);
if (!(ac instanceof CompositeAuthorizationConfiguration)) {
throw new IllegalStateException();
@@ -49,4 +48,4 @@ final class CugSecurityProvider {
}
throw new IllegalStateException();
}
-}
\ No newline at end of file
+}
Modified: jackrabbit/oak/branches/1.8/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugTreePermissionTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugTreePermissionTest.java?rev=1846009&r1=1846008&r2=1846009&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugTreePermissionTest.java (original)
+++ jackrabbit/oak/branches/1.8/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugTreePermissionTest.java Wed Nov 7 13:38:35 2018
@@ -17,8 +17,6 @@
package org.apache.jackrabbit.oak.spi.security.authorization.cug.impl;
import java.security.Principal;
-import javax.annotation.Nonnull;
-
import com.google.common.collect.ImmutableSet;
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.Tree;
@@ -30,6 +28,7 @@ import org.apache.jackrabbit.oak.spi.sec
import org.apache.jackrabbit.oak.spi.security.principal.EveryonePrincipal;
import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.apache.jackrabbit.oak.util.NodeUtil;
+import org.jetbrains.annotations.NotNull;
import org.junit.Test;
import static org.junit.Assert.assertFalse;
@@ -52,11 +51,11 @@ public class CugTreePermissionTest exten
deniedTp = getCugTreePermission();
}
- private CugTreePermission getCugTreePermission(@Nonnull Principal... principals) {
+ private CugTreePermission getCugTreePermission(@NotNull Principal... principals) {
return getCugTreePermission(SUPPORTED_PATH, principals);
}
- private CugTreePermission getCugTreePermission(@Nonnull String path, @Nonnull Principal... principals) {
+ private CugTreePermission getCugTreePermission(@NotNull String path, @NotNull Principal... principals) {
CugPermissionProvider pp = createCugPermissionProvider(ImmutableSet.copyOf(SUPPORTED_PATHS), principals);
TreePermission targetTp = getTreePermission(root, path, pp);
assertTrue(targetTp instanceof CugTreePermission);
@@ -224,4 +223,4 @@ public class CugTreePermissionTest exten
assertFalse(deniedTp.isGranted(Permissions.WRITE, ps));
assertFalse(deniedTp.isGranted(Permissions.READ_PROPERTY, ps));
}
-}
\ No newline at end of file
+}
Modified: jackrabbit/oak/branches/1.8/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugUtilTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugUtilTest.java?rev=1846009&r1=1846008&r2=1846009&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugUtilTest.java (original)
+++ jackrabbit/oak/branches/1.8/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugUtilTest.java Wed Nov 7 13:38:35 2018
@@ -17,8 +17,6 @@
package org.apache.jackrabbit.oak.spi.security.authorization.cug.impl;
import java.util.Set;
-import javax.annotation.Nonnull;
-
import com.google.common.collect.ImmutableSet;
import org.apache.jackrabbit.oak.api.Tree;
import org.apache.jackrabbit.oak.commons.PathUtils;
@@ -32,6 +30,7 @@ import org.apache.jackrabbit.oak.spi.sta
import org.apache.jackrabbit.oak.spi.state.NodeState;
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.assertEquals;
@@ -60,8 +59,8 @@ public class CugUtilTest extends Abstrac
}
}
- @Nonnull
- private static NodeState getNodeState(@Nonnull Tree tree) {
+ @NotNull
+ private static NodeState getNodeState(@NotNull Tree tree) {
return ((AbstractTree) tree).getNodeState();
}
@@ -187,4 +186,4 @@ public class CugUtilTest extends Abstrac
public void testGetImportBehavior() {
assertSame(ImportBehavior.ABORT, CugUtil.getImportBehavior(ConfigurationParameters.EMPTY));
}
-}
\ No newline at end of file
+}
Modified: jackrabbit/oak/branches/1.8/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugValidatorTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugValidatorTest.java?rev=1846009&r1=1846008&r2=1846009&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugValidatorTest.java (original)
+++ jackrabbit/oak/branches/1.8/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugValidatorTest.java Wed Nov 7 13:38:35 2018
@@ -16,8 +16,6 @@
*/
package org.apache.jackrabbit.oak.spi.security.authorization.cug.impl;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
import javax.jcr.nodetype.NodeDefinitionTemplate;
import javax.jcr.nodetype.NodeTypeTemplate;
@@ -29,6 +27,8 @@ import org.apache.jackrabbit.oak.spi.nod
import org.apache.jackrabbit.oak.plugins.nodetype.write.ReadWriteNodeTypeManager;
import org.apache.jackrabbit.oak.spi.security.principal.EveryonePrincipal;
import org.apache.jackrabbit.oak.util.NodeUtil;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
@@ -147,13 +147,13 @@ public class CugValidatorTest extends Ab
@Test
public void testNodeTypeWithCugNames() throws Exception {
ReadWriteNodeTypeManager ntMgr = new ReadWriteNodeTypeManager() {
- @Nonnull
+ @NotNull
@Override
protected Root getWriteRoot() {
return root;
}
- @CheckForNull
+ @Nullable
@Override
protected Tree getTypes() {
return root.getTree(NODE_TYPES_PATH);
@@ -167,4 +167,4 @@ public class CugValidatorTest extends Ab
ntTemplate.getNodeDefinitionTemplates().add(ndt);
ntMgr.registerNodeType(ntTemplate, true);
}
-}
\ No newline at end of file
+}
Modified: jackrabbit/oak/branches/1.8/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/NestedCugHookTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/NestedCugHookTest.java?rev=1846009&r1=1846008&r2=1846009&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/NestedCugHookTest.java (original)
+++ jackrabbit/oak/branches/1.8/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/NestedCugHookTest.java Wed Nov 7 13:38:35 2018
@@ -17,7 +17,6 @@
package org.apache.jackrabbit.oak.spi.security.authorization.cug.impl;
import java.util.Set;
-import javax.annotation.Nonnull;
import javax.jcr.security.AccessControlManager;
import javax.jcr.security.AccessControlPolicy;
@@ -31,6 +30,7 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.plugins.tree.TreeUtil;
import org.apache.jackrabbit.oak.spi.security.authorization.cug.CugPolicy;
import org.apache.jackrabbit.oak.spi.security.principal.EveryonePrincipal;
+import org.jetbrains.annotations.NotNull;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
@@ -41,8 +41,8 @@ import static org.apache.jackrabbit.oak.
public class NestedCugHookTest extends AbstractCugTest {
- protected static void assertNestedCugs(@Nonnull Root root, @Nonnull RootProvider rootProvider,
- @Nonnull String cugHoldingPath, boolean hasCugPolicy, @Nonnull String... expectedNestedPaths) {
+ protected static void assertNestedCugs(@NotNull Root root, @NotNull RootProvider rootProvider,
+ @NotNull String cugHoldingPath, boolean hasCugPolicy, @NotNull String... expectedNestedPaths) {
Root immutableRoot = rootProvider.createReadOnlyRoot(root);
Tree tree = immutableRoot.getTree(cugHoldingPath);
@@ -77,7 +77,7 @@ public class NestedCugHookTest extends A
}
}
- protected boolean removeCug(@Nonnull String path, boolean doCommit) throws Exception {
+ protected boolean removeCug(@NotNull String path, boolean doCommit) throws Exception {
AccessControlManager acMgr = getAccessControlManager(root);
for (AccessControlPolicy policy : acMgr.getPolicies(path)) {
if (policy instanceof CugPolicy) {
@@ -371,4 +371,4 @@ public class NestedCugHookTest extends A
assertNestedCugs(root, getRootProvider(), SUPPORTED_PATH3, true);
assertNestedCugs(root, getRootProvider(), SUPPORTED_PATH2, true, destPath);
}
-}
\ No newline at end of file
+}
Modified: jackrabbit/oak/branches/1.8/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/VersionTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/VersionTest.java?rev=1846009&r1=1846008&r2=1846009&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/VersionTest.java (original)
+++ jackrabbit/oak/branches/1.8/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/VersionTest.java Wed Nov 7 13:38:35 2018
@@ -18,8 +18,6 @@ package org.apache.jackrabbit.oak.spi.se
import java.util.ArrayList;
import java.util.List;
-import javax.annotation.Nonnull;
-
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Iterables;
@@ -40,6 +38,7 @@ import org.apache.jackrabbit.oak.spi.sec
import org.apache.jackrabbit.oak.spi.security.authorization.permission.TreePermission;
import org.apache.jackrabbit.oak.spi.security.principal.EveryonePrincipal;
import org.apache.jackrabbit.oak.plugins.tree.TreeUtil;
+import org.jetbrains.annotations.NotNull;
import org.junit.Before;
import org.junit.Test;
@@ -109,7 +108,7 @@ public class VersionTest extends Abstrac
}
}
- private Tree addVersionContent(@Nonnull String path) throws Exception {
+ private Tree addVersionContent(@NotNull String path) throws Exception {
Tree t = root.getTree(path);
Tree typesRoot = root.getTree(NodeTypeConstants.NODE_TYPES_PATH);
@@ -403,4 +402,4 @@ public class VersionTest extends Abstrac
assertTrue(((CugTreePermission) tp).isInCug());
assertTrue(((CugTreePermission) tp).isAllow());
}
-}
\ No newline at end of file
+}