You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by re...@apache.org on 2018/07/18 15:08:28 UTC
svn commit: r1836194 [6/6] - in /jackrabbit/oak/trunk/oak-store-document: ./
src/main/java/org/apache/jackrabbit/oak/plugins/document/
src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/
src/main/java/org/apache/jackrabbit/oak/plugins/doc...
Modified: jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoConnectionFactory.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoConnectionFactory.java?rev=1836194&r1=1836193&r2=1836194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoConnectionFactory.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoConnectionFactory.java Wed Jul 18 15:08:27 2018
@@ -18,18 +18,17 @@ package org.apache.jackrabbit.oak.plugin
import java.util.List;
-import javax.annotation.CheckForNull;
-
import com.google.common.collect.Lists;
import org.apache.jackrabbit.oak.plugins.document.util.MongoConnection;
+import org.jetbrains.annotations.Nullable;
import org.junit.rules.ExternalResource;
public class MongoConnectionFactory extends ExternalResource {
private final List<MongoConnection> connections = Lists.newArrayList();
- @CheckForNull
+ @Nullable
public MongoConnection getConnection() {
MongoConnection c = MongoUtils.getConnection();
if (c != null) {
@@ -38,7 +37,7 @@ public class MongoConnectionFactory exte
return c;
}
- @CheckForNull
+ @Nullable
public MongoConnection getConnection(String dbName) {
MongoConnection c = MongoUtils.getConnection(dbName);
if (c != null) {
Modified: jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeStoreDiffTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeStoreDiffTest.java?rev=1836194&r1=1836193&r2=1836194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeStoreDiffTest.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeStoreDiffTest.java Wed Jul 18 15:08:27 2018
@@ -23,8 +23,6 @@ import java.io.IOException;
import java.util.List;
import java.util.Set;
-import javax.annotation.Nonnull;
-
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import org.apache.jackrabbit.oak.api.CommitFailedException;
@@ -41,6 +39,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.NodeState;
+import org.jetbrains.annotations.NotNull;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -124,7 +123,7 @@ public class NodeStoreDiffTest {
tds.reset();
//3. Merge which does a rebase
ns.merge(b2, new CommitHook() {
- @Nonnull
+ @NotNull
public NodeState processCommit(NodeState before, NodeState after, CommitInfo info) throws CommitFailedException {
NodeBuilder rb = after.builder();
createNodes(rb, "/oak:index/prop-a/a1");
Modified: jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/OptimizedChildFetchTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/OptimizedChildFetchTest.java?rev=1836194&r1=1836193&r2=1836194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/OptimizedChildFetchTest.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/OptimizedChildFetchTest.java Wed Jul 18 15:08:27 2018
@@ -23,13 +23,12 @@ import com.google.common.collect.Sets;
import org.apache.jackrabbit.oak.plugins.document.memory.MemoryDocumentStore;
import org.apache.jackrabbit.oak.plugins.document.util.Utils;
+import org.jetbrains.annotations.NotNull;
import org.junit.Before;
import org.junit.Test;
-import javax.annotation.Nonnull;
import java.util.List;
import java.util.Set;
-
import static junit.framework.Assert.assertNotNull;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
@@ -104,7 +103,7 @@ public class OptimizedChildFetchTest ext
private static class TestDocumentStore extends MemoryDocumentStore {
Set<String> paths = Sets.newHashSet();
- @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/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/PrefetchDispatcherTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/PrefetchDispatcherTest.java?rev=1836194&r1=1836193&r2=1836194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/PrefetchDispatcherTest.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/PrefetchDispatcherTest.java Wed Jul 18 15:08:27 2018
@@ -19,14 +19,13 @@ package org.apache.jackrabbit.oak.plugin
import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
-import javax.annotation.Nonnull;
-
import com.google.common.util.concurrent.MoreExecutors;
import org.apache.jackrabbit.oak.plugins.document.memory.MemoryDocumentStore;
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.Rule;
import org.junit.Test;
@@ -41,7 +40,7 @@ public class PrefetchDispatcherTest {
public void prefetchVisibleChanges() throws Exception {
final AtomicInteger numQueries = new AtomicInteger();
MemoryDocumentStore store = new MemoryDocumentStore() {
- @Nonnull
+ @NotNull
@Override
public <T extends Document> List<T> query(Collection<T> collection,
String fromKey,
Modified: jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/TestNodeObserver.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/TestNodeObserver.java?rev=1836194&r1=1836193&r2=1836194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/TestNodeObserver.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/TestNodeObserver.java Wed Jul 18 15:08:27 2018
@@ -22,10 +22,9 @@ package org.apache.jackrabbit.oak.plugin
import java.util.Map;
import java.util.Set;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.oak.plugins.observation.NodeObserver;
import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
+import org.jetbrains.annotations.NotNull;
import static com.google.common.collect.Maps.newHashMap;
import static com.google.common.collect.Sets.newHashSet;
@@ -42,12 +41,12 @@ public class TestNodeObserver extends No
@Override
protected void added(
- @Nonnull String path,
- @Nonnull Set<String> added,
- @Nonnull Set<String> deleted,
- @Nonnull Set<String> changed,
- @Nonnull Map<String, String> properties,
- @Nonnull CommitInfo commitInfo) {
+ @NotNull String path,
+ @NotNull Set<String> added,
+ @NotNull Set<String> deleted,
+ @NotNull Set<String> changed,
+ @NotNull Map<String, String> properties,
+ @NotNull CommitInfo commitInfo) {
this.added.put(path, newHashSet(added));
if (!properties.isEmpty()) {
this.properties.put(path, newHashMap(properties));
@@ -56,12 +55,12 @@ public class TestNodeObserver extends No
@Override
protected void deleted(
- @Nonnull String path,
- @Nonnull Set<String> added,
- @Nonnull Set<String> deleted,
- @Nonnull Set<String> changed,
- @Nonnull Map<String, String> properties,
- @Nonnull CommitInfo commitInfo) {
+ @NotNull String path,
+ @NotNull Set<String> added,
+ @NotNull Set<String> deleted,
+ @NotNull Set<String> changed,
+ @NotNull Map<String, String> properties,
+ @NotNull CommitInfo commitInfo) {
this.deleted.put(path, newHashSet(deleted));
if (!properties.isEmpty()) {
this.properties.put(path, newHashMap(properties));
@@ -70,12 +69,12 @@ public class TestNodeObserver extends No
@Override
protected void changed(
- @Nonnull String path,
- @Nonnull Set<String> added,
- @Nonnull Set<String> deleted,
- @Nonnull Set<String> changed,
- @Nonnull Map<String, String> properties,
- @Nonnull CommitInfo commitInfo) {
+ @NotNull String path,
+ @NotNull Set<String> added,
+ @NotNull Set<String> deleted,
+ @NotNull Set<String> changed,
+ @NotNull Map<String, String> properties,
+ @NotNull CommitInfo commitInfo) {
this.changed.put(path, newHashSet(changed));
if (!properties.isEmpty()) {
this.properties.put(path, newHashMap(properties));
Modified: jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/TestUtils.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/TestUtils.java?rev=1836194&r1=1836193&r2=1836194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/TestUtils.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/TestUtils.java Wed Jul 18 15:08:27 2018
@@ -18,9 +18,6 @@ package org.apache.jackrabbit.oak.plugin
import java.util.Map;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
import com.google.common.base.Function;
import com.google.common.base.Functions;
import com.google.common.base.Predicate;
@@ -33,6 +30,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.stats.Clock;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import static com.google.common.base.Functions.compose;
import static com.google.common.base.Functions.constant;
@@ -87,7 +86,7 @@ public class TestUtils {
return nb;
}
- @Nonnull
+ @NotNull
public static DocumentNodeState asDocumentState(NodeState state){
if (state instanceof DocumentNodeState){
return (DocumentNodeState) state;
Modified: jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGCDeletionTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGCDeletionTest.java?rev=1836194&r1=1836193&r2=1836194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGCDeletionTest.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGCDeletionTest.java Wed Jul 18 15:08:27 2018
@@ -38,8 +38,6 @@ import java.util.concurrent.Future;
import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;
-import javax.annotation.Nonnull;
-
import com.google.common.collect.Iterators;
import com.google.common.collect.Lists;
@@ -53,6 +51,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.stats.Clock;
+import org.jetbrains.annotations.NotNull;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -317,7 +316,7 @@ public class VersionGCDeletionTest {
final Semaphore queries = new Semaphore(0);
final CountDownLatch ready = new CountDownLatch(1);
MemoryDocumentStore ms = new MemoryDocumentStore() {
- @Nonnull
+ @NotNull
@Override
public <T extends Document> List<T> query(Collection<T> collection,
String fromKey,
@@ -410,7 +409,7 @@ public class VersionGCDeletionTest {
}
@SuppressWarnings("unchecked")
- @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/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGCTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGCTest.java?rev=1836194&r1=1836193&r2=1836194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGCTest.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGCTest.java Wed Jul 18 15:08:27 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.Iterables;
import com.google.common.collect.Lists;
@@ -42,6 +40,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;
@@ -306,7 +305,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/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollectorIT.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollectorIT.java?rev=1836194&r1=1836193&r2=1836194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollectorIT.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollectorIT.java Wed Jul 18 15:08:27 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;
@@ -78,6 +76,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;
@@ -691,7 +690,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/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VisibleChangesTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VisibleChangesTest.java?rev=1836194&r1=1836193&r2=1836194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VisibleChangesTest.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VisibleChangesTest.java Wed Jul 18 15:08:27 2018
@@ -18,8 +18,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;
import org.apache.jackrabbit.oak.plugins.document.memory.MemoryDocumentStore;
@@ -34,6 +32,7 @@ import org.apache.jackrabbit.oak.spi.com
import org.apache.jackrabbit.oak.spi.mount.MountInfoProvider;
import org.apache.jackrabbit.oak.spi.security.SecurityProvider;
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.TestUtils.persistToBranch;
@@ -72,25 +71,25 @@ public class VisibleChangesTest {
store.paths.clear();
VersionablePathHook hook = new VersionablePathHook("default", new ProviderCtx() {
- @Nonnull
+ @NotNull
@Override
public SecurityProvider getSecurityProvider() {
throw new UnsupportedOperationException();
}
- @Nonnull
+ @NotNull
@Override
public TreeProvider getTreeProvider() {
return new TreeProviderService();
}
- @Nonnull
+ @NotNull
@Override
public RootProvider getRootProvider() {
return new RootProviderService();
}
- @Nonnull
+ @NotNull
@Override
public MountInfoProvider getMountInfoProvider() {
throw new UnsupportedOperationException();
@@ -113,7 +112,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/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/bundlor/DocumentBundlingTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/bundlor/DocumentBundlingTest.java?rev=1836194&r1=1836193&r2=1836194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/bundlor/DocumentBundlingTest.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/bundlor/DocumentBundlingTest.java Wed Jul 18 15:08:27 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;
@@ -1002,7 +1001,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/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/cache/CacheChangesTrackerTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/cache/CacheChangesTrackerTest.java?rev=1836194&r1=1836193&r2=1836194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/cache/CacheChangesTrackerTest.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/cache/CacheChangesTrackerTest.java Wed Jul 18 15:08:27 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/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/ClusterConflictTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/ClusterConflictTest.java?rev=1836194&r1=1836193&r2=1836194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/ClusterConflictTest.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/ClusterConflictTest.java Wed Jul 18 15:08:27 2018
@@ -16,8 +16,6 @@
*/
package org.apache.jackrabbit.oak.plugins.document.mongo;
-import javax.annotation.Nonnull;
-
import com.mongodb.MongoClient;
import org.apache.jackrabbit.oak.api.CommitFailedException;
@@ -33,6 +31,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;
@@ -106,7 +105,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/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/RetryReadIT.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/RetryReadIT.java?rev=1836194&r1=1836193&r2=1836194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/RetryReadIT.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/RetryReadIT.java Wed Jul 18 15:08:27 2018
@@ -18,8 +18,6 @@ package org.apache.jackrabbit.oak.plugin
import java.util.List;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.oak.plugins.document.AbstractMongoConnectionTest;
import org.apache.jackrabbit.oak.plugins.document.Collection;
import org.apache.jackrabbit.oak.plugins.document.Document;
@@ -28,6 +26,7 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.plugins.document.MongoUtils;
import org.apache.jackrabbit.oak.plugins.document.NodeDocument;
import org.apache.jackrabbit.oak.plugins.document.util.Utils;
+import org.jetbrains.annotations.NotNull;
import org.junit.Test;
import com.mongodb.MongoClient;
@@ -115,7 +114,7 @@ public class RetryReadIT extends Abstrac
return super.findUncached(collection, key, docReadPref);
}
- @Nonnull
+ @NotNull
@Override
protected <T extends Document> List<T> queryInternal(Collection<T> collection,
String fromKey,
Modified: jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/AsyncQueueTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/AsyncQueueTest.java?rev=1836194&r1=1836193&r2=1836194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/AsyncQueueTest.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/AsyncQueueTest.java Wed Jul 18 15:08:27 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);
}