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 14:52:24 UTC
svn commit: r1836187 - in /jackrabbit/oak/trunk/oak-run-commons: ./
src/main/java/org/apache/jackrabbit/oak/fixture/
src/main/java/org/apache/jackrabbit/oak/plugins/document/
src/main/java/org/apache/jackrabbit/oak/run/cli/
Author: reschke
Date: Wed Jul 18 14:52:24 2018
New Revision: 1836187
URL: http://svn.apache.org/viewvc?rev=1836187&view=rev
Log:
OAK-7511: get rid of JSR 305 dependency - use jetbrains nullability annotations instead - oak-run-commons
Modified:
jackrabbit/oak/trunk/oak-run-commons/pom.xml
jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/fixture/BlobStoreFixture.java
jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/fixture/SegmentTarFixture.java
jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreHelper.java
jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocumentHelper.java
jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/BlobStoreFixtureProvider.java
jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/NodeStoreFixture.java
jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/OakHelpFormatter.java
Modified: jackrabbit/oak/trunk/oak-run-commons/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run-commons/pom.xml?rev=1836187&r1=1836186&r2=1836187&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run-commons/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-run-commons/pom.xml Wed Jul 18 14:52:24 2018
@@ -74,8 +74,8 @@
</dependency>
<dependency>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
+ <groupId>org.jetbrains</groupId>
+ <artifactId>annotations</artifactId>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
Modified: jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/fixture/BlobStoreFixture.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/fixture/BlobStoreFixture.java?rev=1836187&r1=1836186&r2=1836187&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/fixture/BlobStoreFixture.java (original)
+++ jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/fixture/BlobStoreFixture.java Wed Jul 18 14:52:24 2018
@@ -27,8 +27,6 @@ import java.util.Dictionary;
import java.util.Enumeration;
import java.util.Map;
-import javax.annotation.CheckForNull;
-
import com.google.common.base.Strings;
import com.google.common.collect.Maps;
import org.apache.commons.io.FileUtils;
@@ -42,6 +40,7 @@ import org.apache.jackrabbit.oak.spi.blo
import org.apache.jackrabbit.oak.spi.blob.FileBlobStore;
import org.apache.jackrabbit.oak.spi.blob.MemoryBlobStore;
import org.apache.jackrabbit.oak.stats.StatisticsProvider;
+import org.jetbrains.annotations.Nullable;
import static com.google.common.base.Preconditions.checkNotNull;
import static org.apache.jackrabbit.oak.fixture.DataStoreUtils.cleanup;
@@ -74,7 +73,7 @@ public abstract class BlobStoreFixture i
* @param fallbackToFDS if true then FileDataStore would be used in absence of
* any explicitly defined BlobStore
*/
- @CheckForNull
+ @Nullable
public static BlobStoreFixture create(File basedir, boolean fallbackToFDS,
int fdsCacheInMB,
StatisticsProvider statisticsProvider) {
Modified: jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/fixture/SegmentTarFixture.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/fixture/SegmentTarFixture.java?rev=1836187&r1=1836186&r2=1836187&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/fixture/SegmentTarFixture.java (original)
+++ jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/fixture/SegmentTarFixture.java Wed Jul 18 14:52:24 2018
@@ -27,8 +27,6 @@ import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
-import javax.annotation.Nonnull;
-
import com.google.common.base.StandardSystemProperty;
import com.microsoft.azure.storage.CloudStorageAccount;
import com.microsoft.azure.storage.StorageException;
@@ -51,6 +49,7 @@ import org.apache.jackrabbit.oak.segment
import org.apache.jackrabbit.oak.segment.standby.server.StandbyServerSync;
import org.apache.jackrabbit.oak.spi.blob.BlobStore;
import org.apache.jackrabbit.oak.stats.StatisticsProvider;
+import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -63,7 +62,7 @@ public class SegmentTarFixture extends O
*/
SegmentNotFoundExceptionListener IGNORE_SNFE = new SegmentNotFoundExceptionListener() {
@Override
- public void notify(@Nonnull SegmentId id, @Nonnull SegmentNotFoundException snfe) { }
+ public void notify(@NotNull SegmentId id, @NotNull SegmentNotFoundException snfe) { }
};
private static final int MB = 1024 * 1024;
Modified: jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreHelper.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreHelper.java?rev=1836187&r1=1836186&r2=1836187&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreHelper.java (original)
+++ jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreHelper.java Wed Jul 18 14:52:24 2018
@@ -23,8 +23,6 @@ import java.util.Comparator;
import java.util.List;
import java.util.Map;
import java.util.PriorityQueue;
-import javax.annotation.Nullable;
-
import com.google.common.base.Function;
import com.google.common.base.Stopwatch;
import com.google.common.cache.Cache;
@@ -47,6 +45,7 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.plugins.document.mongo.MongoDocumentStoreHelper;
import org.apache.jackrabbit.oak.plugins.document.util.Utils;
import org.bson.conversions.Bson;
+import org.jetbrains.annotations.Nullable;
/**
* Helper class to access package private method of DocumentNodeStore and other
Modified: jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocumentHelper.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocumentHelper.java?rev=1836187&r1=1836186&r2=1836187&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocumentHelper.java (original)
+++ jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocumentHelper.java Wed Jul 18 14:52:24 2018
@@ -18,7 +18,7 @@ package org.apache.jackrabbit.oak.plugin
import java.util.SortedMap;
-import javax.annotation.Nonnull;
+import org.jetbrains.annotations.NotNull;
/**
* Helper class to access package private methods on NodeDocument.
@@ -28,19 +28,19 @@ public class NodeDocumentHelper {
private NodeDocumentHelper() {
}
- @Nonnull
+ @NotNull
public static SortedMap<Revision, String> getLocalMap(
NodeDocument doc, String key) {
return doc.getLocalMap(key);
}
- @Nonnull
+ @NotNull
public static SortedMap<Revision, String> getLocalCommitRoot(
NodeDocument doc) {
return doc.getLocalCommitRoot();
}
- @Nonnull
+ @NotNull
public static String commitRoot() {
return NodeDocument.COMMIT_ROOT;
}
Modified: jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/BlobStoreFixtureProvider.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/BlobStoreFixtureProvider.java?rev=1836187&r1=1836186&r2=1836187&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/BlobStoreFixtureProvider.java (original)
+++ jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/BlobStoreFixtureProvider.java Wed Jul 18 14:52:24 2018
@@ -30,8 +30,6 @@ import java.util.Map;
import java.util.Properties;
import java.util.UUID;
-import javax.annotation.CheckForNull;
-
import com.google.common.collect.Maps;
import com.google.common.io.Closer;
import com.google.common.io.Files;
@@ -47,12 +45,13 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.plugins.blob.datastore.OakFileDataStore;
import org.apache.jackrabbit.oak.run.cli.BlobStoreOptions.Type;
import org.apache.jackrabbit.oak.spi.blob.BlobStore;
+import org.jetbrains.annotations.Nullable;
import static org.apache.jackrabbit.oak.commons.PropertiesUtil.populate;
public class BlobStoreFixtureProvider {
- @CheckForNull
+ @Nullable
public static BlobStoreFixture create(Options options) throws Exception{
BlobStoreOptions bsopts = options.getOptionBean(BlobStoreOptions.class);
Modified: jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/NodeStoreFixture.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/NodeStoreFixture.java?rev=1836187&r1=1836186&r2=1836187&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/NodeStoreFixture.java (original)
+++ jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/NodeStoreFixture.java Wed Jul 18 14:52:24 2018
@@ -19,17 +19,16 @@ package org.apache.jackrabbit.oak.run.cl
import java.io.Closeable;
-import javax.annotation.CheckForNull;
-
import org.apache.jackrabbit.oak.spi.blob.BlobStore;
import org.apache.jackrabbit.oak.spi.state.NodeStore;
import org.apache.jackrabbit.oak.spi.whiteboard.Whiteboard;
+import org.jetbrains.annotations.Nullable;
public interface NodeStoreFixture extends Closeable {
NodeStore getStore();
- @CheckForNull
+ @Nullable
BlobStore getBlobStore();
Whiteboard getWhiteboard();
Modified: jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/OakHelpFormatter.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/OakHelpFormatter.java?rev=1836187&r1=1836186&r2=1836187&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/OakHelpFormatter.java (original)
+++ jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/OakHelpFormatter.java Wed Jul 18 14:52:24 2018
@@ -29,8 +29,6 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import javax.annotation.Nullable;
-
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.primitives.Ints;
@@ -42,6 +40,8 @@ import joptsimple.internal.Strings;
import static com.google.common.base.StandardSystemProperty.LINE_SEPARATOR;
+import org.jetbrains.annotations.Nullable;
+
public class OakHelpFormatter implements HelpFormatter {
private static final int COL_WIDTH = 120;
private final List<OptionsBean> optionBeans;