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 [4/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/bundlor/BundlingConfigInitializer.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/BundlingConfigInitializer.java?rev=1836194&r1=1836193&r2=1836194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/BundlingConfigInitializer.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/BundlingConfigInitializer.java Wed Jul 18 15:08:27 2018
@@ -19,13 +19,12 @@
package org.apache.jackrabbit.oak.plugins.document.bundlor;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.oak.api.Type;
import org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants;
import org.apache.jackrabbit.oak.spi.lifecycle.RepositoryInitializer;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.jackrabbit.oak.spi.state.NodeState;
+import org.jetbrains.annotations.NotNull;
import static org.apache.jackrabbit.JcrConstants.JCR_PRIMARYTYPE;
import static org.apache.jackrabbit.JcrConstants.JCR_SYSTEM;
@@ -36,7 +35,7 @@ public enum BundlingConfigInitializer im
INSTANCE;
@Override
- public void initialize(@Nonnull NodeBuilder builder) {
+ public void initialize(@NotNull NodeBuilder builder) {
if (builder.hasChildNode(JCR_SYSTEM)){
NodeBuilder system = builder.getChildNode(JCR_SYSTEM);
Modified: jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/BundlorUtils.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/BundlorUtils.java?rev=1836194&r1=1836193&r2=1836194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/BundlorUtils.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/BundlorUtils.java Wed Jul 18 15:08:27 2018
@@ -25,8 +25,6 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import javax.annotation.Nonnull;
-
import com.google.common.base.Predicate;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Lists;
@@ -35,6 +33,7 @@ import com.google.common.collect.Sets;
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.commons.PathUtils;
import org.apache.jackrabbit.oak.spi.state.NodeState;
+import org.jetbrains.annotations.NotNull;
import static org.apache.jackrabbit.oak.plugins.document.bundlor.DocumentBundlor.META_PROP_BUNDLING_PATH;
@@ -74,7 +73,7 @@ public final class BundlorUtils {
if (depth > 0){
value = new PropertyStateWrapper(value){
- @Nonnull
+ @NotNull
@Override
public String getName() {
return newKey;
Modified: jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/PropertyStateWrapper.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/PropertyStateWrapper.java?rev=1836194&r1=1836193&r2=1836194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/PropertyStateWrapper.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/PropertyStateWrapper.java Wed Jul 18 15:08:27 2018
@@ -19,11 +19,10 @@
package org.apache.jackrabbit.oak.plugins.document.bundlor;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.Type;
import org.apache.jackrabbit.oak.plugins.memory.AbstractPropertyState;
+import org.jetbrains.annotations.NotNull;
//TODO Move this to org.apache.jackrabbit.oak.plugins.memory
class PropertyStateWrapper extends AbstractPropertyState implements PropertyState {
@@ -33,7 +32,7 @@ class PropertyStateWrapper extends Abstr
this.delegate = delegate;
}
- @Nonnull
+ @NotNull
@Override
public String getName() {
return delegate.getName();
@@ -49,13 +48,13 @@ class PropertyStateWrapper extends Abstr
return delegate.getType();
}
- @Nonnull
+ @NotNull
@Override
public <T> T getValue(Type<T> type) {
return delegate.getValue(type);
}
- @Nonnull
+ @NotNull
@Override
public <T> T getValue(Type<T> type, int index) {
return delegate.getValue(type, index);
Modified: jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/cache/NodeDocumentCache.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/cache/NodeDocumentCache.java?rev=1836194&r1=1836193&r2=1836194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/cache/NodeDocumentCache.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/cache/NodeDocumentCache.java Wed Jul 18 15:08:27 2018
@@ -28,10 +28,6 @@ import java.util.concurrent.CopyOnWriteA
import java.util.concurrent.ExecutionException;
import java.util.concurrent.locks.Lock;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
import com.google.common.base.Predicate;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
@@ -41,6 +37,8 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.plugins.document.NodeDocument;
import org.apache.jackrabbit.oak.plugins.document.locks.NodeDocumentLocks;
import org.apache.jackrabbit.oak.plugins.document.util.StringValue;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import com.google.common.base.Objects;
import com.google.common.cache.Cache;
@@ -68,11 +66,11 @@ public class NodeDocumentCache implement
private final List<CacheChangesTracker> changeTrackers;
- public NodeDocumentCache(@Nonnull Cache<CacheValue, NodeDocument> nodeDocumentsCache,
- @Nonnull CacheStats nodeDocumentsCacheStats,
- @Nonnull Cache<StringValue, NodeDocument> prevDocumentsCache,
- @Nonnull CacheStats prevDocumentsCacheStats,
- @Nonnull NodeDocumentLocks locks) {
+ public NodeDocumentCache(@NotNull Cache<CacheValue, NodeDocument> nodeDocumentsCache,
+ @NotNull CacheStats nodeDocumentsCacheStats,
+ @NotNull Cache<StringValue, NodeDocument> prevDocumentsCache,
+ @NotNull CacheStats prevDocumentsCacheStats,
+ @NotNull NodeDocumentLocks locks) {
this.nodeDocumentsCache = nodeDocumentsCache;
this.nodeDocumentsCacheStats = nodeDocumentsCacheStats;
this.prevDocumentsCache = prevDocumentsCache;
@@ -86,7 +84,7 @@ public class NodeDocumentCache implement
*
* @param key to invalidate
*/
- public void invalidate(@Nonnull String key) {
+ public void invalidate(@NotNull String key) {
Lock lock = locks.acquire(key);
try {
if (isLeafPreviousDocId(key)) {
@@ -106,7 +104,7 @@ public class NodeDocumentCache implement
*
* @param key to mark
*/
- public void markChanged(@Nonnull String key) {
+ public void markChanged(@NotNull String key) {
Lock lock = locks.acquire(key);
try {
internalMarkChanged(key);
@@ -123,7 +121,7 @@ public class NodeDocumentCache implement
* modification stamps.
* @return number of invalidated entries
*/
- public int invalidateOutdated(@Nonnull Map<String, ModificationStamp> modStamps) {
+ public int invalidateOutdated(@NotNull Map<String, ModificationStamp> modStamps) {
int invalidatedCount = 0;
for (Entry<String, ModificationStamp> e : modStamps.entrySet()) {
String id = e.getKey();
@@ -147,8 +145,8 @@ public class NodeDocumentCache implement
* @param key document key
* @return cached value of null if there's no document with given key cached
*/
- @CheckForNull
- public NodeDocument getIfPresent(@Nonnull String key) {
+ @Nullable
+ public NodeDocument getIfPresent(@NotNull String key) {
if (isLeafPreviousDocId(key)) {
return prevDocumentsCache.getIfPresent(new StringValue(key));
} else {
@@ -169,8 +167,8 @@ public class NodeDocumentCache implement
* @param valueLoader object used to retrieve the document
* @return document matching given key
*/
- @Nonnull
- public NodeDocument get(@Nonnull final String key, @Nonnull final Callable<NodeDocument> valueLoader)
+ @NotNull
+ public NodeDocument get(@NotNull final String key, @NotNull final Callable<NodeDocument> valueLoader)
throws ExecutionException {
Callable<NodeDocument> wrappedLoader = new Callable<NodeDocument>() {
@Override
@@ -198,7 +196,7 @@ public class NodeDocumentCache implement
*
* @param doc document to put
*/
- public void put(@Nonnull NodeDocument doc) {
+ public void put(@NotNull NodeDocument doc) {
if (doc != NodeDocument.NULL) {
Lock lock = locks.acquire(doc.getId());
try {
@@ -217,8 +215,8 @@ public class NodeDocumentCache implement
* @return either the given <code>doc</code> or the document already present
* in the cache if it's newer
*/
- @Nonnull
- public NodeDocument putIfNewer(@Nonnull final NodeDocument doc) {
+ @NotNull
+ public NodeDocument putIfNewer(@NotNull final NodeDocument doc) {
if (doc == NodeDocument.NULL) {
throw new IllegalArgumentException("doc must not be NULL document");
}
@@ -250,8 +248,8 @@ public class NodeDocumentCache implement
* @return either the given <code>doc</code> or the document already present
* in the cache.
*/
- @Nonnull
- public NodeDocument putIfAbsent(@Nonnull final NodeDocument doc) {
+ @NotNull
+ public NodeDocument putIfAbsent(@NotNull final NodeDocument doc) {
if (doc == NodeDocument.NULL) {
throw new IllegalArgumentException("doc must not be NULL document");
}
@@ -296,8 +294,8 @@ public class NodeDocumentCache implement
* @param oldDoc the old document
* @param newDoc the replacement
*/
- public void replaceCachedDocument(@Nonnull final NodeDocument oldDoc,
- @Nonnull final NodeDocument newDoc) {
+ public void replaceCachedDocument(@NotNull final NodeDocument oldDoc,
+ @NotNull final NodeDocument newDoc) {
if (newDoc == NodeDocument.NULL) {
throw new IllegalArgumentException("doc must not be NULL document");
}
@@ -473,7 +471,7 @@ public class NodeDocumentCache implement
*
* @param doc the document to put into the cache.
*/
- protected final void putInternal(@Nonnull NodeDocument doc) {
+ protected final void putInternal(@NotNull NodeDocument doc) {
putInternal(doc, null);
}
@@ -485,7 +483,7 @@ public class NodeDocumentCache implement
* @param trackerToSkip this tracker won't be updated. pass {@code null} to update
* all trackers.
*/
- protected final void putInternal(@Nonnull NodeDocument doc, @Nullable CacheChangesTracker trackerToSkip) {
+ protected final void putInternal(@NotNull NodeDocument doc, @Nullable CacheChangesTracker trackerToSkip) {
if (isLeafPreviousDocId(doc.getId())) {
prevDocumentsCache.put(new StringValue(doc.getId()), doc);
} else {
@@ -508,7 +506,7 @@ public class NodeDocumentCache implement
* @param doc the tested document
* @return {@code true} iff the cacheDoc is null or older than the doc
*/
- private boolean isNewer(@Nullable NodeDocument cachedDoc, @Nonnull NodeDocument doc) {
+ private boolean isNewer(@Nullable NodeDocument cachedDoc, @NotNull NodeDocument doc) {
if (cachedDoc == null || cachedDoc == NodeDocument.NULL) {
return true;
}
Modified: jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/memory/MemoryDocumentStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/memory/MemoryDocumentStore.java?rev=1836194&r1=1836193&r2=1836194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/memory/MemoryDocumentStore.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/memory/MemoryDocumentStore.java Wed Jul 18 15:08:27 2018
@@ -26,10 +26,6 @@ import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
import com.google.common.base.Predicate;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Maps;
@@ -44,6 +40,8 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.plugins.document.UpdateOp.Condition;
import org.apache.jackrabbit.oak.plugins.document.UpdateOp.Key;
import org.apache.jackrabbit.oak.plugins.document.UpdateUtils;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import com.google.common.base.Splitter;
import com.mongodb.ReadPreference;
@@ -129,7 +127,7 @@ public class MemoryDocumentStore impleme
}
@Override
- @Nonnull
+ @NotNull
public <T extends Document> List<T> query(Collection<T> collection,
String fromKey,
String toKey,
@@ -138,7 +136,7 @@ public class MemoryDocumentStore impleme
}
@Override
- @Nonnull
+ @NotNull
public <T extends Document> List<T> query(Collection<T> collection,
String fromKey,
String toKey,
@@ -244,7 +242,7 @@ public class MemoryDocumentStore impleme
return num;
}
- @CheckForNull
+ @Nullable
@Override
public <T extends Document> T createOrUpdate(Collection<T> collection, UpdateOp update) {
assertUnconditional(update);
@@ -268,7 +266,7 @@ public class MemoryDocumentStore impleme
/**
* @return a copy of this document store.
*/
- @Nonnull
+ @NotNull
public MemoryDocumentStore copy() {
MemoryDocumentStore copy = new MemoryDocumentStore();
copyDocuments(Collection.NODES, copy);
@@ -313,7 +311,7 @@ public class MemoryDocumentStore impleme
}
}
- @CheckForNull
+ @Nullable
private <T extends Document> T internalCreateOrUpdate(Collection<T> collection,
UpdateOp update,
boolean checkConditions) {
@@ -455,7 +453,7 @@ public class MemoryDocumentStore impleme
return metadata;
}
- @Nonnull
+ @NotNull
@Override
public Map<String, String> getStats() {
return ImmutableMap.<String, String>builder()
@@ -482,4 +480,4 @@ public class MemoryDocumentStore impleme
}
doc.put(Document.MOD_COUNT, modCount + 1);
}
-}
\ No newline at end of file
+}
Modified: jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentNodeStoreBuilderBase.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentNodeStoreBuilderBase.java?rev=1836194&r1=1836193&r2=1836194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentNodeStoreBuilderBase.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentNodeStoreBuilderBase.java Wed Jul 18 15:08:27 2018
@@ -18,8 +18,6 @@ package org.apache.jackrabbit.oak.plugin
import java.util.concurrent.TimeUnit;
-import javax.annotation.Nonnull;
-
import com.mongodb.DB;
import com.mongodb.Mongo;
import com.mongodb.MongoClient;
@@ -36,6 +34,7 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.plugins.document.VersionGCSupport;
import org.apache.jackrabbit.oak.plugins.document.util.MongoConnection;
import org.apache.jackrabbit.oak.spi.blob.GarbageCollectableBlobStore;
+import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -71,8 +70,8 @@ public abstract class MongoDocumentNodeS
* @param blobCacheSizeMB the blob cache size in MB.
* @return this
*/
- public T setMongoDB(@Nonnull String uri,
- @Nonnull String name,
+ public T setMongoDB(@NotNull String uri,
+ @NotNull String name,
int blobCacheSizeMB) {
this.mongoUri = uri;
@@ -103,7 +102,7 @@ public abstract class MongoDocumentNodeS
* @return this
* @deprecated use {@link #setMongoDB(MongoClient, String, int)} instead.
*/
- public T setMongoDB(@Nonnull DB db,
+ public T setMongoDB(@NotNull DB db,
int blobCacheSizeMB) {
return setMongoDB(mongoClientFrom(db), db.getName(), blobCacheSizeMB);
}
@@ -116,8 +115,8 @@ public abstract class MongoDocumentNodeS
* @param blobCacheSizeMB the size of the blob cache in MB.
* @return this
*/
- public T setMongoDB(@Nonnull MongoClient client,
- @Nonnull String dbName,
+ public T setMongoDB(@NotNull MongoClient client,
+ @NotNull String dbName,
int blobCacheSizeMB) {
return setMongoDB(client, client.getDatabase(dbName),
new MongoStatus(client, dbName), blobCacheSizeMB);
@@ -130,7 +129,7 @@ public abstract class MongoDocumentNodeS
* @return this
* @deprecated use {@link #setMongoDB(MongoClient, String)} instead.
*/
- public T setMongoDB(@Nonnull DB db) {
+ public T setMongoDB(@NotNull DB db) {
return setMongoDB(mongoClientFrom(db), db.getName());
}
@@ -141,8 +140,8 @@ public abstract class MongoDocumentNodeS
* @param dbName the database name
* @return this
*/
- public T setMongoDB(@Nonnull MongoClient client,
- @Nonnull String dbName) {
+ public T setMongoDB(@NotNull MongoClient client,
+ @NotNull String dbName) {
return setMongoDB(client, dbName, 16);
}
@@ -241,8 +240,8 @@ public abstract class MongoDocumentNodeS
return maxReplicationLagMillis;
}
- private T setMongoDB(@Nonnull MongoClient client,
- @Nonnull MongoDatabase db,
+ private T setMongoDB(@NotNull MongoClient client,
+ @NotNull MongoDatabase db,
MongoStatus status,
int blobCacheSizeMB) {
if (!MongoConnection.isSufficientWriteConcern(client, db.getWriteConcern())) {
Modified: jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java?rev=1836194&r1=1836193&r2=1836194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java Wed Jul 18 15:08:27 2018
@@ -35,10 +35,6 @@ import java.util.concurrent.ExecutionExc
import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.Lock;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
import com.google.common.base.Stopwatch;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
@@ -83,6 +79,8 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.stats.Clock;
import org.apache.jackrabbit.oak.commons.PerfLogger;
import org.bson.conversions.Bson;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -550,7 +548,7 @@ public class MongoDocumentStore implemen
* @param <T> the document type of the given collection.
* @return the document or {@code null} if the document doesn't exist.
*/
- @CheckForNull
+ @Nullable
private <T extends Document> T findUncachedWithRetry(
Collection<T> collection, String key,
DocumentReadPreference docReadPref) {
@@ -577,7 +575,7 @@ public class MongoDocumentStore implemen
}
}
- @CheckForNull
+ @Nullable
protected <T extends Document> T findUncached(Collection<T> collection, String key, DocumentReadPreference docReadPref) {
log("findUncached", key, docReadPref);
final Stopwatch watch = startWatch();
@@ -616,7 +614,7 @@ public class MongoDocumentStore implemen
}
}
- @Nonnull
+ @NotNull
@Override
public <T extends Document> List<T> query(Collection<T> collection,
String fromKey,
@@ -625,7 +623,7 @@ public class MongoDocumentStore implemen
return query(collection, fromKey, toKey, null, 0, limit);
}
- @Nonnull
+ @NotNull
@Override
public <T extends Document> List<T> query(Collection<T> collection,
String fromKey,
@@ -641,7 +639,7 @@ public class MongoDocumentStore implemen
* Queries for documents and performs a number of retries if the read fails
* with an exception.
*/
- @Nonnull
+ @NotNull
private <T extends Document> List<T> queryWithRetry(Collection<T> collection,
String fromKey,
String toKey,
@@ -671,7 +669,7 @@ public class MongoDocumentStore implemen
}
@SuppressWarnings("unchecked")
- @Nonnull
+ @NotNull
protected <T extends Document> List<T> queryInternal(Collection<T> collection,
String fromKey,
String toKey,
@@ -922,7 +920,7 @@ public class MongoDocumentStore implemen
}
@SuppressWarnings("unchecked")
- @CheckForNull
+ @Nullable
private <T extends Document> T findAndModify(Collection<T> collection,
UpdateOp updateOp,
boolean upsert,
@@ -1036,7 +1034,7 @@ public class MongoDocumentStore implemen
}
}
- @CheckForNull
+ @Nullable
@Override
public <T extends Document> T createOrUpdate(Collection<T> collection, UpdateOp update)
throws DocumentStoreException {
@@ -1075,7 +1073,7 @@ public class MongoDocumentStore implemen
* point 2. It will stop after 3rd iteration.
*/
@SuppressWarnings("unchecked")
- @CheckForNull
+ @Nullable
@Override
public <T extends Document> List<T> createOrUpdate(Collection<T> collection,
List<UpdateOp> updateOps) {
@@ -1400,7 +1398,7 @@ public class MongoDocumentStore implemen
* @return map with key to modification stamp mapping.
* @throws MongoException if the call fails
*/
- @Nonnull
+ @NotNull
private Map<String, ModificationStamp> getModStamps(Iterable<String> keys)
throws MongoException {
// Fetch only the modCount and id
@@ -1450,10 +1448,10 @@ public class MongoDocumentStore implemen
return preference;
}
- <T extends Document> ReadPreference getMongoReadPreference(@Nonnull Collection<T> collection,
+ <T extends Document> ReadPreference getMongoReadPreference(@NotNull Collection<T> collection,
@Nullable String parentId,
@Nullable String documentId,
- @Nonnull DocumentReadPreference preference) {
+ @NotNull DocumentReadPreference preference) {
switch(preference){
case PRIMARY:
return ReadPreference.primary();
@@ -1523,8 +1521,8 @@ public class MongoDocumentStore implemen
return getDBCollection(collection).getReadPreference();
}
- @CheckForNull
- protected <T extends Document> T convertFromDBObject(@Nonnull Collection<T> collection,
+ @Nullable
+ protected <T extends Document> T convertFromDBObject(@NotNull Collection<T> collection,
@Nullable DBObject n) {
T copy = null;
if (n != null) {
@@ -1550,8 +1548,8 @@ public class MongoDocumentStore implemen
return copy;
}
- @Nonnull
- private Map<Revision, Object> convertMongoMap(@Nonnull BasicDBObject obj) {
+ @NotNull
+ private Map<Revision, Object> convertMongoMap(@NotNull BasicDBObject obj) {
Map<Revision, Object> map = new TreeMap<Revision, Object>(StableRevisionComparator.REVERSE);
for (Map.Entry<String, Object> entry : obj.entrySet()) {
map.put(Revision.fromString(entry.getKey()), entry.getValue());
@@ -1614,7 +1612,7 @@ public class MongoDocumentStore implemen
return metadata;
}
- @Nonnull
+ @NotNull
@Override
public Map<String, String> getStats() {
ImmutableMap.Builder<String, String> builder = ImmutableMap.builder();
@@ -1658,7 +1656,7 @@ public class MongoDocumentStore implemen
return doc;
}
- @Nonnull
+ @NotNull
private static Bson createQueryForUpdate(String key,
Map<Key, Condition> conditions) {
Bson query = getByKeyQuery(key);
@@ -1693,7 +1691,7 @@ public class MongoDocumentStore implemen
* @param includeId whether to include the SET id operation
* @return the DBObject.
*/
- @Nonnull
+ @NotNull
private static BasicDBObject createUpdate(UpdateOp updateOp, boolean includeId) {
BasicDBObject setUpdates = new BasicDBObject();
BasicDBObject maxUpdates = new BasicDBObject();
@@ -1749,7 +1747,7 @@ public class MongoDocumentStore implemen
return update;
}
- @Nonnull
+ @NotNull
private <T extends Document> T applyChanges(Collection<T> collection, T oldDoc, UpdateOp update) {
T doc = collection.newDocument(this);
oldDoc.deepCopy(doc);
Modified: jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoMissingLastRevSeeker.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoMissingLastRevSeeker.java?rev=1836194&r1=1836193&r2=1836194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoMissingLastRevSeeker.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoMissingLastRevSeeker.java Wed Jul 18 15:08:27 2018
@@ -19,8 +19,6 @@
package org.apache.jackrabbit.oak.plugins.document.mongo;
-import javax.annotation.Nonnull;
-
import static com.google.common.collect.Iterables.transform;
import static org.apache.jackrabbit.oak.plugins.document.Collection.CLUSTER_NODES;
import static org.apache.jackrabbit.oak.plugins.document.Collection.NODES;
@@ -37,6 +35,7 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.plugins.document.util.CloseableIterable;
import org.apache.jackrabbit.oak.stats.Clock;
import org.bson.conversions.Bson;
+import org.jetbrains.annotations.NotNull;
/**
* Mongo specific version of MissingLastRevSeeker which uses mongo queries
@@ -53,7 +52,7 @@ public class MongoMissingLastRevSeeker e
}
@Override
- @Nonnull
+ @NotNull
public CloseableIterable<NodeDocument> getCandidates(final long startTime) {
Bson query = Filters.gte(NodeDocument.MODIFIED_IN_SECS, NodeDocument.getModifiedInSecs(startTime));
Bson sortFields = new BasicDBObject(NodeDocument.MODIFIED_IN_SECS, 1);
Modified: jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoStatus.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoStatus.java?rev=1836194&r1=1836193&r2=1836194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoStatus.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoStatus.java Wed Jul 18 15:08:27 2018
@@ -33,15 +33,14 @@ import com.mongodb.event.ServerMonitorLi
import com.mongodb.session.ClientSession;
import org.apache.jackrabbit.oak.plugins.document.mongo.replica.ReplicaSetStatus;
+import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.annotation.Nonnull;
import java.util.Map;
import java.util.concurrent.TimeUnit;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-
public class MongoStatus implements ServerMonitorListener {
private static final Logger LOG = LoggerFactory.getLogger(MongoStatus.class);
@@ -69,8 +68,8 @@ public class MongoStatus implements Serv
private final ReplicaSetStatus replicaSetStatus = new ReplicaSetStatus();
- public MongoStatus(@Nonnull MongoClient client,
- @Nonnull String dbName) {
+ public MongoStatus(@NotNull MongoClient client,
+ @NotNull String dbName) {
this.client = client;
this.dbName = dbName;
}
@@ -132,7 +131,7 @@ public class MongoStatus implements Serv
return majorityReadConcernEnabled;
}
- @Nonnull
+ @NotNull
public String getServerDetails() {
Map<String, Object> details = Maps.newHashMap();
for (String key : SERVER_DETAIL_FIELD_NAMES) {
@@ -144,7 +143,7 @@ public class MongoStatus implements Serv
return details.toString();
}
- @Nonnull
+ @NotNull
public String getVersion() {
if (version == null) {
String v = getServerStatus().getString("version");
Modified: jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoVersionGCSupport.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoVersionGCSupport.java?rev=1836194&r1=1836193&r2=1836194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoVersionGCSupport.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoVersionGCSupport.java Wed Jul 18 15:08:27 2018
@@ -25,8 +25,6 @@ import java.util.Set;
import java.util.concurrent.TimeUnit;
import java.util.regex.Pattern;
-import javax.annotation.Nonnull;
-
import com.google.common.base.Function;
import com.google.common.base.Joiner;
import com.google.common.base.Predicate;
@@ -49,6 +47,7 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.plugins.document.util.Utils;
import org.apache.jackrabbit.oak.stats.Clock;
import org.bson.conversions.Bson;
+import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -181,7 +180,7 @@ public class MongoVersionGCSupport exten
);
}
- @Nonnull
+ @NotNull
private Iterable<Bson> queriesForType(SplitDocType type, RevisionVector sweepRevs) {
if (type != DEFAULT_NO_BRANCH) {
return singletonList(Filters.eq(SD_TYPE, type.typeCode()));
Modified: jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/RevisionEntry.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/RevisionEntry.java?rev=1836194&r1=1836193&r2=1836194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/RevisionEntry.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/RevisionEntry.java Wed Jul 18 15:08:27 2018
@@ -20,11 +20,10 @@ import java.util.Collections;
import java.util.Map;
import java.util.Set;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
import org.apache.jackrabbit.oak.plugins.document.Revision;
import org.bson.BSONObject;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import com.mongodb.DBObject;
import com.mongodb.util.JSON;
@@ -41,7 +40,7 @@ public class RevisionEntry implements DB
private final Object value;
- public RevisionEntry(@Nonnull Revision revision,
+ public RevisionEntry(@NotNull Revision revision,
@Nullable Object value) {
this.revision = checkNotNull(revision);
this.value = value;
Modified: jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/replica/ReplicaSetInfo.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/replica/ReplicaSetInfo.java?rev=1836194&r1=1836193&r2=1836194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/replica/ReplicaSetInfo.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/replica/ReplicaSetInfo.java Wed Jul 18 15:08:27 2018
@@ -38,12 +38,11 @@ import java.util.concurrent.Future;
import java.util.Set;
import java.util.concurrent.FutureTask;
-import javax.annotation.Nullable;
-
import org.apache.jackrabbit.oak.plugins.document.Revision;
import org.apache.jackrabbit.oak.plugins.document.RevisionVector;
import org.apache.jackrabbit.oak.stats.Clock;
import org.bson.BasicBSONObject;
+import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/replica/ReplicaSetStatus.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/replica/ReplicaSetStatus.java?rev=1836194&r1=1836193&r2=1836194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/replica/ReplicaSetStatus.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/replica/ReplicaSetStatus.java Wed Jul 18 15:08:27 2018
@@ -28,14 +28,13 @@ import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
-import javax.annotation.CheckForNull;
-
import com.mongodb.ServerAddress;
import com.mongodb.event.ServerHeartbeatSucceededEvent;
import com.mongodb.event.ServerMonitorListenerAdapter;
import org.bson.BsonArray;
import org.bson.BsonDocument;
+import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -152,7 +151,7 @@ public class ReplicaSetStatus extends Se
return localTime;
}
- @CheckForNull
+ @Nullable
Date getLastWrite() {
return lastWrite;
}
Modified: jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/NodeCache.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/NodeCache.java?rev=1836194&r1=1836193&r2=1836194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/NodeCache.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/NodeCache.java Wed Jul 18 15:08:27 2018
@@ -32,8 +32,6 @@ import java.util.concurrent.Callable;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.ExecutionException;
-import javax.annotation.Nullable;
-
import org.apache.jackrabbit.oak.cache.CacheValue;
import org.apache.jackrabbit.oak.plugins.document.DocumentNodeStore;
import org.apache.jackrabbit.oak.plugins.document.DocumentStore;
@@ -45,6 +43,7 @@ import org.apache.jackrabbit.oak.stats.T
import org.h2.mvstore.MVMap;
import org.h2.mvstore.WriteBuffer;
import org.h2.mvstore.type.DataType;
+import org.jetbrains.annotations.Nullable;
import com.google.common.base.Function;
import com.google.common.cache.Cache;
@@ -391,4 +390,4 @@ class NodeCache<K extends CacheValue, V
Map<K, V> getGenerationalMap() {
return Collections.unmodifiableMap(map);
}
-}
\ No newline at end of file
+}
Modified: jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobStoreDB.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobStoreDB.java?rev=1836194&r1=1836193&r2=1836194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobStoreDB.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobStoreDB.java Wed Jul 18 15:08:27 2018
@@ -19,8 +19,7 @@ package org.apache.jackrabbit.oak.plugin
import java.sql.DatabaseMetaData;
import java.sql.SQLException;
-import javax.annotation.Nonnull;
-
+import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -138,7 +137,7 @@ public enum RDBBlobStoreDB {
return this.description;
}
- @Nonnull
+ @NotNull
public static RDBBlobStoreDB getValue(String desc) {
for (RDBBlobStoreDB db : RDBBlobStoreDB.values()) {
if (db.description.equals(desc)) {
Modified: jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBConnectionHandler.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBConnectionHandler.java?rev=1836194&r1=1836193&r2=1836194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBConnectionHandler.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBConnectionHandler.java Wed Jul 18 15:08:27 2018
@@ -21,12 +21,11 @@ import java.io.IOException;
import java.sql.Connection;
import java.sql.SQLException;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import javax.sql.DataSource;
import org.apache.jackrabbit.oak.plugins.document.DocumentStoreException;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.slf4j.LoggerFactory;
/**
@@ -49,14 +48,14 @@ public class RDBConnectionHandler implem
private static final boolean CHECKCONNECTIONONCLOSE = Boolean
.getBoolean("org.apache.jackrabbit.oak.plugins.document.rdb.RDBConnectionHandler.CHECKCONNECTIONONCLOSE");
- public RDBConnectionHandler(@Nonnull DataSource ds) {
+ public RDBConnectionHandler(@NotNull DataSource ds) {
this.ds = ds;
}
/**
* Obtain a {@link Connection} suitable for read-only operations.
*/
- public @Nonnull Connection getROConnection() throws SQLException {
+ public @NotNull Connection getROConnection() throws SQLException {
Connection c = getConnection();
c.setAutoCommit(false);
setReadOnly(c, true);
@@ -66,7 +65,7 @@ public class RDBConnectionHandler implem
/**
* Obtain a {@link Connection} suitable for read-write operations.
*/
- public @Nonnull Connection getRWConnection() throws SQLException {
+ public @NotNull Connection getRWConnection() throws SQLException {
Connection c = getConnection();
c.setAutoCommit(false);
setReadOnly(c, false);
@@ -111,7 +110,7 @@ public class RDBConnectionHandler implem
/**
* Return current schema name or {@code null} when unavailable
*/
- @CheckForNull
+ @Nullable
public String getSchema(Connection c) {
try {
return (String) c.getClass().getMethod("getSchema").invoke(c);
@@ -131,7 +130,7 @@ public class RDBConnectionHandler implem
this.closedTime = System.currentTimeMillis();
}
- @Nonnull
+ @NotNull
private DataSource getDataSource() throws IllegalStateException {
DataSource result = this.ds;
if (result == null) {
@@ -141,7 +140,7 @@ public class RDBConnectionHandler implem
return result;
}
- @Nonnull
+ @NotNull
private Connection getConnection() throws IllegalStateException, SQLException {
long ts = System.currentTimeMillis();
Connection c = getDataSource().getConnection();
Modified: jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentSerializer.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentSerializer.java?rev=1836194&r1=1836193&r2=1836194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentSerializer.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentSerializer.java Wed Jul 18 15:08:27 2018
@@ -31,8 +31,6 @@ import java.util.Set;
import java.util.TreeMap;
import java.util.zip.GZIPInputStream;
-import javax.annotation.Nonnull;
-
import org.apache.commons.io.IOUtils;
import org.apache.jackrabbit.oak.commons.json.JsopReader;
import org.apache.jackrabbit.oak.commons.json.JsopTokenizer;
@@ -46,6 +44,7 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.plugins.document.UpdateOp;
import org.apache.jackrabbit.oak.plugins.document.UpdateOp.Key;
import org.apache.jackrabbit.oak.plugins.document.UpdateOp.Operation;
+import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -79,7 +78,7 @@ public class RDBDocumentSerializer {
* Serializes all non-column properties of the {@link Document} into a JSON
* string.
*/
- public String asString(@Nonnull Document doc, Set<String> columnProperties) {
+ public String asString(@NotNull Document doc, Set<String> columnProperties) {
StringBuilder sb = new StringBuilder(32768);
sb.append("{");
boolean needComma = false;
@@ -144,8 +143,8 @@ public class RDBDocumentSerializer {
/**
* Reconstructs a {@link Document} based on the persisted {@link RDBRow}.
*/
- @Nonnull
- public <T extends Document> T fromRow(@Nonnull Collection<T> collection, @Nonnull RDBRow row) throws DocumentStoreException {
+ @NotNull
+ public <T extends Document> T fromRow(@NotNull Collection<T> collection, @NotNull RDBRow row) throws DocumentStoreException {
final String charData = row.getData();
checkNotNull(charData, "RDBRow.getData() is null for collection " + collection + ", id: " + row.getId());
@@ -310,7 +309,7 @@ public class RDBDocumentSerializer {
/**
* Reads from an opened JSON stream ("{" already consumed) into a document.
*/
- private static <T extends Document> void readDocumentFromJson(@Nonnull JsopTokenizer json, @Nonnull T doc) {
+ private static <T extends Document> void readDocumentFromJson(@NotNull JsopTokenizer json, @NotNull T doc) {
if (!json.matches('}')) {
do {
String key = json.readString();
Modified: jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java?rev=1836194&r1=1836193&r2=1836194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java Wed Jul 18 15:08:27 2018
@@ -59,8 +59,6 @@ import java.util.concurrent.locks.Lock;
import java.util.zip.Deflater;
import java.util.zip.GZIPOutputStream;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
import javax.sql.DataSource;
import org.apache.jackrabbit.oak.cache.CacheStats;
@@ -84,6 +82,8 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.plugins.document.locks.StripedNodeDocumentLocks;
import org.apache.jackrabbit.oak.plugins.document.mongo.MongoDocumentStore;
import org.apache.jackrabbit.oak.plugins.document.util.CloseableIterator;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -276,13 +276,13 @@ public class RDBDocumentStore implements
return readDocumentCached(collection, id, maxCacheAge);
}
- @Nonnull
+ @NotNull
@Override
public <T extends Document> List<T> query(Collection<T> collection, String fromKey, String toKey, int limit) {
return query(collection, fromKey, toKey, null, 0, limit);
}
- @Nonnull
+ @NotNull
@Override
public <T extends Document> List<T> query(Collection<T> collection, String fromKey, String toKey, String indexedProperty,
long startValue, int limit) {
@@ -293,7 +293,7 @@ public class RDBDocumentStore implements
return internalQuery(collection, fromKey, toKey, EMPTY_KEY_PATTERN, conditions, limit);
}
- @Nonnull
+ @NotNull
protected <T extends Document> List<T> query(Collection<T> collection, String fromKey, String toKey,
List<String> excludeKeyPatterns, List<QueryCondition> conditions, int limit) {
return internalQuery(collection, fromKey, toKey, excludeKeyPatterns, conditions, limit);
@@ -488,7 +488,7 @@ public class RDBDocumentStore implements
return result;
}
- @CheckForNull
+ @Nullable
private <T extends Document> CacheChangesTracker obtainTracker(Collection<T> collection, Set<String> keys) {
if (collection == Collection.NODES) {
return this.nodesCache.registerTracker(keys);
@@ -497,7 +497,7 @@ public class RDBDocumentStore implements
}
}
- @CheckForNull
+ @Nullable
private <T extends Document> CacheChangesTracker obtainTracker(Collection<T> collection, String fromKey, String toKey) {
if (collection == Collection.NODES) {
return this.nodesCache.registerTracker(fromKey, toKey);
@@ -670,7 +670,7 @@ public class RDBDocumentStore implements
private Set<String> columnOnlyProperties = Collections.unmodifiableSet(COLUMNPROPERTIES);
private Set<String> columnProperties = Collections.unmodifiableSet(COLUMNPROPERTIES);
- public RDBTableMetaData(@CheckForNull String catalog, @Nonnull String name) {
+ public RDBTableMetaData(@Nullable String catalog, @NotNull String name) {
this.catalog = catalog == null ? "" : catalog;
this.name = name;
}
@@ -841,7 +841,7 @@ public class RDBDocumentStore implements
* {@link RDBDocumentStoreDB#getAdditionalStatistics(RDBConnectionHandler, String, String)}
* for details.
**/
- @Nonnull
+ @NotNull
@Override
public Map<String, String> getStats() {
ImmutableMap.Builder<String, String> builder = ImmutableMap.builder();
@@ -1482,7 +1482,7 @@ public class RDBDocumentStore implements
}
}
- @CheckForNull
+ @Nullable
private <T extends Document> boolean internalCreate(Collection<T> collection, List<UpdateOp> updates) {
final Stopwatch watch = startWatch();
List<String> ids = new ArrayList<String>(updates.size());
@@ -1524,7 +1524,7 @@ public class RDBDocumentStore implements
}
}
- @CheckForNull
+ @Nullable
private <T extends Document> T internalCreateOrUpdate(Collection<T> collection, UpdateOp update, boolean allowCreate,
boolean checkConditions) {
T oldDoc = readDocumentCached(collection, update.getId(), Integer.MAX_VALUE);
@@ -1579,7 +1579,7 @@ public class RDBDocumentStore implements
/**
* @return previous version of document or <code>null</code>
*/
- @CheckForNull
+ @Nullable
private <T extends Document> T internalUpdate(Collection<T> collection, UpdateOp update, T oldDoc, boolean checkConditions,
int maxRetries) {
if (checkConditions && !UpdateUtils.checkConditions(oldDoc, update.getConditions())) {
@@ -1641,7 +1641,7 @@ public class RDBDocumentStore implements
}
}
- @Nonnull
+ @NotNull
private <T extends Document> T createNewDocument(Collection<T> collection, T oldDoc, UpdateOp update) {
T doc = collection.newDocument(this);
oldDoc.deepCopy(doc);
@@ -1833,7 +1833,7 @@ public class RDBDocumentStore implements
}
}
- @Nonnull
+ @NotNull
protected <T extends Document> RDBTableMetaData getTable(Collection<T> collection) {
RDBTableMetaData tmd = this.tableMeta.get(collection);
if (tmd != null) {
@@ -1843,7 +1843,7 @@ public class RDBDocumentStore implements
}
}
- @CheckForNull
+ @Nullable
private <T extends Document> T readDocumentUncached(Collection<T> collection, String id, NodeDocument cachedDoc) {
Connection connection = null;
RDBTableMetaData tmd = getTable(collection);
@@ -1966,8 +1966,8 @@ public class RDBDocumentStore implements
return numDeleted;
}
- private <T extends Document> boolean updateDocument(@Nonnull Collection<T> collection, @Nonnull T document,
- @Nonnull UpdateOp update, Long oldmodcount) {
+ private <T extends Document> boolean updateDocument(@NotNull Collection<T> collection, @NotNull T document,
+ @NotNull UpdateOp update, Long oldmodcount) {
Connection connection = null;
RDBTableMetaData tmd = getTable(collection);
String data = null;
@@ -2124,7 +2124,7 @@ public class RDBDocumentStore implements
private static final boolean BATCHUPDATES = Boolean.parseBoolean(System
.getProperty("org.apache.jackrabbit.oak.plugins.document.rdb.RDBDocumentStore.BATCHUPDATES", "true"));
- public static byte[] asBytes(@Nonnull String data) {
+ public static byte[] asBytes(@NotNull String data) {
byte[] bytes;
try {
bytes = data.getBytes("UTF-8");
@@ -2178,18 +2178,18 @@ public class RDBDocumentStore implements
private NodeDocumentLocks locks;
- @CheckForNull
- private static NodeDocument unwrap(@Nonnull NodeDocument doc) {
+ @Nullable
+ private static NodeDocument unwrap(@NotNull NodeDocument doc) {
return doc == NodeDocument.NULL ? null : doc;
}
- @Nonnull
- private static NodeDocument wrap(@CheckForNull NodeDocument doc) {
+ @NotNull
+ private static NodeDocument wrap(@Nullable NodeDocument doc) {
return doc == null ? NodeDocument.NULL : doc;
}
- @Nonnull
- private static String idOf(@Nonnull Document doc) {
+ @NotNull
+ private static String idOf(@NotNull Document doc) {
String id = doc.getId();
if (id == null) {
throw new IllegalArgumentException("non-null ID expected");
@@ -2197,18 +2197,18 @@ public class RDBDocumentStore implements
return id;
}
- private static long modcountOf(@Nonnull Document doc) {
+ private static long modcountOf(@NotNull Document doc) {
Long n = doc.getModCount();
return n != null ? n : -1;
}
- private static long modifiedOf(@Nonnull Document doc) {
+ private static long modifiedOf(@NotNull Document doc) {
Object l = doc.get(NodeDocument.MODIFIED_IN_SECS);
return (l instanceof Long) ? ((Long)l).longValue() : -1;
}
- @Nonnull
- protected <T extends Document> T convertFromDBObject(@Nonnull Collection<T> collection, @Nonnull RDBRow row) {
+ @NotNull
+ protected <T extends Document> T convertFromDBObject(@NotNull Collection<T> collection, @NotNull RDBRow row) {
// this method is present here in order to facilitate unit testing for OAK-3566
return ser.fromRow(collection, row);
}
Modified: jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreDB.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreDB.java?rev=1836194&r1=1836193&r2=1836194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreDB.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreDB.java Wed Jul 18 15:08:27 2018
@@ -35,9 +35,8 @@ import java.util.Map;
import java.util.SortedSet;
import java.util.TreeSet;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.oak.plugins.document.rdb.RDBJDBCTools.PreparedStatementComponent;
+import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -865,7 +864,7 @@ public enum RDBDocumentStoreDB {
*
* @return the DB initialization SQL string
*/
- public @Nonnull String getInitializationStatement() {
+ public @NotNull String getInitializationStatement() {
return "";
}
@@ -1037,7 +1036,7 @@ public enum RDBDocumentStoreDB {
return this.description;
}
- @Nonnull
+ @NotNull
public static RDBDocumentStoreDB getValue(String desc) {
for (RDBDocumentStoreDB db : RDBDocumentStoreDB.values()) {
if (db.description.equals(desc)) {
Modified: jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreJDBC.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreJDBC.java?rev=1836194&r1=1836193&r2=1836194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreJDBC.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreJDBC.java Wed Jul 18 15:08:27 2018
@@ -47,9 +47,6 @@ import java.util.Map.Entry;
import java.util.NoSuchElementException;
import java.util.Set;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.oak.plugins.document.Document;
import org.apache.jackrabbit.oak.plugins.document.DocumentStoreException;
import org.apache.jackrabbit.oak.plugins.document.NodeDocument;
@@ -58,6 +55,8 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.plugins.document.rdb.RDBDocumentStoreDB.FETCHFIRSTSYNTAX;
import org.apache.jackrabbit.oak.plugins.document.rdb.RDBJDBCTools.PreparedStatementComponent;
import org.apache.jackrabbit.oak.plugins.document.util.UTF8Encoder;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -414,7 +413,7 @@ public class RDBDocumentStoreJDBC {
}
}
- @Nonnull
+ @NotNull
public List<RDBRow> query(Connection connection, RDBTableMetaData tmd, String minId, String maxId,
List<String> excludeKeyPatterns, List<QueryCondition> conditions, int limit) throws SQLException {
long start = System.currentTimeMillis();
@@ -523,7 +522,7 @@ public class RDBDocumentStoreJDBC {
}
}
- @Nonnull
+ @NotNull
public Iterator<RDBRow> queryAsIterator(RDBConnectionHandler ch, RDBTableMetaData tmd, String minId, String maxId,
List<String> excludeKeyPatterns, List<QueryCondition> conditions, int limit, String sortBy) throws SQLException {
return new ResultSetIterator(ch, tmd, minId, maxId, excludeKeyPatterns, conditions, limit, sortBy);
@@ -656,7 +655,7 @@ public class RDBDocumentStoreJDBC {
}
}
- @Nonnull
+ @NotNull
private PreparedStatement prepareQuery(Connection connection, RDBTableMetaData tmd, String columns, String minId, String maxId,
List<String> excludeKeyPatterns, List<QueryCondition> conditions, int limit, String sortBy) throws SQLException {
@@ -780,7 +779,7 @@ public class RDBDocumentStoreJDBC {
return rows;
}
- @CheckForNull
+ @Nullable
public RDBRow read(Connection connection, RDBTableMetaData tmd, String id, long lastmodcount, long lastmodified) throws SQLException {
boolean useCaseStatement = lastmodcount != -1 && lastmodified >= 1;
@@ -1030,13 +1029,13 @@ public class RDBDocumentStoreJDBC {
return res.wasNull() ? RDBRow.LONG_UNSET : v;
}
- @CheckForNull
+ @Nullable
private static Boolean readBooleanOrNullFromResultSet(ResultSet res, int index) throws SQLException {
long v = res.getLong(index);
return res.wasNull() ? null : Boolean.valueOf(v != 0);
}
- @CheckForNull
+ @Nullable
private static Long readLongOrNullFromResultSet(ResultSet res, int index) throws SQLException {
long v = res.getLong(index);
return res.wasNull() ? null : Long.valueOf(v);
@@ -1045,12 +1044,12 @@ public class RDBDocumentStoreJDBC {
private static final Integer INT_FALSE = 0;
private static final Integer INT_TRUE = 1;
- @CheckForNull
+ @Nullable
private static Integer deletedOnceAsNullOrInteger(Boolean b) {
return b == null ? null : (b.booleanValue() ? INT_TRUE : INT_FALSE);
}
- @CheckForNull
+ @Nullable
private static Integer hasBinaryAsNullOrInteger(Number n) {
return n == null ? null : (n.longValue() == 1 ? INT_TRUE : INT_FALSE);
}
Modified: jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBExport.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBExport.java?rev=1836194&r1=1836193&r2=1836194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBExport.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBExport.java Wed Jul 18 15:08:27 2018
@@ -42,9 +42,6 @@ import java.util.Locale;
import java.util.Map;
import java.util.Set;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-
import org.apache.commons.io.IOUtils;
import org.apache.jackrabbit.oak.commons.json.JsopBuilder;
import org.apache.jackrabbit.oak.plugins.document.Collection;
@@ -52,6 +49,8 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.plugins.document.DocumentStoreException;
import org.apache.jackrabbit.oak.plugins.document.NodeDocument;
import org.apache.jackrabbit.oak.plugins.document.memory.MemoryDocumentStore;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import static org.apache.jackrabbit.oak.plugins.document.util.Utils.getModuleVersion;
@@ -346,19 +345,19 @@ public class RDBExport {
c.close();
}
- @CheckForNull
+ @Nullable
private static Boolean readBooleanOrNullFromResultSet(ResultSet res, String field) throws SQLException {
long v = res.getLong(field);
return res.wasNull() ? null : Boolean.valueOf(v != 0);
}
- @CheckForNull
+ @Nullable
private static Long readLongOrNullFromResultSet(ResultSet res, String field) throws SQLException {
long v = res.getLong(field);
return res.wasNull() ? null : Long.valueOf(v);
}
- @Nonnull
+ @NotNull
private static StringBuilder dumpRow(RDBDocumentSerializer ser, String id, RDBRow row) {
NodeDocument doc = ser.fromRow(Collection.NODES, row);
String docjson = ser.asString(doc, EXCLUDE_COLUMNS);
@@ -370,7 +369,7 @@ public class RDBExport {
return fulljson;
}
- @Nonnull
+ @NotNull
private static String dumpFieldNames(List<String> fieldNames) {
StringBuilder result = new StringBuilder();
for (String f : fieldNames) {
@@ -382,7 +381,7 @@ public class RDBExport {
return result.toString();
}
- @Nonnull
+ @NotNull
private static StringBuilder asJSON(List<String> fieldNames, StringBuilder fulljson) {
if (fieldNames.isEmpty()) {
return fulljson;
@@ -405,7 +404,7 @@ public class RDBExport {
}
}
- @Nonnull
+ @NotNull
private static StringBuilder asCSV(List<String> csvFieldNames, StringBuilder fulljson) {
Map<String, Object> doc = (Map<String, Object>) JSON.parse(fulljson.toString());
StringBuilder buf = new StringBuilder();
Modified: jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBJDBCTools.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBJDBCTools.java?rev=1836194&r1=1836193&r2=1836194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBJDBCTools.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBJDBCTools.java Wed Jul 18 15:08:27 2018
@@ -36,11 +36,10 @@ import java.util.Locale;
import java.util.Map;
import java.util.TreeMap;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.oak.plugins.document.DocumentStoreException;
import org.apache.jackrabbit.oak.plugins.document.util.UTF8Encoder;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.slf4j.LoggerFactory;
import com.google.common.base.Joiner;
@@ -91,7 +90,7 @@ public class RDBJDBCTools {
}
}
- private static @Nonnull String checkLegalTableName(@Nonnull String tableName) throws IllegalArgumentException {
+ private static @NotNull String checkLegalTableName(@NotNull String tableName) throws IllegalArgumentException {
for (int i = 0; i < tableName.length(); i++) {
char c = tableName.charAt(i);
if (!((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || (c >= '0' && c <= '9') || (c == '_'))) {
@@ -107,7 +106,7 @@ public class RDBJDBCTools {
* @throws IllegalArgumentException
* upon illegal characters in name
*/
- protected static @Nonnull String createTableName(@Nonnull String prefix, @Nonnull String basename)
+ protected static @NotNull String createTableName(@NotNull String prefix, @NotNull String basename)
throws IllegalArgumentException {
String p = checkLegalTableName(prefix);
String b = checkLegalTableName(basename);
@@ -120,7 +119,7 @@ public class RDBJDBCTools {
/**
* Return string representation of transaction isolation level.
*/
- protected static @Nonnull String isolationLevelToString(int isolationLevel) {
+ protected static @NotNull String isolationLevelToString(int isolationLevel) {
String name;
switch (isolationLevel) {
case Connection.TRANSACTION_NONE:
@@ -178,7 +177,7 @@ public class RDBJDBCTools {
/**
* Return a string containing additional messages from chained exceptions.
*/
- protected static @Nonnull String getAdditionalMessages(SQLException ex) {
+ protected static @NotNull String getAdditionalMessages(SQLException ex) {
List<String> messages = new ArrayList<String>();
String message = ex.getMessage();
SQLException next = ex.getNextException();
@@ -278,7 +277,7 @@ public class RDBJDBCTools {
* Closes a {@link Statement}, logging potential problems.
* @return null
*/
- protected static <T extends Statement> T closeStatement(@CheckForNull T stmt) {
+ protected static <T extends Statement> T closeStatement(@Nullable T stmt) {
if (stmt != null) {
try {
stmt.close();
@@ -293,7 +292,7 @@ public class RDBJDBCTools {
* Closes a {@link ResultSet}, logging potential problems.
* @return null
*/
- protected static ResultSet closeResultSet(@CheckForNull ResultSet rs) {
+ protected static ResultSet closeResultSet(@Nullable ResultSet rs) {
if (rs != null) {
try {
rs.close();
@@ -315,7 +314,7 @@ public class RDBJDBCTools {
* @return a string suitable for inclusion into a
* {@link PreparedStatement}
*/
- @Nonnull
+ @NotNull
public String getStatementComponent();
/**
@@ -431,7 +430,7 @@ public class RDBJDBCTools {
return (cause instanceof SQLTransientException) ? DocumentStoreException.Type.TRANSIENT : DocumentStoreException.Type.GENERIC;
}
- public static DocumentStoreException asDocumentStoreException(@Nonnull Exception cause, @Nonnull String message) {
+ public static DocumentStoreException asDocumentStoreException(@NotNull Exception cause, @NotNull String message) {
return new DocumentStoreException(message, cause, exceptionTypeFor(cause));
}
}
Modified: jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBJSONSupport.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBJSONSupport.java?rev=1836194&r1=1836193&r2=1836194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBJSONSupport.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBJSONSupport.java Wed Jul 18 15:08:27 2018
@@ -22,15 +22,14 @@ import java.util.List;
import java.util.Map;
import java.util.TreeMap;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
import org.apache.jackrabbit.oak.commons.json.JsopBuilder;
import org.apache.jackrabbit.oak.commons.json.JsopReader;
import org.apache.jackrabbit.oak.commons.json.JsopTokenizer;
import org.apache.jackrabbit.oak.plugins.document.DocumentNodeStore;
import org.apache.jackrabbit.oak.plugins.document.Revision;
import org.apache.jackrabbit.oak.plugins.document.StableRevisionComparator;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
/**
* Utilities that provide JSON support on top of the existing
@@ -67,7 +66,7 @@ public class RDBJSONSupport {
* Parses the supplied JSON.
*/
@Nullable
- public Object parse(@Nonnull String json) {
+ public Object parse(@NotNull String json) {
return parse(new JsopTokenizer(json));
}
@@ -75,7 +74,7 @@ public class RDBJSONSupport {
* Parses the supplied JSON.
*/
@Nullable
- public Object parse(@Nonnull JsopTokenizer json) {
+ public Object parse(@NotNull JsopTokenizer json) {
switch (json.read()) {
case JsopReader.NULL:
return null;
Modified: jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBOptions.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBOptions.java?rev=1836194&r1=1836193&r2=1836194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBOptions.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBOptions.java Wed Jul 18 15:08:27 2018
@@ -16,7 +16,7 @@
*/
package org.apache.jackrabbit.oak.plugins.document.rdb;
-import javax.annotation.Nonnull;
+import org.jetbrains.annotations.NotNull;
/**
* Options applicable to RDB persistence
@@ -47,12 +47,12 @@ public class RDBOptions {
/**
* Prefix for table names.
*/
- public RDBOptions tablePrefix(@Nonnull String tablePrefix) {
+ public RDBOptions tablePrefix(@NotNull String tablePrefix) {
this.tablePrefix = tablePrefix;
return this;
}
- public @Nonnull String getTablePrefix() {
+ public @NotNull String getTablePrefix() {
return this.tablePrefix;
}
Modified: jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBRow.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBRow.java?rev=1836194&r1=1836193&r2=1836194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBRow.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBRow.java Wed Jul 18 15:08:27 2018
@@ -16,8 +16,8 @@
*/
package org.apache.jackrabbit.oak.plugins.document.rdb;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
/**
* Container for the information in a RDB database column.
@@ -53,22 +53,22 @@ public class RDBRow {
this.bdata = bdata;
}
- @Nonnull
+ @NotNull
public String getId() {
return id;
}
- @CheckForNull
+ @Nullable
public Long hasBinaryProperties() {
return hasBinaryProperties;
}
- @CheckForNull
+ @Nullable
public Boolean deletedOnce() {
return deletedOnce;
}
- @CheckForNull
+ @Nullable
public String getData() {
return data;
}
@@ -115,7 +115,7 @@ public class RDBRow {
return sdMaxRevTime;
}
- @CheckForNull
+ @Nullable
public byte[] getBdata() {
return bdata;
}
Modified: jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/secondary/DelegatingDocumentNodeState.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/secondary/DelegatingDocumentNodeState.java?rev=1836194&r1=1836193&r2=1836194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/secondary/DelegatingDocumentNodeState.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/secondary/DelegatingDocumentNodeState.java Wed Jul 18 15:08:27 2018
@@ -19,9 +19,6 @@
package org.apache.jackrabbit.oak.plugins.document.secondary;
-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.Iterables;
@@ -34,6 +31,8 @@ import org.apache.jackrabbit.oak.plugins
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.jetbrains.annotations.Nullable;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Preconditions.checkState;
@@ -135,7 +134,7 @@ public class DelegatingDocumentNodeState
}
@Override
- public AbstractDocumentNodeState withRootRevision(@Nonnull RevisionVector root, boolean externalChange) {
+ public AbstractDocumentNodeState withRootRevision(@NotNull RevisionVector root, boolean externalChange) {
if (rootRevision.equals(root) && fromExternalChange == externalChange) {
return this;
} else {
@@ -161,24 +160,24 @@ public class DelegatingDocumentNodeState
return true;
}
- @Nonnull
+ @NotNull
@Override
public Iterable<? extends PropertyState> getProperties() {
return Iterables.filter(delegate.getProperties(), NOT_META_PROPS);
}
@Override
- public boolean hasChildNode(@Nonnull String name) {
+ public boolean hasChildNode(@NotNull String name) {
return delegate.hasChildNode(name);
}
- @Nonnull
+ @NotNull
@Override
- public NodeState getChildNode(@Nonnull String name) throws IllegalArgumentException {
+ public NodeState getChildNode(@NotNull String name) throws IllegalArgumentException {
return decorate(name, delegate.getChildNode(name));
}
- @Nonnull
+ @NotNull
@Override
public Iterable<? extends ChildNodeEntry> getChildNodeEntries() {
return Iterables.transform(delegate.getChildNodeEntries(), new Function<ChildNodeEntry, ChildNodeEntry>() {
@@ -190,7 +189,7 @@ public class DelegatingDocumentNodeState
});
}
- @Nonnull
+ @NotNull
@Override
public NodeBuilder builder() {
checkState(!denotesRoot(getPath()), "Builder cannot be opened for root " +
@@ -202,7 +201,7 @@ public class DelegatingDocumentNodeState
//is not optimized
@Override
- public PropertyState getProperty(@Nonnull String name) {
+ public PropertyState getProperty(@NotNull String name) {
return delegate.getProperty(name);
}
@@ -212,12 +211,12 @@ public class DelegatingDocumentNodeState
}
@Override
- public boolean hasProperty(@Nonnull String name) {
+ public boolean hasProperty(@NotNull String name) {
return delegate.hasProperty(name);
}
@Override
- public boolean getBoolean(@Nonnull String name) {
+ public boolean getBoolean(@NotNull String name) {
return delegate.getBoolean(name);
}
@@ -231,20 +230,20 @@ public class DelegatingDocumentNodeState
return delegate.getString(name);
}
- @Nonnull
+ @NotNull
@Override
- public Iterable<String> getStrings(@Nonnull String name) {
+ public Iterable<String> getStrings(@NotNull String name) {
return delegate.getStrings(name);
}
@Override
- public String getName(@Nonnull String name) {
+ public String getName(@NotNull String name) {
return delegate.getName(name);
}
- @Nonnull
+ @NotNull
@Override
- public Iterable<String> getNames(@Nonnull String name) {
+ public Iterable<String> getNames(@NotNull String name) {
return delegate.getNames(name);
}
Modified: jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/secondary/SecondaryStoreCache.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/secondary/SecondaryStoreCache.java?rev=1836194&r1=1836193&r2=1836194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/secondary/SecondaryStoreCache.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/secondary/SecondaryStoreCache.java Wed Jul 18 15:08:27 2018
@@ -19,9 +19,6 @@
package org.apache.jackrabbit.oak.plugins.document.secondary;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-
import com.google.common.collect.EvictingQueue;
import org.apache.jackrabbit.oak.commons.PathUtils;
import org.apache.jackrabbit.oak.plugins.document.AbstractDocumentNodeState;
@@ -35,6 +32,8 @@ import org.apache.jackrabbit.oak.spi.sta
import org.apache.jackrabbit.oak.stats.MeterStats;
import org.apache.jackrabbit.oak.stats.StatisticsProvider;
import org.apache.jackrabbit.oak.stats.StatsOptions;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -72,7 +71,7 @@ public class SecondaryStoreCache impleme
this.queue = EvictingQueue.create(maxSize);
}
- @CheckForNull
+ @Nullable
@Override
public AbstractDocumentNodeState getDocumentNodeState(String path, RevisionVector rootRevision,
RevisionVector lastRev) {
@@ -121,7 +120,7 @@ public class SecondaryStoreCache impleme
return pathFilter.filter(path) == PathFilter.Result.INCLUDE;
}
- @CheckForNull
+ @Nullable
private AbstractDocumentNodeState findByMatchingLastRev(AbstractDocumentNodeState root, String path,
RevisionVector lastRev){
NodeState state = root;
@@ -148,7 +147,7 @@ public class SecondaryStoreCache impleme
return null;
}
- @CheckForNull
+ @Nullable
private AbstractDocumentNodeState findMatchingRoot(RevisionVector rr) {
if (isEmpty()){
return null;
@@ -178,7 +177,7 @@ public class SecondaryStoreCache impleme
}
@Override
- public void contentChanged(@Nonnull AbstractDocumentNodeState root) {
+ public void contentChanged(@NotNull AbstractDocumentNodeState root) {
synchronized (queue){
//TODO Possibly can be improved
queue.add(root);
Modified: jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/secondary/SecondaryStoreCacheService.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/secondary/SecondaryStoreCacheService.java?rev=1836194&r1=1836193&r2=1836194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/secondary/SecondaryStoreCacheService.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/secondary/SecondaryStoreCacheService.java Wed Jul 18 15:08:27 2018
@@ -27,8 +27,6 @@ import java.util.Hashtable;
import java.util.List;
import java.util.concurrent.Executor;
-import javax.annotation.Nonnull;
-
import com.google.common.collect.Lists;
import org.apache.jackrabbit.oak.osgi.OsgiWhiteboard;
import org.apache.jackrabbit.oak.plugins.document.AbstractDocumentNodeState;
@@ -45,6 +43,7 @@ import org.apache.jackrabbit.oak.spi.sta
import org.apache.jackrabbit.oak.spi.whiteboard.Registration;
import org.apache.jackrabbit.oak.spi.whiteboard.Whiteboard;
import org.apache.jackrabbit.oak.stats.StatisticsProvider;
+import org.jetbrains.annotations.NotNull;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
import org.osgi.framework.ServiceRegistration;
@@ -201,8 +200,8 @@ public class SecondaryStoreCacheService
private static class MultiplexingNodeStateDiffer implements NodeStateDiffer {
private volatile NodeStateDiffer delegate = NodeStateDiffer.DEFAULT_DIFFER;
@Override
- public boolean compare(@Nonnull AbstractDocumentNodeState node,
- @Nonnull AbstractDocumentNodeState base, @Nonnull NodeStateDiff diff) {
+ public boolean compare(@NotNull AbstractDocumentNodeState node,
+ @NotNull AbstractDocumentNodeState base, @NotNull NodeStateDiff diff) {
return delegate.compare(node, base, diff);
}
Modified: jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/secondary/SecondaryStoreObserver.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/secondary/SecondaryStoreObserver.java?rev=1836194&r1=1836193&r2=1836194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/secondary/SecondaryStoreObserver.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/secondary/SecondaryStoreObserver.java Wed Jul 18 15:08:27 2018
@@ -22,8 +22,6 @@ package org.apache.jackrabbit.oak.plugin
import java.util.List;
import java.util.concurrent.TimeUnit;
-import javax.annotation.Nonnull;
-
import com.google.common.base.Stopwatch;
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.plugins.document.AbstractDocumentNodeState;
@@ -39,6 +37,7 @@ import org.apache.jackrabbit.oak.spi.sta
import org.apache.jackrabbit.oak.stats.StatisticsProvider;
import org.apache.jackrabbit.oak.stats.StatsOptions;
import org.apache.jackrabbit.oak.stats.TimerStats;
+import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -69,7 +68,7 @@ public class SecondaryStoreObserver impl
}
@Override
- public void contentChanged(@Nonnull NodeState root, @Nonnull CommitInfo info) {
+ public void contentChanged(@NotNull NodeState root, @NotNull CommitInfo info) {
//Diff here would also be traversing non visible areas and there
//diffManyChildren might pose problem for e.g. data under uuid index
if (!firstEventProcessed){
Modified: jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/secondary/SecondaryStoreRootObserver.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/secondary/SecondaryStoreRootObserver.java?rev=1836194&r1=1836193&r2=1836194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/secondary/SecondaryStoreRootObserver.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/secondary/SecondaryStoreRootObserver.java Wed Jul 18 15:08:27 2018
@@ -19,17 +19,16 @@
package org.apache.jackrabbit.oak.plugins.document.secondary;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.oak.plugins.document.AbstractDocumentNodeState;
+import org.jetbrains.annotations.NotNull;
interface SecondaryStoreRootObserver {
SecondaryStoreRootObserver NOOP = new SecondaryStoreRootObserver(){
@Override
- public void contentChanged(@Nonnull AbstractDocumentNodeState root) {
+ public void contentChanged(@NotNull AbstractDocumentNodeState root) {
}
};
- void contentChanged(@Nonnull AbstractDocumentNodeState root);
+ void contentChanged(@NotNull AbstractDocumentNodeState root);
}
Modified: jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/spi/JournalPropertyBuilder.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/spi/JournalPropertyBuilder.java?rev=1836194&r1=1836193&r2=1836194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/spi/JournalPropertyBuilder.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/spi/JournalPropertyBuilder.java Wed Jul 18 15:08:27 2018
@@ -19,7 +19,7 @@
package org.apache.jackrabbit.oak.plugins.document.spi;
-import javax.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
public interface JournalPropertyBuilder<T extends JournalProperty> {
/**