Author: reschke Date: Wed Nov 7 14:21:22 2018 New Revision: 1846030 URL: http://svn.apache.org/viewvc?rev=1846030&view=rev Log: OAK-7669: OAK-7511: get rid of JSR 305 dependency - use jetbrains nullability annotations instead - oak-run
Modified: jackrabbit/oak/branches/1.8/ (props changed) jackrabbit/oak/branches/1.8/oak-run/pom.xml jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/checkpoint/Checkpoints.java jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/console/ConsoleSession.java jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/explorer/SegmentTarExplorerBackend.java jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/index/IndexHelper.java jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/index/SegmentPropertyIndexEditorProvider.java jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/LuceneIndexerProvider.java jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/NodeStateEntryTraverser.java jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/NodeStateIndexerProvider.java jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/ChildNodeStateProvider.java jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/FlatFileBufferLinkedList.java jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/LazyChildrenNodeState.java jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/document/RevisionContextWrapper.java jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/tika/BinaryResource.java jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/tika/BlobStoreByteSource.java jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/tika/CSVFileBinaryResourceProvider.java jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/tika/NodeStoreBinaryResourceProvider.java jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/tika/TikaHelper.java jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/run/DataStoreCheckCommand.java jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Utils.java jackrabbit/oak/branches/1.8/oak-run/src/test/java/org/apache/jackrabbit/oak/run/DataStoreCheckTest.java Propchange: jackrabbit/oak/branches/1.8/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Nov 7 14:21:22 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-1836185,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-1836186,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-run/pom.xml URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-run/pom.xml?rev=1846030&r1=1846029&r2=1846030&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-run/pom.xml (original) +++ jackrabbit/oak/branches/1.8/oak-run/pom.xml Wed Nov 7 14:21:22 2018 @@ -367,10 +367,10 @@ <artifactId>joda-time</artifactId> <version>2.8.1</version> </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-run/src/main/java/org/apache/jackrabbit/oak/checkpoint/Checkpoints.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/checkpoint/Checkpoints.java?rev=1846030&r1=1846029&r2=1846030&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/checkpoint/Checkpoints.java (original) +++ jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/checkpoint/Checkpoints.java Wed Nov 7 14:21:22 2018 @@ -23,12 +23,11 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.annotation.Nonnull; - import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.api.Type; import org.apache.jackrabbit.oak.plugins.document.DocumentNodeStore; import org.apache.jackrabbit.oak.spi.state.NodeState; +import org.jetbrains.annotations.NotNull; import com.google.common.io.Closer; @@ -96,7 +95,7 @@ public abstract class Checkpoints { */ public abstract int setInfoProperty(String cp, String name, String value); - @Nonnull + @NotNull static Set<String> getReferencedCheckpoints(NodeState root) { Set<String> cps = new HashSet<String>(); for (PropertyState ps : root.getChildNode(":async").getProperties()) { @@ -125,4 +124,4 @@ public abstract class Checkpoints { } -} \ No newline at end of file +} Modified: jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/console/ConsoleSession.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/console/ConsoleSession.java?rev=1846030&r1=1846029&r2=1846030&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/console/ConsoleSession.java (original) +++ jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/console/ConsoleSession.java Wed Nov 7 14:21:22 2018 @@ -19,11 +19,10 @@ package org.apache.jackrabbit.oak.consol import java.util.Map; import java.util.concurrent.TimeUnit; -import javax.annotation.Nonnull; - import org.apache.jackrabbit.oak.commons.PathUtils; import org.apache.jackrabbit.oak.spi.state.NodeState; import org.apache.jackrabbit.oak.spi.state.NodeStore; +import org.jetbrains.annotations.NotNull; import com.google.common.collect.Maps; import org.apache.jackrabbit.oak.spi.whiteboard.Whiteboard; @@ -125,7 +124,7 @@ public class ConsoleSession { * * @return the working node state. */ - @Nonnull + @NotNull public NodeState getWorkingNode() { NodeState current = getRoot(); for (String element : PathUtils.elements(getWorkingPath())) { Modified: jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/explorer/SegmentTarExplorerBackend.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/explorer/SegmentTarExplorerBackend.java?rev=1846030&r1=1846029&r2=1846030&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/explorer/SegmentTarExplorerBackend.java (original) +++ jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/explorer/SegmentTarExplorerBackend.java Wed Nov 7 14:21:22 2018 @@ -35,8 +35,6 @@ import java.util.Map.Entry; import java.util.Set; import java.util.UUID; -import javax.annotation.Nullable; - import com.google.common.base.Function; import com.google.common.collect.Iterators; import com.google.common.collect.Maps; @@ -53,6 +51,7 @@ import org.apache.jackrabbit.oak.segment import org.apache.jackrabbit.oak.segment.file.JournalReader; import org.apache.jackrabbit.oak.segment.file.ReadOnlyFileStore; import org.apache.jackrabbit.oak.spi.state.NodeState; +import org.jetbrains.annotations.Nullable; class SegmentTarExplorerBackend implements ExplorerBackend { Modified: jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/index/IndexHelper.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/index/IndexHelper.java?rev=1846030&r1=1846029&r2=1846030&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/index/IndexHelper.java (original) +++ jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/index/IndexHelper.java Wed Nov 7 14:21:22 2018 @@ -31,9 +31,6 @@ import java.util.concurrent.ThreadPoolEx import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; - import com.google.common.collect.ImmutableList; import com.google.common.io.Closer; import org.apache.commons.io.FileUtils; @@ -58,6 +55,8 @@ import org.apache.jackrabbit.oak.spi.sta import org.apache.jackrabbit.oak.spi.whiteboard.Whiteboard; import org.apache.jackrabbit.oak.spi.whiteboard.WhiteboardUtils; import org.apache.jackrabbit.oak.stats.StatisticsProvider; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -143,7 +142,7 @@ public class IndexHelper implements Clos return statisticsProvider; } - @CheckForNull + @Nullable public GarbageCollectableBlobStore getGCBlobStore() { return blobStore instanceof GarbageCollectableBlobStore ? (GarbageCollectableBlobStore) blobStore : null; } @@ -167,8 +166,8 @@ public class IndexHelper implements Clos getExtractedTextCache().setExtractedTextProvider(new DataStoreTextWriter(dir, true)); } - @CheckForNull - public <T> T getService(@Nonnull Class<T> type) { + @Nullable + public <T> T getService(@NotNull Class<T> type) { return WhiteboardUtils.getService(whiteboard, type); } @@ -204,7 +203,7 @@ public class IndexHelper implements Clos private final Thread.UncaughtExceptionHandler handler = (t, e) -> log.warn("Error occurred in asynchronous processing ", e); @Override - public Thread newThread(@Nonnull Runnable r) { + public Thread newThread(@NotNull Runnable r) { Thread thread = new Thread(r, createName()); thread.setDaemon(true); thread.setPriority(Thread.MIN_PRIORITY); Modified: jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/index/SegmentPropertyIndexEditorProvider.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/index/SegmentPropertyIndexEditorProvider.java?rev=1846030&r1=1846029&r2=1846030&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/index/SegmentPropertyIndexEditorProvider.java (original) +++ jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/index/SegmentPropertyIndexEditorProvider.java Wed Nov 7 14:21:22 2018 @@ -23,9 +23,6 @@ import java.io.Closeable; import java.io.File; import java.io.IOException; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; - import joptsimple.OptionParser; import org.apache.jackrabbit.oak.api.CommitFailedException; import org.apache.jackrabbit.oak.commons.PathUtils; @@ -46,6 +43,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.NodeStateUtils; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import static com.google.common.base.Preconditions.checkNotNull; import static org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState.EMPTY_NODE; @@ -66,10 +65,10 @@ public class SegmentPropertyIndexEditorP this.indexStoreDir = storeDir; } - @CheckForNull + @Nullable @Override - public Editor getIndexEditor(@Nonnull String type, @Nonnull NodeBuilder definition, - @Nonnull NodeState root, @Nonnull IndexUpdateCallback callback) + public Editor getIndexEditor(@NotNull String type, @NotNull NodeBuilder definition, + @NotNull NodeState root, @NotNull IndexUpdateCallback callback) throws CommitFailedException { if (!PropertyIndexEditorProvider.TYPE.equals(type)) { return null; Modified: jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/LuceneIndexerProvider.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/LuceneIndexerProvider.java?rev=1846030&r1=1846029&r2=1846030&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/LuceneIndexerProvider.java (original) +++ jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/LuceneIndexerProvider.java Wed Nov 7 14:21:22 2018 @@ -22,8 +22,6 @@ package org.apache.jackrabbit.oak.index. import java.io.IOException; import java.util.concurrent.TimeUnit; -import javax.annotation.Nonnull; - import org.apache.commons.io.FileUtils; import org.apache.jackrabbit.oak.index.IndexHelper; import org.apache.jackrabbit.oak.index.IndexerSupport; @@ -39,6 +37,7 @@ import org.apache.jackrabbit.oak.plugins import org.apache.jackrabbit.oak.plugins.index.progress.IndexingProgressReporter; import org.apache.jackrabbit.oak.spi.state.NodeBuilder; import org.apache.jackrabbit.oak.spi.state.NodeState; +import org.jetbrains.annotations.NotNull; import static org.apache.jackrabbit.oak.plugins.index.IndexConstants.TYPE_PROPERTY_NAME; import static org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexConstants.TYPE_LUCENE; @@ -58,8 +57,8 @@ public class LuceneIndexerProvider imple } @Override - public NodeStateIndexer getIndexer(@Nonnull String type, @Nonnull String indexPath, - @Nonnull NodeBuilder definition, @Nonnull NodeState root, + public NodeStateIndexer getIndexer(@NotNull String type, @NotNull String indexPath, + @NotNull NodeBuilder definition, @NotNull NodeState root, IndexingProgressReporter progressReporter) { if (!TYPE_LUCENE.equals(definition.getString(TYPE_PROPERTY_NAME))) { return null; Modified: jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/NodeStateEntryTraverser.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/NodeStateEntryTraverser.java?rev=1846030&r1=1846029&r2=1846030&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/NodeStateEntryTraverser.java (original) +++ jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/NodeStateEntryTraverser.java Wed Nov 7 14:21:22 2018 @@ -25,8 +25,6 @@ import java.util.Iterator; import java.util.function.Consumer; import java.util.function.Predicate; -import javax.annotation.Nonnull; - import com.google.common.collect.FluentIterable; import com.google.common.io.Closer; import org.apache.jackrabbit.oak.plugins.document.Collection; @@ -39,6 +37,7 @@ import org.apache.jackrabbit.oak.plugins import org.apache.jackrabbit.oak.plugins.document.util.CloseableIterable; import org.apache.jackrabbit.oak.plugins.document.util.Utils; import org.apache.jackrabbit.oak.spi.state.NodeStateUtils; +import org.jetbrains.annotations.NotNull; import static com.google.common.collect.Iterables.concat; import static com.google.common.collect.Iterables.transform; @@ -66,7 +65,7 @@ public class NodeStateEntryTraverser imp this.documentStore = documentStore; } - @Nonnull + @NotNull @Override public Iterator<NodeStateEntry> iterator() { return getIncludedDocs().iterator(); Modified: jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/NodeStateIndexerProvider.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/NodeStateIndexerProvider.java?rev=1846030&r1=1846029&r2=1846030&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/NodeStateIndexerProvider.java (original) +++ jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/NodeStateIndexerProvider.java Wed Nov 7 14:21:22 2018 @@ -21,18 +21,17 @@ package org.apache.jackrabbit.oak.index. import java.io.Closeable; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; - import org.apache.jackrabbit.oak.plugins.index.progress.IndexingProgressReporter; 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; public interface NodeStateIndexerProvider extends Closeable { - @CheckForNull - NodeStateIndexer getIndexer(@Nonnull String type, - @Nonnull String indexPath, - @Nonnull NodeBuilder definition, - @Nonnull NodeState root, IndexingProgressReporter progressReporter); + @Nullable + NodeStateIndexer getIndexer(@NotNull String type, + @NotNull String indexPath, + @NotNull NodeBuilder definition, + @NotNull NodeState root, IndexingProgressReporter progressReporter); } Modified: jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/ChildNodeStateProvider.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/ChildNodeStateProvider.java?rev=1846030&r1=1846029&r2=1846030&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/ChildNodeStateProvider.java (original) +++ jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/ChildNodeStateProvider.java Wed Nov 7 14:21:22 2018 @@ -22,8 +22,6 @@ package org.apache.jackrabbit.oak.index. import java.util.Iterator; import java.util.Set; -import javax.annotation.Nonnull; - import com.google.common.base.Optional; import com.google.common.collect.AbstractIterator; import com.google.common.collect.Iterators; @@ -33,6 +31,7 @@ import org.apache.jackrabbit.oak.index.i import org.apache.jackrabbit.oak.plugins.memory.MemoryChildNodeEntry; import org.apache.jackrabbit.oak.spi.state.ChildNodeEntry; import org.apache.jackrabbit.oak.spi.state.NodeState; +import org.jetbrains.annotations.NotNull; import static com.google.common.base.Preconditions.checkState; import static com.google.common.collect.Iterators.size; @@ -54,12 +53,12 @@ class ChildNodeStateProvider { this.preferredPathElements = preferredPathElements; } - public boolean hasChildNode(@Nonnull String name) { + public boolean hasChildNode(@NotNull String name) { return getChildNode(name).exists(); } - @Nonnull - public NodeState getChildNode(@Nonnull String name) throws IllegalArgumentException { + @NotNull + public NodeState getChildNode(@NotNull String name) throws IllegalArgumentException { boolean isPreferred = preferredPathElements.contains(name); Optional<NodeStateEntry> o = Iterators.tryFind(children(isPreferred), p -> name.equals(name(p))); return o.isPresent() ? o.get().getNodeState() : MISSING_NODE; @@ -76,7 +75,7 @@ class ChildNodeStateProvider { return () -> transform(children(), p -> name(p)); } - @Nonnull + @NotNull public Iterable<? extends ChildNodeEntry> getChildNodeEntries() { return () -> transform(children(), p -> new MemoryChildNodeEntry(name(p), p.getNodeState())); } Modified: jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/FlatFileBufferLinkedList.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/FlatFileBufferLinkedList.java?rev=1846030&r1=1846029&r2=1846030&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/FlatFileBufferLinkedList.java (original) +++ jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/FlatFileBufferLinkedList.java Wed Nov 7 14:21:22 2018 @@ -21,10 +21,9 @@ package org.apache.jackrabbit.oak.index. import com.google.common.base.Preconditions; import org.apache.jackrabbit.oak.index.indexer.document.NodeStateEntry; +import org.jetbrains.annotations.NotNull; -import javax.annotation.Nonnull; import java.util.Iterator; - import static org.apache.jackrabbit.oak.index.indexer.document.flatfile.FlatFileBufferLinkedList.NodeIterator.iteratorFor; /** @@ -52,7 +51,7 @@ public class FlatFileBufferLinkedList { /** * Add {@code item} at the tail of the list */ - public void add(@Nonnull NodeStateEntry item) { + public void add(@NotNull NodeStateEntry item) { Preconditions.checkArgument(item != null, "Can't add null to the list"); long incomingSize = item.estimatedMemUsage(); long memUsage = estimatedMemoryUsage(); @@ -115,7 +114,7 @@ public class FlatFileBufferLinkedList { this.next = null; } - ListNode(@Nonnull NodeStateEntry data) { + ListNode(@NotNull NodeStateEntry data) { Preconditions.checkNotNull(data); this.data = data; this.next = null; @@ -125,12 +124,12 @@ public class FlatFileBufferLinkedList { static class NodeIterator implements Iterator<NodeStateEntry> { private ListNode current; - static NodeIterator iteratorFor(@Nonnull ListNode node) { + static NodeIterator iteratorFor(@NotNull ListNode node) { Preconditions.checkNotNull(node); return new NodeIterator(node); } - NodeIterator(@Nonnull ListNode start) { + NodeIterator(@NotNull ListNode start) { Preconditions.checkNotNull(start); this.current = start; } Modified: jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/LazyChildrenNodeState.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/LazyChildrenNodeState.java?rev=1846030&r1=1846029&r2=1846030&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/LazyChildrenNodeState.java (original) +++ jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/LazyChildrenNodeState.java Wed Nov 7 14:21:22 2018 @@ -19,15 +19,14 @@ package org.apache.jackrabbit.oak.index.indexer.document.flatfile; -import javax.annotation.CheckForNull; -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; +import org.jetbrains.annotations.Nullable; class LazyChildrenNodeState implements NodeState{ private final NodeState delegate; @@ -44,18 +43,18 @@ class LazyChildrenNodeState implements N } @Override - public boolean hasProperty(@Nonnull String name) { + public boolean hasProperty(@NotNull String name) { return delegate.hasProperty(name); } - @CheckForNull + @Nullable @Override - public PropertyState getProperty(@Nonnull String name) { + public PropertyState getProperty(@NotNull String name) { return delegate.getProperty(name); } @Override - public boolean getBoolean(@Nonnull String name) { + public boolean getBoolean(@NotNull String name) { return delegate.getBoolean(name); } @@ -64,27 +63,27 @@ class LazyChildrenNodeState implements N return delegate.getLong(name); } - @CheckForNull + @Nullable @Override public String getString(String name) { return delegate.getString(name); } - @Nonnull + @NotNull @Override - public Iterable<String> getStrings(@Nonnull String name) { + public Iterable<String> getStrings(@NotNull String name) { return delegate.getStrings(name); } - @CheckForNull + @Nullable @Override - public String getName(@Nonnull String name) { + public String getName(@NotNull String name) { return delegate.getName(name); } - @Nonnull + @NotNull @Override - public Iterable<String> getNames(@Nonnull String name) { + public Iterable<String> getNames(@NotNull String name) { return delegate.getNames(name); } @@ -93,13 +92,13 @@ class LazyChildrenNodeState implements N return delegate.getPropertyCount(); } - @Nonnull + @NotNull @Override public Iterable<? extends PropertyState> getProperties() { return delegate.getProperties(); } - @Nonnull + @NotNull @Override public NodeBuilder builder() { return delegate.builder(); @@ -113,13 +112,13 @@ class LazyChildrenNodeState implements N //~-------------------------------< child node access > @Override - public boolean hasChildNode(@Nonnull String name) { + public boolean hasChildNode(@NotNull String name) { return childProvider.hasChildNode(name); } - @Nonnull + @NotNull @Override - public NodeState getChildNode(@Nonnull String name) throws IllegalArgumentException { + public NodeState getChildNode(@NotNull String name) throws IllegalArgumentException { return childProvider.getChildNode(name); } @@ -133,7 +132,7 @@ class LazyChildrenNodeState implements N return childProvider.getChildNodeNames(); } - @Nonnull + @NotNull @Override public Iterable<? extends ChildNodeEntry> getChildNodeEntries() { return childProvider.getChildNodeEntries(); Modified: jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/document/RevisionContextWrapper.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/document/RevisionContextWrapper.java?rev=1846030&r1=1846029&r2=1846030&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/document/RevisionContextWrapper.java (original) +++ jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/document/RevisionContextWrapper.java Wed Nov 7 14:21:22 2018 @@ -16,9 +16,8 @@ */ package org.apache.jackrabbit.oak.plugins.document; -import javax.annotation.Nonnull; - import org.apache.jackrabbit.oak.stats.Clock; +import org.jetbrains.annotations.NotNull; /** * Wraps an existing revision context and exposes a custom {@code clusterId}. @@ -49,28 +48,28 @@ public final class RevisionContextWrappe return clusterId; } - @Nonnull + @NotNull @Override public RevisionVector getHeadRevision() { return context.getHeadRevision(); } - @Nonnull + @NotNull @Override public Revision newRevision() { Revision r = context.newRevision(); return new Revision(r.getTimestamp(), r.getCounter(), clusterId); } - @Nonnull + @NotNull @Override public Clock getClock() { return context.getClock(); } @Override - public String getCommitValue(@Nonnull Revision revision, - @Nonnull NodeDocument nodeDocument) { + public String getCommitValue(@NotNull Revision revision, + @NotNull NodeDocument nodeDocument) { return context.getCommitValue(revision, nodeDocument); } } Modified: jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/tika/BinaryResource.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/tika/BinaryResource.java?rev=1846030&r1=1846029&r2=1846030&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/tika/BinaryResource.java (original) +++ jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/tika/BinaryResource.java Wed Nov 7 14:21:22 2018 @@ -19,13 +19,12 @@ package org.apache.jackrabbit.oak.plugins.tika; -import javax.annotation.CheckForNull; -import javax.annotation.Nullable; - import com.google.common.io.ByteSource; import static com.google.common.base.Preconditions.checkNotNull; +import org.jetbrains.annotations.Nullable; + class BinaryResource { private final ByteSource byteSource; private final String mimeType; @@ -49,12 +48,12 @@ class BinaryResource { return byteSource; } - @CheckForNull + @Nullable public String getMimeType() { return mimeType; } - @CheckForNull + @Nullable public String getEncoding() { return encoding; } Modified: jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/tika/BlobStoreByteSource.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/tika/BlobStoreByteSource.java?rev=1846030&r1=1846029&r2=1846030&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/tika/BlobStoreByteSource.java (original) +++ jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/tika/BlobStoreByteSource.java Wed Nov 7 14:21:22 2018 @@ -22,10 +22,9 @@ package org.apache.jackrabbit.oak.plugin import java.io.IOException; import java.io.InputStream; -import javax.annotation.Nullable; - import com.google.common.io.ByteSource; import org.apache.jackrabbit.oak.spi.blob.BlobStore; +import org.jetbrains.annotations.Nullable; /** * Avoiding use of BlobByteSource to avoid concurrent access to NodeState Modified: jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/tika/CSVFileBinaryResourceProvider.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/tika/CSVFileBinaryResourceProvider.java?rev=1846030&r1=1846029&r2=1846030&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/tika/CSVFileBinaryResourceProvider.java (original) +++ jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/tika/CSVFileBinaryResourceProvider.java Wed Nov 7 14:21:22 2018 @@ -23,8 +23,6 @@ import java.io.Closeable; import java.io.File; import java.io.IOException; -import javax.annotation.Nullable; - import com.google.common.base.Charsets; import com.google.common.base.Function; import com.google.common.base.Predicate; @@ -36,6 +34,7 @@ import org.apache.commons.csv.CSVParser; import org.apache.commons.csv.CSVRecord; import org.apache.jackrabbit.oak.commons.PathUtils; import org.apache.jackrabbit.oak.spi.blob.BlobStore; +import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/tika/NodeStoreBinaryResourceProvider.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/tika/NodeStoreBinaryResourceProvider.java?rev=1846030&r1=1846029&r2=1846030&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/tika/NodeStoreBinaryResourceProvider.java (original) +++ jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/tika/NodeStoreBinaryResourceProvider.java Wed Nov 7 14:21:22 2018 @@ -19,9 +19,6 @@ package org.apache.jackrabbit.oak.plugins.tika; -import javax.annotation.CheckForNull; -import javax.annotation.Nullable; - import com.google.common.base.Function; import com.google.common.collect.FluentIterable; import com.google.common.collect.TreeTraverser; @@ -32,6 +29,7 @@ import org.apache.jackrabbit.oak.api.Tre import org.apache.jackrabbit.oak.api.Type; import org.apache.jackrabbit.oak.spi.blob.BlobStore; import org.apache.jackrabbit.oak.spi.state.NodeStore; +import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -94,7 +92,7 @@ class NodeStoreBinaryResourceProvider im } } - @CheckForNull + @Nullable private static String getString(Tree tree, String name) { PropertyState prop = tree.getProperty(name); return prop != null ? prop.getValue(Type.STRING) : null; Modified: jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/tika/TikaHelper.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/tika/TikaHelper.java?rev=1846030&r1=1846029&r2=1846030&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/tika/TikaHelper.java (original) +++ jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/tika/TikaHelper.java Wed Nov 7 14:21:22 2018 @@ -26,8 +26,6 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.atomic.AtomicBoolean; -import javax.annotation.Nullable; - import org.apache.tika.config.TikaConfig; import org.apache.tika.exception.TikaException; import org.apache.tika.mime.MediaType; @@ -37,6 +35,7 @@ import org.apache.tika.parser.EmptyParse import org.apache.tika.parser.ParseContext; import org.apache.tika.parser.Parser; import org.apache.tika.parser.ParserDecorator; +import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.xml.sax.SAXException; Modified: jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/run/DataStoreCheckCommand.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/run/DataStoreCheckCommand.java?rev=1846030&r1=1846029&r2=1846030&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/run/DataStoreCheckCommand.java (original) +++ jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/run/DataStoreCheckCommand.java Wed Nov 7 14:21:22 2018 @@ -44,8 +44,6 @@ import java.util.Map; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import javax.annotation.Nullable; - import com.google.common.base.Charsets; import com.google.common.base.Function; import com.google.common.base.Joiner; @@ -86,6 +84,7 @@ import org.apache.jackrabbit.oak.spi.blo import org.apache.jackrabbit.oak.spi.state.ChildNodeEntry; import org.apache.jackrabbit.oak.spi.state.NodeState; import org.apache.jackrabbit.oak.spi.state.NodeStore; +import org.jetbrains.annotations.Nullable; /** * Command to check data store consistency and also optionally retrieve ids Modified: jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Utils.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Utils.java?rev=1846030&r1=1846029&r2=1846030&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Utils.java (original) +++ jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Utils.java Wed Nov 7 14:21:22 2018 @@ -34,8 +34,6 @@ import java.util.List; import java.util.Map; import java.util.Properties; -import javax.annotation.CheckForNull; -import javax.annotation.Nullable; import javax.jcr.RepositoryException; import javax.sql.DataSource; @@ -55,6 +53,7 @@ import org.apache.jackrabbit.oak.plugins import org.apache.jackrabbit.oak.run.cli.DummyDataStore; import org.apache.jackrabbit.oak.spi.blob.GarbageCollectableBlobStore; import org.apache.jackrabbit.oak.spi.state.NodeStore; +import org.jetbrains.annotations.Nullable; import com.google.common.collect.Maps; import com.google.common.io.Closer; @@ -172,7 +171,7 @@ class Utils { return SegmentTarUtils.bootstrapNodeStore(src, closer); } - @CheckForNull + @Nullable static DocumentNodeStoreBuilder<?> createDocumentMKBuilder(NodeStoreOptions options, Closer closer) throws IOException { Modified: jackrabbit/oak/branches/1.8/oak-run/src/test/java/org/apache/jackrabbit/oak/run/DataStoreCheckTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-run/src/test/java/org/apache/jackrabbit/oak/run/DataStoreCheckTest.java?rev=1846030&r1=1846029&r2=1846030&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-run/src/test/java/org/apache/jackrabbit/oak/run/DataStoreCheckTest.java (original) +++ jackrabbit/oak/branches/1.8/oak-run/src/test/java/org/apache/jackrabbit/oak/run/DataStoreCheckTest.java Wed Nov 7 14:21:22 2018 @@ -39,8 +39,6 @@ import java.util.Properties; import java.util.Random; import java.util.Set; -import javax.annotation.Nullable; - import com.google.common.base.Function; import com.google.common.base.Joiner; import com.google.common.collect.ImmutableList; @@ -69,6 +67,7 @@ import org.apache.jackrabbit.oak.spi.com import org.apache.jackrabbit.oak.spi.commit.EmptyHook; import org.apache.jackrabbit.oak.spi.state.NodeBuilder; import org.apache.jackrabbit.oak.spi.state.NodeStore; +import org.jetbrains.annotations.Nullable; import org.junit.After; import org.junit.Assert; import org.junit.Before;