Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/evaluation/VersionStorageTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/evaluation/VersionStorageTest.java?rev=1836177&r1=1836176&r2=1836177&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/evaluation/VersionStorageTest.java (original) +++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/evaluation/VersionStorageTest.java Wed Jul 18 14:37:06 2018 @@ -16,7 +16,6 @@ */ package org.apache.jackrabbit.oak.security.authorization.evaluation; -import javax.annotation.Nonnull; import javax.jcr.security.AccessControlEntry; import javax.jcr.security.AccessControlManager; @@ -30,6 +29,7 @@ import org.apache.jackrabbit.oak.plugins import org.apache.jackrabbit.oak.spi.version.VersionConstants; import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeConstants; import org.apache.jackrabbit.oak.plugins.tree.TreeUtil; +import org.jetbrains.annotations.NotNull; import org.junit.Test; import static org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants.NODE_TYPES_PATH; @@ -64,19 +64,19 @@ public class VersionStorageTest extends private String getVersionHistoryPath(String vUUID, final Tree vs) { ReadOnlyVersionManager vMgr = new ReadOnlyVersionManager() { - @Nonnull + @NotNull @Override protected Tree getVersionStorage() { return vs; } - @Nonnull + @NotNull @Override protected Root getWorkspaceRoot() { return root; } - @Nonnull + @NotNull @Override protected ReadOnlyNodeTypeManager getNodeTypeManager() { throw new UnsupportedOperationException(); @@ -138,4 +138,4 @@ public class VersionStorageTest extends Tree vs = getTestRoot().getTree(VersionConstants.VERSION_STORE_PATH); vs.getChildrenCount(Long.MAX_VALUE); } -} \ No newline at end of file +}
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/AbstractPermissionRandomTestIT.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/AbstractPermissionRandomTestIT.java?rev=1836177&r1=1836176&r2=1836177&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/AbstractPermissionRandomTestIT.java (original) +++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/AbstractPermissionRandomTestIT.java Wed Jul 18 14:37:06 2018 @@ -30,7 +30,6 @@ import java.util.Random; import java.util.Set; import java.util.UUID; -import javax.annotation.Nonnull; import javax.jcr.Session; import javax.jcr.security.AccessControlManager; @@ -49,6 +48,7 @@ import org.apache.jackrabbit.oak.spi.sec import org.apache.jackrabbit.oak.spi.security.authorization.permission.Permissions; import org.apache.jackrabbit.oak.spi.security.authorization.permission.RepositoryPermission; import org.apache.jackrabbit.oak.spi.security.authorization.permission.TreePermission; +import org.jetbrains.annotations.NotNull; import org.junit.Test; import com.google.common.collect.ImmutableSet; @@ -108,8 +108,8 @@ public abstract class AbstractPermission return ConfigurationParameters.EMPTY; } - protected PermissionProvider candidatePermissionProvider(@Nonnull Root root, @Nonnull String workspaceName, - @Nonnull Set<Principal> principals) { + protected PermissionProvider candidatePermissionProvider(@NotNull Root root, @NotNull String workspaceName, + @NotNull Set<Principal> principals) { return new SetsPP(allowU, denyU, allowG, denyG); } @@ -324,4 +324,4 @@ public abstract class AbstractPermission return res; } } -} \ No newline at end of file +} Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/MountPermissionProviderRandomTestIT.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/MountPermissionProviderRandomTestIT.java?rev=1836177&r1=1836176&r2=1836177&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/MountPermissionProviderRandomTestIT.java (original) +++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/MountPermissionProviderRandomTestIT.java Wed Jul 18 14:37:06 2018 @@ -18,8 +18,6 @@ package org.apache.jackrabbit.oak.securi import java.security.Principal; import java.util.Set; -import javax.annotation.Nonnull; - import com.google.common.collect.Iterators; import org.apache.jackrabbit.oak.api.Root; import org.apache.jackrabbit.oak.security.internal.SecurityProviderBuilder; @@ -28,6 +26,7 @@ import org.apache.jackrabbit.oak.spi.mou import org.apache.jackrabbit.oak.spi.security.SecurityProvider; import org.apache.jackrabbit.oak.spi.security.authorization.AuthorizationConfiguration; import org.apache.jackrabbit.oak.spi.security.authorization.permission.PermissionProvider; +import org.jetbrains.annotations.NotNull; import org.junit.Assert; public class MountPermissionProviderRandomTestIT extends AbstractPermissionRandomTestIT { @@ -49,8 +48,8 @@ public class MountPermissionProviderRand } @Override - protected PermissionProvider candidatePermissionProvider(@Nonnull Root root, @Nonnull String workspaceName, - @Nonnull Set<Principal> principals) { + protected PermissionProvider candidatePermissionProvider(@NotNull Root root, @NotNull String workspaceName, + @NotNull Set<Principal> principals) { SecurityProvider sp = SecurityProviderBuilder.newBuilder().build(); AuthorizationConfiguration acConfig = MountUtils.bindMountInfoProvider(sp, mountInfoProvider); PermissionProvider composite = acConfig.getPermissionProvider(root, workspaceName, principals); @@ -58,4 +57,4 @@ public class MountPermissionProviderRand return composite; } -} \ No newline at end of file +} Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/MountUtils.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/MountUtils.java?rev=1836177&r1=1836176&r2=1836177&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/MountUtils.java (original) +++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/MountUtils.java Wed Jul 18 14:37:06 2018 @@ -16,24 +16,23 @@ */ package org.apache.jackrabbit.oak.security.authorization.permission; -import javax.annotation.Nonnull; - import org.apache.jackrabbit.oak.security.authorization.AuthorizationConfigurationImpl; import org.apache.jackrabbit.oak.security.authorization.composite.CompositeAuthorizationConfiguration; import org.apache.jackrabbit.oak.spi.mount.MountInfoProvider; import org.apache.jackrabbit.oak.spi.security.SecurityProvider; import org.apache.jackrabbit.oak.spi.security.authorization.AuthorizationConfiguration; +import org.jetbrains.annotations.NotNull; import org.junit.Assert; final class MountUtils { private MountUtils() {} - static AuthorizationConfiguration bindMountInfoProvider(@Nonnull SecurityProvider securityProvider, @Nonnull MountInfoProvider mountInfoProvider) { + static AuthorizationConfiguration bindMountInfoProvider(@NotNull SecurityProvider securityProvider, @NotNull MountInfoProvider mountInfoProvider) { AuthorizationConfiguration acConfig = securityProvider.getConfiguration(AuthorizationConfiguration.class); Assert.assertTrue(acConfig instanceof CompositeAuthorizationConfiguration); ((AuthorizationConfigurationImpl) ((CompositeAuthorizationConfiguration) acConfig).getDefaultConfig()) .bindMountInfoProvider(mountInfoProvider); return acConfig; } -} \ No newline at end of file +} Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionEntryCacheTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionEntryCacheTest.java?rev=1836177&r1=1836176&r2=1836177&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionEntryCacheTest.java (original) +++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionEntryCacheTest.java Wed Jul 18 14:37:06 2018 @@ -20,11 +20,10 @@ import java.lang.reflect.Field; import java.util.Collection; import java.util.Map; import java.util.TreeSet; -import javax.annotation.Nonnull; - import com.google.common.collect.Sets; import org.apache.jackrabbit.oak.spi.security.authorization.restriction.RestrictionPattern; import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeBits; +import org.jetbrains.annotations.NotNull; import org.junit.Before; import org.junit.Test; import org.mockito.Mockito; @@ -204,15 +203,15 @@ public class PermissionEntryCacheTest { assertSame(ppeA, entries); } - private static PrincipalPermissionEntries inspectEntries(@Nonnull PermissionEntryCache cache, @Nonnull String principalName) throws Exception { + private static PrincipalPermissionEntries inspectEntries(@NotNull PermissionEntryCache cache, @NotNull String principalName) throws Exception { Map<String, PrincipalPermissionEntries> entries = inspectEntries(cache); return entries.get(principalName); } - private static Map<String, PrincipalPermissionEntries> inspectEntries(@Nonnull PermissionEntryCache cache) throws Exception { + private static Map<String, PrincipalPermissionEntries> inspectEntries(@NotNull PermissionEntryCache cache) throws Exception { Field f = PermissionEntryCache.class.getDeclaredField("entries"); f.setAccessible(true); return (Map<String, PrincipalPermissionEntries>) f.get(cache); } -} \ No newline at end of file +} Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionEntryProviderImplTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionEntryProviderImplTest.java?rev=1836177&r1=1836176&r2=1836177&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionEntryProviderImplTest.java (original) +++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionEntryProviderImplTest.java Wed Jul 18 14:37:06 2018 @@ -20,13 +20,12 @@ import java.lang.reflect.Field; import java.util.Collection; import java.util.Collections; import java.util.Set; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; - import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; import org.apache.jackrabbit.oak.api.Root; import org.apache.jackrabbit.oak.spi.security.ConfigurationParameters; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.junit.Test; import static org.junit.Assert.assertFalse; @@ -117,7 +116,7 @@ public class PermissionEntryProviderImpl * @return the existingNames set. * @throws Exception */ - private static boolean getNoExistingNames(@Nonnull PermissionEntryProviderImpl provider) throws Exception { + private static boolean getNoExistingNames(@NotNull PermissionEntryProviderImpl provider) throws Exception { Field noExistingNamesField = provider.getClass().getDeclaredField("noExistingNames"); noExistingNamesField.setAccessible(true); return (boolean) noExistingNamesField.get(provider); @@ -126,23 +125,23 @@ public class PermissionEntryProviderImpl // Inner Classes private class MockPermissionStore implements PermissionStore { - @CheckForNull + @Nullable @Override public Collection<PermissionEntry> load( - @Nonnull String principalName, - @Nonnull String path) { + @NotNull String principalName, + @NotNull String path) { return null; } - @Nonnull + @NotNull @Override - public PrincipalPermissionEntries load(@Nonnull String principalName) { + public PrincipalPermissionEntries load(@NotNull String principalName) { return new PrincipalPermissionEntries(); } - @Nonnull + @NotNull @Override - public NumEntries getNumEntries(@Nonnull String principalName, long max) { + public NumEntries getNumEntries(@NotNull String principalName, long max) { long cnt = 0; switch (principalName) { case GROUP_LONG_MAX_MINUS_10: @@ -158,7 +157,7 @@ public class PermissionEntryProviderImpl return NumEntries.valueOf(cnt, true); } - public void flush(@Nonnull Root root) { + public void flush(@NotNull Root root) { } } } Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionHookTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionHookTest.java?rev=1836177&r1=1836176&r2=1836177&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionHookTest.java (original) +++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionHookTest.java Wed Jul 18 14:37:06 2018 @@ -21,8 +21,6 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; import java.util.Set; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; import javax.jcr.RepositoryException; import javax.jcr.security.AccessControlEntry; import javax.jcr.security.AccessControlManager; @@ -50,6 +48,8 @@ import org.apache.jackrabbit.oak.spi.sec import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeBitsProvider; import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeConstants; import org.apache.jackrabbit.oak.util.NodeUtil; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -110,18 +110,18 @@ public class PermissionHookTest extends } } - private void addACE(@Nonnull String path, @Nonnull Principal principal, @Nonnull String... privilegeNames) throws RepositoryException { + private void addACE(@NotNull String path, @NotNull Principal principal, @NotNull String... privilegeNames) throws RepositoryException { AccessControlManager acMgr = getAccessControlManager(root); JackrabbitAccessControlList acl = AccessControlUtils.getAccessControlList(acMgr, path); acl.addAccessControlEntry(principal, privilegesFromNames(privilegeNames)); acMgr.setPolicy(path, acl); } - protected Tree getPrincipalRoot(@Nonnull Principal principal) { + protected Tree getPrincipalRoot(@NotNull Principal principal) { return root.getTree(PERMISSIONS_STORE_PATH).getChild(adminSession.getWorkspaceName()).getChild(principal.getName()); } - protected Tree getEntry(@Nonnull Principal principal, String accessControlledPath, long index) throws Exception { + protected Tree getEntry(@NotNull Principal principal, String accessControlledPath, long index) throws Exception { Tree principalRoot = getPrincipalRoot(principal); Tree parent = principalRoot.getChild(PermissionUtil.getEntryName(accessControlledPath)); Tree entry = parent.getChild(String.valueOf(index)); @@ -688,8 +688,8 @@ public class PermissionHookTest extends } } - @Nonnull - private static Set<String> getAccessControlledPaths(@Nonnull Tree principalTree) { + @NotNull + private static Set<String> getAccessControlledPaths(@NotNull Tree principalTree) { Set<String> s = Sets.newHashSet(); for (Tree tree : principalTree.getChildren()) { String path = getAccessControlledPath(tree); @@ -708,16 +708,16 @@ public class PermissionHookTest extends return s; } - @CheckForNull - private static String getAccessControlledPath(@Nonnull Tree t) { + @Nullable + private static String getAccessControlledPath(@NotNull Tree t) { PropertyState pathProp = t.getProperty(REP_ACCESS_CONTROLLED_PATH); return (pathProp == null) ? null : pathProp.getValue(Type.STRING); } - private static void assertNumPermissionsProperty(long expectedValue, @Nonnull Tree parent) { + private static void assertNumPermissionsProperty(long expectedValue, @NotNull Tree parent) { PropertyState p = parent.getProperty(REP_NUM_PERMISSIONS); assertNotNull(p); assertEquals(expectedValue, p.getValue(Type.LONG).longValue()); } -} \ No newline at end of file +} Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionStoreImplTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionStoreImplTest.java?rev=1836177&r1=1836176&r2=1836177&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionStoreImplTest.java (original) +++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionStoreImplTest.java Wed Jul 18 14:37:06 2018 @@ -19,8 +19,6 @@ package org.apache.jackrabbit.oak.securi import java.lang.reflect.Method; import java.security.Principal; import java.util.Collection; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; import javax.jcr.RepositoryException; import javax.jcr.security.AccessControlManager; @@ -35,6 +33,8 @@ import org.apache.jackrabbit.oak.spi.sec import org.apache.jackrabbit.oak.spi.security.principal.EveryonePrincipal; import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeConstants; import org.apache.jackrabbit.oak.util.NodeUtil; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -70,7 +70,7 @@ public class PermissionStoreImplTest ext permissionStore = new PermissionStoreImpl(root, root.getContentSession().getWorkspaceName(), getConfig(AuthorizationConfiguration.class).getRestrictionProvider()); } - private void addAcl(@Nonnull String path, @Nonnull Principal principal) throws RepositoryException { + private void addAcl(@NotNull String path, @NotNull Principal principal) throws RepositoryException { AccessControlManager acMgr = getAccessControlManager(root); JackrabbitAccessControlList acl = AccessControlUtils.getAccessControlList(acMgr, path); acl.addAccessControlEntry(EveryonePrincipal.getInstance(), privilegesFromNames(PrivilegeConstants.JCR_READ)); @@ -183,11 +183,11 @@ public class PermissionStoreImplTest ext } } - @CheckForNull - private Tree getPermissionRoot(@Nonnull String principalName) throws Exception { + @Nullable + private Tree getPermissionRoot(@NotNull String principalName) throws Exception { Method m = PermissionStoreImpl.class.getDeclaredMethod("getPrincipalRoot", String.class); m.setAccessible(true); return (Tree) m.invoke(permissionStore, principalName); } -} \ No newline at end of file +} Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/PrincipalPermissionEntriesTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/PrincipalPermissionEntriesTest.java?rev=1836177&r1=1836176&r2=1836177&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/PrincipalPermissionEntriesTest.java (original) +++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/PrincipalPermissionEntriesTest.java Wed Jul 18 14:37:06 2018 @@ -19,12 +19,11 @@ package org.apache.jackrabbit.oak.securi import java.lang.reflect.Field; import java.util.Collection; import java.util.Map; -import javax.annotation.Nonnull; - import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import org.apache.jackrabbit.oak.spi.security.authorization.restriction.RestrictionPattern; import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeBits; +import org.jetbrains.annotations.NotNull; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -157,7 +156,7 @@ public class PrincipalPermissionEntriesT assertNull(ppe.getEntriesByPath("/nonExisting")); } - private static final long inspectExpectedSize(@Nonnull PrincipalPermissionEntries ppe) throws Exception { + private static final long inspectExpectedSize(@NotNull PrincipalPermissionEntries ppe) throws Exception { Field f = PrincipalPermissionEntries.class.getDeclaredField("expectedSize"); f.setAccessible(true); Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/RepoPolicyTreePermissionTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/RepoPolicyTreePermissionTest.java?rev=1836177&r1=1836176&r2=1836177&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/RepoPolicyTreePermissionTest.java (original) +++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/RepoPolicyTreePermissionTest.java Wed Jul 18 14:37:06 2018 @@ -18,7 +18,6 @@ package org.apache.jackrabbit.oak.securi import java.security.Principal; import java.security.PrivilegedAction; -import javax.annotation.Nonnull; import javax.jcr.security.AccessControlManager; import javax.security.auth.Subject; @@ -41,6 +40,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.spi.security.privilege.PrivilegeConstants; +import org.jetbrains.annotations.NotNull; import org.junit.Test; import static org.junit.Assert.assertFalse; @@ -102,8 +102,8 @@ public class RepoPolicyTreePermissionTes } } - @Nonnull - private TreePermission getTreePermission(@Nonnull ContentSession cs, @Nonnull String path) throws Exception { + @NotNull + private TreePermission getTreePermission(@NotNull ContentSession cs, @NotNull String path) throws Exception { Root r = cs.getLatestRoot(); PermissionProvider pp = config.getPermissionProvider(r, cs.getWorkspaceName(), cs.getAuthInfo().getPrincipals()); @@ -241,4 +241,4 @@ public class RepoPolicyTreePermissionTes assertFalse(tp.isGranted(Permissions.WORKSPACE_MANAGEMENT, ps)); assertFalse(tp.isGranted(Permissions.NAMESPACE_MANAGEMENT|Permissions.WORKSPACE_MANAGEMENT, ps)); } -} \ No newline at end of file +} Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/VersionTreePermissionTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/VersionTreePermissionTest.java?rev=1836177&r1=1836176&r2=1836177&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/VersionTreePermissionTest.java (original) +++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/VersionTreePermissionTest.java Wed Jul 18 14:37:06 2018 @@ -19,7 +19,6 @@ package org.apache.jackrabbit.oak.securi import java.lang.reflect.Field; import java.security.Principal; -import javax.annotation.Nonnull; import javax.jcr.security.AccessControlList; import javax.jcr.security.AccessControlManager; @@ -42,6 +41,7 @@ import org.apache.jackrabbit.oak.spi.sec import org.apache.jackrabbit.oak.spi.state.NodeState; import org.apache.jackrabbit.oak.util.NodeUtil; import org.apache.jackrabbit.oak.plugins.tree.TreeUtil; +import org.jetbrains.annotations.NotNull; import org.junit.Test; import static com.google.common.base.Preconditions.checkNotNull; @@ -116,7 +116,7 @@ public class VersionTreePermissionTest e return tp; } - private void assertVersionPermission(@Nonnull TreePermission tp, @Nonnull String expectedPath, boolean canRead) throws Exception { + private void assertVersionPermission(@NotNull TreePermission tp, @NotNull String expectedPath, boolean canRead) throws Exception { assertTrue(tp instanceof VersionTreePermission); assertEquals(canRead, tp.canRead()); assertEquals(canRead, tp.canRead(PropertyStates.createProperty("any", "Value"))); @@ -261,4 +261,4 @@ public class VersionTreePermissionTest e tp = pp.getTreePermission(frozenC, tp); assertVersionPermission(tp, "/test/a/b/c", true); } -} \ No newline at end of file +} Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/restriction/CustomRestrictionProviderTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/restriction/CustomRestrictionProviderTest.java?rev=1836177&r1=1836176&r2=1836177&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/restriction/CustomRestrictionProviderTest.java (original) +++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/restriction/CustomRestrictionProviderTest.java Wed Jul 18 14:37:06 2018 @@ -22,8 +22,6 @@ import java.util.HashMap; import java.util.Map; import java.util.Set; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; import javax.jcr.Value; import javax.jcr.security.AccessControlManager; @@ -52,6 +50,8 @@ 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.value.StringValue; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -264,9 +264,9 @@ public class CustomRestrictionProviderTe return RestrictionPattern.EMPTY; } - @Nonnull + @NotNull @Override - public RestrictionPattern getPattern(@Nullable String oakPath, @Nonnull Set<Restriction> restrictions) { + public RestrictionPattern getPattern(@Nullable String oakPath, @NotNull Set<Restriction> restrictions) { if (oakPath != null) { for (Restriction r : restrictions) { String name = r.getDefinition().getName(); @@ -285,7 +285,7 @@ public class CustomRestrictionProviderTe private final boolean negate; - private HasPropertyPattern(@Nonnull String propertyName) { + private HasPropertyPattern(@NotNull String propertyName) { if (propertyName.startsWith("!")) { this.propertyName = propertyName.substring(1); negate = true; @@ -304,7 +304,7 @@ public class CustomRestrictionProviderTe } @Override - public boolean matches(@Nonnull Tree tree, @Nullable PropertyState property) { + public boolean matches(@NotNull Tree tree, @Nullable PropertyState property) { boolean match = false; // configured property name found on underlying jcr:content node has precedence @@ -319,7 +319,7 @@ public class CustomRestrictionProviderTe } @Override - public boolean matches(@Nonnull String path) { + public boolean matches(@NotNull String path) { return matches(); } Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/restriction/TestProvider.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/restriction/TestProvider.java?rev=1836177&r1=1836176&r2=1836177&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/restriction/TestProvider.java (original) +++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/restriction/TestProvider.java Wed Jul 18 14:37:06 2018 @@ -19,9 +19,6 @@ package org.apache.jackrabbit.oak.securi import java.util.HashSet; import java.util.Map; import java.util.Set; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import org.apache.jackrabbit.JcrConstants; import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.api.Tree; @@ -31,6 +28,8 @@ import org.apache.jackrabbit.oak.spi.sec import org.apache.jackrabbit.oak.spi.security.authorization.restriction.RestrictionDefinitionImpl; import org.apache.jackrabbit.oak.spi.security.authorization.restriction.RestrictionImpl; import org.apache.jackrabbit.oak.spi.security.authorization.restriction.RestrictionPattern; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * RestrictionProvider for tests. @@ -48,9 +47,9 @@ final class TestProvider extends Abstrac this.nonValidatingRead = nonValidatingRead; } - @Nonnull + @NotNull @Override - public Set<Restriction> readRestrictions(String oakPath, @Nonnull Tree aceTree) { + public Set<Restriction> readRestrictions(String oakPath, @NotNull Tree aceTree) { if (nonValidatingRead) { Set<Restriction> restrictions = new HashSet(); for (PropertyState propertyState : getRestrictionsTree(aceTree).getProperties()) { @@ -65,9 +64,9 @@ final class TestProvider extends Abstrac } } - @Nonnull + @NotNull @Override - public RestrictionPattern getPattern(@Nullable String oakPath, @Nonnull Tree tree) { + public RestrictionPattern getPattern(@Nullable String oakPath, @NotNull Tree tree) { boolean hasRestriction = false; for (RestrictionDefinition rd : getSupportedRestrictions(oakPath)) { if (tree.hasProperty(rd.getName())) { @@ -78,9 +77,9 @@ final class TestProvider extends Abstrac return (hasRestriction) ? new MatchingPattern() : RestrictionPattern.EMPTY; } - @Nonnull + @NotNull @Override - public RestrictionPattern getPattern(@Nullable String oakPath, @Nonnull Set<Restriction> restrictions) { + public RestrictionPattern getPattern(@Nullable String oakPath, @NotNull Set<Restriction> restrictions) { for (Restriction r : restrictions) { if (getSupportedRestrictions(oakPath).contains(r.getDefinition())) { return new MatchingPattern(); @@ -92,12 +91,12 @@ final class TestProvider extends Abstrac private static final class MatchingPattern implements RestrictionPattern { @Override - public boolean matches(@Nonnull Tree tree, @Nullable PropertyState property) { + public boolean matches(@NotNull Tree tree, @Nullable PropertyState property) { return true; } @Override - public boolean matches(@Nonnull String path) { + public boolean matches(@NotNull String path) { return true; } @@ -106,4 +105,4 @@ final class TestProvider extends Abstrac return true; } } -} \ No newline at end of file +} Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/internal/ConfigurationInitializerTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/internal/ConfigurationInitializerTest.java?rev=1836177&r1=1836176&r2=1836177&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/internal/ConfigurationInitializerTest.java (original) +++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/internal/ConfigurationInitializerTest.java Wed Jul 18 14:37:06 2018 @@ -16,8 +16,6 @@ */ package org.apache.jackrabbit.oak.security.internal; -import javax.annotation.Nonnull; - import org.apache.jackrabbit.oak.plugins.tree.RootProvider; import org.apache.jackrabbit.oak.plugins.tree.TreeProvider; import org.apache.jackrabbit.oak.spi.security.CompositeConfiguration; @@ -25,6 +23,7 @@ import org.apache.jackrabbit.oak.spi.sec import org.apache.jackrabbit.oak.spi.security.ConfigurationParameters; import org.apache.jackrabbit.oak.spi.security.SecurityConfiguration; import org.apache.jackrabbit.oak.spi.security.SecurityProvider; +import org.jetbrains.annotations.NotNull; import org.junit.Test; import org.mockito.Mockito; @@ -166,10 +165,10 @@ public class ConfigurationInitializerTes super("name"); } - @Nonnull + @NotNull @Override public SecurityProvider getSecurityProvider() { return super.getSecurityProvider(); } } -} \ No newline at end of file +} Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/internal/SecurityProviderHelper.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/internal/SecurityProviderHelper.java?rev=1836177&r1=1836176&r2=1836177&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/internal/SecurityProviderHelper.java (original) +++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/internal/SecurityProviderHelper.java Wed Jul 18 14:37:06 2018 @@ -16,20 +16,19 @@ */ package org.apache.jackrabbit.oak.security.internal; -import javax.annotation.Nonnull; - import org.apache.jackrabbit.oak.spi.security.CompositeConfiguration; import org.apache.jackrabbit.oak.spi.security.ConfigurationBase; import org.apache.jackrabbit.oak.spi.security.SecurityConfiguration; import org.apache.jackrabbit.oak.spi.security.SecurityProvider; +import org.jetbrains.annotations.NotNull; public final class SecurityProviderHelper { private SecurityProviderHelper() { } - public static SecurityProvider updateConfig(@Nonnull SecurityProvider securityProvider, - @Nonnull SecurityConfiguration sc, @Nonnull Class<? extends SecurityConfiguration> cls) { + public static SecurityProvider updateConfig(@NotNull SecurityProvider securityProvider, + @NotNull SecurityConfiguration sc, @NotNull Class<? extends SecurityConfiguration> cls) { Object cc = securityProvider.getConfiguration(cls); if (!(cc instanceof CompositeConfiguration)) { Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/internal/SecurityProviderRegistrationTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/internal/SecurityProviderRegistrationTest.java?rev=1836177&r1=1836176&r2=1836177&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/internal/SecurityProviderRegistrationTest.java (original) +++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/internal/SecurityProviderRegistrationTest.java Wed Jul 18 14:37:06 2018 @@ -20,8 +20,6 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Field; import java.util.List; import java.util.Map; -import javax.annotation.Nonnull; - import com.google.common.base.Predicates; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; @@ -53,6 +51,7 @@ import org.apache.jackrabbit.oak.spi.sec import org.apache.jackrabbit.oak.spi.security.user.UserConfiguration; import org.apache.jackrabbit.oak.spi.security.user.action.AuthorizableActionProvider; import org.apache.sling.testing.mock.osgi.junit.OsgiContext; +import org.jetbrains.annotations.NotNull; import org.junit.Rule; import org.junit.Test; import org.mockito.Mockito; @@ -75,7 +74,7 @@ public class SecurityProviderRegistratio private SecurityProviderRegistration registration = new SecurityProviderRegistration(); - private static void assertContext(@Nonnull Context context, int expectedSize, @Nonnull Tree tree, boolean isDefined) throws Exception { + private static void assertContext(@NotNull Context context, int expectedSize, @NotNull Tree tree, boolean isDefined) throws Exception { Class<?> c = context.getClass(); assertTrue(c.getName().endsWith("CompositeContext")); @@ -101,7 +100,7 @@ public class SecurityProviderRegistratio return sc; } - private static SecurityProviderRegistration.Configuration configWithRequiredServiceIds(@Nonnull String... ids) { + private static SecurityProviderRegistration.Configuration configWithRequiredServiceIds(@NotNull String... ids) { return new SecurityProviderRegistration.Configuration() { @Override public Class<? extends Annotation> annotationType() { return SecurityProviderRegistration.Configuration.class; } @@ -607,28 +606,28 @@ public class SecurityProviderRegistratio private static class ContextImpl implements Context { @Override - public boolean definesProperty(@Nonnull Tree parent, @Nonnull PropertyState property) { + public boolean definesProperty(@NotNull Tree parent, @NotNull PropertyState property) { return true; } @Override - public boolean definesContextRoot(@Nonnull Tree tree) { + public boolean definesContextRoot(@NotNull Tree tree) { return true; } @Override - public boolean definesTree(@Nonnull Tree tree) { + public boolean definesTree(@NotNull Tree tree) { return true; } @Override - public boolean definesLocation(@Nonnull TreeLocation location) { + public boolean definesLocation(@NotNull TreeLocation location) { return true; } @Override - public boolean definesInternal(@Nonnull Tree tree) { + public boolean definesInternal(@NotNull Tree tree) { return true; } } -} \ No newline at end of file +} Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/principal/PrincipalConfigurationImplTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/principal/PrincipalConfigurationImplTest.java?rev=1836177&r1=1836176&r2=1836177&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/principal/PrincipalConfigurationImplTest.java (original) +++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/principal/PrincipalConfigurationImplTest.java Wed Jul 18 14:37:06 2018 @@ -16,9 +16,6 @@ */ package org.apache.jackrabbit.oak.security.principal; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import com.google.common.collect.ImmutableList; import org.apache.jackrabbit.api.security.principal.PrincipalManager; import org.apache.jackrabbit.oak.AbstractSecurityTest; @@ -38,6 +35,8 @@ import org.apache.jackrabbit.oak.spi.sec import org.apache.jackrabbit.oak.spi.security.principal.PrincipalManagerImpl; import org.apache.jackrabbit.oak.spi.security.principal.PrincipalProvider; import org.apache.jackrabbit.oak.spi.security.user.UserConfiguration; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -120,26 +119,26 @@ public class PrincipalConfigurationImplT public void testGetPrincipalProvider4() { PrincipalConfigurationImpl pc3 = new PrincipalConfigurationImpl(); final SecurityProvider sp = new SecurityProvider() { - @Nonnull + @NotNull @Override public ConfigurationParameters getParameters(@Nullable String name) { return ConfigurationParameters.EMPTY; } - @Nonnull + @NotNull @Override public Iterable<? extends SecurityConfiguration> getConfigurations() { return ImmutableList.of(); } - @Nonnull + @NotNull @Override - public <T> T getConfiguration(@Nonnull Class<T> configClass) { + public <T> T getConfiguration(@NotNull Class<T> configClass) { if (configClass.equals(UserConfiguration.class)) { return (T) new UserConfigurationImpl(this) { @Nullable @Override - public PrincipalProvider getUserPrincipalProvider(@Nonnull Root root, @Nonnull NamePathMapper namePathMapper) { + public PrincipalProvider getUserPrincipalProvider(@NotNull Root root, @NotNull NamePathMapper namePathMapper) { return null; } }; @@ -184,4 +183,4 @@ public class PrincipalConfigurationImplT PrincipalProvider ppt = pc.getPrincipalProvider(root, NamePathMapper.DEFAULT); assertEquals(pp, ppt); } -} \ No newline at end of file +} Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/privilege/JcrAllTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/privilege/JcrAllTest.java?rev=1836177&r1=1836176&r2=1836177&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/privilege/JcrAllTest.java (original) +++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/privilege/JcrAllTest.java Wed Jul 18 14:37:06 2018 @@ -18,7 +18,6 @@ package org.apache.jackrabbit.oak.securi import java.util.Arrays; import java.util.Collections; -import javax.annotation.Nullable; import javax.jcr.security.Privilege; import com.google.common.base.Function; @@ -31,6 +30,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.PrivilegeConfiguration; import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeConstants; +import org.jetbrains.annotations.Nullable; import org.junit.Test; import static com.google.common.base.Preconditions.checkNotNull; @@ -88,4 +88,4 @@ public class JcrAllTest extends Abstract } assertEquals(all, bits.unmodifiable()); } -} \ No newline at end of file +} Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeContextTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeContextTest.java?rev=1836177&r1=1836176&r2=1836177&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeContextTest.java (original) +++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeContextTest.java Wed Jul 18 14:37:06 2018 @@ -17,8 +17,6 @@ package org.apache.jackrabbit.oak.security.privilege; import java.util.List; -import javax.annotation.Nonnull; - import com.google.common.collect.ImmutableList; import org.apache.jackrabbit.JcrConstants; import org.apache.jackrabbit.oak.api.PropertyState; @@ -33,6 +31,7 @@ import org.apache.jackrabbit.oak.plugins import org.apache.jackrabbit.oak.plugins.tree.impl.TreeProviderService; import org.apache.jackrabbit.oak.spi.security.Context; import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeConstants; +import org.jetbrains.annotations.NotNull; import org.junit.Test; import org.mockito.Mockito; @@ -44,7 +43,7 @@ public class PrivilegeContextTest { private final Context ctx = PrivilegeContext.getInstance(); - private static Tree mockTree(@Nonnull String name, @Nonnull String ntName) { + private static Tree mockTree(@NotNull String name, @NotNull String ntName) { Tree t = Mockito.mock(Tree.class); when(t.getName()).thenReturn(name); when(t.getProperty(JcrConstants.JCR_PRIMARYTYPE)).thenReturn(PropertyStates.createProperty(JcrConstants.JCR_PRIMARYTYPE, ntName, Type.NAME)); @@ -159,4 +158,4 @@ public class PrivilegeContextTest { public void testDefinesInternal() { assertFalse(ctx.definesInternal(Mockito.mock(Tree.class))); } -} \ No newline at end of file +} Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeImplTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeImplTest.java?rev=1836177&r1=1836176&r2=1836177&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeImplTest.java (original) +++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeImplTest.java Wed Jul 18 14:37:06 2018 @@ -17,8 +17,6 @@ package org.apache.jackrabbit.oak.security.privilege; import java.util.Set; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; import javax.jcr.security.Privilege; import com.google.common.base.Function; @@ -30,6 +28,8 @@ import org.apache.jackrabbit.oak.Abstrac import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeConstants; import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeDefinition; 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; @@ -62,7 +62,7 @@ public class PrivilegeImplTest extends A super.after(); } - private static void assertAggregation(@Nonnull Privilege[] aggr, @Nonnull String... expectedNames) { + private static void assertAggregation(@NotNull Privilege[] aggr, @NotNull String... expectedNames) { assertEquals(expectedNames.length, aggr.length); Set<String> expected = Sets.newHashSet(expectedNames); @@ -184,4 +184,4 @@ public class PrivilegeImplTest extends A Privilege p = getPrivilegeManager(root).getPrivilege("test"); assertAggregation(p.getDeclaredAggregatePrivileges(), JCR_READ); } -} \ No newline at end of file +} Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeManagerImplTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeManagerImplTest.java?rev=1836177&r1=1836176&r2=1836177&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeManagerImplTest.java (original) +++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeManagerImplTest.java Wed Jul 18 14:37:06 2018 @@ -17,7 +17,6 @@ package org.apache.jackrabbit.oak.security.privilege; import java.util.Map; -import javax.annotation.Nonnull; import javax.jcr.NamespaceRegistry; import javax.jcr.RepositoryException; import javax.jcr.security.AccessControlException; @@ -37,6 +36,7 @@ import org.apache.jackrabbit.oak.plugins import org.apache.jackrabbit.oak.plugins.name.ReadWriteNamespaceRegistry; import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeConstants; import org.apache.jackrabbit.oak.plugins.tree.TreeUtil; +import org.jetbrains.annotations.NotNull; import org.junit.Before; import org.junit.Test; import org.mockito.Mockito; @@ -58,11 +58,11 @@ public class PrivilegeManagerImplTest ex privilegeManager = create(root); } - private static PrivilegeManagerImpl create(@Nonnull Root root) { + private static PrivilegeManagerImpl create(@NotNull Root root) { return new PrivilegeManagerImpl(root, NamePathMapper.DEFAULT); } - private static PrivilegeManagerImpl create(@Nonnull Root root, @Nonnull NamePathMapper mapper) { + private static PrivilegeManagerImpl create(@NotNull Root root, @NotNull NamePathMapper mapper) { return new PrivilegeManagerImpl(root, mapper); } Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeValidatorTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeValidatorTest.java?rev=1836177&r1=1836176&r2=1836177&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeValidatorTest.java (original) +++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeValidatorTest.java Wed Jul 18 14:37:06 2018 @@ -17,8 +17,6 @@ package org.apache.jackrabbit.oak.security.privilege; import java.util.Collections; -import javax.annotation.Nonnull; - import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import org.apache.jackrabbit.JcrConstants; @@ -37,6 +35,7 @@ import org.apache.jackrabbit.oak.spi.sec import org.apache.jackrabbit.oak.spi.state.NodeBuilder; import org.apache.jackrabbit.oak.spi.state.NodeState; import org.apache.jackrabbit.oak.spi.state.NodeStateUtils; +import org.jetbrains.annotations.NotNull; import org.junit.Before; import org.junit.Test; @@ -58,14 +57,14 @@ public class PrivilegeValidatorTest exte privilegesTree = checkNotNull(bitsProvider.getPrivilegesTree()); } - private Tree createPrivilegeTree(@Nonnull String privName, @Nonnull String... aggr) { + private Tree createPrivilegeTree(@NotNull String privName, @NotNull String... aggr) { Tree privTree = privilegesTree.addChild(privName); privTree.setProperty(JcrConstants.JCR_PRIMARYTYPE, NT_REP_PRIVILEGE, Type.NAME); privTree.setProperty(REP_AGGREGATES, ImmutableSet.copyOf(aggr), Type.NAMES); return privTree; } - private void register(@Nonnull String privName, @Nonnull String... aggr) throws Exception { + private void register(@NotNull String privName, @NotNull String... aggr) throws Exception { getPrivilegeManager(root).registerPrivilege(privName, false, aggr); } @@ -349,4 +348,4 @@ public class PrivilegeValidatorTest exte assertEquals(52, e.getCode()); } } -} \ No newline at end of file +} Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/AbstractAddMembersByIdTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/AbstractAddMembersByIdTest.java?rev=1836177&r1=1836176&r2=1836177&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/AbstractAddMembersByIdTest.java (original) +++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/AbstractAddMembersByIdTest.java Wed Jul 18 14:37:06 2018 @@ -19,7 +19,6 @@ package org.apache.jackrabbit.oak.securi import java.util.Iterator; import java.util.Set; import java.util.UUID; -import javax.annotation.Nonnull; import javax.jcr.RepositoryException; import javax.jcr.SimpleCredentials; import javax.jcr.nodetype.ConstraintViolationException; @@ -39,6 +38,7 @@ import org.apache.jackrabbit.oak.api.Typ import org.apache.jackrabbit.oak.spi.security.principal.EveryonePrincipal; import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeConstants; import org.apache.jackrabbit.oak.spi.security.user.UserConstants; +import org.jetbrains.annotations.NotNull; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -88,8 +88,8 @@ public abstract class AbstractAddMembers } } - @Nonnull - Iterable<String> getMemberIds(@Nonnull Group group) throws RepositoryException { + @NotNull + Iterable<String> getMemberIds(@NotNull Group group) throws RepositoryException { // test group tree Tree groupTree = root.getTree(group.getPath()); PropertyState membersProp = groupTree.getProperty(UserConstants.REP_MEMBERS); @@ -97,7 +97,7 @@ public abstract class AbstractAddMembers return membersProp.getValue(Type.WEAKREFERENCES); } - @Nonnull + @NotNull Set<String> addNonExistingMember() throws Exception { return testGroup.addMembers(NON_EXISTING_IDS); } @@ -281,4 +281,4 @@ public abstract class AbstractAddMembers root.commit(); } } -} \ No newline at end of file +} Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/AbstractGroupPrincipalTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/AbstractGroupPrincipalTest.java?rev=1836177&r1=1836176&r2=1836177&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/AbstractGroupPrincipalTest.java (original) +++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/AbstractGroupPrincipalTest.java Wed Jul 18 14:37:06 2018 @@ -19,7 +19,6 @@ package org.apache.jackrabbit.oak.securi import java.security.Principal; import java.util.Iterator; import java.util.List; -import javax.annotation.Nonnull; import javax.jcr.RepositoryException; import com.google.common.collect.ImmutableList; @@ -29,6 +28,7 @@ import org.apache.jackrabbit.api.securit import org.apache.jackrabbit.oak.AbstractSecurityTest; import org.apache.jackrabbit.oak.spi.security.principal.EveryonePrincipal; import org.apache.jackrabbit.oak.spi.security.principal.PrincipalImpl; +import org.jetbrains.annotations.NotNull; import org.junit.Test; import org.mockito.Mockito; @@ -173,11 +173,11 @@ public class AbstractGroupPrincipalTest } @Override - boolean isMember(@Nonnull Authorizable authorizable) throws RepositoryException { + boolean isMember(@NotNull Authorizable authorizable) throws RepositoryException { return member.getID().equals(authorizable.getID()); } - @Nonnull + @NotNull @Override Iterator<Authorizable> getMembers() throws RepositoryException { return ImmutableList.of(member).iterator(); @@ -203,14 +203,14 @@ public class AbstractGroupPrincipalTest } @Override - boolean isMember(@Nonnull Authorizable authorizable) throws RepositoryException { + boolean isMember(@NotNull Authorizable authorizable) throws RepositoryException { throw new RepositoryException(); } - @Nonnull + @NotNull @Override Iterator<Authorizable> getMembers() throws RepositoryException { throw new RepositoryException(); } } -} \ No newline at end of file +} Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/AuthorizablePropertiesImplTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/AuthorizablePropertiesImplTest.java?rev=1836177&r1=1836176&r2=1836177&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/AuthorizablePropertiesImplTest.java (original) +++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/AuthorizablePropertiesImplTest.java Wed Jul 18 14:37:06 2018 @@ -19,7 +19,6 @@ package org.apache.jackrabbit.oak.securi import java.util.Iterator; import java.util.Set; import java.util.UUID; -import javax.annotation.Nonnull; import javax.jcr.PropertyType; import javax.jcr.RepositoryException; import javax.jcr.Value; @@ -36,6 +35,7 @@ import org.apache.jackrabbit.oak.namepat import org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants; import org.apache.jackrabbit.oak.spi.security.principal.PrincipalImpl; import org.apache.jackrabbit.oak.spi.security.user.UserConstants; +import org.jetbrains.annotations.NotNull; import org.junit.Test; import static org.junit.Assert.assertArrayEquals; @@ -118,7 +118,7 @@ public class AuthorizablePropertiesImplT public void testGetNamesMissingResolutionToOakPath() throws Exception { AuthorizableProperties props = new AuthorizablePropertiesImpl((AuthorizableImpl) user2, new NamePathMapper.Default() { @Override - public String getOakNameOrNull(@Nonnull String jcrName) { + public String getOakNameOrNull(@NotNull String jcrName) { return null; } @@ -212,7 +212,7 @@ public class AuthorizablePropertiesImplT public void testSetMissingResolutionToOakPath() throws Exception { AuthorizableProperties props = new AuthorizablePropertiesImpl((AuthorizableImpl) user2, new NamePathMapper.Default() { @Override - public String getOakNameOrNull(@Nonnull String jcrName) { + public String getOakNameOrNull(@NotNull String jcrName) { return null; } @@ -281,7 +281,7 @@ public class AuthorizablePropertiesImplT public void testRemoveMissingResolutionToOakPath() throws Exception { AuthorizableProperties props = new AuthorizablePropertiesImpl((AuthorizableImpl) user2, new NamePathMapper.Default() { @Override - public String getOakNameOrNull(@Nonnull String jcrName) { + public String getOakNameOrNull(@NotNull String jcrName) { return null; } @@ -307,4 +307,4 @@ public class AuthorizablePropertiesImplT public void testRemovePropertyOtherUser() throws Exception { emptyProperties.removeProperty("../" + PathUtils.getName(user2.getPath()) + "/prop"); } -} \ No newline at end of file +} Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/CacheValidatorProviderTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/CacheValidatorProviderTest.java?rev=1836177&r1=1836176&r2=1836177&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/CacheValidatorProviderTest.java (original) +++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/CacheValidatorProviderTest.java Wed Jul 18 14:37:06 2018 @@ -21,7 +21,6 @@ import java.util.ArrayList; import java.util.List; import java.util.UUID; -import javax.annotation.Nonnull; import javax.jcr.NoSuchWorkspaceException; import javax.jcr.RepositoryException; import javax.security.auth.Subject; @@ -42,6 +41,7 @@ import org.apache.jackrabbit.oak.spi.nod import org.apache.jackrabbit.oak.spi.security.authentication.SystemSubject; import org.apache.jackrabbit.oak.spi.security.principal.EveryonePrincipal; import org.apache.jackrabbit.oak.util.NodeUtil; +import org.jetbrains.annotations.NotNull; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -75,11 +75,11 @@ public class CacheValidatorProviderTest } } - private Tree getAuthorizableTree(@Nonnull Authorizable authorizable) throws RepositoryException { + private Tree getAuthorizableTree(@NotNull Authorizable authorizable) throws RepositoryException { return root.getTree(authorizable.getPath()); } - private Tree getCache(@Nonnull Authorizable authorizable) throws Exception { + private Tree getCache(@NotNull Authorizable authorizable) throws Exception { ContentSession cs = Subject.doAs(SystemSubject.INSTANCE, new PrivilegedExceptionAction<ContentSession>() { @Override public ContentSession run() throws LoginException, NoSuchWorkspaceException { @@ -278,4 +278,4 @@ public class CacheValidatorProviderTest } } -} \ No newline at end of file +} Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/IntermediatePathTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/IntermediatePathTest.java?rev=1836177&r1=1836176&r2=1836177&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/IntermediatePathTest.java (original) +++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/IntermediatePathTest.java Wed Jul 18 14:37:06 2018 @@ -19,7 +19,6 @@ package org.apache.jackrabbit.oak.securi import java.util.List; import java.util.UUID; -import javax.annotation.Nullable; import javax.jcr.RepositoryException; import javax.jcr.nodetype.ConstraintViolationException; @@ -32,6 +31,7 @@ import org.apache.jackrabbit.oak.spi.nod import org.apache.jackrabbit.oak.spi.security.principal.PrincipalImpl; import org.apache.jackrabbit.oak.spi.security.user.UserConstants; import org.apache.jackrabbit.oak.util.NodeUtil; +import org.jetbrains.annotations.Nullable; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -205,4 +205,4 @@ public class IntermediatePathTest extend Authorizable authorizable = createAuthorizable(false, "."); assertEquals(UserConstants.DEFAULT_USER_PATH, PathUtils.getAncestorPath(authorizable.getPath(), 1)); } -} \ No newline at end of file +} Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/MembershipBaseTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/MembershipBaseTest.java?rev=1836177&r1=1836176&r2=1836177&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/MembershipBaseTest.java (original) +++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/MembershipBaseTest.java Wed Jul 18 14:37:06 2018 @@ -22,8 +22,6 @@ import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; import javax.jcr.RepositoryException; import com.google.common.collect.Iterables; @@ -37,6 +35,8 @@ import org.apache.jackrabbit.oak.api.Pro import org.apache.jackrabbit.oak.api.Tree; import org.apache.jackrabbit.oak.spi.security.user.UserConstants; import org.apache.jackrabbit.oak.plugins.tree.TreeUtil; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -85,7 +85,7 @@ public abstract class MembershipBaseTest } } - @Nonnull + @NotNull User createUser() throws RepositoryException { String userId = "testUser" + testUsers.size(); User usr = userMgr.createUser(userId, "pw"); @@ -93,7 +93,7 @@ public abstract class MembershipBaseTest return usr; } - @Nonnull + @NotNull Group createGroup() throws RepositoryException { String groupName = "testGroup" + testGroups.size(); Group grp = userMgr.createGroup(groupName); @@ -102,8 +102,8 @@ public abstract class MembershipBaseTest } - @Nonnull - List<String> createMembers(@Nonnull Group g, int cnt) throws Exception { + @NotNull + List<String> createMembers(@NotNull Group g, int cnt) throws Exception { List<String> memberPaths = new ArrayList(); for (int i = 0; i <= cnt; i++) { User u = createUser(); @@ -115,7 +115,7 @@ public abstract class MembershipBaseTest return memberPaths; } - @Nonnull + @NotNull Map<String, String> createIdMap(int start, int end) { Map<String, String> memberIds = Maps.newLinkedHashMap(); for (int i = start; i < end; i++) { @@ -125,23 +125,23 @@ public abstract class MembershipBaseTest return memberIds; } - @Nonnull - String getContentID(@Nonnull String memberId) { + @NotNull + String getContentID(@NotNull String memberId) { return userMgr.getMembershipProvider().getContentID(memberId); } - @CheckForNull - String getContentID(@Nonnull Tree tree) { + @Nullable + String getContentID(@NotNull Tree tree) { return TreeUtil.getString(tree, JcrConstants.JCR_UUID); } - @Nonnull - Tree getTree(@Nonnull Authorizable a) throws Exception { + @NotNull + Tree getTree(@NotNull Authorizable a) throws Exception { return root.getTree(a.getPath()); } - @Nonnull - Tree getTree(@Nonnull String path) throws Exception { + @NotNull + Tree getTree(@NotNull String path) throws Exception { return root.getTree(path); } @@ -155,7 +155,7 @@ public abstract class MembershipBaseTest assertEquals("Group must have all members", 0, members.size()); } - static void assertMemberList(@Nonnull Tree groupTree, int cntRefTrees, int cnt) { + static void assertMemberList(@NotNull Tree groupTree, int cntRefTrees, int cnt) { Tree list = groupTree.getChild(REP_MEMBERS_LIST); assertTrue(list.exists()); assertEquals(cntRefTrees, list.getChildrenCount(5)); @@ -166,4 +166,4 @@ public abstract class MembershipBaseTest } } -} \ No newline at end of file +} Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/MembershipWriterTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/MembershipWriterTest.java?rev=1836177&r1=1836176&r2=1836177&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/MembershipWriterTest.java (original) +++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/MembershipWriterTest.java Wed Jul 18 14:37:06 2018 @@ -21,8 +21,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; -import javax.annotation.Nonnull; - import com.google.common.collect.Maps; import com.google.common.collect.Sets; import org.apache.jackrabbit.JcrConstants; @@ -33,6 +31,7 @@ import org.apache.jackrabbit.oak.api.Pro import org.apache.jackrabbit.oak.api.Tree; import org.apache.jackrabbit.oak.api.Type; import org.apache.jackrabbit.oak.plugins.tree.TreeUtil; +import org.jetbrains.annotations.NotNull; import org.junit.Before; import org.junit.Test; @@ -61,7 +60,7 @@ public class MembershipWriterTest extend writer.setMembershipSizeThreshold(SIZE_TH); } - private static void assertContentStructure(@Nonnull Tree groupTree, int memberCnt) { + private static void assertContentStructure(@NotNull Tree groupTree, int memberCnt) { assertEquals( "rep:members property must have correct number of references", SIZE_TH, @@ -276,4 +275,4 @@ public class MembershipWriterTest extend assertTrue("the first overflow node must not exist", membersList.getChild("1").exists() ); } -} \ No newline at end of file +} Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/PasswordExpiryHistoryTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/PasswordExpiryHistoryTest.java?rev=1836177&r1=1836176&r2=1836177&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/PasswordExpiryHistoryTest.java (original) +++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/PasswordExpiryHistoryTest.java Wed Jul 18 14:37:06 2018 @@ -28,10 +28,10 @@ import org.apache.jackrabbit.oak.spi.sec import org.apache.jackrabbit.oak.spi.security.user.action.AuthorizableAction; import org.apache.jackrabbit.oak.spi.security.user.action.AuthorizableActionProvider; import org.apache.jackrabbit.oak.spi.security.user.action.PasswordValidationAction; +import org.jetbrains.annotations.NotNull; import org.junit.Before; import org.junit.Test; -import javax.annotation.Nonnull; import javax.jcr.SimpleCredentials; import javax.security.auth.login.CredentialExpiredException; import java.util.List; @@ -60,9 +60,9 @@ public class PasswordExpiryHistoryTest e PasswordValidationAction.CONSTRAINT, "^.*(?=.{4,}).*" )); final AuthorizableActionProvider actionProvider = new AuthorizableActionProvider() { - @Nonnull + @NotNull @Override - public List<? extends AuthorizableAction> getAuthorizableActions(@Nonnull SecurityProvider securityProvider) { + public List<? extends AuthorizableAction> getAuthorizableActions(@NotNull SecurityProvider securityProvider) { return ImmutableList.of(pwAction); } }; Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/PasswordHistoryTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/PasswordHistoryTest.java?rev=1836177&r1=1836176&r2=1836177&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/PasswordHistoryTest.java (original) +++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/PasswordHistoryTest.java Wed Jul 18 14:37:06 2018 @@ -18,7 +18,6 @@ package org.apache.jackrabbit.oak.securi import java.lang.reflect.Field; import java.util.List; -import javax.annotation.Nonnull; import javax.jcr.RepositoryException; import javax.jcr.nodetype.ConstraintViolationException; @@ -34,6 +33,7 @@ import org.apache.jackrabbit.oak.spi.sec import org.apache.jackrabbit.oak.spi.security.user.util.PasswordUtil; import org.apache.jackrabbit.oak.util.NodeUtil; import org.apache.jackrabbit.oak.plugins.tree.TreeUtil; +import org.jetbrains.annotations.NotNull; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -58,8 +58,8 @@ public class PasswordHistoryTest extends return ConfigurationParameters.of(ImmutableMap.of(UserConfiguration.NAME, CONFIG)); } - @Nonnull - private List<String> getHistory(@Nonnull User user) throws RepositoryException { + @NotNull + private List<String> getHistory(@NotNull User user) throws RepositoryException { return ImmutableList.copyOf(TreeUtil.getStrings( root.getTree(user.getPath()).getChild(REP_PWD), REP_PWD_HISTORY)).reverse(); @@ -68,7 +68,7 @@ public class PasswordHistoryTest extends /** * Use reflection to access the private fields stored in the PasswordHistory */ - private static Integer getMaxSize(@Nonnull PasswordHistory history) throws Exception { + private static Integer getMaxSize(@NotNull PasswordHistory history) throws Exception { Field maxSize = history.getClass().getDeclaredField("maxSize"); maxSize.setAccessible(true); return (Integer) maxSize.get(history); @@ -77,7 +77,7 @@ public class PasswordHistoryTest extends /** * Use reflection to access the private fields stored in the PasswordHistory */ - private static boolean isEnabled(@Nonnull PasswordHistory history) throws Exception { + private static boolean isEnabled(@NotNull PasswordHistory history) throws Exception { Field isEnabled = history.getClass().getDeclaredField("isEnabled"); isEnabled.setAccessible(true); return (Boolean) isEnabled.get(history); Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/SystemUserImplTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/SystemUserImplTest.java?rev=1836177&r1=1836176&r2=1836177&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/SystemUserImplTest.java (original) +++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/SystemUserImplTest.java Wed Jul 18 14:37:06 2018 @@ -19,8 +19,6 @@ package org.apache.jackrabbit.oak.securi import java.util.Iterator; import java.util.List; import java.util.UUID; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; import javax.jcr.Credentials; import javax.jcr.SimpleCredentials; import javax.jcr.UnsupportedRepositoryOperationException; @@ -51,6 +49,8 @@ import org.apache.jackrabbit.oak.spi.sec import org.apache.jackrabbit.oak.spi.security.user.action.AuthorizableActionProvider; import org.apache.jackrabbit.oak.util.NodeUtil; import org.apache.jackrabbit.oak.plugins.tree.TreeUtil; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.junit.Before; import org.junit.Test; @@ -96,9 +96,9 @@ public class SystemUserImplTest extends return ConfigurationParameters.of( UserConfiguration.NAME, ConfigurationParameters.of(UserConstants.PARAM_AUTHORIZABLE_ACTION_PROVIDER, new AuthorizableActionProvider() { - @Nonnull + @NotNull @Override - public List<? extends AuthorizableAction> getAuthorizableActions(@Nonnull SecurityProvider securityProvider) { + public List<? extends AuthorizableAction> getAuthorizableActions(@NotNull SecurityProvider securityProvider) { AuthorizableAction action = new AccessControlAction(); action.init(securityProvider, ConfigurationParameters.of(AccessControlAction.USER_PRIVILEGE_NAMES, new String[]{PrivilegeConstants.JCR_ALL})); return ImmutableList.of(action); @@ -318,4 +318,4 @@ public class SystemUserImplTest extends Tree t = root.getTree(user.getPath()); assertFalse(t.hasChild(AccessControlConstants.REP_POLICY)); } -} \ No newline at end of file +} Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserAuthenticationTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserAuthenticationTest.java?rev=1836177&r1=1836176&r2=1836177&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserAuthenticationTest.java (original) +++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserAuthenticationTest.java Wed Jul 18 14:37:06 2018 @@ -20,7 +20,6 @@ import java.security.Principal; import java.util.ArrayList; import java.util.List; import java.util.Set; -import javax.annotation.Nonnull; import javax.jcr.Credentials; import javax.jcr.GuestCredentials; import javax.jcr.SimpleCredentials; @@ -36,6 +35,7 @@ import org.apache.jackrabbit.oak.Abstrac import org.apache.jackrabbit.oak.api.AuthInfo; import org.apache.jackrabbit.oak.spi.security.authentication.Authentication; import org.apache.jackrabbit.oak.spi.security.authentication.ImpersonationCredentials; +import org.jetbrains.annotations.NotNull; import org.junit.Before; import org.junit.Test; @@ -230,7 +230,7 @@ public class UserAuthenticationTest exte public String getUserID() { return userId; } - @Nonnull + @NotNull @Override public String[] getAttributeNames() { return new String[0]; @@ -239,10 +239,10 @@ public class UserAuthenticationTest exte public Object getAttribute(String attributeName) { return null; } - @Nonnull + @NotNull @Override public Set<Principal> getPrincipals() { return null; } } -} \ No newline at end of file +} Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserContextTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserContextTest.java?rev=1836177&r1=1836176&r2=1836177&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserContextTest.java (original) +++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserContextTest.java Wed Jul 18 14:37:06 2018 @@ -20,8 +20,6 @@ import java.util.Collection; import java.util.List; import java.util.Map; import java.util.Set; -import javax.annotation.Nonnull; - import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; @@ -39,6 +37,7 @@ import org.apache.jackrabbit.oak.plugins import org.apache.jackrabbit.oak.plugins.tree.TreeProvider; import org.apache.jackrabbit.oak.spi.security.Context; import org.apache.jackrabbit.oak.spi.security.user.UserConstants; +import org.jetbrains.annotations.NotNull; import org.junit.Test; import org.mockito.Mockito; @@ -51,7 +50,7 @@ public class UserContextTest implements private final Context ctx = UserContext.getInstance(); - private static Tree mockTree(@Nonnull String name, @Nonnull String ntName) { + private static Tree mockTree(@NotNull String name, @NotNull String ntName) { Tree t = Mockito.mock(Tree.class); when(t.getName()).thenReturn(name); when(t.getProperty(JcrConstants.JCR_PRIMARYTYPE)).thenReturn(PropertyStates.createProperty(JcrConstants.JCR_PRIMARYTYPE, ntName, Type.NAME)); @@ -306,4 +305,4 @@ public class UserContextTest implements assertFalse(ctx.definesInternal(mockTree("anyName", ntName))); } } -} \ No newline at end of file +} Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserImporterBaseTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserImporterBaseTest.java?rev=1836177&r1=1836176&r2=1836177&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserImporterBaseTest.java (original) +++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserImporterBaseTest.java Wed Jul 18 14:37:06 2018 @@ -18,7 +18,6 @@ package org.apache.jackrabbit.oak.securi import java.util.ArrayList; import java.util.List; -import javax.annotation.Nonnull; import javax.jcr.ImportUUIDBehavior; import javax.jcr.PropertyType; import javax.jcr.RepositoryException; @@ -54,6 +53,7 @@ import org.apache.jackrabbit.oak.spi.xml import org.apache.jackrabbit.oak.spi.xml.ReferenceChangeTracker; import org.apache.jackrabbit.oak.spi.xml.TextValue; import org.apache.jackrabbit.oak.util.NodeUtil; +import org.jetbrains.annotations.NotNull; import org.mockito.Mockito; import static org.junit.Assert.assertEquals; @@ -66,9 +66,9 @@ public abstract class UserImporterBaseTe TestAction testAction; AuthorizableActionProvider actionProvider = new AuthorizableActionProvider() { - @Nonnull + @NotNull @Override - public List<? extends AuthorizableAction> getAuthorizableActions(@Nonnull SecurityProvider securityProvider) { + public List<? extends AuthorizableAction> getAuthorizableActions(@NotNull SecurityProvider securityProvider) { return (testAction == null) ? ImmutableList.<AuthorizableAction>of() : ImmutableList.of(testAction); } }; @@ -162,7 +162,7 @@ public abstract class UserImporterBaseTe return groupTree; } - PropInfo createPropInfo(@Nonnull String name, final String... values) { + PropInfo createPropInfo(@NotNull String name, final String... values) { List<TextValue> txtValues = Lists.newArrayList(); for (final String v : values) { txtValues.add(new TextValue() { @@ -185,14 +185,14 @@ public abstract class UserImporterBaseTe return new PropInfo(name, PropertyType.STRING, txtValues); } - PropertyDefinition mockPropertyDefinition(@Nonnull String declaringNt, boolean mv) throws Exception { + PropertyDefinition mockPropertyDefinition(@NotNull String declaringNt, boolean mv) throws Exception { PropertyDefinition def = Mockito.mock(PropertyDefinition.class); when(def.isMultiple()).thenReturn(mv); when(def.getDeclaringNodeType()).thenReturn(ReadOnlyNodeTypeManager.getInstance(root, getNamePathMapper()).getNodeType(declaringNt)); return def; } - NodeInfo createNodeInfo(@Nonnull String name, @Nonnull String primaryTypeName) { + NodeInfo createNodeInfo(@NotNull String name, @NotNull String primaryTypeName) { return new NodeInfo(name, primaryTypeName, ImmutableList.<String>of(), null); } @@ -259,4 +259,4 @@ public abstract class UserImporterBaseTe methodCalls.add("onMembersRemoved"); } } -} \ No newline at end of file +} Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserPrincipalProviderWithCacheTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserPrincipalProviderWithCacheTest.java?rev=1836177&r1=1836176&r2=1836177&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserPrincipalProviderWithCacheTest.java (original) +++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserPrincipalProviderWithCacheTest.java Wed Jul 18 14:37:06 2018 @@ -22,7 +22,6 @@ import java.util.ArrayList; import java.util.Enumeration; import java.util.List; import java.util.Set; -import javax.annotation.Nullable; import javax.jcr.NoSuchWorkspaceException; import javax.jcr.SimpleCredentials; import javax.security.auth.Subject; @@ -54,6 +53,7 @@ import org.apache.jackrabbit.oak.spi.sec import org.apache.jackrabbit.oak.spi.security.user.UserConfiguration; import org.apache.jackrabbit.oak.util.NodeUtil; import org.apache.jackrabbit.oak.plugins.tree.TreeUtil; +import org.jetbrains.annotations.Nullable; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -607,4 +607,4 @@ public class UserPrincipalProviderWithCa return (input instanceof GroupPrincipal) && !EveryonePrincipal.getInstance().equals(input); } } -} \ No newline at end of file +}
