Modified: jackrabbit/oak/trunk/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/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugSecurityProvider.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/CugSecurityProvider.java (original) +++ jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugSecurityProvider.java Wed Jul 18 14:16:25 2018 @@ -16,20 +16,19 @@ */ 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.security.internal.SecurityProviderHelper; 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); @@ -40,7 +39,7 @@ final class CugSecurityProvider { return sp; } - 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(); @@ -52,4 +51,4 @@ final class CugSecurityProvider { } throw new IllegalStateException(); } -} \ 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/CugTreePermissionTest.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/CugTreePermissionTest.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/CugTreePermissionTest.java (original) +++ jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugTreePermissionTest.java Wed Jul 18 14:16:25 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; @@ -31,6 +29,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; @@ -53,11 +52,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); @@ -226,4 +225,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/trunk/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/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugUtilTest.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/CugUtilTest.java (original) +++ jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugUtilTest.java Wed Jul 18 14:16:25 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; @@ -33,6 +31,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; @@ -61,8 +60,8 @@ public class CugUtilTest extends Abstrac } } - @Nonnull - private NodeState getNodeState(@Nonnull Tree tree) { + @NotNull + private NodeState getNodeState(@NotNull Tree tree) { return getTreeProvider().asNodeState(tree); } @@ -188,4 +187,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/trunk/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/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugValidatorTest.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/CugValidatorTest.java (original) +++ jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugValidatorTest.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.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/trunk/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/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/NestedCugHookTest.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/NestedCugHookTest.java (original) +++ jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/NestedCugHookTest.java Wed Jul 18 14:16:25 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/trunk/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/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/VersionTest.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/VersionTest.java (original) +++ jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/VersionTest.java Wed Jul 18 14:16:25 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 +}
