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:02:29 UTC
svn commit: r1836191 [5/5] - in /jackrabbit/oak/trunk/oak-segment-tar: ./
src/main/java/org/apache/jackrabbit/oak/backup/impl/
src/main/java/org/apache/jackrabbit/oak/segment/
src/main/java/org/apache/jackrabbit/oak/segment/compaction/
src/main/java/or...
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/iotrace/DepthFirstTrace.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/iotrace/DepthFirstTrace.java?rev=1836191&r1=1836190&r2=1836191&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/iotrace/DepthFirstTrace.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/iotrace/DepthFirstTrace.java Wed Jul 18 15:02:27 2018
@@ -29,10 +29,9 @@ import java.util.concurrent.atomic.Atomi
import java.util.function.Consumer;
import java.util.function.Function;
-import javax.annotation.Nonnull;
-
import com.google.common.collect.ImmutableList;
import org.apache.jackrabbit.oak.spi.state.NodeState;
+import org.jetbrains.annotations.NotNull;
/**
* A depth first traversal trace.
@@ -47,18 +46,18 @@ public class DepthFirstTrace implements
* The context specification of this trace.
* @see IOTracer#newIOTracer(Function, Writer, String)
*/
- @Nonnull
+ @NotNull
public static final String CONTEXT_SPEC = "depth,count,path";
private final int depth;
- @Nonnull
+ @NotNull
private final String path;
- @Nonnull
+ @NotNull
private final Consumer<List<String>> context;
- @Nonnull
+ @NotNull
private final AtomicInteger nodeCount = new AtomicInteger();
/**
@@ -67,7 +66,7 @@ public class DepthFirstTrace implements
* @param path path of the root node where to start traversing
* @param context consumer to pass the additional context to
*/
- public DepthFirstTrace(int depth, @Nonnull String path, @Nonnull Consumer<List<String>> context) {
+ public DepthFirstTrace(int depth, @NotNull String path, @NotNull Consumer<List<String>> context) {
checkArgument(depth >= 0);
this.depth = depth;
@@ -76,12 +75,12 @@ public class DepthFirstTrace implements
}
@Override
- public void run(@Nonnull NodeState node) {
+ public void run(@NotNull NodeState node) {
traverse(getNode(node, path), 0, path);
}
- @Nonnull
- private static NodeState getNode(@Nonnull NodeState root, @Nonnull String path) {
+ @NotNull
+ private static NodeState getNode(@NotNull NodeState root, @NotNull String path) {
NodeState node = root;
for (String name : elements(path)) {
node = node.getChildNode(name);
@@ -89,7 +88,7 @@ public class DepthFirstTrace implements
return node;
}
- private void traverse(NodeState node, int depth, @Nonnull String path) {
+ private void traverse(NodeState node, int depth, @NotNull String path) {
updateContext(context, depth, nodeCount.incrementAndGet(), path);
if (depth < this.depth) {
node.getChildNodeEntries().forEach(cse -> {
@@ -100,7 +99,7 @@ public class DepthFirstTrace implements
}
private static void updateContext(
- @Nonnull Consumer<List<String>> context, int depth, int count, @Nonnull String path) {
+ @NotNull Consumer<List<String>> context, int depth, int count, @NotNull String path) {
context.accept(ImmutableList.of(valueOf(depth), valueOf(count), path));
}
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/iotrace/IOTraceLogWriter.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/iotrace/IOTraceLogWriter.java?rev=1836191&r1=1836190&r2=1836191&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/iotrace/IOTraceLogWriter.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/iotrace/IOTraceLogWriter.java Wed Jul 18 15:02:27 2018
@@ -20,8 +20,7 @@ package org.apache.jackrabbit.oak.segmen
import static com.google.common.base.Preconditions.checkNotNull;
-import javax.annotation.Nonnull;
-
+import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger;
/**
@@ -30,24 +29,24 @@ import org.slf4j.Logger;
*/
public class IOTraceLogWriter implements IOTraceWriter {
- @Nonnull
+ @NotNull
private final Logger log;
/**
* Create a new instance persisting to {@code log}.
* @param log
*/
- public IOTraceLogWriter(@Nonnull Logger log) {
+ public IOTraceLogWriter(@NotNull Logger log) {
this.log = checkNotNull(log);
}
@Override
- public void writeHeader(@Nonnull String header) {
+ public void writeHeader(@NotNull String header) {
log.debug(header);
}
@Override
- public void writeEntry(@Nonnull String entry) {
+ public void writeEntry(@NotNull String entry) {
log.debug(entry);
}
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/iotrace/IOTraceMonitor.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/iotrace/IOTraceMonitor.java?rev=1836191&r1=1836190&r2=1836191&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/iotrace/IOTraceMonitor.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/iotrace/IOTraceMonitor.java Wed Jul 18 15:02:27 2018
@@ -31,29 +31,28 @@ import java.util.concurrent.atomic.Atomi
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-
import com.google.common.collect.ImmutableList;
import org.apache.jackrabbit.oak.segment.spi.monitor.IOMonitor;
import org.apache.jackrabbit.oak.segment.spi.monitor.IOMonitorAdapter;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
/**
* This implementation of a {@link IOMonitor} logs all io reads to an
* underlying {@link IOTraceWriter}.
*/
public class IOTraceMonitor extends IOMonitorAdapter implements Flushable {
- @Nonnull
+ @NotNull
private final AtomicReference<List<String>> context =
new AtomicReference<>(ImmutableList.of());
- @Nonnull
+ @NotNull
private final IOTraceWriter traceWriter;
- @Nonnull
+ @NotNull
private final Lock ioLock = new ReentrantLock();
- @Nonnull
+ @NotNull
private final ConcurrentLinkedQueue<IOEvent> ioEvents = newConcurrentLinkedQueue();
/**
@@ -61,7 +60,7 @@ public class IOTraceMonitor extends IOMo
* @param traceWriter the {@code IOTraceWriter}
* @param contextSpec additional context fields. A comma separated string.
*/
- public IOTraceMonitor(@Nonnull IOTraceWriter traceWriter, @CheckForNull String contextSpec) {
+ public IOTraceMonitor(@NotNull IOTraceWriter traceWriter, @Nullable String contextSpec) {
this.traceWriter = traceWriter;
traceWriter.writeHeader(IOEvent.getFields(contextSpec));
}
@@ -70,7 +69,7 @@ public class IOTraceMonitor extends IOMo
* Create a new instance writing to {@code traceWriter} additional context fields context.
* @param traceWriter the {@code IOTraceWriter}
*/
- public IOTraceMonitor(@Nonnull IOTraceWriter traceWriter) {
+ public IOTraceMonitor(@NotNull IOTraceWriter traceWriter) {
this(traceWriter, null);
}
@@ -79,12 +78,12 @@ public class IOTraceMonitor extends IOMo
* @param context a list of strings corresponding to the fields passed to the
* {@code contextSpec} argument in the constructor.
*/
- public void setContext(@Nonnull List<String> context) {
+ public void setContext(@NotNull List<String> context) {
this.context.set(context);
}
@Override
- public void afterSegmentRead(@Nonnull File file, long msb, long lsb, int length,
+ public void afterSegmentRead(@NotNull File file, long msb, long lsb, int length,
long elapsed) {
ioEvents.add(new IOEvent(
file.getName(), msb, lsb, length, elapsed, context.get()));
@@ -113,22 +112,22 @@ public class IOTraceMonitor extends IOMo
private static class IOEvent {
private static final String FIELDS = "timestamp,file,segmentId,length,elapsed";
- @Nonnull
+ @NotNull
private final String fileName;
private final long msb;
private final long lsb;
private final int length;
private final long elapsed;
- @Nonnull
+ @NotNull
private final List<String> context;
private IOEvent(
- @Nonnull String fileName,
+ @NotNull String fileName,
long msb,
long lsb,
int length,
long elapsed,
- @Nonnull List<String> context) {
+ @NotNull List<String> context) {
this.fileName = fileName;
this.msb = msb;
this.lsb = lsb;
@@ -137,7 +136,7 @@ public class IOTraceMonitor extends IOMo
this.context = context;
}
- public static String getFields(@CheckForNull String contextSpec) {
+ public static String getFields(@Nullable String contextSpec) {
if (contextSpec == null || contextSpec.isEmpty()) {
return FIELDS;
} else {
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/iotrace/IOTraceWriter.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/iotrace/IOTraceWriter.java?rev=1836191&r1=1836190&r2=1836191&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/iotrace/IOTraceWriter.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/iotrace/IOTraceWriter.java Wed Jul 18 15:02:27 2018
@@ -20,7 +20,7 @@ package org.apache.jackrabbit.oak.segmen
import java.io.Flushable;
-import javax.annotation.Nonnull;
+import org.jetbrains.annotations.NotNull;
/**
* Instances of {@code IOTraceWriter} are responsible for persisting
@@ -32,13 +32,13 @@ public interface IOTraceWriter extends F
* Persist a {@code header}
* @param header
*/
- void writeHeader(@Nonnull String header);
+ void writeHeader(@NotNull String header);
/**
* Persist a {@code entry}
* @param entry
*/
- void writeEntry(@Nonnull String entry);
+ void writeEntry(@NotNull String entry);
@Override
void flush();
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/iotrace/IOTracer.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/iotrace/IOTracer.java?rev=1836191&r1=1836190&r2=1836191&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/iotrace/IOTracer.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/iotrace/IOTracer.java Wed Jul 18 15:02:27 2018
@@ -24,11 +24,10 @@ import java.io.Writer;
import java.util.List;
import java.util.function.Function;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.oak.segment.file.FileStore;
import org.apache.jackrabbit.oak.segment.spi.monitor.IOMonitor;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
/**
* This utility class allows collecting IO traces of read accesses to segments
@@ -48,16 +47,16 @@ import org.apache.jackrabbit.oak.segment
* as specified during instantiation of an {@code IOTracer}.
*/
public class IOTracer {
- @Nonnull
+ @NotNull
private final Function<IOMonitor, FileStore> fileStoreFactory;
- @Nonnull
+ @NotNull
private final IOTraceMonitor ioMonitor;
private IOTracer(
- @Nonnull Function<IOMonitor, FileStore> fileStoreFactory,
- @Nonnull Writer output,
- @CheckForNull String contextSpec) {
+ @NotNull Function<IOMonitor, FileStore> fileStoreFactory,
+ @NotNull Writer output,
+ @Nullable String contextSpec) {
this.fileStoreFactory = checkNotNull(fileStoreFactory);
ioMonitor = new IOTraceMonitor(new DefaultIOTraceWriter(output), contextSpec);
}
@@ -73,11 +72,11 @@ public class IOTracer {
* the list of values passed to {@link IOTracer#setContext(List)}.
* @return A new {@code IOTracer} instance.
*/
- @Nonnull
+ @NotNull
public static IOTracer newIOTracer(
- @Nonnull Function<IOMonitor, FileStore> fileStoreFactory,
- @Nonnull Writer output,
- @CheckForNull String contextSpec) {
+ @NotNull Function<IOMonitor, FileStore> fileStoreFactory,
+ @NotNull Writer output,
+ @Nullable String contextSpec) {
return new IOTracer(fileStoreFactory, output, contextSpec);
}
@@ -85,7 +84,7 @@ public class IOTracer {
* Collect a IO trace.
* @param trace
*/
- public void collectTrace(@Nonnull Trace trace) {
+ public void collectTrace(@NotNull Trace trace) {
checkNotNull(trace);
try (FileStore fileStore = checkNotNull(fileStoreFactory).apply(checkNotNull(ioMonitor))) {
trace.run(fileStore.getHead());
@@ -100,7 +99,7 @@ public class IOTracer {
* {@link IOTracer#newIOTracer(Function, Writer, String)}.
* @param context
*/
- public void setContext(@Nonnull List<String> context) {
+ public void setContext(@NotNull List<String> context) {
ioMonitor.setContext(context);
}
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/iotrace/RandomAccessTrace.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/iotrace/RandomAccessTrace.java?rev=1836191&r1=1836190&r2=1836191&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/iotrace/RandomAccessTrace.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/iotrace/RandomAccessTrace.java Wed Jul 18 15:02:27 2018
@@ -28,11 +28,10 @@ import java.util.List;
import java.util.Random;
import java.util.function.Consumer;
-import javax.annotation.Nonnull;
-
import com.google.common.collect.ImmutableList;
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.spi.state.NodeState;
+import org.jetbrains.annotations.NotNull;
/**
* A random access trace
@@ -44,15 +43,15 @@ import org.apache.jackrabbit.oak.spi.sta
public class RandomAccessTrace implements Trace {
public static final String CONTEXT_SPEC = "path";
- @Nonnull
+ @NotNull
private final Random rnd;
private final int count;
- @Nonnull
+ @NotNull
private final List<String> paths;
- @Nonnull
+ @NotNull
private final Consumer<List<String>> context;
/**
@@ -62,7 +61,7 @@ public class RandomAccessTrace implement
* @param count number of paths to trace
* @param context consumer to pass the additional context to
*/
- public RandomAccessTrace(@Nonnull List<String> paths, long seed, int count, @Nonnull Consumer<List<String>> context) {
+ public RandomAccessTrace(@NotNull List<String> paths, long seed, int count, @NotNull Consumer<List<String>> context) {
this.rnd = new Random(seed);
this.count = count;
this.paths = paths;
@@ -70,7 +69,7 @@ public class RandomAccessTrace implement
}
@Override
- public void run(@Nonnull NodeState root) {
+ public void run(@NotNull NodeState root) {
if(!paths.isEmpty()) {
for (int c = 0; c < count; c++) {
String path = paths.get(rnd.nextInt(paths.size()));
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/iotrace/Trace.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/iotrace/Trace.java?rev=1836191&r1=1836190&r2=1836191&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/iotrace/Trace.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/iotrace/Trace.java Wed Jul 18 15:02:27 2018
@@ -18,9 +18,8 @@
package org.apache.jackrabbit.oak.segment.tool.iotrace;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.oak.spi.state.NodeState;
+import org.jetbrains.annotations.NotNull;
/**
* An instance of a {@code Trace} specifies a read pattern for tracing
@@ -32,5 +31,5 @@ public interface Trace {
* Run this trace on the passed {@code node}.
* @param node
*/
- void run(@Nonnull NodeState node);
+ void run(@NotNull NodeState node);
}
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/BigInlinedBinaryIT.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/BigInlinedBinaryIT.java?rev=1836191&r1=1836190&r2=1836191&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/BigInlinedBinaryIT.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/BigInlinedBinaryIT.java Wed Jul 18 15:02:27 2018
@@ -29,9 +29,6 @@ import java.io.File;
import java.io.IOException;
import java.io.InputStream;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.oak.api.Blob;
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.segment.file.FileStore;
@@ -39,6 +36,8 @@ import org.apache.jackrabbit.oak.segment
import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
import org.apache.jackrabbit.oak.spi.commit.EmptyHook;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.junit.Assume;
import org.junit.Before;
import org.junit.Rule;
@@ -81,10 +80,10 @@ public class BigInlinedBinaryIT {
}
}
- @Nonnull
+ @NotNull
private static Blob createBlob(long blobSize) {
return new Blob() {
- @Nonnull
+ @NotNull
@Override
public InputStream getNewStream() {
return new InputStream() {
@@ -101,13 +100,13 @@ public class BigInlinedBinaryIT {
return blobSize;
}
- @CheckForNull
+ @Nullable
@Override
public String getReference() {
return null;
}
- @CheckForNull
+ @Nullable
@Override
public String getContentIdentity() {
return null;
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/BlobIdRecordTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/BlobIdRecordTest.java?rev=1836191&r1=1836190&r2=1836191&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/BlobIdRecordTest.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/BlobIdRecordTest.java Wed Jul 18 15:02:27 2018
@@ -27,8 +27,6 @@ import java.io.InputStream;
import java.util.HashMap;
import java.util.Map;
-import javax.annotation.Nonnull;
-
import com.google.common.base.Strings;
import org.apache.jackrabbit.oak.plugins.memory.ArrayBasedBlob;
import org.apache.jackrabbit.oak.segment.Segment.RecordConsumer;
@@ -36,6 +34,7 @@ import org.apache.jackrabbit.oak.segment
import org.apache.jackrabbit.oak.spi.blob.BlobOptions;
import org.apache.jackrabbit.oak.spi.blob.BlobStore;
import org.apache.jackrabbit.oak.spi.blob.MemoryBlobStore;
+import org.jetbrains.annotations.NotNull;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
@@ -77,12 +76,12 @@ public class BlobIdRecordTest {
}
@Override
- public String getBlobId(@Nonnull String s) {
+ public String getBlobId(@NotNull String s) {
return bs.getBlobId(s);
}
@Override
- public String getReference(@Nonnull String s) {
+ public String getReference(@NotNull String s) {
return bs.getBlobId(mapId(s));
}
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/CheckpointCompactorTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/CheckpointCompactorTest.java?rev=1836191&r1=1836190&r2=1836191&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/CheckpointCompactorTest.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/CheckpointCompactorTest.java Wed Jul 18 15:02:27 2018
@@ -36,8 +36,6 @@ import java.io.IOException;
import java.util.List;
import java.util.Random;
-import javax.annotation.Nonnull;
-
import com.google.common.base.Suppliers;
import org.apache.jackrabbit.oak.api.Blob;
import org.apache.jackrabbit.oak.api.CommitFailedException;
@@ -53,6 +51,7 @@ import org.apache.jackrabbit.oak.spi.sta
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.apache.jackrabbit.oak.spi.state.NodeStore;
+import org.jetbrains.annotations.NotNull;
import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
@@ -163,8 +162,8 @@ public class CheckpointCompactorTest {
((SegmentNodeState) node2).getRecordId());
}
- @Nonnull
- private static CheckpointCompactor createCompactor(@Nonnull FileStore fileStore, @Nonnull GCGeneration generation) {
+ @NotNull
+ private static CheckpointCompactor createCompactor(@NotNull FileStore fileStore, @NotNull GCGeneration generation) {
SegmentWriter writer = defaultSegmentWriterBuilder("c")
.withGeneration(generation)
.build(fileStore);
@@ -177,7 +176,7 @@ public class CheckpointCompactorTest {
GCNodeWriteMonitor.EMPTY);
}
- private static void addTestContent(@Nonnull String parent, @Nonnull NodeStore nodeStore)
+ private static void addTestContent(@NotNull String parent, @NotNull NodeStore nodeStore)
throws CommitFailedException, IOException {
NodeBuilder rootBuilder = nodeStore.getRoot().builder();
NodeBuilder parentBuilder = rootBuilder.child(parent);
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/CompactorTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/CompactorTest.java?rev=1836191&r1=1836190&r2=1836191&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/CompactorTest.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/CompactorTest.java Wed Jul 18 15:02:27 2018
@@ -36,9 +36,6 @@ import java.nio.ByteBuffer;
import java.util.List;
import java.util.Random;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
import org.apache.jackrabbit.oak.api.Blob;
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.segment.file.FileStore;
@@ -50,6 +47,8 @@ import org.apache.jackrabbit.oak.spi.com
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.apache.jackrabbit.oak.spi.state.NodeStore;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
@@ -127,7 +126,7 @@ public class CompactorTest {
compactor.compact(nodeStore.getRoot(), Canceller.newCanceller());
}
- @Nonnull
+ @NotNull
private static Compactor createCompactor(FileStore fileStore, String failOnName) {
SegmentWriter writer = defaultSegmentWriterBuilder("c")
.withGeneration(newGCGeneration(1, 1, true))
@@ -179,13 +178,13 @@ public class CompactorTest {
}
private static class FailingSegmentWriter implements SegmentWriter {
- @Nonnull
+ @NotNull
private final SegmentWriter delegate;
- @Nonnull
+ @NotNull
private final String failOnName;
- public FailingSegmentWriter(@Nonnull SegmentWriter delegate, @Nonnull String failOnName) {
+ public FailingSegmentWriter(@NotNull SegmentWriter delegate, @NotNull String failOnName) {
this.delegate = delegate;
this.failOnName = failOnName;
}
@@ -195,21 +194,21 @@ public class CompactorTest {
delegate.flush();
}
- @Nonnull
+ @NotNull
@Override
- public RecordId writeBlob(@Nonnull Blob blob) throws IOException {
+ public RecordId writeBlob(@NotNull Blob blob) throws IOException {
return delegate.writeBlob(blob);
}
- @Nonnull
+ @NotNull
@Override
- public RecordId writeStream(@Nonnull InputStream stream) throws IOException {
+ public RecordId writeStream(@NotNull InputStream stream) throws IOException {
return delegate.writeStream(stream);
}
- @Nonnull
+ @NotNull
@Override
- public RecordId writeNode(@Nonnull NodeState state, @Nullable ByteBuffer stableIdBytes)
+ public RecordId writeNode(@NotNull NodeState state, @Nullable ByteBuffer stableIdBytes)
throws IOException {
if (state.hasChildNode(failOnName)) {
throw new IOException("Encountered node with name " + failOnName);
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/ExternalBlobIT.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/ExternalBlobIT.java?rev=1836191&r1=1836190&r2=1836191&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/ExternalBlobIT.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/ExternalBlobIT.java Wed Jul 18 15:02:27 2018
@@ -34,8 +34,6 @@ import java.util.Random;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
-import javax.annotation.Nonnull;
-
import com.google.common.collect.Lists;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
@@ -55,6 +53,7 @@ import org.apache.jackrabbit.oak.spi.com
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.apache.jackrabbit.oak.stats.DefaultStatisticsProvider;
+import org.jetbrains.annotations.NotNull;
import org.junit.After;
import org.junit.Ignore;
import org.junit.Rule;
@@ -230,12 +229,12 @@ public class ExternalBlobIT {
}
@Override
- public String getBlobId(@Nonnull String reference) {
+ public String getBlobId(@NotNull String reference) {
return reference;
}
@Override
- public String getReference(@Nonnull String blobId) {
+ public String getReference(@NotNull String blobId) {
return blobId;
}
}
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/ManyChildNodesIT.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/ManyChildNodesIT.java?rev=1836191&r1=1836190&r2=1836191&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/ManyChildNodesIT.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/ManyChildNodesIT.java Wed Jul 18 15:02:27 2018
@@ -28,8 +28,6 @@ import static org.junit.Assume.assumeTru
import java.io.File;
import java.io.IOException;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.segment.file.FileStore;
import org.apache.jackrabbit.oak.segment.file.InvalidFileStoreVersionException;
@@ -37,6 +35,7 @@ import org.apache.jackrabbit.oak.spi.com
import org.apache.jackrabbit.oak.spi.commit.EmptyHook;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.jackrabbit.oak.spi.state.NodeState;
+import org.jetbrains.annotations.NotNull;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -64,7 +63,7 @@ public class ManyChildNodesIT {
assumeTrue(ENABLED);
}
- @Nonnull
+ @NotNull
private FileStore createFileStore() throws InvalidFileStoreVersionException, IOException {
return fileStoreBuilder(folder.getRoot())
.withStringCacheSize(0)
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/NodeRecordTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/NodeRecordTest.java?rev=1836191&r1=1836190&r2=1836191&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/NodeRecordTest.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/NodeRecordTest.java Wed Jul 18 15:02:27 2018
@@ -26,13 +26,12 @@ import static org.junit.Assert.assertNot
import java.nio.ByteBuffer;
-import javax.annotation.Nonnull;
-
import com.google.common.base.Supplier;
import org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState;
import org.apache.jackrabbit.oak.segment.file.FileStore;
import org.apache.jackrabbit.oak.segment.file.FileStoreBuilder;
import org.apache.jackrabbit.oak.segment.file.tar.GCGeneration;
+import org.jetbrains.annotations.NotNull;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
@@ -176,19 +175,19 @@ public class NodeRecordTest {
WriterCacheManager defaultCache = new WriterCacheManager.Default();
- @Nonnull
+ @NotNull
@Override
public Cache<String, RecordId> getStringCache(int generation) {
return Empty.INSTANCE.getStringCache(generation);
}
- @Nonnull
+ @NotNull
@Override
public Cache<Template, RecordId> getTemplateCache(int generation) {
return Empty.INSTANCE.getTemplateCache(generation);
}
- @Nonnull
+ @NotNull
@Override
public Cache<String, RecordId> getNodeCache(int generation) {
return defaultCache.getNodeCache(generation);
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/ReaderCacheTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/ReaderCacheTest.java?rev=1836191&r1=1836190&r2=1836191&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/ReaderCacheTest.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/ReaderCacheTest.java Wed Jul 18 15:02:27 2018
@@ -27,9 +27,8 @@ import java.util.ArrayList;
import java.util.Random;
import java.util.concurrent.atomic.AtomicInteger;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.junit.Test;
import com.google.common.base.Function;
@@ -40,7 +39,7 @@ public class ReaderCacheTest {
public void empty() {
final AtomicInteger counter = new AtomicInteger();
Function<Integer, String> loader = new Function<Integer, String>() {
- @Override @Nonnull
+ @Override @NotNull
public String apply(@Nullable Integer input) {
counter.incrementAndGet();
return valueOf(input);
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentBufferWriterPoolTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentBufferWriterPoolTest.java?rev=1836191&r1=1836190&r2=1836191&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentBufferWriterPoolTest.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentBufferWriterPoolTest.java Wed Jul 18 15:02:27 2018
@@ -36,13 +36,12 @@ import java.util.concurrent.ExecutorServ
import java.util.concurrent.Future;
import java.util.concurrent.TimeoutException;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-
import com.google.common.base.Suppliers;
import org.apache.jackrabbit.oak.segment.WriteOperationHandler.WriteOperation;
import org.apache.jackrabbit.oak.segment.file.tar.GCGeneration;
import org.apache.jackrabbit.oak.segment.memory.MemoryStore;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.junit.After;
import org.junit.Test;
@@ -81,8 +80,8 @@ public class SegmentBufferWriterPoolTest
private WriteOperation createOp(final String key, final ConcurrentMap<String, SegmentBufferWriter> map) {
return new WriteOperation() {
- @Nonnull @Override
- public RecordId execute(@Nonnull SegmentBufferWriter writer) {
+ @NotNull @Override
+ public RecordId execute(@NotNull SegmentBufferWriter writer) {
map.put(key, writer);
return rootId;
}
@@ -154,9 +153,9 @@ public class SegmentBufferWriterPoolTest
@Test
public void testFlushBlocks() throws ExecutionException, InterruptedException {
Future<RecordId> res = execute(new WriteOperation() {
- @Nonnull
- @CheckForNull @Override
- public RecordId execute(@Nonnull SegmentBufferWriter writer) {
+ @NotNull
+ @Nullable @Override
+ public RecordId execute(@NotNull SegmentBufferWriter writer) {
try {
// This should deadlock as flush waits for this write
// operation to finish, which in this case contains the
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentCompactionIT.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentCompactionIT.java?rev=1836191&r1=1836190&r2=1836191&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentCompactionIT.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentCompactionIT.java Wed Jul 18 15:02:27 2018
@@ -65,7 +65,6 @@ import java.util.concurrent.atomic.Atomi
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
-import javax.annotation.Nonnull;
import javax.management.InstanceAlreadyExistsException;
import javax.management.MBeanRegistrationException;
import javax.management.MBeanServer;
@@ -107,6 +106,7 @@ import org.apache.jackrabbit.oak.spi.sta
import org.apache.jackrabbit.oak.spi.whiteboard.CompositeRegistration;
import org.apache.jackrabbit.oak.spi.whiteboard.Registration;
import org.apache.jackrabbit.oak.stats.Clock;
+import org.jetbrains.annotations.NotNull;
import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
@@ -775,7 +775,7 @@ public class SegmentCompactionIT {
private volatile String checkpoint;
private volatile boolean cancelled;
- private Checkpoint(@Nonnull NodeStore nodeStore) {
+ private Checkpoint(@NotNull NodeStore nodeStore) {
this.nodeStore = nodeStore;
}
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentDataStoreBlobGCIT.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentDataStoreBlobGCIT.java?rev=1836191&r1=1836190&r2=1836191&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentDataStoreBlobGCIT.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentDataStoreBlobGCIT.java Wed Jul 18 15:02:27 2018
@@ -42,8 +42,6 @@ import java.util.concurrent.ScheduledExe
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
-import javax.annotation.Nullable;
-
import ch.qos.logback.classic.Level;
import com.google.common.base.Stopwatch;
import com.google.common.collect.ImmutableList;
@@ -72,6 +70,7 @@ import org.apache.jackrabbit.oak.spi.com
import org.apache.jackrabbit.oak.spi.commit.EmptyHook;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.jackrabbit.oak.stats.DefaultStatisticsProvider;
+import org.jetbrains.annotations.Nullable;
import org.junit.After;
import org.junit.Rule;
import org.junit.Test;
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentIdTableBenchmark.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentIdTableBenchmark.java?rev=1836191&r1=1836190&r2=1836191&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentIdTableBenchmark.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentIdTableBenchmark.java Wed Jul 18 15:02:27 2018
@@ -22,16 +22,15 @@ import java.io.IOException;
import java.lang.ref.WeakReference;
import java.util.Random;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.oak.segment.memory.MemoryStore;
+import org.jetbrains.annotations.NotNull;
public class SegmentIdTableBenchmark {
private static SegmentIdFactory newSegmentIdMaker(final SegmentStore store) {
return new SegmentIdFactory() {
- @Nonnull
+ @NotNull
@Override
public SegmentId newSegmentId(long msb, long lsb) {
return new SegmentId(store, msb, lsb);
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentIdTableTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentIdTableTest.java?rev=1836191&r1=1836190&r2=1836191&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentIdTableTest.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentIdTableTest.java Wed Jul 18 15:02:27 2018
@@ -36,9 +36,8 @@ import java.util.concurrent.Executors;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.oak.segment.memory.MemoryStore;
+import org.jetbrains.annotations.NotNull;
import org.junit.Test;
public class SegmentIdTableTest {
@@ -46,7 +45,7 @@ public class SegmentIdTableTest {
private static SegmentIdFactory newSegmentIdMaker(final SegmentStore store) {
return new SegmentIdFactory() {
- @Nonnull
+ @NotNull
@Override
public SegmentId newSegmentId(long msb, long lsb) {
return new SegmentId(store, msb, lsb);
@@ -217,4 +216,4 @@ public class SegmentIdTableTest {
}
assertEquals(2, tbl.getMapRebuildCount());
}
-}
\ No newline at end of file
+}
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentParserTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentParserTest.java?rev=1836191&r1=1836190&r2=1836191&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentParserTest.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentParserTest.java Wed Jul 18 15:02:27 2018
@@ -49,8 +49,6 @@ import java.util.List;
import java.util.Map;
import java.util.Random;
-import javax.annotation.CheckForNull;
-
import com.google.common.base.Strings;
import com.google.common.collect.ImmutableList;
import org.apache.jackrabbit.oak.api.Blob;
@@ -64,6 +62,7 @@ import org.apache.jackrabbit.oak.segment
import org.apache.jackrabbit.oak.segment.memory.MemoryStore;
import org.apache.jackrabbit.oak.spi.blob.BlobStore;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
+import org.jetbrains.annotations.Nullable;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -172,7 +171,7 @@ public class SegmentParserTest {
@Before
public void setup() throws IOException {
store = new MemoryStore() {
- @CheckForNull
+ @Nullable
@Override
public BlobStore getBlobStore() {
return blobStore;
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/TestUtils.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/TestUtils.java?rev=1836191&r1=1836190&r2=1836191&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/TestUtils.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/TestUtils.java Wed Jul 18 15:02:27 2018
@@ -26,8 +26,8 @@ import static org.apache.jackrabbit.oak.
import java.util.Map;
import java.util.Random;
-import javax.annotation.Nonnull;
+import org.jetbrains.annotations.NotNull;
public final class TestUtils {
private TestUtils() {}
@@ -46,7 +46,7 @@ public final class TestUtils {
* Returns a new valid record offset, between {@code a} and {@code b},
* exclusive.
*/
- public static int newValidOffset(@Nonnull Random random, int a, int b) {
+ public static int newValidOffset(@NotNull Random random, int a, int b) {
int p = (a >> RECORD_ALIGN_BITS) + 1;
int q = (b >> RECORD_ALIGN_BITS);
return (p + random.nextInt(q - p)) << RECORD_ALIGN_BITS;
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/FileBlob.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/FileBlob.java?rev=1836191&r1=1836190&r2=1836191&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/FileBlob.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/FileBlob.java Wed Jul 18 15:02:27 2018
@@ -23,9 +23,8 @@ import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.oak.api.Blob;
+import org.jetbrains.annotations.NotNull;
/**
* A blob as a file in the file system.
@@ -49,7 +48,7 @@ public class FileBlob implements Blob {
return null;
}
- @Nonnull
+ @NotNull
@Override
public InputStream getNewStream() {
try {
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/TarRevisionsTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/TarRevisionsTest.java?rev=1836191&r1=1836190&r2=1836191&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/TarRevisionsTest.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/TarRevisionsTest.java Wed Jul 18 15:02:27 2018
@@ -35,9 +35,6 @@ import java.util.concurrent.CountDownLat
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeoutException;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
import com.google.common.base.Function;
import com.google.common.base.Functions;
import com.google.common.util.concurrent.ListenableFuture;
@@ -48,6 +45,8 @@ import org.apache.jackrabbit.oak.segment
import org.apache.jackrabbit.oak.segment.spi.persistence.SegmentNodeStorePersistence;
import org.apache.jackrabbit.oak.segment.SegmentReader;
import org.apache.jackrabbit.oak.segment.file.tar.TarPersistence;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
@@ -93,7 +92,7 @@ public class TarRevisionsTest {
}
}
- @Nonnull
+ @NotNull
private JournalReader createJournalReader() throws IOException {
return new JournalReader(getPersistence().getJournalFile());
}
@@ -106,7 +105,7 @@ public class TarRevisionsTest {
}
}
- @Nonnull
+ @NotNull
private static SegmentNodeState addChild(SegmentNodeState node, String name) {
SegmentNodeBuilder builder = node.builder();
builder.setChildNode(name);
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/scheduler/LockBasedSchedulerCheckpointTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/scheduler/LockBasedSchedulerCheckpointTest.java?rev=1836191&r1=1836190&r2=1836191&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/scheduler/LockBasedSchedulerCheckpointTest.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/scheduler/LockBasedSchedulerCheckpointTest.java Wed Jul 18 15:02:27 2018
@@ -30,7 +30,6 @@ import java.util.concurrent.Callable;
import java.util.concurrent.Semaphore;
import java.util.concurrent.atomic.AtomicBoolean;
-import javax.annotation.Nonnull;
import org.apache.jackrabbit.oak.segment.SegmentNodeStoreStats;
import org.apache.jackrabbit.oak.segment.memory.MemoryStore;
import org.apache.jackrabbit.oak.spi.commit.CommitHook;
@@ -38,8 +37,8 @@ import org.apache.jackrabbit.oak.spi.com
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.apache.jackrabbit.oak.stats.StatisticsProvider;
+import org.jetbrains.annotations.NotNull;
import org.junit.Test;
-
public class LockBasedSchedulerCheckpointTest {
/**
* OAK-3587 test simulates a timeout while trying to create a checkpoint,
@@ -163,7 +162,7 @@ public class LockBasedSchedulerCheckpoin
a.setProperty(property, value);
Commit blockingCommit = new Commit(a, new CommitHook() {
@Override
- @Nonnull
+ @NotNull
public NodeState processCommit(NodeState before, NodeState after, CommitInfo info) {
try {
callable.call();
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/tool/iotrace/BreadthFirstTraceTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/tool/iotrace/BreadthFirstTraceTest.java?rev=1836191&r1=1836190&r2=1836191&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/tool/iotrace/BreadthFirstTraceTest.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/tool/iotrace/BreadthFirstTraceTest.java Wed Jul 18 15:02:27 2018
@@ -24,16 +24,15 @@ import static org.junit.Assert.assertEqu
import java.util.List;
-import javax.annotation.Nonnull;
-
import com.google.common.collect.ImmutableList;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.jackrabbit.oak.spi.state.NodeState;
+import org.jetbrains.annotations.NotNull;
import org.junit.Test;
public class BreadthFirstTraceTest {
- @Nonnull
+ @NotNull
private static NodeState createTree(int depth) {
NodeBuilder root = EMPTY_NODE.builder();
NodeBuilder child = root;
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/tool/iotrace/DepthFirstTraceTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/tool/iotrace/DepthFirstTraceTest.java?rev=1836191&r1=1836190&r2=1836191&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/tool/iotrace/DepthFirstTraceTest.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/tool/iotrace/DepthFirstTraceTest.java Wed Jul 18 15:02:27 2018
@@ -24,16 +24,15 @@ import static org.junit.Assert.assertEqu
import java.util.List;
-import javax.annotation.Nonnull;
-
import com.google.common.collect.ImmutableList;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.jackrabbit.oak.spi.state.NodeState;
+import org.jetbrains.annotations.NotNull;
import org.junit.Test;
public class DepthFirstTraceTest {
- @Nonnull
+ @NotNull
private static NodeState createTree(int depth) {
NodeBuilder root = EMPTY_NODE.builder();
NodeBuilder child = root;
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/tool/iotrace/IOTraceMonitorTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/tool/iotrace/IOTraceMonitorTest.java?rev=1836191&r1=1836190&r2=1836191&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/tool/iotrace/IOTraceMonitorTest.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/tool/iotrace/IOTraceMonitorTest.java Wed Jul 18 15:02:27 2018
@@ -24,8 +24,7 @@ import static org.junit.Assert.assertTru
import java.io.File;
-import javax.annotation.Nonnull;
-
+import org.jetbrains.annotations.NotNull;
import org.junit.Test;
public class IOTraceMonitorTest {
@@ -62,12 +61,12 @@ public class IOTraceMonitorTest {
private boolean flushed;
@Override
- public void writeHeader(@Nonnull String header) {
+ public void writeHeader(@NotNull String header) {
this.header = header;
}
@Override
- public void writeEntry(@Nonnull String entry) {
+ public void writeEntry(@NotNull String entry) {
this.entry = entry;
}
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/tool/iotrace/IOTracerTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/tool/iotrace/IOTracerTest.java?rev=1836191&r1=1836190&r2=1836191&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/tool/iotrace/IOTracerTest.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/tool/iotrace/IOTracerTest.java Wed Jul 18 15:02:27 2018
@@ -38,8 +38,6 @@ import java.util.List;
import java.util.Optional;
import java.util.function.Function;
-import javax.annotation.Nonnull;
-
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import org.apache.jackrabbit.oak.segment.SegmentNodeBuilder;
@@ -49,6 +47,7 @@ import org.apache.jackrabbit.oak.segment
import org.apache.jackrabbit.oak.segment.spi.monitor.IOMonitor;
import org.apache.jackrabbit.oak.segment.spi.monitor.IOMonitorAdapter;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
+import org.jetbrains.annotations.NotNull;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -80,7 +79,7 @@ public class IOTracerTest extends IOMoni
}
}
- @Nonnull
+ @NotNull
private FileStore createFileStore(IOMonitor ioMonitor) {
try {
return fileStoreBuilder(folder.getRoot())
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/tool/iotrace/RandomTraceTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/tool/iotrace/RandomTraceTest.java?rev=1836191&r1=1836190&r2=1836191&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/tool/iotrace/RandomTraceTest.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/tool/iotrace/RandomTraceTest.java Wed Jul 18 15:02:27 2018
@@ -27,17 +27,16 @@ import static org.junit.Assert.assertTru
import java.util.List;
-import javax.annotation.Nonnull;
-
import com.google.common.collect.ImmutableList;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.jackrabbit.oak.spi.state.NodeState;
+import org.jetbrains.annotations.NotNull;
import org.junit.Test;
public class RandomTraceTest {
- @Nonnull
- private static NodeState createTree(@Nonnull List<String> paths) {
+ @NotNull
+ private static NodeState createTree(@NotNull List<String> paths) {
NodeBuilder root = EMPTY_NODE.builder();
for (String path : paths) {
createNode(root, path);
@@ -45,7 +44,7 @@ public class RandomTraceTest {
return root.getNodeState();
}
- private static void createNode(@Nonnull NodeBuilder root, @Nonnull String path) {
+ private static void createNode(@NotNull NodeBuilder root, @NotNull String path) {
NodeBuilder child = root;
for (String name : elements(path)) {
child = child.child(name);
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/upgrade/UpgradeIT.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/upgrade/UpgradeIT.java?rev=1836191&r1=1836190&r2=1836191&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/upgrade/UpgradeIT.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/upgrade/UpgradeIT.java Wed Jul 18 15:02:27 2018
@@ -34,8 +34,6 @@ import static org.junit.Assert.fail;
import java.io.File;
import java.io.IOException;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.oak.segment.SegmentVersion;
import org.apache.jackrabbit.oak.segment.data.SegmentData;
import org.apache.jackrabbit.oak.segment.file.InvalidFileStoreVersionException;
@@ -43,6 +41,7 @@ import org.apache.jackrabbit.oak.segment
import org.apache.jackrabbit.oak.segment.spi.monitor.IOMonitorAdapter;
import org.apache.jackrabbit.oak.segment.file.tar.TarFiles;
import org.apache.jackrabbit.oak.segment.tool.Compact;
+import org.jetbrains.annotations.NotNull;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -129,7 +128,7 @@ public class UpgradeIT {
true, version, version).checkManifest();
}
- private void checkSegmentVersion(@Nonnull SegmentVersion version) throws IOException {
+ private void checkSegmentVersion(@NotNull SegmentVersion version) throws IOException {
try (TarFiles tarFiles = TarFiles.builder()
.withDirectory(fileStoreHome.getRoot())
.withTarRecovery((_1, _2, _3) -> fail("Unexpected recovery"))
@@ -146,7 +145,7 @@ public class UpgradeIT {
}
}
- private static Iterable<SegmentData> getSegments(@Nonnull TarFiles tarFiles) {
+ private static Iterable<SegmentData> getSegments(@NotNull TarFiles tarFiles) {
return transform(
tarFiles.getSegmentIds(),
uuid -> newSegmentData(tarFiles.readSegment(