Author: mduerig
Date: Wed Dec 14 13:20:47 2016
New Revision: 1774232
URL: http://svn.apache.org/viewvc?rev=1774232&view=rev
Log:
OAK-5293: Static code analysis and code cleanup
Add @Nullable annotations where necessary
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CacheWeights.java
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/MapEntry.java
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordId.java
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentBufferWriter.java
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentBufferWriterPool.java
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentDiscoveryLiteDescriptors.java
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentId.java
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStore.java
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentStream.java
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentWriter.java
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/WriterCacheManager.java
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/compaction/SegmentRevisionGCMBean.java
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/ReadOnlyRevisions.java
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/Scheduler.java
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tooling/BasicReadOnlyBlobStore.java
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/client/StandbyClientSync.java
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/server/StandbyServerSync.java
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/store/CommunicationObserver.java
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentBufferWriterPoolTest.java
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentIdTableBenchmark.java
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentIdTableTest.java
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CacheWeights.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CacheWeights.java?rev=1774232&r1=1774231&r2=1774232&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CacheWeights.java
(original)
+++
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CacheWeights.java
Wed Dec 14 13:20:47 2016
@@ -53,7 +53,7 @@ public class CacheWeights {
public static class OneWeigher<K, V> implements Weigher<K, V> {
@Override
- public int weigh(Object key, Object value) {
+ public int weigh(@Nonnull Object key, @Nonnull Object value) {
return 1;
}
}
@@ -79,7 +79,7 @@ public class CacheWeights {
public static class NodeCacheWeigher implements Weigher<String, RecordId> {
@Override
- public int weigh(String key, RecordId value) {
+ public int weigh(@Nonnull String key, @Nonnull RecordId value) {
int size = PRIORITY_CACHE_OVERHEAD;
size += estimateMemoryUsage(key);
size += value.estimateMemoryUsage();
@@ -90,7 +90,7 @@ public class CacheWeights {
public static class StringCacheWeigher implements Weigher<String,
RecordId> {
@Override
- public int weigh(String key, RecordId value) {
+ public int weigh(@Nonnull String key, @Nonnull RecordId value) {
int size = RECORD_CACHE_OVERHEAD;
size += estimateMemoryUsage(key);
size += value.estimateMemoryUsage();
@@ -102,7 +102,7 @@ public class CacheWeights {
Weigher<Template, RecordId> {
@Override
- public int weigh(Template key, RecordId value) {
+ public int weigh(@Nonnull Template key, @Nonnull RecordId value) {
int size = RECORD_CACHE_OVERHEAD;
size += key.estimateMemoryUsage();
size += value.estimateMemoryUsage();
@@ -114,7 +114,7 @@ public class CacheWeights {
Weigher<CacheKey, Template> {
@Override
- public int weigh(CacheKey key, Template value) {
+ public int weigh(@Nonnull CacheKey key, @Nonnull Template value) {
int size = LIRS_CACHE_OVERHEAD;
size += key.estimateMemoryUsage();
size += value.estimateMemoryUsage();
@@ -126,7 +126,7 @@ public class CacheWeights {
Weigher<CacheKey, String> {
@Override
- public int weigh(CacheKey key, String value) {
+ public int weigh(@Nonnull CacheKey key, @Nonnull String value) {
int size = LIRS_CACHE_OVERHEAD;
size += key.estimateMemoryUsage();
size += estimateMemoryUsage(value);
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/MapEntry.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/MapEntry.java?rev=1774232&r1=1774231&r2=1774232&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/MapEntry.java
(original)
+++
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/MapEntry.java
Wed Dec 14 13:20:47 2016
@@ -96,7 +96,7 @@ class MapEntry extends AbstractChildNode
//--------------------------------------------------------< Comparable >--
@Override
- public int compareTo(MapEntry that) {
+ public int compareTo(@Nonnull MapEntry that) {
return ComparisonChain.start()
.compare(getHash() & HASH_MASK, that.getHash() & HASH_MASK)
.compare(name, that.name)
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordId.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordId.java?rev=1774232&r1=1774231&r2=1774232&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordId.java
(original)
+++
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordId.java
Wed Dec 14 13:20:47 2016
@@ -108,7 +108,7 @@ public final class RecordId implements C
//--------------------------------------------------------< Comparable >--
@Override
- public int compareTo(RecordId that) {
+ public int compareTo(@Nonnull RecordId that) {
checkNotNull(that);
int diff = segmentId.compareTo(that.segmentId);
if (diff == 0) {
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentBufferWriter.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentBufferWriter.java?rev=1774232&r1=1774231&r2=1774232&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentBufferWriter.java
(original)
+++
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentBufferWriter.java
Wed Dec 14 13:20:47 2016
@@ -166,8 +166,9 @@ public class SegmentBufferWriter impleme
newSegment();
}
+ @Nonnull
@Override
- public RecordId execute(WriteOperation writeOperation) throws IOException {
+ public RecordId execute(@Nonnull WriteOperation writeOperation) throws
IOException {
return writeOperation.execute(this);
}
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentBufferWriterPool.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentBufferWriterPool.java?rev=1774232&r1=1774231&r2=1774232&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentBufferWriterPool.java
(original)
+++
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentBufferWriterPool.java
Wed Dec 14 13:20:47 2016
@@ -98,8 +98,9 @@ public class SegmentBufferWriterPool imp
this.gcGeneration = checkNotNull(gcGeneration);
}
+ @Nonnull
@Override
- public RecordId execute(WriteOperation writeOperation) throws IOException {
+ public RecordId execute(@Nonnull WriteOperation writeOperation) throws
IOException {
SegmentBufferWriter writer = borrowWriter(currentThread());
try {
return writeOperation.execute(writer);
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentDiscoveryLiteDescriptors.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentDiscoveryLiteDescriptors.java?rev=1774232&r1=1774231&r2=1774232&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentDiscoveryLiteDescriptors.java
(original)
+++
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentDiscoveryLiteDescriptors.java
Wed Dec 14 13:20:47 2016
@@ -17,6 +17,7 @@
package org.apache.jackrabbit.oak.segment;
+import javax.annotation.Nonnull;
import javax.jcr.Value;
import org.apache.jackrabbit.commons.SimpleValueFactory;
@@ -43,23 +44,24 @@ class SegmentDiscoveryLiteDescriptors im
this.store = store;
}
+ @Nonnull
@Override
public String[] getKeys() {
return new String[] {OAK_DISCOVERYLITE_CLUSTERVIEW};
}
@Override
- public boolean isStandardDescriptor(String key) {
+ public boolean isStandardDescriptor(@Nonnull String key) {
return OAK_DISCOVERYLITE_CLUSTERVIEW.equals(key);
}
@Override
- public boolean isSingleValueDescriptor(String key) {
+ public boolean isSingleValueDescriptor(@Nonnull String key) {
return OAK_DISCOVERYLITE_CLUSTERVIEW.equals(key);
}
@Override
- public Value getValue(String key) {
+ public Value getValue(@Nonnull String key) {
if (!OAK_DISCOVERYLITE_CLUSTERVIEW.equals(key)) {
return null;
}
@@ -67,7 +69,7 @@ class SegmentDiscoveryLiteDescriptors im
}
@Override
- public Value[] getValues(String key) {
+ public Value[] getValues(@Nonnull String key) {
if (!OAK_DISCOVERYLITE_CLUSTERVIEW.equals(key)) {
return null;
}
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentId.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentId.java?rev=1774232&r1=1774231&r2=1774232&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentId.java
(original)
+++
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentId.java
Wed Dec 14 13:20:47 2016
@@ -220,7 +220,7 @@ public class SegmentId implements Compar
// --------------------------------------------------------< Comparable >--
@Override
- public int compareTo(SegmentId that) {
+ public int compareTo(@Nonnull SegmentId that) {
int d = Long.valueOf(this.msb).compareTo(that.msb);
if (d == 0) {
d = Long.valueOf(this.lsb).compareTo(that.lsb);
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStore.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStore.java?rev=1774232&r1=1774231&r2=1774232&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStore.java
(original)
+++
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStore.java
Wed Dec 14 13:20:47 2016
@@ -299,6 +299,7 @@ public class SegmentNodeStore implements
return head.get().getChildNode(ROOT);
}
+ @Nonnull
@Override
public NodeState merge(
@Nonnull NodeBuilder builder, @Nonnull CommitHook commitHook,
@@ -381,6 +382,7 @@ public class SegmentNodeStore implements
return root;
}
+ @Nonnull
@Override
public Blob createBlob(InputStream stream) throws IOException {
return writer.writeStream(stream);
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentStream.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentStream.java?rev=1774232&r1=1774231&r2=1774232&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentStream.java
(original)
+++
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentStream.java
Wed Dec 14 13:20:47 2016
@@ -29,6 +29,7 @@ import java.io.InputStream;
import java.util.List;
import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
import com.google.common.base.Charsets;
import com.google.common.io.ByteStreams;
@@ -135,7 +136,7 @@ public class SegmentStream extends Input
}
@Override
- public int read(byte[] b, int off, int len) {
+ public int read(@Nonnull byte[] b, int off, int len) {
checkNotNull(b);
checkPositionIndexes(off, off + len, b.length);
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentWriter.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentWriter.java?rev=1774232&r1=1774231&r2=1774232&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentWriter.java
(original)
+++
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentWriter.java
Wed Dec 14 13:20:47 2016
@@ -180,8 +180,9 @@ public class SegmentWriter {
@Nonnull final Map<String, RecordId> changes)
throws IOException {
RecordId mapId = writeOperationHandler.execute(new
SegmentWriteOperation() {
+ @Nonnull
@Override
- public RecordId execute(SegmentBufferWriter writer) throws
IOException {
+ public RecordId execute(@Nonnull SegmentBufferWriter writer)
throws IOException {
return with(writer).writeMap(base, changes);
}
});
@@ -197,8 +198,9 @@ public class SegmentWriter {
@Nonnull
public RecordId writeList(@Nonnull final List<RecordId> list) throws
IOException {
return writeOperationHandler.execute(new SegmentWriteOperation() {
+ @Nonnull
@Override
- public RecordId execute(SegmentBufferWriter writer) throws
IOException {
+ public RecordId execute(@Nonnull SegmentBufferWriter writer)
throws IOException {
return with(writer).writeList(list);
}
});
@@ -213,8 +215,9 @@ public class SegmentWriter {
@Nonnull
public RecordId writeString(@Nonnull final String string) throws
IOException {
return writeOperationHandler.execute(new SegmentWriteOperation() {
+ @Nonnull
@Override
- public RecordId execute(SegmentBufferWriter writer) throws
IOException {
+ public RecordId execute(@Nonnull SegmentBufferWriter writer)
throws IOException {
return with(writer).writeString(string);
}
});
@@ -229,8 +232,9 @@ public class SegmentWriter {
@Nonnull
public SegmentBlob writeBlob(@Nonnull final Blob blob) throws IOException {
RecordId blobId = writeOperationHandler.execute(new
SegmentWriteOperation() {
+ @Nonnull
@Override
- public RecordId execute(SegmentBufferWriter writer) throws
IOException {
+ public RecordId execute(@Nonnull SegmentBufferWriter writer)
throws IOException {
return with(writer).writeBlob(blob);
}
});
@@ -249,8 +253,9 @@ public class SegmentWriter {
public RecordId writeBlock(@Nonnull final byte[] bytes, final int offset,
final int length)
throws IOException {
return writeOperationHandler.execute(new SegmentWriteOperation() {
+ @Nonnull
@Override
- public RecordId execute(SegmentBufferWriter writer) throws
IOException {
+ public RecordId execute(@Nonnull SegmentBufferWriter writer)
throws IOException {
return with(writer).writeBlock(bytes, offset, length);
}
});
@@ -267,8 +272,9 @@ public class SegmentWriter {
@Nonnull
public SegmentBlob writeStream(@Nonnull final InputStream stream) throws
IOException {
RecordId blobId = writeOperationHandler.execute(new
SegmentWriteOperation() {
+ @Nonnull
@Override
- public RecordId execute(SegmentBufferWriter writer) throws
IOException {
+ public RecordId execute(@Nonnull SegmentBufferWriter writer)
throws IOException {
return with(writer).writeStream(stream);
}
});
@@ -285,8 +291,9 @@ public class SegmentWriter {
public SegmentPropertyState writeProperty(@Nonnull final PropertyState
state)
throws IOException {
RecordId id = writeOperationHandler.execute(new
SegmentWriteOperation() {
+ @Nonnull
@Override
- public RecordId execute(SegmentBufferWriter writer) throws
IOException {
+ public RecordId execute(@Nonnull SegmentBufferWriter writer)
throws IOException {
return with(writer).writeProperty(state);
}
});
@@ -309,8 +316,9 @@ public class SegmentWriter {
@Nonnull
public SegmentNodeState writeNode(@Nonnull final NodeState state) throws
IOException {
RecordId nodeId = writeOperationHandler.execute(new
SegmentWriteOperation() {
+ @Nonnull
@Override
- public RecordId execute(SegmentBufferWriter writer) throws
IOException {
+ public RecordId execute(@Nonnull SegmentBufferWriter writer)
throws IOException {
return with(writer).writeNode(state);
}
});
@@ -336,8 +344,9 @@ public class SegmentWriter {
throws IOException {
try {
RecordId nodeId = writeOperationHandler.execute(new
SegmentWriteOperation(cancel) {
+ @Nonnull
@Override
- public RecordId execute(SegmentBufferWriter writer) throws
IOException {
+ public RecordId execute(@Nonnull SegmentBufferWriter writer)
throws IOException {
return with(writer).writeNode(state);
}
});
@@ -431,8 +440,9 @@ public class SegmentWriter {
this(Suppliers.ofInstance(false));
}
+ @Nonnull
@Override
- public abstract RecordId execute(SegmentBufferWriter writer) throws
IOException;
+ public abstract RecordId execute(@Nonnull SegmentBufferWriter writer)
throws IOException;
@Nonnull
SegmentWriteOperation with(@Nonnull SegmentBufferWriter writer) {
@@ -1239,7 +1249,7 @@ public class SegmentWriter {
}
}
- public void setCompactionMonitor(GCNodeWriteMonitor compactionMonitor) {
+ public void setCompactionMonitor(@Nonnull GCNodeWriteMonitor
compactionMonitor) {
this.compactionMonitor = compactionMonitor;
}
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/WriterCacheManager.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/WriterCacheManager.java?rev=1774232&r1=1774231&r2=1774232&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/WriterCacheManager.java
(original)
+++
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/WriterCacheManager.java
Wed Dec 14 13:20:47 2016
@@ -159,6 +159,7 @@ public abstract class WriterCacheManager
/**
* @return empty cache of size 0
*/
+ @Nonnull
@Override
public RecordCache<String> getStringCache(int generation) {
return stringCache;
@@ -167,6 +168,7 @@ public abstract class WriterCacheManager
/**
* @return empty cache of size 0
*/
+ @Nonnull
@Override
public RecordCache<Template> getTemplateCache(int generation) {
return templateCache;
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/compaction/SegmentRevisionGCMBean.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/compaction/SegmentRevisionGCMBean.java?rev=1774232&r1=1774231&r2=1774232&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/compaction/SegmentRevisionGCMBean.java
(original)
+++
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/compaction/SegmentRevisionGCMBean.java
Wed Dec 14 13:20:47 2016
@@ -151,6 +151,7 @@ public class SegmentRevisionGCMBean
return fileStoreGCMonitor.getLastError();
}
+ @Nonnull
@Override
public String getLastLogMessage() {
return fileStoreGCMonitor.getLastLogMessage();
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/ReadOnlyRevisions.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/ReadOnlyRevisions.java?rev=1774232&r1=1774231&r2=1774232&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/ReadOnlyRevisions.java
(original)
+++
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/ReadOnlyRevisions.java
Wed Dec 14 13:20:47 2016
@@ -111,15 +111,16 @@ public class ReadOnlyRevisions implement
}
@Override
- public boolean setHead(RecordId expected, RecordId head, Option...
options) {
+ public boolean setHead(@Nonnull RecordId expected, @Nonnull RecordId head,
@Nonnull Option... options) {
checkBound();
RecordId id = this.head.get();
return id.equals(expected) && this.head.compareAndSet(id, head);
}
@Override
- public boolean setHead(Function<RecordId, RecordId> newHead,
- Option... options) throws InterruptedException {
+ public boolean setHead(
+ @Nonnull Function<RecordId, RecordId> newHead,
+ @Nonnull Option... options) throws InterruptedException {
throw new UnsupportedOperationException("ReadOnly Revisions");
}
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=1774232&r1=1774231&r2=1774232&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 Dec 14 13:20:47 2016
@@ -152,7 +152,7 @@ public class Scheduler implements Closea
}
@Override
- public Thread newThread(Runnable runnable) {
+ public Thread newThread(@Nonnull 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/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=1774232&r1=1774231&r2=1774232&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 Dec 14 13:20:47 2016
@@ -23,6 +23,8 @@ 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;
@@ -72,12 +74,12 @@ public class BasicReadOnlyBlobStore impl
}
@Override
- public String getBlobId(String reference) {
+ public String getBlobId(@Nonnull String reference) {
return reference;
}
@Override
- public String getReference(String blobId) {
+ public String getReference(@Nonnull String blobId) {
return blobId;
}
}
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=1774232&r1=1774231&r2=1774232&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 Dec 14 13:20:47 2016
@@ -26,6 +26,7 @@ import java.util.UUID;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
+import javax.annotation.Nonnull;
import javax.management.MBeanServer;
import javax.management.ObjectName;
import javax.management.StandardMBean;
@@ -184,6 +185,7 @@ public final class StandbyClientSync imp
};
}
+ @Nonnull
@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/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=1774232&r1=1774231&r2=1774232&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 Dec 14 13:20:47 2016
@@ -23,6 +23,7 @@ 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;
@@ -148,6 +149,7 @@ public class StandbyServerSync implement
state = STATUS_CLOSED;
}
+ @Nonnull
@Override
public String getMode() {
return "primary";
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/store/CommunicationObserver.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/store/CommunicationObserver.java?rev=1774232&r1=1774231&r2=1774232&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/store/CommunicationObserver.java
(original)
+++
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/store/CommunicationObserver.java
Wed Dec 14 13:20:47 2016
@@ -19,21 +19,22 @@
package org.apache.jackrabbit.oak.segment.standby.store;
-import org.apache.jackrabbit.oak.segment.standby.jmx.StandbyStatusMBean;
-import org.apache.jackrabbit.oak.segment.standby.jmx.ObservablePartnerMBean;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import java.lang.management.ManagementFactory;
+import java.net.InetSocketAddress;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+import javax.annotation.Nonnull;
import javax.management.MBeanServer;
import javax.management.MalformedObjectNameException;
import javax.management.ObjectName;
import javax.management.StandardMBean;
-import java.lang.management.ManagementFactory;
-import java.net.InetSocketAddress;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
+import org.apache.jackrabbit.oak.segment.standby.jmx.ObservablePartnerMBean;
+import org.apache.jackrabbit.oak.segment.standby.jmx.StandbyStatusMBean;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class CommunicationObserver {
private static final int MAX_CLIENT_STATISTICS = 10;
@@ -59,6 +60,7 @@ public class CommunicationObserver {
return this.mbeanName;
}
+ @Nonnull
@Override
public String getName() {
return this.clientName;
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentBufferWriterPoolTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentBufferWriterPoolTest.java?rev=1774232&r1=1774231&r2=1774232&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentBufferWriterPoolTest.java
(original)
+++
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentBufferWriterPoolTest.java
Wed Dec 14 13:20:47 2016
@@ -154,6 +154,7 @@ public class SegmentBufferWriterPoolTest
@Test
public void testFlushBlocks() throws ExecutionException,
InterruptedException {
Future<RecordId> res = execute(new WriteOperation() {
+ @Nonnull
@CheckForNull @Override
public RecordId execute(@Nonnull SegmentBufferWriter writer) {
try {
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentIdTableBenchmark.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentIdTableBenchmark.java?rev=1774232&r1=1774231&r2=1774232&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentIdTableBenchmark.java
(original)
+++
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentIdTableBenchmark.java
Wed Dec 14 13:20:47 2016
@@ -22,6 +22,8 @@ import java.io.IOException;
import java.lang.ref.WeakReference;
import java.util.Random;
+import javax.annotation.Nonnull;
+
import org.apache.jackrabbit.oak.segment.memory.MemoryStore;
public class SegmentIdTableBenchmark {
@@ -29,6 +31,7 @@ public class SegmentIdTableBenchmark {
private static SegmentIdFactory newSegmentIdMaker(final SegmentStore
store) {
return new SegmentIdFactory() {
+ @Nonnull
@Override
public SegmentId newSegmentId(long msb, long lsb) {
return new SegmentId(store, msb, lsb);
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentIdTableTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentIdTableTest.java?rev=1774232&r1=1774231&r2=1774232&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentIdTableTest.java
(original)
+++
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentIdTableTest.java
Wed Dec 14 13:20:47 2016
@@ -36,6 +36,8 @@ import java.util.concurrent.Executors;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
+import javax.annotation.Nonnull;
+
import org.apache.jackrabbit.oak.segment.memory.MemoryStore;
import org.junit.Test;
@@ -44,6 +46,7 @@ public class SegmentIdTableTest {
private static SegmentIdFactory newSegmentIdMaker(final SegmentStore
store) {
return new SegmentIdFactory() {
+ @Nonnull
@Override
public SegmentId newSegmentId(long msb, long lsb) {
return new SegmentId(store, msb, lsb);
