Author: reschke Date: Wed Nov 7 13:33:31 2018 New Revision: 1846006 URL: http://svn.apache.org/viewvc?rev=1846006&view=rev Log: OAK-7669: backport of: OAK-7511: get rid of JSR 305 dependency - use jetbrains nullability annotations instead - oak-auth-external
Modified: jackrabbit/oak/branches/1.8/ (props changed) jackrabbit/oak/branches/1.8/oak-auth-external/pom.xml jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/ExternalGroup.java jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/ExternalGroupRef.java jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/ExternalIdentity.java jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/ExternalIdentityProvider.java jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/ExternalIdentityProviderManager.java jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/ExternalIdentityRef.java jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/PrincipalNameResolver.java jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/SyncContext.java jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/SyncHandler.java jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/SyncManager.java jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/SyncResult.java jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/SyncedIdentity.java jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/DefaultSyncConfig.java jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/DefaultSyncContext.java jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/DefaultSyncResultImpl.java jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/DefaultSyncedIdentity.java jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/package-info.java jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DefaultSyncConfigImpl.java jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DefaultSyncHandler.java jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DynamicSyncContext.java jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalIDPManagerImpl.java jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModule.java jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/SyncManagerImpl.java jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/Delegatee.java jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/SyncMBeanImpl.java jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/SyncRuntimeException.java jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/SynchronizationMBean.java jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalGroupPrincipalProvider.java jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalIdentityImporter.java jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalIdentityRepositoryInitializer.java jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalIdentityValidatorProvider.java jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalPrincipalConfiguration.java jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/package-info.java jackrabbit/oak/branches/1.8/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/AbstractExternalAuthTest.java jackrabbit/oak/branches/1.8/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/ExternalIdentityRefTest.java jackrabbit/oak/branches/1.8/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/ExternalLoginModuleAutoMembershipTest.java jackrabbit/oak/branches/1.8/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/ExternalLoginModuleDynamicMembershipTest.java jackrabbit/oak/branches/1.8/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/PreAuthCredentials.java jackrabbit/oak/branches/1.8/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/PreAuthLoginModule.java jackrabbit/oak/branches/1.8/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/TestIdentityProvider.java jackrabbit/oak/branches/1.8/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/TestSecurityProvider.java jackrabbit/oak/branches/1.8/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/DefaultSyncConfigTest.java jackrabbit/oak/branches/1.8/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/DefaultSyncContextTest.java jackrabbit/oak/branches/1.8/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/RepExternalIdTest.java jackrabbit/oak/branches/1.8/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/CustomCredentialsSupportTest.java jackrabbit/oak/branches/1.8/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DefaultSyncHandlerTest.java jackrabbit/oak/branches/1.8/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DynamicSyncContextTest.java jackrabbit/oak/branches/1.8/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/PrincipalResolutionTest.java jackrabbit/oak/branches/1.8/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/AbstractJmxTest.java jackrabbit/oak/branches/1.8/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/DelegateeTest.java jackrabbit/oak/branches/1.8/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/SyncMBeanImplTest.java jackrabbit/oak/branches/1.8/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/AbstractPrincipalTest.java jackrabbit/oak/branches/1.8/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalGroupPrincipalProviderTest.java jackrabbit/oak/branches/1.8/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalGroupPrincipalTest.java jackrabbit/oak/branches/1.8/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalIdentityImporterTest.java jackrabbit/oak/branches/1.8/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalPrincipalConfigurationTest.java jackrabbit/oak/branches/1.8/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/PrincipalProviderAutoMembershipTest.java Propchange: jackrabbit/oak/branches/1.8/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Nov 7 13:33:31 2018 @@ -1,3 +1,3 @@ /jackrabbit/oak/branches/1.0:1665962 -/jackrabbit/oak/trunk:1820660-1820661,1820729,1820734,1820859,1820861,1820878,1820888,1820947,1821027,1821130,1821140-1821141,1821178,1821237,1821240,1821249,1821258,1821325,1821358,1821361-1821362,1821370,1821375,1821393,1821477,1821487,1821516,1821617,1821663,1821665,1821668,1821681,1821847,1821975-1821983,1822121,1822201,1822207,1822527,1822723,1822808,1822850,1822934,1823135,1823163,1823169,1823172,1823655,1823669,1824196,1824198,1824253,1824255,1824896,1824962,1825065,1825362,1825381,1825442,1825448,1825466,1825470-1825471,1825475,1825523,1825525,1825561,1825619-1825621,1825651,1825654,1825992,1826079,1826090,1826096,1826216,1826237,1826338,1826516,1826532,1826551,1826560,1826638,1826640,1826730,1826932,1826957,1827423,1827472,1827486,1827816,1827977,1828349,1828439,1828502,1828529,1828948,1829527,1829534,1829546,1829569,1829587,1829665,1829854,1829864,1829978,1829985,1829987,1829998,1830019,1830048,1830160,1830171,1830197,1830209,1830239,1830347,1830748,1830911,1830923,1831157 -1831158,1831163,1831190,1831374,1831560,1831689,1832258,1832376,1832379,1832535,1833308,1833347,1833833,1834112,1834117,1834287,1834291,1834302,1834326,1834328,1834336,1834428,1834468,1834483,1834610,1834648-1834649,1834681,1834823,1834857-1834858,1835060,1835518,1835521,1835635,1835642,1835780,1835819,1836082,1836121,1836167-1836168,1836487,1836493,1837057,1837274,1837296,1837326,1837475,1837503,1837547,1837569,1837600,1837657,1837718,1837998,1838076,1838637,1839549,1839570,1839637,1839746,1840019,1840024,1840031,1840455,1840574,1841314,1841352,1842089,1842677,1843222,1843231,1843398,1843618,1843652,1843911,1844325,1844549,1844625,1844627,1844642,1844728,1844775,1844932,1845336 +/jackrabbit/oak/trunk:1820660-1820661,1820729,1820734,1820859,1820861,1820878,1820888,1820947,1821027,1821130,1821140-1821141,1821178,1821237,1821240,1821249,1821258,1821325,1821358,1821361-1821362,1821370,1821375,1821393,1821477,1821487,1821516,1821617,1821663,1821665,1821668,1821681,1821847,1821975-1821983,1822121,1822201,1822207,1822527,1822723,1822808,1822850,1822934,1823135,1823163,1823169,1823172,1823655,1823669,1824196,1824198,1824253,1824255,1824896,1824962,1825065,1825362,1825381,1825442,1825448,1825466,1825470-1825471,1825475,1825523,1825525,1825561,1825619-1825621,1825651,1825654,1825992,1826079,1826090,1826096,1826216,1826237,1826338,1826516,1826532,1826551,1826560,1826638,1826640,1826730,1826932,1826957,1827423,1827472,1827486,1827816,1827977,1828349,1828439,1828502,1828529,1828948,1829527,1829534,1829546,1829569,1829587,1829665,1829854,1829864,1829978,1829985,1829987,1829998,1830019,1830048,1830160,1830171,1830197,1830209,1830239,1830347,1830748,1830911,1830923,1831157 -1831158,1831163,1831190,1831374,1831560,1831689,1832258,1832376,1832379,1832535,1833308,1833347,1833833,1834112,1834117,1834287,1834291,1834302,1834326,1834328,1834336,1834428,1834468,1834483,1834610,1834648-1834649,1834681,1834823,1834857-1834858,1835060,1835518,1835521,1835635,1835642,1835780,1835819,1836082,1836121,1836167-1836168,1836170,1836487,1836493,1837057,1837274,1837296,1837326,1837475,1837503,1837547,1837569,1837600,1837657,1837718,1837998,1838076,1838637,1839549,1839570,1839637,1839746,1840019,1840024,1840031,1840455,1840574,1841314,1841352,1842089,1842677,1843222,1843231,1843398,1843618,1843652,1843911,1844325,1844549,1844625,1844627,1844642,1844728,1844775,1844932,1845336 /jackrabbit/trunk:1345480 Modified: jackrabbit/oak/branches/1.8/oak-auth-external/pom.xml URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-auth-external/pom.xml?rev=1846006&r1=1846005&r2=1846006&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-auth-external/pom.xml (original) +++ jackrabbit/oak/branches/1.8/oak-auth-external/pom.xml Wed Nov 7 13:33:31 2018 @@ -140,10 +140,10 @@ <artifactId>slf4j-api</artifactId> </dependency> - <!-- Findbugs annotations --> + <!-- Nullability annotations --> <dependency> - <groupId>com.google.code.findbugs</groupId> - <artifactId>jsr305</artifactId> + <groupId>org.jetbrains</groupId> + <artifactId>annotations</artifactId> </dependency> <!-- Test Dependencies --> Modified: jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/ExternalGroup.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/ExternalGroup.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/ExternalGroup.java (original) +++ jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/ExternalGroup.java Wed Nov 7 13:33:31 2018 @@ -16,7 +16,7 @@ */ package org.apache.jackrabbit.oak.spi.security.authentication.external; -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; /** * ExternalGroup defines a group that is provided by an external system. @@ -28,7 +28,7 @@ public interface ExternalGroup extends E * @return the declared member * @throws ExternalIdentityException if an error occurs */ - @Nonnull + @NotNull Iterable<ExternalIdentityRef> getDeclaredMembers() throws ExternalIdentityException; -} \ 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/ExternalGroupRef.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/ExternalGroupRef.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/ExternalGroupRef.java (original) +++ jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/ExternalGroupRef.java Wed Nov 7 13:33:31 2018 @@ -16,8 +16,8 @@ */ package org.apache.jackrabbit.oak.spi.security.authentication.external; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; @Deprecated public class ExternalGroupRef extends ExternalIdentityRef { @@ -28,7 +28,7 @@ public class ExternalGroupRef extends Ex * @param id the id of the identity. * @param providerName the name of the identity provider */ - public ExternalGroupRef(@Nonnull String id, @CheckForNull String providerName) { + public ExternalGroupRef(@NotNull String id, @Nullable String providerName) { super(id, providerName); } } Modified: jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/ExternalIdentity.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/ExternalIdentity.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/ExternalIdentity.java (original) +++ jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/ExternalIdentity.java Wed Nov 7 13:33:31 2018 @@ -18,8 +18,8 @@ package org.apache.jackrabbit.oak.spi.se import java.util.Map; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * {@code ExternalIdentity} defines an identity provided by an external system. @@ -30,7 +30,7 @@ public interface ExternalIdentity { * Returns the id of this identity as used in the external system. * @return the external id. */ - @Nonnull + @NotNull ExternalIdentityRef getExternalId(); /** @@ -39,7 +39,7 @@ public interface ExternalIdentity { * * @return the internal id. */ - @Nonnull + @NotNull String getId(); /** @@ -47,7 +47,7 @@ public interface ExternalIdentity { * {@link org.apache.jackrabbit.api.security.user.Authorizable#getPrincipal()}.{@link java.security.Principal#getName()} * @return the principal name */ - @Nonnull + @NotNull String getPrincipalName(); /** @@ -57,7 +57,7 @@ public interface ExternalIdentity { * * @return the intermediate path or {@code null} or empty. */ - @CheckForNull + @Nullable String getIntermediatePath(); /** @@ -65,14 +65,14 @@ public interface ExternalIdentity { * @return the declared groups * @throws ExternalIdentityException if an error occurs */ - @Nonnull + @NotNull Iterable<ExternalIdentityRef> getDeclaredGroups() throws ExternalIdentityException; /** * Returns a map of properties of this external identity. * @return the properties */ - @Nonnull + @NotNull Map<String, ?> getProperties(); -} \ 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/ExternalIdentityProvider.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/ExternalIdentityProvider.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/ExternalIdentityProvider.java (original) +++ jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/ExternalIdentityProvider.java Wed Nov 7 13:33:31 2018 @@ -18,11 +18,12 @@ package org.apache.jackrabbit.oak.spi.se import java.util.Iterator; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; import javax.jcr.Credentials; import javax.security.auth.login.LoginException; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + /** * {@code ExternalIdentityProvider} defines an interface to an external system that provides users and groups that * can be synced with local ones. @@ -33,7 +34,7 @@ public interface ExternalIdentityProvide * Returns the name of this provider. * @return the provider name. */ - @Nonnull + @NotNull String getName(); /** @@ -46,8 +47,8 @@ public interface ExternalIdentityProvide * * @throws ExternalIdentityException if an error occurs. */ - @CheckForNull - ExternalIdentity getIdentity(@Nonnull ExternalIdentityRef ref) throws ExternalIdentityException; + @Nullable + ExternalIdentity getIdentity(@NotNull ExternalIdentityRef ref) throws ExternalIdentityException; /** * Returns the user for the given (local) id. if the user does not exist {@code null} is returned. @@ -56,8 +57,8 @@ public interface ExternalIdentityProvide * * @throws ExternalIdentityException if an error occurs. */ - @CheckForNull - ExternalUser getUser(@Nonnull String userId) throws ExternalIdentityException; + @Nullable + ExternalUser getUser(@NotNull String userId) throws ExternalIdentityException; /** * Authenticates the user represented by the given credentials and returns it. If the user does not exist in this @@ -68,8 +69,8 @@ public interface ExternalIdentityProvide * @throws ExternalIdentityException if an error occurs * @throws javax.security.auth.login.LoginException if the user could not be authenticated */ - @CheckForNull - ExternalUser authenticate(@Nonnull Credentials credentials) throws ExternalIdentityException, LoginException; + @Nullable + ExternalUser authenticate(@NotNull Credentials credentials) throws ExternalIdentityException, LoginException; /** * Returns the group for the given (local) group name. if the group does not exist {@code null} is returned. @@ -78,15 +79,15 @@ public interface ExternalIdentityProvide * * @throws ExternalIdentityException if an error occurs. */ - @CheckForNull - ExternalGroup getGroup(@Nonnull String name) throws ExternalIdentityException; + @Nullable + ExternalGroup getGroup(@NotNull String name) throws ExternalIdentityException; /** * List all external users. * @return an iterator over all external users * @throws ExternalIdentityException if an error occurs. */ - @Nonnull + @NotNull Iterator<ExternalUser> listUsers() throws ExternalIdentityException; /** @@ -94,6 +95,6 @@ public interface ExternalIdentityProvide * @return an iterator over all external groups * @throws ExternalIdentityException if an error occurs. */ - @Nonnull + @NotNull Iterator<ExternalGroup> listGroups() throws ExternalIdentityException; -} \ 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/ExternalIdentityProviderManager.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/ExternalIdentityProviderManager.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/ExternalIdentityProviderManager.java (original) +++ jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/ExternalIdentityProviderManager.java Wed Nov 7 13:33:31 2018 @@ -16,8 +16,8 @@ */ package org.apache.jackrabbit.oak.spi.security.authentication.external; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * The external identity provider management. @@ -32,6 +32,6 @@ public interface ExternalIdentityProvide * @param name the provider name * @return the registered provider or {@code null} */ - @CheckForNull - ExternalIdentityProvider getProvider(@Nonnull String name); -} \ No newline at end of file + @Nullable + ExternalIdentityProvider getProvider(@NotNull String name); +} Modified: jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/ExternalIdentityRef.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/ExternalIdentityRef.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/ExternalIdentityRef.java (original) +++ jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/ExternalIdentityRef.java Wed Nov 7 13:33:31 2018 @@ -16,10 +16,9 @@ */ package org.apache.jackrabbit.oak.spi.security.authentication.external; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; - import org.apache.jackrabbit.util.Text; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * {@code ExternalIdentityRef} defines a reference to an external identity. @@ -37,7 +36,7 @@ public class ExternalIdentityRef { * @param id the id of the identity. * @param providerName the name of the identity provider */ - public ExternalIdentityRef(@Nonnull String id, @CheckForNull String providerName) { + public ExternalIdentityRef(@NotNull String id, @Nullable String providerName) { this.id = id; this.providerName = (providerName == null || providerName.isEmpty()) ? null : providerName; @@ -54,7 +53,7 @@ public class ExternalIdentityRef { * Returns the name of the identity provider. * @return the name of the identity provider. */ - @CheckForNull + @Nullable public String getProviderName() { return providerName; } @@ -63,7 +62,7 @@ public class ExternalIdentityRef { * Returns the id of the external identity. for example the DN of an LDAP user. * @return the id */ - @Nonnull + @NotNull public String getId() { return id; } @@ -72,7 +71,7 @@ public class ExternalIdentityRef { * Returns a string representation of this external identity reference * @return a string representation. */ - @Nonnull + @NotNull public String getString() { return string; } @@ -82,8 +81,8 @@ public class ExternalIdentityRef { * @param str the string * @return the reference */ - @Nonnull - public static ExternalIdentityRef fromString(@Nonnull String str) { + @NotNull + public static ExternalIdentityRef fromString(@NotNull String str) { int idx = str.indexOf(';'); if (idx < 0) { return new ExternalIdentityRef(Text.unescape(str), null); @@ -100,7 +99,7 @@ public class ExternalIdentityRef { * @param builder the builder * @param str the string */ - private static void escape(@Nonnull StringBuilder builder, @Nonnull CharSequence str) { + private static void escape(@NotNull StringBuilder builder, @NotNull CharSequence str) { final int len = str.length(); for (int i=0; i<len; i++) { char c = str.charAt(i); @@ -143,4 +142,4 @@ public class ExternalIdentityRef { public int hashCode() { return string.hashCode(); } -} \ 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/PrincipalNameResolver.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/PrincipalNameResolver.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/PrincipalNameResolver.java (original) +++ jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/PrincipalNameResolver.java Wed Nov 7 13:33:31 2018 @@ -16,7 +16,7 @@ */ package org.apache.jackrabbit.oak.spi.security.authentication.external; -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; /** * Interface to obtain the name of the {@link java.security.Principal} from a @@ -44,6 +44,6 @@ public interface PrincipalNameResolver { * @return The name of the {@link java.security.Principal} associated with the external identity referenced by the given {@code externalIdentityRef}. * @throws ExternalIdentityException If the reference is not valid or another error occurs. */ - @Nonnull - String fromExternalIdentityRef(@Nonnull ExternalIdentityRef externalIdentityRef) throws ExternalIdentityException; -} \ No newline at end of file + @NotNull + String fromExternalIdentityRef(@NotNull ExternalIdentityRef externalIdentityRef) throws ExternalIdentityException; +} Modified: jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/SyncContext.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/SyncContext.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/SyncContext.java (original) +++ jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/SyncContext.java Wed Nov 7 13:33:31 2018 @@ -16,7 +16,7 @@ */ package org.apache.jackrabbit.oak.spi.security.authentication.external; -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; /** * {@code SyncContext} is used as scope for sync operations. Implementations are free to associate any resources with @@ -34,7 +34,7 @@ public interface SyncContext { /** * See {@link #isKeepMissing()} */ - @Nonnull + @NotNull SyncContext setKeepMissing(boolean keep); /** @@ -46,7 +46,7 @@ public interface SyncContext { /** * See {@link #isForceUserSync()} */ - @Nonnull + @NotNull SyncContext setForceUserSync(boolean force); /** @@ -58,7 +58,7 @@ public interface SyncContext { /** * See {@link #isForceGroupSync()} */ - @Nonnull + @NotNull SyncContext setForceGroupSync(boolean force); /** @@ -68,8 +68,8 @@ public interface SyncContext { * @return the result of the operation * @throws SyncException if an error occurs */ - @Nonnull - SyncResult sync(@Nonnull ExternalIdentity identity) throws SyncException; + @NotNull + SyncResult sync(@NotNull ExternalIdentity identity) throws SyncException; /** * Synchronizes an authorizable with the corresponding external identity with the repository based on the respective @@ -79,8 +79,8 @@ public interface SyncContext { * @return the result of the operation * @throws SyncException if an error occurs */ - @Nonnull - SyncResult sync(@Nonnull String id) throws SyncException; + @NotNull + SyncResult sync(@NotNull String id) throws SyncException; /** @@ -90,4 +90,4 @@ public interface SyncContext { */ void 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/SyncHandler.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/SyncHandler.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/SyncHandler.java (original) +++ jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/SyncHandler.java Wed Nov 7 13:33:31 2018 @@ -18,12 +18,12 @@ package org.apache.jackrabbit.oak.spi.se import java.util.Iterator; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; import javax.jcr.RepositoryException; import javax.jcr.ValueFactory; import org.apache.jackrabbit.api.security.user.UserManager; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * SyncHandler is used to sync users and groups from an {@link ExternalIdentityProvider}. @@ -42,7 +42,7 @@ public interface SyncHandler { * Returns the name of this sync handler. * @return sync handler name */ - @Nonnull + @NotNull String getName(); /** @@ -54,10 +54,10 @@ public interface SyncHandler { * @return the sync context * @throws SyncException if an error occurs */ - @Nonnull - SyncContext createContext(@Nonnull ExternalIdentityProvider idp, - @Nonnull UserManager userManager, - @Nonnull ValueFactory valueFactory) throws SyncException; + @NotNull + SyncContext createContext(@NotNull ExternalIdentityProvider idp, + @NotNull UserManager userManager, + @NotNull ValueFactory valueFactory) throws SyncException; /** * Tries to find the identity with the given authorizable id or name. @@ -66,15 +66,15 @@ public interface SyncHandler { * @return a synced identity object or {@code null} * @throws RepositoryException if an error occurs */ - @CheckForNull - SyncedIdentity findIdentity(@Nonnull UserManager userManager, @Nonnull String id) throws RepositoryException; + @Nullable + SyncedIdentity findIdentity(@NotNull UserManager userManager, @NotNull String id) throws RepositoryException; /** * Checks if the identity requires sync based on the configuration, type and last sync time. * @param identity the identity to check * @return {@code true} if the identity requires synchronization. */ - boolean requiresSync(@Nonnull SyncedIdentity identity); + boolean requiresSync(@NotNull SyncedIdentity identity); /** * Lists all externally synced identities. @@ -82,7 +82,7 @@ public interface SyncHandler { * @return an iterator over all authorizable that are externally synced. * @throws RepositoryException if an error occurs */ - @Nonnull - Iterator<SyncedIdentity> listIdentities(@Nonnull UserManager userManager) throws RepositoryException; + @NotNull + Iterator<SyncedIdentity> listIdentities(@NotNull UserManager userManager) throws RepositoryException; -} \ 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/SyncManager.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/SyncManager.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/SyncManager.java (original) +++ jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/SyncManager.java Wed Nov 7 13:33:31 2018 @@ -16,8 +16,8 @@ */ package org.apache.jackrabbit.oak.spi.security.authentication.external; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * The external identity synchronization management. @@ -32,6 +32,6 @@ public interface SyncManager { * @param name the name of the sync handler or {@code null} * @return the sync handler */ - @CheckForNull - SyncHandler getSyncHandler(@Nonnull String name); -} \ No newline at end of file + @Nullable + SyncHandler getSyncHandler(@NotNull String name); +} Modified: jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/SyncResult.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/SyncResult.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/SyncResult.java (original) +++ jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/SyncResult.java Wed Nov 7 13:33:31 2018 @@ -16,8 +16,8 @@ */ package org.apache.jackrabbit.oak.spi.security.authentication.external; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * Defines the result of a sync operation @@ -28,14 +28,14 @@ public interface SyncResult { * The synchronized identity * @return the identity */ - @CheckForNull + @Nullable SyncedIdentity getIdentity(); /** * The status of the sync operation * @return the status */ - @Nonnull + @NotNull Status getStatus(); /** @@ -94,4 +94,4 @@ public interface SyncResult { FOREIGN } -} \ 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/SyncedIdentity.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/SyncedIdentity.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/SyncedIdentity.java (original) +++ jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/SyncedIdentity.java Wed Nov 7 13:33:31 2018 @@ -17,8 +17,8 @@ package org.apache.jackrabbit.oak.spi.security.authentication.external; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * Represents a synchronized identity managed by a {@link SyncHandler}. @@ -29,14 +29,14 @@ public interface SyncedIdentity { * Returns the internal id or name of the corresponding authorizable. * @return the id. */ - @Nonnull + @NotNull String getId(); /** * Returns the external reference of this identity. * @return the reference or {@code null} */ - @CheckForNull + @Nullable ExternalIdentityRef getExternalIdRef(); /** @@ -50,4 +50,4 @@ public interface SyncedIdentity { * @return the time when this identity was last synced. */ long lastSynced(); -} \ 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/basic/DefaultSyncConfig.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/basic/DefaultSyncConfig.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/basic/DefaultSyncConfig.java (original) +++ jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/DefaultSyncConfig.java Wed Nov 7 13:33:31 2018 @@ -21,7 +21,7 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; /** * {@code DefaultSyncConfig} defines how users and groups from an external source are synced into the repository using @@ -39,7 +39,7 @@ public class DefaultSyncConfig { * Configures the name of this configuration * @return the name */ - @Nonnull + @NotNull public String getName() { return name; } @@ -50,8 +50,8 @@ public class DefaultSyncConfig { * @return {@code this} * @see #getName() */ - @Nonnull - public DefaultSyncConfig setName(@Nonnull String name) { + @NotNull + public DefaultSyncConfig setName(@NotNull String name) { this.name = name; return this; } @@ -60,7 +60,7 @@ public class DefaultSyncConfig { * Returns the sync configuration for users. * @return the user sync configuration. */ - @Nonnull + @NotNull public User user() { return user; } @@ -69,7 +69,7 @@ public class DefaultSyncConfig { * Returns the sync configuration for groups. * @return the group sync configuration. */ - @Nonnull + @NotNull public Group group() { return group; } @@ -104,7 +104,7 @@ public class DefaultSyncConfig { * @return {@code this} * @see #getExpirationTime() */ - @Nonnull + @NotNull public Authorizable setExpirationTime(long expirationTime) { this.expirationTime = expirationTime; return this; @@ -135,7 +135,7 @@ public class DefaultSyncConfig { * Defines the set of group names that are automatically added to synced authorizable. * @return set of group names. */ - @Nonnull + @NotNull public Set<String> getAutoMembership() { return autoMembership == null ? Collections.<String>emptySet() : autoMembership; } @@ -148,8 +148,8 @@ public class DefaultSyncConfig { * @return {@code this} * @see #getAutoMembership() */ - @Nonnull - public Authorizable setAutoMembership(@Nonnull String ... autoMembership) { + @NotNull + public Authorizable setAutoMembership(@NotNull String ... autoMembership) { this.autoMembership = new HashSet<String>(); for (String groupName: autoMembership) { if (groupName != null && !groupName.trim().isEmpty()) { @@ -178,7 +178,7 @@ public class DefaultSyncConfig { * * @return the property mapping where the keys are the local property names and the values the external ones. */ - @Nonnull + @NotNull public Map<String, String> getPropertyMapping() { return propertyMapping == null ? Collections.<String, String>emptyMap() : propertyMapping; } @@ -189,8 +189,8 @@ public class DefaultSyncConfig { * @return {@code this} * @see #getPropertyMapping() */ - @Nonnull - public Authorizable setPropertyMapping(@Nonnull Map<String, String> propertyMapping) { + @NotNull + public Authorizable setPropertyMapping(@NotNull Map<String, String> propertyMapping) { this.propertyMapping = propertyMapping; return this; } @@ -200,7 +200,7 @@ public class DefaultSyncConfig { * is always prepended to the path provided by the {@link org.apache.jackrabbit.oak.spi.security.authentication.external.ExternalIdentity}. * @return the intermediate path prefix. */ - @Nonnull + @NotNull public String getPathPrefix() { return pathPrefix == null ? "" : pathPrefix; } @@ -211,8 +211,8 @@ public class DefaultSyncConfig { * @return {@code this} * @see #getPathPrefix() */ - @Nonnull - public Authorizable setPathPrefix(@Nonnull String pathPrefix) { + @NotNull + public Authorizable setPathPrefix(@NotNull String pathPrefix) { this.pathPrefix = pathPrefix; return this; } @@ -250,7 +250,7 @@ public class DefaultSyncConfig { * @return {@code this} * @see #getMembershipExpirationTime() */ - @Nonnull + @NotNull public User setMembershipExpirationTime(long membershipExpirationTime) { this.membershipExpirationTime = membershipExpirationTime; return this; @@ -272,7 +272,7 @@ public class DefaultSyncConfig { * @return {@code this} * @see #getMembershipNestingDepth() */ - @Nonnull + @NotNull public User setMembershipNestingDepth(long membershipNestingDepth) { this.membershipNestingDepth = membershipNestingDepth; return this; @@ -289,7 +289,7 @@ public class DefaultSyncConfig { * @return {@code true} if dynamic group membership for external * user identities is turn on; {@code false} otherwise. */ - @Nonnull + @NotNull public boolean getDynamicMembership() { return dynamicMembership; } @@ -306,7 +306,7 @@ public class DefaultSyncConfig { * @return {@code this} * @see #getDynamicMembership() for details. */ - @Nonnull + @NotNull public User setDynamicMembership(boolean dynamicMembership) { this.dynamicMembership = dynamicMembership; return this; @@ -336,4 +336,4 @@ public class DefaultSyncConfig { public static class Group extends Authorizable { } -} \ 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/basic/DefaultSyncContext.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/basic/DefaultSyncContext.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/basic/DefaultSyncContext.java (original) +++ jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/DefaultSyncContext.java Wed Nov 7 13:33:31 2018 @@ -31,9 +31,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; import javax.jcr.Binary; import javax.jcr.RepositoryException; import javax.jcr.Value; @@ -55,6 +52,8 @@ import org.apache.jackrabbit.oak.spi.sec import org.apache.jackrabbit.oak.spi.security.authentication.external.SyncException; import org.apache.jackrabbit.oak.spi.security.authentication.external.SyncResult; import org.apache.jackrabbit.oak.spi.security.principal.PrincipalImpl; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -97,7 +96,7 @@ public class DefaultSyncContext implemen protected final Value nowValue; - public DefaultSyncContext(@Nonnull DefaultSyncConfig config, @Nonnull ExternalIdentityProvider idp, @Nonnull UserManager userManager, @Nonnull ValueFactory valueFactory) { + public DefaultSyncContext(@NotNull DefaultSyncConfig config, @NotNull ExternalIdentityProvider idp, @NotNull UserManager userManager, @NotNull ValueFactory valueFactory) { this.config = config; this.idp = idp; this.userManager = userManager; @@ -115,7 +114,7 @@ public class DefaultSyncContext implemen * @return the id * @throws RepositoryException if an error occurs */ - @CheckForNull + @Nullable public static DefaultSyncedIdentity createSyncedIdentity(@Nullable Authorizable auth) throws RepositoryException { if (auth == null) { return null; @@ -135,7 +134,7 @@ public class DefaultSyncContext implemen * @return the ref * @throws RepositoryException if an error occurs */ - @CheckForNull + @Nullable public static ExternalIdentityRef getIdentityRef(@Nullable Authorizable auth) throws RepositoryException { if (auth == null) { return null; @@ -176,7 +175,7 @@ public class DefaultSyncContext implemen /** * {@inheritDoc} */ - @Nonnull + @NotNull @Override public SyncContext setKeepMissing(boolean keepMissing) { this.keepMissing = keepMissing; @@ -194,7 +193,7 @@ public class DefaultSyncContext implemen /** * {@inheritDoc} */ - @Nonnull + @NotNull @Override public SyncContext setForceUserSync(boolean forceUserSync) { this.forceUserSync = forceUserSync; @@ -210,7 +209,7 @@ public class DefaultSyncContext implemen } @Override - @Nonnull + @NotNull public SyncContext setForceGroupSync(boolean forceGroupSync) { this.forceGroupSync = forceGroupSync; return this; @@ -219,9 +218,9 @@ public class DefaultSyncContext implemen /** * {@inheritDoc} */ - @Nonnull + @NotNull @Override - public SyncResult sync(@Nonnull ExternalIdentity identity) throws SyncException { + public SyncResult sync(@NotNull ExternalIdentity identity) throws SyncException { ExternalIdentityRef ref = identity.getExternalId(); if (!isSameIDP(ref)) { // create result in accordance with sync(String) where status is FOREIGN @@ -270,9 +269,9 @@ public class DefaultSyncContext implemen /** * {@inheritDoc} */ - @Nonnull + @NotNull @Override - public SyncResult sync(@Nonnull String id) throws SyncException { + public SyncResult sync(@NotNull String id) throws SyncException { try { DebugTimer timer = new DebugTimer(); DefaultSyncResultImpl ret; @@ -317,9 +316,9 @@ public class DefaultSyncContext implemen } } - private DefaultSyncResultImpl handleMissingIdentity(@Nonnull String id, - @Nonnull Authorizable authorizable, - @Nonnull DebugTimer timer) throws RepositoryException { + private DefaultSyncResultImpl handleMissingIdentity(@NotNull String id, + @NotNull Authorizable authorizable, + @NotNull DebugTimer timer) throws RepositoryException { DefaultSyncedIdentity syncId = createSyncedIdentity(authorizable); SyncResult.Status status; if (authorizable.isGroup() && ((Group) authorizable).getDeclaredMembers().hasNext()) { @@ -351,8 +350,8 @@ public class DefaultSyncContext implemen * @throws RepositoryException if an error occurs. * @throws SyncException if the repository contains a colliding authorizable with the same name. */ - @CheckForNull - protected <T extends Authorizable> T getAuthorizable(@Nonnull ExternalIdentity external, @Nonnull Class<T> type) + @Nullable + protected <T extends Authorizable> T getAuthorizable(@NotNull ExternalIdentity external, @NotNull Class<T> type) throws RepositoryException, SyncException { Authorizable authorizable = userManager.getAuthorizable(external.getId()); if (authorizable == null) { @@ -377,8 +376,8 @@ public class DefaultSyncContext implemen * @return the repository user * @throws RepositoryException if an error occurs */ - @Nonnull - protected User createUser(@Nonnull ExternalUser externalUser) throws RepositoryException { + @NotNull + protected User createUser(@NotNull ExternalUser externalUser) throws RepositoryException { Principal principal = new PrincipalImpl(externalUser.getPrincipalName()); String authId = config.user().isApplyRFC7613UsernameCaseMapped() ? java.text.Normalizer.normalize(externalUser.getId().toLowerCase(), java.text.Normalizer.Form.NFKC) : externalUser.getId(); @@ -400,8 +399,8 @@ public class DefaultSyncContext implemen * @return the repository group * @throws RepositoryException if an error occurs */ - @Nonnull - protected Group createGroup(@Nonnull ExternalGroup externalGroup) throws RepositoryException { + @NotNull + protected Group createGroup(@NotNull ExternalGroup externalGroup) throws RepositoryException { Principal principal = new PrincipalImpl(externalGroup.getPrincipalName()); Group group = userManager.createGroup( externalGroup.getId(), @@ -421,13 +420,13 @@ public class DefaultSyncContext implemen * @param externalIdentity The {@link ExternalIdentity} from which to retrieve the value of the property. * @throws RepositoryException If setting the property using {@link Authorizable#setProperty(String, Value)} fails. */ - private void setExternalId(@Nonnull Authorizable authorizable, @Nonnull ExternalIdentity externalIdentity) throws RepositoryException { + private void setExternalId(@NotNull Authorizable authorizable, @NotNull ExternalIdentity externalIdentity) throws RepositoryException { log.debug("Fallback: setting rep:externalId without adding the corresponding mixin type"); authorizable.setProperty(REP_EXTERNAL_ID, valueFactory.createValue(externalIdentity.getExternalId().getString())); } - @Nonnull - protected DefaultSyncResultImpl syncUser(@Nonnull ExternalUser external, @Nonnull User user) throws RepositoryException { + @NotNull + protected DefaultSyncResultImpl syncUser(@NotNull ExternalUser external, @NotNull User user) throws RepositoryException { // make also sure the local user to be synced belongs to the same IDP. Note: 'external' has been verified before. if (!isSameIDP(user)) { return new DefaultSyncResultImpl(new DefaultSyncedIdentity(external.getId(), external.getExternalId(), false, -1), SyncResult.Status.FOREIGN); @@ -455,8 +454,8 @@ public class DefaultSyncContext implemen return new DefaultSyncResultImpl(createSyncedIdentity(user), status); } - @Nonnull - protected DefaultSyncResultImpl syncGroup(@Nonnull ExternalGroup external, @Nonnull Group group) throws RepositoryException { + @NotNull + protected DefaultSyncResultImpl syncGroup(@NotNull ExternalGroup external, @NotNull Group group) throws RepositoryException { // make also sure the local user to be synced belongs to the same IDP. Note: 'external' has been verified before. if (!isSameIDP(group)) { return new DefaultSyncResultImpl(new DefaultSyncedIdentity(external.getId(), external.getExternalId(), false, -1), SyncResult.Status.FOREIGN); @@ -485,9 +484,9 @@ public class DefaultSyncContext implemen * @param config The sync configuration * @throws RepositoryException If an error occurs. */ - private void syncExternalIdentity(@Nonnull ExternalIdentity external, - @Nonnull Authorizable authorizable, - @Nonnull DefaultSyncConfig.Authorizable config) throws RepositoryException { + private void syncExternalIdentity(@NotNull ExternalIdentity external, + @NotNull Authorizable authorizable, + @NotNull DefaultSyncConfig.Authorizable config) throws RepositoryException { syncProperties(external, authorizable, config.getPropertyMapping()); applyMembership(authorizable, config.getAutoMembership()); } @@ -501,7 +500,7 @@ public class DefaultSyncContext implemen * @param depth recursion depth. * @throws RepositoryException */ - protected void syncMembership(@Nonnull ExternalIdentity external, @Nonnull Authorizable auth, long depth) + protected void syncMembership(@NotNull ExternalIdentity external, @NotNull Authorizable auth, long depth) throws RepositoryException { if (depth <= 0) { return; @@ -598,7 +597,7 @@ public class DefaultSyncContext implemen * @param member the authorizable * @param groups set of groups. */ - protected void applyMembership(@Nonnull Authorizable member, @Nonnull Set<String> groups) throws RepositoryException { + protected void applyMembership(@NotNull Authorizable member, @NotNull Set<String> groups) throws RepositoryException { for (String groupName : groups) { Authorizable group = userManager.getAuthorizable(groupName); if (group == null) { @@ -620,7 +619,7 @@ public class DefaultSyncContext implemen * @param mapping the property mapping * @throws RepositoryException if an error occurs */ - protected void syncProperties(@Nonnull ExternalIdentity ext, @Nonnull Authorizable auth, @Nonnull Map<String, String> mapping) + protected void syncProperties(@NotNull ExternalIdentity ext, @NotNull Authorizable auth, @NotNull Map<String, String> mapping) throws RepositoryException { Map<String, ?> properties = ext.getProperties(); for (Map.Entry<String, String> entry : mapping.entrySet()) { @@ -654,7 +653,7 @@ public class DefaultSyncContext implemen * @param authorizable the authorizable to check * @return {@code true} if the authorizable needs sync */ - private boolean isExpired(@Nonnull Authorizable authorizable) throws RepositoryException { + private boolean isExpired(@NotNull Authorizable authorizable) throws RepositoryException { long expTime = (authorizable.isGroup()) ? config.group().getExpirationTime() : config.user().getExpirationTime(); return isExpired(authorizable, expTime, "Properties"); } @@ -666,7 +665,7 @@ public class DefaultSyncContext implemen * @param type debug message type * @return {@code true} if the authorizable needs sync */ - protected boolean isExpired(@Nonnull Authorizable auth, long expirationTime, @Nonnull String type) throws RepositoryException { + protected boolean isExpired(@NotNull Authorizable auth, long expirationTime, @NotNull String type) throws RepositoryException { Value[] values = auth.getProperty(REP_LAST_SYNCED); if (values == null || values.length == 0) { if (log.isDebugEnabled()) { @@ -694,7 +693,7 @@ public class DefaultSyncContext implemen * @return the JCR value or null * @throws RepositoryException if an error occurs */ - @CheckForNull + @Nullable protected Value createValue(@Nullable Object v) throws RepositoryException { if (v == null) { return null; @@ -732,8 +731,8 @@ public class DefaultSyncContext implemen * @return and array of JCR values * @throws RepositoryException if an error occurs */ - @CheckForNull - protected Value[] createValues(@Nonnull Collection<?> propValues) throws RepositoryException { + @Nullable + protected Value[] createValues(@NotNull Collection<?> propValues) throws RepositoryException { List<Value> values = new ArrayList<Value>(); for (Object obj : propValues) { Value v = createValue(obj); @@ -764,7 +763,7 @@ public class DefaultSyncContext implemen * @return {@code true} if {@link ExternalIdentityRef#getProviderName()} refers * to the IDP associated with this context instance. */ - protected boolean isSameIDP(@Nonnull ExternalIdentityRef ref) { + protected boolean isSameIDP(@NotNull ExternalIdentityRef ref) { return idp.getName().equals(ref.getProviderName()); } -} \ 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/basic/DefaultSyncResultImpl.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/basic/DefaultSyncResultImpl.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/basic/DefaultSyncResultImpl.java (original) +++ jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/DefaultSyncResultImpl.java Wed Nov 7 13:33:31 2018 @@ -16,11 +16,9 @@ */ package org.apache.jackrabbit.oak.spi.security.authentication.external.basic; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import org.apache.jackrabbit.oak.spi.security.authentication.external.SyncResult; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * Implements a simple sync result with and id and a status. @@ -31,24 +29,24 @@ public class DefaultSyncResultImpl imple private Status status = Status.NOP; - public DefaultSyncResultImpl(@Nullable DefaultSyncedIdentity id, @Nonnull Status status) { + public DefaultSyncResultImpl(@Nullable DefaultSyncedIdentity id, @NotNull Status status) { this.id = id; this.status = status; } @Override - @CheckForNull + @Nullable public DefaultSyncedIdentity getIdentity() { return id; } @Override - @Nonnull + @NotNull public Status getStatus() { return status; } - public void setStatus(@Nonnull Status status) { + public void setStatus(@NotNull Status status) { this.status = status; } -} \ 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/basic/DefaultSyncedIdentity.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/basic/DefaultSyncedIdentity.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/basic/DefaultSyncedIdentity.java (original) +++ jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/DefaultSyncedIdentity.java Wed Nov 7 13:33:31 2018 @@ -16,12 +16,10 @@ */ package org.apache.jackrabbit.oak.spi.security.authentication.external.basic; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import org.apache.jackrabbit.oak.spi.security.authentication.external.ExternalIdentityRef; import org.apache.jackrabbit.oak.spi.security.authentication.external.SyncedIdentity; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * Implements a simple synced identity that maps an authorizable id to an external ref. @@ -36,20 +34,20 @@ public class DefaultSyncedIdentity imple private final long lastSynced; - public DefaultSyncedIdentity(@Nonnull String id, @Nullable ExternalIdentityRef ref, boolean isGroup, long lastSynced) { + public DefaultSyncedIdentity(@NotNull String id, @Nullable ExternalIdentityRef ref, boolean isGroup, long lastSynced) { this.id = id; this.ref = ref; this.isGroup = isGroup; this.lastSynced = lastSynced; } - @Nonnull + @NotNull @Override public String getId() { return id; } - @CheckForNull + @Nullable @Override public ExternalIdentityRef getExternalIdRef() { return ref; @@ -75,4 +73,4 @@ public class DefaultSyncedIdentity imple sb.append('}'); return sb.toString(); } -} \ 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/basic/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/basic/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/basic/package-info.java (original) +++ jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/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("1.3.0") +@Version("1.3.1") package org.apache.jackrabbit.oak.spi.security.authentication.external.basic; import org.osgi.annotation.versioning.Version; Modified: jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DefaultSyncConfigImpl.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/DefaultSyncConfigImpl.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/DefaultSyncConfigImpl.java (original) +++ jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DefaultSyncConfigImpl.java Wed Nov 7 13:33:31 2018 @@ -20,12 +20,11 @@ package org.apache.jackrabbit.oak.spi.se import java.util.HashMap; import java.util.Map; -import javax.annotation.Nonnull; - import org.apache.felix.scr.annotations.Component; import org.apache.felix.scr.annotations.Property; import org.apache.jackrabbit.oak.spi.security.ConfigurationParameters; import org.apache.jackrabbit.oak.spi.security.authentication.external.basic.DefaultSyncConfig; +import org.jetbrains.annotations.NotNull; /** * {@code DefaultSyncConfig} defines how users and groups from an external source are synced into the repository using @@ -306,9 +305,9 @@ public class DefaultSyncConfigImpl exten return cfg; } - private static long getMilliSeconds(@Nonnull ConfigurationParameters params, @Nonnull String paramName, - @Nonnull String defaultParamValue, - @Nonnull ConfigurationParameters.Milliseconds defaultMillis) { + private static long getMilliSeconds(@NotNull ConfigurationParameters params, @NotNull String paramName, + @NotNull String defaultParamValue, + @NotNull ConfigurationParameters.Milliseconds defaultMillis) { return ConfigurationParameters.Milliseconds.of(params.getConfigValue(paramName, defaultParamValue), defaultMillis).value; } @@ -317,7 +316,7 @@ public class DefaultSyncConfigImpl exten * @param patterns the patterns * @return the mapping map */ - private static Map<String, String> createMapping(@Nonnull String[] patterns) { + private static Map<String, String> createMapping(@NotNull String[] patterns) { Map<String, String> mapping = new HashMap<String, String>(); for (String pattern: patterns) { int idx = pattern.indexOf('='); @@ -330,4 +329,4 @@ public class DefaultSyncConfigImpl exten return mapping; } -} \ 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/DefaultSyncHandler.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/DefaultSyncHandler.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/DefaultSyncHandler.java (original) +++ jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DefaultSyncHandler.java Wed Nov 7 13:33:31 2018 @@ -18,7 +18,6 @@ package org.apache.jackrabbit.oak.spi.se import java.util.Iterator; import java.util.Map; -import javax.annotation.Nonnull; import javax.jcr.RepositoryException; import javax.jcr.ValueFactory; @@ -37,6 +36,7 @@ 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.basic.DefaultSyncConfig; import org.apache.jackrabbit.oak.spi.security.authentication.external.basic.DefaultSyncContext; +import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -89,7 +89,7 @@ public class DefaultSyncHandler implemen /** * {@inheritDoc} */ - @Nonnull + @NotNull @Override public String getName() { return config.getName(); @@ -98,10 +98,10 @@ public class DefaultSyncHandler implemen /** * {@inheritDoc} */ - @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 { if (config.user().getDynamicMembership()) { return new DynamicSyncContext(config, idp, userManager, valueFactory); } else { @@ -113,7 +113,7 @@ public class DefaultSyncHandler implemen * {@inheritDoc} */ @Override - public SyncedIdentity findIdentity(@Nonnull UserManager userManager, @Nonnull String id) + public SyncedIdentity findIdentity(@NotNull UserManager userManager, @NotNull String id) throws RepositoryException { return DefaultSyncContext.createSyncedIdentity(userManager.getAuthorizable(id)); } @@ -122,7 +122,7 @@ public class DefaultSyncHandler implemen * {@inheritDoc} */ @Override - public boolean requiresSync(@Nonnull SyncedIdentity identity) { + public boolean requiresSync(@NotNull SyncedIdentity identity) { if (identity.getExternalIdRef() == null || identity.lastSynced() < 0) { return true; } @@ -136,9 +136,9 @@ public class DefaultSyncHandler implemen /** * {@inheritDoc} */ - @Nonnull + @NotNull @Override - public Iterator<SyncedIdentity> listIdentities(@Nonnull UserManager userManager) throws RepositoryException { + public Iterator<SyncedIdentity> listIdentities(@NotNull UserManager userManager) throws RepositoryException { final Iterator<Authorizable> iter = userManager.findAuthorizables(DefaultSyncContext.REP_EXTERNAL_ID, null); return new AbstractLazyIterator<SyncedIdentity>() { @@ -159,4 +159,4 @@ public class DefaultSyncHandler implemen } }; } -} \ 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/DynamicSyncContext.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/DynamicSyncContext.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/DynamicSyncContext.java (original) +++ jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DynamicSyncContext.java Wed Nov 7 13:33:31 2018 @@ -18,7 +18,6 @@ package org.apache.jackrabbit.oak.spi.se import java.util.HashSet; import java.util.Set; -import javax.annotation.Nonnull; import javax.jcr.RepositoryException; import javax.jcr.Value; import javax.jcr.ValueFactory; @@ -39,6 +38,7 @@ 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.basic.DefaultSyncResultImpl; import org.apache.jackrabbit.oak.spi.security.authentication.external.basic.DefaultSyncedIdentity; +import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -66,17 +66,17 @@ public class DynamicSyncContext extends private static final Logger log = LoggerFactory.getLogger(DynamicSyncContext.class); - public DynamicSyncContext(@Nonnull DefaultSyncConfig config, - @Nonnull ExternalIdentityProvider idp, - @Nonnull UserManager userManager, - @Nonnull ValueFactory valueFactory) { + public DynamicSyncContext(@NotNull DefaultSyncConfig config, + @NotNull ExternalIdentityProvider idp, + @NotNull UserManager userManager, + @NotNull ValueFactory valueFactory) { super(config, idp, userManager, valueFactory); } //--------------------------------------------------------< SyncContext >--- - @Nonnull + @NotNull @Override - public SyncResult sync(@Nonnull ExternalIdentity identity) throws SyncException { + public SyncResult sync(@NotNull ExternalIdentity identity) throws SyncException { if (identity instanceof ExternalUser) { return super.sync(identity); } else if (identity instanceof ExternalGroup) { @@ -108,7 +108,7 @@ public class DynamicSyncContext extends //-------------------------------------------------< DefaultSyncContext >--- @Override - protected void syncMembership(@Nonnull ExternalIdentity external, @Nonnull Authorizable auth, long depth) throws RepositoryException { + protected void syncMembership(@NotNull ExternalIdentity external, @NotNull Authorizable auth, long depth) throws RepositoryException { if (auth.isGroup()) { return; } @@ -137,7 +137,7 @@ public class DynamicSyncContext extends } @Override - protected void applyMembership(@Nonnull Authorizable member, @Nonnull Set<String> groups) throws RepositoryException { + protected void applyMembership(@NotNull Authorizable member, @NotNull Set<String> groups) throws RepositoryException { log.debug("Dynamic membership sync enabled => omit setting auto-membership for {} ", member.getID()); } @@ -150,7 +150,7 @@ public class DynamicSyncContext extends * @param depth Configured membership nesting; the recursion will be stopped once depths is < 1. * @throws ExternalIdentityException If an error occurs while resolving the the external group references. */ - private void collectPrincipalNames(@Nonnull Set<String> principalNames, @Nonnull Iterable<ExternalIdentityRef> declaredGroupIdRefs, long depth) throws ExternalIdentityException { + private void collectPrincipalNames(@NotNull Set<String> principalNames, @NotNull Iterable<ExternalIdentityRef> declaredGroupIdRefs, long depth) throws ExternalIdentityException { boolean shortcut = (depth <= 1 && idp instanceof PrincipalNameResolver); for (ExternalIdentityRef ref : declaredGroupIdRefs) { if (shortcut) { @@ -170,4 +170,4 @@ public class DynamicSyncContext extends } } } -} \ 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/ExternalIDPManagerImpl.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/ExternalIDPManagerImpl.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/ExternalIDPManagerImpl.java (original) +++ jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalIDPManagerImpl.java Wed Nov 7 13:33:31 2018 @@ -16,8 +16,6 @@ */ package org.apache.jackrabbit.oak.spi.security.authentication.external.impl; -import javax.annotation.Nonnull; - import org.apache.felix.scr.annotations.Activate; import org.apache.felix.scr.annotations.Component; import org.apache.felix.scr.annotations.Deactivate; @@ -27,6 +25,7 @@ import org.apache.jackrabbit.oak.spi.sec import org.apache.jackrabbit.oak.spi.security.authentication.external.ExternalIdentityProviderManager; import org.apache.jackrabbit.oak.spi.whiteboard.AbstractServiceTracker; import org.apache.jackrabbit.oak.spi.whiteboard.Whiteboard; +import org.jetbrains.annotations.NotNull; import org.osgi.service.component.ComponentContext; /** @@ -68,7 +67,7 @@ public class ExternalIDPManagerImpl exte } @Override - public ExternalIdentityProvider getProvider(@Nonnull String name) { + public ExternalIdentityProvider getProvider(@NotNull String name) { for (ExternalIdentityProvider provider: getServices()) { if (name.equals(provider.getName())) { return provider; @@ -76,4 +75,4 @@ public class ExternalIDPManagerImpl exte } 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/ExternalLoginModule.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/ExternalLoginModule.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/ExternalLoginModule.java (original) +++ jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModule.java Wed Nov 7 13:33:31 2018 @@ -21,8 +21,6 @@ import java.util.HashMap; import java.util.Map; import java.util.Set; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; import javax.jcr.Credentials; import javax.jcr.RepositoryException; import javax.security.auth.Subject; @@ -56,6 +54,8 @@ import org.apache.jackrabbit.oak.spi.sec import org.apache.jackrabbit.oak.spi.security.authentication.external.SyncedIdentity; import org.apache.jackrabbit.oak.spi.whiteboard.Whiteboard; import org.apache.jackrabbit.oak.spi.whiteboard.WhiteboardUtils; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -291,8 +291,8 @@ public class ExternalLoginModule extends //------------------------------------------------------------< private >--- - @CheckForNull - private String getUserId(@CheckForNull PreAuthenticatedLogin preAuthLogin, @CheckForNull Credentials credentials) { + @Nullable + private String getUserId(@Nullable PreAuthenticatedLogin preAuthLogin, @Nullable Credentials credentials) { if (preAuthLogin != null) { return preAuthLogin.getUserId(); } else if (credentials != null){ @@ -302,8 +302,8 @@ public class ExternalLoginModule extends } } - @CheckForNull - private SyncedIdentity getSyncedIdentity(@CheckForNull String userId) throws RepositoryException { + @Nullable + private SyncedIdentity getSyncedIdentity(@Nullable String userId) throws RepositoryException { UserManager userMgr = getUserManager(); if (userId != null && userMgr != null) { return syncHandler.findIdentity(userMgr, userId); @@ -312,7 +312,7 @@ public class ExternalLoginModule extends } } - private boolean ignore(@CheckForNull SyncedIdentity syncedIdentity, @CheckForNull PreAuthenticatedLogin preAuthLogin) { + private boolean ignore(@Nullable SyncedIdentity syncedIdentity, @Nullable PreAuthenticatedLogin preAuthLogin) { if (syncedIdentity != null) { ExternalIdentityRef externalIdRef = syncedIdentity.getExternalIdRef(); if (externalIdRef == null) { @@ -336,7 +336,7 @@ public class ExternalLoginModule extends * @param user the external user * @throws SyncException if an error occurs */ - private void syncUser(@Nonnull ExternalUser user) throws SyncException { + private void syncUser(@NotNull ExternalUser user) throws SyncException { Root root = getRoot(); if (root == null) { throw new SyncException("Cannot synchronize user. root == null"); @@ -376,7 +376,7 @@ public class ExternalLoginModule extends * Initiates synchronization of a possible remove user * @param id the user id */ - private void validateUser(@Nonnull String id) throws SyncException { + private void validateUser(@NotNull String id) throws SyncException { SyncContext context = null; try { Root root = getRoot(); @@ -404,8 +404,8 @@ public class ExternalLoginModule extends } - @Nonnull - private AuthInfo createAuthInfo(@Nonnull String userId, @Nonnull Set<? extends Principal> principals) { + @NotNull + private AuthInfo createAuthInfo(@NotNull String userId, @NotNull Set<? extends Principal> principals) { Credentials creds; if (credentials instanceof ImpersonationCredentials) { creds = ((ImpersonationCredentials) credentials).getBaseCredentials(); @@ -424,7 +424,7 @@ public class ExternalLoginModule extends return new AuthInfoImpl(userId, attributes, principals); } - private static void debug(@Nonnull String msg, String... args) { + private static void debug(@NotNull String msg, String... args) { if (log.isDebugEnabled()) { log.debug(msg, args); } @@ -443,7 +443,7 @@ public class ExternalLoginModule extends * @return the set of credentials classes as exposed by the configured * {@link CredentialsSupport} implementation. */ - @Nonnull + @NotNull @Override protected Set<Class> getSupportedCredentials() { return credentialsSupport.getCredentialClasses(); @@ -451,11 +451,11 @@ public class ExternalLoginModule extends //----------------------------------------------< public setters (JAAS) >--- - public void setSyncManager(@Nonnull SyncManager syncManager) { + public void setSyncManager(@NotNull SyncManager syncManager) { this.syncManager = syncManager; } - public void setIdpManager(@Nonnull ExternalIdentityProviderManager idpManager) { + public void setIdpManager(@NotNull ExternalIdentityProviderManager idpManager) { this.idpManager = idpManager; } -} \ 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/SyncManagerImpl.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/SyncManagerImpl.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/SyncManagerImpl.java (original) +++ jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/SyncManagerImpl.java Wed Nov 7 13:33:31 2018 @@ -17,8 +17,6 @@ package org.apache.jackrabbit.oak.spi.security.authentication.external.impl; -import javax.annotation.Nonnull; - import org.apache.felix.scr.annotations.Activate; import org.apache.felix.scr.annotations.Component; import org.apache.felix.scr.annotations.Deactivate; @@ -28,6 +26,7 @@ import org.apache.jackrabbit.oak.spi.sec import org.apache.jackrabbit.oak.spi.security.authentication.external.SyncManager; import org.apache.jackrabbit.oak.spi.whiteboard.AbstractServiceTracker; import org.apache.jackrabbit.oak.spi.whiteboard.Whiteboard; +import org.jetbrains.annotations.NotNull; import org.osgi.service.component.ComponentContext; /** @@ -69,7 +68,7 @@ public class SyncManagerImpl extends Abs } @Override - public SyncHandler getSyncHandler(@Nonnull String name) { + public SyncHandler getSyncHandler(@NotNull String name) { for (SyncHandler handler: getServices()) { if (name.equals(handler.getName())) { return handler; @@ -77,4 +76,4 @@ public class SyncManagerImpl extends Abs } return null; } -} \ No newline at end of file +}