Author: reschke Date: Wed Nov 7 14:10:06 2018 New Revision: 1846023 URL: http://svn.apache.org/viewvc?rev=1846023&view=rev Log: OAK-7669: OAK-7511: get rid of JSR 305 dependency - use jetbrains nullability annotations instead - oak-jcr
Modified: jackrabbit/oak/branches/1.8/ (props changed) jackrabbit/oak/branches/1.8/oak-jcr/ (props changed) jackrabbit/oak/branches/1.8/oak-jcr/pom.xml jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/Jcr.java jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/AccessControlManagerDelegator.java jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/AuthorizableDelegator.java jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/GroupDelegator.java jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/ImpersonationDelegator.java jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/ItemDelegate.java jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/JackrabbitAccessControlManagerDelegator.java jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/NodeDelegate.java jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/PrincipalManagerDelegator.java jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/PrivilegeManagerDelegator.java jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/PropertyDelegate.java jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/SessionDelegate.java jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/UserDelegator.java jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/UserManagerDelegator.java jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/VersionDelegate.java jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/VersionHistoryDelegate.java jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/VersionManagerDelegate.java jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/WorkspaceDelegate.java jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/lock/LockImpl.java jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/lock/LockManagerImpl.java jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/lock/LockOperation.java jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/ChangeProcessor.java jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/EventQueue.java jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/OakEventFilterImpl.java jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/ObservationManagerImpl.java jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/query/QueryImpl.java jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/query/QueryResultImpl.java jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/repository/RepositoryImpl.java jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/security/AccessManager.java jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/ItemImpl.java jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/NodeImpl.java jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/PropertyImpl.java jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/SessionContext.java jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/SessionImpl.java jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/SessionNamespaces.java jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/WorkspaceImpl.java jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/operation/SessionOperation.java jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/operation/UserManagerOperation.java jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/version/ReadWriteVersionManager.java jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/version/VersionHistoryImpl.java jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/version/VersionImpl.java jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/version/VersionManagerImpl.java jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/version/VersionStorage.java jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/ImporterImpl.java jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/SysViewImportHandler.java jackrabbit/oak/branches/1.8/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/AtomicCounterIT.java jackrabbit/oak/branches/1.8/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/AtomicCounterTest.java jackrabbit/oak/branches/1.8/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/DocumentClusterIT.java jackrabbit/oak/branches/1.8/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/nodetype/NodeTypeDefinitionTest.java jackrabbit/oak/branches/1.8/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/random/AbstractRandomizedTest.java jackrabbit/oak/branches/1.8/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/AbstractEvaluationTest.java jackrabbit/oak/branches/1.8/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/AccessControlImporterTest.java jackrabbit/oak/branches/1.8/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/NamespaceManagementTest.java jackrabbit/oak/branches/1.8/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/AbstractImportTest.java jackrabbit/oak/branches/1.8/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/GroupImportWithActionsBestEffortTest.java jackrabbit/oak/branches/1.8/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/GroupImportWithActionsTest.java jackrabbit/oak/branches/1.8/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/PrincipalLookupTest.java jackrabbit/oak/branches/1.8/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/UserImportPwExpiryTest.java jackrabbit/oak/branches/1.8/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/UserImportWithActionsTest.java jackrabbit/oak/branches/1.8/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/version/OpvIgnoreTest.java jackrabbit/oak/branches/1.8/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/version/VersionableTest.java Propchange: jackrabbit/oak/branches/1.8/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Nov 7 14:10:06 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,1836170-1836181,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-1836182,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 Propchange: jackrabbit/oak/branches/1.8/oak-jcr/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Nov 7 14:10:06 2018 @@ -1,3 +1,3 @@ /jackrabbit/oak/branches/1.0/oak-jcr:1665962 -/jackrabbit/oak/trunk/oak-jcr:1820660-1820661,1820729,1820734,1820859,1820861,1820878,1820888,1820947,1821130,1821140-1821141,1821240,1821249,1821258,1821325,1821358,1821361-1821362,1821370,1821375,1821393,1821477,1821487,1821516,1821665,1821668,1821681,1821979,1822121,1822201,1822207,1822723,1822808,1822850,1822934,1823135,1823163,1823169,1824196,1824198,1824962,1825362,1825381,1825442,1825448,1825466,1825470,1825475,1825523,1825525,1825619-1825621,1825651,1825654,1825992,1826079,1826090,1826096,1826237,1826338,1826516,1826532,1826640,1826932,1826957,1827472,1827486,1827977,1829987,1830019,1830160,1830170,1830911,1830923,1831689,1833347 +/jackrabbit/oak/trunk/oak-jcr:1820660-1820661,1820729,1820734,1820859,1820861,1820878,1820888,1820947,1821130,1821140-1821141,1821240,1821249,1821258,1821325,1821358,1821361-1821362,1821370,1821375,1821393,1821477,1821487,1821516,1821665,1821668,1821681,1821979,1822121,1822201,1822207,1822723,1822808,1822850,1822934,1823135,1823163,1823169,1824196,1824198,1824962,1825362,1825381,1825442,1825448,1825466,1825470,1825475,1825523,1825525,1825619-1825621,1825651,1825654,1825992,1826079,1826090,1826096,1826237,1826338,1826516,1826532,1826640,1826932,1826957,1827472,1827486,1827977,1829987,1830019,1830160,1830170,1830911,1830923,1831689,1833347,1836182 /jackrabbit/trunk/oak-jcr:1345480 Modified: jackrabbit/oak/branches/1.8/oak-jcr/pom.xml URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-jcr/pom.xml?rev=1846023&r1=1846022&r2=1846023&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-jcr/pom.xml (original) +++ jackrabbit/oak/branches/1.8/oak-jcr/pom.xml Wed Nov 7 14:10:06 2018 @@ -327,10 +327,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-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/Jcr.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/Jcr.java?rev=1846023&r1=1846022&r2=1846023&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/Jcr.java (original) +++ jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/Jcr.java Wed Nov 7 14:10:06 2018 @@ -25,7 +25,6 @@ import java.util.Set; import java.util.concurrent.Executor; import java.util.concurrent.ScheduledExecutorService; -import javax.annotation.Nonnull; import javax.jcr.Repository; import org.apache.jackrabbit.oak.Oak; @@ -50,6 +49,7 @@ import org.apache.jackrabbit.oak.spi.sec import org.apache.jackrabbit.oak.spi.state.Clusterable; import org.apache.jackrabbit.oak.spi.state.NodeStore; import org.apache.jackrabbit.oak.spi.whiteboard.Whiteboard; +import org.jetbrains.annotations.NotNull; /** * Builder class which encapsulates the details of building a JCR @@ -130,15 +130,15 @@ public class Jcr { this(new Oak(store)); } - @Nonnull - public Jcr with(@Nonnull Clusterable c) { + @NotNull + public Jcr with(@NotNull Clusterable c) { ensureRepositoryIsNotCreated(); this.clusterable = checkNotNull(c); return this; } - @Nonnull - public final Jcr with(@Nonnull RepositoryInitializer initializer) { + @NotNull + public final Jcr with(@NotNull RepositoryInitializer initializer) { ensureRepositoryIsNotCreated(); repositoryInitializers.add(checkNotNull(initializer)); return this; @@ -155,43 +155,43 @@ public class Jcr { "Repository was already created"); } - @Nonnull - public final Jcr with(@Nonnull QueryIndexProvider provider) { + @NotNull + public final Jcr with(@NotNull QueryIndexProvider provider) { ensureRepositoryIsNotCreated(); queryIndexProviders.add(checkNotNull(provider)); return this; } - @Nonnull - public final Jcr with(@Nonnull IndexEditorProvider indexEditorProvider) { + @NotNull + public final Jcr with(@NotNull IndexEditorProvider indexEditorProvider) { ensureRepositoryIsNotCreated(); indexEditorProviders.add(checkNotNull(indexEditorProvider)); return this; } - @Nonnull - public final Jcr with(@Nonnull CommitHook hook) { + @NotNull + public final Jcr with(@NotNull CommitHook hook) { ensureRepositoryIsNotCreated(); commitHooks.add(checkNotNull(hook)); return this; } - @Nonnull - public final Jcr with(@Nonnull EditorProvider provider) { + @NotNull + public final Jcr with(@NotNull EditorProvider provider) { ensureRepositoryIsNotCreated(); editorProviders.add(checkNotNull(provider)); return this; } - @Nonnull - public final Jcr with(@Nonnull Editor editor) { + @NotNull + public final Jcr with(@NotNull Editor editor) { ensureRepositoryIsNotCreated(); editors.add(checkNotNull(editor)); return this; } - @Nonnull - public final Jcr with(@Nonnull SecurityProvider securityProvider) { + @NotNull + public final Jcr with(@NotNull SecurityProvider securityProvider) { ensureRepositoryIsNotCreated(); this.securityProvider = checkNotNull(securityProvider); return this; @@ -201,34 +201,34 @@ public class Jcr { * @deprecated Use {@link #with(ThreeWayConflictHandler)} instead */ @Deprecated - @Nonnull - public final Jcr with(@Nonnull PartialConflictHandler conflictHandler) { + @NotNull + public final Jcr with(@NotNull PartialConflictHandler conflictHandler) { return with(ConflictHandlers.wrap(conflictHandler)); } - @Nonnull - public final Jcr with(@Nonnull ThreeWayConflictHandler conflictHandler) { + @NotNull + public final Jcr with(@NotNull ThreeWayConflictHandler conflictHandler) { ensureRepositoryIsNotCreated(); this.conflictHandler.addHandler(checkNotNull(conflictHandler)); return this; } - @Nonnull - public final Jcr with(@Nonnull ScheduledExecutorService executor) { + @NotNull + public final Jcr with(@NotNull ScheduledExecutorService executor) { ensureRepositoryIsNotCreated(); this.scheduledExecutor = checkNotNull(executor); return this; } - @Nonnull - public final Jcr with(@Nonnull Executor executor) { + @NotNull + public final Jcr with(@NotNull Executor executor) { ensureRepositoryIsNotCreated(); this.executor = checkNotNull(executor); return this; } - @Nonnull - public final Jcr with(@Nonnull Observer observer) { + @NotNull + public final Jcr with(@NotNull Observer observer) { ensureRepositoryIsNotCreated(); observers.add(checkNotNull(observer)); return this; @@ -237,7 +237,7 @@ public class Jcr { /** * @deprecated Use {@link #withAsyncIndexing(String, long)} instead */ - @Nonnull + @NotNull @Deprecated public Jcr withAsyncIndexing() { ensureRepositoryIsNotCreated(); @@ -245,50 +245,50 @@ public class Jcr { return this; } - @Nonnull - public Jcr withAsyncIndexing(@Nonnull String name, long delayInSeconds) { + @NotNull + public Jcr withAsyncIndexing(@NotNull String name, long delayInSeconds) { ensureRepositoryIsNotCreated(); oak.withAsyncIndexing(name, delayInSeconds); return this; } - @Nonnull + @NotNull public Jcr withObservationQueueLength(int observationQueueLength) { ensureRepositoryIsNotCreated(); this.observationQueueLength = observationQueueLength; return this; } - @Nonnull - public Jcr with(@Nonnull CommitRateLimiter commitRateLimiter) { + @NotNull + public Jcr with(@NotNull CommitRateLimiter commitRateLimiter) { ensureRepositoryIsNotCreated(); this.commitRateLimiter = checkNotNull(commitRateLimiter); return this; } - @Nonnull - public Jcr with(@Nonnull QueryLimits qs) { + @NotNull + public Jcr with(@NotNull QueryLimits qs) { ensureRepositoryIsNotCreated(); this.queryEngineSettings = checkNotNull(qs); return this; } - @Nonnull + @NotNull public Jcr withFastQueryResultSize(boolean fastQueryResultSize) { ensureRepositoryIsNotCreated(); this.fastQueryResultSize = fastQueryResultSize; return this; } - @Nonnull - public Jcr with(@Nonnull String defaultWorkspaceName) { + @NotNull + public Jcr with(@NotNull String defaultWorkspaceName) { ensureRepositoryIsNotCreated(); this.defaultWorkspaceName = checkNotNull(defaultWorkspaceName); return this; } - @Nonnull - public Jcr with(@Nonnull Whiteboard whiteboard) { + @NotNull + public Jcr with(@NotNull Whiteboard whiteboard) { ensureRepositoryIsNotCreated(); this.whiteboard = checkNotNull(whiteboard); return this; @@ -369,7 +369,7 @@ public class Jcr { } } - @Nonnull + @NotNull public ContentRepository createContentRepository() { if (contentRepository == null) { setUpOak(); @@ -378,7 +378,7 @@ public class Jcr { return contentRepository; } - @Nonnull + @NotNull public Repository createRepository() { if (repository == null) { repository = new RepositoryImpl( Modified: jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/AccessControlManagerDelegator.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/AccessControlManagerDelegator.java?rev=1846023&r1=1846022&r2=1846023&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/AccessControlManagerDelegator.java (original) +++ jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/AccessControlManagerDelegator.java Wed Nov 7 14:10:06 2018 @@ -19,7 +19,6 @@ package org.apache.jackrabbit.oak.jcr.delegate; -import javax.annotation.Nonnull; import javax.jcr.RepositoryException; import javax.jcr.security.AccessControlManager; import javax.jcr.security.AccessControlPolicy; @@ -27,6 +26,7 @@ import javax.jcr.security.AccessControlP import javax.jcr.security.Privilege; import org.apache.jackrabbit.oak.jcr.session.operation.SessionOperation; +import org.jetbrains.annotations.NotNull; /** * This implementation of {@code AccessControlManager} delegates back to a @@ -46,7 +46,7 @@ public class AccessControlManagerDelegat @Override public Privilege[] getSupportedPrivileges(final String absPath) throws RepositoryException { return delegate.perform(new SessionOperation<Privilege[]>("getSupportedPrivileges") { - @Nonnull + @NotNull @Override public Privilege[] perform() throws RepositoryException { return acManager.getSupportedPrivileges(absPath); @@ -57,7 +57,7 @@ public class AccessControlManagerDelegat @Override public Privilege privilegeFromName(final String privilegeName) throws RepositoryException { return delegate.perform(new SessionOperation<Privilege>("privilegeFromName") { - @Nonnull + @NotNull @Override public Privilege perform() throws RepositoryException { return acManager.privilegeFromName(privilegeName); @@ -69,7 +69,7 @@ public class AccessControlManagerDelegat public boolean hasPrivileges(final String absPath, final Privilege[] privileges) throws RepositoryException { return delegate.perform(new SessionOperation<Boolean>("hasPrivileges") { - @Nonnull + @NotNull @Override public Boolean perform() throws RepositoryException { return acManager.hasPrivileges(absPath, privileges); @@ -80,7 +80,7 @@ public class AccessControlManagerDelegat @Override public Privilege[] getPrivileges(final String absPath) throws RepositoryException { return delegate.perform(new SessionOperation<Privilege[]>("getPrivileges") { - @Nonnull + @NotNull @Override public Privilege[] perform() throws RepositoryException { return acManager.getPrivileges(absPath); @@ -91,7 +91,7 @@ public class AccessControlManagerDelegat @Override public AccessControlPolicy[] getPolicies(final String absPath) throws RepositoryException { return delegate.perform(new SessionOperation<AccessControlPolicy[]>("getPolicies") { - @Nonnull + @NotNull @Override public AccessControlPolicy[] perform() throws RepositoryException { return acManager.getPolicies(absPath); @@ -103,7 +103,7 @@ public class AccessControlManagerDelegat public AccessControlPolicy[] getEffectivePolicies(final String absPath) throws RepositoryException { return delegate.perform(new SessionOperation<AccessControlPolicy[]>("getEffectivePolicies") { - @Nonnull + @NotNull @Override public AccessControlPolicy[] perform() throws RepositoryException { return acManager.getEffectivePolicies(absPath); @@ -115,7 +115,7 @@ public class AccessControlManagerDelegat public AccessControlPolicyIterator getApplicablePolicies(final String absPath) throws RepositoryException { return delegate.perform(new SessionOperation<AccessControlPolicyIterator>("getApplicablePolicies") { - @Nonnull + @NotNull @Override public AccessControlPolicyIterator perform() throws RepositoryException { return acManager.getApplicablePolicies(absPath); Modified: jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/AuthorizableDelegator.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/AuthorizableDelegator.java?rev=1846023&r1=1846022&r2=1846023&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/AuthorizableDelegator.java (original) +++ jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/AuthorizableDelegator.java Wed Nov 7 14:10:06 2018 @@ -24,8 +24,6 @@ import static com.google.common.base.Pre import java.security.Principal; import java.util.Iterator; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; import javax.jcr.RepositoryException; import javax.jcr.Value; @@ -35,6 +33,8 @@ import org.apache.jackrabbit.api.securit import org.apache.jackrabbit.api.security.user.Group; import org.apache.jackrabbit.api.security.user.User; import org.apache.jackrabbit.oak.jcr.session.operation.SessionOperation; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * Base class for {@link GroupDelegator} and {@link UserDelegator}. @@ -44,13 +44,13 @@ abstract class AuthorizableDelegator imp final SessionDelegate sessionDelegate; final Authorizable delegate; - AuthorizableDelegator(@Nonnull SessionDelegate sessionDelegate, @Nonnull Authorizable delegate) { + AuthorizableDelegator(@NotNull SessionDelegate sessionDelegate, @NotNull Authorizable delegate) { checkArgument(!(delegate instanceof AuthorizableDelegator)); this.sessionDelegate = sessionDelegate; this.delegate = delegate; } - static Authorizable wrap(@Nonnull SessionDelegate sessionDelegate, @Nullable Authorizable authorizable) { + static Authorizable wrap(@NotNull SessionDelegate sessionDelegate, @Nullable Authorizable authorizable) { if (authorizable == null) { return null; } @@ -61,7 +61,7 @@ abstract class AuthorizableDelegator imp } } - static Authorizable unwrap(@Nonnull Authorizable authorizable) { + static Authorizable unwrap(@NotNull Authorizable authorizable) { if (authorizable.isGroup()) { return GroupDelegator.unwrap((Group) authorizable); } else { @@ -73,7 +73,7 @@ abstract class AuthorizableDelegator imp @Override public boolean isGroup() { return sessionDelegate.safePerform(new SessionOperation<Boolean>("isGroup") { - @Nonnull + @NotNull @Override public Boolean perform() { return delegate.isGroup(); @@ -84,7 +84,7 @@ abstract class AuthorizableDelegator imp @Override public String getID() throws RepositoryException { return sessionDelegate.perform(new SessionOperation<String>("getID") { - @Nonnull + @NotNull @Override public String perform() throws RepositoryException { return delegate.getID(); @@ -97,7 +97,7 @@ abstract class AuthorizableDelegator imp @Override public Principal getPrincipal() throws RepositoryException { return sessionDelegate.perform(new SessionOperation<Principal>("getPrincipal") { - @Nonnull + @NotNull @Override public Principal perform() throws RepositoryException { return delegate.getPrincipal(); @@ -108,7 +108,7 @@ abstract class AuthorizableDelegator imp @Override public Iterator<Group> declaredMemberOf() throws RepositoryException { return sessionDelegate.perform(new SessionOperation<Iterator<Group>>("declaredMemberOf") { - @Nonnull + @NotNull @Override public Iterator<Group> perform() throws RepositoryException { Iterator<Group> groups = delegate.declaredMemberOf(); @@ -126,7 +126,7 @@ abstract class AuthorizableDelegator imp @Override public Iterator<Group> memberOf() throws RepositoryException { return sessionDelegate.perform(new SessionOperation<Iterator<Group>>("memberOf") { - @Nonnull + @NotNull @Override public Iterator<Group> perform() throws RepositoryException { Iterator<Group> groups = delegate.memberOf(); @@ -154,7 +154,7 @@ abstract class AuthorizableDelegator imp @Override public Iterator<String> getPropertyNames() throws RepositoryException { return sessionDelegate.perform(new SessionOperation<Iterator<String>>("getPropertyNames") { - @Nonnull + @NotNull @Override public Iterator<String> perform() throws RepositoryException { return delegate.getPropertyNames(); @@ -165,7 +165,7 @@ abstract class AuthorizableDelegator imp @Override public Iterator<String> getPropertyNames(final String relPath) throws RepositoryException { return sessionDelegate.perform(new SessionOperation<Iterator<String>>("getPropertyNames") { - @Nonnull + @NotNull @Override public Iterator<String> perform() throws RepositoryException { return delegate.getPropertyNames(relPath); @@ -176,7 +176,7 @@ abstract class AuthorizableDelegator imp @Override public boolean hasProperty(final String relPath) throws RepositoryException { return sessionDelegate.perform(new SessionOperation<Boolean>("hasProperty") { - @Nonnull + @NotNull @Override public Boolean perform() throws RepositoryException { return delegate.hasProperty(relPath); @@ -207,7 +207,7 @@ abstract class AuthorizableDelegator imp @Override public Value[] getProperty(final String relPath) throws RepositoryException { return sessionDelegate.perform(new SessionOperation<Value[]>("getProperty") { - @Nonnull + @NotNull @Override public Value[] perform() throws RepositoryException { return delegate.getProperty(relPath); @@ -218,7 +218,7 @@ abstract class AuthorizableDelegator imp @Override public boolean removeProperty(final String relPath) throws RepositoryException { return sessionDelegate.perform(new SessionOperation<Boolean>("removeProperty", true) { - @Nonnull + @NotNull @Override public Boolean perform() throws RepositoryException { return delegate.removeProperty(relPath); @@ -229,7 +229,7 @@ abstract class AuthorizableDelegator imp @Override public String getPath() throws RepositoryException { return sessionDelegate.perform(new SessionOperation<String>("getPath") { - @Nonnull + @NotNull @Override public String perform() throws RepositoryException { return delegate.getPath(); Modified: jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/GroupDelegator.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/GroupDelegator.java?rev=1846023&r1=1846022&r2=1846023&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/GroupDelegator.java (original) +++ jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/GroupDelegator.java Wed Nov 7 14:10:06 2018 @@ -21,8 +21,6 @@ package org.apache.jackrabbit.oak.jcr.de import java.util.Iterator; import java.util.Set; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; import javax.jcr.RepositoryException; import com.google.common.base.Function; @@ -30,6 +28,8 @@ import com.google.common.collect.Iterato import org.apache.jackrabbit.api.security.user.Authorizable; import org.apache.jackrabbit.api.security.user.Group; import org.apache.jackrabbit.oak.jcr.session.operation.SessionOperation; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * This implementation of {@code Group} delegates back to a @@ -43,7 +43,7 @@ final class GroupDelegator extends Autho super(sessionDelegate, groupDelegate); } - static Group wrap(@Nonnull SessionDelegate sessionDelegate, Group group) { + static Group wrap(@NotNull SessionDelegate sessionDelegate, Group group) { if (group == null) { return null; } else { @@ -51,8 +51,8 @@ final class GroupDelegator extends Autho } } - @Nonnull - static Group unwrap(@Nonnull Group group) { + @NotNull + static Group unwrap(@NotNull Group group) { if (group instanceof GroupDelegator) { return ((GroupDelegator) group).getDelegate(); } else { @@ -68,7 +68,7 @@ final class GroupDelegator extends Autho @Override public Iterator<Authorizable> getDeclaredMembers() throws RepositoryException { return sessionDelegate.perform(new SessionOperation<Iterator<Authorizable>>("getDeclaredMembers") { - @Nonnull + @NotNull @Override public Iterator<Authorizable> perform() throws RepositoryException { Iterator<Authorizable> authorizables = getDelegate().getDeclaredMembers(); @@ -86,7 +86,7 @@ final class GroupDelegator extends Autho @Override public Iterator<Authorizable> getMembers() throws RepositoryException { return sessionDelegate.perform(new SessionOperation<Iterator<Authorizable>>("getMembers") { - @Nonnull + @NotNull @Override public Iterator<Authorizable> perform() throws RepositoryException { Iterator<Authorizable> authorizables = getDelegate().getMembers(); @@ -104,7 +104,7 @@ final class GroupDelegator extends Autho @Override public boolean isDeclaredMember(final Authorizable authorizable) throws RepositoryException { return sessionDelegate.perform(new SessionOperation<Boolean>("isDeclaredMember") { - @Nonnull + @NotNull @Override public Boolean perform() throws RepositoryException { return getDelegate().isDeclaredMember(unwrap(authorizable)); @@ -115,7 +115,7 @@ final class GroupDelegator extends Autho @Override public boolean isMember(final Authorizable authorizable) throws RepositoryException { return sessionDelegate.perform(new SessionOperation<Boolean>("isMember") { - @Nonnull + @NotNull @Override public Boolean perform() throws RepositoryException { return getDelegate().isMember(unwrap(authorizable)); @@ -126,7 +126,7 @@ final class GroupDelegator extends Autho @Override public boolean addMember(final Authorizable authorizable) throws RepositoryException { return sessionDelegate.perform(new SessionOperation<Boolean>("addMember", true) { - @Nonnull + @NotNull @Override public Boolean perform() throws RepositoryException { return getDelegate().addMember(unwrap(authorizable)); @@ -135,9 +135,9 @@ final class GroupDelegator extends Autho } @Override - public Set<String> addMembers(@Nonnull final String... memberIds) throws RepositoryException { + public Set<String> addMembers(@NotNull final String... memberIds) throws RepositoryException { return sessionDelegate.perform(new SessionOperation<Set<String>>("addMembers", true) { - @Nonnull + @NotNull @Override public Set<String> perform() throws RepositoryException { return getDelegate().addMembers(memberIds); @@ -148,7 +148,7 @@ final class GroupDelegator extends Autho @Override public boolean removeMember(final Authorizable authorizable) throws RepositoryException { return sessionDelegate.perform(new SessionOperation<Boolean>("removeMember", true) { - @Nonnull + @NotNull @Override public Boolean perform() throws RepositoryException { return getDelegate().removeMember(unwrap(authorizable)); @@ -157,9 +157,9 @@ final class GroupDelegator extends Autho } @Override - public Set<String> removeMembers(@Nonnull final String... memberIds) throws RepositoryException { + public Set<String> removeMembers(@NotNull final String... memberIds) throws RepositoryException { return sessionDelegate.perform(new SessionOperation<Set<String>>("removeMembers", true) { - @Nonnull + @NotNull @Override public Set<String> perform() throws RepositoryException { return getDelegate().removeMembers(memberIds); Modified: jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/ImpersonationDelegator.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/ImpersonationDelegator.java?rev=1846023&r1=1846022&r2=1846023&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/ImpersonationDelegator.java (original) +++ jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/ImpersonationDelegator.java Wed Nov 7 14:10:06 2018 @@ -23,13 +23,13 @@ import static com.google.common.base.Pre import java.security.Principal; -import javax.annotation.Nonnull; import javax.jcr.RepositoryException; import javax.security.auth.Subject; import org.apache.jackrabbit.api.security.principal.PrincipalIterator; import org.apache.jackrabbit.api.security.user.Impersonation; import org.apache.jackrabbit.oak.jcr.session.operation.SessionOperation; +import org.jetbrains.annotations.NotNull; /** * This implementation of {@code Impersonation} delegates back to a @@ -58,7 +58,7 @@ final class ImpersonationDelegator imple @Override public PrincipalIterator getImpersonators() throws RepositoryException { return sessionDelegate.perform(new SessionOperation<PrincipalIterator>("getImpersonators") { - @Nonnull + @NotNull @Override public PrincipalIterator perform() throws RepositoryException { return impersonationDelegate.getImpersonators(); @@ -69,7 +69,7 @@ final class ImpersonationDelegator imple @Override public boolean grantImpersonation(final Principal principal) throws RepositoryException { return sessionDelegate.perform(new SessionOperation<Boolean>("grantImpersonation", true) { - @Nonnull + @NotNull @Override public Boolean perform() throws RepositoryException { return impersonationDelegate.grantImpersonation(principal); @@ -80,7 +80,7 @@ final class ImpersonationDelegator imple @Override public boolean revokeImpersonation(final Principal principal) throws RepositoryException { return sessionDelegate.perform(new SessionOperation<Boolean>("revokeImpersonation", true) { - @Nonnull + @NotNull @Override public Boolean perform() throws RepositoryException { return impersonationDelegate.revokeImpersonation(principal); @@ -91,7 +91,7 @@ final class ImpersonationDelegator imple @Override public boolean allows(final Subject subject) throws RepositoryException { return sessionDelegate.perform(new SessionOperation<Boolean>("allows") { - @Nonnull + @NotNull @Override public Boolean perform() throws RepositoryException { return impersonationDelegate.allows(subject); Modified: jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/ItemDelegate.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/ItemDelegate.java?rev=1846023&r1=1846022&r2=1846023&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/ItemDelegate.java (original) +++ jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/ItemDelegate.java Wed Nov 7 14:10:06 2018 @@ -19,12 +19,12 @@ package org.apache.jackrabbit.oak.jcr.de import static com.google.common.base.Preconditions.checkNotNull; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; import javax.jcr.InvalidItemStateException; import javax.jcr.RepositoryException; import org.apache.jackrabbit.oak.api.Tree.Status; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * Abstract base class for {@link NodeDelegate} and {@link PropertyDelegate} @@ -91,14 +91,14 @@ public abstract class ItemDelegate { * Get the name of this item * @return oak name of this item */ - @Nonnull + @NotNull public abstract String getName(); /** * Get the path of this item * @return oak path of this item */ - @Nonnull + @NotNull public abstract String getPath(); /** @@ -106,14 +106,14 @@ public abstract class ItemDelegate { * @return parent of this item or {@code null} for root or if the parent * is not accessible. */ - @CheckForNull + @Nullable public abstract NodeDelegate getParent(); /** * Get the status of this item. * @return {@link Status} of this item or {@code null} if not available. */ - @CheckForNull + @Nullable public abstract Status getStatus(); public abstract boolean isProtected() throws InvalidItemStateException; Modified: jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/JackrabbitAccessControlManagerDelegator.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/JackrabbitAccessControlManagerDelegator.java?rev=1846023&r1=1846022&r2=1846023&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/JackrabbitAccessControlManagerDelegator.java (original) +++ jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/JackrabbitAccessControlManagerDelegator.java Wed Nov 7 14:10:06 2018 @@ -22,7 +22,6 @@ package org.apache.jackrabbit.oak.jcr.de import java.security.Principal; import java.util.Set; -import javax.annotation.Nonnull; import javax.jcr.RepositoryException; import javax.jcr.security.AccessControlPolicy; import javax.jcr.security.AccessControlPolicyIterator; @@ -31,6 +30,7 @@ import javax.jcr.security.Privilege; import org.apache.jackrabbit.api.security.JackrabbitAccessControlManager; import org.apache.jackrabbit.api.security.JackrabbitAccessControlPolicy; import org.apache.jackrabbit.oak.jcr.session.operation.SessionOperation; +import org.jetbrains.annotations.NotNull; /** * This implementation of {@code JackrabbitAccessControlManager} delegates back to a @@ -54,7 +54,7 @@ public class JackrabbitAccessControlMana public JackrabbitAccessControlPolicy[] getApplicablePolicies(final Principal principal) throws RepositoryException { return delegate.perform(new SessionOperation<JackrabbitAccessControlPolicy[]>("getApplicablePolicies") { - @Nonnull + @NotNull @Override public JackrabbitAccessControlPolicy[] perform() throws RepositoryException { return jackrabbitACManager.getApplicablePolicies(principal); @@ -66,7 +66,7 @@ public class JackrabbitAccessControlMana public JackrabbitAccessControlPolicy[] getPolicies(final Principal principal) throws RepositoryException { return delegate.perform(new SessionOperation<JackrabbitAccessControlPolicy[]>("getPolicies") { - @Nonnull + @NotNull @Override public JackrabbitAccessControlPolicy[] perform() throws RepositoryException { return jackrabbitACManager.getPolicies(principal); @@ -78,7 +78,7 @@ public class JackrabbitAccessControlMana public AccessControlPolicy[] getEffectivePolicies(final Set<Principal> principals) throws RepositoryException { return delegate.perform(new SessionOperation<AccessControlPolicy[]>("getEffectivePolicies") { - @Nonnull + @NotNull @Override public AccessControlPolicy[] perform() throws RepositoryException { return jackrabbitACManager.getEffectivePolicies(principals); @@ -90,7 +90,7 @@ public class JackrabbitAccessControlMana public boolean hasPrivileges(final String absPath, final Set<Principal> principals, final Privilege[] privileges) throws RepositoryException { return delegate.perform(new SessionOperation<Boolean>("hasPrivileges") { - @Nonnull + @NotNull @Override public Boolean perform() throws RepositoryException { return jackrabbitACManager.hasPrivileges(absPath, principals, privileges); @@ -102,7 +102,7 @@ public class JackrabbitAccessControlMana public Privilege[] getPrivileges(final String absPath, final Set<Principal> principals) throws RepositoryException { return delegate.perform(new SessionOperation<Privilege[]>("getPrivileges") { - @Nonnull + @NotNull @Override public Privilege[] perform() throws RepositoryException { return jackrabbitACManager.getPrivileges(absPath, principals); Modified: jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/NodeDelegate.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/NodeDelegate.java?rev=1846023&r1=1846022&r2=1846023&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/NodeDelegate.java (original) +++ jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/NodeDelegate.java Wed Nov 7 14:10:06 2018 @@ -62,8 +62,6 @@ import java.util.Iterator; import java.util.List; import java.util.Set; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; import javax.jcr.InvalidItemStateException; import javax.jcr.ItemNotFoundException; import javax.jcr.RepositoryException; @@ -87,6 +85,8 @@ import org.apache.jackrabbit.oak.plugins import org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants; import org.apache.jackrabbit.oak.plugins.tree.TreeUtil; import org.apache.jackrabbit.value.ValueHelper; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * {@code NodeDelegate} serve as internal representations of {@code Node}s. @@ -105,19 +105,19 @@ public class NodeDelegate extends ItemDe } @Override - @Nonnull + @NotNull public String getName() { return tree.getName(); } @Override - @Nonnull + @NotNull public String getPath() { return tree.getPath(); } @Override - @CheckForNull + @Nullable public NodeDelegate getParent() { return tree.isRoot() || !tree.getParent().exists() ? null @@ -130,12 +130,12 @@ public class NodeDelegate extends ItemDe } @Override - @CheckForNull + @Nullable public Status getStatus() { return tree.getStatus(); } - @Nonnull + @NotNull public String getIdentifier() throws InvalidItemStateException { return IdentifierManager.getIdentifier(getTree()); } @@ -248,7 +248,7 @@ public class NodeDelegate extends ItemDe * @return property at the path given by {@code relPath} or {@code null} if * no such property exists */ - @CheckForNull + @Nullable public PropertyDelegate getPropertyOrNull(String relPath) throws RepositoryException { Tree parent = tree; @@ -279,7 +279,7 @@ public class NodeDelegate extends ItemDe * @param relPath oak path * @return property at the path given by {@code relPath}. */ - @Nonnull + @NotNull public PropertyDelegate getProperty(String relPath) throws RepositoryException { Tree parent = tree; String name = relPath; @@ -298,7 +298,7 @@ public class NodeDelegate extends ItemDe * * @return properties of the node */ - @Nonnull + @NotNull public Iterator<PropertyDelegate> getProperties() throws InvalidItemStateException { return transform(getTree().getProperties().iterator(), new Function<PropertyState, PropertyDelegate>() { @@ -331,7 +331,7 @@ public class NodeDelegate extends ItemDe * @return node at the path given by {@code relPath} or {@code null} if * no such node exists */ - @CheckForNull + @Nullable public NodeDelegate getChild(String relPath) throws RepositoryException { if (relPath.isEmpty()) { return this; @@ -347,7 +347,7 @@ public class NodeDelegate extends ItemDe * * @return child nodes of the node */ - @Nonnull + @NotNull public Iterator<NodeDelegate> getChildren() throws InvalidItemStateException { Iterator<Tree> iterator = getTree().getChildren().iterator(); return transform( @@ -496,7 +496,7 @@ public class NodeDelegate extends ItemDe * * @return the set property */ - @Nonnull + @NotNull public PropertyDelegate setProperty( PropertyState propertyState, boolean exactTypeMatch, boolean setProtected) throws RepositoryException { @@ -681,7 +681,7 @@ public class NodeDelegate extends ItemDe * or {@code null} if a default type should be used * @return the added node or {@code null} if such a node already exists */ - @CheckForNull + @Nullable public NodeDelegate addChild(String name, String typeName) throws RepositoryException { Tree tree = getTree(); @@ -725,7 +725,7 @@ public class NodeDelegate extends ItemDe return getLock() != null; } - @CheckForNull + @Nullable public NodeDelegate getLock() { Tree lock = findLock(tree, false); if (lock != null) { @@ -741,8 +741,8 @@ public class NodeDelegate extends ItemDe return null; } - @CheckForNull - private Tree findLock(@Nonnull Tree tree, boolean deep) { + @Nullable + private Tree findLock(@NotNull Tree tree, boolean deep) { if (holdsLock(tree, deep)) { return tree; } else if (tree.isRoot()) { @@ -760,8 +760,8 @@ public class NodeDelegate extends ItemDe && (!deep || property.getValue(BOOLEAN)); } - @CheckForNull - private Tree findDescendantLock(@Nonnull Tree tree) { + @Nullable + private Tree findDescendantLock(@NotNull Tree tree) { for (Tree child : tree.getChildren()) { if (holdsLock(child, false)) { return child; @@ -879,7 +879,7 @@ public class NodeDelegate extends ItemDe //------------------------------------------------------------< internal >--- - @Nonnull // FIXME this should be package private. OAK-672 + @NotNull // FIXME this should be package private. OAK-672 public Tree getTree() throws InvalidItemStateException { if (!tree.exists()) { throw new InvalidItemStateException("Item is stale " + tree.getPath()); Modified: jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/PrincipalManagerDelegator.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/PrincipalManagerDelegator.java?rev=1846023&r1=1846022&r2=1846023&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/PrincipalManagerDelegator.java (original) +++ jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/PrincipalManagerDelegator.java Wed Nov 7 14:10:06 2018 @@ -21,12 +21,12 @@ package org.apache.jackrabbit.oak.jcr.de import java.security.Principal; -import javax.annotation.Nonnull; import javax.jcr.RepositoryException; import org.apache.jackrabbit.api.security.principal.PrincipalIterator; import org.apache.jackrabbit.api.security.principal.PrincipalManager; import org.apache.jackrabbit.oak.jcr.session.operation.SessionOperation; +import org.jetbrains.annotations.NotNull; /** * This implementation of {@code PrincipalManager} delegates back to a @@ -47,7 +47,7 @@ public class PrincipalManagerDelegator i @Override public boolean hasPrincipal(final String principalName) { return delegate.safePerform(new SessionOperation<Boolean>("hasPrincipal") { - @Nonnull + @NotNull @Override public Boolean perform() { return principalManager.hasPrincipal(principalName); @@ -72,7 +72,7 @@ public class PrincipalManagerDelegator i @Override public PrincipalIterator findPrincipals(final String simpleFilter) { return delegate.safePerform(new SessionOperation<PrincipalIterator>("findPrincipals") { - @Nonnull + @NotNull @Override public PrincipalIterator perform() { return principalManager.findPrincipals(simpleFilter); @@ -83,7 +83,7 @@ public class PrincipalManagerDelegator i @Override public PrincipalIterator findPrincipals(final String simpleFilter, final int searchType) { return delegate.safePerform(new SessionOperation<PrincipalIterator>("findPrincipals") { - @Nonnull + @NotNull @Override public PrincipalIterator perform() { return principalManager.findPrincipals(simpleFilter, searchType); @@ -94,7 +94,7 @@ public class PrincipalManagerDelegator i @Override public PrincipalIterator getPrincipals(final int searchType) { return delegate.safePerform(new SessionOperation<PrincipalIterator>("getPrincipals") { - @Nonnull + @NotNull @Override public PrincipalIterator perform() { return principalManager.getPrincipals(searchType); @@ -105,7 +105,7 @@ public class PrincipalManagerDelegator i @Override public PrincipalIterator getGroupMembership(final Principal principal) { return delegate.safePerform(new SessionOperation<PrincipalIterator>("getGroupMembership") { - @Nonnull + @NotNull @Override public PrincipalIterator perform() { return principalManager.getGroupMembership(principal); @@ -116,7 +116,7 @@ public class PrincipalManagerDelegator i @Override public Principal getEveryone() { return delegate.safePerform(new SessionOperation<Principal>("getEveryone") { - @Nonnull + @NotNull @Override public Principal perform() { return principalManager.getEveryone(); Modified: jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/PrivilegeManagerDelegator.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/PrivilegeManagerDelegator.java?rev=1846023&r1=1846022&r2=1846023&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/PrivilegeManagerDelegator.java (original) +++ jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/PrivilegeManagerDelegator.java Wed Nov 7 14:10:06 2018 @@ -19,7 +19,6 @@ package org.apache.jackrabbit.oak.jcr.delegate; -import javax.annotation.Nonnull; import javax.jcr.AccessDeniedException; import javax.jcr.NamespaceException; import javax.jcr.RepositoryException; @@ -28,6 +27,7 @@ import javax.jcr.security.Privilege; import org.apache.jackrabbit.api.security.authorization.PrivilegeManager; import org.apache.jackrabbit.oak.jcr.session.operation.SessionOperation; +import org.jetbrains.annotations.NotNull; /** * This implementation of {@code PrivilegeManager} delegates back to a @@ -47,7 +47,7 @@ public class PrivilegeManagerDelegator i @Override public Privilege[] getRegisteredPrivileges() throws RepositoryException { return delegate.perform(new SessionOperation<Privilege[]>("getRegisteredPrivileges") { - @Nonnull + @NotNull @Override public Privilege[] perform() throws RepositoryException { return pm.getRegisteredPrivileges(); @@ -58,7 +58,7 @@ public class PrivilegeManagerDelegator i @Override public Privilege getPrivilege(final String privilegeName) throws AccessControlException, RepositoryException { return delegate.perform(new SessionOperation<Privilege>("getPrivilege") { - @Nonnull + @NotNull @Override public Privilege perform() throws RepositoryException { return pm.getPrivilege(privilegeName); @@ -69,7 +69,7 @@ public class PrivilegeManagerDelegator i @Override public Privilege registerPrivilege(final String privilegeName, final boolean isAbstract, final String[] declaredAggregateNames) throws AccessDeniedException, NamespaceException, RepositoryException { return delegate.perform(new SessionOperation<Privilege>("registerPrivilege", true) { - @Nonnull + @NotNull @Override public Privilege perform() throws RepositoryException { return pm.registerPrivilege(privilegeName, isAbstract, declaredAggregateNames); Modified: jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/PropertyDelegate.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/PropertyDelegate.java?rev=1846023&r1=1846022&r2=1846023&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/PropertyDelegate.java (original) +++ jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/PropertyDelegate.java Wed Nov 7 14:10:06 2018 @@ -19,8 +19,6 @@ package org.apache.jackrabbit.oak.jcr.de import static com.google.common.base.Objects.toStringHelper; import static com.google.common.base.Preconditions.checkNotNull; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; import javax.jcr.InvalidItemStateException; import javax.jcr.ValueFormatException; @@ -29,6 +27,8 @@ import org.apache.jackrabbit.oak.api.Tre import org.apache.jackrabbit.oak.api.Tree.Status; import org.apache.jackrabbit.oak.api.Type; import org.apache.jackrabbit.oak.commons.PathUtils; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * {@code PropertyDelegate} serve as internal representations of {@code Property}s. @@ -41,10 +41,10 @@ public class PropertyDelegate extends It /** The underlying {@link org.apache.jackrabbit.oak.api.Tree} of this property's parent */ private final Tree parent; - @Nonnull + @NotNull private final String name; - @CheckForNull + @Nullable private PropertyState state; PropertyDelegate(SessionDelegate sessionDelegate, Tree parent, String name) { @@ -65,17 +65,17 @@ public class PropertyDelegate extends It state = parent.getProperty(name); } - @Override @Nonnull + @Override @NotNull public String getName() { return name; } - @Override @Nonnull + @Override @NotNull public String getPath() { return PathUtils.concat(parent.getPath(), name); } - @Override @CheckForNull + @Override @Nullable public NodeDelegate getParent() { return parent.exists() ? new NodeDelegate(sessionDelegate, parent) : null; } @@ -85,7 +85,7 @@ public class PropertyDelegate extends It return state != null; } - @Override @CheckForNull + @Override @Nullable public Status getStatus() { return parent.getPropertyStatus(name); } @@ -95,7 +95,7 @@ public class PropertyDelegate extends It return getParent().isProtected(name); } - @Nonnull + @NotNull public PropertyState getPropertyState() throws InvalidItemStateException { if (state != null) { return state; @@ -105,7 +105,7 @@ public class PropertyDelegate extends It } } - @Nonnull + @NotNull public PropertyState getSingleState() throws InvalidItemStateException, ValueFormatException { PropertyState p = getPropertyState(); if (p.isArray()) { @@ -126,7 +126,7 @@ public class PropertyDelegate extends It return getSingleState().getValue(Type.DATE); } - @Nonnull + @NotNull public PropertyState getMultiState() throws InvalidItemStateException, ValueFormatException { PropertyState p = getPropertyState(); if (!p.isArray()) { @@ -135,7 +135,7 @@ public class PropertyDelegate extends It return p; } - public void setState(@Nonnull PropertyState propertyState) { + public void setState(@NotNull PropertyState propertyState) { parent.setProperty(propertyState); } Modified: jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/SessionDelegate.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/SessionDelegate.java?rev=1846023&r1=1846022&r2=1846023&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/SessionDelegate.java (original) +++ jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/SessionDelegate.java Wed Nov 7 14:10:06 2018 @@ -33,9 +33,6 @@ import java.util.concurrent.locks.Condit import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; import javax.jcr.ItemExistsException; import javax.jcr.PathNotFoundException; import javax.jcr.RepositoryException; @@ -65,6 +62,8 @@ import org.apache.jackrabbit.oak.stats.C import org.apache.jackrabbit.oak.stats.StatisticManager; import org.apache.jackrabbit.oak.stats.MeterStats; import org.apache.jackrabbit.oak.stats.TimerStats; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -130,12 +129,12 @@ public class SessionDelegate { * @param statisticManager the statistics manager for tracking session operations */ public SessionDelegate( - @Nonnull ContentSession contentSession, - @Nonnull SecurityProvider securityProvider, - @Nonnull RefreshStrategy refreshStrategy, - @Nonnull ThreadLocal<Long> threadSaveCount, - @Nonnull StatisticManager statisticManager, - @Nonnull Clock clock) { + @NotNull ContentSession contentSession, + @NotNull SecurityProvider securityProvider, + @NotNull RefreshStrategy refreshStrategy, + @NotNull ThreadLocal<Long> threadSaveCount, + @NotNull StatisticManager statisticManager, + @NotNull Clock clock) { this.contentSession = checkNotNull(contentSession); this.securityProvider = checkNotNull(securityProvider); this.root = contentSession.getLatestRoot(); @@ -156,7 +155,7 @@ public class SessionDelegate { writeDuration = statisticManager.getTimer(SESSION_WRITE_DURATION); } - @Nonnull + @NotNull public SessionStats getSessionStats() { return sessionStats; } @@ -193,8 +192,8 @@ public class SessionDelegate { * @throws RepositoryException * @see #getRoot() */ - @Nonnull - public <T> T perform(@Nonnull SessionOperation<T> sessionOperation) throws RepositoryException { + @NotNull + public <T> T perform(@NotNull SessionOperation<T> sessionOperation) throws RepositoryException { long t0 = clock.getTime(); // Acquire the exclusive lock for accessing session internals. @@ -229,7 +228,7 @@ public class SessionDelegate { * @see #perform(org.apache.jackrabbit.oak.jcr.session.operation.SessionOperation) */ @Nullable - public <T> T performNullable(@Nonnull SessionOperation<T> sessionOperation) throws RepositoryException { + public <T> T performNullable(@NotNull SessionOperation<T> sessionOperation) throws RepositoryException { long t0 = clock.getTime(); // Acquire the exclusive lock for accessing session internals. @@ -300,7 +299,7 @@ public class SessionDelegate { } } - @Nonnull + @NotNull public ContentSession getContentSession() { return contentSession; } @@ -383,7 +382,7 @@ public class SessionDelegate { } } - @Nonnull + @NotNull public AuthInfo getAuthInfo() { return contentSession.getAuthInfo(); } @@ -405,12 +404,12 @@ public class SessionDelegate { } } - @Nonnull + @NotNull public IdentifierManager getIdManager() { return idManager; } - @CheckForNull + @Nullable public NodeDelegate getRootNode() { return getNode("/"); } @@ -421,7 +420,7 @@ public class SessionDelegate { * @return The {@code NodeDelegate} at {@code path} or {@code null} if * none exists or not accessible. */ - @CheckForNull + @Nullable public NodeDelegate getNode(String path) { Tree tree = root.getTree(path); return tree.exists() ? new NodeDelegate(this, tree) : null; @@ -433,7 +432,7 @@ public class SessionDelegate { * @param path Oak path * @return node or property delegate, or {@code null} if none exists */ - @CheckForNull + @Nullable public ItemDelegate getItem(String path) { String name = PathUtils.getName(path); if (name.isEmpty()) { @@ -452,7 +451,7 @@ public class SessionDelegate { } } - @CheckForNull + @Nullable public NodeDelegate getNodeByIdentifier(String id) { Tree tree = idManager.getTree(id); return (tree == null || !tree.exists()) ? null : new NodeDelegate(this, tree); @@ -464,7 +463,7 @@ public class SessionDelegate { * @return The {@code PropertyDelegate} at {@code path} or {@code null} if * none exists or not accessible. */ - @CheckForNull + @Nullable public PropertyDelegate getProperty(String path) { Tree parent = root.getTree(PathUtils.getParentPath(path)); String name = PathUtils.getName(path); @@ -514,7 +513,7 @@ public class SessionDelegate { //----------------------------------------------------------< Workspace >--- - @Nonnull + @NotNull public String getWorkspaceName() { return contentSession.getWorkspaceName(); } @@ -566,12 +565,12 @@ public class SessionDelegate { } } - @Nonnull + @NotNull public QueryEngine getQueryEngine() { return root.getQueryEngine(); } - @Nonnull + @NotNull public PermissionProvider getPermissionProvider() { if (permissionProvider == null) { permissionProvider = checkNotNull(securityProvider) @@ -589,7 +588,7 @@ public class SessionDelegate { * * @return current root */ - @Nonnull + @NotNull public Root getRoot() { return root; } @@ -600,7 +599,7 @@ public class SessionDelegate { } //-----------------------------------------------------------< internal >--- - private void prePerform(@Nonnull SessionOperation<?> op, long t0) throws RepositoryException { + private void prePerform(@NotNull SessionOperation<?> op, long t0) throws RepositoryException { if (sessionOpCount == 0) { // Refresh and precondition checks only for non re-entrant // session operations. Don't refresh if this operation is a @@ -616,7 +615,7 @@ public class SessionDelegate { } } - private void postPerform(@Nonnull SessionOperation<?> op, long t0) { + private void postPerform(@NotNull SessionOperation<?> op, long t0) { sessionCounters.accessTime = t0; long dt = NANOSECONDS.convert(clock.getTime() - t0, MILLISECONDS); sessionOpCount--; @@ -799,7 +798,7 @@ public class SessionDelegate { } @Override - public boolean tryLock(long time, @Nonnull TimeUnit unit) throws InterruptedException { + public boolean tryLock(long time, @NotNull TimeUnit unit) throws InterruptedException { if (lock.tryLock(time, unit)) { holderTrace = null; holderThread = null; @@ -814,7 +813,7 @@ public class SessionDelegate { lock.unlock(); } - @Nonnull + @NotNull @Override public Condition newCondition() { return lock.newCondition(); Modified: jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/UserDelegator.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/UserDelegator.java?rev=1846023&r1=1846022&r2=1846023&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/UserDelegator.java (original) +++ jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/UserDelegator.java Wed Nov 7 14:10:06 2018 @@ -19,13 +19,13 @@ package org.apache.jackrabbit.oak.jcr.delegate; -import javax.annotation.Nonnull; import javax.jcr.Credentials; import javax.jcr.RepositoryException; import org.apache.jackrabbit.api.security.user.Impersonation; import org.apache.jackrabbit.api.security.user.User; import org.apache.jackrabbit.oak.jcr.session.operation.SessionOperation; +import org.jetbrains.annotations.NotNull; /** * This implementation of {@code User} delegates back to a @@ -47,8 +47,8 @@ final class UserDelegator extends Author } } - @Nonnull - static User unwrap(@Nonnull User user) { + @NotNull + static User unwrap(@NotNull User user) { if (user instanceof UserDelegator) { return ((UserDelegator) user).getDelegate(); } else { @@ -64,7 +64,7 @@ final class UserDelegator extends Author @Override public boolean isAdmin() { return sessionDelegate.safePerform(new SessionOperation<Boolean>("isAdmin") { - @Nonnull + @NotNull @Override public Boolean perform() { return getDelegate().isAdmin(); @@ -75,7 +75,7 @@ final class UserDelegator extends Author @Override public boolean isSystemUser() { return sessionDelegate.safePerform(new SessionOperation<Boolean>("isSystemUser") { - @Nonnull + @NotNull @Override public Boolean perform() { return getDelegate().isSystemUser(); @@ -86,7 +86,7 @@ final class UserDelegator extends Author @Override public Credentials getCredentials() { return sessionDelegate.safePerform(new SessionOperation<Credentials>("getCredentials") { - @Nonnull + @NotNull @Override public Credentials perform() throws RepositoryException { return getDelegate().getCredentials(); @@ -97,7 +97,7 @@ final class UserDelegator extends Author @Override public Impersonation getImpersonation() { return sessionDelegate.safePerform(new SessionOperation<Impersonation>("getImpersonation") { - @Nonnull + @NotNull @Override public Impersonation perform() throws RepositoryException { Impersonation impersonation = getDelegate().getImpersonation(); @@ -139,7 +139,7 @@ final class UserDelegator extends Author @Override public boolean isDisabled() throws RepositoryException { return sessionDelegate.perform(new SessionOperation<Boolean>("isDisabled") { - @Nonnull + @NotNull @Override public Boolean perform() throws RepositoryException { return getDelegate().isDisabled(); Modified: jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/UserManagerDelegator.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/UserManagerDelegator.java?rev=1846023&r1=1846022&r2=1846023&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/UserManagerDelegator.java (original) +++ jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/UserManagerDelegator.java Wed Nov 7 14:10:06 2018 @@ -24,8 +24,6 @@ import static com.google.common.base.Pre import java.security.Principal; import java.util.Iterator; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; import javax.jcr.RepositoryException; import com.google.common.base.Function; @@ -38,6 +36,8 @@ import org.apache.jackrabbit.api.securit import org.apache.jackrabbit.api.security.user.UserManager; import org.apache.jackrabbit.oak.jcr.session.operation.UserManagerOperation; import org.apache.jackrabbit.oak.spi.security.user.util.UserUtil; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * This implementation of {@code UserManager} delegates back to a @@ -105,7 +105,7 @@ public class UserManagerDelegator implem @Override public Iterator<Authorizable> findAuthorizables(final String relPath, final String value) throws RepositoryException { return sessionDelegate.perform(new UserManagerOperation<Iterator<Authorizable>>(sessionDelegate, "findAuthorizables") { - @Nonnull + @NotNull @Override public Iterator<Authorizable> perform() throws RepositoryException { Iterator<Authorizable> authorizables = userManagerDelegate.findAuthorizables(relPath, value); @@ -123,7 +123,7 @@ public class UserManagerDelegator implem @Override public Iterator<Authorizable> findAuthorizables(final String relPath, final String value, final int searchType) throws RepositoryException { return sessionDelegate.perform(new UserManagerOperation<Iterator<Authorizable>>(sessionDelegate, "findAuthorizables") { - @Nonnull + @NotNull @Override public Iterator<Authorizable> perform() throws RepositoryException { Iterator<Authorizable> authorizables = userManagerDelegate.findAuthorizables(relPath, value, searchType); @@ -141,7 +141,7 @@ public class UserManagerDelegator implem @Override public Iterator<Authorizable> findAuthorizables(final Query query) throws RepositoryException { return sessionDelegate.perform(new UserManagerOperation<Iterator<Authorizable>>(sessionDelegate, "findAuthorizables") { - @Nonnull + @NotNull @Override public Iterator<Authorizable> perform() throws RepositoryException { Iterator<Authorizable> authorizables = userManagerDelegate.findAuthorizables(query); @@ -159,7 +159,7 @@ public class UserManagerDelegator implem @Override public User createUser(final String userID, final String password) throws AuthorizableExistsException, RepositoryException { return sessionDelegate.perform(new UserManagerOperation<User>(sessionDelegate, "createUser", true) { - @Nonnull + @NotNull @Override public User perform() throws RepositoryException { User user = userManagerDelegate.createUser(userID, password); @@ -171,7 +171,7 @@ public class UserManagerDelegator implem @Override public User createUser(final String userID, final String password, final Principal principal, final String intermediatePath) throws RepositoryException { return sessionDelegate.perform(new UserManagerOperation<User>(sessionDelegate, "createUser", true) { - @Nonnull + @NotNull @Override public User perform() throws RepositoryException { User user = userManagerDelegate.createUser(userID, password, principal, intermediatePath); @@ -183,7 +183,7 @@ public class UserManagerDelegator implem @Override public User createSystemUser(final String userID, final String intermediatePath) throws RepositoryException { return sessionDelegate.perform(new UserManagerOperation<User>(sessionDelegate, "createUser", true) { - @Nonnull + @NotNull @Override public User perform() throws RepositoryException { User user = userManagerDelegate.createSystemUser(userID, intermediatePath); @@ -195,7 +195,7 @@ public class UserManagerDelegator implem @Override public Group createGroup(final String groupID) throws RepositoryException { return sessionDelegate.perform(new UserManagerOperation<Group>(sessionDelegate, "createGroup", true) { - @Nonnull + @NotNull @Override public Group perform() throws RepositoryException { Group group = userManagerDelegate.createGroup(groupID); @@ -207,7 +207,7 @@ public class UserManagerDelegator implem @Override public Group createGroup(final Principal principal) throws RepositoryException { return sessionDelegate.perform(new UserManagerOperation<Group>(sessionDelegate, "createGroup", true) { - @Nonnull + @NotNull @Override public Group perform() throws RepositoryException { Group group = userManagerDelegate.createGroup(principal); @@ -219,7 +219,7 @@ public class UserManagerDelegator implem @Override public Group createGroup(final Principal principal, final String intermediatePath) throws RepositoryException { return sessionDelegate.perform(new UserManagerOperation<Group>(sessionDelegate, "createGroup", true) { - @Nonnull + @NotNull @Override public Group perform() throws RepositoryException { Group group = userManagerDelegate.createGroup(principal, intermediatePath); @@ -231,7 +231,7 @@ public class UserManagerDelegator implem @Override public Group createGroup(final String groupID, final Principal principal, final String intermediatePath) throws RepositoryException { return sessionDelegate.perform(new UserManagerOperation<Group>(sessionDelegate, "createGroup", true) { - @Nonnull + @NotNull @Override public Group perform() throws RepositoryException { Group group = userManagerDelegate.createGroup(groupID, principal, intermediatePath); @@ -243,7 +243,7 @@ public class UserManagerDelegator implem @Override public boolean isAutoSave() { return sessionDelegate.safePerform(new UserManagerOperation<Boolean>(sessionDelegate, "isAutoSave") { - @Nonnull + @NotNull @Override public Boolean perform() { return userManagerDelegate.isAutoSave(); Modified: jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/VersionDelegate.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/VersionDelegate.java?rev=1846023&r1=1846022&r2=1846023&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/VersionDelegate.java (original) +++ jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/VersionDelegate.java Wed Nov 7 14:10:06 2018 @@ -21,13 +21,13 @@ import java.util.List; import static com.google.common.base.Preconditions.checkNotNull; import static org.apache.jackrabbit.JcrConstants.JCR_PREDECESSORS; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; import javax.jcr.RepositoryException; import org.apache.jackrabbit.JcrConstants; import org.apache.jackrabbit.oak.api.Tree; import org.apache.jackrabbit.oak.api.Type; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import com.google.common.collect.Lists; @@ -40,12 +40,12 @@ public class VersionDelegate extends Nod super(checkNotNull(sessionDelegate), checkNotNull(tree)); } - static VersionDelegate create(@Nonnull SessionDelegate sessionDelegate, - @Nonnull Tree tree) { + static VersionDelegate create(@NotNull SessionDelegate sessionDelegate, + @NotNull Tree tree) { return new VersionDelegate(sessionDelegate, tree); } - @Nonnull + @NotNull NodeDelegate getFrozenNode() throws RepositoryException { NodeDelegate frozenNode = getChild(JcrConstants.JCR_FROZENNODE); if (frozenNode == null) { @@ -55,7 +55,7 @@ public class VersionDelegate extends Nod return frozenNode; } - @Nonnull + @NotNull public Iterable<VersionDelegate> getPredecessors() throws RepositoryException { PropertyDelegate p = getPropertyOrNull(JCR_PREDECESSORS); @@ -71,7 +71,7 @@ public class VersionDelegate extends Nod return predecessors; } - @CheckForNull + @Nullable public VersionDelegate getLinearPredecessor() throws RepositoryException { Iterable<VersionDelegate> predecessors = getPredecessors(); if (predecessors.iterator().hasNext()) {