Author: mduerig
Date: Wed Dec 14 13:19:09 2016
New Revision: 1774215
URL: http://svn.apache.org/viewvc?rev=1774215&view=rev
Log:
OAK-5293: Static code analysis and code cleanup
Make fields final where possible
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/backup/impl/FileStoreBackupImpl.java
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/Compactor.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/compaction/SegmentGCStatus.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/GCJournal.java
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/PriorityCache.java
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/client/StandbyClient.java
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/codec/GetHeadRequest.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/FileStoreBackupImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/backup/impl/FileStoreBackupImpl.java?rev=1774215&r1=1774214&r2=1774215&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/backup/impl/FileStoreBackupImpl.java
(original)
+++
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/backup/impl/FileStoreBackupImpl.java
Wed Dec 14 13:19:09 2016
@@ -48,7 +48,7 @@ public class FileStoreBackupImpl impleme
private static final Logger log =
LoggerFactory.getLogger(FileStoreBackupImpl.class);
- public static boolean USE_FAKE_BLOBSTORE =
Boolean.getBoolean("oak.backup.UseFakeBlobStore");
+ public static final boolean USE_FAKE_BLOBSTORE =
Boolean.getBoolean("oak.backup.UseFakeBlobStore");
@Override
public void backup(@Nonnull SegmentReader reader, @Nonnull Revisions
revisions, @Nonnull File destination) throws IOException,
InvalidFileStoreVersionException {
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/Compactor.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/Compactor.java?rev=1774215&r1=1774214&r2=1774215&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/Compactor.java
(original)
+++
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/Compactor.java
Wed Dec 14 13:19:09 2016
@@ -57,7 +57,7 @@ public class Compactor {
/** Logger instance */
private static final Logger log = LoggerFactory.getLogger(Compactor.class);
- private static boolean eagerFlush =
Boolean.getBoolean("oak.compaction.eagerFlush");
+ private static final boolean eagerFlush =
Boolean.getBoolean("oak.compaction.eagerFlush");
static {
if (eagerFlush) {
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=1774215&r1=1774214&r2=1774215&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
Wed Dec 14 13:19:09 2016
@@ -57,7 +57,7 @@ class MutableRecordNumbers implements Re
@Override
public synchronized Iterator<Entry> iterator() {
return new AbstractIterator<Entry>() {
- int[] entries = copyOf(recordEntries, size * 2);
+ final int[] entries = copyOf(recordEntries, size * 2);
int index = 0;
@Override
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/compaction/SegmentGCStatus.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/compaction/SegmentGCStatus.java?rev=1774215&r1=1774214&r2=1774215&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/compaction/SegmentGCStatus.java
(original)
+++
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/compaction/SegmentGCStatus.java
Wed Dec 14 13:19:09 2016
@@ -27,7 +27,7 @@ public enum SegmentGCStatus {
COMPACTION_FORCE_COMPACT("compaction-force-compact"),
CLEANUP("cleanup");
- private String message;
+ private final String message;
SegmentGCStatus(String message) {
this.message = message;
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=1774215&r1=1774214&r2=1774215&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:09 2016
@@ -240,7 +240,7 @@ public class FileStore extends AbstractF
fileStoreScheduler.scheduleAtFixedRate(
format("TarMK disk space check [%s]", directory), 1, MINUTES,
new Runnable() {
- SegmentGCOptions gcOptions = builder.getGcOptions();
+ final SegmentGCOptions gcOptions = builder.getGcOptions();
@Override
public void run() {
@@ -922,7 +922,7 @@ public class FileStore extends AbstractF
*/
private Supplier<Boolean> timeOut(final long duration, @Nonnull final
TimeUnit unit) {
return new Supplier<Boolean>() {
- long deadline = currentTimeMillis() +
MILLISECONDS.convert(duration, unit);
+ final long deadline = currentTimeMillis() +
MILLISECONDS.convert(duration, unit);
@Override
public Boolean get() {
return currentTimeMillis() > deadline;
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/GCJournal.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/GCJournal.java?rev=1774215&r1=1774214&r2=1774215&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/GCJournal.java
(original)
+++
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/GCJournal.java
Wed Dec 14 13:19:09 2016
@@ -134,7 +134,7 @@ public class GCJournal {
static class GCJournalEntry {
- static GCJournalEntry EMPTY = new GCJournalEntry(-1, -1, -1, -1, -1);
+ static final GCJournalEntry EMPTY = new GCJournalEntry(-1, -1, -1, -1,
-1);
private final long repoSize;
private final long reclaimedSize;
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/PriorityCache.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/PriorityCache.java?rev=1774215&r1=1774214&r2=1774215&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/PriorityCache.java
(original)
+++
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/PriorityCache.java
Wed Dec 14 13:19:09 2016
@@ -105,7 +105,7 @@ public class PriorityCache<K, V> {
}
private static class Entry<K, V> {
- static Entry<Void, Void> NULL = new Entry<>(null, null, -1,
Byte.MIN_VALUE);
+ static final Entry<Void, Void> NULL = new Entry<>(null, null, -1,
Byte.MIN_VALUE);
final K key;
final V value;
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=1774215&r1=1774214&r2=1774215&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 Dec 14 13:19:09 2016
@@ -71,9 +71,9 @@ class StandbyClient implements AutoClose
private final int readTimeoutMs;
- private String clientId;
+ private final String clientId;
- private NioEventLoopGroup group;
+ private final NioEventLoopGroup group;
private Channel channel;
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/codec/GetHeadRequest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/codec/GetHeadRequest.java?rev=1774215&r1=1774214&r2=1774215&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/codec/GetHeadRequest.java
(original)
+++
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/codec/GetHeadRequest.java
Wed Dec 14 13:19:09 2016
@@ -19,7 +19,7 @@ package org.apache.jackrabbit.oak.segmen
public class GetHeadRequest {
- private String clientId;
+ private final String clientId;
public GetHeadRequest(String clientId) {
this.clientId = clientId;
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=1774215&r1=1774214&r2=1774215&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:09 2016
@@ -62,7 +62,7 @@ public class DebugSegments implements Ru
private File path;
- private List<String> segments = new ArrayList<>();
+ private final List<String> segments = new ArrayList<>();
private Builder() {
// Prevent external instantiation.
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=1774215&r1=1774214&r2=1774215&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:09 2016
@@ -69,9 +69,9 @@ public class DebugTars implements Runnab
private File path;
- private List<String> tars = new ArrayList<>();
+ private final List<String> tars = new ArrayList<>();
- private int maxCharDisplay = Integer.getInteger("max.char.display",
60);
+ private final int maxCharDisplay =
Integer.getInteger("max.char.display", 60);
private Builder() {
// Prevent external instantiation.
