Modified: jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGCTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGCTest.java?rev=1846037&r1=1846036&r2=1846037&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGCTest.java (original) +++ jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGCTest.java Wed Nov 7 14:46:03 2018 @@ -28,8 +28,6 @@ import java.util.concurrent.Semaphore; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicLong; -import javax.annotation.Nonnull; - import com.google.common.collect.Lists; import org.apache.jackrabbit.oak.api.CommitFailedException; @@ -40,6 +38,7 @@ import org.apache.jackrabbit.oak.spi.com import org.apache.jackrabbit.oak.spi.gc.GCMonitor; import org.apache.jackrabbit.oak.spi.state.NodeBuilder; import org.apache.jackrabbit.oak.stats.Clock; +import org.jetbrains.annotations.NotNull; import org.junit.After; import org.junit.AfterClass; import org.junit.Before; @@ -269,7 +268,7 @@ public class VersionGCTest { AtomicLong findVersionGC = new AtomicLong(); - @Nonnull + @NotNull @Override public <T extends Document> List<T> query(Collection<T> collection, String fromKey,
Modified: jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGCWithSplitTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGCWithSplitTest.java?rev=1846037&r1=1846036&r2=1846037&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGCWithSplitTest.java (original) +++ jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGCWithSplitTest.java Wed Nov 7 14:46:03 2018 @@ -24,8 +24,6 @@ import java.util.Map; import java.util.concurrent.Semaphore; import java.util.concurrent.atomic.AtomicReference; -import javax.annotation.Nonnull; - import com.google.common.collect.Lists; import com.google.common.collect.Maps; @@ -36,6 +34,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.stats.Clock; +import org.jetbrains.annotations.NotNull; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -208,7 +207,7 @@ public class VersionGCWithSplitTest { this.docStore = base; } - @Nonnull + @NotNull @Override public <T extends Document> T createOrUpdate(final Collection<T> collection, final UpdateOp update) { Modified: jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollectorIT.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollectorIT.java?rev=1846037&r1=1846036&r2=1846037&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollectorIT.java (original) +++ jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollectorIT.java Wed Nov 7 14:46:03 2018 @@ -33,8 +33,6 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicReference; -import javax.annotation.Nonnull; - import static com.google.common.collect.Iterables.filter; import static com.google.common.collect.Iterables.size; import static java.util.concurrent.TimeUnit.HOURS; @@ -76,6 +74,7 @@ import org.apache.jackrabbit.oak.spi.com import org.apache.jackrabbit.oak.spi.state.ChildNodeEntry; import org.apache.jackrabbit.oak.spi.state.NodeBuilder; import org.apache.jackrabbit.oak.stats.Clock; +import org.jetbrains.annotations.NotNull; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -681,7 +680,7 @@ public class VersionGarbageCollectorIT { @Override public Iterable<NodeDocument> getPossiblyDeletedDocs(final long fromModified, final long toModified) { return new Iterable<NodeDocument>() { - @Nonnull + @NotNull @Override public Iterator<NodeDocument> iterator() { return new AbstractIterator<NodeDocument>() { Modified: jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VisibleChangesTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VisibleChangesTest.java?rev=1846037&r1=1846036&r2=1846037&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VisibleChangesTest.java (original) +++ jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VisibleChangesTest.java Wed Nov 7 14:46:03 2018 @@ -19,8 +19,6 @@ package org.apache.jackrabbit.oak.plugin import java.util.List; import java.util.Set; -import javax.annotation.Nonnull; - import com.google.common.collect.Sets; import org.apache.jackrabbit.oak.api.CommitFailedException; @@ -29,6 +27,7 @@ import org.apache.jackrabbit.oak.plugins import org.apache.jackrabbit.oak.spi.commit.CommitInfo; import org.apache.jackrabbit.oak.spi.commit.EmptyHook; import org.apache.jackrabbit.oak.spi.state.NodeBuilder; +import org.jetbrains.annotations.NotNull; import org.junit.Test; import static org.apache.jackrabbit.oak.plugins.document.util.Utils.getIdFromPath; @@ -82,7 +81,7 @@ public class VisibleChangesTest { private final Set<String> paths = Sets.newHashSet(); - @Nonnull + @NotNull @Override public <T extends Document> List<T> query(Collection<T> collection, String fromKey, Modified: jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/bundlor/DocumentBundlingTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/bundlor/DocumentBundlingTest.java?rev=1846037&r1=1846036&r2=1846037&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/bundlor/DocumentBundlingTest.java (original) +++ jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/bundlor/DocumentBundlingTest.java Wed Nov 7 14:46:03 2018 @@ -24,8 +24,6 @@ import java.util.Arrays; import java.util.List; import java.util.Set; -import javax.annotation.Nonnull; - import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; @@ -59,6 +57,7 @@ import org.apache.jackrabbit.oak.spi.sta import org.apache.jackrabbit.oak.spi.state.NodeState; import org.apache.jackrabbit.oak.spi.state.NodeStateDiff; import org.apache.jackrabbit.oak.spi.state.NodeStateUtils; +import org.jetbrains.annotations.NotNull; import org.junit.After; import org.junit.Before; import org.junit.Rule; @@ -959,7 +958,7 @@ public class DocumentBundlingTest { return super.find(collection, key); } - @Nonnull + @NotNull @Override public <T extends Document> List<T> query(Collection<T> collection, String fromKey, String toKey, String indexedProperty, long startValue, int limit) { Modified: jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/cache/CacheChangesTrackerTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/cache/CacheChangesTrackerTest.java?rev=1846037&r1=1846036&r2=1846037&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/cache/CacheChangesTrackerTest.java (original) +++ jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/cache/CacheChangesTrackerTest.java Wed Nov 7 14:46:03 2018 @@ -29,16 +29,15 @@ import org.apache.jackrabbit.oak.plugins import org.apache.jackrabbit.oak.plugins.document.locks.StripedNodeDocumentLocks; import org.apache.jackrabbit.oak.plugins.document.memory.MemoryDocumentStore; import org.apache.jackrabbit.oak.plugins.document.util.StringValue; +import org.jetbrains.annotations.Nullable; import org.junit.Before; import org.junit.Test; import org.mockito.Mockito; -import javax.annotation.Nullable; import java.util.ArrayList; import java.util.List; import java.util.concurrent.Callable; import java.util.concurrent.ExecutionException; - import static org.apache.jackrabbit.oak.plugins.document.util.Utils.getKeyLowerLimit; import static org.apache.jackrabbit.oak.plugins.document.util.Utils.getKeyUpperLimit; import static org.junit.Assert.assertFalse; Modified: jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/ClusterConflictTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/ClusterConflictTest.java?rev=1846037&r1=1846036&r2=1846037&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/ClusterConflictTest.java (original) +++ jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/ClusterConflictTest.java Wed Nov 7 14:46:03 2018 @@ -16,8 +16,6 @@ */ package org.apache.jackrabbit.oak.plugins.document.mongo; -import javax.annotation.Nonnull; - import com.mongodb.DB; import org.apache.jackrabbit.oak.api.CommitFailedException; @@ -31,6 +29,7 @@ import org.apache.jackrabbit.oak.spi.com import org.apache.jackrabbit.oak.spi.state.NodeBuilder; import org.apache.jackrabbit.oak.spi.state.NodeState; import org.apache.jackrabbit.oak.spi.state.NodeStore; +import org.jetbrains.annotations.NotNull; import org.junit.Test; import static org.junit.Assert.assertTrue; @@ -102,7 +101,7 @@ public class ClusterConflictTest extends b2.child("z").setProperty("q", "v"); try { ns2.merge(b2, new CommitHook() { - @Nonnull + @NotNull @Override public NodeState processCommit(NodeState before, NodeState after, Modified: jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/AsyncQueueTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/AsyncQueueTest.java?rev=1846037&r1=1846036&r2=1846037&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/AsyncQueueTest.java (original) +++ jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/AsyncQueueTest.java Wed Nov 7 14:46:03 2018 @@ -27,18 +27,17 @@ import org.apache.jackrabbit.oak.plugins import org.apache.jackrabbit.oak.plugins.document.RevisionVector; import org.apache.jackrabbit.oak.plugins.document.persistentCache.async.CacheWriteQueue; import org.apache.jackrabbit.oak.plugins.document.util.StringValue; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.junit.After; import org.junit.Before; import org.junit.Rule; import org.junit.Test; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; import java.io.File; import java.io.IOException; import java.util.List; import java.util.concurrent.atomic.AtomicReference; - import static com.google.common.collect.Lists.newArrayList; import static java.util.Arrays.asList; import static java.util.Collections.emptyList; @@ -68,7 +67,7 @@ public class AsyncQueueTest { final AtomicReference<NodeCache<PathRev, StringValue>> nodeCacheRef = new AtomicReference<NodeCache<PathRev, StringValue>>(); CacheLIRS<PathRev, StringValue> cache = new CacheLIRS.Builder<PathRev, StringValue>().maximumSize(1).evictionCallback(new CacheLIRS.EvictionCallback<PathRev, StringValue>() { @Override - public void evicted(@Nonnull PathRev key, @Nullable StringValue value, @Nonnull RemovalCause cause) { + public void evicted(@NotNull PathRev key, @Nullable StringValue value, @NotNull RemovalCause cause) { if (nodeCacheRef.get() != null) { nodeCacheRef.get().evicted(key, value, cause); }
