Modified: jackrabbit/oak/branches/1.8/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DynamicSyncContextTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DynamicSyncContextTest.java?rev=1846006&r1=1846005&r2=1846006&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DynamicSyncContextTest.java (original) +++ jackrabbit/oak/branches/1.8/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DynamicSyncContextTest.java Wed Nov 7 13:33:31 2018 @@ -19,8 +19,6 @@ package org.apache.jackrabbit.oak.spi.se import java.util.HashSet; import java.util.Set; import java.util.UUID; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; import javax.jcr.RepositoryException; import javax.jcr.Value; import javax.jcr.ValueFactory; @@ -50,6 +48,8 @@ import org.apache.jackrabbit.oak.spi.sec import org.apache.jackrabbit.oak.spi.security.authentication.external.TestIdentityProvider; import org.apache.jackrabbit.oak.spi.security.authentication.external.basic.DefaultSyncConfig; import org.apache.jackrabbit.oak.spi.security.authentication.external.basic.DefaultSyncContext; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -96,13 +96,13 @@ public class DynamicSyncContextTest exte return sc; } - private void sync(@Nonnull ExternalIdentity externalIdentity, @Nonnull SyncResult.Status expectedStatus) throws Exception { + private void sync(@NotNull ExternalIdentity externalIdentity, @NotNull SyncResult.Status expectedStatus) throws Exception { SyncResult result = syncContext.sync(externalIdentity); assertSame(expectedStatus, result.getStatus()); r.commit(); } - private void assertDynamicMembership(@Nonnull Authorizable a, @Nonnull ExternalIdentity externalIdentity, long depth) throws Exception { + private void assertDynamicMembership(@NotNull Authorizable a, @NotNull ExternalIdentity externalIdentity, long depth) throws Exception { Value[] vs = a.getProperty(ExternalIdentityConstants.REP_EXTERNAL_PRINCIPAL_NAMES); Iterable<String> pNames = Iterables.transform(ImmutableList.copyOf(vs), new Function<Value, String>() { @Nullable @@ -123,7 +123,7 @@ public class DynamicSyncContextTest exte assertEquals(expected, ImmutableSet.copyOf(pNames)); } - private void collectGroupPrincipals(Set<String> pNames, @Nonnull Iterable<ExternalIdentityRef> declaredGroups, long depth) throws ExternalIdentityException { + private void collectGroupPrincipals(Set<String> pNames, @NotNull Iterable<ExternalIdentityRef> declaredGroups, long depth) throws ExternalIdentityException { if (depth <= 0) { return; } @@ -134,9 +134,9 @@ public class DynamicSyncContextTest exte } } - private static void assertSyncedMembership(@Nonnull UserManager userManager, - @Nonnull Authorizable a, - @Nonnull ExternalIdentity externalIdentity) throws Exception { + private static void assertSyncedMembership(@NotNull UserManager userManager, + @NotNull Authorizable a, + @NotNull ExternalIdentity externalIdentity) throws Exception { for (ExternalIdentityRef ref : externalIdentity.getDeclaredGroups()) { Group gr = userManager.getAuthorizable(ref.getId(), Group.class); assertNotNull(gr); @@ -439,7 +439,7 @@ public class DynamicSyncContextTest exte private Iterable<ExternalIdentityRef> declaredGroupRefs; - private TestUserWithGroupRefs(@Nonnull ExternalUser base, @Nonnull Iterable<ExternalIdentityRef> declaredGroupRefs) { + private TestUserWithGroupRefs(@NotNull ExternalUser base, @NotNull Iterable<ExternalIdentityRef> declaredGroupRefs) { super(base); this.declaredGroupRefs = declaredGroupRefs; } @@ -448,10 +448,10 @@ public class DynamicSyncContextTest exte return ""; } - @Nonnull + @NotNull @Override public Iterable<ExternalIdentityRef> getDeclaredGroups() { return declaredGroupRefs; } } -} \ No newline at end of file +}
Modified: jackrabbit/oak/branches/1.8/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/PrincipalResolutionTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/PrincipalResolutionTest.java?rev=1846006&r1=1846005&r2=1846006&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/PrincipalResolutionTest.java (original) +++ jackrabbit/oak/branches/1.8/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/PrincipalResolutionTest.java Wed Nov 7 13:33:31 2018 @@ -16,14 +16,13 @@ */ package org.apache.jackrabbit.oak.spi.security.authentication.external.impl; -import javax.annotation.Nonnull; - import org.apache.jackrabbit.oak.spi.security.authentication.external.ExternalIdentity; import org.apache.jackrabbit.oak.spi.security.authentication.external.ExternalIdentityException; import org.apache.jackrabbit.oak.spi.security.authentication.external.ExternalIdentityProvider; import org.apache.jackrabbit.oak.spi.security.authentication.external.ExternalIdentityRef; import org.apache.jackrabbit.oak.spi.security.authentication.external.PrincipalNameResolver; import org.apache.jackrabbit.oak.spi.security.authentication.external.TestIdentityProvider; +import org.jetbrains.annotations.NotNull; public class PrincipalResolutionTest extends DynamicSyncContextTest { @@ -34,9 +33,9 @@ public class PrincipalResolutionTest ext private final class PrincipalResolvingIDP extends TestIdentityProvider implements PrincipalNameResolver { - @Nonnull + @NotNull @Override - public String fromExternalIdentityRef(@Nonnull ExternalIdentityRef externalIdentityRef) throws ExternalIdentityException { + public String fromExternalIdentityRef(@NotNull ExternalIdentityRef externalIdentityRef) throws ExternalIdentityException { ExternalIdentity identity = getIdentity(externalIdentityRef); if (identity == null) { throw new ExternalIdentityException(); @@ -45,4 +44,4 @@ public class PrincipalResolutionTest ext } } } -} \ No newline at end of file +} Modified: jackrabbit/oak/branches/1.8/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/AbstractJmxTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/AbstractJmxTest.java?rev=1846006&r1=1846005&r2=1846006&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/AbstractJmxTest.java (original) +++ jackrabbit/oak/branches/1.8/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/AbstractJmxTest.java Wed Nov 7 13:33:31 2018 @@ -17,8 +17,6 @@ package org.apache.jackrabbit.oak.spi.security.authentication.external.impl.jmx; import java.util.Map; -import javax.annotation.Nonnull; - import com.google.common.collect.ImmutableMap; import org.apache.jackrabbit.api.security.user.Authorizable; import org.apache.jackrabbit.api.security.user.Group; @@ -33,6 +31,7 @@ import org.apache.jackrabbit.oak.spi.sec import org.apache.jackrabbit.oak.spi.security.authentication.external.SyncResult; import org.apache.jackrabbit.oak.spi.security.authentication.external.TestIdentityProvider; import org.apache.jackrabbit.oak.spi.security.authentication.external.basic.DefaultSyncContext; +import org.jetbrains.annotations.NotNull; import org.junit.Before; import static org.junit.Assert.assertEquals; @@ -50,11 +49,11 @@ public abstract class AbstractJmxTest ex foreignIDP = new TestIdentityProvider("anotherIDP"); } - static void assertResultMessages(@Nonnull String[] resultMessages, String uid, @Nonnull String expectedOperation) { + static void assertResultMessages(@NotNull String[] resultMessages, String uid, @NotNull String expectedOperation) { assertResultMessages(resultMessages, ImmutableMap.of(uid, expectedOperation)); } - static void assertResultMessages(@Nonnull String[] resultMessages, @Nonnull Map<String, String> expected) { + static void assertResultMessages(@NotNull String[] resultMessages, @NotNull Map<String, String> expected) { assertEquals(expected.size(), resultMessages.length); for (int i = 0; i < resultMessages.length; i++) { String rm = resultMessages[i]; @@ -68,7 +67,7 @@ public abstract class AbstractJmxTest ex } } - static void assertSync(@Nonnull ExternalIdentity ei, @Nonnull UserManager userManager) throws Exception { + static void assertSync(@NotNull ExternalIdentity ei, @NotNull UserManager userManager) throws Exception { Authorizable authorizable; if (ei instanceof ExternalUser) { authorizable = userManager.getAuthorizable(ei.getId(), User.class); @@ -80,11 +79,11 @@ public abstract class AbstractJmxTest ex assertEquals(ei.getExternalId(), ExternalIdentityRef.fromString(authorizable.getProperty(DefaultSyncContext.REP_EXTERNAL_ID)[0].getString())); } - SyncResult sync(@Nonnull ExternalIdentityProvider idp, @Nonnull String id, boolean isGroup) throws Exception { + SyncResult sync(@NotNull ExternalIdentityProvider idp, @NotNull String id, boolean isGroup) throws Exception { return sync((isGroup) ? idp.getGroup(id) : idp.getUser(id), idp); } - SyncResult sync(@Nonnull ExternalIdentity externalIdentity, @Nonnull ExternalIdentityProvider idp) throws Exception { + SyncResult sync(@NotNull ExternalIdentity externalIdentity, @NotNull ExternalIdentityProvider idp) throws Exception { SyncContext ctx = new DefaultSyncContext(syncConfig, idp, getUserManager(root), getValueFactory(root)); SyncResult res = ctx.sync(externalIdentity); root.commit(); @@ -95,4 +94,4 @@ public abstract class AbstractJmxTest ex root.refresh(); return getUserManager(root); } -} \ No newline at end of file +} Modified: jackrabbit/oak/branches/1.8/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/DelegateeTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/DelegateeTest.java?rev=1846006&r1=1846005&r2=1846006&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/DelegateeTest.java (original) +++ jackrabbit/oak/branches/1.8/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/DelegateeTest.java Wed Nov 7 13:33:31 2018 @@ -23,9 +23,6 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; import java.util.Map; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; - import com.google.common.collect.ImmutableMap; import org.apache.jackrabbit.oak.api.Blob; import org.apache.jackrabbit.oak.api.CommitFailedException; @@ -39,6 +36,8 @@ import org.apache.jackrabbit.oak.spi.sec import org.apache.jackrabbit.oak.spi.security.authentication.external.ExternalUser; import org.apache.jackrabbit.oak.spi.security.authentication.external.TestIdentityProvider; import org.apache.jackrabbit.oak.spi.security.authentication.external.impl.DefaultSyncHandler; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.junit.Before; import org.junit.Test; @@ -75,11 +74,11 @@ public class DelegateeTest extends Abstr return 100; } - private Delegatee createDelegatee(@Nonnull ExternalIdentityProvider idp) { + private Delegatee createDelegatee(@NotNull ExternalIdentityProvider idp) { return Delegatee.createInstance(getContentRepository(), getSecurityProvider(), new DefaultSyncHandler(syncConfig), idp, getBatchSize()); } - private static Root preventRootCommit(@Nonnull Delegatee delegatee) throws Exception { + private static Root preventRootCommit(@NotNull Delegatee delegatee) throws Exception { Field rootField = Delegatee.class.getDeclaredField("root"); rootField.setAccessible(true); @@ -243,7 +242,7 @@ public class DelegateeTest extends Abstr public void testSyncAllExternalUsersThrowingIDP() { Delegatee dg = createDelegatee(new TestIdentityProvider("throwing") { - @Nonnull + @NotNull @Override public Iterator<ExternalUser> listUsers() throws ExternalIdentityException { throw new ExternalIdentityException(); @@ -272,7 +271,7 @@ public class DelegateeTest extends Abstr private Root base; - private ThrowingRoot(@Nonnull Root base) { + private ThrowingRoot(@NotNull Root base) { this.base = base; } @@ -281,9 +280,9 @@ public class DelegateeTest extends Abstr return base.move(srcAbsPath, destAbsPath); } - @Nonnull + @NotNull @Override - public Tree getTree(@Nonnull String path) { + public Tree getTree(@NotNull String path) { return base.getTree(path); } @@ -303,7 +302,7 @@ public class DelegateeTest extends Abstr } @Override - public void commit(@Nonnull Map<String, Object> info) throws CommitFailedException { + public void commit(@NotNull Map<String, Object> info) throws CommitFailedException { throw new CommitFailedException(CommitFailedException.OAK, 0, "failed"); } @@ -312,28 +311,28 @@ public class DelegateeTest extends Abstr return base.hasPendingChanges(); } - @Nonnull + @NotNull @Override public QueryEngine getQueryEngine() { return base.getQueryEngine(); } - @Nonnull + @NotNull @Override - public Blob createBlob(@Nonnull InputStream stream) throws IOException { + public Blob createBlob(@NotNull InputStream stream) throws IOException { return base.createBlob(stream); } - @CheckForNull + @Nullable @Override - public Blob getBlob(@Nonnull String reference) { + public Blob getBlob(@NotNull String reference) { return base.getBlob(reference); } - @Nonnull + @NotNull @Override public ContentSession getContentSession() { return base.getContentSession(); } } -} \ No newline at end of file +} Modified: jackrabbit/oak/branches/1.8/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/SyncMBeanImplTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/SyncMBeanImplTest.java?rev=1846006&r1=1846005&r2=1846006&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/SyncMBeanImplTest.java (original) +++ jackrabbit/oak/branches/1.8/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/SyncMBeanImplTest.java Wed Nov 7 13:33:31 2018 @@ -19,8 +19,6 @@ package org.apache.jackrabbit.oak.spi.se import java.util.HashMap; import java.util.Iterator; import java.util.Map; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; import javax.jcr.RepositoryException; import javax.jcr.ValueFactory; @@ -47,6 +45,8 @@ import org.apache.jackrabbit.oak.spi.sec import org.apache.jackrabbit.oak.spi.security.authentication.external.basic.DefaultSyncContext; import org.apache.jackrabbit.oak.spi.security.authentication.external.impl.DefaultSyncHandler; import org.apache.jackrabbit.oak.spi.security.user.UserConstants; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.junit.Before; import org.junit.Test; @@ -70,9 +70,9 @@ public class SyncMBeanImplTest extends A super.before(); syncMgr = new SyncManager() { - @CheckForNull + @Nullable @Override - public SyncHandler getSyncHandler(@Nonnull String name) { + public SyncHandler getSyncHandler(@NotNull String name) { if (SYNC_NAME.equals(name)) { return new DefaultSyncHandler(syncConfig); } else if (ThrowingSyncHandler.NAME.equals(name)) { @@ -85,9 +85,9 @@ public class SyncMBeanImplTest extends A } }; idpMgr = new ExternalIdentityProviderManager() { - @CheckForNull + @Nullable @Override - public ExternalIdentityProvider getProvider(@Nonnull String name) { + public ExternalIdentityProvider getProvider(@NotNull String name) { if (name.equals(idp.getName())) { return idp; } else { @@ -114,7 +114,7 @@ public class SyncMBeanImplTest extends A return expected; } - private SyncMBeanImpl createSyncMBeanImpl(@Nonnull String syncHandlerName, @Nonnull String idpName) { + private SyncMBeanImpl createSyncMBeanImpl(@NotNull String syncHandlerName, @NotNull String idpName) { return new SyncMBeanImpl(getContentRepository(), getSecurityProvider(), syncMgr, syncHandlerName, idpMgr, idpName); } @@ -763,44 +763,44 @@ public class SyncMBeanImplTest extends A this.allowsListIdentities = allowsListIdentities; }; - @Nonnull + @NotNull @Override public String getName() { return allowsListIdentities ? NAME_ALLOWS_IDENTITY_LISTING : NAME; } - @Nonnull + @NotNull @Override - public SyncContext createContext(@Nonnull ExternalIdentityProvider idp, @Nonnull UserManager userManager, @Nonnull ValueFactory valueFactory) throws SyncException { + public SyncContext createContext(@NotNull ExternalIdentityProvider idp, @NotNull UserManager userManager, @NotNull ValueFactory valueFactory) throws SyncException { return new DefaultSyncContext(syncConfig, idp, userManager, valueFactory) { - @Nonnull + @NotNull @Override - public SyncResult sync(@Nonnull ExternalIdentity identity) throws SyncException { + public SyncResult sync(@NotNull ExternalIdentity identity) throws SyncException { throw new SyncException("sync " + identity); } - @Nonnull + @NotNull @Override - public SyncResult sync(@Nonnull String id) throws SyncException { + public SyncResult sync(@NotNull String id) throws SyncException { throw new SyncException("sync " + id); } }; } - @CheckForNull + @Nullable @Override - public SyncedIdentity findIdentity(@Nonnull UserManager userManager, @Nonnull String id) throws RepositoryException { + public SyncedIdentity findIdentity(@NotNull UserManager userManager, @NotNull String id) throws RepositoryException { throw new RepositoryException("findIdentity"); } @Override - public boolean requiresSync(@Nonnull SyncedIdentity identity) { + public boolean requiresSync(@NotNull SyncedIdentity identity) { return false; } - @Nonnull + @NotNull @Override - public Iterator<SyncedIdentity> listIdentities(@Nonnull UserManager userManager) throws RepositoryException { + public Iterator<SyncedIdentity> listIdentities(@NotNull UserManager userManager) throws RepositoryException { if (!allowsListIdentities) { throw new RepositoryException("listIdentities"); } else { @@ -808,4 +808,4 @@ public class SyncMBeanImplTest extends A } } } -} \ No newline at end of file +} Modified: jackrabbit/oak/branches/1.8/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/AbstractPrincipalTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/AbstractPrincipalTest.java?rev=1846006&r1=1846005&r2=1846006&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/AbstractPrincipalTest.java (original) +++ jackrabbit/oak/branches/1.8/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/AbstractPrincipalTest.java Wed Nov 7 13:33:31 2018 @@ -19,8 +19,6 @@ package org.apache.jackrabbit.oak.spi.se import java.security.Principal; import java.util.Set; import java.util.UUID; -import javax.annotation.Nonnull; - import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; @@ -37,6 +35,7 @@ import org.apache.jackrabbit.oak.spi.sec import org.apache.jackrabbit.oak.spi.security.authentication.external.impl.DynamicSyncContext; import org.apache.jackrabbit.oak.spi.security.principal.PrincipalProvider; import org.apache.jackrabbit.oak.spi.security.user.UserConfiguration; +import org.jetbrains.annotations.NotNull; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; @@ -65,7 +64,7 @@ public abstract class AbstractPrincipalT principalProvider = createPrincipalProvider(); } - @Nonnull + @NotNull PrincipalProvider createPrincipalProvider() { Set<String> autoMembership = ImmutableSet.copyOf(Iterables.concat(syncConfig.user().getAutoMembership(),syncConfig.group().getAutoMembership())); return new ExternalGroupPrincipalProvider(root, getSecurityProvider().getConfiguration(UserConfiguration.class), @@ -85,7 +84,7 @@ public abstract class AbstractPrincipalT return getGroupPrincipal(externalUser.getDeclaredGroups().iterator().next()); } - java.security.acl.Group getGroupPrincipal(@Nonnull ExternalIdentityRef ref) throws Exception { + java.security.acl.Group getGroupPrincipal(@NotNull ExternalIdentityRef ref) throws Exception { String principalName = idp.getIdentity(ref).getPrincipalName(); Principal p = principalProvider.getPrincipal(principalName); @@ -100,4 +99,4 @@ public abstract class AbstractPrincipalT root.commit(); return gr; } -} \ No newline at end of file +} Modified: jackrabbit/oak/branches/1.8/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalGroupPrincipalProviderTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalGroupPrincipalProviderTest.java?rev=1846006&r1=1846005&r2=1846006&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalGroupPrincipalProviderTest.java (original) +++ jackrabbit/oak/branches/1.8/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalGroupPrincipalProviderTest.java Wed Nov 7 13:33:31 2018 @@ -21,9 +21,6 @@ import java.util.Collections; import java.util.HashSet; import java.util.Iterator; import java.util.Set; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import com.google.common.base.Function; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; @@ -41,6 +38,8 @@ import org.apache.jackrabbit.oak.spi.sec import org.apache.jackrabbit.oak.spi.security.authentication.external.TestIdentityProvider; import org.apache.jackrabbit.oak.spi.security.authentication.external.impl.DynamicSyncContext; import org.apache.jackrabbit.oak.spi.security.principal.PrincipalImpl; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -51,7 +50,7 @@ import static org.junit.Assert.assertTru public class ExternalGroupPrincipalProviderTest extends AbstractPrincipalTest { - void sync(@Nonnull ExternalUser externalUser) throws Exception { + void sync(@NotNull ExternalUser externalUser) throws Exception { Root systemRoot = getSystemRoot(); DynamicSyncContext syncContext = new DynamicSyncContext(syncConfig, idp, getUserManager(systemRoot), getValueFactory(systemRoot)); syncContext.sync(externalUser); @@ -61,7 +60,7 @@ public class ExternalGroupPrincipalProvi root.refresh(); } - Set<Principal> getExpectedGroupPrincipals(@Nonnull String userId) throws Exception { + Set<Principal> getExpectedGroupPrincipals(@NotNull String userId) throws Exception { if (syncConfig.user().getMembershipNestingDepth() == 1) { Set<Principal> principals = ImmutableSet.copyOf(Iterables.transform(idp.getUser(userId).getDeclaredGroups(), new Function<ExternalIdentityRef, Principal>() { @Nullable @@ -82,7 +81,7 @@ public class ExternalGroupPrincipalProvi } } - private void collectExpectedPrincipals(Set<Principal> grPrincipals, @Nonnull Iterable<ExternalIdentityRef> declaredGroups, long depth) throws Exception { + private void collectExpectedPrincipals(Set<Principal> grPrincipals, @NotNull Iterable<ExternalIdentityRef> declaredGroups, long depth) throws Exception { if (depth <= 0) { return; } @@ -394,14 +393,14 @@ public class ExternalGroupPrincipalProvi private final Iterable<ExternalIdentityRef> declaredGroups; - private TestUser(@Nonnull String id, @Nonnull Iterable<ExternalIdentityRef> declaredGroups) { + private TestUser(@NotNull String id, @NotNull Iterable<ExternalIdentityRef> declaredGroups) { super(id); this.declaredGroups = declaredGroups; } - @Nonnull + @NotNull @Override public Iterable<ExternalIdentityRef> getDeclaredGroups() { return declaredGroups; } } -} \ No newline at end of file +} Modified: jackrabbit/oak/branches/1.8/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalGroupPrincipalTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalGroupPrincipalTest.java?rev=1846006&r1=1846005&r2=1846006&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalGroupPrincipalTest.java (original) +++ jackrabbit/oak/branches/1.8/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalGroupPrincipalTest.java Wed Nov 7 13:33:31 2018 @@ -18,8 +18,6 @@ package org.apache.jackrabbit.oak.spi.se import java.security.Principal; import java.util.Enumeration; -import javax.annotation.Nullable; - import com.google.common.base.Function; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; @@ -27,6 +25,7 @@ import org.apache.jackrabbit.api.securit import org.apache.jackrabbit.oak.spi.security.authentication.external.ExternalGroup; import org.apache.jackrabbit.oak.spi.security.authentication.external.ExternalUser; import org.apache.jackrabbit.oak.spi.security.principal.PrincipalImpl; +import org.jetbrains.annotations.Nullable; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -118,4 +117,4 @@ public class ExternalGroupPrincipalTest assertFalse(members.hasMoreElements()); } } -} \ No newline at end of file +} Modified: jackrabbit/oak/branches/1.8/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalIdentityImporterTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalIdentityImporterTest.java?rev=1846006&r1=1846005&r2=1846006&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalIdentityImporterTest.java (original) +++ jackrabbit/oak/branches/1.8/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalIdentityImporterTest.java Wed Nov 7 13:33:31 2018 @@ -19,7 +19,6 @@ package org.apache.jackrabbit.oak.spi.se import java.io.ByteArrayInputStream; import java.io.InputStream; import java.security.PrivilegedExceptionAction; -import javax.annotation.Nonnull; import javax.jcr.ImportUUIDBehavior; import javax.jcr.Node; import javax.jcr.Repository; @@ -38,6 +37,7 @@ import org.apache.jackrabbit.oak.spi.sec import org.apache.jackrabbit.oak.spi.security.authentication.external.TestSecurityProvider; import org.apache.jackrabbit.oak.spi.security.authentication.external.impl.ExternalIdentityConstants; import org.apache.jackrabbit.oak.spi.security.user.UserConstants; +import org.jetbrains.annotations.NotNull; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -102,7 +102,7 @@ public class ExternalIdentityImporterTes } } - @Nonnull + @NotNull ConfigurationParameters getConfigurationParameters() { return ConfigurationParameters.EMPTY; } @@ -136,13 +136,13 @@ public class ExternalIdentityImporterTes } } - static void assertHasProperties(@Nonnull Node node, @Nonnull String... propertyNames) throws Exception { + static void assertHasProperties(@NotNull Node node, @NotNull String... propertyNames) throws Exception { for (String pN : propertyNames) { assertTrue(node.hasProperty(pN)); } } - static void assertNotHasProperties(@Nonnull Node node, @Nonnull String... propertyNames) throws Exception { + static void assertNotHasProperties(@NotNull Node node, @NotNull String... propertyNames) throws Exception { for (String pN : propertyNames) { assertFalse(node.hasProperty(pN)); } @@ -174,4 +174,4 @@ public class ExternalIdentityImporterTes Node parent = doImport(createSession(true), UserConstants.DEFAULT_USER_PATH, XML_EXTERNAL_USER_WITH_PRINCIPAL_NAMES); assertHasProperties(parent.getNode("t"), ExternalIdentityConstants.REP_EXTERNAL_ID, ExternalIdentityConstants.REP_LAST_SYNCED, ExternalIdentityConstants.REP_EXTERNAL_PRINCIPAL_NAMES); } -} \ No newline at end of file +} Modified: jackrabbit/oak/branches/1.8/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalPrincipalConfigurationTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalPrincipalConfigurationTest.java?rev=1846006&r1=1846005&r2=1846006&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalPrincipalConfigurationTest.java (original) +++ jackrabbit/oak/branches/1.8/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalPrincipalConfigurationTest.java Wed Nov 7 13:33:31 2018 @@ -22,7 +22,6 @@ import java.util.Hashtable; import java.util.Iterator; import java.util.List; import java.util.Map; -import javax.annotation.Nonnull; import javax.jcr.RepositoryException; import javax.jcr.ValueFactory; @@ -49,6 +48,7 @@ import org.apache.jackrabbit.oak.spi.sec import org.apache.jackrabbit.oak.spi.security.principal.PrincipalConfiguration; import org.apache.jackrabbit.oak.spi.security.principal.PrincipalProvider; import org.apache.jackrabbit.oak.spi.xml.ProtectedItemImporter; +import org.jetbrains.annotations.NotNull; import org.junit.Ignore; import org.junit.Test; import org.osgi.framework.BundleContext; @@ -262,32 +262,32 @@ public class ExternalPrincipalConfigurat private static final class TestSyncHandler implements SyncHandler { - @Nonnull + @NotNull @Override public String getName() { return "name"; } - @Nonnull + @NotNull @Override - public SyncContext createContext(@Nonnull ExternalIdentityProvider idp, @Nonnull UserManager userManager, @Nonnull ValueFactory valueFactory) throws SyncException { + public SyncContext createContext(@NotNull ExternalIdentityProvider idp, @NotNull UserManager userManager, @NotNull ValueFactory valueFactory) throws SyncException { return new DefaultSyncContext(new DefaultSyncConfig(), idp, userManager, valueFactory); } @Override - public SyncedIdentity findIdentity(@Nonnull UserManager userManager, @Nonnull String id) throws RepositoryException { + public SyncedIdentity findIdentity(@NotNull UserManager userManager, @NotNull String id) throws RepositoryException { return null; } @Override - public boolean requiresSync(@Nonnull SyncedIdentity identity) { + public boolean requiresSync(@NotNull SyncedIdentity identity) { return false; } - @Nonnull + @NotNull @Override - public Iterator<SyncedIdentity> listIdentities(@Nonnull UserManager userManager) throws RepositoryException { + public Iterator<SyncedIdentity> listIdentities(@NotNull UserManager userManager) throws RepositoryException { return Collections.emptyIterator(); } } -} \ No newline at end of file +} Modified: jackrabbit/oak/branches/1.8/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/PrincipalProviderAutoMembershipTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/PrincipalProviderAutoMembershipTest.java?rev=1846006&r1=1846005&r2=1846006&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/PrincipalProviderAutoMembershipTest.java (original) +++ jackrabbit/oak/branches/1.8/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/PrincipalProviderAutoMembershipTest.java Wed Nov 7 13:33:31 2018 @@ -21,8 +21,6 @@ import java.util.Iterator; import java.util.List; import java.util.Set; import java.util.UUID; -import javax.annotation.Nonnull; - import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterators; @@ -31,6 +29,7 @@ import org.apache.jackrabbit.api.securit import org.apache.jackrabbit.api.security.user.Group; import org.apache.jackrabbit.oak.spi.security.authentication.external.basic.DefaultSyncConfig; import org.apache.jackrabbit.oak.spi.security.principal.PrincipalImpl; +import org.jetbrains.annotations.NotNull; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -75,7 +74,7 @@ public class PrincipalProviderAutoMember } @Override - Set<Principal> getExpectedGroupPrincipals(@Nonnull String userId) throws Exception { + Set<Principal> getExpectedGroupPrincipals(@NotNull String userId) throws Exception { return ImmutableSet.<Principal>builder() .addAll(super.getExpectedGroupPrincipals(userId)) .add(userAutoMembershipGroup.getPrincipal()) @@ -150,4 +149,4 @@ public class PrincipalProviderAutoMember assertFalse(Iterators.contains(res, groupAutoMembershipGroup.getPrincipal())); assertFalse(Iterators.contains(res, new PrincipalImpl(NON_EXISTING_GROUP_ID))); } -} \ No newline at end of file +}