Author: reschke Date: Wed Nov 7 14:48:58 2018 New Revision: 1846038 URL: http://svn.apache.org/viewvc?rev=1846038&view=rev Log: OAK-7669: OAK-7511: get rid of JSR 305 dependency - use jetbrains nullability annotations instead - oak-store-spi
Modified: jackrabbit/oak/branches/1.8/ (props changed) jackrabbit/oak/branches/1.8/oak-store-spi/pom.xml jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/AbstractBlob.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/ArrayBasedBlob.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/BinaryPropertyState.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/BooleanPropertyState.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/DecimalPropertyState.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/DoublePropertyState.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/EmptyNodeState.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/EmptyPropertyState.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/GenericPropertyState.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/LongPropertyState.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeBuilder.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeState.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeStore.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/ModifiedNodeState.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MultiPropertyState.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MutableNodeState.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/PropertyBuilder.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/PropertyStateValue.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/PropertyStates.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/PropertyValues.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/SinglePropertyState.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/StringBasedBlob.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/StringPropertyState.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/value/BinaryBasedBlob.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/value/jcr/BinaryImpl.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/value/jcr/ValueFactoryImpl.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/value/jcr/ValueImpl.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/cluster/ClusterRepositoryInfo.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/BackgroundObserver.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/ChangeDispatcher.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/CommitContext.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/CommitHook.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/CommitInfo.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/CompositeConflictHandler.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/CompositeEditor.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/CompositeEditorProvider.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/CompositeHook.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/CompositeObserver.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/ConflictHandler.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/DiffObserver.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/Editor.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/EditorDiff.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/EditorHook.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/EditorProvider.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/EmptyHook.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/EmptyObserver.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/MoveTracker.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/Observer.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/ObserverTracker.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/PartialConflictHandler.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/ProgressNotificationEditor.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/ResetCommitAttributeHook.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/SubtreeEditor.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/ThreeWayConflictHandler.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/Validator.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/ValidatorProvider.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/VisibleEditor.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/VisibleValidator.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/WhiteboardEditorProvider.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/filter/PathFilter.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/lifecycle/CompositeInitializer.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/lifecycle/CompositeWorkspaceInitializer.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/lifecycle/RepositoryInitializer.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/state/AbstractNodeState.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/state/ChildNodeEntry.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/state/Clusterable.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/state/MoveValidator.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/state/NodeBuilder.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/state/NodeState.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/state/NodeStateUtils.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/state/NodeStore.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/state/NodeStoreBranch.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/state/ProxyNodeStore.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/state/ReadOnlyBuilder.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/state/RevisionGC.java jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/state/RevisionGCMBean.java jackrabbit/oak/branches/1.8/oak-store-spi/src/test/java/org/apache/jackrabbit/oak/plugins/memory/AbstractBlobTest.java jackrabbit/oak/branches/1.8/oak-store-spi/src/test/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeBuilderTest.java jackrabbit/oak/branches/1.8/oak-store-spi/src/test/java/org/apache/jackrabbit/oak/plugins/memory/PropertyStateValueTest.java Propchange: jackrabbit/oak/branches/1.8/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Nov 7 14:48:58 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-1836194,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-1836195,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-spi/pom.xml URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-spi/pom.xml?rev=1846038&r1=1846037&r2=1846038&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-store-spi/pom.xml (original) +++ jackrabbit/oak/branches/1.8/oak-store-spi/pom.xml Wed Nov 7 14:48:58 2018 @@ -137,10 +137,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 --> @@ -156,4 +156,4 @@ </dependency> </dependencies> -</project> \ No newline at end of file +</project> Modified: jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/AbstractBlob.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/AbstractBlob.java?rev=1846038&r1=1846037&r2=1846038&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/AbstractBlob.java (original) +++ jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/AbstractBlob.java Wed Nov 7 14:48:58 2018 @@ -21,14 +21,13 @@ package org.apache.jackrabbit.oak.plugin import java.io.IOException; import java.io.InputStream; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; - import com.google.common.hash.HashCode; import com.google.common.hash.Hashing; import com.google.common.io.ByteSource; import org.apache.jackrabbit.oak.api.Blob; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * Abstract base class for {@link Blob} implementations. @@ -80,7 +79,7 @@ public abstract class AbstractBlob imple public long length() { return blob.length(); } - @Nonnull + @NotNull @Override public InputStream getNewStream() { return blob.getNewStream(); @@ -122,7 +121,7 @@ public abstract class AbstractBlob imple //--------------------------------------------------------------< Blob >-- - @Override @CheckForNull + @Override @Nullable public String getReference() { return null; } Modified: jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/ArrayBasedBlob.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/ArrayBasedBlob.java?rev=1846038&r1=1846037&r2=1846038&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/ArrayBasedBlob.java (original) +++ jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/ArrayBasedBlob.java Wed Nov 7 14:48:58 2018 @@ -21,7 +21,7 @@ package org.apache.jackrabbit.oak.plugin import java.io.ByteArrayInputStream; import java.io.InputStream; -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; /** * This {@code Blob} implementations is based on an array of bytes. @@ -33,7 +33,7 @@ public class ArrayBasedBlob extends Abst this.value = value; } - @Nonnull + @NotNull @Override public InputStream getNewStream() { return new ByteArrayInputStream(value); Modified: jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/BinaryPropertyState.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/BinaryPropertyState.java?rev=1846038&r1=1846037&r2=1846038&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/BinaryPropertyState.java (original) +++ jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/BinaryPropertyState.java Wed Nov 7 14:48:58 2018 @@ -18,7 +18,6 @@ package org.apache.jackrabbit.oak.plugin import static com.google.common.base.Preconditions.checkNotNull; -import javax.annotation.Nonnull; import javax.jcr.RepositoryException; import javax.jcr.Value; @@ -27,11 +26,12 @@ import org.apache.jackrabbit.oak.api.Pro import org.apache.jackrabbit.oak.api.Type; import org.apache.jackrabbit.oak.plugins.value.Conversions; import org.apache.jackrabbit.oak.plugins.value.Conversions.Converter; +import org.jetbrains.annotations.NotNull; public class BinaryPropertyState extends SinglePropertyState<Blob> { private final Blob value; - public BinaryPropertyState(@Nonnull String name, @Nonnull Blob value) { + public BinaryPropertyState(@NotNull String name, @NotNull Blob value) { super(name); this.value = checkNotNull(value); } @@ -43,7 +43,7 @@ public class BinaryPropertyState extends * @return The new property state of type {@link Type#BINARY} */ public static PropertyState binaryProperty( - @Nonnull String name, @Nonnull byte[] value) { + @NotNull String name, @NotNull byte[] value) { return new BinaryPropertyState( name, new ArrayBasedBlob(checkNotNull(value))); } @@ -55,7 +55,7 @@ public class BinaryPropertyState extends * @return The new property state of type {@link Type#BINARY} */ public static PropertyState binaryProperty( - @Nonnull String name, @Nonnull String value) { + @NotNull String name, @NotNull String value) { return new BinaryPropertyState( name, new StringBasedBlob(checkNotNull(value))); } @@ -67,7 +67,7 @@ public class BinaryPropertyState extends * @return The new property state of type {@link Type#BINARY} */ public static PropertyState binaryProperty( - @Nonnull String name, @Nonnull Blob value) { + @NotNull String name, @NotNull Blob value) { return new BinaryPropertyState(name, value); } @@ -78,7 +78,7 @@ public class BinaryPropertyState extends * @return The new property state of type {@link Type#BINARY} */ public static PropertyState binaryProperty( - @Nonnull String name, @Nonnull Value value) throws RepositoryException { + @NotNull String name, @NotNull Value value) throws RepositoryException { return new BinaryPropertyState(name, getBlob(value)); } Modified: jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/BooleanPropertyState.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/BooleanPropertyState.java?rev=1846038&r1=1846037&r2=1846038&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/BooleanPropertyState.java (original) +++ jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/BooleanPropertyState.java Wed Nov 7 14:48:58 2018 @@ -18,19 +18,18 @@ */ package org.apache.jackrabbit.oak.plugins.memory; -import javax.annotation.Nonnull; - import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.api.Type; import org.apache.jackrabbit.oak.plugins.value.Conversions; import org.apache.jackrabbit.oak.plugins.value.Conversions.Converter; +import org.jetbrains.annotations.NotNull; import static org.apache.jackrabbit.oak.api.Type.BOOLEAN; public class BooleanPropertyState extends SinglePropertyState<Boolean> { private final boolean value; - public BooleanPropertyState(@Nonnull String name, boolean value) { + public BooleanPropertyState(@NotNull String name, boolean value) { super(name); this.value = value; } @@ -42,7 +41,7 @@ public class BooleanPropertyState extend * @return The new property state of type {@link Type#BOOLEAN} */ public static PropertyState booleanProperty( - @Nonnull String name, boolean value) { + @NotNull String name, boolean value) { return new BooleanPropertyState(name, value); } Modified: jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/DecimalPropertyState.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/DecimalPropertyState.java?rev=1846038&r1=1846037&r2=1846038&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/DecimalPropertyState.java (original) +++ jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/DecimalPropertyState.java Wed Nov 7 14:48:58 2018 @@ -18,12 +18,11 @@ package org.apache.jackrabbit.oak.plugin import java.math.BigDecimal; -import javax.annotation.Nonnull; - import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.api.Type; import org.apache.jackrabbit.oak.plugins.value.Conversions; import org.apache.jackrabbit.oak.plugins.value.Conversions.Converter; +import org.jetbrains.annotations.NotNull; import static com.google.common.base.Preconditions.checkNotNull; import static org.apache.jackrabbit.oak.api.Type.DECIMAL; @@ -31,7 +30,7 @@ import static org.apache.jackrabbit.oak. public class DecimalPropertyState extends SinglePropertyState<BigDecimal> { private final BigDecimal value; - public DecimalPropertyState(@Nonnull String name, @Nonnull BigDecimal value) { + public DecimalPropertyState(@NotNull String name, @NotNull BigDecimal value) { super(name); this.value = checkNotNull(value); } @@ -43,7 +42,7 @@ public class DecimalPropertyState extend * @return The new property state of type {@link Type#DECIMAL} */ public static PropertyState decimalProperty( - @Nonnull String name, @Nonnull BigDecimal value) { + @NotNull String name, @NotNull BigDecimal value) { return new DecimalPropertyState(name, value); } Modified: jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/DoublePropertyState.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/DoublePropertyState.java?rev=1846038&r1=1846037&r2=1846038&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/DoublePropertyState.java (original) +++ jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/DoublePropertyState.java Wed Nov 7 14:48:58 2018 @@ -18,19 +18,18 @@ */ package org.apache.jackrabbit.oak.plugins.memory; -import javax.annotation.Nonnull; - import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.api.Type; import org.apache.jackrabbit.oak.plugins.value.Conversions; import org.apache.jackrabbit.oak.plugins.value.Conversions.Converter; +import org.jetbrains.annotations.NotNull; import static org.apache.jackrabbit.oak.api.Type.DOUBLE; public class DoublePropertyState extends SinglePropertyState<Double> { private final double value; - public DoublePropertyState(@Nonnull String name, double value) { + public DoublePropertyState(@NotNull String name, double value) { super(name); this.value = value; } @@ -42,7 +41,7 @@ public class DoublePropertyState extends * @return The new property state of type {@link Type#DOUBLE} */ public static PropertyState doubleProperty( - @Nonnull String name, double value) { + @NotNull String name, double value) { return new DoublePropertyState(name, value); } Modified: jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/EmptyNodeState.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/EmptyNodeState.java?rev=1846038&r1=1846037&r2=1846038&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/EmptyNodeState.java (original) +++ jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/EmptyNodeState.java Wed Nov 7 14:48:58 2018 @@ -19,14 +19,13 @@ package org.apache.jackrabbit.oak.plugin import static java.util.Collections.emptyList; import static org.apache.jackrabbit.oak.spi.state.AbstractNodeState.checkValidName; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; - import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.spi.state.ChildNodeEntry; import org.apache.jackrabbit.oak.spi.state.NodeBuilder; import org.apache.jackrabbit.oak.spi.state.NodeState; import org.apache.jackrabbit.oak.spi.state.NodeStateDiff; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * Singleton instances of empty and non-existent node states, i.e. ones @@ -55,17 +54,17 @@ public final class EmptyNodeState implem } @Override - public boolean hasProperty(@Nonnull String name) { + public boolean hasProperty(@NotNull String name) { return false; } - @Override @CheckForNull - public PropertyState getProperty(@Nonnull String name) { + @Override @Nullable + public PropertyState getProperty(@NotNull String name) { return null; } @Override - public boolean getBoolean(@Nonnull String name) { + public boolean getBoolean(@NotNull String name) { return false; } @@ -79,23 +78,23 @@ public final class EmptyNodeState implem return null; } - @Nonnull + @NotNull @Override - public Iterable<String> getStrings(@Nonnull String name) { + public Iterable<String> getStrings(@NotNull String name) { return emptyList(); } - @Override @CheckForNull - public String getName(@Nonnull String name) { + @Override @Nullable + public String getName(@NotNull String name) { return null; } - @Override @Nonnull - public Iterable<String> getNames(@Nonnull String name) { + @Override @NotNull + public Iterable<String> getNames(@NotNull String name) { return emptyList(); } - @Override @Nonnull + @Override @NotNull public Iterable<? extends PropertyState> getProperties() { return emptyList(); } @@ -106,12 +105,12 @@ public final class EmptyNodeState implem } @Override - public boolean hasChildNode(@Nonnull String name) { + public boolean hasChildNode(@NotNull String name) { return false; } - @Override @Nonnull - public NodeState getChildNode(@Nonnull String name) { + @Override @NotNull + public NodeState getChildNode(@NotNull String name) { checkValidName(name); return MISSING_NODE; } @@ -121,12 +120,12 @@ public final class EmptyNodeState implem return emptyList(); } - @Override @Nonnull + @Override @NotNull public Iterable<? extends ChildNodeEntry> getChildNodeEntries() { return emptyList(); } - @Override @Nonnull + @Override @NotNull public NodeBuilder builder() { return new MemoryNodeBuilder(this); } Modified: jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/EmptyPropertyState.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/EmptyPropertyState.java?rev=1846038&r1=1846037&r2=1846038&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/EmptyPropertyState.java (original) +++ jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/EmptyPropertyState.java Wed Nov 7 14:48:58 2018 @@ -20,10 +20,9 @@ package org.apache.jackrabbit.oak.plugin import java.util.Collections; -import javax.annotation.Nonnull; - import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.api.Type; +import org.jetbrains.annotations.NotNull; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; @@ -41,7 +40,7 @@ public abstract class EmptyPropertyState * Create a new property state with the given {@code name} * @param name The name of the property state. */ - protected EmptyPropertyState(@Nonnull String name) { + protected EmptyPropertyState(@NotNull String name) { this.name = checkNotNull(name); } @@ -63,7 +62,7 @@ public abstract class EmptyPropertyState }; } - @Nonnull + @NotNull @Override public String getName() { return name; @@ -82,7 +81,7 @@ public abstract class EmptyPropertyState * @throws IllegalArgumentException {@code type.isArray()} is {@code false}. */ @SuppressWarnings("unchecked") - @Nonnull + @NotNull @Override public <T> T getValue(Type<T> type) { checkArgument(type.isArray(), "Type must be an array type"); @@ -92,7 +91,7 @@ public abstract class EmptyPropertyState /** * @throws IndexOutOfBoundsException always */ - @Nonnull + @NotNull @Override public <T> T getValue(Type<T> type, int index) { throw new IndexOutOfBoundsException(String.valueOf(index)); Modified: jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/GenericPropertyState.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/GenericPropertyState.java?rev=1846038&r1=1846037&r2=1846038&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/GenericPropertyState.java (original) +++ jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/GenericPropertyState.java Wed Nov 7 14:48:58 2018 @@ -16,12 +16,11 @@ */ package org.apache.jackrabbit.oak.plugins.memory; -import javax.annotation.Nonnull; - import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.api.Type; import org.apache.jackrabbit.oak.plugins.value.Conversions; import org.apache.jackrabbit.oak.plugins.value.Conversions.Converter; +import org.jetbrains.annotations.NotNull; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; @@ -40,7 +39,7 @@ public class GenericPropertyState extend * @throws IllegalArgumentException if {@code type.isArray()} is {@code true} */ public GenericPropertyState( - @Nonnull String name, @Nonnull String value, @Nonnull Type<?> type) { + @NotNull String name, @NotNull String value, @NotNull Type<?> type) { super(name); this.value = checkNotNull(value); this.type = checkNotNull(type); Modified: jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/LongPropertyState.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/LongPropertyState.java?rev=1846038&r1=1846037&r2=1846038&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/LongPropertyState.java (original) +++ jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/LongPropertyState.java Wed Nov 7 14:48:58 2018 @@ -18,17 +18,16 @@ */ package org.apache.jackrabbit.oak.plugins.memory; -import javax.annotation.Nonnull; - import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.api.Type; import org.apache.jackrabbit.oak.plugins.value.Conversions; import org.apache.jackrabbit.oak.plugins.value.Conversions.Converter; +import org.jetbrains.annotations.NotNull; public class LongPropertyState extends SinglePropertyState<Long> { private final long value; - public LongPropertyState(@Nonnull String name, long value) { + public LongPropertyState(@NotNull String name, long value) { super(name); this.value = value; } @@ -40,7 +39,7 @@ public class LongPropertyState extends S * @return The new property state of type {@link Type#LONG} */ public static PropertyState createLongProperty( - @Nonnull String name, long value) { + @NotNull String name, long value) { return new LongPropertyState(name, value); } Modified: jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeBuilder.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeBuilder.java?rev=1846038&r1=1846037&r2=1846038&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeBuilder.java (original) +++ jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeBuilder.java Wed Nov 7 14:48:58 2018 @@ -35,9 +35,6 @@ import static org.apache.jackrabbit.oak. import java.io.IOException; import java.io.InputStream; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; - import com.google.common.base.Objects; import com.google.common.io.ByteStreams; import org.apache.jackrabbit.oak.api.Blob; @@ -48,6 +45,8 @@ import org.apache.jackrabbit.oak.spi.sta import org.apache.jackrabbit.oak.spi.state.MoveDetector; import org.apache.jackrabbit.oak.spi.state.NodeBuilder; import org.apache.jackrabbit.oak.spi.state.NodeState; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * In-memory node state builder. @@ -117,7 +116,7 @@ public class MemoryNodeBuilder implement * The base state of this builder, possibly non-existent if this builder * represents a new node that didn't yet exist in the base content tree. */ - @Nonnull + @NotNull private NodeState base; /** @@ -151,7 +150,7 @@ public class MemoryNodeBuilder implement * and based on the passed {@code base} state. * @param base base state of the new builder */ - public MemoryNodeBuilder(@Nonnull NodeState base) { + public MemoryNodeBuilder(@NotNull NodeState base) { this.parent = null; this.name = null; this.rootBuilder = this; @@ -183,7 +182,7 @@ public class MemoryNodeBuilder implement * from its parent builder. * @return base state of this builder */ - @Nonnull + @NotNull private NodeState base() { if (rootBuilder.baseRevision != baseRevision) { base = parent.base().getChildNode(name); @@ -235,7 +234,7 @@ public class MemoryNodeBuilder implement * * @param newBase new base state */ - public void reset(@Nonnull NodeState newBase) { + public void reset(@NotNull NodeState newBase) { checkState(parent == null); base = checkNotNull(newBase); baseRevision = rootHead.setState(newBase) + 1; @@ -258,12 +257,12 @@ public class MemoryNodeBuilder implement //--------------------------------------------------------< NodeBuilder >--- - @Override @Nonnull + @Override @NotNull public NodeState getNodeState() { return head().getImmutableNodeState(); } - @Override @Nonnull + @Override @NotNull public NodeState getBaseState() { return base(); } @@ -303,20 +302,20 @@ public class MemoryNodeBuilder implement return head().getCurrentNodeState().getChildNodeCount(max); } - @Nonnull + @NotNull @Override public Iterable<String> getChildNodeNames() { return head().getCurrentNodeState().getChildNodeNames(); } @Override - public boolean hasChildNode(@Nonnull String name) { + public boolean hasChildNode(@NotNull String name) { return head().getCurrentNodeState().hasChildNode(checkNotNull(name)); } - @Nonnull + @NotNull @Override - public NodeBuilder child(@Nonnull String name) { + public NodeBuilder child(@NotNull String name) { if (hasChildNode(name)) { return getChildNode(name); } else { @@ -324,22 +323,22 @@ public class MemoryNodeBuilder implement } } - @Nonnull + @NotNull @Override - public NodeBuilder getChildNode(@Nonnull String name) { + public NodeBuilder getChildNode(@NotNull String name) { checkValidName(name); return createChildBuilder(name); } - @Nonnull + @NotNull @Override - public NodeBuilder setChildNode(@Nonnull String name) { + public NodeBuilder setChildNode(@NotNull String name) { return setChildNode(name, EMPTY_NODE); } - @Nonnull + @NotNull @Override - public NodeBuilder setChildNode(@Nonnull String name, @Nonnull NodeState state) { + public NodeBuilder setChildNode(@NotNull String name, @NotNull NodeState state) { checkState(exists(), "This builder does not exist: " + this.name); head().getMutableNodeState().setChildNode(name, checkNotNull(state)); MemoryNodeBuilder builder = createChildBuilder(name); @@ -376,7 +375,7 @@ public class MemoryNodeBuilder implement * or contains the forward slash character */ @Override - public boolean moveTo(@Nonnull NodeBuilder newParent, @Nonnull String newName) + public boolean moveTo(@NotNull NodeBuilder newParent, @NotNull String newName) throws IllegalArgumentException { checkNotNull(newParent); checkValidName(newName); @@ -464,7 +463,7 @@ public class MemoryNodeBuilder implement return head().getCurrentNodeState().getPropertyCount(); } - @Nonnull + @NotNull @Override public Iterable<? extends PropertyState> getProperties() { return head().getCurrentNodeState().getProperties(); @@ -481,49 +480,49 @@ public class MemoryNodeBuilder implement } @Override - public boolean getBoolean(@Nonnull String name) { + public boolean getBoolean(@NotNull String name) { return head().getCurrentNodeState().getBoolean(checkNotNull(name)); } - @Override @CheckForNull - public String getString(@Nonnull String name) { + @Override @Nullable + public String getString(@NotNull String name) { return head().getCurrentNodeState().getString(checkNotNull(name)); } - @Override @CheckForNull - public String getName(@Nonnull String name) { + @Override @Nullable + public String getName(@NotNull String name) { return head().getCurrentNodeState().getName(checkNotNull(name)); } - @Override @Nonnull - public Iterable<String> getNames(@Nonnull String name) { + @Override @NotNull + public Iterable<String> getNames(@NotNull String name) { return head().getCurrentNodeState().getNames(checkNotNull(name)); } - @Nonnull + @NotNull @Override - public NodeBuilder setProperty(@Nonnull PropertyState property) { + public NodeBuilder setProperty(@NotNull PropertyState property) { checkState(exists(), "This builder does not exist: " + name); head().getMutableNodeState().setProperty(checkNotNull(property)); updated(); return this; } - @Nonnull + @NotNull @Override - public <T> NodeBuilder setProperty(String name, @Nonnull T value) { + public <T> NodeBuilder setProperty(String name, @NotNull T value) { setProperty(PropertyStates.createProperty(name, value)); return this; } - @Nonnull + @NotNull @Override - public <T> NodeBuilder setProperty(String name, @Nonnull T value, Type<T> type) { + public <T> NodeBuilder setProperty(String name, @NotNull T value, Type<T> type) { setProperty(PropertyStates.createProperty(name, value, type)); return this; } - @Nonnull + @NotNull @Override public NodeBuilder removeProperty(String name) { checkState(exists(), "This builder does not exist: " + name); Modified: jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeState.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeState.java?rev=1846038&r1=1846037&r2=1846038&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeState.java (original) +++ jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeState.java Wed Nov 7 14:48:58 2018 @@ -23,14 +23,13 @@ import static org.apache.jackrabbit.oak. import java.util.HashMap; import java.util.Map; -import javax.annotation.Nonnull; - import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.spi.state.AbstractNodeState; import org.apache.jackrabbit.oak.spi.state.ChildNodeEntry; import org.apache.jackrabbit.oak.spi.state.NodeBuilder; import org.apache.jackrabbit.oak.spi.state.NodeState; import org.apache.jackrabbit.oak.spi.state.NodeStateDiff; +import org.jetbrains.annotations.NotNull; /** * Basic in-memory node state implementation. @@ -63,12 +62,12 @@ class MemoryNodeState extends AbstractNo } @Override - public boolean hasProperty(@Nonnull String name) { + public boolean hasProperty(@NotNull String name) { return properties.containsKey(name); } @Override - public PropertyState getProperty(@Nonnull String name) { + public PropertyState getProperty(@NotNull String name) { return properties.get(name); } @@ -77,20 +76,20 @@ class MemoryNodeState extends AbstractNo return properties.size(); } - @Nonnull + @NotNull @Override public Iterable<? extends PropertyState> getProperties() { return properties.values(); } @Override - public boolean hasChildNode(@Nonnull String name) { + public boolean hasChildNode(@NotNull String name) { return nodes.containsKey(name); } - @Nonnull + @NotNull @Override - public NodeState getChildNode(@Nonnull String name) { + public NodeState getChildNode(@NotNull String name) { NodeState state = nodes.get(name); if (state == null) { checkValidName(name); @@ -104,13 +103,13 @@ class MemoryNodeState extends AbstractNo return nodes.size(); } - @Nonnull + @NotNull @Override public Iterable<ChildNodeEntry> getChildNodeEntries() { return MemoryChildNodeEntry.iterable(nodes.entrySet()); } - @Nonnull + @NotNull @Override public NodeBuilder builder() { return new MemoryNodeBuilder(this); Modified: jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeStore.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeStore.java?rev=1846038&r1=1846037&r2=1846038&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeStore.java (original) +++ jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeStore.java Wed Nov 7 14:48:58 2018 @@ -32,9 +32,6 @@ import java.util.Set; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicReference; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; - import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; @@ -51,6 +48,8 @@ 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.NodeStoreBranch; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * Basic in-memory node store implementation. Useful as a base class for @@ -122,8 +121,8 @@ public class MemoryNodeStore implements */ @Override public synchronized NodeState merge( - @Nonnull NodeBuilder builder, @Nonnull CommitHook commitHook, - @Nonnull CommitInfo info) throws CommitFailedException { + @NotNull NodeBuilder builder, @NotNull CommitHook commitHook, + @NotNull CommitInfo info) throws CommitFailedException { checkArgument(builder instanceof MemoryNodeBuilder); MemoryNodeBuilder mnb = (MemoryNodeBuilder) builder; checkArgument(mnb.isRoot()); @@ -147,7 +146,7 @@ public class MemoryNodeStore implements * this store */ @Override - public NodeState rebase(@Nonnull NodeBuilder builder) { + public NodeState rebase(@NotNull NodeBuilder builder) { checkArgument(builder instanceof MemoryNodeBuilder); NodeState head = checkNotNull(builder).getNodeState(); NodeState base = builder.getBaseState(); @@ -170,7 +169,7 @@ public class MemoryNodeStore implements * this store */ @Override - public NodeState reset(@Nonnull NodeBuilder builder) { + public NodeState reset(@NotNull NodeBuilder builder) { checkArgument(builder instanceof MemoryNodeBuilder); NodeState head = getRoot(); ((MemoryNodeBuilder) builder).reset(head); @@ -191,13 +190,13 @@ public class MemoryNodeStore implements } @Override - public Blob getBlob(@Nonnull String reference) { + public Blob getBlob(@NotNull String reference) { return null; } - @Nonnull + @NotNull @Override - public String checkpoint(long lifetime, @Nonnull Map<String, String> properties) { + public String checkpoint(long lifetime, @NotNull Map<String, String> properties) { checkArgument(lifetime > 0); checkNotNull(properties); String checkpoint = "checkpoint" + checkpointCounter.incrementAndGet(); @@ -205,14 +204,14 @@ public class MemoryNodeStore implements return checkpoint; } - @Override @Nonnull + @Override @NotNull public synchronized String checkpoint(long lifetime) { return checkpoint(lifetime, Collections.<String, String>emptyMap()); } - @Nonnull + @NotNull @Override - public Map<String, String> checkpointInfo(@Nonnull String checkpoint) { + public Map<String, String> checkpointInfo(@NotNull String checkpoint) { Checkpoint cp = checkpoints.get(checkNotNull(checkpoint)); if (cp == null) { return Collections.emptyMap(); @@ -221,14 +220,14 @@ public class MemoryNodeStore implements } } - @Nonnull + @NotNull @Override public synchronized Iterable<String> checkpoints() { return Lists.newArrayList(checkpoints.keySet()); } - @Override @CheckForNull - public synchronized NodeState retrieve(@Nonnull String checkpoint) { + @Override @Nullable + public synchronized NodeState retrieve(@NotNull String checkpoint) { Checkpoint cp = checkpoints.get(checkNotNull(checkpoint)); if (cp == null) { return null; @@ -286,7 +285,7 @@ public class MemoryNodeStore implements @Override public NodeState merge( - @Nonnull CommitHook hook, @Nonnull CommitInfo info) + @NotNull CommitHook hook, @NotNull CommitInfo info) throws CommitFailedException { checkNotNull(hook); checkNotNull(info); Modified: jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/ModifiedNodeState.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/ModifiedNodeState.java?rev=1846038&r1=1846037&r2=1846038&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/ModifiedNodeState.java (original) +++ jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/ModifiedNodeState.java Wed Nov 7 14:48:58 2018 @@ -31,9 +31,6 @@ import static org.apache.jackrabbit.oak. import java.util.Map; import java.util.Map.Entry; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import com.google.common.base.Function; import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.spi.state.AbstractNodeState; @@ -41,6 +38,8 @@ import org.apache.jackrabbit.oak.spi.sta import org.apache.jackrabbit.oak.spi.state.NodeBuilder; import org.apache.jackrabbit.oak.spi.state.NodeState; import org.apache.jackrabbit.oak.spi.state.NodeStateDiff; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import com.google.common.base.Predicate; import com.google.common.base.Predicates; @@ -85,9 +84,9 @@ public class ModifiedNodeState extends A * @return new {@link MutableNodeState} base state */ static NodeState unwrap( - @Nonnull NodeState base, - @Nonnull Map<String, PropertyState> properties, - @Nonnull Map<String, MutableNodeState> nodes) { + @NotNull NodeState base, + @NotNull Map<String, PropertyState> properties, + @NotNull Map<String, MutableNodeState> nodes) { properties.clear(); for (Entry<String, MutableNodeState> entry : nodes.entrySet()) { entry.getValue().reset(base.getChildNode(entry.getKey())); @@ -263,9 +262,9 @@ public class ModifiedNodeState extends A * @param nodes current child node modifications */ ModifiedNodeState( - @Nonnull NodeState base, - @Nonnull Map<String, PropertyState> properties, - @Nonnull Map<String, MutableNodeState> nodes) { + @NotNull NodeState base, + @NotNull Map<String, PropertyState> properties, + @NotNull Map<String, MutableNodeState> nodes) { this.base = checkNotNull(base); if (checkNotNull(properties).isEmpty()) { @@ -284,14 +283,14 @@ public class ModifiedNodeState extends A } } - @Nonnull + @NotNull public NodeState getBaseState() { return base; } //---------------------------------------------------------< NodeState >-- - @Nonnull + @NotNull @Override public NodeBuilder builder() { return new MemoryNodeBuilder(this); @@ -308,16 +307,16 @@ public class ModifiedNodeState extends A } @Override - public boolean hasProperty(@Nonnull String name) { + public boolean hasProperty(@NotNull String name) { return hasProperty(base, properties, name); } @Override - public PropertyState getProperty(@Nonnull String name) { + public PropertyState getProperty(@NotNull String name) { return getProperty(base, properties, name); } - @Nonnull + @NotNull @Override public Iterable<? extends PropertyState> getProperties() { return getProperties(base, properties, false); @@ -329,7 +328,7 @@ public class ModifiedNodeState extends A } @Override - public boolean hasChildNode(@Nonnull String name) { + public boolean hasChildNode(@NotNull String name) { NodeState child = nodes.get(name); if (child != null) { return child.exists(); @@ -338,9 +337,9 @@ public class ModifiedNodeState extends A } } - @Nonnull + @NotNull @Override - public NodeState getChildNode(@Nonnull String name) { + public NodeState getChildNode(@NotNull String name) { NodeState child = nodes.get(name); if (child == null) { child = base.getChildNode(name); @@ -353,7 +352,7 @@ public class ModifiedNodeState extends A return getChildNodeNames(base, nodes, false); } - @Nonnull + @NotNull @Override public Iterable<? extends ChildNodeEntry> getChildNodeEntries() { if (!base.exists()) { Modified: jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MultiPropertyState.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MultiPropertyState.java?rev=1846038&r1=1846037&r2=1846038&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MultiPropertyState.java (original) +++ jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MultiPropertyState.java Wed Nov 7 14:48:58 2018 @@ -23,7 +23,6 @@ import static com.google.common.base.Pre import java.math.BigDecimal; import java.util.List; -import javax.annotation.Nonnull; import javax.jcr.PropertyType; import com.google.common.base.Function; @@ -32,6 +31,7 @@ import com.google.common.collect.Lists; import org.apache.jackrabbit.oak.api.Blob; import org.apache.jackrabbit.oak.api.Type; import org.apache.jackrabbit.oak.plugins.value.Conversions.Converter; +import org.jetbrains.annotations.NotNull; /** * Abstract base class for multi valued {@code PropertyState} implementations. @@ -153,7 +153,7 @@ abstract class MultiPropertyState<T> ext * values defined in {@link Type} or if {@code type.isArray()} is {@code false}. */ @SuppressWarnings("unchecked") - @Nonnull + @NotNull @Override public <S> S getValue(Type<S> type) { checkArgument(type.isArray(), "Type must be an array type"); @@ -190,7 +190,7 @@ abstract class MultiPropertyState<T> ext * @throws IndexOutOfBoundsException if {@code index >= count()}. */ @SuppressWarnings("unchecked") - @Nonnull + @NotNull @Override public <S> S getValue(Type<S> type, int index) { checkArgument(!type.isArray(), "Type must not be an array type"); Modified: jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MutableNodeState.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MutableNodeState.java?rev=1846038&r1=1846037&r2=1846038&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MutableNodeState.java (original) +++ jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MutableNodeState.java Wed Nov 7 14:48:58 2018 @@ -26,8 +26,6 @@ import static org.apache.jackrabbit.oak. import java.util.Map; import java.util.Map.Entry; -import javax.annotation.Nonnull; - import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.spi.state.AbstractNodeState; import org.apache.jackrabbit.oak.spi.state.ChildNodeEntry; @@ -35,6 +33,7 @@ import org.apache.jackrabbit.oak.spi.sta import org.apache.jackrabbit.oak.spi.state.NodeBuilder; import org.apache.jackrabbit.oak.spi.state.NodeState; import org.apache.jackrabbit.oak.spi.state.NodeStateDiff; +import org.jetbrains.annotations.NotNull; /** * A <em>mutable</em> state being built. @@ -69,7 +68,7 @@ class MutableNodeState extends AbstractN */ private boolean replaced; - MutableNodeState(@Nonnull NodeState base) { + MutableNodeState(@NotNull NodeState base) { checkNotNull(base); this.base = ModifiedNodeState.unwrap(base, properties, nodes); } @@ -100,7 +99,7 @@ class MutableNodeState extends AbstractN * @throws IllegalArgumentException if the given name string is empty * or contains the forward slash character */ - @Nonnull + @NotNull MutableNodeState setChildNode(String name, NodeState state) throws IllegalArgumentException { assert base != null; @@ -245,16 +244,16 @@ class MutableNodeState extends AbstractN } @Override - public boolean hasProperty(@Nonnull String name) { + public boolean hasProperty(@NotNull String name) { return ModifiedNodeState.hasProperty(base, properties, name); } @Override - public PropertyState getProperty(@Nonnull String name) { + public PropertyState getProperty(@NotNull String name) { return ModifiedNodeState.getProperty(base, properties, name); } - @Override @Nonnull + @Override @NotNull public Iterable<? extends PropertyState> getProperties() { return ModifiedNodeState.getProperties(base, properties, true); } @@ -266,7 +265,7 @@ class MutableNodeState extends AbstractN } @Override - public boolean hasChildNode(@Nonnull String name) { + public boolean hasChildNode(@NotNull String name) { assert base != null; NodeState child = nodes.get(name); if (child != null) { @@ -294,9 +293,9 @@ class MutableNodeState extends AbstractN return child; } - @Nonnull + @NotNull @Override - public NodeState getChildNode(@Nonnull String name) { + public NodeState getChildNode(@NotNull String name) { NodeState child = nodes.get(name); if (child == null) { child = base.getChildNode(name); @@ -304,13 +303,13 @@ class MutableNodeState extends AbstractN return child; } - @Override @Nonnull + @Override @NotNull public Iterable<String> getChildNodeNames() { assert base != null; return ModifiedNodeState.getChildNodeNames(base, nodes, true); } - @Override @Nonnull + @Override @NotNull public Iterable<? extends ChildNodeEntry> getChildNodeEntries() { throw new UnsupportedOperationException(); } @@ -320,7 +319,7 @@ class MutableNodeState extends AbstractN throw new UnsupportedOperationException(); } - @Override @Nonnull + @Override @NotNull public NodeBuilder builder() { throw new UnsupportedOperationException(); } Modified: jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/PropertyBuilder.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/PropertyBuilder.java?rev=1846038&r1=1846037&r2=1846038&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/PropertyBuilder.java (original) +++ jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/PropertyBuilder.java Wed Nov 7 14:48:58 2018 @@ -22,7 +22,6 @@ import static com.google.common.base.Pre import java.math.BigDecimal; import java.util.List; -import javax.annotation.Nonnull; import javax.jcr.PropertyType; import com.google.common.collect.Iterables; @@ -30,6 +29,7 @@ import com.google.common.collect.Lists; import org.apache.jackrabbit.oak.api.Blob; import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.api.Type; +import org.jetbrains.annotations.NotNull; /** * {@code PropertyBuilder} for building in memory {@code PropertyState} instances. @@ -130,7 +130,7 @@ public class PropertyBuilder<T> { return values.isEmpty() ? null : values.get(0); } - @Nonnull + @NotNull public List<T> getValues() { return Lists.newArrayList(values); } @@ -156,7 +156,7 @@ public class PropertyBuilder<T> { } @SuppressWarnings("unchecked") - @Nonnull + @NotNull public PropertyState getPropertyState() { checkState(name != null, "Property has no name"); checkState(isArray() || values.size() == 1, "Property has multiple values"); @@ -202,7 +202,7 @@ public class PropertyBuilder<T> { } @SuppressWarnings("unchecked") - @Nonnull + @NotNull public PropertyBuilder<T> assignFrom(PropertyState property) { if (property != null) { setName(property.getName()); @@ -217,62 +217,62 @@ public class PropertyBuilder<T> { return this; } - @Nonnull + @NotNull public PropertyBuilder<T> setName(String name) { this.name = name; return this; } - @Nonnull + @NotNull public PropertyBuilder<T> setArray() { isArray = true; return this; } - @Nonnull + @NotNull public PropertyBuilder<T> setScalar() { isArray = false; return this; } - @Nonnull + @NotNull public PropertyBuilder<T> setValue(T value) { values.clear(); values.add(value); return this; } - @Nonnull + @NotNull public PropertyBuilder<T> addValue(T value) { values.add(value); return this; } - @Nonnull + @NotNull public PropertyBuilder<T> addValues(Iterable<T> values) { Iterables.addAll(this.values, values); return this; } - @Nonnull + @NotNull public PropertyBuilder<T> setValue(T value, int index) { values.set(index, value); return this; } - @Nonnull + @NotNull public PropertyBuilder<T> setValues(Iterable<T> values) { this.values = Lists.newArrayList(values); return this; } - @Nonnull + @NotNull public PropertyBuilder<T> removeValue(int index) { values.remove(index); return this; } - @Nonnull + @NotNull public PropertyBuilder<T> removeValue(Object value) { values.remove(value); return this; Modified: jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/PropertyStateValue.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/PropertyStateValue.java?rev=1846038&r1=1846037&r2=1846038&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/PropertyStateValue.java (original) +++ jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/PropertyStateValue.java Wed Nov 7 14:48:58 2018 @@ -23,8 +23,6 @@ import java.io.InputStream; import java.util.Calendar; import java.util.Iterator; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; import javax.jcr.PropertyType; import org.apache.jackrabbit.oak.api.Blob; @@ -32,6 +30,8 @@ import org.apache.jackrabbit.oak.api.Pro import org.apache.jackrabbit.oak.api.PropertyValue; import org.apache.jackrabbit.oak.api.Type; import org.apache.jackrabbit.util.ISO8601; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * A {@link PropertyValue} implementation that wraps a {@link PropertyState} @@ -50,19 +50,19 @@ public class PropertyStateValue implemen } @Override - @Nonnull + @NotNull public Type<?> getType() { return ps.getType(); } @Override - @Nonnull + @NotNull public <T> T getValue(Type<T> type) { return ps.getValue(type); } @Override - @Nonnull + @NotNull public <T> T getValue(Type<T> type, int index) { return ps.getValue(type, index); } @@ -82,13 +82,13 @@ public class PropertyStateValue implemen return ps.count(); } - @CheckForNull + @Nullable public PropertyState unwrap() { return ps; } @Override - public int compareTo(@Nonnull PropertyValue p2) { + public int compareTo(@NotNull PropertyValue p2) { if (getType().tag() != p2.getType().tag()) { return Integer.signum(p2.getType().tag() - getType().tag()); } Modified: jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/PropertyStates.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/PropertyStates.java?rev=1846038&r1=1846037&r2=1846038&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/PropertyStates.java (original) +++ jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/PropertyStates.java Wed Nov 7 14:48:58 2018 @@ -22,7 +22,6 @@ import java.math.BigDecimal; import java.util.Calendar; import java.util.List; -import javax.annotation.Nonnull; import javax.jcr.PropertyType; import javax.jcr.RepositoryException; import javax.jcr.Value; @@ -36,6 +35,7 @@ import org.apache.jackrabbit.oak.api.Typ import org.apache.jackrabbit.oak.plugins.value.Conversions; import org.apache.jackrabbit.oak.plugins.value.OakValue; import org.apache.jackrabbit.util.ISO8601; +import org.jetbrains.annotations.NotNull; /** * Utility class for creating {@link PropertyState} instances. @@ -52,7 +52,7 @@ public final class PropertyStates { * @return The new property state * @throws RepositoryException forwarded from {@code value} */ - @Nonnull + @NotNull public static PropertyState createProperty(String name, Value value) throws RepositoryException { int type = value.getType(); switch (type) { @@ -84,7 +84,7 @@ public final class PropertyStates { * @return The new property state * @throws RepositoryException forwarded from {@code value} */ - @Nonnull + @NotNull public static PropertyState createProperty( String name, Iterable<Value> values) throws RepositoryException { @@ -164,7 +164,7 @@ public final class PropertyStates { * @param type The type of the property state * @return The new property state */ - @Nonnull + @NotNull public static PropertyState createProperty(String name, String value, int type) { switch (type) { case PropertyType.STRING: @@ -192,7 +192,7 @@ public final class PropertyStates { * @return The new property state */ @SuppressWarnings("unchecked") - @Nonnull + @NotNull public static PropertyState createProperty(String name, Object value, Type<?> type) { switch (type.tag()) { case PropertyType.STRING: @@ -255,7 +255,7 @@ public final class PropertyStates { * @param value The value of the property state * @return The new property state */ - @Nonnull + @NotNull public static <T> PropertyState createProperty(String name, T value) { if (value instanceof String) { return StringPropertyState.stringProperty(name, (String) value); Modified: jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/PropertyValues.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/PropertyValues.java?rev=1846038&r1=1846037&r2=1846038&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/PropertyValues.java (original) +++ jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/PropertyValues.java Wed Nov 7 14:48:58 2018 @@ -19,14 +19,14 @@ package org.apache.jackrabbit.oak.plugins.memory; import java.math.BigDecimal; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; import javax.jcr.PropertyType; import org.apache.jackrabbit.oak.api.Blob; import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.api.PropertyValue; import org.apache.jackrabbit.oak.api.Type; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import static com.google.common.collect.Iterables.contains; @@ -38,21 +38,21 @@ public final class PropertyValues { private PropertyValues() { } - @CheckForNull - public static PropertyValue create(@CheckForNull PropertyState property) { + @Nullable + public static PropertyValue create(@Nullable PropertyState property) { if (property == null) { return null; } return newValue(property); } - @Nonnull - private static PropertyValue newValue(@Nonnull PropertyState property) { + @NotNull + private static PropertyValue newValue(@NotNull PropertyState property) { return new PropertyStateValue(property); } - @CheckForNull - public static PropertyState create(@CheckForNull PropertyValue value) { + @Nullable + public static PropertyState create(@Nullable PropertyValue value) { if (value == null) { return null; } @@ -62,92 +62,92 @@ public final class PropertyValues { return null; } - @Nonnull - public static PropertyValue newString(@Nonnull String value) { + @NotNull + public static PropertyValue newString(@NotNull String value) { return new PropertyStateValue(StringPropertyState.stringProperty("", value)); } - @Nonnull - public static PropertyValue newString(@Nonnull Iterable<String> value) { + @NotNull + public static PropertyValue newString(@NotNull Iterable<String> value) { return new PropertyStateValue(MultiStringPropertyState.stringProperty("", value)); } - @Nonnull - public static PropertyValue newLong(@Nonnull Long value) { + @NotNull + public static PropertyValue newLong(@NotNull Long value) { return new PropertyStateValue(LongPropertyState.createLongProperty("", value)); } - @Nonnull - public static PropertyValue newDouble(@Nonnull Double value) { + @NotNull + public static PropertyValue newDouble(@NotNull Double value) { return new PropertyStateValue(DoublePropertyState.doubleProperty("", value)); } - @Nonnull - public static PropertyValue newDecimal(@Nonnull BigDecimal value) { + @NotNull + public static PropertyValue newDecimal(@NotNull BigDecimal value) { return new PropertyStateValue(DecimalPropertyState.decimalProperty("", value)); } - @Nonnull + @NotNull public static PropertyValue newBoolean(boolean value) { return new PropertyStateValue(BooleanPropertyState.booleanProperty("", value)); } - @Nonnull - public static PropertyValue newDate(@Nonnull String value) { + @NotNull + public static PropertyValue newDate(@NotNull String value) { return new PropertyStateValue(GenericPropertyState.dateProperty("", value)); } - @Nonnull - public static PropertyValue newName(@Nonnull String value) { + @NotNull + public static PropertyValue newName(@NotNull String value) { return new PropertyStateValue(GenericPropertyState.nameProperty("", value)); } - @Nonnull - public static PropertyValue newName(@Nonnull Iterable<String> value) { + @NotNull + public static PropertyValue newName(@NotNull Iterable<String> value) { return new PropertyStateValue(MultiGenericPropertyState.nameProperty("", value)); } - @Nonnull - public static PropertyValue newPath(@Nonnull String value) { + @NotNull + public static PropertyValue newPath(@NotNull String value) { return new PropertyStateValue(GenericPropertyState.pathProperty("", value)); } - @Nonnull - public static PropertyValue newReference(@Nonnull String value) { + @NotNull + public static PropertyValue newReference(@NotNull String value) { return new PropertyStateValue(GenericPropertyState.referenceProperty("", value)); } - @Nonnull - public static PropertyValue newWeakReference(@Nonnull String value) { + @NotNull + public static PropertyValue newWeakReference(@NotNull String value) { return new PropertyStateValue(GenericPropertyState.weakreferenceProperty("", value)); } - @Nonnull - public static PropertyValue newUri(@Nonnull String value) { + @NotNull + public static PropertyValue newUri(@NotNull String value) { return new PropertyStateValue(GenericPropertyState.uriProperty("", value)); } - @Nonnull - public static PropertyValue newBinary(@Nonnull byte[] value) { + @NotNull + public static PropertyValue newBinary(@NotNull byte[] value) { return new PropertyStateValue(BinaryPropertyState.binaryProperty("", value)); } - @Nonnull - public static PropertyValue newBinary(@Nonnull Blob value) { + @NotNull + public static PropertyValue newBinary(@NotNull Blob value) { return new PropertyStateValue(BinaryPropertyState.binaryProperty("", value)); } // -- - public static boolean match(@Nonnull PropertyValue p1, @Nonnull PropertyState p2) { + public static boolean match(@NotNull PropertyValue p1, @NotNull PropertyState p2) { return match(p1, newValue(p2)); } - public static boolean match(@Nonnull PropertyState p1, @Nonnull PropertyValue p2) { + public static boolean match(@NotNull PropertyState p1, @NotNull PropertyValue p2) { return match(newValue(p1), p2); } - public static boolean match(@Nonnull PropertyValue p1, @Nonnull PropertyValue p2) { + public static boolean match(@NotNull PropertyValue p1, @NotNull PropertyValue p2) { if (p1.getType().tag() != p2.getType().tag()) { return false; } @@ -178,7 +178,7 @@ public final class PropertyValues { } - public static boolean notMatch(@Nonnull PropertyValue p1, @Nonnull PropertyValue p2) { + public static boolean notMatch(@NotNull PropertyValue p1, @NotNull PropertyValue p2) { if (p1.getType().tag() != p2.getType().tag()) { return true; } Modified: jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/SinglePropertyState.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/SinglePropertyState.java?rev=1846038&r1=1846037&r2=1846038&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/SinglePropertyState.java (original) +++ jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/SinglePropertyState.java Wed Nov 7 14:48:58 2018 @@ -21,11 +21,11 @@ package org.apache.jackrabbit.oak.plugin import static com.google.common.base.Preconditions.checkArgument; import static java.util.Collections.singleton; -import javax.annotation.Nonnull; import javax.jcr.PropertyType; import org.apache.jackrabbit.oak.api.Type; import org.apache.jackrabbit.oak.plugins.value.Conversions.Converter; +import org.jetbrains.annotations.NotNull; /** * Abstract base class for single valued {@code PropertyState} implementations. @@ -36,7 +36,7 @@ abstract class SinglePropertyState<T> ex * Create a new property state with the given {@code name} * @param name The name of the property state. */ - protected SinglePropertyState(@Nonnull String name) { + protected SinglePropertyState(@NotNull String name) { super(name); } @@ -84,7 +84,7 @@ abstract class SinglePropertyState<T> ex * values defined in {@link Type}. */ @SuppressWarnings("unchecked") - @Nonnull + @NotNull @Override public <S> S getValue(Type<S> type) { if (type.isArray()) { @@ -106,7 +106,7 @@ abstract class SinglePropertyState<T> ex * @throws IllegalArgumentException if {@code type.isArray} is {@code true} * @throws IndexOutOfBoundsException if {@code index != 0} */ - @Nonnull + @NotNull @Override public <S> S getValue(Type<S> type, int index) { checkArgument(!type.isArray(), "Type must not be an array type"); Modified: jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/StringBasedBlob.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/StringBasedBlob.java?rev=1846038&r1=1846037&r2=1846038&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/StringBasedBlob.java (original) +++ jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/StringBasedBlob.java Wed Nov 7 14:48:58 2018 @@ -21,10 +21,10 @@ package org.apache.jackrabbit.oak.plugin import java.io.ByteArrayInputStream; import java.io.InputStream; -import javax.annotation.Nonnull; - import com.google.common.base.Charsets; +import org.jetbrains.annotations.NotNull; + /** * This {@code Blob} implementations is based on a string. */ @@ -44,7 +44,7 @@ public class StringBasedBlob extends Abs * This implementation returns the bytes of the UTF-8 encoding * of the underlying string. */ - @Nonnull + @NotNull @Override public InputStream getNewStream() { return new ByteArrayInputStream(value.getBytes(Charsets.UTF_8)); Modified: jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/StringPropertyState.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/StringPropertyState.java?rev=1846038&r1=1846037&r2=1846038&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/StringPropertyState.java (original) +++ jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/StringPropertyState.java Wed Nov 7 14:48:58 2018 @@ -18,12 +18,11 @@ */ package org.apache.jackrabbit.oak.plugins.memory; -import javax.annotation.Nonnull; - import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.api.Type; import org.apache.jackrabbit.oak.plugins.value.Conversions; import org.apache.jackrabbit.oak.plugins.value.Conversions.Converter; +import org.jetbrains.annotations.NotNull; import static com.google.common.base.Preconditions.checkNotNull; import static org.apache.jackrabbit.oak.api.Type.STRING; @@ -31,7 +30,7 @@ import static org.apache.jackrabbit.oak. public class StringPropertyState extends SinglePropertyState<String> { private final String value; - public StringPropertyState(@Nonnull String name, @Nonnull String value) { + public StringPropertyState(@NotNull String name, @NotNull String value) { super(name); this.value = checkNotNull(value); } @@ -43,7 +42,7 @@ public class StringPropertyState extends * @return The new property state of type {@link Type#STRING} */ public static PropertyState stringProperty( - @Nonnull String name, @Nonnull String value) { + @NotNull String name, @NotNull String value) { return new StringPropertyState(name, value); } Modified: jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/value/BinaryBasedBlob.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/value/BinaryBasedBlob.java?rev=1846038&r1=1846037&r2=1846038&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/value/BinaryBasedBlob.java (original) +++ jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/value/BinaryBasedBlob.java Wed Nov 7 14:48:58 2018 @@ -22,11 +22,11 @@ package org.apache.jackrabbit.oak.plugin import java.io.IOException; import java.io.InputStream; -import javax.annotation.Nonnull; import javax.jcr.Binary; import javax.jcr.RepositoryException; import org.apache.jackrabbit.oak.api.Blob; +import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -49,7 +49,7 @@ public class BinaryBasedBlob implements * Delegates to {@link Binary#getStream()} and returns an input stream the always * throws an {@code IOException} if the underlying binary failed to produce one. */ - @Nonnull + @NotNull @Override public InputStream getNewStream() { try { Modified: jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/value/jcr/BinaryImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/value/jcr/BinaryImpl.java?rev=1846038&r1=1846037&r2=1846038&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/value/jcr/BinaryImpl.java (original) +++ jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/value/jcr/BinaryImpl.java Wed Nov 7 14:48:58 2018 @@ -21,12 +21,12 @@ import static com.google.common.base.Obj import java.io.IOException; import java.io.InputStream; -import javax.annotation.CheckForNull; import javax.jcr.PropertyType; import javax.jcr.RepositoryException; import com.google.common.base.Objects; import org.apache.jackrabbit.api.ReferenceBinary; +import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -85,7 +85,7 @@ class BinaryImpl implements ReferenceBin //---------------------------------------------------< ReferenceBinary >-- - @Override @CheckForNull + @Override @Nullable public String getReference() { try { return value.getBlob().getReference(); @@ -113,4 +113,4 @@ class BinaryImpl implements ReferenceBin public String toString() { return toStringHelper(this).addValue(value).toString(); } -} \ No newline at end of file +} Modified: jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/value/jcr/ValueFactoryImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/value/jcr/ValueFactoryImpl.java?rev=1846038&r1=1846037&r2=1846038&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/value/jcr/ValueFactoryImpl.java (original) +++ jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/value/jcr/ValueFactoryImpl.java Wed Nov 7 14:48:58 2018 @@ -23,7 +23,6 @@ import java.net.URI; import java.net.URISyntaxException; import java.util.Calendar; import java.util.List; -import javax.annotation.Nonnull; import javax.jcr.Binary; import javax.jcr.Node; import javax.jcr.PropertyType; @@ -56,6 +55,7 @@ import org.apache.jackrabbit.oak.plugins import org.apache.jackrabbit.oak.plugins.value.Conversions; import org.apache.jackrabbit.oak.plugins.value.ErrorValue; import org.apache.jackrabbit.util.ISO8601; +import org.jetbrains.annotations.NotNull; import org.slf4j.LoggerFactory; import static com.google.common.base.Preconditions.checkNotNull; @@ -77,7 +77,7 @@ public class ValueFactoryImpl implements * @param namePathMapper The name/path mapping used for converting JCR names/paths to * the internal representation. */ - public ValueFactoryImpl(@Nonnull Root root, @Nonnull NamePathMapper namePathMapper) { + public ValueFactoryImpl(@NotNull Root root, @NotNull NamePathMapper namePathMapper) { this.root = checkNotNull(root); this.namePathMapper = checkNotNull(namePathMapper); } @@ -102,8 +102,8 @@ public class ValueFactoryImpl implements * @return New {@code Value} instance * @throws IllegalArgumentException if {@code property.isArray()} is {@code true}. */ - @Nonnull - public static Value createValue(@Nonnull PropertyValue property, @Nonnull NamePathMapper namePathMapper) { + @NotNull + public static Value createValue(@NotNull PropertyValue property, @NotNull NamePathMapper namePathMapper) { PropertyState ps = PropertyValues.create(property); if (ps == null) { throw new IllegalArgumentException("Failed to convert the specified property value to a property state.");