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 [5/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/main/java/org/apache/jackrabbit/oak/plugins/document/util/CloseableIterable.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/CloseableIterable.java?rev=1836194&r1=1836193&r2=1836194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/CloseableIterable.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/CloseableIterable.java Wed Jul 18 15:08:27 2018
@@ -23,10 +23,10 @@ import java.io.Closeable;
import java.io.IOException;
import java.util.Iterator;
-import javax.annotation.Nonnull;
-
import com.google.common.io.Closer;
+import org.jetbrains.annotations.NotNull;
+
public class CloseableIterable<T> implements Iterable<T>, Closeable {
private final Iterable<T> iterable;
private final Closer closer = Closer.create();
@@ -51,7 +51,7 @@ public class CloseableIterable<T> implem
closer.close();
}
- @Nonnull
+ @NotNull
@Override
public Iterator<T> iterator() {
Iterator<T> it = iterable.iterator();
Modified: jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LeaseCheckDocumentStoreWrapper.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LeaseCheckDocumentStoreWrapper.java?rev=1836194&r1=1836193&r2=1836194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LeaseCheckDocumentStoreWrapper.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LeaseCheckDocumentStoreWrapper.java Wed Jul 18 15:08:27 2018
@@ -21,8 +21,6 @@ package org.apache.jackrabbit.oak.plugin
import java.util.List;
import java.util.Map;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.oak.cache.CacheStats;
import org.apache.jackrabbit.oak.plugins.document.ClusterNodeInfo;
import org.apache.jackrabbit.oak.plugins.document.Collection;
@@ -33,6 +31,7 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.plugins.document.RevisionVector;
import org.apache.jackrabbit.oak.plugins.document.UpdateOp;
import org.apache.jackrabbit.oak.plugins.document.cache.CacheInvalidationStats;
+import org.jetbrains.annotations.NotNull;
/**
* Wrapper of another DocumentStore that does a lease check on any method
@@ -201,7 +200,7 @@ public final class LeaseCheckDocumentSto
return delegate.getMetadata();
}
- @Nonnull
+ @NotNull
@Override
public Map<String, String> getStats() {
performLeaseCheck();
Modified: jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LoggingDocumentStoreWrapper.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LoggingDocumentStoreWrapper.java?rev=1836194&r1=1836193&r2=1836194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LoggingDocumentStoreWrapper.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LoggingDocumentStoreWrapper.java Wed Jul 18 15:08:27 2018
@@ -20,8 +20,6 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.Callable;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.oak.cache.CacheStats;
import org.apache.jackrabbit.oak.commons.json.JsopBuilder;
import org.apache.jackrabbit.oak.plugins.document.Collection;
@@ -32,6 +30,7 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.plugins.document.RevisionVector;
import org.apache.jackrabbit.oak.plugins.document.UpdateOp;
import org.apache.jackrabbit.oak.plugins.document.cache.CacheInvalidationStats;
+import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -91,7 +90,7 @@ public class LoggingDocumentStoreWrapper
}
}
- @Nonnull
+ @NotNull
@Override
public <T extends Document> List<T> query(final Collection<T> collection,
final String fromKey,
@@ -112,7 +111,7 @@ public class LoggingDocumentStoreWrapper
}
@Override
- @Nonnull
+ @NotNull
public <T extends Document> List<T> query(final Collection<T> collection,
final String fromKey,
final String toKey,
@@ -207,7 +206,7 @@ public class LoggingDocumentStoreWrapper
}
}
- @Nonnull
+ @NotNull
@Override
public <T extends Document> T createOrUpdate(final Collection<T> collection,
final UpdateOp update) {
@@ -352,7 +351,7 @@ public class LoggingDocumentStoreWrapper
return store.getMetadata();
}
- @Nonnull
+ @NotNull
@Override
public Map<String, String> getStats() {
Map<String, String> result = store.getStats();
Modified: jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/MongoConnection.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/MongoConnection.java?rev=1836194&r1=1836193&r2=1836194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/MongoConnection.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/MongoConnection.java Wed Jul 18 15:08:27 2018
@@ -19,8 +19,6 @@ package org.apache.jackrabbit.oak.plugin
import java.util.Set;
import java.util.concurrent.TimeUnit;
-import javax.annotation.Nonnull;
-
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableSet;
import com.mongodb.DB;
@@ -36,6 +34,8 @@ import com.mongodb.client.MongoDatabase;
import static com.google.common.base.Preconditions.checkNotNull;
+import org.jetbrains.annotations.NotNull;
+
/**
* The {@code MongoConnection} abstracts connection to the {@code MongoDB}.
*/
@@ -117,7 +117,7 @@ public class MongoConnection {
*
* @return The {@link DB}.
*/
- public DB getDB(@Nonnull String name) {
+ public DB getDB(@NotNull String name) {
return mongo.getDB(name);
}
@@ -126,7 +126,7 @@ public class MongoConnection {
*
* @return The {@link MongoDatabase}.
*/
- public MongoDatabase getDatabase(@Nonnull String name) {
+ public MongoDatabase getDatabase(@NotNull String name) {
return mongo.getDatabase(name);
}
@@ -180,7 +180,7 @@ public class MongoConnection {
* @return {@code true} if the URI has a write concern set, {@code false}
* otherwise.
*/
- public static boolean hasWriteConcern(@Nonnull String uri) {
+ public static boolean hasWriteConcern(@NotNull String uri) {
MongoClientOptions.Builder builder = MongoClientOptions.builder();
builder.writeConcern(WC_UNKNOWN);
WriteConcern wc = new MongoClientURI(checkNotNull(uri), builder)
@@ -194,7 +194,7 @@ public class MongoConnection {
* @return {@code true} if the URI has a read concern set, {@code false}
* otherwise.
*/
- public static boolean hasReadConcern(@Nonnull String uri) {
+ public static boolean hasReadConcern(@NotNull String uri) {
ReadConcern rc = new MongoClientURI(checkNotNull(uri))
.getOptions().getReadConcern();
return readConcernLevel(rc) != null;
@@ -211,7 +211,7 @@ public class MongoConnection {
* @return the default write concern to use for Oak.
* @deprecated use {@link #getDefaultWriteConcern(Mongo)} instead.
*/
- public static WriteConcern getDefaultWriteConcern(@Nonnull DB db) {
+ public static WriteConcern getDefaultWriteConcern(@NotNull DB db) {
return getDefaultWriteConcern(db.getMongo());
}
@@ -225,7 +225,7 @@ public class MongoConnection {
* @param client the connection to MongoDB.
* @return the default write concern to use for Oak.
*/
- public static WriteConcern getDefaultWriteConcern(@Nonnull Mongo client) {
+ public static WriteConcern getDefaultWriteConcern(@NotNull Mongo client) {
WriteConcern w;
if (client.getReplicaSetStatus() != null) {
w = WriteConcern.MAJORITY;
@@ -246,7 +246,7 @@ public class MongoConnection {
* @return the default write concern to use for Oak.
* @deprecated use {@link #getDefaultReadConcern(Mongo, MongoDatabase)} instead.
*/
- public static ReadConcern getDefaultReadConcern(@Nonnull DB db) {
+ public static ReadConcern getDefaultReadConcern(@NotNull DB db) {
ReadConcern r;
if (checkNotNull(db).getMongo().getReplicaSetStatus() != null && isMajorityWriteConcern(db)) {
r = ReadConcern.MAJORITY;
@@ -266,8 +266,8 @@ public class MongoConnection {
* @param db the connection to MongoDB.
* @return the default write concern to use for Oak.
*/
- public static ReadConcern getDefaultReadConcern(@Nonnull Mongo client,
- @Nonnull MongoDatabase db) {
+ public static ReadConcern getDefaultReadConcern(@NotNull Mongo client,
+ @NotNull MongoDatabase db) {
ReadConcern r;
if (checkNotNull(client).getReplicaSetStatus() != null && isMajorityWriteConcern(db)) {
r = ReadConcern.MAJORITY;
@@ -283,7 +283,7 @@ public class MongoConnection {
* @param db the connection to MongoDB.
* @return true if the majority write concern has been configured; false otherwise
*/
- public static boolean isMajorityWriteConcern(@Nonnull DB db) {
+ public static boolean isMajorityWriteConcern(@NotNull DB db) {
return WriteConcern.MAJORITY.getWString().equals(db.getWriteConcern().getWObject());
}
@@ -293,7 +293,7 @@ public class MongoConnection {
* @param db the connection to MongoDB.
* @return true if the majority write concern has been configured; false otherwise
*/
- public static boolean isMajorityWriteConcern(@Nonnull MongoDatabase db) {
+ public static boolean isMajorityWriteConcern(@NotNull MongoDatabase db) {
return WriteConcern.MAJORITY.getWString().equals(db.getWriteConcern().getWObject());
}
@@ -307,7 +307,7 @@ public class MongoConnection {
* @deprecated use {@link #isSufficientWriteConcern(Mongo, WriteConcern)}
* instead.
*/
- public static boolean hasSufficientWriteConcern(@Nonnull DB db) {
+ public static boolean hasSufficientWriteConcern(@NotNull DB db) {
return isSufficientWriteConcern(checkNotNull(db).getMongo(), db.getWriteConcern());
}
@@ -320,8 +320,8 @@ public class MongoConnection {
* @param wc the write concern.
* @return whether the write concern is sufficient.
*/
- public static boolean isSufficientWriteConcern(@Nonnull Mongo client,
- @Nonnull WriteConcern wc) {
+ public static boolean isSufficientWriteConcern(@NotNull Mongo client,
+ @NotNull WriteConcern wc) {
Object wObj = checkNotNull(wc).getWObject();
int w;
if (wObj instanceof Number) {
@@ -353,7 +353,7 @@ public class MongoConnection {
* @deprecated use {@link #isSufficientReadConcern(Mongo, ReadConcern)}
* instead.
*/
- public static boolean hasSufficientReadConcern(@Nonnull DB db) {
+ public static boolean hasSufficientReadConcern(@NotNull DB db) {
return isSufficientReadConcern(checkNotNull(db).getMongo(), db.getReadConcern());
}
@@ -366,8 +366,8 @@ public class MongoConnection {
* @param rc the read concern.
* @return whether the read concern is sufficient.
*/
- public static boolean isSufficientReadConcern(@Nonnull Mongo client,
- @Nonnull ReadConcern rc) {
+ public static boolean isSufficientReadConcern(@NotNull Mongo client,
+ @NotNull ReadConcern rc) {
ReadConcernLevel r = readConcernLevel(checkNotNull(rc));
if (client.getReplicaSetStatus() == null) {
return true;
@@ -383,4 +383,4 @@ public class MongoConnection {
return ReadConcernLevel.fromString(readConcern.asDocument().getString("level").getValue());
}
}
-}
\ No newline at end of file
+}
Modified: jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/ReadOnlyDocumentStoreWrapperFactory.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/ReadOnlyDocumentStoreWrapperFactory.java?rev=1836194&r1=1836193&r2=1836194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/ReadOnlyDocumentStoreWrapperFactory.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/ReadOnlyDocumentStoreWrapperFactory.java Wed Jul 18 15:08:27 2018
@@ -18,18 +18,17 @@ package org.apache.jackrabbit.oak.plugin
import com.google.common.collect.Sets;
import org.apache.jackrabbit.oak.plugins.document.DocumentStore;
+import org.jetbrains.annotations.NotNull;
-import javax.annotation.Nonnull;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
import java.util.Arrays;
import java.util.Set;
-
public class ReadOnlyDocumentStoreWrapperFactory {
private static final Set<String> unsupportedMethods = Sets.newHashSet(
"remove", "create", "update", "createOrUpdate", "findAndUpdate");
- public static DocumentStore getInstance(@Nonnull final DocumentStore delegate) {
+ public static DocumentStore getInstance(@NotNull final DocumentStore delegate) {
return (DocumentStore)Proxy.newProxyInstance(DocumentStore.class.getClassLoader(),
new Class[]{DocumentStore.class},
new InvocationHandler() {
Modified: jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/RevisionsKey.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/RevisionsKey.java?rev=1836194&r1=1836193&r2=1836194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/RevisionsKey.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/RevisionsKey.java Wed Jul 18 15:08:27 2018
@@ -16,11 +16,10 @@
*/
package org.apache.jackrabbit.oak.plugins.document.util;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.oak.cache.CacheValue;
import org.apache.jackrabbit.oak.plugins.document.Revision;
import org.apache.jackrabbit.oak.plugins.document.RevisionVector;
+import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -73,7 +72,7 @@ public final class RevisionsKey implemen
return r1 + "/" + r2;
}
- public int compareTo(@Nonnull RevisionsKey k) {
+ public int compareTo(@NotNull RevisionsKey k) {
int c = r1.compareTo(k.r1);
if (c != 0) {
return c;
Modified: jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/StringValue.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/StringValue.java?rev=1836194&r1=1836193&r2=1836194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/StringValue.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/StringValue.java Wed Jul 18 15:08:27 2018
@@ -18,9 +18,8 @@
*/
package org.apache.jackrabbit.oak.plugins.document.util;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.oak.cache.CacheValue;
+import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -35,7 +34,7 @@ public final class StringValue implement
private final String value;
- public StringValue(@Nonnull String value) {
+ public StringValue(@NotNull String value) {
this.value = checkNotNull(value);
}
@@ -44,7 +43,7 @@ public final class StringValue implement
return getMemory(value);
}
- public static int getMemory(@Nonnull String s) {
+ public static int getMemory(@NotNull String s) {
long size = 16 // shallow size
+ 40 + (long)s.length() * 2; // value
if (size > Integer.MAX_VALUE) {
Modified: jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/SynchronizingDocumentStoreWrapper.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/SynchronizingDocumentStoreWrapper.java?rev=1836194&r1=1836193&r2=1836194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/SynchronizingDocumentStoreWrapper.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/SynchronizingDocumentStoreWrapper.java Wed Jul 18 15:08:27 2018
@@ -19,8 +19,6 @@ package org.apache.jackrabbit.oak.plugin
import java.util.List;
import java.util.Map;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.oak.cache.CacheStats;
import org.apache.jackrabbit.oak.plugins.document.Collection;
import org.apache.jackrabbit.oak.plugins.document.Document;
@@ -30,6 +28,7 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.plugins.document.RevisionVector;
import org.apache.jackrabbit.oak.plugins.document.UpdateOp;
import org.apache.jackrabbit.oak.plugins.document.cache.CacheInvalidationStats;
+import org.jetbrains.annotations.NotNull;
/**
* Implements a <code>DocumentStore</code> wrapper which synchronizes on all
@@ -54,14 +53,14 @@ public class SynchronizingDocumentStoreW
}
@Override
- @Nonnull
+ @NotNull
public synchronized <T extends Document> List<T> query(final Collection<T> collection, final String fromKey,
final String toKey, final int limit) {
return store.query(collection, fromKey, toKey, limit);
}
@Override
- @Nonnull
+ @NotNull
public synchronized <T extends Document> List<T> query(final Collection<T> collection, final String fromKey,
final String toKey, final String indexedProperty, final long startValue, final int limit) {
return store.query(collection, fromKey, toKey, indexedProperty, startValue, limit);
@@ -155,7 +154,7 @@ public class SynchronizingDocumentStoreW
return store.getMetadata();
}
- @Nonnull
+ @NotNull
@Override
public synchronized Map<String, String> getStats() {
return store.getStats();
Modified: jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/TimingDocumentStoreWrapper.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/TimingDocumentStoreWrapper.java?rev=1836194&r1=1836193&r2=1836194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/TimingDocumentStoreWrapper.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/TimingDocumentStoreWrapper.java Wed Jul 18 15:08:27 2018
@@ -25,10 +25,6 @@ import java.util.Map.Entry;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicInteger;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
import org.apache.jackrabbit.oak.cache.CacheStats;
import org.apache.jackrabbit.oak.plugins.document.Collection;
import org.apache.jackrabbit.oak.plugins.document.Document;
@@ -38,6 +34,8 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.plugins.document.RevisionVector;
import org.apache.jackrabbit.oak.plugins.document.UpdateOp;
import org.apache.jackrabbit.oak.plugins.document.cache.CacheInvalidationStats;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
/**
* A DocumentStore wrapper that can be used to log and also time DocumentStore
@@ -90,7 +88,7 @@ public class TimingDocumentStoreWrapper
}
@Override
- @CheckForNull
+ @Nullable
public <T extends Document> T find(Collection<T> collection, String key) {
try {
long start = now();
@@ -106,7 +104,7 @@ public class TimingDocumentStoreWrapper
}
@Override
- @CheckForNull
+ @Nullable
public <T extends Document> T find(Collection<T> collection, String key, int maxCacheAge) {
try {
long start = now();
@@ -122,7 +120,7 @@ public class TimingDocumentStoreWrapper
}
@Override
- @Nonnull
+ @NotNull
public <T extends Document> List<T> query(Collection<T> collection,
String fromKey,
String toKey,
@@ -147,7 +145,7 @@ public class TimingDocumentStoreWrapper
}
@Override
- @Nonnull
+ @NotNull
public <T extends Document> List<T> query(Collection<T> collection,
String fromKey,
String toKey,
@@ -246,7 +244,7 @@ public class TimingDocumentStoreWrapper
}
@Override
- @CheckForNull
+ @Nullable
public <T extends Document> T createOrUpdate(Collection<T> collection, UpdateOp update) {
try {
long start = now();
@@ -281,7 +279,7 @@ public class TimingDocumentStoreWrapper
}
@Override
- @CheckForNull
+ @Nullable
public <T extends Document> T findAndUpdate(Collection<T> collection, UpdateOp update) {
try {
long start = now();
@@ -383,7 +381,7 @@ public class TimingDocumentStoreWrapper
return base.getMetadata();
}
- @Nonnull
+ @NotNull
@Override
public Map<String, String> getStats() {
try {
Modified: jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/Utils.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/Utils.java?rev=1836194&r1=1836193&r2=1836194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/Utils.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/Utils.java Wed Jul 18 15:08:27 2018
@@ -31,10 +31,6 @@ import java.util.Map.Entry;
import java.util.SortedMap;
import java.util.TreeMap;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
import com.google.common.base.Function;
import com.google.common.base.Predicate;
import com.google.common.collect.AbstractIterator;
@@ -49,6 +45,8 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.plugins.document.RevisionVector;
import org.apache.jackrabbit.oak.plugins.document.StableRevisionComparator;
import org.apache.jackrabbit.oak.stats.Clock;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -282,7 +280,7 @@ public class Utils {
* @param id id for which parent id needs to be determined
* @return parent id. null if parent id cannot be determined
*/
- @CheckForNull
+ @Nullable
public static String getParentId(String id){
if(Utils.isIdFromLongPath(id)){
return null;
@@ -444,7 +442,7 @@ public class Utils {
* @param fromKey key used as start key in queries
* @return parentId if possible.
*/
- @CheckForNull
+ @Nullable
public static String getParentIdFromLowerLimit(String fromKey){
//If key just ends with slash 2:/foo/ then append a fake
//name to create a proper id
@@ -474,9 +472,9 @@ public class Utils {
* @param tag the associated commit tag.
* @return the actual commit revision for <code>rev</code>.
*/
- @Nonnull
- public static Revision resolveCommitRevision(@Nonnull Revision rev,
- @Nonnull String tag) {
+ @NotNull
+ public static Revision resolveCommitRevision(@NotNull Revision rev,
+ @NotNull String tag) {
return checkNotNull(tag).startsWith("c-") ?
Revision.fromString(tag.substring(2)) : rev;
}
@@ -513,7 +511,7 @@ public class Utils {
* @param b the second revision (or {@code null}).
* @return the revision with the newer timestamp.
*/
- @CheckForNull
+ @Nullable
public static Revision max(@Nullable Revision a, @Nullable Revision b) {
return max(a, b, StableRevisionComparator.INSTANCE);
}
@@ -529,10 +527,10 @@ public class Utils {
* @param c the comparator.
* @return the revision considered more recent.
*/
- @CheckForNull
+ @Nullable
public static Revision max(@Nullable Revision a,
@Nullable Revision b,
- @Nonnull Comparator<Revision> c) {
+ @NotNull Comparator<Revision> c) {
if (a == null) {
return b;
} else if (b == null) {
@@ -550,7 +548,7 @@ public class Utils {
* @param b the second revision (or {@code null}).
* @return the revision with the older timestamp.
*/
- @CheckForNull
+ @Nullable
public static Revision min(@Nullable Revision a, @Nullable Revision b) {
return min(a, b, StableRevisionComparator.INSTANCE);
}
@@ -566,10 +564,10 @@ public class Utils {
* @param c the comparator.
* @return the revision considered more recent.
*/
- @CheckForNull
+ @Nullable
public static Revision min(@Nullable Revision a,
@Nullable Revision b,
- @Nonnull Comparator<Revision> c) {
+ @NotNull Comparator<Revision> c) {
if (a == null) {
return b;
} else if (b == null) {
@@ -606,8 +604,8 @@ public class Utils {
* @return the root document.
* @throws IllegalStateException if there is no root document.
*/
- @Nonnull
- public static NodeDocument getRootDocument(@Nonnull DocumentStore store) {
+ @NotNull
+ public static NodeDocument getRootDocument(@NotNull DocumentStore store) {
String rootId = Utils.getIdFromPath("/");
NodeDocument root = store.find(Collection.NODES, rootId);
if (root == null) {
@@ -694,7 +692,7 @@ public class Utils {
* @return if {@code path} represent oak's internal path. That is, a path
* element start with a colon.
*/
- public static boolean isHiddenPath(@Nonnull String path) {
+ public static boolean isHiddenPath(@NotNull String path) {
return path.contains("/:");
}
@@ -704,7 +702,7 @@ public class Utils {
* {@code null} values.
*/
public static Iterable<StringValue> asStringValueIterable(
- @Nonnull Iterable<String> values) {
+ @NotNull Iterable<String> values) {
return transform(values, new Function<String, StringValue>() {
@Override
public StringValue apply(String input) {
@@ -716,7 +714,7 @@ public class Utils {
/**
* Transforms the given paths into ids using {@link #getIdFromPath(String)}.
*/
- public static Iterable<String> pathToId(@Nonnull Iterable<String> paths) {
+ public static Iterable<String> pathToId(@NotNull Iterable<String> paths) {
return transform(paths, new Function<String, String>() {
@Override
public String apply(String input) {
@@ -774,9 +772,9 @@ public class Utils {
* are derived from the startTime of a cluster node.
* @return the minimum timestamp.
*/
- public static long getMinTimestampForDiff(@Nonnull RevisionVector fromRev,
- @Nonnull RevisionVector toRev,
- @Nonnull RevisionVector minRevisions) {
+ public static long getMinTimestampForDiff(@NotNull RevisionVector fromRev,
+ @NotNull RevisionVector toRev,
+ @NotNull RevisionVector minRevisions) {
// make sure we have minimum revisions for all known cluster nodes
fromRev = fromRev.pmax(minRevisions);
toRev = toRev.pmax(minRevisions);
@@ -804,8 +802,8 @@ public class Utils {
* @return true if all the revisions in the {@code a} are at least
* as recent as their counterparts in the {@code b}
*/
- public static boolean isGreaterOrEquals(@Nonnull RevisionVector a,
- @Nonnull RevisionVector b) {
+ public static boolean isGreaterOrEquals(@NotNull RevisionVector a,
+ @NotNull RevisionVector b) {
return a.pmax(b).equals(a);
}
@@ -820,8 +818,8 @@ public class Utils {
* @param clusterId the local clusterId.
* @return whether the changes are considered local.
*/
- public static boolean isLocalChange(@Nonnull RevisionVector from,
- @Nonnull RevisionVector to,
+ public static boolean isLocalChange(@NotNull RevisionVector from,
+ @NotNull RevisionVector to,
int clusterId) {
RevisionVector diff = to.difference(from);
return diff.getDimensions() == 1 && diff.getRevision(clusterId) != null;
@@ -871,8 +869,8 @@ public class Utils {
* waiting. The interrupted status on the current thread is cleared
* when this exception is thrown.
*/
- public static void alignWithExternalRevisions(@Nonnull NodeDocument rootDoc,
- @Nonnull Clock clock,
+ public static void alignWithExternalRevisions(@NotNull NodeDocument rootDoc,
+ @NotNull Clock clock,
int clusterId)
throws InterruptedException {
Map<Integer, Revision> lastRevMap = checkNotNull(rootDoc).getLastRev();
Modified: jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/AmnesiaDiffCache.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/AmnesiaDiffCache.java?rev=1836194&r1=1836193&r2=1836194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/AmnesiaDiffCache.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/AmnesiaDiffCache.java Wed Jul 18 15:08:27 2018
@@ -18,10 +18,9 @@ package org.apache.jackrabbit.oak.plugin
import java.util.Collections;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
import org.apache.jackrabbit.oak.cache.CacheStats;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
/**
* A diff cache implementation, which immediately forgets the diff.
@@ -35,9 +34,9 @@ class AmnesiaDiffCache extends DiffCache
}
@Override
- public String getChanges(@Nonnull RevisionVector from,
- @Nonnull RevisionVector to,
- @Nonnull String path,
+ public String getChanges(@NotNull RevisionVector from,
+ @NotNull RevisionVector to,
+ @NotNull String path,
@Nullable Loader loader) {
if (loader != null) {
return loader.call();
@@ -45,12 +44,12 @@ class AmnesiaDiffCache extends DiffCache
return null;
}
- @Nonnull
+ @NotNull
@Override
- public Entry newEntry(@Nonnull RevisionVector from, @Nonnull RevisionVector to, boolean local) {
+ public Entry newEntry(@NotNull RevisionVector from, @NotNull RevisionVector to, boolean local) {
return new Entry() {
@Override
- public void append(@Nonnull String path, @Nonnull String changes) {
+ public void append(@NotNull String path, @NotNull String changes) {
}
@Override
@@ -60,7 +59,7 @@ class AmnesiaDiffCache extends DiffCache
};
}
- @Nonnull
+ @NotNull
@Override
public Iterable<CacheStats> getStats() {
return Collections.emptyList();
Modified: jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/BranchStateTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/BranchStateTest.java?rev=1836194&r1=1836193&r2=1836194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/BranchStateTest.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/BranchStateTest.java Wed Jul 18 15:08:27 2018
@@ -16,14 +16,13 @@
*/
package org.apache.jackrabbit.oak.plugins.document;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.plugins.document.util.Utils;
import org.apache.jackrabbit.oak.spi.commit.CommitHook;
import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
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;
@@ -72,7 +71,7 @@ public class BranchStateTest {
}
private static final class FailingHook implements 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/CacheConsistencyRDBTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/CacheConsistencyRDBTest.java?rev=1836194&r1=1836193&r2=1836194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/CacheConsistencyRDBTest.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/CacheConsistencyRDBTest.java Wed Jul 18 15:08:27 2018
@@ -23,8 +23,6 @@ import java.util.Map;
import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import javax.sql.DataSource;
import org.apache.jackrabbit.oak.plugins.document.DocumentMK.Builder;
@@ -34,6 +32,8 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.plugins.document.rdb.RDBRow;
import org.apache.jackrabbit.oak.plugins.document.util.Utils;
import org.apache.jackrabbit.oak.spi.state.NodeState;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.junit.Before;
import org.junit.Test;
@@ -107,7 +107,7 @@ public class CacheConsistencyRDBTest ext
}
@Override
- protected <T extends Document> T convertFromDBObject(@Nonnull Collection<T> collection, @Nullable RDBRow row) {
+ protected <T extends Document> T convertFromDBObject(@NotNull Collection<T> collection, @Nullable RDBRow row) {
Semaphore s = semaphores.get(Thread.currentThread());
if (s != null) {
s.acquireUninterruptibly();
Modified: jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/CacheConsistencyTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/CacheConsistencyTest.java?rev=1836194&r1=1836193&r2=1836194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/CacheConsistencyTest.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/CacheConsistencyTest.java Wed Jul 18 15:08:27 2018
@@ -20,12 +20,11 @@ import java.util.Map;
import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
import org.apache.jackrabbit.oak.plugins.document.mongo.MongoDocumentStore;
import org.apache.jackrabbit.oak.plugins.document.util.Utils;
import org.apache.jackrabbit.oak.spi.state.NodeState;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.junit.Before;
import org.junit.Test;
@@ -115,7 +114,7 @@ public class CacheConsistencyTest extend
@Override
protected <T extends Document> T convertFromDBObject(
- @Nonnull Collection<T> collection, @Nullable DBObject n) {
+ @NotNull Collection<T> collection, @Nullable DBObject n) {
Semaphore s = semaphores.get(Thread.currentThread());
if (s != null) {
s.acquireUninterruptibly();
Modified: jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/ClusterConflictTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/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/ClusterConflictTest.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/ClusterConflictTest.java Wed Jul 18 15:08:27 2018
@@ -21,8 +21,6 @@ import java.util.Collections;
import java.util.List;
import java.util.concurrent.atomic.AtomicLong;
-import javax.annotation.CheckForNull;
-
import com.google.common.collect.Lists;
import org.apache.jackrabbit.oak.api.CommitFailedException;
@@ -37,6 +35,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.Nullable;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -214,7 +213,7 @@ public class ClusterConflictTest {
TestHook() {
super(new EditorProvider() {
- @CheckForNull
+ @Nullable
@Override
public Editor getRootEditor(NodeState before,
NodeState after,
Modified: jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/ClusterTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/ClusterTest.java?rev=1836194&r1=1836193&r2=1836194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/ClusterTest.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/ClusterTest.java Wed Jul 18 15:08:27 2018
@@ -26,8 +26,6 @@ import static org.junit.Assert.fail;
import java.util.HashSet;
import java.util.List;
-import javax.annotation.Nonnull;
-
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import com.mongodb.client.MongoDatabase;
@@ -46,6 +44,7 @@ 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.json.simple.JSONObject;
import org.json.simple.parser.JSONParser;
import org.junit.After;
@@ -358,8 +357,8 @@ public class ClusterTest {
DocumentNodeStore ns1 = createMK(1, 0).getNodeStore();
ns1.addObserver(new Observer() {
@Override
- public void contentChanged(@Nonnull NodeState root,
- @Nonnull CommitInfo info) {
+ public void contentChanged(@NotNull NodeState root,
+ @NotNull CommitInfo info) {
rootStates1.add((DocumentNodeState) root);
}
});
@@ -367,8 +366,8 @@ public class ClusterTest {
DocumentNodeStore ns2 = createMK(2, 0).getNodeStore();
ns2.addObserver(new Observer() {
@Override
- public void contentChanged(@Nonnull NodeState root,
- @Nonnull CommitInfo info) {
+ public void contentChanged(@NotNull NodeState root,
+ @NotNull CommitInfo info) {
rootStates2.add((DocumentNodeState) root);
}
});
Modified: jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/CollisionTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/CollisionTest.java?rev=1836194&r1=1836193&r2=1836194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/CollisionTest.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/CollisionTest.java Wed Jul 18 15:08:27 2018
@@ -18,13 +18,12 @@ package org.apache.jackrabbit.oak.plugin
import java.util.concurrent.atomic.AtomicInteger;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.plugins.document.util.Utils;
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;
@@ -153,14 +152,14 @@ public class CollisionTest {
assertTrue(col.isConflicting());
}
- @Nonnull
+ @NotNull
private static RevisionVector merge(DocumentNodeStore ns, NodeBuilder nb)
throws CommitFailedException {
ns.merge(nb, EmptyHook.INSTANCE, CommitInfo.EMPTY);
return ns.getHeadRevision();
}
- @Nonnull
+ @NotNull
private static NodeDocument getDocument(DocumentStore store, String id) {
NodeDocument doc = store.find(NODES, id);
assertNotNull(doc);
Modified: jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/CommitQueueTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/CommitQueueTest.java?rev=1836194&r1=1836193&r2=1836194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/CommitQueueTest.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/CommitQueueTest.java Wed Jul 18 15:08:27 2018
@@ -27,15 +27,14 @@ import java.util.concurrent.Semaphore;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicReference;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
import org.apache.jackrabbit.oak.spi.commit.EmptyHook;
import org.apache.jackrabbit.oak.spi.commit.Observer;
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;
import org.junit.Rule;
import org.junit.Test;
import org.slf4j.Logger;
@@ -74,7 +73,7 @@ public class CommitQueueTest {
new Revision(0, 0, store.getClusterId()));
@Override
- public void contentChanged(@Nonnull NodeState root, @Nullable CommitInfo info) {
+ public void contentChanged(@NotNull NodeState root, @Nullable CommitInfo info) {
DocumentNodeState after = (DocumentNodeState) root;
RevisionVector r = after.getRootRevision();
LOG.debug("seen: {}", r);
@@ -136,7 +135,7 @@ public class CommitQueueTest {
private Revision before = Revision.newRevision(1);
@Override
- public void headOfQueue(@Nonnull Revision r) {
+ public void headOfQueue(@NotNull Revision r) {
LOG.debug("seen: {}", r);
if (r.compareRevisionTime(before) < 0) {
exceptions.add(new Exception(
@@ -217,7 +216,7 @@ public class CommitQueueTest {
public void suspendUntil() throws Exception {
final AtomicReference<RevisionVector> headRevision = new AtomicReference<RevisionVector>();
RevisionContext context = new DummyRevisionContext() {
- @Nonnull
+ @NotNull
@Override
public RevisionVector getHeadRevision() {
return headRevision.get();
@@ -265,7 +264,7 @@ public class CommitQueueTest {
public void suspendUntilTimeout() throws Exception {
final AtomicReference<RevisionVector> headRevision = new AtomicReference<RevisionVector>();
RevisionContext context = new DummyRevisionContext() {
- @Nonnull
+ @NotNull
@Override
public RevisionVector getHeadRevision() {
return headRevision.get();
@@ -292,7 +291,7 @@ public class CommitQueueTest {
public void concurrentSuspendUntil() throws Exception {
final AtomicReference<RevisionVector> headRevision = new AtomicReference<RevisionVector>();
RevisionContext context = new DummyRevisionContext() {
- @Nonnull
+ @NotNull
@Override
public RevisionVector getHeadRevision() {
return headRevision.get();
@@ -357,7 +356,7 @@ public class CommitQueueTest {
final Semaphore s1 = new Semaphore(0);
final CommitQueue.Callback c = new CommitQueue.Callback() {
@Override
- public void headOfQueue(@Nonnull Revision revision) {
+ public void headOfQueue(@NotNull Revision revision) {
s1.acquireUninterruptibly();
}
};
Modified: jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/ConcurrentReadAndAddTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/ConcurrentReadAndAddTest.java?rev=1836194&r1=1836193&r2=1836194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/ConcurrentReadAndAddTest.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/ConcurrentReadAndAddTest.java Wed Jul 18 15:08:27 2018
@@ -21,8 +21,6 @@ import java.util.Collections;
import java.util.List;
import java.util.concurrent.Semaphore;
-import javax.annotation.Nonnull;
-
import com.google.common.collect.Iterables;
import org.apache.jackrabbit.oak.api.CommitFailedException;
@@ -32,6 +30,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.spi.state.NodeState;
+import org.jetbrains.annotations.NotNull;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -52,7 +51,7 @@ public class ConcurrentReadAndAddTest {
@Before
public void setUp() throws Exception {
ns = builderProvider.newBuilder().setDocumentStore(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/CountingDiffCache.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/CountingDiffCache.java?rev=1836194&r1=1836193&r2=1836194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/CountingDiffCache.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/CountingDiffCache.java Wed Jul 18 15:08:27 2018
@@ -16,8 +16,8 @@
*/
package org.apache.jackrabbit.oak.plugins.document;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
public class CountingDiffCache extends MemoryDiffCache {
@@ -56,9 +56,9 @@ public class CountingDiffCache extends M
}
@Override
- public String getChanges(@Nonnull RevisionVector from,
- @Nonnull RevisionVector to,
- @Nonnull String path,
+ public String getChanges(@NotNull RevisionVector from,
+ @NotNull RevisionVector to,
+ @NotNull String path,
@Nullable Loader loader) {
return super.getChanges(from, to, path, new CountingLoader(loader));
}
Modified: jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/CountingDocumentStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/CountingDocumentStore.java?rev=1836194&r1=1836193&r2=1836194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/CountingDocumentStore.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/CountingDocumentStore.java Wed Jul 18 15:08:27 2018
@@ -20,10 +20,9 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.oak.cache.CacheStats;
import org.apache.jackrabbit.oak.plugins.document.cache.CacheInvalidationStats;
+import org.jetbrains.annotations.NotNull;
public class CountingDocumentStore implements DocumentStore, RevisionListener {
@@ -97,7 +96,7 @@ public class CountingDocumentStore imple
return delegate.find(collection, key, maxCacheAge);
}
- @Nonnull
+ @NotNull
@Override
public <T extends Document> List<T> query(Collection<T> collection,
String fromKey,
@@ -110,7 +109,7 @@ public class CountingDocumentStore imple
return delegate.query(collection, fromKey, toKey, limit);
}
- @Nonnull
+ @NotNull
@Override
public <T extends Document> List<T> query(Collection<T> collection,
String fromKey,
@@ -224,7 +223,7 @@ public class CountingDocumentStore imple
return delegate.getMetadata();
}
- @Nonnull
+ @NotNull
@Override
public Map<String, String> getStats() {
return delegate.getStats();
Modified: jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMK.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMK.java?rev=1836194&r1=1836193&r2=1836194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMK.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMK.java Wed Jul 18 15:08:27 2018
@@ -23,8 +23,6 @@ import java.io.InputStream;
import java.util.List;
import java.util.Set;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import javax.sql.DataSource;
import com.google.common.collect.Lists;
@@ -47,6 +45,8 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.plugins.document.rdb.RDBVersionGCSupport;
import org.apache.jackrabbit.oak.spi.blob.GarbageCollectableBlobStore;
import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -248,8 +248,8 @@ public class DocumentMK {
}
}
- @Nonnull
- public String rebase(@Nonnull String branchRevisionId,
+ @NotNull
+ public String rebase(@NotNull String branchRevisionId,
@Nullable String newBaseRevisionId)
throws DocumentStoreException {
RevisionVector r = RevisionVector.fromString(branchRevisionId);
@@ -259,9 +259,9 @@ public class DocumentMK {
return nodeStore.rebase(r, base).toString();
}
- @Nonnull
- public String reset(@Nonnull String branchRevisionId,
- @Nonnull String ancestorRevisionId)
+ @NotNull
+ public String reset(@NotNull String branchRevisionId,
+ @NotNull String ancestorRevisionId)
throws DocumentStoreException {
RevisionVector branch = RevisionVector.fromString(branchRevisionId);
if (!branch.isBranch()) {
Modified: jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBranchInCommitHookTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBranchInCommitHookTest.java?rev=1836194&r1=1836193&r2=1836194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBranchInCommitHookTest.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBranchInCommitHookTest.java Wed Jul 18 15:08:27 2018
@@ -19,8 +19,6 @@ package org.apache.jackrabbit.oak.plugin
import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.plugins.document.util.Utils;
import org.apache.jackrabbit.oak.spi.commit.CommitHook;
@@ -32,6 +30,7 @@ import org.apache.jackrabbit.oak.spi.com
import org.apache.jackrabbit.oak.spi.commit.EditorProvider;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.jackrabbit.oak.spi.state.NodeState;
+import org.jetbrains.annotations.NotNull;
import org.junit.Rule;
import org.junit.Test;
@@ -164,7 +163,7 @@ public class DocumentNodeStoreBranchInCo
this.countDown = numFailures;
}
- @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/DocumentNodeStoreBranchesTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBranchesTest.java?rev=1836194&r1=1836193&r2=1836194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBranchesTest.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBranchesTest.java Wed Jul 18 15:08:27 2018
@@ -21,8 +21,6 @@ import static org.junit.Assert.assertTru
import java.util.Arrays;
-import javax.annotation.CheckForNull;
-
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.Type;
@@ -38,6 +36,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.stats.Clock;
+import org.jetbrains.annotations.Nullable;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.BeforeClass;
@@ -160,7 +159,7 @@ public class DocumentNodeStoreBranchesTe
TestHook(final String prefix) {
super(new EditorProvider() {
- @CheckForNull
+ @Nullable
@Override
public Editor getRootEditor(NodeState before, NodeState after, NodeBuilder builder, CommitInfo info)
throws CommitFailedException {
Modified: jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreServiceTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreServiceTest.java?rev=1836194&r1=1836193&r2=1836194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreServiceTest.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreServiceTest.java Wed Jul 18 15:08:27 2018
@@ -20,8 +20,6 @@ import java.io.File;
import java.lang.reflect.Field;
import java.util.Map;
-import javax.annotation.Nonnull;
-
import com.google.common.base.Supplier;
import com.google.common.collect.Maps;
import com.mongodb.MongoClient;
@@ -34,6 +32,7 @@ import org.apache.jackrabbit.oak.spi.sta
import org.apache.jackrabbit.oak.stats.StatisticsProvider;
import org.apache.sling.testing.mock.osgi.MockOsgi;
import org.apache.sling.testing.mock.osgi.junit.OsgiContext;
+import org.jetbrains.annotations.NotNull;
import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
@@ -260,7 +259,7 @@ public class DocumentNodeStoreServiceTes
assertEquals(LeaseCheckMode.LENIENT, dns.getClusterInfo().getLeaseCheckMode());
}
- @Nonnull
+ @NotNull
private static MongoDocumentStore getMongoDocumentStore(DocumentNodeStore s) {
try {
Field f = s.getClass().getDeclaredField("nonLeaseCheckingStore");
Modified: jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreSweepTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreSweepTest.java?rev=1836194&r1=1836193&r2=1836194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreSweepTest.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreSweepTest.java Wed Jul 18 15:08:27 2018
@@ -21,8 +21,6 @@ import java.util.Map;
import java.util.SortedMap;
import java.util.concurrent.TimeUnit;
-import javax.annotation.Nonnull;
-
import com.google.common.collect.Iterables;
import com.google.common.collect.Maps;
@@ -33,6 +31,7 @@ import org.apache.jackrabbit.oak.plugins
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.AfterClass;
import org.junit.Before;
import org.junit.Rule;
@@ -242,7 +241,7 @@ public class DocumentNodeStoreSweepTest
// restart with a document store that tracks queries
final Map<String, Long> queries = Maps.newHashMap();
store = new FailingDocumentStore(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/DocumentNodeStoreTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java?rev=1836194&r1=1836193&r2=1836194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java Wed Jul 18 15:08:27 2018
@@ -80,8 +80,6 @@ import java.util.concurrent.atomic.Atomi
import java.util.concurrent.atomic.AtomicReference;
import java.util.concurrent.locks.ReentrantReadWriteLock;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
import javax.jcr.InvalidItemStateException;
import com.google.common.base.Throwables;
@@ -118,6 +116,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 org.junit.AfterClass;
import org.junit.Before;
import org.junit.Ignore;
@@ -230,7 +230,7 @@ public class DocumentNodeStoreTest {
public void childNodeEntries() throws Exception {
final AtomicInteger counter = new AtomicInteger();
DocumentStore docStore = new MemoryDocumentStore() {
- @Nonnull
+ @NotNull
@Override
public <T extends Document> List<T> query(Collection<T> collection,
String fromKey,
@@ -507,7 +507,7 @@ public class DocumentNodeStoreTest {
public void readChildrenWithDeletedSiblings() throws Exception {
final AtomicInteger maxLimit = new AtomicInteger(0);
DocumentStore docStore = new MemoryDocumentStore() {
- @Nonnull
+ @NotNull
@Override
public <T extends Document> List<T> query(Collection<T> collection,
String fromKey,
@@ -816,7 +816,7 @@ public class DocumentNodeStoreTest {
public void diffOnce() 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,
@@ -1875,12 +1875,12 @@ public class DocumentNodeStoreTest {
private final Semaphore controllee = new Semaphore(0);
private void startMerge(final NodeStore store,
- @Nonnull String [] addChildren, @Nonnull String [] removeChildren, boolean change) {
+ @NotNull String [] addChildren, @NotNull String [] removeChildren, boolean change) {
startMerge(store, null, addChildren, removeChildren, change);
}
private void startMerge(final NodeStore store, final CommitHook hook,
- @Nonnull String [] addChildren, @Nonnull String [] removeChildren, boolean change) {
+ @NotNull String [] addChildren, @NotNull String [] removeChildren, boolean change) {
setDontBlock(false);
//our controller is controllee for merge thread (and vice versa)
@@ -1914,13 +1914,13 @@ public class DocumentNodeStoreTest {
private Thread createMergeThread(final NodeStore store, final CommitHook hook,
final Semaphore controller, final Semaphore controllee,
- @Nonnull final String [] addChildren, @Nonnull final String [] removeChildren,
+ @NotNull final String [] addChildren, @NotNull final String [] removeChildren,
final boolean change) {
return new Thread(new Runnable() {
@Override
public void run() {
final CommitHook blockingHook = new CommitHook() {
- @Nonnull
+ @NotNull
@Override
public NodeState processCommit(NodeState before, NodeState after, CommitInfo info)
throws CommitFailedException {
@@ -2142,7 +2142,7 @@ public class DocumentNodeStoreTest {
public void diffCache() 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,
@@ -2202,7 +2202,7 @@ public class DocumentNodeStoreTest {
Revision.setClock(clock);
final List<Long> startValues = Lists.newArrayList();
MemoryDocumentStore ds = new MemoryDocumentStore() {
- @Nonnull
+ @NotNull
@Override
public <T extends Document> List<T> query(Collection<T> collection,
String fromKey,
@@ -2309,7 +2309,7 @@ public class DocumentNodeStoreTest {
try {
b.merge(new CommitHook() {
- @Nonnull
+ @NotNull
@Override
public NodeState processCommit(NodeState before,
NodeState after,
@@ -2741,7 +2741,7 @@ public class DocumentNodeStoreTest {
final AtomicBoolean failCommit = new AtomicBoolean();
ns.addObserver(new Observer() {
@Override
- public void contentChanged(@Nonnull NodeState root, @Nonnull CommitInfo info) {
+ public void contentChanged(@NotNull NodeState root, @NotNull CommitInfo info) {
if (failCommit.get()){
throw testException;
}
@@ -2764,7 +2764,7 @@ public class DocumentNodeStoreTest {
public void localChangesFromCache() throws Exception {
final AtomicInteger numQueries = new AtomicInteger();
DocumentStore store = new MemoryDocumentStore() {
- @Nonnull
+ @NotNull
@Override
public <T extends Document> List<T> query(Collection<T> collection,
String fromKey,
@@ -3191,7 +3191,7 @@ public class DocumentNodeStoreTest {
@Override
public MissingLastRevSeeker createMissingLastRevSeeker() {
return new MissingLastRevSeeker(getDocumentStore(), getClock()) {
- @Nonnull
+ @NotNull
@Override
public Iterable<NodeDocument> getCandidates(long startTime) {
candidateCalls.incrementAndGet();
@@ -3889,7 +3889,7 @@ public class DocumentNodeStoreTest {
TestHook(final String prefix) {
super(new EditorProvider() {
- @CheckForNull
+ @Nullable
@Override
public Editor getRootEditor(NodeState before,
NodeState after,
@@ -3903,7 +3903,7 @@ public class DocumentNodeStoreTest {
}
private static final CommitHook FAILING_HOOK = 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/DocumentSplitTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentSplitTest.java?rev=1836194&r1=1836193&r2=1836194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentSplitTest.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentSplitTest.java Wed Jul 18 15:08:27 2018
@@ -26,8 +26,6 @@ import java.util.Random;
import java.util.Set;
import java.util.TreeSet;
-import javax.annotation.Nonnull;
-
import com.google.common.base.Predicate;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Iterators;
@@ -46,6 +44,7 @@ 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.junit.Test;
import com.google.common.collect.Iterables;
@@ -1097,7 +1096,7 @@ public class DocumentSplitTest extends B
return rc.getClusterId();
}
- @Nonnull
+ @NotNull
@Override
public RevisionVector getHeadRevision() {
try {
@@ -1108,21 +1107,21 @@ public class DocumentSplitTest extends B
return rc.getHeadRevision();
}
- @Nonnull
+ @NotNull
@Override
public Revision newRevision() {
return rc.newRevision();
}
- @Nonnull
+ @NotNull
@Override
public Clock getClock() {
return rc.getClock();
}
@Override
- public String getCommitValue(@Nonnull Revision changeRevision,
- @Nonnull NodeDocument doc) {
+ public String getCommitValue(@NotNull Revision changeRevision,
+ @NotNull NodeDocument doc) {
return rc.getCommitValue(changeRevision, doc);
}
}
Modified: jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreWrapper.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreWrapper.java?rev=1836194&r1=1836193&r2=1836194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreWrapper.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreWrapper.java Wed Jul 18 15:08:27 2018
@@ -19,10 +19,9 @@ package org.apache.jackrabbit.oak.plugin
import java.util.List;
import java.util.Map;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.oak.cache.CacheStats;
import org.apache.jackrabbit.oak.plugins.document.cache.CacheInvalidationStats;
+import org.jetbrains.annotations.NotNull;
/**
* A DocumentStore implementation which wraps another store and delegates all
@@ -48,7 +47,7 @@ public class DocumentStoreWrapper implem
return store.find(collection, key, maxCacheAge);
}
- @Nonnull
+ @NotNull
@Override
public <T extends Document> List<T> query(Collection<T> collection,
String fromKey,
@@ -57,7 +56,7 @@ public class DocumentStoreWrapper implem
return store.query(collection, fromKey, toKey, limit);
}
- @Nonnull
+ @NotNull
@Override
public <T extends Document> List<T> query(Collection<T> collection,
String fromKey,
@@ -160,7 +159,7 @@ public class DocumentStoreWrapper implem
return store.getMetadata();
}
- @Nonnull
+ @NotNull
@Override
public Map<String, String> getStats() {
return store.getStats();
Modified: jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DummyRevisionContext.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DummyRevisionContext.java?rev=1836194&r1=1836193&r2=1836194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DummyRevisionContext.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DummyRevisionContext.java Wed Jul 18 15:08:27 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;
/**
* A revision context for tests.
@@ -42,27 +41,27 @@ public class DummyRevisionContext implem
return 1;
}
- @Nonnull
+ @NotNull
@Override
public RevisionVector getHeadRevision() {
return new RevisionVector(Revision.newRevision(getClusterId()));
}
- @Nonnull
+ @NotNull
@Override
public Revision newRevision() {
return Revision.newRevision(getClusterId());
}
- @Nonnull
+ @NotNull
@Override
public Clock getClock() {
return Clock.SIMPLE;
}
@Override
- public String getCommitValue(@Nonnull Revision changeRevision,
- @Nonnull NodeDocument doc) {
+ public String getCommitValue(@NotNull Revision changeRevision,
+ @NotNull NodeDocument doc) {
return doc.resolveCommitValue(changeRevision);
}
}
Modified: jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/ExternalChangesTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/ExternalChangesTest.java?rev=1836194&r1=1836193&r2=1836194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/ExternalChangesTest.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/ExternalChangesTest.java Wed Jul 18 15:08:27 2018
@@ -23,9 +23,6 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
import com.google.common.base.Joiner;
import com.google.common.base.Splitter;
import com.google.common.collect.ImmutableMap;
@@ -49,6 +46,8 @@ import org.apache.jackrabbit.oak.spi.sta
import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.apache.jackrabbit.oak.spi.whiteboard.DefaultWhiteboard;
import org.apache.jackrabbit.oak.spi.whiteboard.Whiteboard;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -243,7 +242,7 @@ public class ExternalChangesTest {
List<CommitInfo> infos = Lists.newArrayList();
@Override
- public void contentChanged(@Nonnull NodeState root, @Nonnull CommitInfo info) {
+ public void contentChanged(@NotNull NodeState root, @NotNull CommitInfo info) {
infos.add(info);
}
Modified: jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/JournalDiffLoaderTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/JournalDiffLoaderTest.java?rev=1836194&r1=1836193&r2=1836194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/JournalDiffLoaderTest.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/JournalDiffLoaderTest.java Wed Jul 18 15:08:27 2018
@@ -21,8 +21,6 @@ import java.util.Set;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
-import javax.annotation.Nonnull;
-
import com.google.common.collect.Sets;
import org.apache.jackrabbit.oak.api.CommitFailedException;
@@ -36,6 +34,7 @@ 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.junit.AfterClass;
import org.junit.Before;
import org.junit.Rule;
@@ -234,7 +233,7 @@ public class JournalDiffLoaderTest {
public void useJournal() throws Exception {
final AtomicInteger journalQueryCounter = new AtomicInteger();
DocumentStore ds = 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/JournalTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/JournalTest.java?rev=1836194&r1=1836193&r2=1836194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/JournalTest.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/JournalTest.java Wed Jul 18 15:08:27 2018
@@ -22,8 +22,6 @@ import java.util.List;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
-import javax.annotation.Nonnull;
-
import com.google.common.collect.Lists;
import org.apache.jackrabbit.oak.api.PropertyState;
@@ -37,6 +35,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.NodeStateDiff;
+import org.jetbrains.annotations.NotNull;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TestRule;
@@ -85,7 +84,7 @@ public class JournalTest extends Abstrac
}
@Override
- public void contentChanged(@Nonnull NodeState root,@Nonnull CommitInfo info) {
+ public void contentChanged(@NotNull NodeState root,@NotNull CommitInfo info) {
synchronized(incomingRootStates1) {
incomingRootStates1.add((DocumentNodeState) root);
incomingRootStates1.notifyAll();
Modified: jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/ManyChildNodesTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/ManyChildNodesTest.java?rev=1836194&r1=1836193&r2=1836194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/ManyChildNodesTest.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/ManyChildNodesTest.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.Map;
-import javax.annotation.Nonnull;
-
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.ChildNodeEntry;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.jackrabbit.oak.spi.state.NodeStore;
+import org.jetbrains.annotations.NotNull;
import org.junit.Test;
import com.google.common.collect.Maps;
@@ -86,7 +85,7 @@ public class ManyChildNodesTest {
Map<String, Integer> queries = Maps.newHashMap();
- @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/MergeRetryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MergeRetryTest.java?rev=1836194&r1=1836193&r2=1836194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MergeRetryTest.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MergeRetryTest.java Wed Jul 18 15:08:27 2018
@@ -16,8 +16,6 @@
*/
package org.apache.jackrabbit.oak.plugins.document;
-import javax.annotation.CheckForNull;
-
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.plugins.document.memory.MemoryDocumentStore;
import org.apache.jackrabbit.oak.spi.blob.BlobStore;
@@ -30,6 +28,7 @@ import org.apache.jackrabbit.oak.spi.com
import org.apache.jackrabbit.oak.spi.commit.EditorProvider;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.jackrabbit.oak.spi.state.NodeState;
+import org.jetbrains.annotations.Nullable;
import org.junit.Test;
/**
@@ -40,7 +39,7 @@ public class MergeRetryTest {
// this hook adds a 'foo' child if it does not exist
private static final CommitHook HOOK = new EditorHook(new EditorProvider() {
- @CheckForNull
+ @Nullable
@Override
public Editor getRootEditor(
NodeState before, NodeState after, final NodeBuilder builder,
Modified: jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoBlobGCTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoBlobGCTest.java?rev=1836194&r1=1836193&r2=1836194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoBlobGCTest.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoBlobGCTest.java Wed Jul 18 15:08:27 2018
@@ -31,8 +31,6 @@ import java.util.concurrent.Executors;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
-import javax.annotation.Nullable;
-
import ch.qos.logback.classic.Level;
import com.google.common.base.Splitter;
import com.google.common.base.Stopwatch;
@@ -65,6 +63,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.Nullable;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;