Author: mduerig
Date: Thu Jun 8 20:10:06 2017
New Revision: 1798119
URL: http://svn.apache.org/viewvc?rev=1798119&view=rev
Log:
OAK-6332: Add missing @Nonnull annotations
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/IdentityRecordNumbers.java
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/IllegalSegmentReferences.java
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ImmutableRecordNumbers.java
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/MapRecord.java
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/MutableRecordNumbers.java
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/MutableSegmentReferences.java
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordNumbers.java
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/TarFiles.java
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tooling/RevisionHistory.java
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/Utils.java
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/IdentityRecordNumbers.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/IdentityRecordNumbers.java?rev=1798119&r1=1798118&r2=1798119&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/IdentityRecordNumbers.java
(original)
+++
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/IdentityRecordNumbers.java
Thu Jun 8 20:10:06 2017
@@ -19,6 +19,8 @@ package org.apache.jackrabbit.oak.segmen
import java.util.Iterator;
+import javax.annotation.Nonnull;
+
/**
* An implementation of a record number to offset table that assumes that a
* record number is also a valid offset in the segment. This implementation is
@@ -34,6 +36,7 @@ class IdentityRecordNumbers implements R
return recordNumber;
}
+ @Nonnull
@Override
public Iterator<Entry> iterator() {
throw new UnsupportedOperationException("invalid usage of the
record-number-to-offset table");
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/IllegalSegmentReferences.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/IllegalSegmentReferences.java?rev=1798119&r1=1798118&r2=1798119&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/IllegalSegmentReferences.java
(original)
+++
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/IllegalSegmentReferences.java
Thu Jun 8 20:10:06 2017
@@ -19,6 +19,8 @@ package org.apache.jackrabbit.oak.segmen
import java.util.Iterator;
+import javax.annotation.Nonnull;
+
/**
* An implementation of {@link SegmentReferences} that throws {@link
* IllegalStateException}s every time it's used. This instance is used in
@@ -32,6 +34,7 @@ class IllegalSegmentReferences implement
throw new IllegalStateException("invalid use");
}
+ @Nonnull
@Override
public Iterator<SegmentId> iterator() {
throw new IllegalStateException("invalid use");
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ImmutableRecordNumbers.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ImmutableRecordNumbers.java?rev=1798119&r1=1798118&r2=1798119&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ImmutableRecordNumbers.java
(original)
+++
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ImmutableRecordNumbers.java
Thu Jun 8 20:10:06 2017
@@ -61,6 +61,7 @@ class ImmutableRecordNumbers implements
}
}
+ @Nonnull
@Override
public Iterator<Entry> iterator() {
return new AbstractIterator<Entry>() {
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/MapRecord.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/MapRecord.java?rev=1798119&r1=1798118&r2=1798119&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/MapRecord.java
(original)
+++
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/MapRecord.java
Thu Jun 8 20:10:06 2017
@@ -351,6 +351,7 @@ public class MapRecord extends Record {
newArrayListWithCapacity(buckets.size());
for (final MapRecord bucket : buckets) {
entries.add(new Iterable<MapEntry>() {
+ @Nonnull
@Override
public Iterator<MapEntry> iterator() {
return bucket.getEntries(diffKey,
diffValue).iterator();
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/MutableRecordNumbers.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/MutableRecordNumbers.java?rev=1798119&r1=1798118&r2=1798119&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/MutableRecordNumbers.java
(original)
+++
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/MutableRecordNumbers.java
Thu Jun 8 20:10:06 2017
@@ -22,6 +22,8 @@ import static java.util.Arrays.fill;
import java.util.Iterator;
+import javax.annotation.Nonnull;
+
import com.google.common.collect.AbstractIterator;
/**
@@ -54,6 +56,7 @@ class MutableRecordNumbers implements Re
: entries[index * 2];
}
+ @Nonnull
@Override
public synchronized Iterator<Entry> iterator() {
return new AbstractIterator<Entry>() {
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/MutableSegmentReferences.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/MutableSegmentReferences.java?rev=1798119&r1=1798118&r2=1798119&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/MutableSegmentReferences.java
(original)
+++
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/MutableSegmentReferences.java
Thu Jun 8 20:10:06 2017
@@ -24,6 +24,8 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import javax.annotation.Nonnull;
+
/**
* A mutable, thread-safe implementation of {@link SegmentReferences}.
*/
@@ -110,6 +112,7 @@ class MutableSegmentReferences implement
}
}
+ @Nonnull
@Override
public Iterator<SegmentId> iterator() {
synchronized (lock) {
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordNumbers.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordNumbers.java?rev=1798119&r1=1798118&r2=1798119&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordNumbers.java
(original)
+++
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordNumbers.java
Thu Jun 8 20:10:06 2017
@@ -21,6 +21,8 @@ import static com.google.common.collect.
import java.util.Iterator;
+import javax.annotation.Nonnull;
+
import org.apache.jackrabbit.oak.segment.RecordNumbers.Entry;
/**
@@ -37,6 +39,7 @@ interface RecordNumbers extends Iterable
return -1;
}
+ @Nonnull
@Override
public Iterator<Entry> iterator() {
return emptyIterator();
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/TarFiles.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/TarFiles.java?rev=1798119&r1=1798118&r2=1798119&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/TarFiles.java
(original)
+++
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/TarFiles.java
Thu Jun 8 20:10:06 2017
@@ -45,6 +45,8 @@ import java.util.concurrent.locks.Reentr
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import javax.annotation.Nonnull;
+
import com.google.common.base.Predicate;
import com.google.common.base.Supplier;
import com.google.common.collect.Iterables;
@@ -183,6 +185,7 @@ class TarFiles implements Closeable {
private static Iterable<TarReader> iterable(final Node head) {
return new Iterable<TarReader>() {
+ @Nonnull
@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/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=1798119&r1=1798118&r2=1798119&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
Thu Jun 8 20:10:06 2017
@@ -30,8 +30,9 @@ import java.util.Iterator;
import javax.annotation.CheckForNull;
import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import com.google.common.base.Function;
+import com.google.common.collect.Iterators;
import org.apache.jackrabbit.oak.json.BlobSerializer;
import org.apache.jackrabbit.oak.json.JsonSerializer;
import org.apache.jackrabbit.oak.segment.SegmentNodeState;
@@ -41,9 +42,6 @@ import org.apache.jackrabbit.oak.segment
import org.apache.jackrabbit.oak.segment.file.ReadOnlyFileStore;
import org.apache.jackrabbit.oak.spi.state.NodeState;
-import com.google.common.base.Function;
-import com.google.common.collect.Iterators;
-
/**
* Utility for tracing a node back through the revision history.
*/
@@ -84,7 +82,7 @@ public class RevisionHistory {
try (JournalReader journalReader = new
JournalReader(checkNotNull(journal))) {
return Iterators.transform(journalReader,
new Function<JournalEntry, HistoryElement>() {
- @Nullable @Override
+ @Nonnull @Override
public HistoryElement apply(JournalEntry entry) {
store.setRevision(entry.getRevision());
NodeState node = getNode(store.getHead(), path);
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=1798119&r1=1798118&r2=1798119&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
Thu Jun 8 20:10:06 2017
@@ -26,8 +26,10 @@ import java.io.IOException;
import java.util.Iterator;
import java.util.List;
-import javax.annotation.Nullable;
+import javax.annotation.Nonnull;
+import com.google.common.base.Function;
+import com.google.common.collect.Iterators;
import org.apache.jackrabbit.oak.segment.file.InvalidFileStoreVersionException;
import org.apache.jackrabbit.oak.segment.file.JournalEntry;
import org.apache.jackrabbit.oak.segment.file.JournalReader;
@@ -35,9 +37,6 @@ import org.apache.jackrabbit.oak.segment
import org.apache.jackrabbit.oak.segment.file.tooling.BasicReadOnlyBlobStore;
import org.apache.jackrabbit.oak.spi.blob.BlobStore;
-import com.google.common.base.Function;
-import com.google.common.collect.Iterators;
-
final class Utils {
private static final boolean TAR_STORAGE_MEMORY_MAPPED =
Boolean.getBoolean("tar.memoryMapped");
@@ -71,7 +70,7 @@ final class Utils {
if (journal.exists()) {
try (JournalReader journalReader = new JournalReader(journal)) {
Iterator<String> revisionIterator =
Iterators.transform(journalReader, new Function<JournalEntry, String>() {
- @Nullable
+ @Nonnull
@Override
public String apply(JournalEntry entry) {
return entry.getRevision();
