Modified: jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserAuthenticationTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserAuthenticationTest.java?rev=1846014&r1=1846013&r2=1846014&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserAuthenticationTest.java (original) +++ jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserAuthenticationTest.java Wed Nov 7 13:57:55 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/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserContextTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserContextTest.java?rev=1846014&r1=1846013&r2=1846014&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserContextTest.java (original) +++ jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserContextTest.java Wed Nov 7 13:57:55 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/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserImporterBaseTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserImporterBaseTest.java?rev=1846014&r1=1846013&r2=1846014&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserImporterBaseTest.java (original) +++ jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserImporterBaseTest.java Wed Nov 7 13:57:55 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/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserPrincipalProviderWithCacheTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserPrincipalProviderWithCacheTest.java?rev=1846014&r1=1846013&r2=1846014&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserPrincipalProviderWithCacheTest.java (original) +++ jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserPrincipalProviderWithCacheTest.java Wed Nov 7 13:57:55 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; @@ -53,6 +52,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; @@ -606,4 +606,4 @@ public class UserPrincipalProviderWithCa return (input instanceof java.security.acl.Group) && !EveryonePrincipal.getInstance().equals(input); } } -} \ No newline at end of file +} Modified: jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserProviderTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserProviderTest.java?rev=1846014&r1=1846013&r2=1846014&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserProviderTest.java (original) +++ jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserProviderTest.java Wed Nov 7 13:57:55 2018 @@ -18,7 +18,6 @@ package org.apache.jackrabbit.oak.securi import java.util.HashMap; import java.util.Map; -import javax.annotation.Nonnull; import javax.jcr.RepositoryException; import javax.jcr.nodetype.NodeDefinition; import javax.jcr.nodetype.NodeType; @@ -38,6 +37,7 @@ import org.apache.jackrabbit.oak.spi.sec import org.apache.jackrabbit.oak.spi.security.user.UserConstants; import org.apache.jackrabbit.oak.spi.security.user.util.UserUtil; import org.apache.jackrabbit.util.Text; +import org.jetbrains.annotations.NotNull; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -349,9 +349,9 @@ public class UserProviderTest { @Test public void testCollisions() throws Exception { ConfigurationParameters config = ConfigurationParameters.of(UserConstants.PARAM_AUTHORIZABLE_NODE_NAME, new AuthorizableNodeName() { - @Nonnull + @NotNull @Override - public String generateNodeName(@Nonnull String authorizableId) { + public String generateNodeName(@NotNull String authorizableId) { return "aaa"; } }); @@ -389,7 +389,7 @@ public class UserProviderTest { assertAutoCreatedItems(up.createGroup("g", null), UserConstants.NT_REP_GROUP, root); } - private static void assertAutoCreatedItems(@Nonnull Tree authorizableTree, @Nonnull String ntName, @Nonnull Root root) throws Exception { + private static void assertAutoCreatedItems(@NotNull Tree authorizableTree, @NotNull String ntName, @NotNull Root root) throws Exception { NodeType repUser = ReadOnlyNodeTypeManager.getInstance(root, NamePathMapper.DEFAULT).getNodeType(ntName); for (NodeDefinition cnd : repUser.getChildNodeDefinitions()) { if (cnd.isAutoCreated()) { Modified: jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UtilsTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UtilsTest.java?rev=1846014&r1=1846013&r2=1846014&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UtilsTest.java (original) +++ jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UtilsTest.java Wed Nov 7 13:57:55 2018 @@ -17,13 +17,12 @@ package org.apache.jackrabbit.oak.security.user; import java.util.Map; -import javax.annotation.Nonnull; - import com.google.common.collect.ImmutableMap; import org.apache.jackrabbit.oak.AbstractSecurityTest; import org.apache.jackrabbit.oak.api.Tree; import org.apache.jackrabbit.oak.commons.PathUtils; import org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants; +import org.jetbrains.annotations.NotNull; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -49,7 +48,7 @@ public class UtilsTest extends AbstractS } } - private void assertEqualPath(@Nonnull Tree expected, @Nonnull Tree result) { + private void assertEqualPath(@NotNull Tree expected, @NotNull Tree result) { assertEquals(expected.getPath(), result.getPath()); } @@ -75,4 +74,4 @@ public class UtilsTest extends AbstractS assertEqualPath(root.getTree(map.get(relPath)), t); } } -} \ No newline at end of file +} Modified: jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/action/GroupActionTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/action/GroupActionTest.java?rev=1846014&r1=1846013&r2=1846014&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/action/GroupActionTest.java (original) +++ jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/action/GroupActionTest.java Wed Nov 7 13:57:55 2018 @@ -18,7 +18,6 @@ package org.apache.jackrabbit.oak.securi import java.util.List; import java.util.Set; -import javax.annotation.Nonnull; import javax.jcr.RepositoryException; import com.google.common.collect.ImmutableList; @@ -39,6 +38,7 @@ import org.apache.jackrabbit.oak.spi.sec import org.apache.jackrabbit.oak.spi.security.user.action.AuthorizableActionProvider; import org.apache.jackrabbit.oak.spi.xml.ImportBehavior; import org.apache.jackrabbit.oak.spi.xml.ProtectedItemImporter; +import org.jetbrains.annotations.NotNull; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -54,9 +54,9 @@ public class GroupActionTest extends Abs final TestGroupAction groupAction = new TestGroupAction(); private 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(groupAction); } }; @@ -195,14 +195,14 @@ public class GroupActionTest extends Abs Authorizable member; @Override - public void onMemberAdded(@Nonnull Group group, @Nonnull Authorizable member, @Nonnull Root root, @Nonnull NamePathMapper namePathMapper) throws RepositoryException { + public void onMemberAdded(@NotNull Group group, @NotNull Authorizable member, @NotNull Root root, @NotNull NamePathMapper namePathMapper) throws RepositoryException { this.group = group; this.member = member; onMemberAddedCalled = true; } @Override - public void onMembersAdded(@Nonnull Group group, @Nonnull Iterable<String> memberIds, @Nonnull Iterable<String> failedIds, @Nonnull Root root, @Nonnull NamePathMapper namePathMapper) throws RepositoryException { + public void onMembersAdded(@NotNull Group group, @NotNull Iterable<String> memberIds, @NotNull Iterable<String> failedIds, @NotNull Root root, @NotNull NamePathMapper namePathMapper) throws RepositoryException { this.group = group; this.memberIds = ImmutableSet.copyOf(memberIds); this.failedIds = ImmutableSet.copyOf(failedIds); @@ -210,14 +210,14 @@ public class GroupActionTest extends Abs } @Override - public void onMemberRemoved(@Nonnull Group group, @Nonnull Authorizable member, @Nonnull Root root, @Nonnull NamePathMapper namePathMapper) throws RepositoryException { + public void onMemberRemoved(@NotNull Group group, @NotNull Authorizable member, @NotNull Root root, @NotNull NamePathMapper namePathMapper) throws RepositoryException { this.group = group; this.member = member; onMemberRemovedCalled = true; } @Override - public void onMembersRemoved(@Nonnull Group group, @Nonnull Iterable<String> memberIds, @Nonnull Iterable<String> failedIds, @Nonnull Root root, @Nonnull NamePathMapper namePathMapper) throws RepositoryException { + public void onMembersRemoved(@NotNull Group group, @NotNull Iterable<String> memberIds, @NotNull Iterable<String> failedIds, @NotNull Root root, @NotNull NamePathMapper namePathMapper) throws RepositoryException { this.group = group; this.memberIds = ImmutableSet.copyOf(memberIds); this.failedIds = ImmutableSet.copyOf(failedIds); Modified: jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/action/PasswordValidationActionTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/action/PasswordValidationActionTest.java?rev=1846014&r1=1846013&r2=1846014&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/action/PasswordValidationActionTest.java (original) +++ jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/action/PasswordValidationActionTest.java Wed Nov 7 13:57:55 2018 @@ -17,8 +17,6 @@ package org.apache.jackrabbit.oak.security.user.action; import java.util.List; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; import javax.jcr.RepositoryException; import javax.jcr.nodetype.ConstraintViolationException; @@ -37,6 +35,8 @@ import org.apache.jackrabbit.oak.spi.sec import org.apache.jackrabbit.oak.spi.security.user.action.AuthorizableActionProvider; import org.apache.jackrabbit.oak.spi.security.user.action.PasswordValidationAction; import org.apache.jackrabbit.oak.spi.security.user.util.PasswordUtil; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -51,9 +51,9 @@ public class PasswordValidationActionTes private final PasswordValidationAction pwAction = new PasswordValidationAction(); private final TestAction testAction = new TestAction(); private 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, testAction); } }; @@ -140,12 +140,12 @@ public class PasswordValidationActionTes } @Override - public void onCreate(@Nonnull User user, @Nullable String password, @Nonnull Root root, @Nonnull NamePathMapper namePathMapper) throws RepositoryException { + public void onCreate(@NotNull User user, @Nullable String password, @NotNull Root root, @NotNull NamePathMapper namePathMapper) throws RepositoryException { onCreateCalled++; } @Override - public void onPasswordChange(@Nonnull User user, @Nullable String newPassword, @Nonnull Root root, @Nonnull NamePathMapper namePathMapper) throws RepositoryException { + public void onPasswordChange(@NotNull User user, @Nullable String newPassword, @NotNull Root root, @NotNull NamePathMapper namePathMapper) throws RepositoryException { onPasswordChangeCalled++; } } Modified: jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/query/QueryUtilTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/query/QueryUtilTest.java?rev=1846014&r1=1846013&r2=1846014&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/query/QueryUtilTest.java (original) +++ jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/query/QueryUtilTest.java Wed Nov 7 13:57:55 2018 @@ -18,7 +18,6 @@ package org.apache.jackrabbit.oak.securi import java.util.List; import java.util.Map; -import javax.annotation.Nonnull; import javax.jcr.NamespaceRegistry; import javax.jcr.RepositoryException; import javax.jcr.Value; @@ -37,6 +36,7 @@ import org.apache.jackrabbit.oak.spi.que import org.apache.jackrabbit.oak.spi.security.ConfigurationParameters; import org.apache.jackrabbit.oak.spi.security.user.AuthorizableType; import org.apache.jackrabbit.oak.spi.security.user.UserConstants; +import org.jetbrains.annotations.NotNull; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -44,7 +44,7 @@ import static org.junit.Assert.assertSam public class QueryUtilTest { - private static void assertSearchRoot(@Nonnull Map<AuthorizableType, String> mapping, @Nonnull ConfigurationParameters params) { + private static void assertSearchRoot(@NotNull Map<AuthorizableType, String> mapping, @NotNull ConfigurationParameters params) { for (AuthorizableType type : mapping.keySet()) { String expected = QueryConstants.SEARCH_ROOT_PATH + mapping.get(type); assertEquals(expected, QueryUtil.getSearchRoot(type, params)); @@ -197,4 +197,4 @@ public class QueryUtilTest { assertSame(RelationOp.LT, QueryUtil.getCollation(QueryBuilder.Direction.DESCENDING)); assertSame(RelationOp.GT, QueryUtil.getCollation(QueryBuilder.Direction.ASCENDING)); } -} \ No newline at end of file +} Modified: jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/query/UserQueryManagerTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/query/UserQueryManagerTest.java?rev=1846014&r1=1846013&r2=1846014&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/query/UserQueryManagerTest.java (original) +++ jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/query/UserQueryManagerTest.java Wed Nov 7 13:57:55 2018 @@ -21,8 +21,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.Iterator; import java.util.List; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; import javax.jcr.RepositoryException; import javax.jcr.Value; import javax.jcr.ValueFactory; @@ -40,6 +38,8 @@ import org.apache.jackrabbit.oak.securit import org.apache.jackrabbit.oak.spi.security.principal.EveryonePrincipal; import org.apache.jackrabbit.oak.spi.security.principal.PrincipalImpl; import org.apache.jackrabbit.oak.spi.security.user.AuthorizableType; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.junit.Before; import org.junit.Test; @@ -117,7 +117,7 @@ public class UserQueryManagerTest extend return g; } - private static void assertResultContainsAuthorizables(@Nonnull Iterator<Authorizable> result, Authorizable... expected) throws RepositoryException { + private static void assertResultContainsAuthorizables(@NotNull Iterator<Authorizable> result, Authorizable... expected) throws RepositoryException { switch (expected.length) { case 0: assertFalse(result.hasNext()); @@ -534,4 +534,4 @@ public class UserQueryManagerTest extend Iterator<Authorizable> result = queryMgr.findAuthorizables(q); assertResultContainsAuthorizables(result, g); } -} \ No newline at end of file +} Modified: jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/query/XPathConditionVisitorTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/query/XPathConditionVisitorTest.java?rev=1846014&r1=1846013&r2=1846014&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/query/XPathConditionVisitorTest.java (original) +++ jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/query/XPathConditionVisitorTest.java Wed Nov 7 13:57:55 2018 @@ -18,7 +18,6 @@ package org.apache.jackrabbit.oak.securi import java.util.Iterator; import java.util.Map; -import javax.annotation.Nonnull; import javax.jcr.Value; import com.google.common.collect.ImmutableMap; @@ -29,6 +28,7 @@ import org.apache.jackrabbit.oak.namepat import org.apache.jackrabbit.oak.namepath.NamePathMapper; import org.apache.jackrabbit.oak.namepath.impl.NamePathMapperImpl; import org.apache.jackrabbit.oak.spi.security.user.UserConstants; +import org.jetbrains.annotations.NotNull; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -60,7 +60,7 @@ public class XPathConditionVisitorTest e return new NamePathMapperImpl(new LocalNameMapper(root, LOCAL)); } - private static void reduceCompoundConditionToSingleTerm(@Nonnull Condition.Compound condition) { + private static void reduceCompoundConditionToSingleTerm(@NotNull Condition.Compound condition) { Iterator<Condition> it = condition.iterator(); if (it.hasNext()) { it.next(); @@ -203,4 +203,4 @@ public class XPathConditionVisitorTest e assertFalse(s.startsWith("(")); assertFalse(s.endsWith("))")); } -} \ No newline at end of file +} Modified: jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/query/XPathQueryBuilderTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/query/XPathQueryBuilderTest.java?rev=1846014&r1=1846013&r2=1846014&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/query/XPathQueryBuilderTest.java (original) +++ jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/query/XPathQueryBuilderTest.java Wed Nov 7 13:57:55 2018 @@ -18,7 +18,6 @@ package org.apache.jackrabbit.oak.securi import java.util.HashMap; import java.util.Map; -import javax.annotation.Nonnull; import javax.jcr.Value; import org.apache.jackrabbit.api.security.user.Authorizable; @@ -27,6 +26,7 @@ import org.apache.jackrabbit.api.securit import org.apache.jackrabbit.api.security.user.User; import org.apache.jackrabbit.oak.AbstractSecurityTest; import org.apache.jackrabbit.oak.spi.security.user.AuthorizableType; +import org.jetbrains.annotations.NotNull; import org.junit.Test; import org.mockito.Mockito; @@ -43,7 +43,7 @@ public class XPathQueryBuilderTest exten private final Value v = Mockito.mock(Value.class); private final String relPath = "re/l/path"; - private void assertPropertyCondition(@Nonnull Condition condition, @Nonnull RelationOp expectedOp) { + private void assertPropertyCondition(@NotNull Condition condition, @NotNull RelationOp expectedOp) { assertTrue(condition instanceof Condition.Property); Condition.Property cp = (Condition.Property) condition; @@ -320,4 +320,4 @@ public class XPathQueryBuilderTest exten Condition c = builder.property(relPath, RelationOp.GT, v); assertPropertyCondition(c, RelationOp.GT); } -} \ No newline at end of file +} Modified: jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/whiteboard/WhiteboardAuthorizableActionProviderTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/whiteboard/WhiteboardAuthorizableActionProviderTest.java?rev=1846014&r1=1846013&r2=1846014&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/whiteboard/WhiteboardAuthorizableActionProviderTest.java (original) +++ jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/whiteboard/WhiteboardAuthorizableActionProviderTest.java Wed Nov 7 13:57:55 2018 @@ -17,8 +17,6 @@ package org.apache.jackrabbit.oak.security.user.whiteboard; import java.util.List; -import javax.annotation.Nonnull; - import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import org.apache.jackrabbit.oak.spi.security.SecurityProvider; @@ -27,6 +25,7 @@ import org.apache.jackrabbit.oak.spi.sec import org.apache.jackrabbit.oak.spi.security.user.action.AuthorizableActionProvider; import org.apache.jackrabbit.oak.spi.whiteboard.DefaultWhiteboard; import org.apache.jackrabbit.oak.spi.whiteboard.Whiteboard; +import org.jetbrains.annotations.NotNull; import org.junit.After; import org.junit.Test; import org.mockito.Mockito; @@ -66,9 +65,9 @@ public class WhiteboardAuthorizableActio actionProvider.start(whiteboard); AuthorizableActionProvider registered = new AuthorizableActionProvider() { - @Nonnull + @NotNull @Override - public List<? extends AuthorizableAction> getAuthorizableActions(@Nonnull SecurityProvider securityProvider) { + public List<? extends AuthorizableAction> getAuthorizableActions(@NotNull SecurityProvider securityProvider) { return ImmutableList.of(new TestAction()); } }; @@ -82,4 +81,4 @@ public class WhiteboardAuthorizableActio private static final class TestAction extends AbstractAuthorizableAction {} -} \ No newline at end of file +} Modified: jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/whiteboard/WhiteboardAuthorizableNodeNameTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/whiteboard/WhiteboardAuthorizableNodeNameTest.java?rev=1846014&r1=1846013&r2=1846014&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/whiteboard/WhiteboardAuthorizableNodeNameTest.java (original) +++ jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/whiteboard/WhiteboardAuthorizableNodeNameTest.java Wed Nov 7 13:57:55 2018 @@ -16,12 +16,11 @@ */ package org.apache.jackrabbit.oak.security.user.whiteboard; -import javax.annotation.Nonnull; - import com.google.common.collect.ImmutableMap; import org.apache.jackrabbit.oak.spi.security.user.AuthorizableNodeName; import org.apache.jackrabbit.oak.spi.whiteboard.DefaultWhiteboard; import org.apache.jackrabbit.oak.spi.whiteboard.Whiteboard; +import org.jetbrains.annotations.NotNull; import org.junit.After; import org.junit.Test; @@ -55,13 +54,13 @@ public class WhiteboardAuthorizableNodeN authorizableNodeName.start(whiteboard); AuthorizableNodeName registered = new AuthorizableNodeName() { - @Nonnull + @NotNull @Override - public String generateNodeName(@Nonnull String authorizableId) { + public String generateNodeName(@NotNull String authorizableId) { return "generated"; } }; whiteboard.register(AuthorizableNodeName.class, registered, ImmutableMap.of()); assertEquals(registered.generateNodeName(TEST_ID), authorizableNodeName.generateNodeName(TEST_ID)); } -} \ No newline at end of file +} Modified: jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/whiteboard/WhiteboardUserAuthenticationFactoryTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/whiteboard/WhiteboardUserAuthenticationFactoryTest.java?rev=1846014&r1=1846013&r2=1846014&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/whiteboard/WhiteboardUserAuthenticationFactoryTest.java (original) +++ jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/whiteboard/WhiteboardUserAuthenticationFactoryTest.java Wed Nov 7 13:57:55 2018 @@ -18,14 +18,13 @@ package org.apache.jackrabbit.oak.securi import java.util.ArrayList; import java.util.List; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import org.apache.jackrabbit.oak.api.Root; import org.apache.jackrabbit.oak.security.user.whiteboard.WhiteboardUserAuthenticationFactory; import org.apache.jackrabbit.oak.spi.security.authentication.Authentication; import org.apache.jackrabbit.oak.spi.security.user.UserAuthenticationFactory; import org.apache.jackrabbit.oak.spi.security.user.UserConfiguration; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.junit.Test; import org.mockito.Mockito; @@ -38,7 +37,7 @@ public class WhiteboardUserAuthenticatio private final UserConfiguration userConfiguration = Mockito.mock(UserConfiguration.class); private WhiteboardUserAuthenticationFactory createFactory(@Nullable final UserAuthenticationFactory defaultFactory, - @Nonnull final String... userIds) { + @NotNull final String... userIds) { return new WhiteboardUserAuthenticationFactory(defaultFactory) { @Override protected List<UserAuthenticationFactory> getServices() { @@ -51,7 +50,7 @@ public class WhiteboardUserAuthenticatio }; } - @Nonnull + @NotNull private UserConfiguration getUserConfiguration() { return userConfiguration; } @@ -99,12 +98,12 @@ public class WhiteboardUserAuthenticatio private final String userId; - private TestUserAuthenticationFactory(@Nonnull String userId) { + private TestUserAuthenticationFactory(@NotNull String userId) { this.userId = userId; } @Override - public Authentication getAuthentication(@Nonnull UserConfiguration configuration, @Nonnull Root root, @Nullable String userId) { + public Authentication getAuthentication(@NotNull UserConfiguration configuration, @NotNull Root root, @Nullable String userId) { if (this.userId.equals(userId)) { return Mockito.mock(Authentication.class); } else { Modified: jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/commit/BackgroundObserverTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/commit/BackgroundObserverTest.java?rev=1846014&r1=1846013&r2=1846014&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/commit/BackgroundObserverTest.java (original) +++ jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/commit/BackgroundObserverTest.java Wed Nov 7 13:57:55 2018 @@ -36,14 +36,13 @@ import java.util.concurrent.Executor; import java.util.concurrent.ExecutorService; import java.util.concurrent.TimeUnit; -import javax.annotation.Nonnull; - import org.apache.jackrabbit.oak.api.Type; import org.apache.jackrabbit.oak.plugins.observation.Filter; import org.apache.jackrabbit.oak.plugins.observation.FilteringAwareObserver; import org.apache.jackrabbit.oak.plugins.observation.FilteringObserver; import org.apache.jackrabbit.oak.spi.state.NodeBuilder; import org.apache.jackrabbit.oak.spi.state.NodeState; +import org.jetbrains.annotations.NotNull; import org.junit.After; import org.junit.Test; @@ -118,7 +117,7 @@ public class BackgroundObserverTest { volatile NodeState previous; @Override - public void contentChanged(@Nonnull final NodeState root, @Nonnull CommitInfo info) { + public void contentChanged(@NotNull final NodeState root, @NotNull CommitInfo info) { if (root.hasProperty("done")) { done(assertions); } else if (previous != null) { Modified: jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/util/NodeUtil.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/util/NodeUtil.java?rev=1846014&r1=1846013&r2=1846014&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/util/NodeUtil.java (original) +++ jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/util/NodeUtil.java Wed Nov 7 13:57:55 2018 @@ -18,9 +18,6 @@ package org.apache.jackrabbit.oak.util; import java.util.Arrays; import java.util.Calendar; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; import javax.jcr.AccessDeniedException; import javax.jcr.RepositoryException; import javax.jcr.Value; @@ -37,6 +34,8 @@ import org.apache.jackrabbit.oak.plugins import org.apache.jackrabbit.oak.plugins.tree.TreeUtil; import org.apache.jackrabbit.util.ISO8601; import org.apache.jackrabbit.util.Text; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -70,17 +69,17 @@ public class NodeUtil { this(tree, NamePathMapper.DEFAULT); } - @Nonnull + @NotNull public Tree getTree() { return tree; } - @Nonnull + @NotNull public String getName() { return mapper.getJcrName(tree.getName()); } - @Nonnull + @NotNull public NodeUtil getParent() { return new NodeUtil(tree.getParent(), mapper); } @@ -89,7 +88,7 @@ public class NodeUtil { return tree.hasChild(name); } - @CheckForNull + @Nullable public NodeUtil getChild(String name) { Tree child = tree.getChild(name); return child.exists() ? new NodeUtil(child, mapper) : null; @@ -109,7 +108,7 @@ public class NodeUtil { * @return The new child node with the specified name and primary type. * @throws AccessDeniedException If the child does not exist after creation. */ - @Nonnull + @NotNull public NodeUtil addChild(String name, String primaryTypeName) throws AccessDeniedException { Tree child = tree.addChild(name); if (!child.exists()) { @@ -129,7 +128,7 @@ public class NodeUtil { * @return The new child node with the specified name and primary type. * @throws AccessDeniedException If the child does not exist after creation. */ - @Nonnull + @NotNull public NodeUtil getOrAddChild(String name, String primaryTypeName) throws AccessDeniedException { NodeUtil child = getChild(name); return (child != null) ? child : addChild(name, primaryTypeName); @@ -153,7 +152,7 @@ public class NodeUtil { * @throws AccessDeniedException If the any intermediate tree does not exist * and cannot be created. */ - @Nonnull + @NotNull public NodeUtil getOrAddTree(String relativePath, String primaryTypeName) throws AccessDeniedException { if (PathUtils.denotesCurrent(relativePath)) { return this; @@ -192,7 +191,7 @@ public class NodeUtil { tree.setProperty(name, value); } - @CheckForNull + @Nullable public String getString(String name, @Nullable String defaultValue) { String str = TreeUtil.getString(tree, name); return (str != null) ? str : defaultValue; @@ -206,7 +205,7 @@ public class NodeUtil { tree.setProperty(name, Arrays.asList(values), STRINGS); } - @CheckForNull + @Nullable public String getName(String name, @Nullable String defaultValue) { PropertyState property = tree.getProperty(name); if (property != null && !property.isArray()) { @@ -245,7 +244,7 @@ public class NodeUtil { } } - public void setLong(@Nonnull String name, long value) { + public void setLong(@NotNull String name, long value) { tree.setProperty(name, value); } @@ -257,7 +256,7 @@ public class NodeUtil { } } - @Nonnull + @NotNull private String getOakName(String jcrName) { String oakName = (jcrName == null) ? null : mapper.getOakNameOrNull(jcrName); if (oakName == null) { Modified: jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/util/NodeUtilTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/util/NodeUtilTest.java?rev=1846014&r1=1846013&r2=1846014&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/util/NodeUtilTest.java (original) +++ jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/util/NodeUtilTest.java Wed Nov 7 13:57:55 2018 @@ -17,11 +17,10 @@ package org.apache.jackrabbit.oak.util; import java.util.Map; -import javax.annotation.Nonnull; - import com.google.common.collect.ImmutableMap; import org.apache.jackrabbit.oak.AbstractSecurityTest; import org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants; +import org.jetbrains.annotations.NotNull; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -47,7 +46,7 @@ public class NodeUtilTest extends Abstra } } - private void assertEqualNodeUtil(@Nonnull NodeUtil expected, @Nonnull NodeUtil result) { + private void assertEqualNodeUtil(@NotNull NodeUtil expected, @NotNull NodeUtil result) { assertEquals(expected.getTree().getPath(), result.getTree().getPath()); } @@ -73,4 +72,4 @@ public class NodeUtilTest extends Abstra assertEqualNodeUtil(new NodeUtil(root.getTree(map.get(relPath))), n); } } -} \ No newline at end of file +}
