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 [4/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/file/SafeRunnable.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/SafeRunnable.java?rev=1836191&r1=1836190&r2=1836191&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/SafeRunnable.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/SafeRunnable.java Wed Jul 18 15:02:27 2018
@@ -22,8 +22,7 @@ package org.apache.jackrabbit.oak.segmen
import static com.google.common.base.Preconditions.checkNotNull;
import static java.lang.Thread.currentThread;
-import javax.annotation.Nonnull;
-
+import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -41,10 +40,10 @@ class SafeRunnable implements Runnable {
private static final Logger log = LoggerFactory.getLogger(SafeRunnable.class);
- @Nonnull
+ @NotNull
private final String name;
- @Nonnull
+ @NotNull
private final Runnable runnable;
/**
@@ -54,7 +53,7 @@ class SafeRunnable implements Runnable {
* @param name The name of the background operation.
* @param runnable The background operation.
*/
- SafeRunnable(@Nonnull String name, @Nonnull Runnable runnable) {
+ SafeRunnable(@NotNull String name, @NotNull Runnable runnable) {
this.name = checkNotNull(name);
this.runnable = checkNotNull(runnable);
}
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/Scheduler.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/Scheduler.java?rev=1836191&r1=1836190&r2=1836191&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/Scheduler.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/Scheduler.java Wed Jul 18 15:02:27 2018
@@ -30,9 +30,8 @@ import java.util.concurrent.ThreadFactor
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicLong;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -51,13 +50,13 @@ public class Scheduler implements Closea
private static int schedulerNumber = 0;
private static final Logger LOG = LoggerFactory.getLogger(Scheduler.class);
- @Nonnull
+ @NotNull
private final AtomicLong executionCounter = new AtomicLong();
- @Nonnull
+ @NotNull
private final String name;
- @Nonnull
+ @NotNull
private final ScheduledExecutorService executor;
/**
@@ -84,7 +83,7 @@ public class Scheduler implements Closea
* @param task
* @see ScheduledExecutorService#execute(Runnable)
*/
- public void execute(@Nonnull String name, @Nonnull Runnable task) {
+ public void execute(@NotNull String name, @NotNull Runnable task) {
executor.execute(new SafeRunnable(name, task));
}
@@ -98,10 +97,10 @@ public class Scheduler implements Closea
* @see ScheduledExecutorService#schedule(Runnable, long, TimeUnit)
*/
public void scheduleOnce(
- @Nonnull String name,
+ @NotNull String name,
long delay,
- @Nonnull TimeUnit unit,
- @Nonnull Runnable task) {
+ @NotNull TimeUnit unit,
+ @NotNull Runnable task) {
executor.schedule(new SafeRunnable(name, task), delay, unit);
}
@@ -115,10 +114,10 @@ public class Scheduler implements Closea
* @see ScheduledExecutorService#scheduleAtFixedRate(Runnable, long, long, TimeUnit)
*/
public void scheduleAtFixedRate(
- @Nonnull String name,
+ @NotNull String name,
long period,
- @Nonnull TimeUnit unit,
- @Nonnull Runnable task) {
+ @NotNull TimeUnit unit,
+ @NotNull Runnable task) {
executor.scheduleAtFixedRate(new SafeRunnable(name, task), period, period, unit);
}
@@ -132,10 +131,10 @@ public class Scheduler implements Closea
* @see ScheduledExecutorService#scheduleWithFixedDelay(Runnable, long, long, TimeUnit)
*/
public void scheduleWithFixedDelay(
- @Nonnull String name,
+ @NotNull String name,
long delay,
- @Nonnull TimeUnit unit,
- @Nonnull Runnable task) {
+ @NotNull TimeUnit unit,
+ @NotNull Runnable task) {
executor.scheduleWithFixedDelay(new SafeRunnable(name, task), delay, delay, unit);
}
@@ -161,15 +160,15 @@ public class Scheduler implements Closea
private static class SchedulerThreadFactory implements ThreadFactory {
private final ThreadFactory threadFactory = defaultThreadFactory();
- @Nonnull
+ @NotNull
private final String name;
- public SchedulerThreadFactory(@Nonnull String name) {
+ public SchedulerThreadFactory(@NotNull String name) {
this.name = name;
}
@Override
- public Thread newThread(@Nonnull Runnable runnable) {
+ public Thread newThread(@NotNull Runnable runnable) {
Thread thread = threadFactory.newThread(runnable);
thread.setName(name);
thread.setDaemon(true);
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/TarRevisions.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/TarRevisions.java?rev=1836191&r1=1836190&r2=1836191&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/TarRevisions.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/TarRevisions.java Wed Jul 18 15:02:27 2018
@@ -33,9 +33,6 @@ import java.util.concurrent.locks.ReadWr
import java.util.concurrent.locks.ReentrantLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-
import com.google.common.base.Function;
import com.google.common.base.Supplier;
import org.apache.jackrabbit.oak.segment.RecordId;
@@ -46,6 +43,8 @@ import org.apache.jackrabbit.oak.segment
import org.apache.jackrabbit.oak.segment.spi.persistence.SegmentNodeStorePersistence;
import org.apache.jackrabbit.oak.segment.SegmentStore;
import org.apache.jackrabbit.oak.segment.file.tar.TarPersistence;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -68,7 +67,7 @@ public class TarRevisions implements Rev
*/
private final Lock journalFileLock = new ReentrantLock();
- @Nonnull
+ @NotNull
private final AtomicReference<RecordId> head;
private final SegmentNodeStorePersistence persistence;
@@ -85,25 +84,25 @@ public class TarRevisions implements Rev
* The persisted head of the root journal, used to determine whether the
* latest {@link #head} value should be written to the disk.
*/
- @Nonnull
+ @NotNull
private final AtomicReference<RecordId> persistedHead;
- @Nonnull
+ @NotNull
private final ReadWriteLock rwLock = new ReentrantReadWriteLock(true);
private static class TimeOutOption implements Option {
private final long time;
- @Nonnull
+ @NotNull
private final TimeUnit unit;
- TimeOutOption(long time, @Nonnull TimeUnit unit) {
+ TimeOutOption(long time, @NotNull TimeUnit unit) {
this.time = time;
this.unit = unit;
}
- @Nonnull
- public static TimeOutOption from(@CheckForNull Option option) {
+ @NotNull
+ public static TimeOutOption from(@Nullable Option option) {
if (option instanceof TimeOutOption) {
return (TimeOutOption) option;
} else {
@@ -156,9 +155,9 @@ public class TarRevisions implements Rev
* @param writeInitialNode provider for the initial node in case the journal is empty.
* @throws IOException
*/
- synchronized void bind(@Nonnull SegmentStore store,
- @Nonnull SegmentIdProvider idProvider,
- @Nonnull Supplier<RecordId> writeInitialNode)
+ synchronized void bind(@NotNull SegmentStore store,
+ @NotNull SegmentIdProvider idProvider,
+ @NotNull Supplier<RecordId> writeInitialNode)
throws IOException {
if (head.get() != null) {
return;
@@ -241,14 +240,14 @@ public class TarRevisions implements Rev
persistedHead.set(after);
}
- @Nonnull
+ @NotNull
@Override
public RecordId getHead() {
checkBound();
return head.get();
}
- @Nonnull
+ @NotNull
@Override
public RecordId getPersistedHead() {
checkBound();
@@ -266,9 +265,9 @@ public class TarRevisions implements Rev
*/
@Override
public boolean setHead(
- @Nonnull RecordId expected,
- @Nonnull RecordId head,
- @Nonnull Option... options) {
+ @NotNull RecordId expected,
+ @NotNull RecordId head,
+ @NotNull Option... options) {
checkBound();
// If the expedite option was specified we acquire the write lock instead of the read lock.
@@ -301,8 +300,8 @@ public class TarRevisions implements Rev
*/
@Override
public RecordId setHead(
- @Nonnull Function<RecordId, RecordId> newHead,
- @Nonnull Option... options)
+ @NotNull Function<RecordId, RecordId> newHead,
+ @NotNull Option... options)
throws InterruptedException {
checkBound();
TimeOutOption timeout = getTimeout(options);
@@ -333,8 +332,8 @@ public class TarRevisions implements Rev
}
}
- @Nonnull
- private static TimeOutOption getTimeout(@Nonnull Option[] options) {
+ @NotNull
+ private static TimeOutOption getTimeout(@NotNull Option[] options) {
if (options.length == 0) {
return TimeOutOption.from(INFINITY);
} else if (options.length == 1) {
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/proc/AbstractNode.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/proc/AbstractNode.java?rev=1836191&r1=1836190&r2=1836191&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/proc/AbstractNode.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/proc/AbstractNode.java Wed Jul 18 15:02:27 2018
@@ -21,13 +21,12 @@ package org.apache.jackrabbit.oak.segmen
import java.util.Collections;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.spi.state.AbstractNodeState;
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;
abstract class AbstractNode extends AbstractNodeState {
@@ -37,29 +36,29 @@ abstract class AbstractNode extends Abst
}
@Override
- public boolean hasChildNode(@Nonnull String name) {
+ public boolean hasChildNode(@NotNull String name) {
return NodeUtils.hasChildNode(getChildNodeEntries(), name);
}
- @Nonnull
+ @NotNull
@Override
- public NodeState getChildNode(@Nonnull String name) throws IllegalArgumentException {
+ public NodeState getChildNode(@NotNull String name) throws IllegalArgumentException {
return NodeUtils.getChildNode(getChildNodeEntries(), name);
}
- @Nonnull
+ @NotNull
@Override
public NodeBuilder builder() {
throw new UnsupportedOperationException();
}
- @Nonnull
+ @NotNull
@Override
public Iterable<? extends PropertyState> getProperties() {
return Collections.emptyList();
}
- @Nonnull
+ @NotNull
@Override
public Iterable<? extends ChildNodeEntry> getChildNodeEntries() {
return Collections.emptyList();
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/proc/BulkSegmentNode.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/proc/BulkSegmentNode.java?rev=1836191&r1=1836190&r2=1836191&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/proc/BulkSegmentNode.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/proc/BulkSegmentNode.java Wed Jul 18 15:02:27 2018
@@ -23,12 +23,11 @@ import static org.apache.jackrabbit.oak.
import java.util.Arrays;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.Type;
import org.apache.jackrabbit.oak.segment.file.proc.Proc.Backend;
import org.apache.jackrabbit.oak.segment.file.proc.Proc.Backend.Segment;
+import org.jetbrains.annotations.NotNull;
class BulkSegmentNode extends AbstractNode {
@@ -44,7 +43,7 @@ class BulkSegmentNode extends AbstractNo
this.segment = segment;
}
- @Nonnull
+ @NotNull
@Override
public Iterable<? extends PropertyState> getProperties() {
return Arrays.asList(
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/proc/CommitNode.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/proc/CommitNode.java?rev=1836191&r1=1836190&r2=1836191&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/proc/CommitNode.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/proc/CommitNode.java Wed Jul 18 15:02:27 2018
@@ -21,8 +21,6 @@ package org.apache.jackrabbit.oak.segmen
import static java.util.Collections.emptySet;
import static java.util.Collections.singleton;
-import javax.annotation.Nonnull;
-
import com.google.common.collect.Lists;
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.Type;
@@ -32,6 +30,7 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.segment.file.proc.Proc.Backend.Commit;
import org.apache.jackrabbit.oak.spi.state.ChildNodeEntry;
import org.apache.jackrabbit.oak.spi.state.NodeState;
+import org.jetbrains.annotations.NotNull;
class CommitNode extends AbstractNode {
@@ -44,7 +43,7 @@ class CommitNode extends AbstractNode {
this.handle = handle;
}
- @Nonnull
+ @NotNull
@Override
public Iterable<? extends PropertyState> getProperties() {
return backend.getCommit(handle).map(this::getProperties).orElse(emptySet());
@@ -57,7 +56,7 @@ class CommitNode extends AbstractNode {
);
}
- @Nonnull
+ @NotNull
@Override
public Iterable<? extends ChildNodeEntry> getChildNodeEntries() {
return backend.getCommit(handle)
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/proc/DataSegmentNode.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/proc/DataSegmentNode.java?rev=1836191&r1=1836190&r2=1836191&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/proc/DataSegmentNode.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/proc/DataSegmentNode.java Wed Jul 18 15:02:27 2018
@@ -23,14 +23,13 @@ import static org.apache.jackrabbit.oak.
import java.util.Arrays;
-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.MemoryChildNodeEntry;
import org.apache.jackrabbit.oak.segment.file.proc.Proc.Backend;
import org.apache.jackrabbit.oak.segment.file.proc.Proc.Backend.Segment;
import org.apache.jackrabbit.oak.spi.state.ChildNodeEntry;
+import org.jetbrains.annotations.NotNull;
class DataSegmentNode extends AbstractNode {
@@ -46,7 +45,7 @@ class DataSegmentNode extends AbstractNo
this.segment = segment;
}
- @Nonnull
+ @NotNull
@Override
public Iterable<? extends PropertyState> getProperties() {
return Arrays.asList(
@@ -63,7 +62,7 @@ class DataSegmentNode extends AbstractNo
);
}
- @Nonnull
+ @NotNull
@Override
public Iterable<? extends ChildNodeEntry> getChildNodeEntries() {
return Arrays.asList(
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/proc/JournalNode.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/proc/JournalNode.java?rev=1836191&r1=1836190&r2=1836191&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/proc/JournalNode.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/proc/JournalNode.java Wed Jul 18 15:02:27 2018
@@ -21,12 +21,11 @@ package org.apache.jackrabbit.oak.segmen
import java.util.ArrayList;
import java.util.List;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState;
import org.apache.jackrabbit.oak.plugins.memory.MemoryChildNodeEntry;
import org.apache.jackrabbit.oak.spi.state.ChildNodeEntry;
import org.apache.jackrabbit.oak.spi.state.NodeState;
+import org.jetbrains.annotations.NotNull;
class JournalNode extends AbstractNode {
@@ -37,20 +36,20 @@ class JournalNode extends AbstractNode {
}
@Override
- public boolean hasChildNode(@Nonnull String name) {
+ public boolean hasChildNode(@NotNull String name) {
return backend.commitExists(name);
}
- @Nonnull
+ @NotNull
@Override
- public NodeState getChildNode(@Nonnull String name) throws IllegalArgumentException {
+ public NodeState getChildNode(@NotNull String name) throws IllegalArgumentException {
if (backend.commitExists(name)) {
return new CommitNode(backend, name);
}
return EmptyNodeState.MISSING_NODE;
}
- @Nonnull
+ @NotNull
@Override
public Iterable<? extends ChildNodeEntry> getChildNodeEntries() {
List<ChildNodeEntry> entries = new ArrayList<>();
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/proc/MissingSegmentNode.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/proc/MissingSegmentNode.java?rev=1836191&r1=1836190&r2=1836191&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/proc/MissingSegmentNode.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/proc/MissingSegmentNode.java Wed Jul 18 15:02:27 2018
@@ -23,10 +23,9 @@ import static org.apache.jackrabbit.oak.
import java.util.Arrays;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.Type;
+import org.jetbrains.annotations.NotNull;
class MissingSegmentNode extends AbstractNode {
@@ -36,7 +35,7 @@ class MissingSegmentNode extends Abstrac
this.segmentId = segmentId;
}
- @Nonnull
+ @NotNull
@Override
public Iterable<? extends PropertyState> getProperties() {
return Arrays.asList(
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/proc/RecordNode.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/proc/RecordNode.java?rev=1836191&r1=1836190&r2=1836191&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/proc/RecordNode.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/proc/RecordNode.java Wed Jul 18 15:02:27 2018
@@ -24,13 +24,12 @@ import static org.apache.jackrabbit.oak.
import java.util.Arrays;
import java.util.Collections;
-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.MemoryChildNodeEntry;
import org.apache.jackrabbit.oak.segment.file.proc.Proc.Backend.Record;
import org.apache.jackrabbit.oak.spi.state.ChildNodeEntry;
+import org.jetbrains.annotations.NotNull;
class RecordNode extends AbstractNode {
@@ -40,7 +39,7 @@ class RecordNode extends AbstractNode {
this.record = record;
}
- @Nonnull
+ @NotNull
@Override
public Iterable<? extends PropertyState> getProperties() {
return Arrays.asList(
@@ -52,7 +51,7 @@ class RecordNode extends AbstractNode {
);
}
- @Nonnull
+ @NotNull
@Override
public Iterable<? extends ChildNodeEntry> getChildNodeEntries() {
return record.getRoot()
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/proc/RecordsNode.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/proc/RecordsNode.java?rev=1836191&r1=1836190&r2=1836191&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/proc/RecordsNode.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/proc/RecordsNode.java Wed Jul 18 15:02:27 2018
@@ -23,12 +23,11 @@ import java.util.Collections;
import java.util.stream.Collectors;
import java.util.stream.StreamSupport;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.oak.plugins.memory.MemoryChildNodeEntry;
import org.apache.jackrabbit.oak.segment.file.proc.Proc.Backend;
import org.apache.jackrabbit.oak.segment.file.proc.Proc.Backend.Record;
import org.apache.jackrabbit.oak.spi.state.ChildNodeEntry;
+import org.jetbrains.annotations.NotNull;
class RecordsNode extends AbstractNode {
@@ -41,7 +40,7 @@ class RecordsNode extends AbstractNode {
this.segmentId = segmentId;
}
- @Nonnull
+ @NotNull
@Override
public Iterable<? extends ChildNodeEntry> getChildNodeEntries() {
return backend.getSegmentRecords(segmentId)
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/proc/ReferencesNode.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/proc/ReferencesNode.java?rev=1836191&r1=1836190&r2=1836191&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/proc/ReferencesNode.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/proc/ReferencesNode.java Wed Jul 18 15:02:27 2018
@@ -23,10 +23,9 @@ import java.util.Collections;
import java.util.stream.Collectors;
import java.util.stream.StreamSupport;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.oak.segment.file.proc.Proc.Backend;
import org.apache.jackrabbit.oak.spi.state.ChildNodeEntry;
+import org.jetbrains.annotations.NotNull;
class ReferencesNode extends AbstractNode {
@@ -39,7 +38,7 @@ class ReferencesNode extends AbstractNod
this.segmentId = segmentId;
}
- @Nonnull
+ @NotNull
@Override
public Iterable<? extends ChildNodeEntry> getChildNodeEntries() {
return backend.getSegmentReferences(segmentId)
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/proc/SegmentBlob.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/proc/SegmentBlob.java?rev=1836191&r1=1836190&r2=1836191&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/proc/SegmentBlob.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/proc/SegmentBlob.java Wed Jul 18 15:02:27 2018
@@ -21,12 +21,11 @@ package org.apache.jackrabbit.oak.segmen
import java.io.InputStream;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.oak.api.Blob;
import org.apache.jackrabbit.oak.segment.file.proc.Proc.Backend;
import org.apache.jackrabbit.oak.segment.file.proc.Proc.Backend.Segment;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
class SegmentBlob implements Blob {
@@ -42,7 +41,7 @@ class SegmentBlob implements Blob {
this.segment = segment;
}
- @Nonnull
+ @NotNull
@Override
public InputStream getNewStream() {
return backend.getSegmentData(segmentId)
@@ -54,13 +53,13 @@ class SegmentBlob implements Blob {
return segment.getLength();
}
- @CheckForNull
+ @Nullable
@Override
public String getReference() {
return null;
}
- @CheckForNull
+ @Nullable
@Override
public String getContentIdentity() {
return null;
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/proc/SegmentEntry.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/proc/SegmentEntry.java?rev=1836191&r1=1836190&r2=1836191&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/proc/SegmentEntry.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/proc/SegmentEntry.java Wed Jul 18 15:02:27 2018
@@ -19,11 +19,10 @@
package org.apache.jackrabbit.oak.segment.file.proc;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.oak.segment.file.proc.Proc.Backend;
import org.apache.jackrabbit.oak.spi.state.ChildNodeEntry;
import org.apache.jackrabbit.oak.spi.state.NodeState;
+import org.jetbrains.annotations.NotNull;
class SegmentEntry implements ChildNodeEntry {
@@ -36,13 +35,13 @@ class SegmentEntry implements ChildNodeE
this.segmentId = segmentId;
}
- @Nonnull
+ @NotNull
@Override
public String getName() {
return segmentId;
}
- @Nonnull
+ @NotNull
@Override
public NodeState getNodeState() {
return SegmentNode.newSegmentNode(backend, segmentId);
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/proc/StoreNode.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/proc/StoreNode.java?rev=1836191&r1=1836190&r2=1836191&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/proc/StoreNode.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/proc/StoreNode.java Wed Jul 18 15:02:27 2018
@@ -21,13 +21,12 @@ package org.apache.jackrabbit.oak.segmen
import java.util.ArrayList;
import java.util.List;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState;
import org.apache.jackrabbit.oak.plugins.memory.MemoryChildNodeEntry;
import org.apache.jackrabbit.oak.segment.file.proc.Proc.Backend;
import org.apache.jackrabbit.oak.spi.state.ChildNodeEntry;
import org.apache.jackrabbit.oak.spi.state.NodeState;
+import org.jetbrains.annotations.NotNull;
class StoreNode extends AbstractNode {
@@ -38,20 +37,20 @@ class StoreNode extends AbstractNode {
}
@Override
- public boolean hasChildNode(@Nonnull String name) {
+ public boolean hasChildNode(@NotNull String name) {
return backend.tarExists(name);
}
- @Nonnull
+ @NotNull
@Override
- public NodeState getChildNode(@Nonnull String name) throws IllegalArgumentException {
+ public NodeState getChildNode(@NotNull String name) throws IllegalArgumentException {
if (backend.tarExists(name)) {
return new TarNode(backend, name);
}
return EmptyNodeState.MISSING_NODE;
}
- @Nonnull
+ @NotNull
@Override
public Iterable<? extends ChildNodeEntry> getChildNodeEntries() {
List<ChildNodeEntry> entries = new ArrayList<>();
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/proc/TarNode.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/proc/TarNode.java?rev=1836191&r1=1836190&r2=1836191&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/proc/TarNode.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/proc/TarNode.java Wed Jul 18 15:02:27 2018
@@ -23,14 +23,13 @@ import static org.apache.jackrabbit.oak.
import java.util.stream.Collectors;
import java.util.stream.StreamSupport;
-import javax.annotation.Nonnull;
-
import com.google.common.collect.ImmutableList;
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState;
import org.apache.jackrabbit.oak.segment.file.proc.Proc.Backend;
import org.apache.jackrabbit.oak.spi.state.ChildNodeEntry;
import org.apache.jackrabbit.oak.spi.state.NodeState;
+import org.jetbrains.annotations.NotNull;
class TarNode extends AbstractNode {
@@ -43,7 +42,7 @@ class TarNode extends AbstractNode {
this.name = name;
}
- @Nonnull
+ @NotNull
@Override
public Iterable<? extends PropertyState> getProperties() {
return ImmutableList.of(
@@ -53,20 +52,20 @@ class TarNode extends AbstractNode {
}
@Override
- public boolean hasChildNode(@Nonnull String name) {
+ public boolean hasChildNode(@NotNull String name) {
return backend.segmentExists(this.name, name);
}
- @Nonnull
+ @NotNull
@Override
- public NodeState getChildNode(@Nonnull String name) throws IllegalArgumentException {
+ public NodeState getChildNode(@NotNull String name) throws IllegalArgumentException {
if (backend.segmentExists(this.name, name)) {
return SegmentNode.newSegmentNode(backend, name);
}
return EmptyNodeState.MISSING_NODE;
}
- @Nonnull
+ @NotNull
@Override
public Iterable<? extends ChildNodeEntry> getChildNodeEntries() {
return StreamSupport.stream(backend.getSegmentIds(name).spliterator(), false)
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/GCGeneration.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/GCGeneration.java?rev=1836191&r1=1836190&r2=1836191&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/GCGeneration.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/GCGeneration.java Wed Jul 18 15:02:27 2018
@@ -20,11 +20,10 @@ package org.apache.jackrabbit.oak.segmen
import static com.google.common.base.Preconditions.checkNotNull;
-import javax.annotation.Nonnull;
-
import com.google.common.base.Objects;
import org.apache.jackrabbit.oak.segment.file.tar.index.IndexEntry;
import org.apache.jackrabbit.oak.segment.spi.persistence.SegmentArchiveEntry;
+import org.jetbrains.annotations.NotNull;
/**
* Instances of this class represent the garbage collection generation related
@@ -92,7 +91,7 @@ public final class GCGeneration {
* Create a new instance with the generation and the full generation incremented by one
* and the compaction flag left unchanged.
*/
- @Nonnull
+ @NotNull
public GCGeneration nextFull() {
return new GCGeneration(generation + 1, fullGeneration + 1, true);
}
@@ -101,7 +100,7 @@ public final class GCGeneration {
* Create a new instance with the generation incremented by one and the full
* generation and the compaction flag left unchanged.
*/
- @Nonnull
+ @NotNull
public GCGeneration nextTail() {
return new GCGeneration(generation + 1, fullGeneration, true);
}
@@ -110,7 +109,7 @@ public final class GCGeneration {
* Create a new instance with the compaction flag unset and the generation and the
* full generation left unchanged.
*/
- @Nonnull
+ @NotNull
public GCGeneration nonGC() {
return new GCGeneration(generation, fullGeneration, false);
}
@@ -120,7 +119,7 @@ public final class GCGeneration {
* @param gcGeneration the generation this generation is compared against.
* @return Number of generations between this generation and {@code gcGeneration}
*/
- public int compareWith(@Nonnull GCGeneration gcGeneration) {
+ public int compareWith(@NotNull GCGeneration gcGeneration) {
return generation - checkNotNull(gcGeneration).generation;
}
@@ -130,7 +129,7 @@ public final class GCGeneration {
* @return Number of generations between the full generations of this generation
* and {@code gcGeneration}
*/
- public int compareFullGenerationWith(@Nonnull GCGeneration gcGeneration) {
+ public int compareFullGenerationWith(@NotNull GCGeneration gcGeneration) {
return fullGeneration - checkNotNull(gcGeneration).fullGeneration;
}
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/TarFiles.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/TarFiles.java?rev=1836191&r1=1836190&r2=1836191&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/TarFiles.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/TarFiles.java Wed Jul 18 15:02:27 2018
@@ -47,8 +47,6 @@ import java.util.function.Consumer;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import javax.annotation.Nonnull;
-
import com.google.common.base.Predicate;
import com.google.common.collect.Iterables;
import org.apache.jackrabbit.oak.segment.file.FileReaper;
@@ -57,6 +55,7 @@ import org.apache.jackrabbit.oak.segment
import org.apache.jackrabbit.oak.segment.spi.monitor.IOMonitor;
import org.apache.jackrabbit.oak.segment.spi.persistence.SegmentArchiveManager;
import org.apache.jackrabbit.oak.segment.spi.persistence.SegmentNodeStorePersistence;
+import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -231,7 +230,7 @@ public class TarFiles implements Closeab
private static Iterable<TarReader> iterable(final Node head) {
return new Iterable<TarReader>() {
- @Nonnull
+ @NotNull
@Override
public Iterator<TarReader> iterator() {
return new Iterator<TarReader>() {
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/TarReader.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/TarReader.java?rev=1836191&r1=1836190&r2=1836191&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/TarReader.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/TarReader.java Wed Jul 18 15:02:27 2018
@@ -41,8 +41,6 @@ import java.util.UUID;
import java.util.function.Consumer;
import java.util.stream.Collectors;
-import javax.annotation.Nonnull;
-
import com.google.common.base.Predicate;
import org.apache.jackrabbit.oak.segment.file.tar.binaries.BinaryReferencesIndexLoader;
import org.apache.jackrabbit.oak.segment.spi.persistence.SegmentArchiveEntry;
@@ -51,6 +49,7 @@ import org.apache.jackrabbit.oak.segment
import org.apache.jackrabbit.oak.segment.file.tar.binaries.InvalidBinaryReferencesIndexException;
import org.apache.jackrabbit.oak.segment.file.tar.index.IndexEntry;
import org.apache.jackrabbit.oak.segment.spi.persistence.SegmentArchiveReader;
+import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -315,7 +314,7 @@ public class TarReader implements Closea
*
* @return An array of {@link IndexEntry}.
*/
- @Nonnull
+ @NotNull
SegmentArchiveEntry[] getEntries() {
List<SegmentArchiveEntry> entryList = archive.listSegments();
return entryList.toArray(new SegmentArchiveEntry[entryList.size()]);
@@ -328,7 +327,7 @@ public class TarReader implements Closea
* @param graph The content of the graph of this TAR file.
* @return The references of the provided TAR entry.
*/
- @Nonnull
+ @NotNull
private static List<UUID> getReferences(UUID id, Map<UUID, List<UUID>> graph) {
List<UUID> references = graph.get(id);
@@ -356,7 +355,7 @@ public class TarReader implements Closea
* @param collector An instance of {@link Consumer}.
* @param skipGeneration An instance of {@link Predicate}.
*/
- void collectBlobReferences(@Nonnull Consumer<String> collector, Predicate<GCGeneration> skipGeneration) {
+ void collectBlobReferences(@NotNull Consumer<String> collector, Predicate<GCGeneration> skipGeneration) {
BinaryReferencesIndex references = getBinaryReferences();
if (references == null) {
@@ -463,7 +462,7 @@ public class TarReader implements Closea
* @return Either this {@link TarReader}, or a new instance of {@link
* TarReader}, or {@code null}.
*/
- TarReader sweep(@Nonnull Set<UUID> reclaim, @Nonnull Set<UUID> reclaimed) throws IOException {
+ TarReader sweep(@NotNull Set<UUID> reclaim, @NotNull Set<UUID> reclaimed) throws IOException {
String name = archive.getName();
log.debug("Cleaning up {}", name);
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tooling/BasicReadOnlyBlobStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tooling/BasicReadOnlyBlobStore.java?rev=1836191&r1=1836190&r2=1836191&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tooling/BasicReadOnlyBlobStore.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tooling/BasicReadOnlyBlobStore.java Wed Jul 18 15:02:27 2018
@@ -23,10 +23,9 @@ import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.oak.spi.blob.BlobOptions;
import org.apache.jackrabbit.oak.spi.blob.BlobStore;
+import org.jetbrains.annotations.NotNull;
/**
* Utility BlobStore implementation to be used in tooling that can work with a
@@ -74,12 +73,12 @@ public class BasicReadOnlyBlobStore impl
}
@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/main/java/org/apache/jackrabbit/oak/segment/file/tooling/RevisionHistory.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tooling/RevisionHistory.java?rev=1836191&r1=1836190&r2=1836191&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tooling/RevisionHistory.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tooling/RevisionHistory.java Wed Jul 18 15:02:27 2018
@@ -28,9 +28,6 @@ import java.io.File;
import java.io.IOException;
import java.util.Iterator;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-
import com.google.common.base.Function;
import com.google.common.collect.Iterators;
import org.apache.jackrabbit.oak.json.BlobSerializer;
@@ -42,6 +39,8 @@ import org.apache.jackrabbit.oak.segment
import org.apache.jackrabbit.oak.segment.file.JournalReader;
import org.apache.jackrabbit.oak.segment.file.ReadOnlyFileStore;
import org.apache.jackrabbit.oak.spi.state.NodeState;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
/**
* Utility for tracing a node back through the revision history.
@@ -55,7 +54,7 @@ public class RevisionHistory {
* @param directory
* @throws IOException
*/
- public RevisionHistory(@Nonnull File directory) throws IOException, InvalidFileStoreVersionException {
+ public RevisionHistory(@NotNull File directory) throws IOException, InvalidFileStoreVersionException {
this.store = fileStoreBuilder(checkNotNull(directory)).buildReadOnly();
}
@@ -76,14 +75,14 @@ public class RevisionHistory {
* @return
* @throws IOException
*/
- public Iterator<HistoryElement> getHistory(@Nonnull JournalFile journal, @Nonnull final String path)
+ public Iterator<HistoryElement> getHistory(@NotNull JournalFile journal, @NotNull final String path)
throws IOException {
checkNotNull(path);
try (JournalReader journalReader = new JournalReader(checkNotNull(journal))) {
return Iterators.transform(journalReader,
new Function<JournalEntry, HistoryElement>() {
- @Nonnull @Override
+ @NotNull @Override
public HistoryElement apply(JournalEntry entry) {
store.setRevision(entry.getRevision());
NodeState node = getNode(store.getHead(), path);
@@ -109,7 +108,7 @@ public class RevisionHistory {
* Revision of the node
* @return
*/
- @Nonnull
+ @NotNull
public String getRevision() {
return revision;
}
@@ -118,7 +117,7 @@ public class RevisionHistory {
* Node at given revision
* @return
*/
- @CheckForNull
+ @Nullable
public NodeState getNode() {
return node;
}
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/memory/MemoryStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/memory/MemoryStore.java?rev=1836191&r1=1836190&r2=1836191&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/memory/MemoryStore.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/memory/MemoryStore.java Wed Jul 18 15:02:27 2018
@@ -25,9 +25,6 @@ import java.nio.ByteBuffer;
import java.util.Set;
import java.util.concurrent.ConcurrentMap;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-
import com.google.common.collect.Maps;
import org.apache.jackrabbit.oak.segment.CachingSegmentReader;
import org.apache.jackrabbit.oak.segment.Revisions;
@@ -41,22 +38,24 @@ import org.apache.jackrabbit.oak.segment
import org.apache.jackrabbit.oak.segment.SegmentTracker;
import org.apache.jackrabbit.oak.segment.SegmentWriter;
import org.apache.jackrabbit.oak.spi.blob.BlobStore;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
/**
* A store used for in-memory operations.
*/
public class MemoryStore implements SegmentStore {
- @Nonnull
+ @NotNull
private final SegmentTracker tracker;
- @Nonnull
+ @NotNull
private final MemoryStoreRevisions revisions;
- @Nonnull
+ @NotNull
private final SegmentReader segmentReader;
- @Nonnull
+ @NotNull
private final SegmentWriter segmentWriter;
private final ConcurrentMap<SegmentId, Segment> segments =
@@ -64,7 +63,7 @@ public class MemoryStore implements Segm
public MemoryStore() throws IOException {
this.tracker = new SegmentTracker(new SegmentIdFactory() {
- @Override @Nonnull
+ @Override @NotNull
public SegmentId newSegmentId(long msb, long lsb) {
return new SegmentId(MemoryStore.this, msb, lsb);
}
@@ -76,22 +75,22 @@ public class MemoryStore implements Segm
segmentWriter.flush();
}
- @Nonnull
+ @NotNull
public SegmentWriter getWriter() {
return segmentWriter;
}
- @Nonnull
+ @NotNull
public SegmentReader getReader() {
return segmentReader;
}
- @Nonnull
+ @NotNull
public SegmentIdProvider getSegmentIdProvider() {
return tracker;
}
- @Nonnull
+ @NotNull
public Revisions getRevisions() {
return revisions;
}
@@ -101,7 +100,7 @@ public class MemoryStore implements Segm
return id.sameStore(this) || segments.containsKey(id);
}
- @Override @Nonnull
+ @Override @NotNull
public Segment readSegment(SegmentId id) {
Segment segment = segments.get(id);
if (segment != null) {
@@ -125,7 +124,7 @@ public class MemoryStore implements Segm
/**
* @return {@code null}
*/
- @CheckForNull
+ @Nullable
public BlobStore getBlobStore() {
return null;
}
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/memory/MemoryStoreRevisions.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/memory/MemoryStoreRevisions.java?rev=1836191&r1=1836190&r2=1836191&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/memory/MemoryStoreRevisions.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/memory/MemoryStoreRevisions.java Wed Jul 18 15:02:27 2018
@@ -24,12 +24,11 @@ import static org.apache.jackrabbit.oak.
import java.io.IOException;
-import javax.annotation.Nonnull;
-
import com.google.common.base.Function;
import org.apache.jackrabbit.oak.segment.RecordId;
import org.apache.jackrabbit.oak.segment.Revisions;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
+import org.jetbrains.annotations.NotNull;
/**
* This is a simple in memory {@code Revisions} implementation.
@@ -54,14 +53,14 @@ public class MemoryStoreRevisions implem
checkState(head != null, "Revisions not bound to a store");
}
- @Nonnull
+ @NotNull
@Override
public synchronized RecordId getHead() {
checkBound();
return head;
}
- @Nonnull
+ @NotNull
@Override
public RecordId getPersistedHead() {
return getHead();
@@ -69,8 +68,8 @@ public class MemoryStoreRevisions implem
@Override
public synchronized boolean setHead(
- @Nonnull RecordId expected, @Nonnull RecordId head,
- @Nonnull Option... options) {
+ @NotNull RecordId expected, @NotNull RecordId head,
+ @NotNull Option... options) {
checkBound();
if (this.head.equals(expected)) {
this.head = head;
@@ -86,8 +85,8 @@ public class MemoryStoreRevisions implem
*/
@Override
public RecordId setHead(
- @Nonnull Function<RecordId, RecordId> newHead,
- @Nonnull Option... options) throws InterruptedException {
+ @NotNull Function<RecordId, RecordId> newHead,
+ @NotNull Option... options) throws InterruptedException {
throw new UnsupportedOperationException();
}
}
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/scheduler/Commit.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/scheduler/Commit.java?rev=1836191&r1=1836190&r2=1836191&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/scheduler/Commit.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/scheduler/Commit.java Wed Jul 18 15:02:27 2018
@@ -20,8 +20,6 @@ package org.apache.jackrabbit.oak.segmen
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.segment.SegmentNodeBuilder;
import org.apache.jackrabbit.oak.segment.SegmentNodeState;
@@ -30,6 +28,7 @@ import org.apache.jackrabbit.oak.spi.com
import org.apache.jackrabbit.oak.spi.state.ConflictAnnotatingRebaseDiff;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.jackrabbit.oak.spi.state.NodeState;
+import org.jetbrains.annotations.NotNull;
/**
* A {@code Commit} instance represents a set of related changes, which when
@@ -42,7 +41,7 @@ public class Commit {
private final CommitHook hook;
private final CommitInfo info;
- public Commit(@Nonnull NodeBuilder changes, @Nonnull CommitHook hook, @Nonnull CommitInfo info) {
+ public Commit(@NotNull NodeBuilder changes, @NotNull CommitHook hook, @NotNull CommitInfo info) {
checkNotNull(changes);
checkArgument(changes instanceof SegmentNodeBuilder);
this.changes = (SegmentNodeBuilder) changes;
@@ -105,4 +104,4 @@ public class Commit {
public CommitInfo info() {
return info;
}
-}
\ No newline at end of file
+}
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/scheduler/LockBasedScheduler.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/scheduler/LockBasedScheduler.java?rev=1836191&r1=1836190&r2=1836191&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/scheduler/LockBasedScheduler.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/scheduler/LockBasedScheduler.java Wed Jul 18 15:02:27 2018
@@ -37,7 +37,6 @@ import java.util.concurrent.atomic.Atomi
import com.codahale.metrics.Histogram;
import com.codahale.metrics.UniformReservoir;
-import javax.annotation.Nonnull;
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.segment.Revisions;
@@ -52,37 +51,37 @@ import org.apache.jackrabbit.oak.spi.com
import org.apache.jackrabbit.oak.spi.commit.Observer;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.jackrabbit.oak.spi.state.NodeState;
+import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-
public class LockBasedScheduler implements Scheduler {
public static class LockBasedSchedulerBuilder {
- @Nonnull
+ @NotNull
private final SegmentReader reader;
- @Nonnull
+ @NotNull
private final Revisions revisions;
- @Nonnull
+ @NotNull
private final SegmentNodeStoreStats stats;
private boolean dispatchChanges = true;
- private LockBasedSchedulerBuilder(@Nonnull Revisions revisions, @Nonnull SegmentReader reader,
- @Nonnull SegmentNodeStoreStats stats) {
+ private LockBasedSchedulerBuilder(@NotNull Revisions revisions, @NotNull SegmentReader reader,
+ @NotNull SegmentNodeStoreStats stats) {
this.revisions = revisions;
this.reader = reader;
this.stats = stats;
}
- @Nonnull
+ @NotNull
public LockBasedSchedulerBuilder dispatchChanges(boolean dispatchChanges) {
this.dispatchChanges = dispatchChanges;
return this;
}
- @Nonnull
+ @NotNull
public LockBasedScheduler build() {
if (dispatchChanges) {
return new ObservableLockBasedScheduler(this);
@@ -93,8 +92,8 @@ public class LockBasedScheduler implemen
}
- public static LockBasedSchedulerBuilder builder(@Nonnull Revisions revisions, @Nonnull SegmentReader reader,
- @Nonnull SegmentNodeStoreStats stats) {
+ public static LockBasedSchedulerBuilder builder(@NotNull Revisions revisions, @NotNull SegmentReader reader,
+ @NotNull SegmentNodeStoreStats stats) {
return new LockBasedSchedulerBuilder(checkNotNull(revisions), checkNotNull(reader), checkNotNull(stats));
}
@@ -134,10 +133,10 @@ public class LockBasedScheduler implemen
*/
private final Semaphore commitSemaphore = new Semaphore(1, COMMIT_FAIR_LOCK);
- @Nonnull
+ @NotNull
private final SegmentReader reader;
- @Nonnull
+ @NotNull
private final Revisions revisions;
protected final AtomicReference<SegmentNodeState> head;
@@ -198,7 +197,7 @@ public class LockBasedScheduler implemen
}
@Override
- public NodeState schedule(@Nonnull Commit commit, SchedulerOption... schedulingOptions)
+ public NodeState schedule(@NotNull Commit commit, SchedulerOption... schedulingOptions)
throws CommitFailedException {
boolean queued = false;
@@ -275,7 +274,7 @@ public class LockBasedScheduler implemen
}
@Override
- public String checkpoint(long lifetime, @Nonnull Map<String, String> properties) {
+ public String checkpoint(long lifetime, @NotNull Map<String, String> properties) {
checkArgument(lifetime > 0);
checkNotNull(properties);
String name = UUID.randomUUID().toString();
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/scheduler/Scheduler.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/scheduler/Scheduler.java?rev=1836191&r1=1836190&r2=1836191&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/scheduler/Scheduler.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/scheduler/Scheduler.java Wed Jul 18 15:02:27 2018
@@ -19,10 +19,9 @@ package org.apache.jackrabbit.oak.segmen
import java.util.Map;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.spi.state.NodeState;
+import org.jetbrains.annotations.NotNull;
/**
* A {@code Scheduler} instance transforms changes to the content tree
@@ -55,7 +54,7 @@ public interface Scheduler {
* @throws CommitFailedException if the commit failed and none of the changes
* have been applied.
*/
- NodeState schedule(@Nonnull Commit commit, SchedulerOption... schedulingOptions) throws CommitFailedException;
+ NodeState schedule(@NotNull Commit commit, SchedulerOption... schedulingOptions) throws CommitFailedException;
/**
* Creates a new checkpoint of the latest root of the tree. The checkpoint
@@ -73,7 +72,7 @@ public interface Scheduler {
* @param properties properties to associate with the checkpoint
* @return string reference of this checkpoint
*/
- String checkpoint(long lifetime, @Nonnull Map<String, String> properties);
+ String checkpoint(long lifetime, @NotNull Map<String, String> properties);
/**
* Releases the provided checkpoint. If the provided checkpoint doesn't exist this method should return {@code true}.
@@ -88,4 +87,4 @@ public interface Scheduler {
* @return the latest state.
*/
NodeState getHeadNodeState();
-}
\ No newline at end of file
+}
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/monitor/CompositeIOMonitor.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/monitor/CompositeIOMonitor.java?rev=1836191&r1=1836190&r2=1836191&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/monitor/CompositeIOMonitor.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/monitor/CompositeIOMonitor.java Wed Jul 18 15:02:27 2018
@@ -25,9 +25,8 @@ import static java.util.Collections.empt
import java.io.File;
import java.util.Set;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.oak.spi.whiteboard.Registration;
+import org.jetbrains.annotations.NotNull;
/**
* This {@link IOMonitor} instance delegates all calls to all
@@ -40,7 +39,7 @@ public class CompositeIOMonitor implemen
* Create a new {@code CompositeIOMonitor} instance delegating the passed {@code ioMonitors}
* @param ioMonitors {@link IOMonitor} instances to delegate to
*/
- public CompositeIOMonitor(@Nonnull Iterable<? extends IOMonitor> ioMonitors) {
+ public CompositeIOMonitor(@NotNull Iterable<? extends IOMonitor> ioMonitors) {
this.ioMonitors = newConcurrentHashSet(checkNotNull(ioMonitors));
}
@@ -59,8 +58,8 @@ public class CompositeIOMonitor implemen
* @param ioMonitor {@code IOMonitor} to delegate to
* @return a {@code Registration} for {@code ioMonitor}.
*/
- @Nonnull
- public Registration registerIOMonitor(@Nonnull IOMonitor ioMonitor) {
+ @NotNull
+ public Registration registerIOMonitor(@NotNull IOMonitor ioMonitor) {
ioMonitors.add(checkNotNull(ioMonitor));
return () -> ioMonitors.remove(ioMonitor);
}
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/SegmentArchiveManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/SegmentArchiveManager.java?rev=1836191&r1=1836190&r2=1836191&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/SegmentArchiveManager.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/SegmentArchiveManager.java Wed Jul 18 15:02:27 2018
@@ -18,12 +18,12 @@
*/
package org.apache.jackrabbit.oak.segment.spi.persistence;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import java.io.IOException;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.UUID;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
/**
* SegmentArchiveManager provides a low-level access to the segment files (eg.
@@ -40,7 +40,7 @@ public interface SegmentArchiveManager {
*
* @return archive list
*/
- @Nonnull
+ @NotNull
List<String> listArchives() throws IOException;
/**
@@ -50,7 +50,7 @@ public interface SegmentArchiveManager {
* @return the archive reader or null if the archive doesn't exist
*/
@Nullable
- SegmentArchiveReader open(@Nonnull String archiveName) throws IOException;
+ SegmentArchiveReader open(@NotNull String archiveName) throws IOException;
/**
* Creates a new archive.
@@ -58,8 +58,8 @@ public interface SegmentArchiveManager {
* @param archiveName
* @return the archive writer
*/
- @Nonnull
- SegmentArchiveWriter create(@Nonnull String archiveName) throws IOException;
+ @NotNull
+ SegmentArchiveWriter create(@NotNull String archiveName) throws IOException;
/**
* Deletes the archive if exists.
@@ -67,7 +67,7 @@ public interface SegmentArchiveManager {
* @param archiveName
* @return true if the archive was removed, false otherwise
*/
- boolean delete(@Nonnull String archiveName);
+ boolean delete(@NotNull String archiveName);
/**
* Renames the archive.
@@ -76,7 +76,7 @@ public interface SegmentArchiveManager {
* @param to new name
* @return true if the archive was renamed, false otherwise
*/
- boolean renameTo(@Nonnull String from, @Nonnull String to);
+ boolean renameTo(@NotNull String from, @NotNull String to);
/**
* Copies the archive with all the segments.
@@ -84,7 +84,7 @@ public interface SegmentArchiveManager {
* @param from the existing archive
* @param to new name
*/
- void copyFile(@Nonnull String from, @Nonnull String to) throws IOException;
+ void copyFile(@NotNull String from, @NotNull String to) throws IOException;
/**
* Check if archive exists.
@@ -92,7 +92,7 @@ public interface SegmentArchiveManager {
* @param archiveName archive to check
* @return true if archive exists, false otherwise
*/
- boolean exists(@Nonnull String archiveName);
+ boolean exists(@NotNull String archiveName);
/**
* Finds all the segments included in the archive.
@@ -101,6 +101,6 @@ public interface SegmentArchiveManager {
* @param entries results will be put there, in the order of presence in the
* archive
*/
- void recoverEntries(@Nonnull String archiveName, @Nonnull LinkedHashMap<UUID, byte[]> entries) throws IOException;
+ void recoverEntries(@NotNull String archiveName, @NotNull LinkedHashMap<UUID, byte[]> entries) throws IOException;
}
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/SegmentArchiveReader.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/SegmentArchiveReader.java?rev=1836191&r1=1836190&r2=1836191&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/SegmentArchiveReader.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/SegmentArchiveReader.java Wed Jul 18 15:02:27 2018
@@ -23,8 +23,8 @@ import java.io.IOException;
import java.nio.ByteBuffer;
import java.util.List;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
/**
* This interface represents a read-only segment archive. Since the underlying
@@ -79,7 +79,7 @@ public interface SegmentArchiveReader ex
*
* @return byte buffer representing the binary references structure.
*/
- @Nonnull
+ @NotNull
ByteBuffer getBinaryReferences() throws IOException;
/**
@@ -94,7 +94,7 @@ public interface SegmentArchiveReader ex
*
* @return archive name
*/
- @Nonnull
+ @NotNull
String getName();
/**
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/SegmentArchiveWriter.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/SegmentArchiveWriter.java?rev=1836191&r1=1836190&r2=1836191&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/SegmentArchiveWriter.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/SegmentArchiveWriter.java Wed Jul 18 15:02:27 2018
@@ -21,8 +21,8 @@ package org.apache.jackrabbit.oak.segmen
import java.io.IOException;
import java.nio.ByteBuffer;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
/**
* Represents a write-enabled, append-only archive. It allows to append segments
@@ -64,8 +64,8 @@ public interface SegmentArchiveWriter {
* @param isCompacted the segment compaction property, see {@link SegmentArchiveEntry#isCompacted()}
* @throws IOException
*/
- @Nonnull
- void writeSegment(long msb, long lsb, @Nonnull byte[] data, int offset, int size, int generation, int fullGeneration, boolean isCompacted) throws IOException;
+ @NotNull
+ void writeSegment(long msb, long lsb, @NotNull byte[] data, int offset, int size, int generation, int fullGeneration, boolean isCompacted) throws IOException;
/**
* Read the segment.
@@ -91,14 +91,14 @@ public interface SegmentArchiveWriter {
*
* @param data serialized segment graph data
*/
- void writeGraph(@Nonnull byte[] data) throws IOException;
+ void writeGraph(@NotNull byte[] data) throws IOException;
/**
* Write the binary references data.
*
* @param data serialized binary references data
*/
- void writeBinaryReferences(@Nonnull byte[] data) throws IOException;
+ void writeBinaryReferences(@NotNull byte[] data) throws IOException;
/**
* Get the current length of the archive.
@@ -138,6 +138,6 @@ public interface SegmentArchiveWriter {
*
* @return archive name
*/
- @Nonnull
+ @NotNull
String getName();
}
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/client/StandbyClient.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/client/StandbyClient.java?rev=1836191&r1=1836190&r2=1836191&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/client/StandbyClient.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/client/StandbyClient.java Wed Jul 18 15:02:27 2018
@@ -23,7 +23,6 @@ import java.util.concurrent.BlockingQueu
import java.util.concurrent.LinkedBlockingDeque;
import java.util.concurrent.TimeUnit;
-import javax.annotation.Nullable;
import javax.net.ssl.SSLException;
import io.netty.bootstrap.Bootstrap;
@@ -55,6 +54,7 @@ import org.apache.jackrabbit.oak.segment
import org.apache.jackrabbit.oak.segment.standby.codec.GetSegmentRequestEncoder;
import org.apache.jackrabbit.oak.segment.standby.codec.GetSegmentResponse;
import org.apache.jackrabbit.oak.segment.standby.codec.ResponseDecoder;
+import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/client/StandbyClientSync.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/client/StandbyClientSync.java?rev=1836191&r1=1836190&r2=1836191&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/client/StandbyClientSync.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/client/StandbyClientSync.java Wed Jul 18 15:02:27 2018
@@ -28,7 +28,6 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
-import javax.annotation.Nonnull;
import javax.management.MBeanServer;
import javax.management.ObjectName;
import javax.management.StandardMBean;
@@ -40,6 +39,7 @@ import org.apache.jackrabbit.oak.segment
import org.apache.jackrabbit.oak.segment.standby.jmx.ClientStandbyStatusMBean;
import org.apache.jackrabbit.oak.segment.standby.jmx.StandbyStatusMBean;
import org.apache.jackrabbit.oak.segment.standby.store.CommunicationObserver;
+import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -189,7 +189,7 @@ public final class StandbyClientSync imp
}
}
- @Nonnull
+ @NotNull
private static GCGeneration headGeneration(FileStore fileStore) {
return fileStore.getHead().getRecordId().getSegment().getGcGeneration();
}
@@ -198,7 +198,7 @@ public final class StandbyClientSync imp
fileStore.cleanup();
}
- @Nonnull
+ @NotNull
@Override
public String getMode() {
return "client: " + this.observer.getID();
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/client/StandbyClientSyncExecution.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/client/StandbyClientSyncExecution.java?rev=1836191&r1=1836190&r2=1836191&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/client/StandbyClientSyncExecution.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/client/StandbyClientSyncExecution.java Wed Jul 18 15:02:27 2018
@@ -22,8 +22,6 @@ import java.util.LinkedList;
import java.util.Set;
import java.util.UUID;
-import javax.annotation.Nullable;
-
import com.google.common.base.Stopwatch;
import com.google.common.base.Supplier;
import org.apache.jackrabbit.oak.segment.RecordId;
@@ -33,6 +31,7 @@ import org.apache.jackrabbit.oak.segment
import org.apache.jackrabbit.oak.segment.SegmentNodeState;
import org.apache.jackrabbit.oak.segment.SegmentNotFoundException;
import org.apache.jackrabbit.oak.segment.file.FileStore;
+import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/jmx/ObservablePartnerMBean.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/jmx/ObservablePartnerMBean.java?rev=1836191&r1=1836190&r2=1836191&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/jmx/ObservablePartnerMBean.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/jmx/ObservablePartnerMBean.java Wed Jul 18 15:02:27 2018
@@ -17,13 +17,12 @@
package org.apache.jackrabbit.oak.segment.standby.jmx;
import org.apache.jackrabbit.oak.api.jmx.Description;
-
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
public interface ObservablePartnerMBean {
- @Nonnull
+ @NotNull
@Description("name of the partner")
String getName();
@@ -36,7 +35,7 @@ public interface ObservablePartnerMBean
@Description("Port of the remote")
int getRemotePort();
- @CheckForNull
+ @Nullable
@Description("Time the remote instance was last contacted")
String getLastSeenTimestamp();
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/jmx/StandbyStatusMBean.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/jmx/StandbyStatusMBean.java?rev=1836191&r1=1836190&r2=1836191&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/jmx/StandbyStatusMBean.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/jmx/StandbyStatusMBean.java Wed Jul 18 15:02:27 2018
@@ -17,9 +17,8 @@
package org.apache.jackrabbit.oak.segment.standby.jmx;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.oak.api.jmx.Description;
+import org.jetbrains.annotations.NotNull;
public interface StandbyStatusMBean {
String JMX_NAME = "org.apache.jackrabbit.oak:name=Status,type=\"Standby\"";
@@ -30,7 +29,7 @@ public interface StandbyStatusMBean {
String STATUS_CLOSING = "closing";
String STATUS_CLOSED = "closed";
- @Nonnull
+ @NotNull
@Description("primary or standby")
String getMode();
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/server/StandbyServerSync.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/server/StandbyServerSync.java?rev=1836191&r1=1836190&r2=1836191&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/server/StandbyServerSync.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/server/StandbyServerSync.java Wed Jul 18 15:02:27 2018
@@ -23,7 +23,6 @@ import java.io.Closeable;
import java.lang.management.ManagementFactory;
import java.util.concurrent.atomic.AtomicBoolean;
-import javax.annotation.Nonnull;
import javax.management.InstanceNotFoundException;
import javax.management.MBeanServer;
import javax.management.ObjectName;
@@ -32,6 +31,7 @@ import javax.management.StandardMBean;
import org.apache.jackrabbit.oak.segment.file.FileStore;
import org.apache.jackrabbit.oak.segment.standby.jmx.StandbyStatusMBean;
import org.apache.jackrabbit.oak.segment.standby.store.CommunicationObserver;
+import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -152,7 +152,7 @@ public class StandbyServerSync implement
state = STATUS_CLOSED;
}
- @Nonnull
+ @NotNull
@Override
public String getMode() {
return "primary";
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/store/CommunicationPartnerMBean.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/store/CommunicationPartnerMBean.java?rev=1836191&r1=1836190&r2=1836191&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/store/CommunicationPartnerMBean.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/store/CommunicationPartnerMBean.java Wed Jul 18 15:02:27 2018
@@ -20,10 +20,10 @@ package org.apache.jackrabbit.oak.segmen
import java.util.Date;
import java.util.concurrent.atomic.AtomicLong;
-import javax.annotation.Nonnull;
import javax.management.MalformedObjectNameException;
import org.apache.jackrabbit.oak.segment.standby.jmx.ObservablePartnerMBean;
+import org.jetbrains.annotations.NotNull;
class CommunicationPartnerMBean implements ObservablePartnerMBean {
@@ -51,7 +51,7 @@ class CommunicationPartnerMBean implemen
this.remotePort = remotePort;
}
- @Nonnull
+ @NotNull
@Override
public String getName() {
return this.clientName;
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/Compact.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/Compact.java?rev=1836191&r1=1836190&r2=1836191&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/Compact.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/Compact.java Wed Jul 18 15:02:27 2018
@@ -35,8 +35,6 @@ import java.util.Date;
import java.util.Set;
import java.util.concurrent.TimeUnit;
-import javax.annotation.Nullable;
-
import com.google.common.base.Stopwatch;
import org.apache.jackrabbit.oak.segment.SegmentCache;
import org.apache.jackrabbit.oak.segment.spi.persistence.JournalFile;
@@ -46,6 +44,7 @@ import org.apache.jackrabbit.oak.segment
import org.apache.jackrabbit.oak.segment.file.InvalidFileStoreVersionException;
import org.apache.jackrabbit.oak.segment.file.JournalReader;
import org.apache.jackrabbit.oak.segment.file.tar.LocalJournalFile;
+import org.jetbrains.annotations.Nullable;
/**
* Perform an offline compaction of an existing segment store.
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/Utils.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/Utils.java?rev=1836191&r1=1836190&r2=1836191&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/Utils.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/Utils.java Wed Jul 18 15:02:27 2018
@@ -26,8 +26,6 @@ import java.io.IOException;
import java.util.Iterator;
import java.util.List;
-import javax.annotation.Nonnull;
-
import com.google.common.base.Function;
import com.google.common.collect.Iterators;
import org.apache.jackrabbit.oak.segment.spi.persistence.JournalFile;
@@ -38,6 +36,7 @@ import org.apache.jackrabbit.oak.segment
import org.apache.jackrabbit.oak.segment.file.tar.LocalJournalFile;
import org.apache.jackrabbit.oak.segment.file.tooling.BasicReadOnlyBlobStore;
import org.apache.jackrabbit.oak.spi.blob.BlobStore;
+import org.jetbrains.annotations.NotNull;
final class Utils {
@@ -72,7 +71,7 @@ final class Utils {
if (journal.exists()) {
try (JournalReader journalReader = new JournalReader(journal)) {
Iterator<String> revisionIterator = Iterators.transform(journalReader, new Function<JournalEntry, String>() {
- @Nonnull
+ @NotNull
@Override
public String apply(JournalEntry entry) {
return entry.getRevision();
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/iotrace/BreadthFirstTrace.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/iotrace/BreadthFirstTrace.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/BreadthFirstTrace.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/iotrace/BreadthFirstTrace.java Wed Jul 18 15:02:27 2018
@@ -31,10 +31,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 breadth first traversal trace.
@@ -49,18 +48,18 @@ public class BreadthFirstTrace implement
* The context specification of this trace.
* @see IOTracer#newIOTracer(Function, Writer, String)
*/
- @Nonnull
+ @NotNull
public static final String CONTEXT_SPEC = "depth,count";
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();
/**
@@ -69,7 +68,7 @@ public class BreadthFirstTrace implement
* @param path path of the root node where to start traversing
* @param context consumer to pass the additional context to
*/
- public BreadthFirstTrace(int depth, @Nonnull String path, @Nonnull Consumer<List<String>> context) {
+ public BreadthFirstTrace(int depth, @NotNull String path, @NotNull Consumer<List<String>> context) {
checkArgument(depth >= 0);
this.depth = depth;
@@ -78,13 +77,13 @@ public class BreadthFirstTrace implement
}
@Override
- public void run(@Nonnull NodeState node) {
+ public void run(@NotNull NodeState node) {
updateContext(context, 0, nodeCount.incrementAndGet());
traverse(newLinkedList(singleton(getNode(node, path))), 0);
}
- @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);
@@ -92,7 +91,7 @@ public class BreadthFirstTrace implement
return node;
}
- private void traverse(@Nonnull Queue<NodeState> nodes, int depth) {
+ private void traverse(@NotNull Queue<NodeState> nodes, int depth) {
if (!nodes.isEmpty()) {
Queue<NodeState> children = newLinkedList();
while (!nodes.isEmpty()) {
@@ -114,7 +113,7 @@ public class BreadthFirstTrace implement
}
}
- private static void updateContext(@Nonnull Consumer<List<String>> context, int depth, int count) {
+ private static void updateContext(@NotNull Consumer<List<String>> context, int depth, int count) {
context.accept(ImmutableList.of(valueOf(depth), valueOf(count)));
}
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/iotrace/DefaultIOTraceWriter.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/iotrace/DefaultIOTraceWriter.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/DefaultIOTraceWriter.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/iotrace/DefaultIOTraceWriter.java Wed Jul 18 15:02:27 2018
@@ -24,14 +24,14 @@ import java.io.BufferedWriter;
import java.io.PrintWriter;
import java.io.Writer;
-import javax.annotation.Nonnull;
+import org.jetbrains.annotations.NotNull;
/**
* This {@link IOTraceWriter} implementation implements persistence
* through a {@code Writer} instance.
*/
public class DefaultIOTraceWriter implements IOTraceWriter {
- @Nonnull
+ @NotNull
private final PrintWriter out;
/**
@@ -40,17 +40,17 @@ public class DefaultIOTraceWriter implem
* not needed anymore.
* @param writer
*/
- public DefaultIOTraceWriter(@Nonnull Writer writer) {
+ public DefaultIOTraceWriter(@NotNull Writer writer) {
out = new PrintWriter(new BufferedWriter(checkNotNull(writer)));
}
@Override
- public void writeHeader(@Nonnull String header) {
+ public void writeHeader(@NotNull String header) {
out.println(header);
}
@Override
- public void writeEntry(@Nonnull String entry) {
+ public void writeEntry(@NotNull String entry) {
out.println(entry);
}