Modified: jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/Delegatee.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/Delegatee.java?rev=1846006&r1=1846005&r2=1846006&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/Delegatee.java (original) +++ jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/Delegatee.java Wed Nov 7 13:33:31 2018 @@ -23,9 +23,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.Iterator; import java.util.List; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; import javax.jcr.NoSuchWorkspaceException; import javax.jcr.RepositoryException; import javax.security.auth.Subject; @@ -57,6 +54,8 @@ import org.apache.jackrabbit.oak.spi.sec import org.apache.jackrabbit.oak.spi.security.authentication.external.basic.DefaultSyncResultImpl; import org.apache.jackrabbit.oak.spi.security.authentication.external.basic.DefaultSyncedIdentity; import org.apache.jackrabbit.oak.spi.security.user.UserConfiguration; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -81,8 +80,8 @@ final class Delegatee { private SyncContext context; - private Delegatee(@Nonnull SyncHandler handler, @Nonnull ExternalIdentityProvider idp, - @Nonnull ContentSession systemSession, @Nonnull SecurityProvider securityProvider, int batchSize) throws SyncException { + private Delegatee(@NotNull SyncHandler handler, @NotNull ExternalIdentityProvider idp, + @NotNull ContentSession systemSession, @NotNull SecurityProvider securityProvider, int batchSize) throws SyncException { this.handler = handler; this.idp = idp; @@ -96,15 +95,15 @@ final class Delegatee { log.info("Created delegatee for SyncMBean with session: {} {}", systemSession, systemSession.getAuthInfo().getUserID()); } - static Delegatee createInstance(@Nonnull ContentRepository repository, @Nonnull SecurityProvider securityProvider, - @Nonnull SyncHandler handler, @Nonnull ExternalIdentityProvider idp) { + static Delegatee createInstance(@NotNull ContentRepository repository, @NotNull SecurityProvider securityProvider, + @NotNull SyncHandler handler, @NotNull ExternalIdentityProvider idp) { return createInstance(repository, securityProvider, handler, idp, DEFAULT_BATCH_SIZE); } - static Delegatee createInstance(@Nonnull final ContentRepository repository, - @Nonnull SecurityProvider securityProvider, - @Nonnull SyncHandler handler, - @Nonnull ExternalIdentityProvider idp, + static Delegatee createInstance(@NotNull final ContentRepository repository, + @NotNull SecurityProvider securityProvider, + @NotNull SyncHandler handler, + @NotNull ExternalIdentityProvider idp, int batchSize) { ContentSession systemSession; try { @@ -126,7 +125,7 @@ final class Delegatee { } } - private static void close(@Nonnull ContentSession systemSession) { + private static void close(@NotNull ContentSession systemSession) { try { systemSession.close(); } catch (IOException e) { @@ -145,8 +144,8 @@ final class Delegatee { /** * @see SynchronizationMBean#syncUsers(String[], boolean) */ - @Nonnull - String[] syncUsers(@Nonnull String[] userIds, boolean purge) { + @NotNull + String[] syncUsers(@NotNull String[] userIds, boolean purge) { context.setKeepMissing(!purge) .setForceGroupSync(true) .setForceUserSync(true); @@ -163,7 +162,7 @@ final class Delegatee { /** * @see SynchronizationMBean#syncAllUsers(boolean) */ - @Nonnull + @NotNull String[] syncAllUsers(boolean purge) { try { List<String> list = new ArrayList<String>(); @@ -189,8 +188,8 @@ final class Delegatee { /** * @see SynchronizationMBean#syncExternalUsers(String[]) */ - @Nonnull - String[] syncExternalUsers(@Nonnull String[] externalIds) { + @NotNull + String[] syncExternalUsers(@NotNull String[] externalIds) { List<String> list = new ArrayList<String>(); context.setForceGroupSync(true).setForceUserSync(true); @@ -223,7 +222,7 @@ final class Delegatee { /** * @see SynchronizationMBean#syncAllExternalUsers() */ - @Nonnull + @NotNull String[] syncAllExternalUsers() { List<String> list = new ArrayList<String>(); context.setForceGroupSync(true).setForceUserSync(true); @@ -244,7 +243,7 @@ final class Delegatee { /** * @see SynchronizationMBean#listOrphanedUsers() */ - @Nonnull + @NotNull String[] listOrphanedUsers() { return Iterators.toArray(internalListOrphanedIdentities(), String.class); } @@ -252,7 +251,7 @@ final class Delegatee { /** * @see SynchronizationMBean#purgeOrphanedUsers() */ - @Nonnull + @NotNull String[] purgeOrphanedUsers() { context.setKeepMissing(false); List<String> list = new ArrayList<String>(); @@ -269,14 +268,14 @@ final class Delegatee { //------------------------------------------------------------< private >--- - private boolean isMyIDP(@Nonnull SyncedIdentity id) { + private boolean isMyIDP(@NotNull SyncedIdentity id) { ExternalIdentityRef ref = id.getExternalIdRef(); String providerName = (ref == null) ? null : ref.getProviderName(); return providerName != null && (providerName.isEmpty() || providerName.equals(idp.getName())); } - @Nonnull - private List<SyncResult> syncUser(@Nonnull ExternalIdentity id, @Nonnull List<SyncResult> results, @Nonnull List<String> list) { + @NotNull + private List<SyncResult> syncUser(@NotNull ExternalIdentity id, @NotNull List<SyncResult> results, @NotNull List<String> list) { try { SyncResult r = context.sync(id); if (r.getIdentity() == null) { @@ -296,8 +295,8 @@ final class Delegatee { return commit(list, results, batchSize); } - private List<SyncResult> syncUser(@Nonnull String userId, boolean includeIdpName, - @Nonnull List<SyncResult> results, @Nonnull List<String> list) { + private List<SyncResult> syncUser(@NotNull String userId, boolean includeIdpName, + @NotNull List<SyncResult> results, @NotNull List<String> list) { try { results.add(context.sync(userId)); } catch (SyncException e) { @@ -307,7 +306,7 @@ final class Delegatee { return commit(list, results, batchSize); } - private List<SyncResult> commit(@Nonnull List<String> list, @Nonnull List<SyncResult> resultList, int size) { + private List<SyncResult> commit(@NotNull List<String> list, @NotNull List<SyncResult> resultList, int size) { if (resultList.isEmpty() || resultList.size() < size) { return resultList; } else { @@ -324,7 +323,7 @@ final class Delegatee { } } - @Nonnull + @NotNull private Iterator<String> internalListOrphanedIdentities() { try { Iterator<SyncedIdentity> it = handler.listIdentities(userMgr); @@ -352,7 +351,7 @@ final class Delegatee { } } - private static void append(@Nonnull List<String> list, @Nonnull SyncResult r) { + private static void append(@NotNull List<String> list, @NotNull SyncResult r) { if (r instanceof ErrorSyncResult) { ((ErrorSyncResult) r).append(list); } else { @@ -360,11 +359,11 @@ final class Delegatee { } } - private static void append(@Nonnull List<String> list, @CheckForNull SyncedIdentity syncedIdentity, @Nonnull Exception e) { + private static void append(@NotNull List<String> list, @Nullable SyncedIdentity syncedIdentity, @NotNull Exception e) { append(list, syncedIdentity, "ERR", e.toString()); } - private static void append(@Nonnull List<String> list, @CheckForNull SyncedIdentity syncedIdentity, @Nonnull String op, @CheckForNull String msg) { + private static void append(@NotNull List<String> list, @Nullable SyncedIdentity syncedIdentity, @NotNull String op, @Nullable String msg) { String uid = JsonUtil.getJsonString((syncedIdentity == null ? null : syncedIdentity.getId())); ExternalIdentityRef externalIdentityRef = (syncedIdentity == null) ? null : syncedIdentity.getExternalIdRef(); String eid = (externalIdentityRef == null) ? "\"\"" : JsonUtil.getJsonString(externalIdentityRef.getString()); @@ -376,13 +375,13 @@ final class Delegatee { } } - private static void append(@Nonnull List<String> list, @Nonnull List<SyncResult> results) { + private static void append(@NotNull List<String> list, @NotNull List<SyncResult> results) { for (SyncResult result : results) { append(list, result); } } - private static void append(@Nonnull List<String> list, @Nonnull List<SyncResult> results, @Nonnull Exception e) { + private static void append(@NotNull List<String> list, @NotNull List<SyncResult> results, @NotNull Exception e) { for (SyncResult result : results) { if (result instanceof ErrorSyncResult) { ((ErrorSyncResult) result).append(list); @@ -447,30 +446,30 @@ final class Delegatee { private final SyncedIdentity syncedIdentity; private final Exception error; - private ErrorSyncResult(@Nonnull String userId, @CheckForNull String idpName, @Nonnull Exception error) { + private ErrorSyncResult(@NotNull String userId, @Nullable String idpName, @NotNull Exception error) { ExternalIdentityRef ref = (idpName != null) ? new ExternalIdentityRef(userId, idpName) : null; this.syncedIdentity = new DefaultSyncedIdentity(userId, ref, false, -1); this.error = error; } - private ErrorSyncResult(@Nonnull ExternalIdentityRef ref, @Nonnull Exception error) { + private ErrorSyncResult(@NotNull ExternalIdentityRef ref, @NotNull Exception error) { this.syncedIdentity = new DefaultSyncedIdentity(ref.getId(), ref, false, -1); this.error = error; } - @Nonnull + @NotNull @Override public SyncedIdentity getIdentity() { return syncedIdentity; } - @Nonnull + @NotNull @Override public Status getStatus() { return Status.NOP; } - private void append(@Nonnull List<String> list) { + private void append(@NotNull List<String> list) { Delegatee.append(list, syncedIdentity, error); } }
Modified: jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/SyncMBeanImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/SyncMBeanImpl.java?rev=1846006&r1=1846005&r2=1846006&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/SyncMBeanImpl.java (original) +++ jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/SyncMBeanImpl.java Wed Nov 7 13:33:31 2018 @@ -16,14 +16,13 @@ */ package org.apache.jackrabbit.oak.spi.security.authentication.external.impl.jmx; -import javax.annotation.Nonnull; - import org.apache.jackrabbit.oak.api.ContentRepository; import org.apache.jackrabbit.oak.spi.security.SecurityProvider; import org.apache.jackrabbit.oak.spi.security.authentication.external.ExternalIdentityProvider; import org.apache.jackrabbit.oak.spi.security.authentication.external.ExternalIdentityProviderManager; import org.apache.jackrabbit.oak.spi.security.authentication.external.SyncHandler; import org.apache.jackrabbit.oak.spi.security.authentication.external.SyncManager; +import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -46,9 +45,9 @@ public class SyncMBeanImpl implements Sy private final String idpName; - public SyncMBeanImpl(@Nonnull ContentRepository repository, @Nonnull SecurityProvider securityProvider, - @Nonnull SyncManager syncManager, @Nonnull String syncName, - @Nonnull ExternalIdentityProviderManager idpManager, @Nonnull String idpName) { + public SyncMBeanImpl(@NotNull ContentRepository repository, @NotNull SecurityProvider securityProvider, + @NotNull SyncManager syncManager, @NotNull String syncName, + @NotNull ExternalIdentityProviderManager idpManager, @NotNull String idpName) { this.repository = repository; this.securityProvider = securityProvider; this.syncManager = syncManager; @@ -57,7 +56,7 @@ public class SyncMBeanImpl implements Sy this.idpName = idpName; } - @Nonnull + @NotNull private Delegatee getDelegatee() { SyncHandler handler = syncManager.getSyncHandler(syncName); if (handler == null) { @@ -73,21 +72,21 @@ public class SyncMBeanImpl implements Sy } //-----------------------------------------------< SynchronizationMBean >--- - @Nonnull + @NotNull @Override public String getSyncHandlerName() { return syncName; } - @Nonnull + @NotNull @Override public String getIDPName() { return idpName; } - @Nonnull + @NotNull @Override - public String[] syncUsers(@Nonnull String[] userIds, boolean purge) { + public String[] syncUsers(@NotNull String[] userIds, boolean purge) { Delegatee delegatee = getDelegatee(); try { return delegatee.syncUsers(userIds, purge); @@ -96,7 +95,7 @@ public class SyncMBeanImpl implements Sy } } - @Nonnull + @NotNull @Override public String[] syncAllUsers(boolean purge) { Delegatee delegatee = getDelegatee(); @@ -107,9 +106,9 @@ public class SyncMBeanImpl implements Sy } } - @Nonnull + @NotNull @Override - public String[] syncExternalUsers(@Nonnull String[] externalIds) { + public String[] syncExternalUsers(@NotNull String[] externalIds) { Delegatee delegatee = getDelegatee(); try { return delegatee.syncExternalUsers(externalIds); @@ -118,7 +117,7 @@ public class SyncMBeanImpl implements Sy } } - @Nonnull + @NotNull @Override public String[] syncAllExternalUsers() { Delegatee delegatee = getDelegatee(); @@ -129,7 +128,7 @@ public class SyncMBeanImpl implements Sy } } - @Nonnull + @NotNull @Override public String[] listOrphanedUsers() { Delegatee delegatee = getDelegatee(); @@ -140,7 +139,7 @@ public class SyncMBeanImpl implements Sy } } - @Nonnull + @NotNull @Override public String[] purgeOrphanedUsers() { Delegatee delegatee = getDelegatee(); @@ -150,4 +149,4 @@ public class SyncMBeanImpl implements Sy delegatee.close(); } } -} \ No newline at end of file +} Modified: jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/SyncRuntimeException.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/SyncRuntimeException.java?rev=1846006&r1=1846005&r2=1846006&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/SyncRuntimeException.java (original) +++ jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/SyncRuntimeException.java Wed Nov 7 13:33:31 2018 @@ -16,15 +16,15 @@ */ package org.apache.jackrabbit.oak.spi.security.authentication.external.impl.jmx; -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; public class SyncRuntimeException extends RuntimeException { - public SyncRuntimeException(@Nonnull String message) { + public SyncRuntimeException(@NotNull String message) { super(message); } - public SyncRuntimeException(@Nonnull String message, @Nonnull Throwable throwable) { + public SyncRuntimeException(@NotNull String message, @NotNull Throwable throwable) { super(message, throwable); } -} \ No newline at end of file +} Modified: jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/SynchronizationMBean.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/SynchronizationMBean.java?rev=1846006&r1=1846005&r2=1846006&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/SynchronizationMBean.java (original) +++ jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/SynchronizationMBean.java Wed Nov 7 13:33:31 2018 @@ -16,8 +16,7 @@ */ package org.apache.jackrabbit.oak.spi.security.authentication.external.impl.jmx; -import javax.annotation.Nonnull; - +import org.jetbrains.annotations.NotNull; import org.osgi.annotation.versioning.ProviderType; /** @@ -52,7 +51,7 @@ public interface SynchronizationMBean { * * @return the name of the sync handler. */ - @Nonnull + @NotNull String getSyncHandlerName(); /** @@ -61,7 +60,7 @@ public interface SynchronizationMBean { * * @return the name of the IDP. */ - @Nonnull + @NotNull String getIDPName(); /** @@ -70,8 +69,8 @@ public interface SynchronizationMBean { * @param purge if {@code true} users that don't exist in the IDP are deleted. * @return result messages. */ - @Nonnull - String[] syncUsers(@Nonnull String[] userIds, boolean purge); + @NotNull + String[] syncUsers(@NotNull String[] userIds, boolean purge); /** * Synchronizes all local users with the given user ids. Note that this can be an expensive operation since all @@ -80,7 +79,7 @@ public interface SynchronizationMBean { * @param purge if {@code true} users that don't exist in the IDP are deleted. * @return result messages. */ - @Nonnull + @NotNull String[] syncAllUsers(boolean purge); /** @@ -88,8 +87,8 @@ public interface SynchronizationMBean { * @param externalIds the external id * @return result messages. */ - @Nonnull - String[] syncExternalUsers(@Nonnull String[] externalIds); + @NotNull + String[] syncExternalUsers(@NotNull String[] externalIds); /** * Synchronizes all the external users, i.e. basically imports the entire IDP. Note that this can be an expensive @@ -97,7 +96,7 @@ public interface SynchronizationMBean { * * @return result messages. */ - @Nonnull + @NotNull String[] syncAllExternalUsers(); /** @@ -105,7 +104,7 @@ public interface SynchronizationMBean { * expensive operation since all potential users need to be examined. * @return a list of the user ids of orphaned users. */ - @Nonnull + @NotNull String[] listOrphanedUsers(); /** @@ -114,6 +113,6 @@ public interface SynchronizationMBean { * * @return result messages. */ - @Nonnull + @NotNull String[] purgeOrphanedUsers(); -} \ No newline at end of file +} Modified: jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalGroupPrincipalProvider.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalGroupPrincipalProvider.java?rev=1846006&r1=1846005&r2=1846006&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalGroupPrincipalProvider.java (original) +++ jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalGroupPrincipalProvider.java Wed Nov 7 13:33:31 2018 @@ -27,9 +27,6 @@ import java.util.Iterator; import java.util.Map; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; import javax.jcr.PropertyType; import javax.jcr.RepositoryException; import javax.jcr.Value; @@ -64,6 +61,8 @@ import org.apache.jackrabbit.oak.spi.sec import org.apache.jackrabbit.oak.spi.security.user.AuthorizableType; import org.apache.jackrabbit.oak.spi.security.user.UserConfiguration; import org.apache.jackrabbit.oak.spi.security.user.util.UserUtil; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -102,9 +101,9 @@ class ExternalGroupPrincipalProvider imp private final UserManager userManager; private final AutoMembershipPrincipals autoMembershipPrincipals; - ExternalGroupPrincipalProvider(@Nonnull Root root, @Nonnull UserConfiguration uc, - @Nonnull NamePathMapper namePathMapper, - @Nonnull Map<String, String[]> autoMembershipMapping) { + ExternalGroupPrincipalProvider(@NotNull Root root, @NotNull UserConfiguration uc, + @NotNull NamePathMapper namePathMapper, + @NotNull Map<String, String[]> autoMembershipMapping) { this.root = root; this.namePathMapper = namePathMapper; @@ -114,7 +113,7 @@ class ExternalGroupPrincipalProvider imp //--------------------------------------------------< PrincipalProvider >--- @Override - public Principal getPrincipal(@Nonnull String principalName) { + public Principal getPrincipal(@NotNull String principalName) { Result result = findPrincipals(principalName, true); if (result != null && result.getRows().iterator().hasNext()) { return new ExternalGroupPrincipal(principalName); @@ -123,9 +122,9 @@ class ExternalGroupPrincipalProvider imp } } - @Nonnull + @NotNull @Override - public Set<Group> getGroupMembership(@Nonnull Principal principal) { + public Set<Group> getGroupMembership(@NotNull Principal principal) { if (!(principal instanceof Group)) { try { if (principal instanceof ItemBasedPrincipal) { @@ -142,9 +141,9 @@ class ExternalGroupPrincipalProvider imp return ImmutableSet.of(); } - @Nonnull + @NotNull @Override - public Set<? extends Principal> getPrincipals(@Nonnull String userID) { + public Set<? extends Principal> getPrincipals(@NotNull String userID) { try { return getGroupPrincipals(userManager.getAuthorizable(userID)); } catch (RepositoryException e) { @@ -153,7 +152,7 @@ class ExternalGroupPrincipalProvider imp } } - @Nonnull + @NotNull @Override public Iterator<? extends Principal> findPrincipals(@Nullable String nameHint, int searchType) { if (PrincipalManager.SEARCH_TYPE_NOT_GROUP != searchType) { @@ -166,15 +165,15 @@ class ExternalGroupPrincipalProvider imp return Collections.emptyIterator(); } - @Nonnull + @NotNull @Override public Iterator<? extends Principal> findPrincipals(int searchType) { return findPrincipals(null, searchType); } //------------------------------------------------------------< private >--- - @CheckForNull - private String getIdpName(@Nonnull Tree userTree) { + @Nullable + private String getIdpName(@NotNull Tree userTree) { PropertyState ps = userTree.getProperty(REP_EXTERNAL_ID); if (ps != null) { return ExternalIdentityRef.fromString(ps.getValue(Type.STRING)).getProviderName(); @@ -183,7 +182,7 @@ class ExternalGroupPrincipalProvider imp } } - private Set<Group> getGroupPrincipals(@CheckForNull Authorizable authorizable) throws RepositoryException { + private Set<Group> getGroupPrincipals(@Nullable Authorizable authorizable) throws RepositoryException { if (authorizable != null && !authorizable.isGroup()) { Tree userTree = root.getTree(authorizable.getPath()); return getGroupPrincipals(userTree); @@ -192,7 +191,7 @@ class ExternalGroupPrincipalProvider imp } } - private Set<Group> getGroupPrincipals(@Nonnull Tree userTree) { + private Set<Group> getGroupPrincipals(@NotNull Tree userTree) { if (userTree.exists() && UserUtil.isType(userTree, AuthorizableType.USER) && userTree.hasProperty(REP_EXTERNAL_PRINCIPAL_NAMES)) { PropertyState ps = userTree.getProperty(REP_EXTERNAL_PRINCIPAL_NAMES); if (ps != null) { @@ -224,8 +223,8 @@ class ExternalGroupPrincipalProvider imp * exact matching. * @return The query result. */ - @CheckForNull - private Result findPrincipals(@Nonnull String nameHint, boolean exactMatch) { + @Nullable + private Result findPrincipals(@NotNull String nameHint, boolean exactMatch) { try { Map<String, ? extends PropertyValue> bindings = buildBinding(nameHint, exactMatch); String op = (exactMatch) ? " = " : " LIKE "; @@ -245,8 +244,8 @@ class ExternalGroupPrincipalProvider imp * @param exactMatch boolean flag indicating if the query should search for exact matching. * @return the bindings */ - @Nonnull - private static Map<String, ? extends PropertyValue> buildBinding(@Nonnull String nameHint, boolean exactMatch) { + @NotNull + private static Map<String, ? extends PropertyValue> buildBinding(@NotNull String nameHint, boolean exactMatch) { String val = nameHint; if (!exactMatch) { // not-exact query matching required => add leading and trailing % @@ -360,7 +359,7 @@ class ExternalGroupPrincipalProvider imp private Iterator<String> propValues = Collections.emptyIterator(); - private GroupPrincipalIterator(@Nullable String queryString, @Nonnull Result queryResult) { + private GroupPrincipalIterator(@Nullable String queryString, @NotNull Result queryResult) { this.queryString = queryString; rows = queryResult.getRows().iterator(); } @@ -384,7 +383,7 @@ class ExternalGroupPrincipalProvider imp return null; } - private boolean matchesQuery(@Nonnull String principalName) { + private boolean matchesQuery(@NotNull String principalName) { if (queryString == null) { return true; } else { @@ -414,7 +413,7 @@ class ExternalGroupPrincipalProvider imp */ private final Iterator<? extends ResultRow> rows; - private MemberIterator(@Nonnull Result queryResult) { + private MemberIterator(@NotNull Result queryResult) { rows = queryResult.getRows().iterator(); } @@ -440,13 +439,13 @@ class ExternalGroupPrincipalProvider imp private final Map<String, String[]> autoMembershipMapping; private final Map<String, Set<Group>> principalMap; - private AutoMembershipPrincipals(@Nonnull Map<String, String[]> autoMembershipMapping) { + private AutoMembershipPrincipals(@NotNull Map<String, String[]> autoMembershipMapping) { this.autoMembershipMapping = autoMembershipMapping; this.principalMap = new ConcurrentHashMap<String, Set<Group>>(autoMembershipMapping.size()); } - @Nonnull - private Collection<Group> get(@CheckForNull String idpName) { + @NotNull + private Collection<Group> get(@Nullable String idpName) { if (idpName == null) { return ImmutableSet.of(); } @@ -484,4 +483,4 @@ class ExternalGroupPrincipalProvider imp return principals; } } -} \ No newline at end of file +} Modified: jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalIdentityImporter.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalIdentityImporter.java?rev=1846006&r1=1846005&r2=1846006&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalIdentityImporter.java (original) +++ jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalIdentityImporter.java Wed Nov 7 13:33:31 2018 @@ -16,7 +16,6 @@ */ package org.apache.jackrabbit.oak.spi.security.authentication.external.impl.principal; -import javax.annotation.Nonnull; import javax.jcr.Session; import javax.jcr.nodetype.PropertyDefinition; @@ -29,6 +28,7 @@ import org.apache.jackrabbit.oak.spi.sec import org.apache.jackrabbit.oak.spi.xml.PropInfo; import org.apache.jackrabbit.oak.spi.xml.ProtectedPropertyImporter; import org.apache.jackrabbit.oak.spi.xml.ReferenceChangeTracker; +import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -46,7 +46,7 @@ class ExternalIdentityImporter implement //----------------------------------------------< ProtectedItemImporter >--- @Override - public boolean init(@Nonnull Session session, @Nonnull Root root, @Nonnull NamePathMapper namePathMapper, boolean isWorkspaceImport, int uuidBehavior, @Nonnull ReferenceChangeTracker referenceTracker, @Nonnull SecurityProvider securityProvider) { + public boolean init(@NotNull Session session, @NotNull Root root, @NotNull NamePathMapper namePathMapper, boolean isWorkspaceImport, int uuidBehavior, @NotNull ReferenceChangeTracker referenceTracker, @NotNull SecurityProvider securityProvider) { isSystemSession = root.getContentSession().getAuthInfo().getPrincipals().contains(SystemPrincipal.INSTANCE); return true; } @@ -69,7 +69,7 @@ class ExternalIdentityImporter implement * @return Always returns false. */ @Override - public boolean handlePropInfo(@Nonnull Tree parent, @Nonnull PropInfo protectedPropInfo, @Nonnull PropertyDefinition def) { + public boolean handlePropInfo(@NotNull Tree parent, @NotNull PropInfo protectedPropInfo, @NotNull PropertyDefinition def) { return false; } @@ -82,7 +82,7 @@ class ExternalIdentityImporter implement * @param protectedParent The protected parent tree. */ @Override - public void propertiesCompleted(@Nonnull Tree protectedParent) { + public void propertiesCompleted(@NotNull Tree protectedParent) { if (!isSystemSession) { if (protectedParent.hasProperty(REP_EXTERNAL_PRINCIPAL_NAMES)) { log.debug("Found reserved property " + REP_EXTERNAL_PRINCIPAL_NAMES + " managed by the system => Removed from imported scope."); @@ -93,4 +93,4 @@ class ExternalIdentityImporter implement } } } -} \ No newline at end of file +} Modified: jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalIdentityRepositoryInitializer.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalIdentityRepositoryInitializer.java?rev=1846006&r1=1846005&r2=1846006&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalIdentityRepositoryInitializer.java (original) +++ jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalIdentityRepositoryInitializer.java Wed Nov 7 13:33:31 2018 @@ -16,12 +16,11 @@ */ package org.apache.jackrabbit.oak.spi.security.authentication.external.impl.principal; -import javax.annotation.Nonnull; - import org.apache.jackrabbit.oak.plugins.index.IndexUtils; import org.apache.jackrabbit.oak.spi.lifecycle.RepositoryInitializer; import org.apache.jackrabbit.oak.spi.security.authentication.external.impl.ExternalIdentityConstants; import org.apache.jackrabbit.oak.spi.state.NodeBuilder; +import org.jetbrains.annotations.NotNull; import com.google.common.collect.ImmutableList; @@ -48,7 +47,7 @@ class ExternalIdentityRepositoryInitiali } @Override - public void initialize(@Nonnull NodeBuilder builder) { + public void initialize(@NotNull NodeBuilder builder) { // create index definition for "rep:externalId" and // "rep:externalPrincipalNames" @@ -65,4 +64,4 @@ class ExternalIdentityRepositoryInitiali "Oak index used by the principal management provided by the external authentication module."); } } -} \ No newline at end of file +} Modified: jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalIdentityValidatorProvider.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalIdentityValidatorProvider.java?rev=1846006&r1=1846005&r2=1846006&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalIdentityValidatorProvider.java (original) +++ jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalIdentityValidatorProvider.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.Map; import java.util.Set; -import javax.annotation.Nonnull; - import com.google.common.collect.ImmutableMap; import org.apache.jackrabbit.oak.api.CommitFailedException; import org.apache.jackrabbit.oak.api.PropertyState; @@ -32,6 +30,7 @@ import org.apache.jackrabbit.oak.spi.com import org.apache.jackrabbit.oak.spi.security.authentication.external.impl.ExternalIdentityConstants; import org.apache.jackrabbit.oak.spi.security.principal.SystemPrincipal; import org.apache.jackrabbit.oak.spi.state.NodeState; +import org.jetbrains.annotations.NotNull; /** * {@code ValidatorProvider} used to assure that the system maintained properties @@ -53,13 +52,13 @@ class ExternalIdentityValidatorProvider private final boolean isSystem; private final boolean protectedExternalIds; - ExternalIdentityValidatorProvider(@Nonnull Set<Principal> principals, boolean protectExternalIds) { + ExternalIdentityValidatorProvider(@NotNull Set<Principal> principals, boolean protectExternalIds) { isSystem = principals.contains(SystemPrincipal.INSTANCE); this.protectedExternalIds = protectExternalIds; } - private void checkAddModifyProperties(@Nonnull NodeState parent, @Nonnull String name, @Nonnull PropertyState propertyState, boolean isModify) throws CommitFailedException { + private void checkAddModifyProperties(@NotNull NodeState parent, @NotNull String name, @NotNull PropertyState propertyState, boolean isModify) throws CommitFailedException { if (RESERVED_PROPERTY_NAMES.contains(name)) { Type<?> type = propertyState.getType(); if (REP_EXTERNAL_PRINCIPAL_NAMES.equals(name)) { @@ -84,7 +83,7 @@ class ExternalIdentityValidatorProvider } } - private void checkRemoveProperties(@Nonnull NodeState parent, @Nonnull String name) throws CommitFailedException { + private void checkRemoveProperties(@NotNull NodeState parent, @NotNull String name) throws CommitFailedException { if (RESERVED_PROPERTY_NAMES.contains(name)) { if (REP_EXTERNAL_ID.equals(name)) { if (parent.hasProperty(REP_EXTERNAL_PRINCIPAL_NAMES)) { @@ -110,7 +109,7 @@ class ExternalIdentityValidatorProvider private final NodeState parent; private final boolean modifiedParent; - private ExternalIdentityValidator(@Nonnull NodeState parent, boolean modifiedParent) { + private ExternalIdentityValidator(@NotNull NodeState parent, boolean modifiedParent) { this.parent = parent; this.modifiedParent = modifiedParent; } @@ -146,4 +145,4 @@ class ExternalIdentityValidatorProvider return null; } } -} \ No newline at end of file +} Modified: jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalPrincipalConfiguration.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalPrincipalConfiguration.java?rev=1846006&r1=1846005&r2=1846006&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalPrincipalConfiguration.java (original) +++ jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalPrincipalConfiguration.java Wed Nov 7 13:33:31 2018 @@ -26,9 +26,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import com.google.common.base.Function; import com.google.common.base.Predicates; import com.google.common.collect.ImmutableList; @@ -62,6 +59,8 @@ import org.apache.jackrabbit.oak.spi.sec import org.apache.jackrabbit.oak.spi.security.principal.PrincipalProvider; import org.apache.jackrabbit.oak.spi.security.user.UserConfiguration; import org.apache.jackrabbit.oak.spi.xml.ProtectedItemImporter; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceReference; import org.osgi.util.tracker.ServiceTracker; @@ -110,13 +109,13 @@ public class ExternalPrincipalConfigurat } //---------------------------------------------< 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) { if (dynamicMembershipEnabled()) { @@ -128,25 +127,25 @@ public class ExternalPrincipalConfigurat } //----------------------------------------------< SecurityConfiguration >--- - @Nonnull + @NotNull @Override public String getName() { return NAME; } - @Nonnull + @NotNull @Override public RepositoryInitializer getRepositoryInitializer() { return new ExternalIdentityRepositoryInitializer(protectedExternalIds()); } - @Nonnull + @NotNull @Override - public List<? extends ValidatorProvider> getValidators(@Nonnull String workspaceName, @Nonnull Set<Principal> principals, @Nonnull MoveTracker moveTracker) { + public List<? extends ValidatorProvider> getValidators(@NotNull String workspaceName, @NotNull Set<Principal> principals, @NotNull MoveTracker moveTracker) { return ImmutableList.of(new ExternalIdentityValidatorProvider(principals, protectedExternalIds())); } - @Nonnull + @NotNull @Override public List<ProtectedItemImporter> getProtectedItemImporters() { return ImmutableList.<ProtectedItemImporter>of(new ExternalIdentityImporter()); @@ -198,7 +197,7 @@ public class ExternalPrincipalConfigurat private Set<ServiceReference> enablingRefs = new HashSet(); private boolean isEnabled = false; - public SyncConfigTracker(@Nonnull BundleContext context, @Nonnull SyncHandlerMappingTracker mappingTracker) { + public SyncConfigTracker(@NotNull BundleContext context, @NotNull SyncHandlerMappingTracker mappingTracker) { super(context, SyncHandler.class.getName(), null); this.mappingTracker = mappingTracker; } @@ -264,7 +263,7 @@ public class ExternalPrincipalConfigurat private Map<ServiceReference, String[]> referenceMap = new HashMap<ServiceReference, String[]>(); - public SyncHandlerMappingTracker(@Nonnull BundleContext context) { + public SyncHandlerMappingTracker(@NotNull BundleContext context) { super(context, SyncHandlerMapping.class.getName(), null); } @@ -297,7 +296,7 @@ public class ExternalPrincipalConfigurat } } - private Iterable<String> getIdpNames(@Nonnull final String syncHandlerName) { + private Iterable<String> getIdpNames(@NotNull final String syncHandlerName) { return Iterables.filter(Iterables.transform(referenceMap.values(), new Function<String[], String>() { @Nullable @Override @@ -315,4 +314,4 @@ public class ExternalPrincipalConfigurat ), Predicates.notNull()); } } -} \ No newline at end of file +} Modified: jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/package-info.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/package-info.java?rev=1846006&r1=1846005&r2=1846006&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/package-info.java (original) +++ jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/package-info.java Wed Nov 7 13:33:31 2018 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -@Version("2.3.0") +@Version("2.3.1") package org.apache.jackrabbit.oak.spi.security.authentication.external; import org.osgi.annotation.versioning.Version; Modified: jackrabbit/oak/branches/1.8/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/AbstractExternalAuthTest.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/AbstractExternalAuthTest.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/AbstractExternalAuthTest.java (original) +++ jackrabbit/oak/branches/1.8/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/AbstractExternalAuthTest.java Wed Nov 7 13:33:31 2018 @@ -22,8 +22,6 @@ import java.util.HashMap; import java.util.Iterator; import java.util.Map; import java.util.Set; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; import javax.jcr.NoSuchWorkspaceException; import javax.jcr.RepositoryException; import javax.security.auth.Subject; @@ -48,6 +46,8 @@ import org.apache.jackrabbit.oak.spi.sec import org.apache.jackrabbit.oak.spi.security.authentication.external.impl.ExternalIdentityConstants; import org.apache.jackrabbit.oak.spi.security.authentication.external.impl.principal.ExternalPrincipalConfiguration; import org.apache.sling.testing.mock.osgi.junit.OsgiContext; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.junit.After; import org.junit.Before; import org.junit.Rule; @@ -115,7 +115,7 @@ public abstract class AbstractExternalAu } } - private static Iterator<String> getAllAuthorizableIds(@Nonnull UserManager userManager) throws Exception { + private static Iterator<String> getAllAuthorizableIds(@NotNull UserManager userManager) throws Exception { Iterator<Authorizable> iter = userManager.findAuthorizables("jcr:primaryType", null); return Iterators.filter(Iterators.transform(iter, new Function<Authorizable, String>() { @Nullable @@ -182,7 +182,7 @@ public abstract class AbstractExternalAu return systemRoot; } - protected static void waitUntilExpired(@Nonnull User user, @Nonnull Root root, long expTime) throws RepositoryException { + protected static void waitUntilExpired(@NotNull User user, @NotNull Root root, long expTime) throws RepositoryException { Tree t = root.getTree(user.getPath()); PropertyState ps = t.getProperty(ExternalIdentityConstants.REP_LAST_SYNCED); if (ps == null || ps.count() == 0) { @@ -195,4 +195,4 @@ public abstract class AbstractExternalAu now = Calendar.getInstance().getTimeInMillis(); } } -} \ 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/ExternalIdentityRefTest.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/ExternalIdentityRefTest.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/ExternalIdentityRefTest.java (original) +++ jackrabbit/oak/branches/1.8/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/ExternalIdentityRefTest.java Wed Nov 7 13:33:31 2018 @@ -18,12 +18,11 @@ package org.apache.jackrabbit.oak.spi.se import java.util.HashMap; 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 com.google.common.collect.ImmutableSet; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -130,37 +129,37 @@ public class ExternalIdentityRefTest { @Test public void testNotEqualsExternalIdentity() { assertFalse(ref.equals(new ExternalIdentity() { - @Nonnull + @NotNull @Override public ExternalIdentityRef getExternalId() { return ref; } - @Nonnull + @NotNull @Override public String getId() { return ref.getId(); } - @Nonnull + @NotNull @Override public String getPrincipalName() { return ref.getId(); } - @CheckForNull + @Nullable @Override public String getIntermediatePath() { return null; } - @Nonnull + @NotNull @Override public Iterable<ExternalIdentityRef> getDeclaredGroups() { return ImmutableSet.of(); } - @Nonnull + @NotNull @Override public Map<String, ?> getProperties() { return ImmutableMap.of(); Modified: jackrabbit/oak/branches/1.8/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/ExternalLoginModuleAutoMembershipTest.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/ExternalLoginModuleAutoMembershipTest.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/ExternalLoginModuleAutoMembershipTest.java (original) +++ jackrabbit/oak/branches/1.8/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/ExternalLoginModuleAutoMembershipTest.java Wed Nov 7 13:33:31 2018 @@ -21,8 +21,6 @@ import java.util.Collections; import java.util.Map; import java.util.Set; import java.util.UUID; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; import javax.jcr.SimpleCredentials; import javax.jcr.ValueFactory; import javax.security.auth.login.AppConfigurationEntry; @@ -45,6 +43,8 @@ import org.apache.jackrabbit.oak.spi.sec import org.apache.jackrabbit.oak.spi.whiteboard.Registration; import org.apache.jackrabbit.oak.spi.whiteboard.WhiteboardUtils; import org.apache.sling.testing.mock.osgi.junit.OsgiContext; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -138,7 +138,7 @@ public class ExternalLoginModuleAutoMemb }; } - private static void registerSyncHandlerMapping(@Nonnull OsgiContext ctx, @Nonnull ExternalSetup setup) { + private static void registerSyncHandlerMapping(@NotNull OsgiContext ctx, @NotNull ExternalSetup setup) { String syncHandlerName = setup.sc.getName(); Map props = ImmutableMap.of( DefaultSyncConfigImpl.PARAM_NAME, syncHandlerName, @@ -363,11 +363,11 @@ public class ExternalLoginModuleAutoMemb private SyncContext ctx; - private ExternalSetup(@Nonnull ExternalIdentityProvider idp, @Nonnull DefaultSyncConfig sc) throws Exception { + private ExternalSetup(@NotNull ExternalIdentityProvider idp, @NotNull DefaultSyncConfig sc) throws Exception { this(idp, sc, new DefaultSyncHandler(sc), "gr_" + sc.getName()); } - private ExternalSetup(@Nonnull ExternalIdentityProvider idp, @Nonnull DefaultSyncConfig sc, @Nonnull SyncHandler sh, @CheckForNull String groupId) throws Exception { + private ExternalSetup(@NotNull ExternalIdentityProvider idp, @NotNull DefaultSyncConfig sc, @NotNull SyncHandler sh, @Nullable String groupId) throws Exception { this.idp = idp; this.sc = sc; this.sh = sh; @@ -394,7 +394,7 @@ public class ExternalLoginModuleAutoMemb registerSyncHandlerMapping(context, this); } - private void sync(@Nonnull String id, boolean isGroup) throws Exception { + private void sync(@NotNull String id, boolean isGroup) throws Exception { ctx = sh.createContext(idp, userManager, valueFactory); ExternalIdentity exIdentity = (isGroup) ? idp.getGroup(id) : idp.getUser(id); assertNotNull(exIdentity); @@ -427,4 +427,4 @@ public class ExternalLoginModuleAutoMemb )); } } -} \ 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/ExternalLoginModuleDynamicMembershipTest.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/ExternalLoginModuleDynamicMembershipTest.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/ExternalLoginModuleDynamicMembershipTest.java (original) +++ jackrabbit/oak/branches/1.8/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/ExternalLoginModuleDynamicMembershipTest.java Wed Nov 7 13:33:31 2018 @@ -21,7 +21,6 @@ import java.util.HashSet; import java.util.Iterator; import java.util.Map; import java.util.Set; -import javax.annotation.Nonnull; import javax.jcr.SimpleCredentials; import javax.jcr.Value; @@ -37,6 +36,7 @@ import org.apache.jackrabbit.oak.spi.sec import org.apache.jackrabbit.oak.spi.security.authentication.external.impl.ExternalIdentityConstants; import org.apache.jackrabbit.oak.spi.security.principal.EveryonePrincipal; import org.apache.jackrabbit.oak.spi.whiteboard.WhiteboardUtils; +import org.jetbrains.annotations.NotNull; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -59,7 +59,7 @@ public class ExternalLoginModuleDynamicM context.registerService(SyncHandler.class, WhiteboardUtils.getService(whiteboard, SyncHandler.class), props); } - private void assertExternalPrincipalNames(@Nonnull UserManager userMgr, @Nonnull String id) throws Exception { + private void assertExternalPrincipalNames(@NotNull UserManager userMgr, @NotNull String id) throws Exception { Authorizable a = userMgr.getAuthorizable(id); assertNotNull(a); @@ -74,7 +74,7 @@ public class ExternalLoginModuleDynamicM assertEquals(expected, extPrincNames); } - private void calcExpectedPrincipalNames(@Nonnull ExternalIdentity identity, long depth, @Nonnull Set<String> expected) throws Exception { + private void calcExpectedPrincipalNames(@NotNull ExternalIdentity identity, long depth, @NotNull Set<String> expected) throws Exception { if (depth <= 0) { return; } @@ -239,4 +239,4 @@ public class ExternalLoginModuleDynamicM options.clear(); } } -} \ 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/PreAuthCredentials.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/PreAuthCredentials.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/PreAuthCredentials.java (original) +++ jackrabbit/oak/branches/1.8/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/PreAuthCredentials.java Wed Nov 7 13:33:31 2018 @@ -17,11 +17,11 @@ package org.apache.jackrabbit.oak.spi.security.authentication.external; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; import javax.jcr.Credentials; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + final class PreAuthCredentials implements Credentials { static final String PRE_AUTH_DONE = "pre_auth_done"; @@ -34,17 +34,17 @@ final class PreAuthCredentials implement this.userId = userId; } - @CheckForNull + @Nullable String getUserId() { return userId; } - @CheckForNull + @Nullable String getMessage() { return msg; } - void setMessage(@Nonnull String message) { + void setMessage(@NotNull String message) { msg = message; } } Modified: jackrabbit/oak/branches/1.8/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/PreAuthLoginModule.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/PreAuthLoginModule.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/PreAuthLoginModule.java (original) +++ jackrabbit/oak/branches/1.8/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/PreAuthLoginModule.java Wed Nov 7 13:33:31 2018 @@ -18,19 +18,19 @@ package org.apache.jackrabbit.oak.spi.security.authentication.external; import java.util.Set; -import javax.annotation.Nonnull; import javax.jcr.Credentials; import javax.jcr.SimpleCredentials; import com.google.common.collect.ImmutableSet; import org.apache.jackrabbit.oak.spi.security.authentication.AbstractLoginModule; import org.apache.jackrabbit.oak.spi.security.authentication.PreAuthenticatedLogin; +import org.jetbrains.annotations.NotNull; public final class PreAuthLoginModule extends AbstractLoginModule { public PreAuthLoginModule() {} - @Nonnull + @NotNull @Override protected Set<Class> getSupportedCredentials() { return ImmutableSet.<Class>of(PreAuthCredentials.class); Modified: jackrabbit/oak/branches/1.8/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/TestIdentityProvider.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/TestIdentityProvider.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/TestIdentityProvider.java (original) +++ jackrabbit/oak/branches/1.8/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/TestIdentityProvider.java Wed Nov 7 13:33:31 2018 @@ -22,13 +22,14 @@ import java.util.Iterator; import java.util.Map; import java.util.Set; -import javax.annotation.Nonnull; import javax.jcr.Credentials; import javax.jcr.SimpleCredentials; import javax.security.auth.login.LoginException; import com.google.common.collect.ImmutableList; +import org.jetbrains.annotations.NotNull; + public class TestIdentityProvider implements ExternalIdentityProvider { public static final String ID_TEST_USER = "testUser"; @@ -48,7 +49,7 @@ public class TestIdentityProvider implem this(DEFAULT_IDP_NAME); } - public TestIdentityProvider(@Nonnull String idpName) { + public TestIdentityProvider(@NotNull String idpName) { this.idpName = idpName; addGroup(new TestGroup("aa", getName())); @@ -89,14 +90,14 @@ public class TestIdentityProvider implem externalGroups.put(group.getId().toLowerCase(), (ExternalGroup) group); } - @Nonnull + @NotNull @Override public String getName() { return idpName; } @Override - public ExternalIdentity getIdentity(@Nonnull ExternalIdentityRef ref) throws ExternalIdentityException { + public ExternalIdentity getIdentity(@NotNull ExternalIdentityRef ref) throws ExternalIdentityException { if (ID_EXCEPTION.equals(ref.getId())) { throw new ExternalIdentityException(ID_EXCEPTION); } @@ -109,7 +110,7 @@ public class TestIdentityProvider implem } @Override - public ExternalUser getUser(@Nonnull String userId) throws ExternalIdentityException { + public ExternalUser getUser(@NotNull String userId) throws ExternalIdentityException { if (ID_EXCEPTION.equals(userId)) { throw new ExternalIdentityException(ID_EXCEPTION); } @@ -117,7 +118,7 @@ public class TestIdentityProvider implem } @Override - public ExternalUser authenticate(@Nonnull Credentials credentials) throws ExternalIdentityException, LoginException { + public ExternalUser authenticate(@NotNull Credentials credentials) throws ExternalIdentityException, LoginException { if (!(credentials instanceof SimpleCredentials)) { return null; } @@ -132,20 +133,20 @@ public class TestIdentityProvider implem } @Override - public ExternalGroup getGroup(@Nonnull String name) throws ExternalIdentityException { + public ExternalGroup getGroup(@NotNull String name) throws ExternalIdentityException { if (ID_EXCEPTION.equals(name)) { throw new ExternalIdentityException(ID_EXCEPTION); } return externalGroups.get(name.toLowerCase()); } - @Nonnull + @NotNull @Override public Iterator<ExternalUser> listUsers() throws ExternalIdentityException { return externalUsers.values().iterator(); } - @Nonnull + @NotNull @Override public Iterator<ExternalGroup> listGroups() throws ExternalIdentityException { return externalGroups.values().iterator(); @@ -164,35 +165,35 @@ public class TestIdentityProvider implem this("externalId", "principalName", DEFAULT_IDP_NAME); } - public TestIdentity(@Nonnull String userId) { + public TestIdentity(@NotNull String userId) { this(userId, userId, DEFAULT_IDP_NAME); } - public TestIdentity(@Nonnull String userId, @Nonnull String principalName, @Nonnull String idpName) { + public TestIdentity(@NotNull String userId, @NotNull String principalName, @NotNull String idpName) { this.userId = userId; this.principalName = principalName; id = new ExternalIdentityRef(userId, idpName); } - public TestIdentity(@Nonnull ExternalIdentity base) { + public TestIdentity(@NotNull ExternalIdentity base) { userId = base.getId(); principalName = base.getPrincipalName(); id = base.getExternalId(); } - @Nonnull + @NotNull @Override public String getId() { return userId; } - @Nonnull + @NotNull @Override public String getPrincipalName() { return principalName; } - @Nonnull + @NotNull @Override public ExternalIdentityRef getExternalId() { return id; @@ -203,13 +204,13 @@ public class TestIdentityProvider implem return null; } - @Nonnull + @NotNull @Override public Iterable<ExternalIdentityRef> getDeclaredGroups() { return groups; } - @Nonnull + @NotNull @Override public Map<String, ?> getProperties() { return props; @@ -230,7 +231,7 @@ public class TestIdentityProvider implem public static class TestUser extends TestIdentity implements ExternalUser { - public TestUser(String userId, @Nonnull String idpName) { + public TestUser(String userId, @NotNull String idpName) { super(userId, userId, idpName); } @@ -242,11 +243,11 @@ public class TestIdentityProvider implem public static class TestGroup extends TestIdentity implements ExternalGroup { - public TestGroup(@Nonnull String userId, @Nonnull String idpName) { + public TestGroup(@NotNull String userId, @NotNull String idpName) { super(userId, userId, idpName); } - @Nonnull + @NotNull @Override public Iterable<ExternalIdentityRef> getDeclaredMembers() throws ExternalIdentityException { return null; @@ -266,10 +267,10 @@ public class TestIdentityProvider implem super("externalId", "principalName", "AnotherExternalIDP"); } - @Nonnull + @NotNull @Override public Iterable<ExternalIdentityRef> getDeclaredMembers() { return ImmutableList.of(); } } -} \ 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/TestSecurityProvider.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/TestSecurityProvider.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/TestSecurityProvider.java (original) +++ jackrabbit/oak/branches/1.8/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/TestSecurityProvider.java Wed Nov 7 13:33:31 2018 @@ -16,20 +16,19 @@ */ package org.apache.jackrabbit.oak.spi.security.authentication.external; -import javax.annotation.Nonnull; - import org.apache.jackrabbit.oak.security.internal.SecurityProviderBuilder; import org.apache.jackrabbit.oak.spi.security.ConfigurationParameters; import org.apache.jackrabbit.oak.spi.security.SecurityProvider; import org.apache.jackrabbit.oak.spi.security.authentication.external.impl.principal.ExternalPrincipalConfiguration; import org.apache.jackrabbit.oak.spi.security.principal.PrincipalConfiguration; +import org.jetbrains.annotations.NotNull; public final class TestSecurityProvider { private TestSecurityProvider() {} - public static SecurityProvider newTestSecurityProvider(@Nonnull ConfigurationParameters configuration, - @Nonnull ExternalPrincipalConfiguration externalPrincipalConfiguration) { + public static SecurityProvider newTestSecurityProvider(@NotNull ConfigurationParameters configuration, + @NotNull ExternalPrincipalConfiguration externalPrincipalConfiguration) { return new SecurityProviderBuilder().with(configuration).with(externalPrincipalConfiguration, PrincipalConfiguration.class).build(); } -} \ 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/basic/DefaultSyncConfigTest.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/basic/DefaultSyncConfigTest.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/basic/DefaultSyncConfigTest.java (original) +++ jackrabbit/oak/branches/1.8/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/DefaultSyncConfigTest.java Wed Nov 7 13:33:31 2018 @@ -18,10 +18,9 @@ package org.apache.jackrabbit.oak.spi.se import java.util.Map; import java.util.Set; -import javax.annotation.Nonnull; - import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; +import org.jetbrains.annotations.NotNull; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -33,7 +32,7 @@ public class DefaultSyncConfigTest { private DefaultSyncConfig config = new DefaultSyncConfig(); - private static void assertAuthorizableConfig(@Nonnull DefaultSyncConfig.Authorizable authorizableConfig) { + private static void assertAuthorizableConfig(@NotNull DefaultSyncConfig.Authorizable authorizableConfig) { assertEquals("", authorizableConfig.getPathPrefix()); assertSame(authorizableConfig, authorizableConfig.setPathPrefix(null)); assertEquals("", authorizableConfig.getPathPrefix()); @@ -98,4 +97,4 @@ public class DefaultSyncConfigTest { assertNotNull(groupConfig); assertAuthorizableConfig(groupConfig); } -} \ 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/basic/DefaultSyncContextTest.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/basic/DefaultSyncContextTest.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/basic/DefaultSyncContextTest.java (original) +++ jackrabbit/oak/branches/1.8/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/DefaultSyncContextTest.java Wed Nov 7 13:33:31 2018 @@ -27,8 +27,6 @@ import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.UUID; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; import javax.jcr.Binary; import javax.jcr.PropertyType; import javax.jcr.RepositoryException; @@ -54,6 +52,8 @@ import org.apache.jackrabbit.oak.spi.sec import org.apache.jackrabbit.oak.spi.security.authentication.external.SyncedIdentity; import org.apache.jackrabbit.oak.spi.security.authentication.external.TestIdentityProvider; import org.apache.jackrabbit.oak.spi.security.authentication.external.impl.ExternalIdentityConstants; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -107,13 +107,13 @@ public class DefaultSyncContextTest exte * @param externalIdentity The external identity to be synchronized. * @throws Exception */ - private void sync(@Nonnull ExternalIdentity externalIdentity) throws Exception { + private void sync(@NotNull ExternalIdentity externalIdentity) throws Exception { SyncResult result = syncCtx.sync(externalIdentity); assertSame(SyncResult.Status.ADD, result.getStatus()); root.commit(); } - private void setExternalID(@Nonnull Authorizable authorizable, @Nullable String idpName) throws RepositoryException { + private void setExternalID(@NotNull Authorizable authorizable, @Nullable String idpName) throws RepositoryException { authorizable.setProperty(DefaultSyncContext.REP_EXTERNAL_ID, valueFactory.createValue(authorizable.getID() + ';' + idpName)); } @@ -1375,17 +1375,17 @@ public class DefaultSyncContextTest exte private final ExternalIdentityRef declaredGroupRef; - private ExternalUserWithDeclaredGroup(@Nonnull ExternalIdentityRef declaredGroupRef) { + private ExternalUserWithDeclaredGroup(@NotNull ExternalIdentityRef declaredGroupRef) { super("externalId"); this.declaredGroupRef = declaredGroupRef; } - private ExternalUserWithDeclaredGroup(@Nonnull ExternalIdentityRef declaredGroupRef, @Nonnull ExternalIdentity base) { + private ExternalUserWithDeclaredGroup(@NotNull ExternalIdentityRef declaredGroupRef, @NotNull ExternalIdentity base) { super(base); this.declaredGroupRef = declaredGroupRef; } - @Nonnull + @NotNull @Override public Iterable<ExternalIdentityRef> getDeclaredGroups() { return ImmutableSet.of(declaredGroupRef); @@ -1394,8 +1394,8 @@ public class DefaultSyncContextTest exte private final class ExternalUserFromGroup extends TestIdentityProvider.TestIdentity implements ExternalUser { - private ExternalUserFromGroup(@Nonnull ExternalIdentity base) { + private ExternalUserFromGroup(@NotNull ExternalIdentity base) { super(base); } } -} \ 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/basic/RepExternalIdTest.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/basic/RepExternalIdTest.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/basic/RepExternalIdTest.java (original) +++ jackrabbit/oak/branches/1.8/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/RepExternalIdTest.java Wed Nov 7 13:33:31 2018 @@ -16,8 +16,6 @@ */ package org.apache.jackrabbit.oak.spi.security.authentication.external.basic; -import javax.annotation.Nonnull; - import org.apache.jackrabbit.api.security.user.Authorizable; import org.apache.jackrabbit.api.security.user.UserManager; import org.apache.jackrabbit.oak.api.CommitFailedException; @@ -29,6 +27,7 @@ import org.apache.jackrabbit.oak.spi.sec import org.apache.jackrabbit.oak.spi.security.authentication.external.ExternalIdentityRef; import org.apache.jackrabbit.oak.spi.security.authentication.external.SyncResult; import org.apache.jackrabbit.oak.spi.security.authentication.external.SyncedIdentity; +import org.jetbrains.annotations.NotNull; import org.junit.Before; import org.junit.Test; @@ -63,7 +62,7 @@ public class RepExternalIdTest extends A } } - private void assertRepExternalId(@Nonnull SyncResult result) throws Exception { + private void assertRepExternalId(@NotNull SyncResult result) throws Exception { assertSame(SyncResult.Status.ADD, result.getStatus()); SyncedIdentity si = result.getIdentity(); assertNotNull(si); @@ -150,4 +149,4 @@ public class RepExternalIdTest extends A r.refresh(); } } -} \ 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/CustomCredentialsSupportTest.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/CustomCredentialsSupportTest.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/CustomCredentialsSupportTest.java (original) +++ jackrabbit/oak/branches/1.8/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/CustomCredentialsSupportTest.java Wed Nov 7 13:33:31 2018 @@ -21,8 +21,6 @@ import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; import javax.jcr.Credentials; import javax.jcr.GuestCredentials; import javax.jcr.SimpleCredentials; @@ -41,6 +39,8 @@ import org.apache.jackrabbit.oak.spi.sec import org.apache.jackrabbit.oak.spi.security.authentication.external.ExternalLoginModuleTestBase; import org.apache.jackrabbit.oak.spi.security.authentication.external.ExternalUser; import org.apache.jackrabbit.oak.spi.security.authentication.credentials.CredentialsSupport; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -53,7 +53,7 @@ import static org.junit.Assert.fail; */ public class CustomCredentialsSupportTest extends ExternalLoginModuleTestBase { - private static void assertAttributes(@Nonnull Map<String, ?> expected, @Nonnull AuthInfo info) { + private static void assertAttributes(@NotNull Map<String, ?> expected, @NotNull AuthInfo info) { assertEquals(expected.size(), info.getAttributeNames().length); for (String aName : info.getAttributeNames()) { assertEquals(expected.get(aName), info.getAttribute(aName)); @@ -107,7 +107,7 @@ public class CustomCredentialsSupportTes private final String uid; - private TestCredentials(@Nonnull String uid) { + private TestCredentials(@NotNull String uid) { this.uid = uid; } } @@ -116,61 +116,61 @@ public class CustomCredentialsSupportTes private final Map attributes = Maps.newHashMap(ImmutableMap.of("a", "a")); - @Nonnull + @NotNull @Override public String getName() { return "creds_test"; } - @CheckForNull + @Nullable @Override - public ExternalIdentity getIdentity(@Nonnull ExternalIdentityRef ref) { + public ExternalIdentity getIdentity(@NotNull ExternalIdentityRef ref) { throw new UnsupportedOperationException(); } - @CheckForNull + @Nullable @Override - public ExternalUser getUser(@Nonnull String userId) { + public ExternalUser getUser(@NotNull String userId) { throw new UnsupportedOperationException(); } - @CheckForNull + @Nullable @Override - public ExternalUser authenticate(@Nonnull Credentials credentials) { + public ExternalUser authenticate(@NotNull Credentials credentials) { if (credentials instanceof TestCredentials) { final String uid = ((TestCredentials) credentials).uid; return new ExternalUser() { - @Nonnull + @NotNull @Override public ExternalIdentityRef getExternalId() { return new ExternalIdentityRef(uid, getName()); } - @Nonnull + @NotNull @Override public String getId() { return uid; } - @Nonnull + @NotNull @Override public String getPrincipalName() { return "principal" + uid; } - @CheckForNull + @Nullable @Override public String getIntermediatePath() { return null; } - @Nonnull + @NotNull @Override public Iterable<ExternalIdentityRef> getDeclaredGroups() { return Collections.emptySet(); } - @Nonnull + @NotNull @Override public Map<String, ?> getProperties() { return Collections.emptyMap(); @@ -181,33 +181,33 @@ public class CustomCredentialsSupportTes } } - @CheckForNull + @Nullable @Override - public ExternalGroup getGroup(@Nonnull String name) { + public ExternalGroup getGroup(@NotNull String name) { throw new UnsupportedOperationException(); } - @Nonnull + @NotNull @Override public Iterator<ExternalUser> listUsers() { throw new UnsupportedOperationException(); } - @Nonnull + @NotNull @Override public Iterator<ExternalGroup> listGroups() { throw new UnsupportedOperationException(); } - @Nonnull + @NotNull @Override public Set<Class> getCredentialClasses() { return ImmutableSet.<Class>of(TestCredentials.class); } - @CheckForNull + @Nullable @Override - public String getUserId(@Nonnull Credentials credentials) { + public String getUserId(@NotNull Credentials credentials) { if (credentials instanceof TestCredentials) { return ((TestCredentials) credentials).uid; } else { @@ -215,9 +215,9 @@ public class CustomCredentialsSupportTes } } - @Nonnull + @NotNull @Override - public Map<String, ?> getAttributes(@Nonnull Credentials credentials) { + public Map<String, ?> getAttributes(@NotNull Credentials credentials) { if (credentials instanceof TestCredentials) { return attributes; } else { @@ -226,7 +226,7 @@ public class CustomCredentialsSupportTes } @Override - public boolean setAttributes(@Nonnull Credentials credentials, @Nonnull Map<String, ?> attributes) { + public boolean setAttributes(@NotNull Credentials credentials, @NotNull Map<String, ?> attributes) { if (credentials instanceof TestCredentials) { this.attributes.putAll(attributes); return true; @@ -235,4 +235,4 @@ public class CustomCredentialsSupportTes } } } -} \ 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/DefaultSyncHandlerTest.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/DefaultSyncHandlerTest.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/DefaultSyncHandlerTest.java (original) +++ jackrabbit/oak/branches/1.8/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DefaultSyncHandlerTest.java Wed Nov 7 13:33:31 2018 @@ -19,7 +19,6 @@ package org.apache.jackrabbit.oak.spi.se import java.util.Calendar; import java.util.Iterator; import java.util.Set; -import javax.annotation.Nonnull; import javax.jcr.SimpleCredentials; import javax.jcr.Value; @@ -37,6 +36,7 @@ import org.apache.jackrabbit.oak.spi.sec import org.apache.jackrabbit.oak.spi.security.authentication.external.basic.DefaultSyncConfig; import org.apache.jackrabbit.oak.spi.security.authentication.external.basic.DefaultSyncContext; import org.apache.jackrabbit.oak.spi.security.authentication.external.basic.DefaultSyncedIdentity; +import org.jetbrains.annotations.NotNull; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -82,7 +82,7 @@ public class DefaultSyncHandlerTest exte super.setSyncConfig(cfg); } - private void sync(@Nonnull String id, boolean isGroup) throws Exception { + private void sync(@NotNull String id, boolean isGroup) throws Exception { SyncContext ctx = syncHandler.createContext(idp, userManager, getValueFactory()); ExternalIdentity exIdentity = (isGroup) ? idp.getGroup(id) : idp.getUser(id); assertNotNull(exIdentity); @@ -265,4 +265,4 @@ public class DefaultSyncHandlerTest exte assertNotNull(ref.getProviderName()); } } -} \ No newline at end of file +}