Author: reschke Date: Wed Nov 7 14:39:07 2018 New Revision: 1846036 URL: http://svn.apache.org/viewvc?rev=1846036&view=rev Log: OAK-7669: OAK-7511: get rid of JSR 305 dependency - use jetbrains nullability annotations instead - oak-store-composite
Modified: jackrabbit/oak/branches/1.8/ (props changed) jackrabbit/oak/branches/1.8/oak-store-composite/pom.xml jackrabbit/oak/branches/1.8/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CommitHookEnhancer.java jackrabbit/oak/branches/1.8/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/PrivateStoreValidatorProvider.java jackrabbit/oak/branches/1.8/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/package-info.java jackrabbit/oak/branches/1.8/oak-store-composite/src/test/java/org/apache/jackrabbit/oak/composite/CompositeChildrenCountTest.java Propchange: jackrabbit/oak/branches/1.8/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Nov 7 14:39:07 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-1836187,1836189-1836192,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-1836187,1836189-1836193,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-store-composite/pom.xml URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-composite/pom.xml?rev=1846036&r1=1846035&r2=1846036&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-store-composite/pom.xml (original) +++ jackrabbit/oak/branches/1.8/oak-store-composite/pom.xml Wed Nov 7 14:39:07 2018 @@ -125,10 +125,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-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CommitHookEnhancer.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CommitHookEnhancer.java?rev=1846036&r1=1846035&r2=1846036&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CommitHookEnhancer.java (original) +++ jackrabbit/oak/branches/1.8/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CommitHookEnhancer.java Wed Nov 7 14:39:07 2018 @@ -21,11 +21,10 @@ import org.apache.jackrabbit.oak.spi.com import org.apache.jackrabbit.oak.spi.commit.CommitInfo; import org.apache.jackrabbit.oak.spi.state.ApplyDiff; import org.apache.jackrabbit.oak.spi.state.NodeState; +import org.jetbrains.annotations.NotNull; -import javax.annotation.Nonnull; import java.util.Map; import java.util.Optional; - import static com.google.common.collect.Maps.newHashMap; class CommitHookEnhancer implements CommitHook { @@ -44,7 +43,7 @@ class CommitHookEnhancer implements Comm this.hook = hook; } - @Nonnull + @NotNull @Override public NodeState processCommit(NodeState before, NodeState after, CommitInfo info) throws CommitFailedException { Map<MountedNodeStore, NodeState> beforeStates = newHashMap(); Modified: jackrabbit/oak/branches/1.8/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/PrivateStoreValidatorProvider.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/PrivateStoreValidatorProvider.java?rev=1846036&r1=1846035&r2=1846036&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/PrivateStoreValidatorProvider.java (original) +++ jackrabbit/oak/branches/1.8/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/PrivateStoreValidatorProvider.java Wed Nov 7 14:39:07 2018 @@ -26,14 +26,13 @@ import org.apache.jackrabbit.oak.spi.mou import org.apache.jackrabbit.oak.spi.mount.MountInfoProvider; import org.apache.jackrabbit.oak.spi.mount.Mounts; import org.apache.jackrabbit.oak.spi.state.NodeState; +import org.jetbrains.annotations.NotNull; import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceRegistration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.annotation.Nonnull; import java.util.Map; - /** * {@link Validator} which detects change commits to the read only mounts. */ @@ -55,7 +54,7 @@ public class PrivateStoreValidatorProvid private ServiceRegistration serviceRegistration; - @Nonnull + @NotNull public Validator getRootValidator(NodeState before, NodeState after, CommitInfo info) { return new PrivateStoreValidator(ROOT_PATH); } Modified: jackrabbit/oak/branches/1.8/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/package-info.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/package-info.java?rev=1846036&r1=1846035&r2=1846036&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/package-info.java (original) +++ jackrabbit/oak/branches/1.8/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/package-info.java Wed Nov 7 14:39:07 2018 @@ -55,7 +55,7 @@ * This is obviously correct but may be slow. * {@link org.apache.jackrabbit.oak.composite.CompositionContext#getContributingStores(java.lang.String, java.util.function.Function)} */ -@Version("0.2.0") +@Version("0.2.1") package org.apache.jackrabbit.oak.composite; -import org.osgi.annotation.versioning.Version; \ No newline at end of file +import org.osgi.annotation.versioning.Version; Modified: jackrabbit/oak/branches/1.8/oak-store-composite/src/test/java/org/apache/jackrabbit/oak/composite/CompositeChildrenCountTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-composite/src/test/java/org/apache/jackrabbit/oak/composite/CompositeChildrenCountTest.java?rev=1846036&r1=1846035&r2=1846036&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-store-composite/src/test/java/org/apache/jackrabbit/oak/composite/CompositeChildrenCountTest.java (original) +++ jackrabbit/oak/branches/1.8/oak-store-composite/src/test/java/org/apache/jackrabbit/oak/composite/CompositeChildrenCountTest.java Wed Nov 7 14:39:07 2018 @@ -35,11 +35,10 @@ import org.apache.jackrabbit.oak.spi.sta import org.apache.jackrabbit.oak.spi.state.NodeState; import org.apache.jackrabbit.oak.spi.state.NodeStore; import org.apache.jackrabbit.oak.spi.state.ReadOnlyBuilder; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.junit.Test; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import java.util.List; import java.util.Map; @@ -202,24 +201,24 @@ public class CompositeChildrenCountTest return true; } - @Nonnull + @NotNull @Override public Iterable<? extends PropertyState> getProperties() { return emptyList(); } @Override - public boolean hasChildNode(@Nonnull String name) { + public boolean hasChildNode(@NotNull String name) { return false; } - @Nonnull + @NotNull @Override - public NodeState getChildNode(@Nonnull String name) throws IllegalArgumentException { + public NodeState getChildNode(@NotNull String name) throws IllegalArgumentException { return EmptyNodeState.MISSING_NODE; } - @Nonnull + @NotNull @Override public Iterable<? extends ChildNodeEntry> getChildNodeEntries() { if (children == null) { @@ -241,7 +240,7 @@ public class CompositeChildrenCountTest return childrenCount; } - @Nonnull + @NotNull @Override public NodeBuilder builder() { return new MemoryNodeBuilder(this);