Modified: jackrabbit/oak/branches/1.8/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/AbstractAccessControlManagerTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/AbstractAccessControlManagerTest.java?rev=1846033&r1=1846032&r2=1846033&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/AbstractAccessControlManagerTest.java (original) +++ jackrabbit/oak/branches/1.8/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/AbstractAccessControlManagerTest.java Wed Nov 7 14:29:24 2018 @@ -22,7 +22,6 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; import java.util.Set; -import javax.annotation.Nonnull; import javax.jcr.AccessDeniedException; import javax.jcr.PathNotFoundException; import javax.jcr.RepositoryException; @@ -49,6 +48,7 @@ import org.apache.jackrabbit.oak.spi.sec import org.apache.jackrabbit.oak.spi.security.principal.EveryonePrincipal; import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeConfiguration; import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeConstants; +import org.jetbrains.annotations.NotNull; import org.junit.Before; import org.junit.Test; import org.mockito.Mockito; @@ -130,7 +130,7 @@ public class AbstractAccessControlManage acMgr = createAccessControlManager(root, getNamePathMapper()); } - private AbstractAccessControlManager createAccessControlManager(@Nonnull Root root, @Nonnull NamePathMapper namePathMapper) { + private AbstractAccessControlManager createAccessControlManager(@NotNull Root root, @NotNull NamePathMapper namePathMapper) { return new TestAcMgr(root, namePathMapper, securityProvider); } @@ -144,7 +144,7 @@ public class AbstractAccessControlManage return invalid; } - private static Privilege mockPrivilege(@Nonnull String name) { + private static Privilege mockPrivilege(@NotNull String name) { Privilege p = Mockito.mock(Privilege.class); when(p.getName()).thenReturn(name); return p; @@ -227,7 +227,7 @@ public class AbstractAccessControlManage public void testGetTreeDefinesAcContent() throws Exception { Context ctx = new Context.Default() { @Override - public boolean definesTree(@Nonnull Tree tree) { + public boolean definesTree(@NotNull Tree tree) { return true; } }; @@ -436,7 +436,7 @@ public class AbstractAccessControlManage private final class TestAcMgr extends AbstractAccessControlManager { - protected TestAcMgr(@Nonnull Root root, @Nonnull NamePathMapper namePathMapper, @Nonnull SecurityProvider securityProvider) { + protected TestAcMgr(@NotNull Root root, @NotNull NamePathMapper namePathMapper, @NotNull SecurityProvider securityProvider) { super(root, namePathMapper, securityProvider); } @@ -480,4 +480,4 @@ public class AbstractAccessControlManage throw new UnsupportedOperationException(); } } -} \ No newline at end of file +}
Modified: jackrabbit/oak/branches/1.8/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/ImmutableACLTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/ImmutableACLTest.java?rev=1846033&r1=1846032&r2=1846033&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/ImmutableACLTest.java (original) +++ jackrabbit/oak/branches/1.8/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/ImmutableACLTest.java Wed Nov 7 14:29:24 2018 @@ -19,8 +19,6 @@ package org.apache.jackrabbit.oak.spi.se import java.util.ArrayList; import java.util.Collections; import java.util.List; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; import javax.jcr.Value; import javax.jcr.security.AccessControlEntry; import javax.jcr.security.AccessControlException; @@ -32,6 +30,8 @@ import org.apache.jackrabbit.oak.namepat import org.apache.jackrabbit.oak.spi.security.authorization.restriction.RestrictionProvider; import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeBits; import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeConstants; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.junit.Before; import org.junit.Test; import org.mockito.Mockito; @@ -65,9 +65,9 @@ public class ImmutableACLTest extends Ab } protected ImmutableACL createACL(@Nullable String jcrPath, - @Nonnull List<JackrabbitAccessControlEntry> entries, - @Nonnull NamePathMapper namePathMapper, - @Nonnull RestrictionProvider restrictionProvider) { + @NotNull List<JackrabbitAccessControlEntry> entries, + @NotNull NamePathMapper namePathMapper, + @NotNull RestrictionProvider restrictionProvider) { String oakPath = (jcrPath == null) ? null : namePathMapper.getOakPath(jcrPath); return new ImmutableACL(oakPath, entries, restrictionProvider, namePathMapper); } @@ -219,4 +219,4 @@ public class ImmutableACLTest extends Ab assertFalse(hc == new TestACL("/anotherPath", rp, getNamePathMapper()).hashCode()); assertFalse(hc == new TestACL(getTestPath(), rp, getNamePathMapper(), ace1, ace2).hashCode()); } -} \ No newline at end of file +} Modified: jackrabbit/oak/branches/1.8/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/TestACL.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/TestACL.java?rev=1846033&r1=1846032&r2=1846033&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/TestACL.java (original) +++ jackrabbit/oak/branches/1.8/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/TestACL.java Wed Nov 7 14:29:24 2018 @@ -20,8 +20,6 @@ import java.security.Principal; import java.util.ArrayList; import java.util.List; import java.util.Map; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; import javax.jcr.RepositoryException; import javax.jcr.Value; import javax.jcr.security.AccessControlEntry; @@ -32,6 +30,8 @@ import com.google.common.collect.Lists; import org.apache.jackrabbit.api.security.JackrabbitAccessControlEntry; import org.apache.jackrabbit.oak.namepath.NamePathMapper; import org.apache.jackrabbit.oak.spi.security.authorization.restriction.RestrictionProvider; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * Test implementation of AbstractAccessControlList @@ -42,18 +42,18 @@ public final class TestACL extends Abstr private final RestrictionProvider restrictionProvider; public TestACL(@Nullable String jcrPath, - @Nonnull RestrictionProvider restrictionProvider, - @Nonnull NamePathMapper namePathMapper, - @Nonnull List<JackrabbitAccessControlEntry> entries) { + @NotNull RestrictionProvider restrictionProvider, + @NotNull NamePathMapper namePathMapper, + @NotNull List<JackrabbitAccessControlEntry> entries) { super((jcrPath == null) ? null : namePathMapper.getOakPath(jcrPath), namePathMapper); this.entries.addAll(entries); this.restrictionProvider = restrictionProvider; } public TestACL(@Nullable String jcrPath, - @Nonnull RestrictionProvider restrictionProvider, - @Nonnull NamePathMapper namePathMapper, - @Nonnull JackrabbitAccessControlEntry... entry) { + @NotNull RestrictionProvider restrictionProvider, + @NotNull NamePathMapper namePathMapper, + @NotNull JackrabbitAccessControlEntry... entry) { this(jcrPath, restrictionProvider, namePathMapper, Lists.newArrayList(entry)); } @@ -88,15 +88,15 @@ public final class TestACL extends Abstr throw new UnsupportedOperationException(); } - @Nonnull + @NotNull @Override public List<JackrabbitAccessControlEntry> getEntries() { return entries; } - @Nonnull + @NotNull @Override public RestrictionProvider getRestrictionProvider() { return restrictionProvider; } -} \ No newline at end of file +} Modified: jackrabbit/oak/branches/1.8/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/permission/PermissionsTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/permission/PermissionsTest.java?rev=1846033&r1=1846032&r2=1846033&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/permission/PermissionsTest.java (original) +++ jackrabbit/oak/branches/1.8/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/permission/PermissionsTest.java Wed Nov 7 14:29:24 2018 @@ -21,7 +21,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; -import javax.annotation.Nonnull; import javax.jcr.Session; import com.google.common.base.Joiner; @@ -43,6 +42,7 @@ import org.apache.jackrabbit.oak.spi.sec import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeConstants; import org.apache.jackrabbit.oak.spi.version.VersionConstants; import org.apache.jackrabbit.util.Text; +import org.jetbrains.annotations.NotNull; import org.junit.Before; import org.junit.Test; import org.mockito.Mockito; @@ -81,7 +81,7 @@ public class PermissionsTest { when(existingTree.getProperty(JcrConstants.JCR_PRIMARYTYPE)).thenReturn(PropertyStates.createProperty(JcrConstants.JCR_PRIMARYTYPE, "rep:root")); } - private static TreeLocation createNonExistingTreeLocation(@Nonnull String path) { + private static TreeLocation createNonExistingTreeLocation(@NotNull String path) { String name = Text.getName(path); Tree nonExistingTree = Mockito.mock(Tree.class); when(nonExistingTree.exists()).thenReturn(false); @@ -561,4 +561,4 @@ public class PermissionsTest { } } } -} \ No newline at end of file +} Modified: jackrabbit/oak/branches/1.8/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/AbstractRestrictionProviderTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/AbstractRestrictionProviderTest.java?rev=1846033&r1=1846032&r2=1846033&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/AbstractRestrictionProviderTest.java (original) +++ jackrabbit/oak/branches/1.8/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/AbstractRestrictionProviderTest.java Wed Nov 7 14:29:24 2018 @@ -20,8 +20,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.Set; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; import javax.jcr.PropertyType; import javax.jcr.Value; import javax.jcr.ValueFactory; @@ -37,6 +35,8 @@ import org.apache.jackrabbit.oak.namepat import org.apache.jackrabbit.oak.plugins.memory.PropertyStates; import org.apache.jackrabbit.oak.plugins.value.jcr.ValueFactoryImpl; import org.apache.jackrabbit.oak.spi.security.authorization.accesscontrol.AccessControlConstants; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.junit.Before; import org.junit.Test; import org.mockito.Mockito; @@ -78,15 +78,15 @@ public class AbstractRestrictionProvider RestrictionDefinition mand = new RestrictionDefinitionImpl("mandatory", Type.BOOLEAN, true); supported = ImmutableMap.of(glob.getName(), glob, nts.getName(), nts, mand.getName(), mand); restrictionProvider = new AbstractRestrictionProvider(supported) { - @Nonnull + @NotNull @Override - public RestrictionPattern getPattern(@Nullable String oakPath, @Nonnull Tree tree) { + public RestrictionPattern getPattern(@Nullable String oakPath, @NotNull Tree tree) { throw new UnsupportedOperationException(); } - @Nonnull + @NotNull @Override - public RestrictionPattern getPattern(@Nullable String oakPath, @Nonnull Set<Restriction> restrictions) { + public RestrictionPattern getPattern(@Nullable String oakPath, @NotNull Set<Restriction> restrictions) { throw new UnsupportedOperationException(); } }; @@ -365,4 +365,4 @@ public class AbstractRestrictionProvider restrictionProvider.validateRestrictions(testPath, getAceTree(mand, ntNames)); restrictionProvider.validateRestrictions(testPath, getAceTree(mand, glob, ntNames)); } -} \ No newline at end of file +} Modified: jackrabbit/oak/branches/1.8/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/CompositePatternTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/CompositePatternTest.java?rev=1846033&r1=1846032&r2=1846033&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/CompositePatternTest.java (original) +++ jackrabbit/oak/branches/1.8/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/CompositePatternTest.java Wed Nov 7 14:29:24 2018 @@ -17,13 +17,12 @@ package org.apache.jackrabbit.oak.spi.security.authorization.restriction; import java.util.List; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import com.google.common.collect.ImmutableList; import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.api.Tree; import org.apache.jackrabbit.oak.plugins.memory.PropertyStates; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.junit.Test; import org.mockito.Mockito; @@ -99,12 +98,12 @@ public class CompositePatternTest { } @Override - public boolean matches(@Nonnull Tree tree, @Nullable PropertyState property) { + public boolean matches(@NotNull Tree tree, @Nullable PropertyState property) { return matches; } @Override - public boolean matches(@Nonnull String path) { + public boolean matches(@NotNull String path) { return matches; } @@ -113,4 +112,4 @@ public class CompositePatternTest { return matches; } } -} \ No newline at end of file +} Modified: jackrabbit/oak/branches/1.8/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/CompositeRestrictionProviderTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/CompositeRestrictionProviderTest.java?rev=1846033&r1=1846032&r2=1846033&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/CompositeRestrictionProviderTest.java (original) +++ jackrabbit/oak/branches/1.8/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/CompositeRestrictionProviderTest.java Wed Nov 7 14:29:24 2018 @@ -21,8 +21,6 @@ import java.util.Collections; import java.util.List; import java.util.Map; import java.util.Set; -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.namepat import org.apache.jackrabbit.oak.plugins.memory.PropertyStates; import org.apache.jackrabbit.oak.plugins.value.jcr.ValueFactoryImpl; import org.apache.jackrabbit.oak.spi.security.authorization.accesscontrol.AccessControlConstants; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.junit.Test; import org.mockito.Mockito; @@ -64,15 +64,15 @@ public class CompositeRestrictionProvide REP_GLOB, GLOB_RESTRICTION.getDefinition(), REP_PREFIXES, NT_PREFIXES_RESTRICTION.getDefinition() )) { - @Nonnull + @NotNull @Override - public RestrictionPattern getPattern(@Nullable String oakPath, @Nonnull Tree tree) { + public RestrictionPattern getPattern(@Nullable String oakPath, @NotNull Tree tree) { throw new UnsupportedOperationException(); } - @Nonnull + @NotNull @Override - public RestrictionPattern getPattern(@Nullable String oakPath, @Nonnull Set<Restriction> restrictions) { + public RestrictionPattern getPattern(@Nullable String oakPath, @NotNull Set<Restriction> restrictions) { throw new UnsupportedOperationException(); } }; @@ -80,15 +80,15 @@ public class CompositeRestrictionProvide NAME_BOOLEAN, MANDATORY_BOOLEAN_RESTRICTION.getDefinition(), NAME_LONGS, LONGS_RESTRICTION.getDefinition() )) { - @Nonnull + @NotNull @Override - public RestrictionPattern getPattern(@Nullable String oakPath, @Nonnull Tree tree) { + public RestrictionPattern getPattern(@Nullable String oakPath, @NotNull Tree tree) { throw new UnsupportedOperationException(); } - @Nonnull + @NotNull @Override - public RestrictionPattern getPattern(@Nullable String oakPath, @Nonnull Set<Restriction> restrictions) { + public RestrictionPattern getPattern(@Nullable String oakPath, @NotNull Set<Restriction> restrictions) { throw new UnsupportedOperationException(); } }; @@ -256,21 +256,21 @@ public class CompositeRestrictionProvide Tree aceTree = getAceTree(rWithInvalidDefinition, MANDATORY_BOOLEAN_RESTRICTION); RestrictionProvider rp = new AbstractRestrictionProvider(ImmutableMap.of(REP_GLOB, GLOB_RESTRICTION.getDefinition())) { - @Nonnull + @NotNull @Override - public Set<Restriction> readRestrictions(String oakPath, @Nonnull Tree aceTree) { + public Set<Restriction> readRestrictions(String oakPath, @NotNull Tree aceTree) { return ImmutableSet.of(rWithInvalidDefinition); } - @Nonnull + @NotNull @Override - public RestrictionPattern getPattern(@Nullable String oakPath, @Nonnull Tree tree) { + public RestrictionPattern getPattern(@Nullable String oakPath, @NotNull Tree tree) { throw new UnsupportedOperationException(); } - @Nonnull + @NotNull @Override - public RestrictionPattern getPattern(@Nullable String oakPath, @Nonnull Set<Restriction> restrictions) { + public RestrictionPattern getPattern(@Nullable String oakPath, @NotNull Set<Restriction> restrictions) { throw new UnsupportedOperationException(); } }; @@ -283,21 +283,21 @@ public class CompositeRestrictionProvide Tree aceTree = getAceTree(UNKNOWN_RESTRICTION, MANDATORY_BOOLEAN_RESTRICTION); RestrictionProvider rp = new AbstractRestrictionProvider(ImmutableMap.of(REP_GLOB, GLOB_RESTRICTION.getDefinition())) { - @Nonnull + @NotNull @Override - public Set<Restriction> readRestrictions(String oakPath, @Nonnull Tree aceTree) { + public Set<Restriction> readRestrictions(String oakPath, @NotNull Tree aceTree) { return ImmutableSet.of(UNKNOWN_RESTRICTION); } - @Nonnull + @NotNull @Override - public RestrictionPattern getPattern(@Nullable String oakPath, @Nonnull Tree tree) { + public RestrictionPattern getPattern(@Nullable String oakPath, @NotNull Tree tree) { throw new UnsupportedOperationException(); } - @Nonnull + @NotNull @Override - public RestrictionPattern getPattern(@Nullable String oakPath, @Nonnull Set<Restriction> restrictions) { + public RestrictionPattern getPattern(@Nullable String oakPath, @NotNull Set<Restriction> restrictions) { throw new UnsupportedOperationException(); } }; @@ -314,15 +314,15 @@ public class CompositeRestrictionProvide @Test public void testGetRestrictionPatternSingleEmpty() throws Exception { assertSame(RestrictionPattern.EMPTY, CompositeRestrictionProvider.newInstance(new AbstractRestrictionProvider(ImmutableMap.of()) { - @Nonnull + @NotNull @Override - public RestrictionPattern getPattern(@Nullable String oakPath, @Nonnull Tree tree) { + public RestrictionPattern getPattern(@Nullable String oakPath, @NotNull Tree tree) { 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) { return RestrictionPattern.EMPTY; } }).getPattern("/test", ImmutableSet.of(GLOB_RESTRICTION))); @@ -331,29 +331,29 @@ public class CompositeRestrictionProvide @Test public void testGetRestrictionPatternAllEmpty() throws Exception { assertSame(RestrictionPattern.EMPTY, CompositeRestrictionProvider.newInstance(new AbstractRestrictionProvider(ImmutableMap.of()) { - @Nonnull + @NotNull @Override - public RestrictionPattern getPattern(@Nullable String oakPath, @Nonnull Tree tree) { + public RestrictionPattern getPattern(@Nullable String oakPath, @NotNull Tree tree) { 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) { return RestrictionPattern.EMPTY; } }, new AbstractRestrictionProvider(ImmutableMap.of()) { - @Nonnull + @NotNull @Override - public RestrictionPattern getPattern(@Nullable String oakPath, @Nonnull Tree tree) { + public RestrictionPattern getPattern(@Nullable String oakPath, @NotNull Tree tree) { 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) { return RestrictionPattern.EMPTY; } }).getPattern("/test", getAceTree(NT_PREFIXES_RESTRICTION))); } -} \ No newline at end of file +} Modified: jackrabbit/oak/branches/1.8/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/RestrictionDefinitionImplTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/RestrictionDefinitionImplTest.java?rev=1846033&r1=1846032&r2=1846033&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/RestrictionDefinitionImplTest.java (original) +++ jackrabbit/oak/branches/1.8/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/RestrictionDefinitionImplTest.java Wed Nov 7 14:29:24 2018 @@ -18,9 +18,8 @@ package org.apache.jackrabbit.oak.spi.se import java.util.ArrayList; import java.util.List; -import javax.annotation.Nonnull; - import org.apache.jackrabbit.oak.api.Type; +import org.jetbrains.annotations.NotNull; import org.junit.Before; import org.junit.Test; @@ -94,12 +93,12 @@ public class RestrictionDefinitionImplTe defs.add(new RestrictionDefinitionImpl(name, Type.NAMES, true)); // - different impl defs.add(new RestrictionDefinition() { - @Nonnull + @NotNull @Override public String getName() { return name; } - @Nonnull + @NotNull @Override public Type<?> getRequiredType() { return Type.NAME; Modified: jackrabbit/oak/branches/1.8/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/RestrictionImplTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/RestrictionImplTest.java?rev=1846033&r1=1846032&r2=1846033&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/RestrictionImplTest.java (original) +++ jackrabbit/oak/branches/1.8/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/RestrictionImplTest.java Wed Nov 7 14:29:24 2018 @@ -18,12 +18,11 @@ package org.apache.jackrabbit.oak.spi.se import java.util.ArrayList; import java.util.List; -import javax.annotation.Nonnull; - import com.google.common.collect.ImmutableList; import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.api.Type; import org.apache.jackrabbit.oak.plugins.memory.PropertyStates; +import org.jetbrains.annotations.NotNull; import org.junit.Before; import org.junit.Test; @@ -128,13 +127,13 @@ public class RestrictionImplTest { rs.add(new RestrictionImpl(createProperty(name, value, type), !isMandatory)); // - different impl rs.add(new Restriction() { - @Nonnull + @NotNull @Override public RestrictionDefinition getDefinition() { return new RestrictionDefinitionImpl(name, type, isMandatory); } - @Nonnull + @NotNull @Override public PropertyState getProperty() { return createProperty(name, value, type); @@ -167,13 +166,13 @@ public class RestrictionImplTest { rs.add(new RestrictionImpl(createProperty(name, value, type), !isMandatory)); // - different impl rs.add(new Restriction() { - @Nonnull + @NotNull @Override public RestrictionDefinition getDefinition() { return new RestrictionDefinitionImpl(name, type, isMandatory); } - @Nonnull + @NotNull @Override public PropertyState getProperty() { return createProperty(name, value, type); Modified: jackrabbit/oak/branches/1.8/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/CompositePrincipalConfigurationTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/CompositePrincipalConfigurationTest.java?rev=1846033&r1=1846032&r2=1846033&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/CompositePrincipalConfigurationTest.java (original) +++ jackrabbit/oak/branches/1.8/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/CompositePrincipalConfigurationTest.java Wed Nov 7 14:29:24 2018 @@ -23,10 +23,6 @@ import java.util.Collections; import java.util.Iterator; import java.util.List; import java.util.Set; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import com.google.common.collect.ImmutableSet; import org.apache.jackrabbit.api.security.principal.PrincipalManager; @@ -35,6 +31,8 @@ import org.apache.jackrabbit.oak.namepat import org.apache.jackrabbit.oak.spi.security.AbstractCompositeConfigurationTest; import org.apache.jackrabbit.oak.spi.security.ConfigurationBase; import org.apache.jackrabbit.oak.spi.security.ConfigurationParameters; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.junit.Before; import org.junit.Test; import org.mockito.Mockito; @@ -142,41 +140,41 @@ public class CompositePrincipalConfigura private final class TestPrincipalConfiguration extends ConfigurationBase implements PrincipalConfiguration { - @Nonnull + @NotNull @Override public PrincipalManager getPrincipalManager(Root root, NamePathMapper namePathMapper) { return new PrincipalManagerImpl(getPrincipalProvider(root, namePathMapper)); } - @Nonnull + @NotNull @Override public PrincipalProvider getPrincipalProvider(Root root, NamePathMapper namePathMapper) { return new PrincipalProvider() { - @CheckForNull + @Nullable @Override - public Principal getPrincipal(@Nonnull String principalName) { + public Principal getPrincipal(@NotNull String principalName) { return null; } - @Nonnull + @NotNull @Override - public Set<Group> getGroupMembership(@Nonnull Principal principal) { + public Set<Group> getGroupMembership(@NotNull Principal principal) { return ImmutableSet.of(); } - @Nonnull + @NotNull @Override - public Set<? extends Principal> getPrincipals(@Nonnull String userID) { + public Set<? extends Principal> getPrincipals(@NotNull String userID) { return ImmutableSet.of(); } - @Nonnull + @NotNull @Override public Iterator<? extends Principal> findPrincipals(@Nullable String nameHint, int searchType) { return Collections.emptyIterator(); } - @Nonnull + @NotNull @Override public Iterator<? extends Principal> findPrincipals(int searchType) { return Collections.emptyIterator(); @@ -184,7 +182,7 @@ public class CompositePrincipalConfigura }; } - @Nonnull + @NotNull @Override public String getName() { return PrincipalConfiguration.NAME; @@ -193,22 +191,22 @@ public class CompositePrincipalConfigura private final class TestEmptyConfiguration extends ConfigurationBase implements PrincipalConfiguration { - @Nonnull + @NotNull @Override public PrincipalManager getPrincipalManager(Root root, NamePathMapper namePathMapper) { return new PrincipalManagerImpl(getPrincipalProvider(root, namePathMapper)); } - @Nonnull + @NotNull @Override public PrincipalProvider getPrincipalProvider(Root root, NamePathMapper namePathMapper) { return EmptyPrincipalProvider.INSTANCE; } - @Nonnull + @NotNull @Override public String getName() { return PrincipalConfiguration.NAME; } } -} \ No newline at end of file +} Modified: jackrabbit/oak/branches/1.8/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/CompositePrincipalProviderTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/CompositePrincipalProviderTest.java?rev=1846033&r1=1846032&r2=1846033&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/CompositePrincipalProviderTest.java (original) +++ jackrabbit/oak/branches/1.8/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/CompositePrincipalProviderTest.java Wed Nov 7 14:29:24 2018 @@ -19,13 +19,12 @@ package org.apache.jackrabbit.oak.spi.se import java.security.Principal; import java.security.acl.Group; import java.util.Iterator; -import javax.annotation.Nonnull; - import com.google.common.base.Predicate; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; import org.apache.jackrabbit.api.security.principal.PrincipalManager; +import org.jetbrains.annotations.NotNull; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -45,7 +44,7 @@ public class CompositePrincipalProviderT return Iterables.concat(pp1.getTestPrincipals(), pp2.getTestPrincipals()); } - private static void assertIterator(@Nonnull Iterable<? extends Principal> expected, @Nonnull Iterator<? extends Principal> result) { + private static void assertIterator(@NotNull Iterable<? extends Principal> expected, @NotNull Iterator<? extends Principal> result) { assertEquals(ImmutableSet.copyOf(expected), ImmutableSet.copyOf(result)); } @@ -135,4 +134,4 @@ public class CompositePrincipalProviderT Iterator<? extends Principal> result = cpp.findPrincipals(PrincipalManager.SEARCH_TYPE_ALL); assertIterator(Iterables.concat(ImmutableSet.of(EveryonePrincipal.getInstance()), testPrincipals()), result); } -} \ No newline at end of file +} Modified: jackrabbit/oak/branches/1.8/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/PrincipalManagerImplTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/PrincipalManagerImplTest.java?rev=1846033&r1=1846032&r2=1846033&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/PrincipalManagerImplTest.java (original) +++ jackrabbit/oak/branches/1.8/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/PrincipalManagerImplTest.java Wed Nov 7 14:29:24 2018 @@ -20,12 +20,11 @@ import java.security.Principal; import java.security.acl.Group; import java.util.Enumeration; import java.util.Iterator; -import javax.annotation.Nonnull; - import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterators; import org.apache.jackrabbit.api.security.principal.PrincipalIterator; import org.apache.jackrabbit.api.security.principal.PrincipalManager; +import org.jetbrains.annotations.NotNull; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -45,7 +44,7 @@ public class PrincipalManagerImplTest { return p instanceof Group; } - private static void assertIterator(@Nonnull Iterator<? extends Principal> expected, @Nonnull Iterator<? extends Principal> result) { + private static void assertIterator(@NotNull Iterator<? extends Principal> expected, @NotNull Iterator<? extends Principal> result) { assertEquals(ImmutableSet.copyOf(expected), ImmutableSet.copyOf(result)); } @@ -168,7 +167,7 @@ public class PrincipalManagerImplTest { assertMembership(principalMgr, PrincipalManager.SEARCH_TYPE_ALL); } - private static void assertMembership(@Nonnull PrincipalManager mgr, int searchType) { + private static void assertMembership(@NotNull PrincipalManager mgr, int searchType) { PrincipalIterator it = mgr.getPrincipals(searchType); while (it.hasNext()) { Principal p = it.nextPrincipal(); @@ -308,4 +307,4 @@ public class PrincipalManagerImplTest { String unknownHint = TestPrincipalProvider.UNKNOWN.getName().substring(0, 4); assertFalse(principalMgr.findPrincipals(unknownHint, PrincipalManager.SEARCH_TYPE_NOT_GROUP).hasNext()); } -} \ No newline at end of file +} Modified: jackrabbit/oak/branches/1.8/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/TestPrincipalProvider.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/TestPrincipalProvider.java?rev=1846033&r1=1846032&r2=1846033&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/TestPrincipalProvider.java (original) +++ jackrabbit/oak/branches/1.8/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/TestPrincipalProvider.java Wed Nov 7 14:29:24 2018 @@ -22,10 +22,6 @@ import java.util.Enumeration; import java.util.Iterator; import java.util.Map; import java.util.Set; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import com.google.common.base.Function; import com.google.common.base.Predicate; import com.google.common.collect.ImmutableMap; @@ -35,6 +31,8 @@ import com.google.common.collect.Iterato import com.google.common.collect.Maps; import com.google.common.collect.Sets; import org.apache.jackrabbit.api.security.principal.PrincipalManager; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; public final class TestPrincipalProvider implements PrincipalProvider { @@ -72,12 +70,12 @@ public final class TestPrincipalProvider return all; } - public static String getIDFromPrincipal(@Nonnull Principal principal) { + public static String getIDFromPrincipal(@NotNull Principal principal) { return principal.getName() + "_id"; } - @CheckForNull - private static String getPrincipalNameFromID(@Nonnull String id) { + @Nullable + private static String getPrincipalNameFromID(@NotNull String id) { if (id.endsWith("_id")) { return id.substring(0, id.lastIndexOf("_id")); } else { @@ -85,9 +83,9 @@ public final class TestPrincipalProvider } } - @CheckForNull + @Nullable @Override - public Principal getPrincipal(@Nonnull String principalName) { + public Principal getPrincipal(@NotNull String principalName) { if (exposesEveryone && EveryonePrincipal.NAME.equals(principalName)) { return EveryonePrincipal.getInstance(); } else { @@ -95,9 +93,9 @@ public final class TestPrincipalProvider } } - @Nonnull + @NotNull @Override - public Set<Group> getGroupMembership(@Nonnull Principal principal) { + public Set<Group> getGroupMembership(@NotNull Principal principal) { if (principals.equals(TestPrincipals.asMap())) { return TestPrincipals.membership(principal.getName()); } else if (principals.values().contains(principal)) { @@ -107,9 +105,9 @@ public final class TestPrincipalProvider } } - @Nonnull + @NotNull @Override - public Set<? extends Principal> getPrincipals(@Nonnull String userID) { + public Set<? extends Principal> getPrincipals(@NotNull String userID) { String pName = getPrincipalNameFromID(userID); if (pName != null) { Principal p = principals.get(pName); @@ -123,13 +121,13 @@ public final class TestPrincipalProvider return ImmutableSet.of(); } - @Nonnull + @NotNull @Override public Iterator<? extends Principal> findPrincipals(@Nullable String nameHint, int searchType) { return Iterables.filter(all(), new SearchTypePredicate(nameHint, searchType)).iterator(); } - @Nonnull + @NotNull @Override public Iterator<? extends Principal> findPrincipals(int searchType) { return findPrincipals(null, searchType); @@ -211,7 +209,7 @@ public final class TestPrincipalProvider return principals; } - private static Set<Group> membership(@Nonnull String name) { + private static Set<Group> membership(@NotNull String name) { if ("a".equals(name)) { return ImmutableSet.of(EveryonePrincipal.getInstance(), gr2, gr3); } else if ("ac".equals(name)) { @@ -225,4 +223,4 @@ public final class TestPrincipalProvider } } } -} \ No newline at end of file +} Modified: jackrabbit/oak/branches/1.8/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeBitsProviderTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeBitsProviderTest.java?rev=1846033&r1=1846032&r2=1846033&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeBitsProviderTest.java (original) +++ jackrabbit/oak/branches/1.8/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeBitsProviderTest.java Wed Nov 7 14:29:24 2018 @@ -17,7 +17,6 @@ package org.apache.jackrabbit.oak.spi.security.privilege; import java.util.Set; -import javax.annotation.Nonnull; import javax.jcr.RepositoryException; import javax.jcr.security.Privilege; @@ -30,6 +29,7 @@ import org.apache.jackrabbit.oak.api.Tre import org.apache.jackrabbit.oak.api.Type; import org.apache.jackrabbit.oak.namepath.NamePathMapper; import org.apache.jackrabbit.oak.plugins.memory.PropertyStates; +import org.jetbrains.annotations.NotNull; import org.junit.Before; import org.junit.Test; import org.mockito.Mockito; @@ -161,9 +161,9 @@ public class PrivilegeBitsProviderTest i when(p.getName()).thenReturn("name"); NamePathMapper mapper = new NamePathMapper.Default() { - @Nonnull + @NotNull @Override - public String getOakName(@Nonnull String jcrName) throws RepositoryException { + public String getOakName(@NotNull String jcrName) throws RepositoryException { throw new RepositoryException(); } }; @@ -368,4 +368,4 @@ public class PrivilegeBitsProviderTest i assertEquals(expected, ImmutableSet.copyOf(result)); } -} \ No newline at end of file +} Modified: jackrabbit/oak/branches/1.8/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/user/action/AccessControlActionTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/user/action/AccessControlActionTest.java?rev=1846033&r1=1846032&r2=1846033&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/user/action/AccessControlActionTest.java (original) +++ jackrabbit/oak/branches/1.8/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/user/action/AccessControlActionTest.java Wed Nov 7 14:29:24 2018 @@ -16,8 +16,6 @@ */ package org.apache.jackrabbit.oak.spi.security.user.action; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; import javax.jcr.RepositoryException; import org.apache.jackrabbit.api.security.user.Authorizable; @@ -33,6 +31,8 @@ import org.apache.jackrabbit.oak.spi.sec import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeConstants; import org.apache.jackrabbit.oak.spi.security.user.UserConfiguration; import org.apache.jackrabbit.oak.spi.security.user.UserConstants; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.junit.Test; import org.mockito.Mockito; @@ -50,7 +50,7 @@ public class AccessControlActionTest imp private final UserConfiguration userConfiguration = Mockito.mock(UserConfiguration.class); private final AuthorizationConfiguration authorizationConfiguration = Mockito.mock(AuthorizationConfiguration.class); - private void initSecurityProvider(@Nonnull String adminId, @Nonnull String anonymousId, @Nonnull String... adminPrincipalNames) { + private void initSecurityProvider(@NotNull String adminId, @NotNull String anonymousId, @NotNull String... adminPrincipalNames) { when(userConfiguration.getParameters()).thenReturn(ConfigurationParameters.of( PARAM_ADMIN_ID, adminId, PARAM_ANONYMOUS_ID, anonymousId)); @@ -62,7 +62,7 @@ public class AccessControlActionTest imp } - private AccessControlAction createAction(@Nonnull String... privNames) { + private AccessControlAction createAction(@NotNull String... privNames) { AccessControlAction action = new AccessControlAction(); action.init(securityProvider, ConfigurationParameters.of( AccessControlAction.USER_PRIVILEGE_NAMES, privNames, @@ -70,7 +70,7 @@ public class AccessControlActionTest imp return action; } - private AccessControlAction createAction(@Nonnull String[] userPrivNames, @Nonnull String[] groupPrivNames) { + private AccessControlAction createAction(@NotNull String[] userPrivNames, @NotNull String[] groupPrivNames) { AccessControlAction action = new AccessControlAction(); action.init(securityProvider, ConfigurationParameters.of( AccessControlAction.USER_PRIVILEGE_NAMES, userPrivNames, @@ -78,7 +78,7 @@ public class AccessControlActionTest imp return action; } - private static void mockAuthorizable(@Nonnull Authorizable a, @Nonnull String id, @CheckForNull String principalName, @CheckForNull String path) throws RepositoryException { + private static void mockAuthorizable(@NotNull Authorizable a, @NotNull String id, @Nullable String principalName, @Nullable String path) throws RepositoryException { when(a.getID()).thenReturn(id); if (principalName != null) { when(a.getPrincipal()).thenReturn(new PrincipalImpl(principalName)); @@ -92,14 +92,14 @@ public class AccessControlActionTest imp } } - private static User mockUser(@Nonnull String id, @CheckForNull String principalName, @CheckForNull String path) throws RepositoryException { + private static User mockUser(@NotNull String id, @Nullable String principalName, @Nullable String path) throws RepositoryException { User user = Mockito.mock(User.class); when(user.isGroup()).thenReturn(false); mockAuthorizable(user, id, principalName, path); return user; } - private static Group mockGroup(@Nonnull String id, @CheckForNull String principalName, @CheckForNull String path) throws RepositoryException { + private static Group mockGroup(@NotNull String id, @Nullable String principalName, @Nullable String path) throws RepositoryException { Group gr = Mockito.mock(Group.class); when(gr.isGroup()).thenReturn(true); mockAuthorizable(gr, id, principalName, path); @@ -200,4 +200,4 @@ public class AccessControlActionTest imp action.onCreate(gr, root, NamePathMapper.DEFAULT); } -} \ No newline at end of file +} Modified: jackrabbit/oak/branches/1.8/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/user/action/CompositeActionProviderTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/user/action/CompositeActionProviderTest.java?rev=1846033&r1=1846032&r2=1846033&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/user/action/CompositeActionProviderTest.java (original) +++ jackrabbit/oak/branches/1.8/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/user/action/CompositeActionProviderTest.java Wed Nov 7 14:29:24 2018 @@ -17,10 +17,9 @@ package org.apache.jackrabbit.oak.spi.security.user.action; import java.util.List; -import javax.annotation.Nonnull; - import com.google.common.collect.ImmutableList; import org.apache.jackrabbit.oak.spi.security.SecurityProvider; +import org.jetbrains.annotations.NotNull; import org.junit.Test; import org.mockito.Mockito; @@ -62,9 +61,9 @@ public class CompositeActionProviderTest private final class TestAuthorizableActionProvider implements AuthorizableActionProvider { - @Nonnull + @NotNull @Override - public List<? extends AuthorizableAction> getAuthorizableActions(@Nonnull SecurityProvider securityProvider) { + public List<? extends AuthorizableAction> getAuthorizableActions(@NotNull SecurityProvider securityProvider) { return ImmutableList.of(TestAction.INSTANCE); } } @@ -73,4 +72,4 @@ public class CompositeActionProviderTest private static final AuthorizableAction INSTANCE = new TestAction(); } -} \ No newline at end of file +} Modified: jackrabbit/oak/branches/1.8/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/user/action/PasswordChangeActionTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/user/action/PasswordChangeActionTest.java?rev=1846033&r1=1846032&r2=1846033&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/user/action/PasswordChangeActionTest.java (original) +++ jackrabbit/oak/branches/1.8/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/user/action/PasswordChangeActionTest.java Wed Nov 7 14:29:24 2018 @@ -16,7 +16,6 @@ */ package org.apache.jackrabbit.oak.spi.security.user.action; -import javax.annotation.Nullable; import javax.jcr.nodetype.ConstraintViolationException; import org.apache.jackrabbit.api.security.user.User; @@ -28,6 +27,7 @@ import org.apache.jackrabbit.oak.spi.sec import org.apache.jackrabbit.oak.spi.security.SecurityProvider; import org.apache.jackrabbit.oak.spi.security.user.UserConstants; import org.apache.jackrabbit.oak.spi.security.user.util.PasswordUtil; +import org.jetbrains.annotations.Nullable; import org.junit.Before; import org.junit.Test; import org.mockito.Mockito; @@ -87,4 +87,4 @@ public class PasswordChangeActionTest { user.remove(); } } -} \ No newline at end of file +} Modified: jackrabbit/oak/branches/1.8/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/user/util/UserUtilTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/user/util/UserUtilTest.java?rev=1846033&r1=1846032&r2=1846033&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/user/util/UserUtilTest.java (original) +++ jackrabbit/oak/branches/1.8/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/user/util/UserUtilTest.java Wed Nov 7 14:29:24 2018 @@ -18,9 +18,6 @@ package org.apache.jackrabbit.oak.spi.se import java.util.List; import java.util.Map; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; - import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import org.apache.jackrabbit.JcrConstants; @@ -36,6 +33,8 @@ import org.apache.jackrabbit.oak.spi.sec import org.apache.jackrabbit.oak.spi.security.user.UserConstants; import org.apache.jackrabbit.oak.spi.xml.ImportBehavior; import org.apache.jackrabbit.oak.spi.xml.ProtectedItemImporter; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.junit.Test; import org.mockito.Mockito; @@ -47,18 +46,18 @@ import static org.mockito.Mockito.when; public class UserUtilTest { - @Nonnull - private static Tree createTree(@CheckForNull String ntName) { + @NotNull + private static Tree createTree(@Nullable String ntName) { return createTree(ntName, null, null); } - @Nonnull - private static Tree createTree(@CheckForNull String ntName, @CheckForNull String id) { + @NotNull + private static Tree createTree(@Nullable String ntName, @Nullable String id) { return createTree(ntName, id, null); } - @Nonnull - private static Tree createTree(@CheckForNull String ntName, @CheckForNull String id, @CheckForNull String nodeName) { + @NotNull + private static Tree createTree(@Nullable String ntName, @Nullable String id, @Nullable String nodeName) { Tree t = Mockito.mock(Tree.class); if (ntName != null) { when(t.getProperty(JcrConstants.JCR_PRIMARYTYPE)).thenReturn(PropertyStates.createProperty(JcrConstants.JCR_PRIMARYTYPE, ntName, Type.NAME)); @@ -389,4 +388,4 @@ public class UserUtilTest { assertEquals(entry.getValue().intValue(), UserUtil.getImportBehavior(entry.getKey())); } } -} \ No newline at end of file +} Modified: jackrabbit/oak/branches/1.8/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/xml/PropInfoTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/xml/PropInfoTest.java?rev=1846033&r1=1846032&r2=1846033&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/xml/PropInfoTest.java (original) +++ jackrabbit/oak/branches/1.8/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/xml/PropInfoTest.java Wed Nov 7 14:29:24 2018 @@ -17,8 +17,6 @@ package org.apache.jackrabbit.oak.spi.xml; import java.util.List; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; import javax.jcr.PropertyType; import javax.jcr.RepositoryException; import javax.jcr.Value; @@ -29,6 +27,8 @@ import com.google.common.collect.Immutab import com.google.common.collect.Lists; import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.api.Type; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.junit.Test; import org.mockito.Mockito; @@ -40,11 +40,11 @@ import static org.mockito.Mockito.when; public class PropInfoTest { - private TextValue mockTextValue(@Nonnull String value, int type) throws Exception { + private TextValue mockTextValue(@NotNull String value, int type) throws Exception { return mockTextValue(value, type, false); } - private TextValue mockTextValue(@Nonnull String value, int type, boolean throwOnDispose) throws Exception { + private TextValue mockTextValue(@NotNull String value, int type, boolean throwOnDispose) throws Exception { Value jcrValue = Mockito.mock(Value.class); when(jcrValue.getType()).thenReturn(type); when(jcrValue.getString()).thenReturn(value); @@ -298,4 +298,4 @@ public class PropInfoTest { } private class DisposeException extends RuntimeException {} -} \ No newline at end of file +}