Author: mduerig
Date: Wed Dec 14 13:19:57 2016
New Revision: 1774223
URL: http://svn.apache.org/viewvc?rev=1774223&view=rev
Log:
OAK-5293: Static code analysis and code cleanup
Make methods static where possible
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/backup/impl/FileStoreRestoreImpl.java
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/Segment.java
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentPropertyState.java
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/compaction/SegmentGCOptions.java
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/AbstractFileStore.java
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/TarReader.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/codec/GetBlobResponseEncoder.java
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/codec/GetReferencesResponseEncoder.java
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/codec/GetSegmentResponseEncoder.java
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/codec/ResponseDecoder.java
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/server/GetSegmentRequestHandler.java
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/server/StandbyServer.java
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/DebugSegments.java
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/DebugTars.java
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/backup/impl/FileStoreRestoreImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/backup/impl/FileStoreRestoreImpl.java?rev=1774223&r1=1774222&r2=1774223&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/backup/impl/FileStoreRestoreImpl.java
(original)
+++
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/backup/impl/FileStoreRestoreImpl.java
Wed Dec 14 13:19:57 2016
@@ -100,7 +100,7 @@ public class FileStoreRestoreImpl implem
log.warn("Restore not available as an online operation.");
}
- private boolean validFileStore(File source) {
+ private static boolean validFileStore(File source) {
if (source == null || !source.isDirectory()) {
return false;
}
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/Segment.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/Segment.java?rev=1774223&r1=1774222&r2=1774223&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/Segment.java
(original)
+++
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/Segment.java
Wed Dec 14 13:19:57 2016
@@ -590,7 +590,7 @@ public class Segment {
return properties;
}
- long readLength(RecordId id) {
+ static long readLength(RecordId id) {
return id.getSegment().readLength(id.getRecordNumber());
}
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentPropertyState.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentPropertyState.java?rev=1774223&r1=1774222&r2=1774223&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentPropertyState.java
(original)
+++
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentPropertyState.java
Wed Dec 14 13:19:57 2016
@@ -225,7 +225,7 @@ public class SegmentPropertyState extend
return reader.readBlob(entry).length();
}
- return getSegment().readLength(entry);
+ return Segment.readLength(entry);
}
//------------------------------------------------------------< Object >--
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/compaction/SegmentGCOptions.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/compaction/SegmentGCOptions.java?rev=1774223&r1=1774222&r2=1774223&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/compaction/SegmentGCOptions.java
(original)
+++
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/compaction/SegmentGCOptions.java
Wed Dec 14 13:19:57 2016
@@ -236,7 +236,7 @@ public class SegmentGCOptions {
* @return {@code true} if the available disk space is considered enough
for
* normal repository operations.
*/
- public boolean isDiskSpaceSufficient(long repositoryDiskSpace, long
availableDiskSpace) {
+ public static boolean isDiskSpaceSufficient(long repositoryDiskSpace, long
availableDiskSpace) {
return availableDiskSpace > 0.25 * repositoryDiskSpace;
}
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/AbstractFileStore.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/AbstractFileStore.java?rev=1774223&r1=1774222&r2=1774223&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/AbstractFileStore.java
(original)
+++
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/AbstractFileStore.java
Wed Dec 14 13:19:57 2016
@@ -148,7 +148,7 @@ public abstract class AbstractFileStore
return null;
}
- Manifest checkManifest(Manifest manifest) throws
InvalidFileStoreVersionException {
+ static Manifest checkManifest(Manifest manifest) throws
InvalidFileStoreVersionException {
if (manifest == null) {
throw new InvalidFileStoreVersionException("Using oak-segment-tar,
but oak-segment should be used");
}
@@ -330,14 +330,14 @@ public abstract class AbstractFileStore
}
}
- final void populateTarGraph(Segment segment, TarWriter w) {
+ static void populateTarGraph(Segment segment, TarWriter w) {
UUID from = segment.getSegmentId().asUUID();
for (int i = 0; i < segment.getReferencedSegmentIdCount(); i++) {
w.addGraphEdge(from, segment.getReferencedSegmentId(i));
}
}
- final void populateTarBinaryReferences(final Segment segment, final
TarWriter w) {
+ static void populateTarBinaryReferences(final Segment segment, final
TarWriter w) {
final int generation = segment.getGcGeneration();
final UUID id = segment.getSegmentId().asUUID();
segment.forEachRecord(new RecordConsumer() {
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java?rev=1774223&r1=1774222&r2=1774223&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java
(original)
+++
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java
Wed Dec 14 13:19:57 2016
@@ -680,7 +680,7 @@ public class FileStore extends AbstractF
private void checkDiskSpace(SegmentGCOptions gcOptions) {
long repositoryDiskSpace = size();
long availableDiskSpace = directory.getFreeSpace();
- boolean updated = gcOptions.isDiskSpaceSufficient(repositoryDiskSpace,
availableDiskSpace);
+ boolean updated =
SegmentGCOptions.isDiskSpaceSufficient(repositoryDiskSpace, availableDiskSpace);
boolean previous = sufficientDiskSpace.getAndSet(updated);
if (previous && !updated) {
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/TarReader.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/TarReader.java?rev=1774223&r1=1774222&r2=1774223&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/TarReader.java
(original)
+++
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/TarReader.java
Wed Dec 14 13:19:57 2016
@@ -650,7 +650,7 @@ class TarReader implements Closeable {
}
@Nonnull
- private List<UUID> getReferences(TarEntry entry, UUID id, Map<UUID,
List<UUID>> graph) {
+ private static List<UUID> getReferences(TarEntry entry, UUID id, Map<UUID,
List<UUID>> graph) {
List<UUID> references = graph.get(id);
if (references == null) {
@@ -1021,7 +1021,7 @@ class TarReader implements Closeable {
return buffer;
}
- private Map<Integer, Map<UUID, Set<String>>>
parseBinaryReferences(ByteBuffer buffer) {
+ private static Map<Integer, Map<UUID, Set<String>>>
parseBinaryReferences(ByteBuffer buffer) {
int nGenerations = buffer.getInt(buffer.limit() - 12);
Map<Integer, Map<UUID, Set<String>>> binaryReferences =
newHashMapWithExpectedSize(nGenerations);
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=1774223&r1=1774222&r2=1774223&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:19:57 2016
@@ -165,7 +165,7 @@ public final class StandbyClientSync imp
}
}
- private int headGeneration(FileStore fileStore) {
+ private static int headGeneration(FileStore fileStore) {
return
fileStore.getHead().getRecordId().getSegment().getGcGeneration();
}
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/codec/GetBlobResponseEncoder.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/codec/GetBlobResponseEncoder.java?rev=1774223&r1=1774222&r2=1774223&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/codec/GetBlobResponseEncoder.java
(original)
+++
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/codec/GetBlobResponseEncoder.java
Wed Dec 14 13:19:57 2016
@@ -37,7 +37,7 @@ public class GetBlobResponseEncoder exte
encode(msg.getBlobId(), msg.getBlobData(), out);
}
- private void encode(String blobId, byte[] data, ByteBuf out) {
+ private static void encode(String blobId, byte[] data, ByteBuf out) {
byte[] blobIdBytes = blobId.getBytes(Charset.forName("UTF-8"));
Hasher hasher = Hashing.murmur3_32().newHasher();
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/codec/GetReferencesResponseEncoder.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/codec/GetReferencesResponseEncoder.java?rev=1774223&r1=1774222&r2=1774223&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/codec/GetReferencesResponseEncoder.java
(original)
+++
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/codec/GetReferencesResponseEncoder.java
Wed Dec 14 13:19:57 2016
@@ -35,14 +35,14 @@ public class GetReferencesResponseEncode
encode(msg.getSegmentId(), msg.getReferences(), out);
}
- private void encode(String segmentId, Iterable<String> references, ByteBuf
out) {
+ private static void encode(String segmentId, Iterable<String> references,
ByteBuf out) {
byte[] data = serialize(segmentId,
references).getBytes(Charsets.UTF_8);
out.writeInt(data.length + 1);
out.writeByte(Messages.HEADER_REFERENCES);
out.writeBytes(data);
}
- private String serialize(String segmentId, Iterable<String> references) {
+ private static String serialize(String segmentId, Iterable<String>
references) {
return segmentId + ":" + Joiner.on(",").join(references);
}
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/codec/GetSegmentResponseEncoder.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/codec/GetSegmentResponseEncoder.java?rev=1774223&r1=1774222&r2=1774223&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/codec/GetSegmentResponseEncoder.java
(original)
+++
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/codec/GetSegmentResponseEncoder.java
Wed Dec 14 13:19:57 2016
@@ -44,7 +44,7 @@ public class GetSegmentResponseEncoder e
encode(msg.getSegmentId(), msg.getSegmentData(), out);
}
- private void encode(String segmentId, byte[] data, ByteBuf out) {
+ private static void encode(String segmentId, byte[] data, ByteBuf out) {
UUID id = UUID.fromString(segmentId);
Hasher hasher = Hashing.murmur3_32().newHasher();
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/codec/ResponseDecoder.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/codec/ResponseDecoder.java?rev=1774223&r1=1774222&r2=1774223&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/codec/ResponseDecoder.java
(original)
+++
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/codec/ResponseDecoder.java
Wed Dec 14 13:19:57 2016
@@ -61,14 +61,14 @@ public class ResponseDecoder extends Byt
}
}
- private void decodeGetHeadResponse(int length, ByteBuf in, List<Object>
out) {
+ private static void decodeGetHeadResponse(int length, ByteBuf in,
List<Object> out) {
byte[] data = new byte[length - 1];
in.readBytes(data);
String recordId = new String(data, Charsets.UTF_8);
out.add(new GetHeadResponse(null, recordId));
}
- private void decodeGetSegmentResponse(int length, ByteBuf in, List<Object>
out) {
+ private static void decodeGetSegmentResponse(int length, ByteBuf in,
List<Object> out) {
long msb = in.readLong();
long lsb = in.readLong();
@@ -87,7 +87,7 @@ public class ResponseDecoder extends Byt
out.add(new GetSegmentResponse(null, segmentId, data));
}
- private void decodeGetBlobResponse(int length, ByteBuf in, List<Object>
out) {
+ private static void decodeGetBlobResponse(int length, ByteBuf in,
List<Object> out) {
int blobIdLength = in.readInt();
byte[] blobIdBytes = new byte[blobIdLength];
@@ -108,7 +108,7 @@ public class ResponseDecoder extends Byt
out.add(new GetBlobResponse(null, blobId, blobData));
}
- private void decodeGetReferencesResponse(int length, ByteBuf in,
List<Object> out) {
+ private static void decodeGetReferencesResponse(int length, ByteBuf in,
List<Object> out) {
byte[] data = new byte[length - 1];
in.readBytes(data);
@@ -135,7 +135,7 @@ public class ResponseDecoder extends Byt
out.add(new GetReferencesResponse(null, segmentId, references));
}
- private long hash(byte[] data) {
+ private static long hash(byte[] data) {
return
Hashing.murmur3_32().newHasher().putBytes(data).hash().padToLong();
}
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/server/GetSegmentRequestHandler.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/server/GetSegmentRequestHandler.java?rev=1774223&r1=1774222&r2=1774223&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/server/GetSegmentRequestHandler.java
(original)
+++
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/server/GetSegmentRequestHandler.java
Wed Dec 14 13:19:57 2016
@@ -49,7 +49,7 @@ class GetSegmentRequestHandler extends S
ctx.writeAndFlush(new GetSegmentResponse(msg.getClientId(),
msg.getSegmentId(), data));
}
- private String getId(Segment segment) {
+ private static String getId(Segment segment) {
return segment.getSegmentId().asUUID().toString();
}
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/server/StandbyServer.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/server/StandbyServer.java?rev=1774223&r1=1774222&r2=1774223&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/server/StandbyServer.java
(original)
+++
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/server/StandbyServer.java
Wed Dec 14 13:19:57 2016
@@ -221,7 +221,7 @@ class StandbyServer implements AutoClose
}
}
- private boolean shutDown(EventLoopGroup group) {
+ private static boolean shutDown(EventLoopGroup group) {
return group.shutdownGracefully(0, 5,
TimeUnit.SECONDS).awaitUninterruptibly(10, TimeUnit.SECONDS);
}
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/DebugSegments.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/DebugSegments.java?rev=1774223&r1=1774222&r2=1774223&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/DebugSegments.java
(original)
+++
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/DebugSegments.java
Wed Dec 14 13:19:57 2016
@@ -144,7 +144,7 @@ public class DebugSegments implements Ru
}
}
- private void debugSegment(ReadOnlyFileStore store, String segment) {
+ private static void debugSegment(ReadOnlyFileStore store, String segment) {
Matcher matcher = SEGMENT_REGEX.matcher(segment);
if (!matcher.matches()) {
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/DebugTars.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/DebugTars.java?rev=1774223&r1=1774222&r2=1774223&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/DebugTars.java
(original)
+++
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/DebugTars.java
Wed Dec 14 13:19:57 2016
@@ -239,11 +239,11 @@ public class DebugTars implements Runnab
}
}
- private String getLocalPath(String path, PropertyState ps, String value,
RecordId id) {
+ private static String getLocalPath(String path, PropertyState ps, String
value, RecordId id) {
return path + ps.getName() + " = " + value + " [SegmentPropertyState<"
+ ps.getType() + ">@" + id + "]";
}
- private String getLocalPath(String path, PropertyState ps, RecordId id) {
+ private static String getLocalPath(String path, PropertyState ps, RecordId
id) {
return path + ps + " [SegmentPropertyState<" + ps.getType() + ">@" +
id + "]";
}
