This is an automated email from the ASF dual-hosted git repository.
cshannon pushed a commit to branch elasticity
in repository https://gitbox.apache.org/repos/asf/accumulo.git
The following commit(s) were added to refs/heads/elasticity by this push:
new e8446a2f18 Mark member variables as final in core (#4834)
e8446a2f18 is described below
commit e8446a2f186e8202680077965a65db00a2e9d715
Author: Christopher L. Shannon <[email protected]>
AuthorDate: Sun Aug 25 12:02:28 2024 -0400
Mark member variables as final in core (#4834)
* Mark member variables as final in core
See #4830
---
.../core/client/AccumuloSecurityException.java | 2 +-
.../core/client/ClientSideIteratorScanner.java | 6 ++--
.../accumulo/core/client/ConditionalWriter.java | 4 +--
.../accumulo/core/client/IsolatedScanner.java | 18 +++++-----
.../accumulo/core/client/IteratorSetting.java | 2 +-
.../core/client/NamespaceNotEmptyException.java | 2 +-
.../core/client/NamespaceNotFoundException.java | 2 +-
.../apache/accumulo/core/client/RowIterator.java | 2 +-
.../core/client/TableDeletedException.java | 2 +-
.../core/client/TableNotFoundException.java | 2 +-
.../accumulo/core/client/admin/DiskUsage.java | 2 +-
.../core/client/lexicoder/DateLexicoder.java | 2 +-
.../core/client/lexicoder/DoubleLexicoder.java | 2 +-
.../core/client/lexicoder/FloatLexicoder.java | 2 +-
.../core/client/lexicoder/IntegerLexicoder.java | 2 +-
.../core/client/lexicoder/ListLexicoder.java | 2 +-
.../core/client/lexicoder/PairLexicoder.java | 4 +--
.../core/client/lexicoder/ReverseLexicoder.java | 2 +-
.../core/client/rfile/RFileScannerBuilder.java | 2 +-
.../accumulo/core/client/rfile/RFileWriter.java | 2 +-
.../core/client/sample/SamplerConfiguration.java | 2 +-
.../security/tokens/AuthenticationToken.java | 7 ++--
.../core/client/summary/CountingSummarizer.java | 8 ++---
.../summarizers/AuthorizationSummarizer.java | 2 +-
.../summary/summarizers/EntryLengthSummarizer.java | 14 ++++----
.../core/clientImpl/ActiveCompactionImpl.java | 8 ++---
.../accumulo/core/clientImpl/ActiveScanImpl.java | 10 +++---
.../core/clientImpl/ClientTabletCache.java | 8 ++---
.../core/clientImpl/ClientTabletCacheImpl.java | 10 +++---
.../core/clientImpl/CompressedIterators.java | 6 ++--
.../core/clientImpl/ConditionalWriterImpl.java | 24 ++++++-------
.../accumulo/core/clientImpl/Credentials.java | 4 +--
.../core/clientImpl/NamespaceOperationsImpl.java | 2 +-
.../accumulo/core/clientImpl/OfflineScanner.java | 6 ++--
.../accumulo/core/clientImpl/ScannerImpl.java | 6 ++--
.../accumulo/core/clientImpl/ScannerIterator.java | 10 +++---
.../core/clientImpl/TableOperationsImpl.java | 2 +-
.../core/clientImpl/TabletServerBatchDeleter.java | 4 +--
.../TabletServerBatchReaderIterator.java | 20 +++++------
.../core/clientImpl/TabletServerBatchWriter.java | 14 ++++----
.../core/clientImpl/TimeoutClientTabletCache.java | 2 +-
.../apache/accumulo/core/clientImpl/bulk/Bulk.java | 10 +++---
.../clientImpl/bulk/ConcurrentKeyExtentCache.java | 17 ++++-----
.../lexicoder/FixedByteArrayOutputStream.java | 2 +-
.../core/compaction/CompactionSettings.java | 4 +--
.../accumulo/core/conf/AccumuloConfiguration.java | 4 +--
.../apache/accumulo/core/conf/ConfigCheckUtil.java | 3 +-
.../accumulo/core/conf/ConfigurationDocGen.java | 2 +-
.../core/conf/ConfigurationTypeHelper.java | 2 +-
.../accumulo/core/constraints/Violations.java | 2 +-
.../apache/accumulo/core/data/ColumnUpdate.java | 14 ++++----
.../org/apache/accumulo/core/data/Condition.java | 4 +--
.../core/data/ConstraintViolationSummary.java | 6 ++--
.../org/apache/accumulo/core/data/PartialKey.java | 2 +-
.../java/org/apache/accumulo/core/data/Value.java | 2 +-
.../accumulo/core/dataImpl/ComparableBytes.java | 2 +-
.../fate/zookeeper/DistributedReadWriteLock.java | 8 ++---
.../core/fate/zookeeper/ZooCacheFactory.java | 2 +-
.../accumulo/core/fate/zookeeper/ZooSession.java | 2 +-
.../accumulo/core/file/BloomFilterLayer.java | 8 ++---
.../org/apache/accumulo/core/file/FilePrefix.java | 2 +-
.../file/blockfile/cache/lru/LruBlockCache.java | 2 +-
.../cache/lru/LruBlockCacheConfiguration.java | 4 +--
.../file/blockfile/impl/CachableBlockFile.java | 16 ++++-----
.../blockfile/impl/OpportunisticBlockCache.java | 2 +-
.../accumulo/core/file/rfile/BlockIndex.java | 4 +--
.../accumulo/core/file/rfile/IndexIterator.java | 2 +-
.../core/file/rfile/MultiIndexIterator.java | 2 +-
.../accumulo/core/file/rfile/MultiLevelIndex.java | 24 ++++++-------
.../org/apache/accumulo/core/file/rfile/RFile.java | 40 +++++++++++-----------
.../accumulo/core/file/rfile/RelativeKey.java | 6 ++--
.../accumulo/core/file/rfile/RollingStats.java | 2 +-
.../core/file/rfile/VisMetricsGatherer.java | 12 +++----
.../accumulo/core/file/rfile/VisibilityMetric.java | 8 +++--
.../file/rfile/bcfile/CompressionAlgorithm.java | 7 ++--
.../rfile/bcfile/SimpleBufferedOutputStream.java | 2 +-
.../apache/accumulo/core/iterators/Combiner.java | 6 ++--
.../accumulo/core/iterators/IteratorAdapter.java | 2 +-
.../apache/accumulo/core/iterators/OrIterator.java | 2 +-
.../core/iterators/TypedValueCombiner.java | 6 ++--
.../core/iterators/user/CfCqSliceOpts.java | 12 +++----
.../accumulo/core/iterators/user/GrepIterator.java | 2 +-
.../core/iterators/user/IntersectingIterator.java | 10 +++---
.../core/iterators/user/LargeRowFilter.java | 4 +--
.../core/iterators/user/RowEncodingIterator.java | 4 +--
.../core/iterators/user/TransformingIterator.java | 13 +++----
.../core/iterators/user/VersioningIterator.java | 2 +-
.../core/iterators/user/VisibilityFilter.java | 2 +-
.../iterators/user/WholeColumnFamilyIterator.java | 4 +--
.../core/iteratorsImpl/IteratorBuilderImpl.java | 2 +-
.../core/iteratorsImpl/conf/ColumnSet.java | 8 ++---
.../iteratorsImpl/conf/ColumnToClassMapping.java | 8 ++---
.../core/iteratorsImpl/conf/ColumnUtil.java | 6 ++--
.../system/ColumnQualifierFilter.java | 4 +--
.../iteratorsImpl/system/DeletingIterator.java | 4 +--
.../system/LocalityGroupIterator.java | 4 +--
.../iteratorsImpl/system/SequenceFileIterator.java | 4 +--
.../iteratorsImpl/system/SortedMapIterator.java | 2 +-
.../system/SourceSwitchingIterator.java | 2 +-
.../core/iteratorsImpl/system/StatsIterator.java | 6 ++--
.../iteratorsImpl/system/TimeSettingIterator.java | 4 +--
.../iteratorsImpl/system/VisibilityFilter.java | 2 +-
.../org/apache/accumulo/core/lock/ServiceLock.java | 2 +-
.../apache/accumulo/core/lock/ServiceLockData.java | 2 +-
.../metadata/MetadataCachedTabletObtainer.java | 4 +--
.../core/metadata/schema/DataFileValue.java | 4 +--
.../core/metadata/schema/LinkingIterator.java | 4 +--
.../metadata/schema/TabletMetadataBuilder.java | 2 +-
.../accumulo/core/rpc/UGIAssumingTransport.java | 2 +-
.../core/sample/impl/DataoutputHasher.java | 2 +-
.../org/apache/accumulo/core/schema/Section.java | 4 +--
.../accumulo/core/security/ColumnVisibility.java | 6 ++--
.../accumulo/core/security/SystemPermission.java | 2 +-
.../core/security/VisibilityParseException.java | 2 +-
.../accumulo/core/spi/balancer/GroupBalancer.java | 2 +-
.../core/spi/balancer/TableLoadBalancer.java | 2 +-
.../core/spi/fs/SpaceAwareVolumeChooser.java | 4 +--
.../core/spi/scan/DefaultScanDispatch.java | 2 +-
.../core/spi/scan/SimpleScanDispatcher.java | 3 +-
.../org/apache/accumulo/core/summary/Gatherer.java | 36 +++++++++----------
.../accumulo/core/summary/SummaryCollection.java | 10 +++---
.../accumulo/core/summary/SummaryReader.java | 4 +--
.../accumulo/core/summary/SummarySerializer.java | 28 +++++++--------
.../accumulo/core/summary/SummaryWriter.java | 8 ++---
.../core/util/compaction/CompactionPlanImpl.java | 2 +-
.../core/util/format/DefaultFormatter.java | 2 +-
.../format/ShardedTableDistributionFormatter.java | 2 +-
.../accumulo/core/util/threads/ThreadPools.java | 2 +-
128 files changed, 370 insertions(+), 362 deletions(-)
diff --git
a/core/src/main/java/org/apache/accumulo/core/client/AccumuloSecurityException.java
b/core/src/main/java/org/apache/accumulo/core/client/AccumuloSecurityException.java
index 6486bd2a9b..ec6beab75c 100644
---
a/core/src/main/java/org/apache/accumulo/core/client/AccumuloSecurityException.java
+++
b/core/src/main/java/org/apache/accumulo/core/client/AccumuloSecurityException.java
@@ -68,7 +68,7 @@ public class AccumuloSecurityException extends Exception {
private String user;
private String tableInfo;
- private SecurityErrorCode errorCode;
+ private final SecurityErrorCode errorCode;
/**
* @return this exception as a thrift exception
diff --git
a/core/src/main/java/org/apache/accumulo/core/client/ClientSideIteratorScanner.java
b/core/src/main/java/org/apache/accumulo/core/client/ClientSideIteratorScanner.java
index 7e300e917d..ba3fab71fa 100644
---
a/core/src/main/java/org/apache/accumulo/core/client/ClientSideIteratorScanner.java
+++
b/core/src/main/java/org/apache/accumulo/core/client/ClientSideIteratorScanner.java
@@ -89,8 +89,8 @@ public class ClientSideIteratorScanner extends ScannerOptions
implements Scanner
private class ClientSideIteratorEnvironment implements IteratorEnvironment {
- private SamplerConfiguration samplerConfig;
- private boolean sampleEnabled;
+ private final SamplerConfiguration samplerConfig;
+ private final boolean sampleEnabled;
ClientSideIteratorEnvironment(boolean sampleEnabled, SamplerConfiguration
samplerConfig) {
this.sampleEnabled = sampleEnabled;
@@ -150,7 +150,7 @@ public class ClientSideIteratorScanner extends
ScannerOptions implements Scanner
* use it as a source.
*/
private class ScannerTranslatorImpl implements
SortedKeyValueIterator<Key,Value> {
- protected Scanner scanner;
+ protected final Scanner scanner;
Iterator<Entry<Key,Value>> iter;
Entry<Key,Value> top = null;
private SamplerConfiguration samplerConfig;
diff --git
a/core/src/main/java/org/apache/accumulo/core/client/ConditionalWriter.java
b/core/src/main/java/org/apache/accumulo/core/client/ConditionalWriter.java
index 79968fe567..9070ee131f 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/ConditionalWriter.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/ConditionalWriter.java
@@ -33,8 +33,8 @@ public interface ConditionalWriter extends AutoCloseable {
class Result {
private Status status;
- private ConditionalMutation mutation;
- private String server;
+ private final ConditionalMutation mutation;
+ private final String server;
private Exception exception;
public Result(Status s, ConditionalMutation m, String server) {
diff --git
a/core/src/main/java/org/apache/accumulo/core/client/IsolatedScanner.java
b/core/src/main/java/org/apache/accumulo/core/client/IsolatedScanner.java
index c3ead89abb..ae18703b69 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/IsolatedScanner.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/IsolatedScanner.java
@@ -45,17 +45,17 @@ public class IsolatedScanner extends ScannerOptions
implements Scanner {
private static class RowBufferingIterator implements
Iterator<Entry<Key,Value>> {
private Iterator<Entry<Key,Value>> source;
- private RowBuffer buffer;
+ private final RowBuffer buffer;
private Entry<Key,Value> nextRowStart;
private Iterator<Entry<Key,Value>> rowIter;
private ByteSequence lastRow = null;
- private long timeout;
+ private final long timeout;
private final Scanner scanner;
- private ScannerOptions opts;
- private Range range;
- private int batchSize;
- private long readaheadThreshold;
+ private final ScannerOptions opts;
+ private final Range range;
+ private final int batchSize;
+ private final long readaheadThreshold;
private void readRow() {
@@ -195,7 +195,7 @@ public class IsolatedScanner extends ScannerOptions
implements Scanner {
public static class MemoryRowBuffer implements RowBuffer {
- private ArrayList<Entry<Key,Value>> buffer = new ArrayList<>();
+ private final ArrayList<Entry<Key,Value>> buffer = new ArrayList<>();
@Override
public void add(Entry<Key,Value> entry) {
@@ -214,11 +214,11 @@ public class IsolatedScanner extends ScannerOptions
implements Scanner {
}
- private Scanner scanner;
+ private final Scanner scanner;
private Range range;
private int batchSize;
private long readaheadThreshold;
- private RowBufferFactory bufferFactory;
+ private final RowBufferFactory bufferFactory;
public IsolatedScanner(Scanner scanner) {
this(scanner, new MemoryRowBufferFactory());
diff --git
a/core/src/main/java/org/apache/accumulo/core/client/IteratorSetting.java
b/core/src/main/java/org/apache/accumulo/core/client/IteratorSetting.java
index ebdff6e758..c9855e2671 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/IteratorSetting.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/IteratorSetting.java
@@ -55,7 +55,7 @@ public class IteratorSetting implements Writable {
private int priority;
private String name;
private String iteratorClass;
- private Map<String,String> properties;
+ private final Map<String,String> properties;
/**
* Get layer at which this iterator applies. See {@link #setPriority(int)}
for how the priority is
diff --git
a/core/src/main/java/org/apache/accumulo/core/client/NamespaceNotEmptyException.java
b/core/src/main/java/org/apache/accumulo/core/client/NamespaceNotEmptyException.java
index 73536c309a..6aa61014a8 100644
---
a/core/src/main/java/org/apache/accumulo/core/client/NamespaceNotEmptyException.java
+++
b/core/src/main/java/org/apache/accumulo/core/client/NamespaceNotEmptyException.java
@@ -27,7 +27,7 @@ public class NamespaceNotEmptyException extends Exception {
private static final long serialVersionUID = 1L;
- private String namespace;
+ private final String namespace;
/**
* @param namespaceId the internal id of the namespace
diff --git
a/core/src/main/java/org/apache/accumulo/core/client/NamespaceNotFoundException.java
b/core/src/main/java/org/apache/accumulo/core/client/NamespaceNotFoundException.java
index 64256d4cf0..fe7c2dcf42 100644
---
a/core/src/main/java/org/apache/accumulo/core/client/NamespaceNotFoundException.java
+++
b/core/src/main/java/org/apache/accumulo/core/client/NamespaceNotFoundException.java
@@ -29,7 +29,7 @@ public class NamespaceNotFoundException extends Exception {
*/
private static final long serialVersionUID = 1L;
- private String namespace;
+ private final String namespace;
/**
* @param namespaceId the internal id of the namespace that was sought
diff --git
a/core/src/main/java/org/apache/accumulo/core/client/RowIterator.java
b/core/src/main/java/org/apache/accumulo/core/client/RowIterator.java
index 90ce588019..abe0c9854d 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/RowIterator.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/RowIterator.java
@@ -40,7 +40,7 @@ public class RowIterator implements
Iterator<Iterator<Entry<Key,Value>>> {
* Iterate over entries in a single row.
*/
private static class SingleRowIter implements Iterator<Entry<Key,Value>> {
- private PeekingIterator<Entry<Key,Value>> source;
+ private final PeekingIterator<Entry<Key,Value>> source;
private Text currentRow = null;
private long count = 0;
private boolean disabled = false;
diff --git
a/core/src/main/java/org/apache/accumulo/core/client/TableDeletedException.java
b/core/src/main/java/org/apache/accumulo/core/client/TableDeletedException.java
index b19170f775..dadb1c1b39 100644
---
a/core/src/main/java/org/apache/accumulo/core/client/TableDeletedException.java
+++
b/core/src/main/java/org/apache/accumulo/core/client/TableDeletedException.java
@@ -27,7 +27,7 @@ package org.apache.accumulo.core.client;
public class TableDeletedException extends RuntimeException {
private static final long serialVersionUID = 1L;
- private String tableId;
+ private final String tableId;
public TableDeletedException(String tableId) {
super("Table ID " + tableId + " was deleted");
diff --git
a/core/src/main/java/org/apache/accumulo/core/client/TableNotFoundException.java
b/core/src/main/java/org/apache/accumulo/core/client/TableNotFoundException.java
index f2922e9ccf..f56ed0face 100644
---
a/core/src/main/java/org/apache/accumulo/core/client/TableNotFoundException.java
+++
b/core/src/main/java/org/apache/accumulo/core/client/TableNotFoundException.java
@@ -30,7 +30,7 @@ public class TableNotFoundException extends Exception {
*/
private static final long serialVersionUID = 1L;
- private String tableName;
+ private final String tableName;
/**
* @param tableId the internal id of the table that was sought
diff --git
a/core/src/main/java/org/apache/accumulo/core/client/admin/DiskUsage.java
b/core/src/main/java/org/apache/accumulo/core/client/admin/DiskUsage.java
index dfa23081c4..311b866028 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/admin/DiskUsage.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/admin/DiskUsage.java
@@ -24,7 +24,7 @@ import java.util.SortedSet;
public class DiskUsage {
protected final SortedSet<String> tables;
- protected long usage;
+ protected final long usage;
public DiskUsage(SortedSet<String> tables, long usage) {
this.tables = tables;
diff --git
a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/DateLexicoder.java
b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/DateLexicoder.java
index 8bb3c63055..d5a4b653bc 100644
---
a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/DateLexicoder.java
+++
b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/DateLexicoder.java
@@ -27,7 +27,7 @@ import java.util.Date;
*/
public class DateLexicoder extends AbstractLexicoder<Date> {
- private LongLexicoder longEncoder = new LongLexicoder();
+ private final LongLexicoder longEncoder = new LongLexicoder();
@Override
public byte[] encode(Date data) {
diff --git
a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/DoubleLexicoder.java
b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/DoubleLexicoder.java
index 31649b86bf..1adbeeaec4 100644
---
a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/DoubleLexicoder.java
+++
b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/DoubleLexicoder.java
@@ -25,7 +25,7 @@ package org.apache.accumulo.core.client.lexicoder;
*/
public class DoubleLexicoder extends AbstractLexicoder<Double> {
- private ULongLexicoder longEncoder = new ULongLexicoder();
+ private final ULongLexicoder longEncoder = new ULongLexicoder();
@Override
public byte[] encode(Double d) {
diff --git
a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/FloatLexicoder.java
b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/FloatLexicoder.java
index ef832bb3af..54e6598791 100644
---
a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/FloatLexicoder.java
+++
b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/FloatLexicoder.java
@@ -25,7 +25,7 @@ package org.apache.accumulo.core.client.lexicoder;
*/
public class FloatLexicoder extends AbstractLexicoder<Float> {
- private UIntegerLexicoder intEncoder = new UIntegerLexicoder();
+ private final UIntegerLexicoder intEncoder = new UIntegerLexicoder();
@Override
public byte[] encode(Float f) {
diff --git
a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/IntegerLexicoder.java
b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/IntegerLexicoder.java
index 795158aa0c..982848719d 100644
---
a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/IntegerLexicoder.java
+++
b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/IntegerLexicoder.java
@@ -26,7 +26,7 @@ package org.apache.accumulo.core.client.lexicoder;
*/
public class IntegerLexicoder extends AbstractLexicoder<Integer> {
- private UIntegerLexicoder uil = new UIntegerLexicoder();
+ private final UIntegerLexicoder uil = new UIntegerLexicoder();
@Override
public byte[] encode(Integer i) {
diff --git
a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/ListLexicoder.java
b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/ListLexicoder.java
index 7cc44dd004..a52db6ce34 100644
---
a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/ListLexicoder.java
+++
b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/ListLexicoder.java
@@ -37,7 +37,7 @@ import java.util.List;
*/
public class ListLexicoder<LT> extends AbstractLexicoder<List<LT>> {
- private Lexicoder<LT> lexicoder;
+ private final Lexicoder<LT> lexicoder;
public ListLexicoder(Lexicoder<LT> lexicoder) {
this.lexicoder = lexicoder;
diff --git
a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/PairLexicoder.java
b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/PairLexicoder.java
index e5172a5777..5c0ff63544 100644
---
a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/PairLexicoder.java
+++
b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/PairLexicoder.java
@@ -54,8 +54,8 @@ import org.apache.accumulo.core.util.ComparablePair;
public class PairLexicoder<A extends Comparable<A>,B extends Comparable<B>>
extends AbstractLexicoder<ComparablePair<A,B>> {
- private Lexicoder<A> firstLexicoder;
- private Lexicoder<B> secondLexicoder;
+ private final Lexicoder<A> firstLexicoder;
+ private final Lexicoder<B> secondLexicoder;
public PairLexicoder(Lexicoder<A> firstLexicoder, Lexicoder<B>
secondLexicoder) {
this.firstLexicoder = firstLexicoder;
diff --git
a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/ReverseLexicoder.java
b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/ReverseLexicoder.java
index 5c67f79389..71ba10c73f 100644
---
a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/ReverseLexicoder.java
+++
b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/ReverseLexicoder.java
@@ -31,7 +31,7 @@ import static
org.apache.accumulo.core.clientImpl.lexicoder.ByteUtils.unescape;
*/
public class ReverseLexicoder<T> extends AbstractLexicoder<T> {
- private Lexicoder<T> lexicoder;
+ private final Lexicoder<T> lexicoder;
/**
* @param lexicoder The lexicoder who's sort order will be flipped.
diff --git
a/core/src/main/java/org/apache/accumulo/core/client/rfile/RFileScannerBuilder.java
b/core/src/main/java/org/apache/accumulo/core/client/rfile/RFileScannerBuilder.java
index e63c7953ee..ca1a810b44 100644
---
a/core/src/main/java/org/apache/accumulo/core/client/rfile/RFileScannerBuilder.java
+++
b/core/src/main/java/org/apache/accumulo/core/client/rfile/RFileScannerBuilder.java
@@ -77,7 +77,7 @@ class RFileScannerBuilder implements RFile.InputArguments,
RFile.ScannerFSOption
}
}
- private RFileScanner.Opts opts = new RFileScanner.Opts();
+ private final RFileScanner.Opts opts = new RFileScanner.Opts();
@Override
public ScannerOptions withoutSystemIterators() {
diff --git
a/core/src/main/java/org/apache/accumulo/core/client/rfile/RFileWriter.java
b/core/src/main/java/org/apache/accumulo/core/client/rfile/RFileWriter.java
index f8ce1f7c2f..b4d6def4a2 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/rfile/RFileWriter.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/rfile/RFileWriter.java
@@ -90,7 +90,7 @@ import com.google.common.base.Preconditions;
*/
public class RFileWriter implements AutoCloseable {
- private FileSKVWriter writer;
+ private final FileSKVWriter writer;
private final LRUMap<ByteSequence,Boolean> validVisibilities;
private boolean startedLG;
private boolean startedDefaultLG;
diff --git
a/core/src/main/java/org/apache/accumulo/core/client/sample/SamplerConfiguration.java
b/core/src/main/java/org/apache/accumulo/core/client/sample/SamplerConfiguration.java
index 397dc16755..41b0e6534b 100644
---
a/core/src/main/java/org/apache/accumulo/core/client/sample/SamplerConfiguration.java
+++
b/core/src/main/java/org/apache/accumulo/core/client/sample/SamplerConfiguration.java
@@ -33,7 +33,7 @@ import java.util.Map.Entry;
*/
public class SamplerConfiguration {
- private String className;
+ private final String className;
private Map<String,String> options = new HashMap<>();
public SamplerConfiguration(Class<? extends Sampler> samplerClass) {
diff --git
a/core/src/main/java/org/apache/accumulo/core/client/security/tokens/AuthenticationToken.java
b/core/src/main/java/org/apache/accumulo/core/client/security/tokens/AuthenticationToken.java
index 0652a3b7bf..43832cbed3 100644
---
a/core/src/main/java/org/apache/accumulo/core/client/security/tokens/AuthenticationToken.java
+++
b/core/src/main/java/org/apache/accumulo/core/client/security/tokens/AuthenticationToken.java
@@ -124,7 +124,7 @@ public interface AuthenticationToken extends Writable,
Destroyable, Cloneable {
class Properties implements Destroyable, Map<String,char[]> {
private boolean destroyed = false;
- private HashMap<String,char[]> map = new HashMap<>();
+ private final HashMap<String,char[]> map = new HashMap<>();
private void checkDestroyed() {
if (destroyed) {
@@ -241,8 +241,9 @@ public interface AuthenticationToken extends Writable,
Destroyable, Cloneable {
}
class TokenProperty implements Comparable<TokenProperty> {
- private String key, description;
- private boolean masked;
+ private final String key;
+ private final String description;
+ private final boolean masked;
public TokenProperty(String name, String description, boolean mask) {
this.key = name;
diff --git
a/core/src/main/java/org/apache/accumulo/core/client/summary/CountingSummarizer.java
b/core/src/main/java/org/apache/accumulo/core/client/summary/CountingSummarizer.java
index df9a64121b..2b5f40a1e5 100644
---
a/core/src/main/java/org/apache/accumulo/core/client/summary/CountingSummarizer.java
+++
b/core/src/main/java/org/apache/accumulo/core/client/summary/CountingSummarizer.java
@@ -218,15 +218,15 @@ public abstract class CountingSummarizer<K> implements
Summarizer {
// efficient than converting String for each Key. The
// conversion to String is deferred until the summary is requested.
- private Map<K,MutableLong> counters = new HashMap<>();
+ private final Map<K,MutableLong> counters = new HashMap<>();
private long tooMany = 0;
private long tooLong = 0;
private long seen = 0;
private long emitted = 0;
private long deleted = 0;
- private Converter<K> converter = converter();
- private Function<K,String> encoder = encoder();
- private UnaryOperator<K> copier = copier();
+ private final Converter<K> converter = converter();
+ private final Function<K,String> encoder = encoder();
+ private final UnaryOperator<K> copier = copier();
private void incrementCounter(K counter) {
emitted++;
diff --git
a/core/src/main/java/org/apache/accumulo/core/client/summary/summarizers/AuthorizationSummarizer.java
b/core/src/main/java/org/apache/accumulo/core/client/summary/summarizers/AuthorizationSummarizer.java
index 77a92442e5..a0045ba592 100644
---
a/core/src/main/java/org/apache/accumulo/core/client/summary/summarizers/AuthorizationSummarizer.java
+++
b/core/src/main/java/org/apache/accumulo/core/client/summary/summarizers/AuthorizationSummarizer.java
@@ -63,7 +63,7 @@ public class AuthorizationSummarizer extends
CountingSummarizer<ByteSequence> {
private static class AuthsConverter implements Converter<ByteSequence> {
final int MAX_ENTRIES = 1000;
- private Map<ByteSequence,Set<ByteSequence>> cache =
+ private final Map<ByteSequence,Set<ByteSequence>> cache =
new LinkedHashMap<>(MAX_ENTRIES + 1, .75F, true) {
private static final long serialVersionUID = 1L;
diff --git
a/core/src/main/java/org/apache/accumulo/core/client/summary/summarizers/EntryLengthSummarizer.java
b/core/src/main/java/org/apache/accumulo/core/client/summary/summarizers/EntryLengthSummarizer.java
index 9b70a58fcc..95e169e218 100644
---
a/core/src/main/java/org/apache/accumulo/core/client/summary/summarizers/EntryLengthSummarizer.java
+++
b/core/src/main/java/org/apache/accumulo/core/client/summary/summarizers/EntryLengthSummarizer.java
@@ -45,7 +45,7 @@ public class EntryLengthSummarizer implements Summarizer {
private long min = Long.MAX_VALUE;
private long max = Long.MIN_VALUE;
private long sum = 0;
- private long[] counts = new long[32];
+ private final long[] counts = new long[32];
private void accept(int length) {
int idx;
@@ -106,12 +106,12 @@ public class EntryLengthSummarizer implements Summarizer {
public Collector collector(SummarizerConfiguration sc) {
return new Collector() {
- private LengthStats keyStats = new LengthStats();
- private LengthStats rowStats = new LengthStats();
- private LengthStats familyStats = new LengthStats();
- private LengthStats qualifierStats = new LengthStats();
- private LengthStats visibilityStats = new LengthStats();
- private LengthStats valueStats = new LengthStats();
+ private final LengthStats keyStats = new LengthStats();
+ private final LengthStats rowStats = new LengthStats();
+ private final LengthStats familyStats = new LengthStats();
+ private final LengthStats qualifierStats = new LengthStats();
+ private final LengthStats visibilityStats = new LengthStats();
+ private final LengthStats valueStats = new LengthStats();
private long total = 0;
@Override
diff --git
a/core/src/main/java/org/apache/accumulo/core/clientImpl/ActiveCompactionImpl.java
b/core/src/main/java/org/apache/accumulo/core/clientImpl/ActiveCompactionImpl.java
index ca36f3df7e..d744789fe8 100644
---
a/core/src/main/java/org/apache/accumulo/core/clientImpl/ActiveCompactionImpl.java
+++
b/core/src/main/java/org/apache/accumulo/core/clientImpl/ActiveCompactionImpl.java
@@ -38,10 +38,10 @@ import com.google.common.net.HostAndPort;
*/
public class ActiveCompactionImpl extends ActiveCompaction {
- private org.apache.accumulo.core.tabletserver.thrift.ActiveCompaction tac;
- private ClientContext context;
- private HostAndPort hostport;
- private Type type;
+ private final org.apache.accumulo.core.tabletserver.thrift.ActiveCompaction
tac;
+ private final ClientContext context;
+ private final HostAndPort hostport;
+ private final Type type;
ActiveCompactionImpl(ClientContext context,
org.apache.accumulo.core.tabletserver.thrift.ActiveCompaction tac,
HostAndPort hostport,
diff --git
a/core/src/main/java/org/apache/accumulo/core/clientImpl/ActiveScanImpl.java
b/core/src/main/java/org/apache/accumulo/core/clientImpl/ActiveScanImpl.java
index d125fd22a2..a3b177c4a8 100644
--- a/core/src/main/java/org/apache/accumulo/core/clientImpl/ActiveScanImpl.java
+++ b/core/src/main/java/org/apache/accumulo/core/clientImpl/ActiveScanImpl.java
@@ -42,18 +42,18 @@ import org.apache.accumulo.core.security.Authorizations;
*/
public class ActiveScanImpl extends ActiveScan {
- private long scanId;
- private String client;
+ private final long scanId;
+ private final String client;
private String tableName;
- private long age;
- private long idle;
+ private final long age;
+ private final long idle;
private ScanType type;
private ScanState state;
private KeyExtent extent;
private List<Column> columns;
private List<String> ssiList;
private Map<String,Map<String,String>> ssio;
- private String user;
+ private final String user;
private Authorizations authorizations;
ActiveScanImpl(ClientContext context,
diff --git
a/core/src/main/java/org/apache/accumulo/core/clientImpl/ClientTabletCache.java
b/core/src/main/java/org/apache/accumulo/core/clientImpl/ClientTabletCache.java
index 5a23cad2d4..4c4e7056a3 100644
---
a/core/src/main/java/org/apache/accumulo/core/clientImpl/ClientTabletCache.java
+++
b/core/src/main/java/org/apache/accumulo/core/clientImpl/ClientTabletCache.java
@@ -190,8 +190,8 @@ public abstract class ClientTabletCache {
public abstract void invalidateCache(ClientContext context, String server);
private static class InstanceKey {
- InstanceId instanceId;
- TableId tableId;
+ final InstanceId instanceId;
+ final TableId tableId;
InstanceKey(InstanceId instanceId, TableId table) {
this.instanceId = instanceId;
@@ -405,8 +405,8 @@ public abstract class ClientTabletCache {
}
public static class TabletServerMutations<T extends Mutation> {
- private Map<KeyExtent,List<T>> mutations;
- private String tserverSession;
+ private final Map<KeyExtent,List<T>> mutations;
+ private final String tserverSession;
public TabletServerMutations(String tserverSession) {
this.tserverSession = tserverSession;
diff --git
a/core/src/main/java/org/apache/accumulo/core/clientImpl/ClientTabletCacheImpl.java
b/core/src/main/java/org/apache/accumulo/core/clientImpl/ClientTabletCacheImpl.java
index 78def35df0..2dfbf288e3 100644
---
a/core/src/main/java/org/apache/accumulo/core/clientImpl/ClientTabletCacheImpl.java
+++
b/core/src/main/java/org/apache/accumulo/core/clientImpl/ClientTabletCacheImpl.java
@@ -93,12 +93,12 @@ public class ClientTabletCacheImpl extends
ClientTabletCache {
return o1.compareTo(o2);
};
- protected TableId tableId;
- protected ClientTabletCache parent;
- protected TreeMap<Text,CachedTablet> metaCache = new
TreeMap<>(END_ROW_COMPARATOR);
- protected CachedTabletObtainer tabletObtainer;
+ protected final TableId tableId;
+ protected final ClientTabletCache parent;
+ protected final TreeMap<Text,CachedTablet> metaCache = new
TreeMap<>(END_ROW_COMPARATOR);
+ protected final CachedTabletObtainer tabletObtainer;
private final TabletServerLockChecker lockChecker;
- protected Text lastTabletRow;
+ protected final Text lastTabletRow;
private final TreeSet<KeyExtent> badExtents = new TreeSet<>();
private final ReentrantReadWriteLock rwLock = new ReentrantReadWriteLock();
diff --git
a/core/src/main/java/org/apache/accumulo/core/clientImpl/CompressedIterators.java
b/core/src/main/java/org/apache/accumulo/core/clientImpl/CompressedIterators.java
index 1b91bc1588..79ca97737b 100644
---
a/core/src/main/java/org/apache/accumulo/core/clientImpl/CompressedIterators.java
+++
b/core/src/main/java/org/apache/accumulo/core/clientImpl/CompressedIterators.java
@@ -31,11 +31,11 @@ import org.apache.accumulo.core.util.UnsynchronizedBuffer;
public class CompressedIterators {
private Map<String,Integer> symbolMap;
- private List<String> symbolTable;
+ private final List<String> symbolTable;
public static class IterConfig {
- public List<IterInfo> ssiList = new ArrayList<>();
- public Map<String,Map<String,String>> ssio = new HashMap<>();
+ public final List<IterInfo> ssiList = new ArrayList<>();
+ public final Map<String,Map<String,String>> ssio = new HashMap<>();
}
public CompressedIterators() {
diff --git
a/core/src/main/java/org/apache/accumulo/core/clientImpl/ConditionalWriterImpl.java
b/core/src/main/java/org/apache/accumulo/core/clientImpl/ConditionalWriterImpl.java
index a4445d48d7..e25d2781b1 100644
---
a/core/src/main/java/org/apache/accumulo/core/clientImpl/ConditionalWriterImpl.java
+++
b/core/src/main/java/org/apache/accumulo/core/clientImpl/ConditionalWriterImpl.java
@@ -110,18 +110,18 @@ public class ConditionalWriterImpl implements
ConditionalWriter {
private final ConditionalWriterConfig config;
private static class ServerQueue {
- BlockingQueue<TabletServerMutations<QCMutation>> queue = new
LinkedBlockingQueue<>();
+ final BlockingQueue<TabletServerMutations<QCMutation>> queue = new
LinkedBlockingQueue<>();
boolean taskQueued = false;
}
- private Map<String,ServerQueue> serverQueues;
- private DelayQueue<QCMutation> failedMutations = new DelayQueue<>();
- private ScheduledThreadPoolExecutor threadPool;
+ private final Map<String,ServerQueue> serverQueues;
+ private final DelayQueue<QCMutation> failedMutations = new DelayQueue<>();
+ private final ScheduledThreadPoolExecutor threadPool;
private final ScheduledFuture<?> failureTaskFuture;
private class RQIterator implements Iterator<Result> {
- private BlockingQueue<Result> rq;
+ private final BlockingQueue<Result> rq;
private int count;
public RQIterator(BlockingQueue<Result> resultQueue, int count) {
@@ -165,10 +165,10 @@ public class ConditionalWriterImpl implements
ConditionalWriter {
}
private static class QCMutation extends ConditionalMutation implements
Delayed {
- private BlockingQueue<Result> resultQueue;
+ private final BlockingQueue<Result> resultQueue;
private long resetTime;
private long delay = 50;
- private long entryTime;
+ private final long entryTime;
QCMutation(ConditionalMutation cm, BlockingQueue<Result> resultQueue, long
entryTime) {
super(cm);
@@ -224,7 +224,7 @@ public class ConditionalWriterImpl implements
ConditionalWriter {
}
private class CleanupTask implements Runnable {
- private List<SessionID> sessions;
+ private final List<SessionID> sessions;
CleanupTask(List<SessionID> activeSessions) {
this.sessions = activeSessions;
@@ -439,7 +439,7 @@ public class ConditionalWriterImpl implements
ConditionalWriter {
private class SendTask implements Runnable {
- String location;
+ final String location;
public SendTask(String location) {
this.location = location;
@@ -461,8 +461,8 @@ public class ConditionalWriterImpl implements
ConditionalWriter {
private static class CMK {
- QCMutation cm;
- KeyExtent ke;
+ final QCMutation cm;
+ final KeyExtent ke;
public CMK(KeyExtent ke, QCMutation cm) {
this.ke = ke;
@@ -483,7 +483,7 @@ public class ConditionalWriterImpl implements
ConditionalWriter {
}
}
- private HashMap<HostAndPort,SessionID> cachedSessionIDs = new HashMap<>();
+ private final HashMap<HostAndPort,SessionID> cachedSessionIDs = new
HashMap<>();
private SessionID reserveSessionID(HostAndPort location,
TabletIngestClientService.Iface client,
TInfo tinfo) throws ThriftSecurityException, TException {
diff --git
a/core/src/main/java/org/apache/accumulo/core/clientImpl/Credentials.java
b/core/src/main/java/org/apache/accumulo/core/clientImpl/Credentials.java
index eb7dad6b41..73c95452ce 100644
--- a/core/src/main/java/org/apache/accumulo/core/clientImpl/Credentials.java
+++ b/core/src/main/java/org/apache/accumulo/core/clientImpl/Credentials.java
@@ -43,8 +43,8 @@ import
org.apache.accumulo.core.securityImpl.thrift.TCredentials;
*/
public class Credentials {
- private String principal;
- private AuthenticationToken token;
+ private final String principal;
+ private final AuthenticationToken token;
/**
* Creates a new credentials object.
diff --git
a/core/src/main/java/org/apache/accumulo/core/clientImpl/NamespaceOperationsImpl.java
b/core/src/main/java/org/apache/accumulo/core/clientImpl/NamespaceOperationsImpl.java
index 4b4de4adfb..378147bea6 100644
---
a/core/src/main/java/org/apache/accumulo/core/clientImpl/NamespaceOperationsImpl.java
+++
b/core/src/main/java/org/apache/accumulo/core/clientImpl/NamespaceOperationsImpl.java
@@ -68,7 +68,7 @@ import org.slf4j.LoggerFactory;
public class NamespaceOperationsImpl extends NamespaceOperationsHelper {
private final ClientContext context;
- private TableOperationsImpl tableOps;
+ private final TableOperationsImpl tableOps;
private static final Logger log =
LoggerFactory.getLogger(TableOperations.class);
diff --git
a/core/src/main/java/org/apache/accumulo/core/clientImpl/OfflineScanner.java
b/core/src/main/java/org/apache/accumulo/core/clientImpl/OfflineScanner.java
index 536c8a876f..3cef042876 100644
--- a/core/src/main/java/org/apache/accumulo/core/clientImpl/OfflineScanner.java
+++ b/core/src/main/java/org/apache/accumulo/core/clientImpl/OfflineScanner.java
@@ -37,9 +37,9 @@ public class OfflineScanner extends ScannerOptions implements
Scanner {
private int batchSize;
private Range range;
- private ClientContext context;
- private Authorizations authorizations;
- private Text tableId;
+ private final ClientContext context;
+ private final Authorizations authorizations;
+ private final Text tableId;
public OfflineScanner(ClientContext context, TableId tableId, Authorizations
authorizations) {
checkArgument(context != null, "context is null");
diff --git
a/core/src/main/java/org/apache/accumulo/core/clientImpl/ScannerImpl.java
b/core/src/main/java/org/apache/accumulo/core/clientImpl/ScannerImpl.java
index a1f77184ba..048b1626a1 100644
--- a/core/src/main/java/org/apache/accumulo/core/clientImpl/ScannerImpl.java
+++ b/core/src/main/java/org/apache/accumulo/core/clientImpl/ScannerImpl.java
@@ -51,8 +51,8 @@ public class ScannerImpl extends ScannerOptions implements
Scanner {
// and just query for the next highest row from the tablet server
private final ClientContext context;
- private Authorizations authorizations;
- private TableId tableId;
+ private final Authorizations authorizations;
+ private final TableId tableId;
private int size;
@@ -71,7 +71,7 @@ public class ScannerImpl extends ScannerOptions implements
Scanner {
// and does not read all of the data. For this case do not want iterator
tracking to consume too
// much memory. Also it would be best to avoid an RPC storm of close methods
for thousands
// sessions that may have timed out.
- private Map<ScannerIterator,Long> iters = new LinkedHashMap<>(MAX_ENTRIES +
1, .75F, true) {
+ private final Map<ScannerIterator,Long> iters = new
LinkedHashMap<>(MAX_ENTRIES + 1, .75F, true) {
private static final long serialVersionUID = 1L;
// This method is called just after a new entry has been added
diff --git
a/core/src/main/java/org/apache/accumulo/core/clientImpl/ScannerIterator.java
b/core/src/main/java/org/apache/accumulo/core/clientImpl/ScannerIterator.java
index 1f065bbf7e..e258f0fcfa 100644
---
a/core/src/main/java/org/apache/accumulo/core/clientImpl/ScannerIterator.java
+++
b/core/src/main/java/org/apache/accumulo/core/clientImpl/ScannerIterator.java
@@ -49,26 +49,26 @@ import com.google.common.base.Preconditions;
public class ScannerIterator implements Iterator<Entry<Key,Value>> {
// scanner options
- private long timeOut;
+ private final long timeOut;
// scanner state
private Iterator<KeyValue> iter;
private final ScanState scanState;
- private ScannerOptions options;
+ private final ScannerOptions options;
private Future<List<KeyValue>> readAheadOperation;
private boolean finished = false;
private long batchCount = 0;
- private long readaheadThreshold;
+ private final long readaheadThreshold;
- private ScannerImpl.Reporter reporter;
+ private final ScannerImpl.Reporter reporter;
private final ClientContext context;
- private AtomicBoolean closed = new AtomicBoolean(false);
+ private final AtomicBoolean closed = new AtomicBoolean(false);
ScannerIterator(ClientContext context, TableId tableId, Authorizations
authorizations,
Range range, int size, long timeOut, ScannerOptions options, boolean
isolated,
diff --git
a/core/src/main/java/org/apache/accumulo/core/clientImpl/TableOperationsImpl.java
b/core/src/main/java/org/apache/accumulo/core/clientImpl/TableOperationsImpl.java
index b25b8dd219..36de59f9e8 100644
---
a/core/src/main/java/org/apache/accumulo/core/clientImpl/TableOperationsImpl.java
+++
b/core/src/main/java/org/apache/accumulo/core/clientImpl/TableOperationsImpl.java
@@ -1855,7 +1855,7 @@ public class TableOperationsImpl extends
TableOperationsHelper {
private Map<Range,List<TabletId>> groupedByRanges;
private Map<TabletId,List<Range>> groupedByTablets;
- private Map<TabletId,String> tabletLocations;
+ private final Map<TabletId,String> tabletLocations;
public LocationsImpl(Map<String,Map<KeyExtent,List<Range>>> binnedRanges) {
groupedByTablets = new HashMap<>();
diff --git
a/core/src/main/java/org/apache/accumulo/core/clientImpl/TabletServerBatchDeleter.java
b/core/src/main/java/org/apache/accumulo/core/clientImpl/TabletServerBatchDeleter.java
index 13889a6273..02be6e3904 100644
---
a/core/src/main/java/org/apache/accumulo/core/clientImpl/TabletServerBatchDeleter.java
+++
b/core/src/main/java/org/apache/accumulo/core/clientImpl/TabletServerBatchDeleter.java
@@ -37,8 +37,8 @@ import org.apache.accumulo.core.security.ColumnVisibility;
public class TabletServerBatchDeleter extends TabletServerBatchReader
implements BatchDeleter {
private final ClientContext context;
- private TableId tableId;
- private BatchWriterConfig bwConfig;
+ private final TableId tableId;
+ private final BatchWriterConfig bwConfig;
public TabletServerBatchDeleter(ClientContext context, TableId tableId,
String tableName,
Authorizations authorizations, int numQueryThreads, BatchWriterConfig
bwConfig) {
diff --git
a/core/src/main/java/org/apache/accumulo/core/clientImpl/TabletServerBatchReaderIterator.java
b/core/src/main/java/org/apache/accumulo/core/clientImpl/TabletServerBatchReaderIterator.java
index 8cdb8b4c81..e82769b50c 100644
---
a/core/src/main/java/org/apache/accumulo/core/clientImpl/TabletServerBatchReaderIterator.java
+++
b/core/src/main/java/org/apache/accumulo/core/clientImpl/TabletServerBatchReaderIterator.java
@@ -102,7 +102,7 @@ public class TabletServerBatchReaderIterator implements
Iterator<Entry<Key,Value
private final ExecutorService queryThreadPool;
private final ScannerOptions options;
- private ArrayBlockingQueue<List<Entry<Key,Value>>> resultsQueue;
+ private final ArrayBlockingQueue<List<Entry<Key,Value>>> resultsQueue;
private Iterator<Entry<Key,Value>> batchIterator;
private List<Entry<Key,Value>> batch;
private static final List<Entry<Key,Value>> LAST_BATCH = new ArrayList<>();
@@ -112,13 +112,13 @@ public class TabletServerBatchReaderIterator implements
Iterator<Entry<Key,Value
private volatile Throwable fatalException = null;
- private Map<String,TimeoutTracker> timeoutTrackers;
- private Set<String> timedoutServers;
+ private final Map<String,TimeoutTracker> timeoutTrackers;
+ private final Set<String> timedoutServers;
private final long retryTimeout;
- private ClientTabletCache locator;
+ private final ClientTabletCache locator;
- private ScanServerAttemptsImpl scanAttempts = new ScanServerAttemptsImpl();
+ private final ScanServerAttemptsImpl scanAttempts = new
ScanServerAttemptsImpl();
public interface ResultReceiver {
void receive(List<Entry<Key,Value>> entries);
@@ -382,12 +382,12 @@ public class TabletServerBatchReaderIterator implements
Iterator<Entry<Key,Value
private class QueryTask implements Runnable {
- private String tsLocation;
- private Map<KeyExtent,List<Range>> tabletsRanges;
- private ResultReceiver receiver;
+ private final String tsLocation;
+ private final Map<KeyExtent,List<Range>> tabletsRanges;
+ private final ResultReceiver receiver;
private Semaphore semaphore = null;
private final Map<KeyExtent,List<Range>> failures;
- private List<Column> columns;
+ private final List<Column> columns;
private int semaphoreSize;
private final long busyTimeout;
private final ScanServerAttemptReporter reporter;
@@ -801,7 +801,7 @@ public class TabletServerBatchReaderIterator implements
Iterator<Entry<Key,Value
String server;
Set<String> badServers;
- long timeOut;
+ final long timeOut;
long activityTime;
Long firstErrorTime = null;
diff --git
a/core/src/main/java/org/apache/accumulo/core/clientImpl/TabletServerBatchWriter.java
b/core/src/main/java/org/apache/accumulo/core/clientImpl/TabletServerBatchWriter.java
index b6233edb1b..2b17131752 100644
---
a/core/src/main/java/org/apache/accumulo/core/clientImpl/TabletServerBatchWriter.java
+++
b/core/src/main/java/org/apache/accumulo/core/clientImpl/TabletServerBatchWriter.java
@@ -155,13 +155,13 @@ public class TabletServerBatchWriter implements
AutoCloseable {
private long initialCompileTimes;
private double initialSystemLoad;
- private AtomicInteger tabletServersBatchSum = new AtomicInteger(0);
- private AtomicInteger tabletBatchSum = new AtomicInteger(0);
- private AtomicInteger numBatches = new AtomicInteger(0);
- private AtomicInteger maxTabletBatch = new AtomicInteger(Integer.MIN_VALUE);
- private AtomicInteger minTabletBatch = new AtomicInteger(Integer.MAX_VALUE);
- private AtomicInteger minTabletServersBatch = new
AtomicInteger(Integer.MAX_VALUE);
- private AtomicInteger maxTabletServersBatch = new
AtomicInteger(Integer.MIN_VALUE);
+ private final AtomicInteger tabletServersBatchSum = new AtomicInteger(0);
+ private final AtomicInteger tabletBatchSum = new AtomicInteger(0);
+ private final AtomicInteger numBatches = new AtomicInteger(0);
+ private final AtomicInteger maxTabletBatch = new
AtomicInteger(Integer.MIN_VALUE);
+ private final AtomicInteger minTabletBatch = new
AtomicInteger(Integer.MAX_VALUE);
+ private final AtomicInteger minTabletServersBatch = new
AtomicInteger(Integer.MAX_VALUE);
+ private final AtomicInteger maxTabletServersBatch = new
AtomicInteger(Integer.MIN_VALUE);
// error handling
private final Violations violations = new Violations();
diff --git
a/core/src/main/java/org/apache/accumulo/core/clientImpl/TimeoutClientTabletCache.java
b/core/src/main/java/org/apache/accumulo/core/clientImpl/TimeoutClientTabletCache.java
index b9610da386..77c93de7d4 100644
---
a/core/src/main/java/org/apache/accumulo/core/clientImpl/TimeoutClientTabletCache.java
+++
b/core/src/main/java/org/apache/accumulo/core/clientImpl/TimeoutClientTabletCache.java
@@ -40,7 +40,7 @@ import org.apache.hadoop.io.Text;
*/
public class TimeoutClientTabletCache extends SyncingClientTabletCache {
- private long timeout;
+ private final long timeout;
private Long firstFailTime = null;
private void failed() {
diff --git
a/core/src/main/java/org/apache/accumulo/core/clientImpl/bulk/Bulk.java
b/core/src/main/java/org/apache/accumulo/core/clientImpl/bulk/Bulk.java
index 43d2afbb70..622fdb5fb1 100644
--- a/core/src/main/java/org/apache/accumulo/core/clientImpl/bulk/Bulk.java
+++ b/core/src/main/java/org/apache/accumulo/core/clientImpl/bulk/Bulk.java
@@ -38,8 +38,8 @@ public class Bulk {
* WARNING : do not change this class, its used for serialization to Json
*/
public static class Mapping {
- private Tablet tablet;
- private Collection<FileInfo> files;
+ private final Tablet tablet;
+ private final Collection<FileInfo> files;
public Mapping(KeyExtent tablet, Files files) {
this.tablet = toTablet(tablet);
@@ -64,8 +64,8 @@ public class Bulk {
*/
public static class Tablet {
- private byte[] endRow;
- private byte[] prevEndRow;
+ private final byte[] endRow;
+ private final byte[] prevEndRow;
public Tablet(Text endRow, Text prevEndRow) {
this.endRow = endRow == null ? null : TextUtil.getBytes(endRow);
@@ -156,7 +156,7 @@ public class Bulk {
}
public static class Files implements Iterable<FileInfo> {
- Map<String,FileInfo> files = new HashMap<>();
+ final Map<String,FileInfo> files = new HashMap<>();
public Files(Collection<FileInfo> files) {
files.forEach(this::add);
diff --git
a/core/src/main/java/org/apache/accumulo/core/clientImpl/bulk/ConcurrentKeyExtentCache.java
b/core/src/main/java/org/apache/accumulo/core/clientImpl/bulk/ConcurrentKeyExtentCache.java
index e338fe99fa..584aba471b 100644
---
a/core/src/main/java/org/apache/accumulo/core/clientImpl/bulk/ConcurrentKeyExtentCache.java
+++
b/core/src/main/java/org/apache/accumulo/core/clientImpl/bulk/ConcurrentKeyExtentCache.java
@@ -45,19 +45,20 @@ import com.google.common.annotations.VisibleForTesting;
class ConcurrentKeyExtentCache implements KeyExtentCache {
- private static Logger log =
LoggerFactory.getLogger(ConcurrentKeyExtentCache.class);
+ private static final Logger log =
LoggerFactory.getLogger(ConcurrentKeyExtentCache.class);
private static final Text MAX = new Text();
- private Set<Text> rowsToLookup = Collections.synchronizedSet(new
HashSet<>());
+ private final Set<Text> rowsToLookup = Collections.synchronizedSet(new
HashSet<>());
- List<Text> lookupRows = new ArrayList<>();
+ final List<Text> lookupRows = new ArrayList<>();
- private ConcurrentSkipListMap<Text,KeyExtent> extents = new
ConcurrentSkipListMap<>((t1, t2) -> {
- return (t1 == t2) ? 0 : (t1 == MAX ? 1 : (t2 == MAX ? -1 :
t1.compareTo(t2)));
- });
- private TableId tableId;
- private ClientContext ctx;
+ private final ConcurrentSkipListMap<Text,KeyExtent> extents =
+ new ConcurrentSkipListMap<>((t1, t2) -> {
+ return (t1 == t2) ? 0 : (t1 == MAX ? 1 : (t2 == MAX ? -1 :
t1.compareTo(t2)));
+ });
+ private final TableId tableId;
+ private final ClientContext ctx;
ConcurrentKeyExtentCache(TableId tableId, ClientContext ctx) {
this.tableId = tableId;
diff --git
a/core/src/main/java/org/apache/accumulo/core/clientImpl/lexicoder/FixedByteArrayOutputStream.java
b/core/src/main/java/org/apache/accumulo/core/clientImpl/lexicoder/FixedByteArrayOutputStream.java
index 5fac123390..477b31ccc6 100644
---
a/core/src/main/java/org/apache/accumulo/core/clientImpl/lexicoder/FixedByteArrayOutputStream.java
+++
b/core/src/main/java/org/apache/accumulo/core/clientImpl/lexicoder/FixedByteArrayOutputStream.java
@@ -27,7 +27,7 @@ import java.io.OutputStream;
public class FixedByteArrayOutputStream extends OutputStream {
private int i;
- byte[] out;
+ final byte[] out;
public FixedByteArrayOutputStream(byte[] out) {
this.out = out;
diff --git
a/core/src/main/java/org/apache/accumulo/core/compaction/CompactionSettings.java
b/core/src/main/java/org/apache/accumulo/core/compaction/CompactionSettings.java
index dc728b14d0..1f985d4ed1 100644
---
a/core/src/main/java/org/apache/accumulo/core/compaction/CompactionSettings.java
+++
b/core/src/main/java/org/apache/accumulo/core/compaction/CompactionSettings.java
@@ -36,8 +36,8 @@ public enum CompactionSettings {
OUTPUT_INDEX_BLOCK_SIZE_OPT(new SizeType(), false),
OUTPUT_REPLICATION_OPT(new UIntType(), false);
- private Type type;
- private boolean selectorOpt;
+ private final Type type;
+ private final boolean selectorOpt;
private CompactionSettings(Type type, boolean selectorOpt) {
this.type = type;
diff --git
a/core/src/main/java/org/apache/accumulo/core/conf/AccumuloConfiguration.java
b/core/src/main/java/org/apache/accumulo/core/conf/AccumuloConfiguration.java
index 5dc3a29c2c..c1ec5a72e9 100644
---
a/core/src/main/java/org/apache/accumulo/core/conf/AccumuloConfiguration.java
+++
b/core/src/main/java/org/apache/accumulo/core/conf/AccumuloConfiguration.java
@@ -433,8 +433,8 @@ public abstract class AccumuloConfiguration implements
Iterable<Entry<String,Str
public abstract boolean isPropertySet(Property prop);
private static class RefCount<T> {
- T obj;
- long count;
+ final T obj;
+ final long count;
RefCount(long c, T r) {
this.count = c;
diff --git
a/core/src/main/java/org/apache/accumulo/core/conf/ConfigCheckUtil.java
b/core/src/main/java/org/apache/accumulo/core/conf/ConfigCheckUtil.java
index fcb255c770..295dbf35b0 100644
--- a/core/src/main/java/org/apache/accumulo/core/conf/ConfigCheckUtil.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/ConfigCheckUtil.java
@@ -95,7 +95,8 @@ public class ConfigCheckUtil {
}
private static class CheckTimeDurationBetween implements CheckTimeDuration {
- long min, max;
+ final long min;
+ final long max;
CheckTimeDurationBetween(long x, long y) {
min = Math.min(x, y);
diff --git
a/core/src/main/java/org/apache/accumulo/core/conf/ConfigurationDocGen.java
b/core/src/main/java/org/apache/accumulo/core/conf/ConfigurationDocGen.java
index dc5320e93e..438bf21146 100644
--- a/core/src/main/java/org/apache/accumulo/core/conf/ConfigurationDocGen.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/ConfigurationDocGen.java
@@ -29,7 +29,7 @@ import java.util.TreeMap;
* presentable form.
*/
public class ConfigurationDocGen {
- private PrintStream doc;
+ private final PrintStream doc;
private final TreeMap<String,Property> sortedProps = new TreeMap<>();
void generate() {
diff --git
a/core/src/main/java/org/apache/accumulo/core/conf/ConfigurationTypeHelper.java
b/core/src/main/java/org/apache/accumulo/core/conf/ConfigurationTypeHelper.java
index 4637e5ac36..cf7b9deb48 100644
---
a/core/src/main/java/org/apache/accumulo/core/conf/ConfigurationTypeHelper.java
+++
b/core/src/main/java/org/apache/accumulo/core/conf/ConfigurationTypeHelper.java
@@ -154,7 +154,7 @@ public class ConfigurationTypeHelper {
}
// This is not a cache for loaded classes, just a way to avoid spamming the
debug log
- private static Map<String,Class<?>> loaded = Collections.synchronizedMap(new
HashMap<>());
+ private static final Map<String,Class<?>> loaded =
Collections.synchronizedMap(new HashMap<>());
/**
* Loads a class in the given classloader context, suppressing any
exceptions, and optionally
diff --git
a/core/src/main/java/org/apache/accumulo/core/constraints/Violations.java
b/core/src/main/java/org/apache/accumulo/core/constraints/Violations.java
index e2711ee8f6..9592f7b817 100644
--- a/core/src/main/java/org/apache/accumulo/core/constraints/Violations.java
+++ b/core/src/main/java/org/apache/accumulo/core/constraints/Violations.java
@@ -62,7 +62,7 @@ public class Violations {
public static final Violations EMPTY = new
Violations(Collections.emptyMap());
- private Map<CVSKey,ConstraintViolationSummary> cvsmap;
+ private final Map<CVSKey,ConstraintViolationSummary> cvsmap;
/**
* Creates a new empty object.
diff --git a/core/src/main/java/org/apache/accumulo/core/data/ColumnUpdate.java
b/core/src/main/java/org/apache/accumulo/core/data/ColumnUpdate.java
index a311b6fbf5..8255fc8244 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/ColumnUpdate.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/ColumnUpdate.java
@@ -25,13 +25,13 @@ import java.util.Arrays;
*/
public class ColumnUpdate {
- private byte[] columnFamily;
- private byte[] columnQualifier;
- private byte[] columnVisibility;
- private long timestamp;
- private boolean hasTimestamp;
- private byte[] val;
- private boolean deleted;
+ private final byte[] columnFamily;
+ private final byte[] columnQualifier;
+ private final byte[] columnVisibility;
+ private final long timestamp;
+ private final boolean hasTimestamp;
+ private final byte[] val;
+ private final boolean deleted;
/**
* Creates a new column update.
diff --git a/core/src/main/java/org/apache/accumulo/core/data/Condition.java
b/core/src/main/java/org/apache/accumulo/core/data/Condition.java
index dab5ee24e5..817c1666e9 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/Condition.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/Condition.java
@@ -36,8 +36,8 @@ import org.apache.hadoop.io.Text;
*/
public class Condition {
- private ByteSequence cf;
- private ByteSequence cq;
+ private final ByteSequence cf;
+ private final ByteSequence cq;
private ByteSequence cv;
private ByteSequence val;
private Long ts;
diff --git
a/core/src/main/java/org/apache/accumulo/core/data/ConstraintViolationSummary.java
b/core/src/main/java/org/apache/accumulo/core/data/ConstraintViolationSummary.java
index 44a988f0f5..960ebf0198 100644
---
a/core/src/main/java/org/apache/accumulo/core/data/ConstraintViolationSummary.java
+++
b/core/src/main/java/org/apache/accumulo/core/data/ConstraintViolationSummary.java
@@ -28,9 +28,9 @@ import
org.apache.accumulo.core.dataImpl.thrift.TConstraintViolationSummary;
public class ConstraintViolationSummary implements Serializable {
private static final long serialVersionUID = 1L;
- public String constrainClass;
- public short violationCode;
- public String violationDescription;
+ public final String constrainClass;
+ public final short violationCode;
+ public final String violationDescription;
public long numberOfViolatingMutations;
/**
diff --git a/core/src/main/java/org/apache/accumulo/core/data/PartialKey.java
b/core/src/main/java/org/apache/accumulo/core/data/PartialKey.java
index f5ff0ae08c..861a380a77 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/PartialKey.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/PartialKey.java
@@ -30,7 +30,7 @@ public enum PartialKey {
// everything with delete flag
ROW_COLFAM_COLQUAL_COLVIS_TIME_DEL(6);
- int depth;
+ final int depth;
private PartialKey(int depth) {
this.depth = depth;
diff --git a/core/src/main/java/org/apache/accumulo/core/data/Value.java
b/core/src/main/java/org/apache/accumulo/core/data/Value.java
index 1acd34fbda..6c62a3ed53 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/Value.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/Value.java
@@ -245,7 +245,7 @@ public class Value implements WritableComparable<Object> {
* A Comparator optimized for Value.
*/
public static class Comparator extends WritableComparator {
- private BytesWritable.Comparator comparator = new
BytesWritable.Comparator();
+ private final BytesWritable.Comparator comparator = new
BytesWritable.Comparator();
/** constructor */
public Comparator() {
diff --git
a/core/src/main/java/org/apache/accumulo/core/dataImpl/ComparableBytes.java
b/core/src/main/java/org/apache/accumulo/core/dataImpl/ComparableBytes.java
index de4457bb18..c9044714c6 100644
--- a/core/src/main/java/org/apache/accumulo/core/dataImpl/ComparableBytes.java
+++ b/core/src/main/java/org/apache/accumulo/core/dataImpl/ComparableBytes.java
@@ -25,7 +25,7 @@ import org.apache.hadoop.io.BinaryComparable;
*/
public class ComparableBytes extends BinaryComparable {
- public byte[] data;
+ public final byte[] data;
/**
* Creates a new byte wrapper. The given byte array is used directly as a
backing array, so later
diff --git
a/core/src/main/java/org/apache/accumulo/core/fate/zookeeper/DistributedReadWriteLock.java
b/core/src/main/java/org/apache/accumulo/core/fate/zookeeper/DistributedReadWriteLock.java
index 0bf4af19c7..28ff670e3a 100644
---
a/core/src/main/java/org/apache/accumulo/core/fate/zookeeper/DistributedReadWriteLock.java
+++
b/core/src/main/java/org/apache/accumulo/core/fate/zookeeper/DistributedReadWriteLock.java
@@ -113,8 +113,8 @@ public class DistributedReadWriteLock implements
java.util.concurrent.locks.Read
static class ReadLock implements DistributedLock {
- QueueLock qlock;
- byte[] userData;
+ final QueueLock qlock;
+ final byte[] userData;
long entry = -1;
ReadLock(QueueLock qlock, byte[] userData) {
@@ -241,8 +241,8 @@ public class DistributedReadWriteLock implements
java.util.concurrent.locks.Read
}
}
- private QueueLock qlock;
- private byte[] data;
+ private final QueueLock qlock;
+ private final byte[] data;
public DistributedReadWriteLock(QueueLock qlock, byte[] data) {
this.qlock = qlock;
diff --git
a/core/src/main/java/org/apache/accumulo/core/fate/zookeeper/ZooCacheFactory.java
b/core/src/main/java/org/apache/accumulo/core/fate/zookeeper/ZooCacheFactory.java
index e30c942114..2e1987af34 100644
---
a/core/src/main/java/org/apache/accumulo/core/fate/zookeeper/ZooCacheFactory.java
+++
b/core/src/main/java/org/apache/accumulo/core/fate/zookeeper/ZooCacheFactory.java
@@ -36,7 +36,7 @@ import org.apache.accumulo.core.singletons.SingletonService;
*/
public class ZooCacheFactory {
- private static Map<String,ZooCache> instances = new HashMap<>();
+ private static final Map<String,ZooCache> instances = new HashMap<>();
private static boolean enabled = true;
public ZooCacheFactory() {}
diff --git
a/core/src/main/java/org/apache/accumulo/core/fate/zookeeper/ZooSession.java
b/core/src/main/java/org/apache/accumulo/core/fate/zookeeper/ZooSession.java
index 91085f27cc..0e4a1a8c1d 100644
--- a/core/src/main/java/org/apache/accumulo/core/fate/zookeeper/ZooSession.java
+++ b/core/src/main/java/org/apache/accumulo/core/fate/zookeeper/ZooSession.java
@@ -58,7 +58,7 @@ public class ZooSession {
this.zooKeeper = zooKeeper;
}
- ZooKeeper zooKeeper;
+ final ZooKeeper zooKeeper;
}
private static Map<String,ZooSessionInfo> sessions = new HashMap<>();
diff --git
a/core/src/main/java/org/apache/accumulo/core/file/BloomFilterLayer.java
b/core/src/main/java/org/apache/accumulo/core/file/BloomFilterLayer.java
index 2cdd3f213e..f06f3929f4 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/BloomFilterLayer.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/BloomFilterLayer.java
@@ -93,7 +93,7 @@ public class BloomFilterLayer {
private int numKeys;
private int vectorSize;
- private FileSKVWriter writer;
+ private final FileSKVWriter writer;
private KeyFunctor transformer = null;
private boolean closed = false;
private long length = -1;
@@ -205,7 +205,7 @@ public class BloomFilterLayer {
private volatile DynamicBloomFilter bloomFilter;
private int loadRequest = 0;
private int loadThreshold = 1;
- private int maxLoadThreads;
+ private final int maxLoadThreads;
private Runnable loadTask;
private volatile KeyFunctor transformer = null;
private volatile boolean closed = false;
@@ -349,8 +349,8 @@ public class BloomFilterLayer {
public static class Reader implements FileSKVIterator {
- private BloomFilterLoader bfl;
- private FileSKVIterator reader;
+ private final BloomFilterLoader bfl;
+ private final FileSKVIterator reader;
public Reader(FileSKVIterator reader, AccumuloConfiguration acuconf) {
this.reader = reader;
diff --git a/core/src/main/java/org/apache/accumulo/core/file/FilePrefix.java
b/core/src/main/java/org/apache/accumulo/core/file/FilePrefix.java
index febec86ae4..92522f7a58 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/FilePrefix.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/FilePrefix.java
@@ -24,7 +24,7 @@ public enum FilePrefix {
BULK_IMPORT("I"), MINOR_COMPACTION("F"), MAJOR_COMPACTION("C"),
MAJOR_COMPACTION_ALL_FILES("A");
- String prefix;
+ final String prefix;
FilePrefix(String prefix) {
this.prefix = prefix;
diff --git
a/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/lru/LruBlockCache.java
b/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/lru/LruBlockCache.java
index 7a85da767f..eff9b834d2 100644
---
a/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/lru/LruBlockCache.java
+++
b/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/lru/LruBlockCache.java
@@ -556,7 +556,7 @@ public class LruBlockCache extends
SynchronousLoadingBlockCache implements Block
* Statistics thread. Periodically prints the cache statistics to the log.
*/
private static class StatisticsThread extends AccumuloDaemonThread {
- LruBlockCache lru;
+ final LruBlockCache lru;
public StatisticsThread(LruBlockCache lru) {
super("LruBlockCache.StatisticsThread");
diff --git
a/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/lru/LruBlockCacheConfiguration.java
b/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/lru/LruBlockCacheConfiguration.java
index 0ce59c993b..e68d21d454 100644
---
a/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/lru/LruBlockCacheConfiguration.java
+++
b/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/lru/LruBlockCacheConfiguration.java
@@ -157,8 +157,8 @@ public final class LruBlockCacheConfiguration {
}
public static class Builder {
- private Map<String,String> props = new HashMap<>();
- private String prefix;
+ private final Map<String,String> props = new HashMap<>();
+ private final String prefix;
private Builder(String prefix) {
this.prefix = prefix;
diff --git
a/core/src/main/java/org/apache/accumulo/core/file/blockfile/impl/CachableBlockFile.java
b/core/src/main/java/org/apache/accumulo/core/file/blockfile/impl/CachableBlockFile.java
index 8bedcef04e..32deb697a4 100644
---
a/core/src/main/java/org/apache/accumulo/core/file/blockfile/impl/CachableBlockFile.java
+++
b/core/src/main/java/org/apache/accumulo/core/file/blockfile/impl/CachableBlockFile.java
@@ -241,9 +241,9 @@ public class CachableBlockFile {
}
private class RawBlockLoader extends BaseBlockLoader {
- private long offset;
- private long compressedSize;
- private long rawSize;
+ private final long offset;
+ private final long compressedSize;
+ private final long rawSize;
private RawBlockLoader(long offset, long compressedSize, long rawSize,
boolean loadingMeta) {
super(loadingMeta);
@@ -267,7 +267,7 @@ public class CachableBlockFile {
}
private class OffsetBlockLoader extends BaseBlockLoader {
- private int blockIndex;
+ private final int blockIndex;
private OffsetBlockLoader(int blockIndex, boolean loadingMeta) {
super(loadingMeta);
@@ -289,7 +289,7 @@ public class CachableBlockFile {
}
private class MetaBlockLoader extends BaseBlockLoader {
- String blockName;
+ final String blockName;
MetaBlockLoader(String blockName) {
super(true);
@@ -316,7 +316,7 @@ public class CachableBlockFile {
abstract String getBlockId();
- private boolean loadingMetaBlock;
+ private final boolean loadingMetaBlock;
public BaseBlockLoader(boolean loadingMetaBlock) {
this.loadingMetaBlock = loadingMetaBlock;
@@ -489,9 +489,9 @@ public class CachableBlockFile {
}
public static class CachedBlockRead extends DataInputStream {
- private SeekableByteArrayInputStream seekableInput;
+ private final SeekableByteArrayInputStream seekableInput;
private final CacheEntry cb;
- boolean indexable;
+ final boolean indexable;
public CachedBlockRead(InputStream in) {
super(in);
diff --git
a/core/src/main/java/org/apache/accumulo/core/file/blockfile/impl/OpportunisticBlockCache.java
b/core/src/main/java/org/apache/accumulo/core/file/blockfile/impl/OpportunisticBlockCache.java
index 70bde7877e..b146176730 100644
---
a/core/src/main/java/org/apache/accumulo/core/file/blockfile/impl/OpportunisticBlockCache.java
+++
b/core/src/main/java/org/apache/accumulo/core/file/blockfile/impl/OpportunisticBlockCache.java
@@ -23,7 +23,7 @@ import org.apache.accumulo.core.spi.cache.CacheEntry;
public class OpportunisticBlockCache implements BlockCache {
- private BlockCache cache;
+ private final BlockCache cache;
public OpportunisticBlockCache(BlockCache cache) {
this.cache = cache;
diff --git
a/core/src/main/java/org/apache/accumulo/core/file/rfile/BlockIndex.java
b/core/src/main/java/org/apache/accumulo/core/file/rfile/BlockIndex.java
index d22c3b71a0..a2ae4049d1 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/rfile/BlockIndex.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/rfile/BlockIndex.java
@@ -62,12 +62,12 @@ public class BlockIndex implements Weighable {
return ((x > 0) && (x & (x - 1)) == 0);
}
- private AtomicInteger accessCount = new AtomicInteger(0);
+ private final AtomicInteger accessCount = new AtomicInteger(0);
private volatile BlockIndexEntry[] blockIndex = null;
public static class BlockIndexEntry implements Comparable<BlockIndexEntry> {
- private Key prevKey;
+ private final Key prevKey;
private int entriesLeft;
private int pos;
diff --git
a/core/src/main/java/org/apache/accumulo/core/file/rfile/IndexIterator.java
b/core/src/main/java/org/apache/accumulo/core/file/rfile/IndexIterator.java
index 11177ff61f..9e7b377b5c 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/rfile/IndexIterator.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/rfile/IndexIterator.java
@@ -34,7 +34,7 @@ import
org.apache.accumulo.core.iterators.SortedKeyValueIterator;
class IndexIterator implements SortedKeyValueIterator<Key,Value> {
private Key key;
- private Iterator<IndexEntry> indexIter;
+ private final Iterator<IndexEntry> indexIter;
IndexIterator(Iterator<IndexEntry> indexIter) {
this.indexIter = indexIter;
diff --git
a/core/src/main/java/org/apache/accumulo/core/file/rfile/MultiIndexIterator.java
b/core/src/main/java/org/apache/accumulo/core/file/rfile/MultiIndexIterator.java
index 4fb360079a..480da09348 100644
---
a/core/src/main/java/org/apache/accumulo/core/file/rfile/MultiIndexIterator.java
+++
b/core/src/main/java/org/apache/accumulo/core/file/rfile/MultiIndexIterator.java
@@ -42,7 +42,7 @@ import org.apache.hadoop.io.Text;
class MultiIndexIterator extends HeapIterator implements FileSKVIterator {
- private RFile.Reader source;
+ private final RFile.Reader source;
MultiIndexIterator(RFile.Reader source, List<Iterator<IndexEntry>> indexes) {
super(indexes.size());
diff --git
a/core/src/main/java/org/apache/accumulo/core/file/rfile/MultiLevelIndex.java
b/core/src/main/java/org/apache/accumulo/core/file/rfile/MultiLevelIndex.java
index 0760e0fa0f..2909669bea 100644
---
a/core/src/main/java/org/apache/accumulo/core/file/rfile/MultiLevelIndex.java
+++
b/core/src/main/java/org/apache/accumulo/core/file/rfile/MultiLevelIndex.java
@@ -53,7 +53,7 @@ public class MultiLevelIndex {
private long offset;
private long compressedSize;
private long rawSize;
- private boolean newFormat;
+ private final boolean newFormat;
IndexEntry(Key k, int e, long offset, long compressedSize, long rawSize) {
this.key = k;
@@ -140,8 +140,8 @@ public class MultiLevelIndex {
protected int[] offsets;
protected byte[] data;
- protected SeekableByteArrayInputStream sbais;
- protected DataInputStream dis;
+ protected final SeekableByteArrayInputStream sbais;
+ protected final DataInputStream dis;
protected int offsetsOffset;
protected int indexOffset;
protected int numOffsets;
@@ -209,7 +209,7 @@ public class MultiLevelIndex {
// a list that deserializes index entries on demand
private static class SerializedIndex extends SerializedIndexBase<IndexEntry>
{
- private boolean newFormat;
+ private final boolean newFormat;
SerializedIndex(int[] offsets, byte[] data, boolean newFormat) {
super(offsets, data);
@@ -452,7 +452,7 @@ public class MultiLevelIndex {
*/
public static class BufferedWriter {
- private Writer writer;
+ private final Writer writer;
private DataOutputStream buffer;
private int buffered;
private ByteArrayOutputStream baos;
@@ -504,15 +504,15 @@ public class MultiLevelIndex {
}
public static class Writer {
- private int threshold;
+ private final int threshold;
- private ArrayList<IndexBlock> levels;
+ private final ArrayList<IndexBlock> levels;
private int totalAdded;
private boolean addedLast = false;
- private BCFile.Writer blockFileWriter;
+ private final BCFile.Writer blockFileWriter;
Writer(BCFile.Writer blockFileWriter, int maxBlockSize) {
this.blockFileWriter = blockFileWriter;
@@ -593,14 +593,14 @@ public class MultiLevelIndex {
public static class Reader {
private IndexBlock rootBlock;
- private CachableBlockFile.Reader blockStore;
- private int version;
+ private final CachableBlockFile.Reader blockStore;
+ private final int version;
private int size;
public class Node {
- private Node parent;
- private IndexBlock indexBlock;
+ private final Node parent;
+ private final IndexBlock indexBlock;
private int currentPos;
Node(Node parent, IndexBlock iBlock) {
diff --git a/core/src/main/java/org/apache/accumulo/core/file/rfile/RFile.java
b/core/src/main/java/org/apache/accumulo/core/file/rfile/RFile.java
index dfa164e9b5..f0e05ae0a1 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/rfile/RFile.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/rfile/RFile.java
@@ -376,8 +376,8 @@ public class RFile {
}
private static class SampleEntry {
- Key key;
- Value val;
+ final Key key;
+ final Value val;
SampleEntry(Key key, Value val) {
this.key = new Key(key);
@@ -387,12 +387,12 @@ public class RFile {
private static class SampleLocalityGroupWriter {
- private Sampler sampler;
+ private final Sampler sampler;
- private List<SampleEntry> entries = new ArrayList<>();
+ private final List<SampleEntry> entries = new ArrayList<>();
private long dataSize = 0;
- private LocalityGroupWriter lgw;
+ private final LocalityGroupWriter lgw;
public SampleLocalityGroupWriter(LocalityGroupWriter lgw, Sampler sampler)
{
this.lgw = lgw;
@@ -436,7 +436,7 @@ public class RFile {
private static class LocalityGroupWriter {
- private BCFile.Writer fileWriter;
+ private final BCFile.Writer fileWriter;
private BlockAppender blockWriter;
private final long blockSize;
@@ -449,10 +449,10 @@ public class RFile {
private Key prevKey = new Key();
- private SampleLocalityGroupWriter sample;
+ private final SampleLocalityGroupWriter sample;
// Use windowed stats to fix ACCUMULO-4669
- private RollingStats keyLenStats = new RollingStats(2017);
+ private final RollingStats keyLenStats = new RollingStats(2017);
private double averageKeySize = 0;
LocalityGroupWriter(BCFile.Writer fileWriter, long blockSize, long
maxBlockSize,
@@ -568,14 +568,14 @@ public class RFile {
public static final int MAX_CF_IN_DLG = 1000;
private static final double MAX_BLOCK_MULTIPLIER = 1.1;
- private BCFile.Writer fileWriter;
+ private final BCFile.Writer fileWriter;
private final long blockSize;
private final long maxBlockSize;
private final int indexBlockSize;
- private ArrayList<LocalityGroupMetadata> localityGroups = new
ArrayList<>();
- private ArrayList<LocalityGroupMetadata> sampleGroups = new ArrayList<>();
+ private final ArrayList<LocalityGroupMetadata> localityGroups = new
ArrayList<>();
+ private final ArrayList<LocalityGroupMetadata> sampleGroups = new
ArrayList<>();
private LocalityGroupMetadata currentLocalityGroup = null;
private LocalityGroupMetadata sampleLocalityGroup = null;
@@ -583,13 +583,13 @@ public class RFile {
private boolean closed = false;
private boolean startedDefaultLocalityGroup = false;
- private HashSet<ByteSequence> previousColumnFamilies;
+ private final HashSet<ByteSequence> previousColumnFamilies;
private long length = -1;
private LocalityGroupWriter lgWriter;
- private SamplerConfigurationImpl samplerConfig;
- private Sampler sampler;
+ private final SamplerConfigurationImpl samplerConfig;
+ private final Sampler sampler;
public Writer(BCFile.Writer bfw, int blockSize) throws IOException {
this(bfw, blockSize, (int) DefaultConfiguration.getInstance()
@@ -762,13 +762,13 @@ public class RFile {
private static class LocalityGroupReader extends LocalityGroup implements
FileSKVIterator {
- private CachableBlockFile.Reader reader;
- private MultiLevelIndex.Reader index;
- private int blockCount;
- private Key firstKey;
- private int startBlock;
+ private final CachableBlockFile.Reader reader;
+ private final MultiLevelIndex.Reader index;
+ private final int blockCount;
+ private final Key firstKey;
+ private final int startBlock;
private boolean closed = false;
- private int version;
+ private final int version;
private boolean checkRange = true;
private LocalityGroupReader(CachableBlockFile.Reader reader,
LocalityGroupMetadata lgm,
diff --git
a/core/src/main/java/org/apache/accumulo/core/file/rfile/RelativeKey.java
b/core/src/main/java/org/apache/accumulo/core/file/rfile/RelativeKey.java
index 7340ece246..f1846d0233 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/rfile/RelativeKey.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/rfile/RelativeKey.java
@@ -204,9 +204,9 @@ public class RelativeKey implements Writable {
}
public static class SkippR {
- RelativeKey rk;
- int skipped;
- Key prevKey;
+ final RelativeKey rk;
+ final int skipped;
+ final Key prevKey;
SkippR(RelativeKey rk, int skipped, Key prevKey) {
this.rk = rk;
diff --git
a/core/src/main/java/org/apache/accumulo/core/file/rfile/RollingStats.java
b/core/src/main/java/org/apache/accumulo/core/file/rfile/RollingStats.java
index ab7f9ac371..1e4706adeb 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/rfile/RollingStats.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/rfile/RollingStats.java
@@ -34,7 +34,7 @@ import org.apache.commons.math3.util.FastMath;
*/
class RollingStats {
private int position;
- private double[] window;
+ private final double[] window;
private double average;
private double variance;
diff --git
a/core/src/main/java/org/apache/accumulo/core/file/rfile/VisMetricsGatherer.java
b/core/src/main/java/org/apache/accumulo/core/file/rfile/VisMetricsGatherer.java
index a31a9eb593..adb06717d3 100644
---
a/core/src/main/java/org/apache/accumulo/core/file/rfile/VisMetricsGatherer.java
+++
b/core/src/main/java/org/apache/accumulo/core/file/rfile/VisMetricsGatherer.java
@@ -48,12 +48,12 @@ public class VisMetricsGatherer
implements MetricsGatherer<Map<String,ArrayList<VisibilityMetric>>> {
private static final String KEY_HASH_ALGORITHM = "SHA-256";
- protected Map<String,AtomicLongMap<String>> metric;
- protected Map<String,AtomicLongMap<String>> blocks;
- protected ArrayList<Long> numEntries;
- protected ArrayList<Integer> numBlocks;
- private ArrayList<String> inBlock;
- protected ArrayList<String> localityGroups;
+ protected final Map<String,AtomicLongMap<String>> metric;
+ protected final Map<String,AtomicLongMap<String>> blocks;
+ protected final ArrayList<Long> numEntries;
+ protected final ArrayList<Integer> numBlocks;
+ private final ArrayList<String> inBlock;
+ protected final ArrayList<String> localityGroups;
private int numLG;
private Map<String,ArrayList<ByteSequence>> localityGroupCF;
diff --git
a/core/src/main/java/org/apache/accumulo/core/file/rfile/VisibilityMetric.java
b/core/src/main/java/org/apache/accumulo/core/file/rfile/VisibilityMetric.java
index 5752986576..d0081d215f 100644
---
a/core/src/main/java/org/apache/accumulo/core/file/rfile/VisibilityMetric.java
+++
b/core/src/main/java/org/apache/accumulo/core/file/rfile/VisibilityMetric.java
@@ -26,9 +26,11 @@ package org.apache.accumulo.core.file.rfile;
*/
public class VisibilityMetric {
- private long visLG, visBlock;
- private double visLGPer, visBlockPer;
- private String visibility;
+ private final long visLG;
+ private final long visBlock;
+ private final double visLGPer;
+ private final double visBlockPer;
+ private final String visibility;
public VisibilityMetric(String visibility, long visLG, double visLGPer, long
visBlock,
double visBlockPer) {
diff --git
a/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/CompressionAlgorithm.java
b/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/CompressionAlgorithm.java
index 4c7b8192a6..a184d9c610 100644
---
a/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/CompressionAlgorithm.java
+++
b/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/CompressionAlgorithm.java
@@ -111,9 +111,10 @@ public class CompressionAlgorithm extends Configured {
/**
* Guava cache to have a limited factory pattern defined in the Algorithm
enum.
*/
- private static
LoadingCache<Entry<CompressionAlgorithm,Integer>,CompressionCodec> codecCache =
- Caches.getInstance().createNewBuilder(CacheName.COMPRESSION_ALGORITHM,
false).maximumSize(25)
- .build(key -> key.getKey().createNewCodec(key.getValue()));
+ private static final LoadingCache<Entry<CompressionAlgorithm,Integer>,
+ CompressionCodec> codecCache =
+
Caches.getInstance().createNewBuilder(CacheName.COMPRESSION_ALGORITHM, false)
+ .maximumSize(25).build(key ->
key.getKey().createNewCodec(key.getValue()));
// Data input buffer size to absorb small reads from application.
protected static final int DATA_IBUF_SIZE = 1024;
diff --git
a/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/SimpleBufferedOutputStream.java
b/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/SimpleBufferedOutputStream.java
index 87e96a602d..4696fb7897 100644
---
a/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/SimpleBufferedOutputStream.java
+++
b/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/SimpleBufferedOutputStream.java
@@ -27,7 +27,7 @@ import java.io.OutputStream;
* been buffered.
*/
class SimpleBufferedOutputStream extends FilterOutputStream {
- protected byte[] buf; // the borrowed buffer
+ protected final byte[] buf; // the borrowed buffer
protected int count = 0; // bytes used in buffer.
// Constructor
diff --git
a/core/src/main/java/org/apache/accumulo/core/iterators/Combiner.java
b/core/src/main/java/org/apache/accumulo/core/iterators/Combiner.java
index e5da445e10..775c7803a0 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/Combiner.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/Combiner.java
@@ -95,8 +95,8 @@ public abstract class Combiner extends WrappingIterator
implements OptionDescrib
* SortedKeyValueIterator.
*/
public static class ValueIterator implements Iterator<Value> {
- Key topKey;
- SortedKeyValueIterator<Key,Value> source;
+ final Key topKey;
+ final SortedKeyValueIterator<Key,Value> source;
boolean hasNext;
/**
@@ -183,7 +183,7 @@ public abstract class Combiner extends WrappingIterator
implements OptionDescrib
findTop();
}
- private Key workKey = new Key();
+ private final Key workKey = new Key();
@VisibleForTesting
static final Cache<String,Boolean> loggedMsgCache =
diff --git
a/core/src/main/java/org/apache/accumulo/core/iterators/IteratorAdapter.java
b/core/src/main/java/org/apache/accumulo/core/iterators/IteratorAdapter.java
index 4674028ac9..cda923a5f0 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/IteratorAdapter.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/IteratorAdapter.java
@@ -29,7 +29,7 @@ import org.apache.accumulo.core.data.Value;
public class IteratorAdapter implements Iterator<Entry<Key,Value>> {
- SortedKeyValueIterator<Key,Value> inner;
+ final SortedKeyValueIterator<Key,Value> inner;
public IteratorAdapter(SortedKeyValueIterator<Key,Value> inner) {
this.inner = inner;
diff --git
a/core/src/main/java/org/apache/accumulo/core/iterators/OrIterator.java
b/core/src/main/java/org/apache/accumulo/core/iterators/OrIterator.java
index d0e2cb605b..aa4ee5cfa9 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/OrIterator.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/OrIterator.java
@@ -85,7 +85,7 @@ public class OrIterator implements
SortedKeyValueIterator<Key,Value>, OptionDesc
private TermSource currentTerm;
private List<TermSource> sources;
- private PriorityQueue<TermSource> sorted = new PriorityQueue<>(5);
+ private final PriorityQueue<TermSource> sorted = new PriorityQueue<>(5);
protected static class TermSource implements Comparable<TermSource> {
private final SortedKeyValueIterator<Key,Value> iter;
diff --git
a/core/src/main/java/org/apache/accumulo/core/iterators/TypedValueCombiner.java
b/core/src/main/java/org/apache/accumulo/core/iterators/TypedValueCombiner.java
index ce554fe347..12656720a8 100644
---
a/core/src/main/java/org/apache/accumulo/core/iterators/TypedValueCombiner.java
+++
b/core/src/main/java/org/apache/accumulo/core/iterators/TypedValueCombiner.java
@@ -53,9 +53,9 @@ public abstract class TypedValueCombiner<V> extends Combiner {
* decode method of an Encoder.
*/
private static class VIterator<V> implements Iterator<V> {
- private Iterator<Value> source;
- private Encoder<V> encoder;
- private boolean lossy;
+ private final Iterator<Value> source;
+ private final Encoder<V> encoder;
+ private final boolean lossy;
/**
* Constructs an {@code Iterator<V>} from an {@code Iterator<Value>}
diff --git
a/core/src/main/java/org/apache/accumulo/core/iterators/user/CfCqSliceOpts.java
b/core/src/main/java/org/apache/accumulo/core/iterators/user/CfCqSliceOpts.java
index 7b9e1de4c1..d21e6f6e4d 100644
---
a/core/src/main/java/org/apache/accumulo/core/iterators/user/CfCqSliceOpts.java
+++
b/core/src/main/java/org/apache/accumulo/core/iterators/user/CfCqSliceOpts.java
@@ -62,14 +62,14 @@ public class CfCqSliceOpts {
+ " indicating whether to include the maximum column in the slice range."
+ " Optional parameter, default is true.";
- Text minCf;
- Text minCq;
+ final Text minCf;
+ final Text minCq;
- Text maxCf;
- Text maxCq;
+ final Text maxCf;
+ final Text maxCq;
- boolean minInclusive;
- boolean maxInclusive;
+ final boolean minInclusive;
+ final boolean maxInclusive;
public CfCqSliceOpts(CfCqSliceOpts o) {
minCf = new Text(o.minCf);
diff --git
a/core/src/main/java/org/apache/accumulo/core/iterators/user/GrepIterator.java
b/core/src/main/java/org/apache/accumulo/core/iterators/user/GrepIterator.java
index e526851c65..0a173ad20f 100644
---
a/core/src/main/java/org/apache/accumulo/core/iterators/user/GrepIterator.java
+++
b/core/src/main/java/org/apache/accumulo/core/iterators/user/GrepIterator.java
@@ -58,7 +58,7 @@ public class GrepIterator extends Filter {
private static final String MATCH_VALUE_OPT = "matchValue";
private byte[] term;
- private int[] right = new int[256];
+ private final int[] right = new int[256];
private boolean matchRow = true;
private boolean matchColFam = true;
diff --git
a/core/src/main/java/org/apache/accumulo/core/iterators/user/IntersectingIterator.java
b/core/src/main/java/org/apache/accumulo/core/iterators/user/IntersectingIterator.java
index 9c951f2aaa..e1b33cbd91 100644
---
a/core/src/main/java/org/apache/accumulo/core/iterators/user/IntersectingIterator.java
+++
b/core/src/main/java/org/apache/accumulo/core/iterators/user/IntersectingIterator.java
@@ -64,7 +64,7 @@ import org.apache.hadoop.io.Text;
*/
public class IntersectingIterator implements SortedKeyValueIterator<Key,Value>
{
- protected Text nullText = new Text();
+ protected final Text nullText = new Text();
protected Text getPartition(Key key) {
return key.getRow();
@@ -91,10 +91,10 @@ public class IntersectingIterator implements
SortedKeyValueIterator<Key,Value> {
}
public static class TermSource {
- public SortedKeyValueIterator<Key,Value> iter;
- public Text term;
+ public final SortedKeyValueIterator<Key,Value> iter;
+ public final Text term;
public Collection<ByteSequence> seekColfams;
- public boolean notFlag;
+ public final boolean notFlag;
public TermSource(TermSource other) {
this.iter = other.iter;
@@ -128,7 +128,7 @@ public class IntersectingIterator implements
SortedKeyValueIterator<Key,Value> {
// query-time settings
protected Text currentPartition = null;
- protected Text currentDocID = new Text(emptyByteArray);
+ protected final Text currentDocID = new Text(emptyByteArray);
static final byte[] emptyByteArray = new byte[0];
protected Key topKey = null;
diff --git
a/core/src/main/java/org/apache/accumulo/core/iterators/user/LargeRowFilter.java
b/core/src/main/java/org/apache/accumulo/core/iterators/user/LargeRowFilter.java
index 26c388a3c1..715daaeb4b 100644
---
a/core/src/main/java/org/apache/accumulo/core/iterators/user/LargeRowFilter.java
+++
b/core/src/main/java/org/apache/accumulo/core/iterators/user/LargeRowFilter.java
@@ -58,8 +58,8 @@ public class LargeRowFilter implements
SortedKeyValueIterator<Key,Value>, Option
private SortedKeyValueIterator<Key,Value> source;
// a cache of keys
- private ArrayList<Key> keys = new ArrayList<>();
- private ArrayList<Value> values = new ArrayList<>();
+ private final ArrayList<Key> keys = new ArrayList<>();
+ private final ArrayList<Value> values = new ArrayList<>();
private int currentPosition;
diff --git
a/core/src/main/java/org/apache/accumulo/core/iterators/user/RowEncodingIterator.java
b/core/src/main/java/org/apache/accumulo/core/iterators/user/RowEncodingIterator.java
index 79f81d8a77..92bbad0bdd 100644
---
a/core/src/main/java/org/apache/accumulo/core/iterators/user/RowEncodingIterator.java
+++
b/core/src/main/java/org/apache/accumulo/core/iterators/user/RowEncodingIterator.java
@@ -98,8 +98,8 @@ public abstract class RowEncodingIterator
return newInstance;
}
- List<Key> keys = new ArrayList<>();
- List<Value> values = new ArrayList<>();
+ final List<Key> keys = new ArrayList<>();
+ final List<Value> values = new ArrayList<>();
private void prepKeys() throws IOException {
long kvBufSize = 0;
diff --git
a/core/src/main/java/org/apache/accumulo/core/iterators/user/TransformingIterator.java
b/core/src/main/java/org/apache/accumulo/core/iterators/user/TransformingIterator.java
index 492ef6d272..764913435d 100644
---
a/core/src/main/java/org/apache/accumulo/core/iterators/user/TransformingIterator.java
+++
b/core/src/main/java/org/apache/accumulo/core/iterators/user/TransformingIterator.java
@@ -93,9 +93,9 @@ public abstract class TransformingIterator extends
WrappingIterator implements O
public static final String MAX_BUFFER_SIZE_OPT = "maxBufferSize";
private static final long DEFAULT_MAX_BUFFER_SIZE = 10000000;
- private Logger log = LoggerFactory.getLogger(getClass());
+ private final Logger log = LoggerFactory.getLogger(getClass());
- protected ArrayList<Pair<Key,Value>> keys = new ArrayList<>();
+ protected final ArrayList<Pair<Key,Value>> keys = new ArrayList<>();
protected int keyPos = -1;
protected boolean scanning;
protected Range seekRange;
@@ -107,7 +107,8 @@ public abstract class TransformingIterator extends
WrappingIterator implements O
private LRUMap<ByteSequence,Boolean> parsedVisibilitiesCache = null;
private long maxBufferSize;
- private static Comparator<Pair<Key,Value>> keyComparator =
Comparator.comparing(Pair::getFirst);
+ private static final Comparator<Pair<Key,Value>> keyComparator =
+ Comparator.comparing(Pair::getFirst);
@Override
public void init(SortedKeyValueIterator<Key,Value> source,
Map<String,String> options,
@@ -265,9 +266,9 @@ public abstract class TransformingIterator extends
WrappingIterator implements O
private static class RangeIterator implements
SortedKeyValueIterator<Key,Value> {
- private SortedKeyValueIterator<Key,Value> source;
- private Key prefixKey;
- private PartialKey keyPrefix;
+ private final SortedKeyValueIterator<Key,Value> source;
+ private final Key prefixKey;
+ private final PartialKey keyPrefix;
private boolean hasTop = false;
RangeIterator(SortedKeyValueIterator<Key,Value> source, Key prefixKey,
PartialKey keyPrefix) {
diff --git
a/core/src/main/java/org/apache/accumulo/core/iterators/user/VersioningIterator.java
b/core/src/main/java/org/apache/accumulo/core/iterators/user/VersioningIterator.java
index 81b7b16dbc..6a707fb24a 100644
---
a/core/src/main/java/org/apache/accumulo/core/iterators/user/VersioningIterator.java
+++
b/core/src/main/java/org/apache/accumulo/core/iterators/user/VersioningIterator.java
@@ -38,7 +38,7 @@ import org.apache.accumulo.core.iterators.WrappingIterator;
public class VersioningIterator extends WrappingIterator implements
OptionDescriber {
private final int maxCount = 10;
- private Key currentKey = new Key();
+ private final Key currentKey = new Key();
private int numVersions;
protected int maxVersions;
diff --git
a/core/src/main/java/org/apache/accumulo/core/iterators/user/VisibilityFilter.java
b/core/src/main/java/org/apache/accumulo/core/iterators/user/VisibilityFilter.java
index be1d0c5644..0d04b8ba7e 100644
---
a/core/src/main/java/org/apache/accumulo/core/iterators/user/VisibilityFilter.java
+++
b/core/src/main/java/org/apache/accumulo/core/iterators/user/VisibilityFilter.java
@@ -47,7 +47,7 @@ public class VisibilityFilter extends Filter implements
OptionDescriber {
private AccessEvaluator accessEvaluator;
protected Map<ByteSequence,Boolean> cache;
- private ArrayByteSequence testVis = new ArrayByteSequence(new byte[0]);
+ private final ArrayByteSequence testVis = new ArrayByteSequence(new byte[0]);
private static final Logger log =
LoggerFactory.getLogger(VisibilityFilter.class);
diff --git
a/core/src/main/java/org/apache/accumulo/core/iterators/user/WholeColumnFamilyIterator.java
b/core/src/main/java/org/apache/accumulo/core/iterators/user/WholeColumnFamilyIterator.java
index cda5a234c0..5553d7fac5 100644
---
a/core/src/main/java/org/apache/accumulo/core/iterators/user/WholeColumnFamilyIterator.java
+++
b/core/src/main/java/org/apache/accumulo/core/iterators/user/WholeColumnFamilyIterator.java
@@ -145,8 +145,8 @@ public class WholeColumnFamilyIterator
return new Value(out.toByteArray());
}
- List<Key> keys = new ArrayList<>();
- List<Value> values = new ArrayList<>();
+ final List<Key> keys = new ArrayList<>();
+ final List<Value> values = new ArrayList<>();
private void prepKeys() throws IOException {
if (topKey != null) {
diff --git
a/core/src/main/java/org/apache/accumulo/core/iteratorsImpl/IteratorBuilderImpl.java
b/core/src/main/java/org/apache/accumulo/core/iteratorsImpl/IteratorBuilderImpl.java
index c26df026d1..49fb411930 100644
---
a/core/src/main/java/org/apache/accumulo/core/iteratorsImpl/IteratorBuilderImpl.java
+++
b/core/src/main/java/org/apache/accumulo/core/iteratorsImpl/IteratorBuilderImpl.java
@@ -27,7 +27,7 @@ import org.apache.accumulo.core.iterators.IteratorEnvironment;
public class IteratorBuilderImpl
implements IteratorBuilder.IteratorBuilderEnv,
IteratorBuilder.IteratorBuilderOptions {
- Collection<IterInfo> iters;
+ final Collection<IterInfo> iters;
Map<String,Map<String,String>> iterOpts;
IteratorEnvironment iteratorEnvironment;
boolean useAccumuloClassLoader = false;
diff --git
a/core/src/main/java/org/apache/accumulo/core/iteratorsImpl/conf/ColumnSet.java
b/core/src/main/java/org/apache/accumulo/core/iteratorsImpl/conf/ColumnSet.java
index 600019f05d..37f9d1cd0d 100644
---
a/core/src/main/java/org/apache/accumulo/core/iteratorsImpl/conf/ColumnSet.java
+++
b/core/src/main/java/org/apache/accumulo/core/iteratorsImpl/conf/ColumnSet.java
@@ -31,11 +31,11 @@ import org.apache.accumulo.core.util.Pair;
import org.apache.hadoop.io.Text;
public class ColumnSet {
- private Set<ColFamHashKey> objectsCF;
- private Set<ColHashKey> objectsCol;
+ private final Set<ColFamHashKey> objectsCF;
+ private final Set<ColHashKey> objectsCol;
- private ColHashKey lookupCol = new ColHashKey();
- private ColFamHashKey lookupCF = new ColFamHashKey();
+ private final ColHashKey lookupCol = new ColHashKey();
+ private final ColFamHashKey lookupCF = new ColFamHashKey();
public ColumnSet() {
objectsCF = new HashSet<>();
diff --git
a/core/src/main/java/org/apache/accumulo/core/iteratorsImpl/conf/ColumnToClassMapping.java
b/core/src/main/java/org/apache/accumulo/core/iteratorsImpl/conf/ColumnToClassMapping.java
index 5492c4cae3..1e6ff268b0 100644
---
a/core/src/main/java/org/apache/accumulo/core/iteratorsImpl/conf/ColumnToClassMapping.java
+++
b/core/src/main/java/org/apache/accumulo/core/iteratorsImpl/conf/ColumnToClassMapping.java
@@ -32,11 +32,11 @@ import org.apache.hadoop.io.Text;
public class ColumnToClassMapping<K> {
- private HashMap<ColFamHashKey,K> objectsCF;
- private HashMap<ColHashKey,K> objectsCol;
+ private final HashMap<ColFamHashKey,K> objectsCF;
+ private final HashMap<ColHashKey,K> objectsCol;
- private ColHashKey lookupCol = new ColHashKey();
- private ColFamHashKey lookupCF = new ColFamHashKey();
+ private final ColHashKey lookupCol = new ColHashKey();
+ private final ColFamHashKey lookupCF = new ColFamHashKey();
public ColumnToClassMapping() {
objectsCF = new HashMap<>();
diff --git
a/core/src/main/java/org/apache/accumulo/core/iteratorsImpl/conf/ColumnUtil.java
b/core/src/main/java/org/apache/accumulo/core/iteratorsImpl/conf/ColumnUtil.java
index b53a105a67..2f868be4ab 100644
---
a/core/src/main/java/org/apache/accumulo/core/iteratorsImpl/conf/ColumnUtil.java
+++
b/core/src/main/java/org/apache/accumulo/core/iteratorsImpl/conf/ColumnUtil.java
@@ -39,7 +39,7 @@ public class ColumnUtil {
}
public static class ColFamHashKey {
- Text columnFamily;
+ final Text columnFamily;
Key key;
@@ -81,8 +81,8 @@ public class ColumnUtil {
}
public static class ColHashKey {
- Text columnFamily;
- Text columnQualifier;
+ final Text columnFamily;
+ final Text columnQualifier;
Key key;
diff --git
a/core/src/main/java/org/apache/accumulo/core/iteratorsImpl/system/ColumnQualifierFilter.java
b/core/src/main/java/org/apache/accumulo/core/iteratorsImpl/system/ColumnQualifierFilter.java
index c383ad0a12..b575fafdbd 100644
---
a/core/src/main/java/org/apache/accumulo/core/iteratorsImpl/system/ColumnQualifierFilter.java
+++
b/core/src/main/java/org/apache/accumulo/core/iteratorsImpl/system/ColumnQualifierFilter.java
@@ -32,8 +32,8 @@ import org.apache.accumulo.core.iterators.ServerFilter;
import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
public class ColumnQualifierFilter extends ServerFilter {
- private HashSet<ByteSequence> columnFamilies;
- private HashMap<ByteSequence,HashSet<ByteSequence>> columnsQualifiers;
+ private final HashSet<ByteSequence> columnFamilies;
+ private final HashMap<ByteSequence,HashSet<ByteSequence>> columnsQualifiers;
private ColumnQualifierFilter(SortedKeyValueIterator<Key,Value> iterator,
Set<Column> columns) {
super(iterator);
diff --git
a/core/src/main/java/org/apache/accumulo/core/iteratorsImpl/system/DeletingIterator.java
b/core/src/main/java/org/apache/accumulo/core/iteratorsImpl/system/DeletingIterator.java
index 97a614ae41..67d82c55ab 100644
---
a/core/src/main/java/org/apache/accumulo/core/iteratorsImpl/system/DeletingIterator.java
+++
b/core/src/main/java/org/apache/accumulo/core/iteratorsImpl/system/DeletingIterator.java
@@ -35,8 +35,8 @@ import
org.apache.accumulo.core.iterators.ServerWrappingIterator;
import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
public class DeletingIterator extends ServerWrappingIterator {
- private boolean propagateDeletes;
- private Key workKey = new Key();
+ private final boolean propagateDeletes;
+ private final Key workKey = new Key();
public enum Behavior {
PROCESS, FAIL
diff --git
a/core/src/main/java/org/apache/accumulo/core/iteratorsImpl/system/LocalityGroupIterator.java
b/core/src/main/java/org/apache/accumulo/core/iteratorsImpl/system/LocalityGroupIterator.java
index d7c3b0a6d6..7ada6fa496 100644
---
a/core/src/main/java/org/apache/accumulo/core/iteratorsImpl/system/LocalityGroupIterator.java
+++
b/core/src/main/java/org/apache/accumulo/core/iteratorsImpl/system/LocalityGroupIterator.java
@@ -65,8 +65,8 @@ public class LocalityGroupIterator extends HeapIterator
implements Interruptible
return iterator;
}
- protected boolean isDefaultLocalityGroup;
- protected Map<ByteSequence,MutableLong> columnFamilies;
+ protected final boolean isDefaultLocalityGroup;
+ protected final Map<ByteSequence,MutableLong> columnFamilies;
private InterruptibleIterator iterator;
}
diff --git
a/core/src/main/java/org/apache/accumulo/core/iteratorsImpl/system/SequenceFileIterator.java
b/core/src/main/java/org/apache/accumulo/core/iteratorsImpl/system/SequenceFileIterator.java
index 71cbb76387..8e2a0e3799 100644
---
a/core/src/main/java/org/apache/accumulo/core/iteratorsImpl/system/SequenceFileIterator.java
+++
b/core/src/main/java/org/apache/accumulo/core/iteratorsImpl/system/SequenceFileIterator.java
@@ -40,10 +40,10 @@ import org.apache.hadoop.io.Text;
public class SequenceFileIterator implements FileSKVIterator {
- private Reader reader;
+ private final Reader reader;
private Value top_value;
private Key top_key;
- private boolean readValue;
+ private final boolean readValue;
@Override
public SequenceFileIterator deepCopy(IteratorEnvironment env) {
diff --git
a/core/src/main/java/org/apache/accumulo/core/iteratorsImpl/system/SortedMapIterator.java
b/core/src/main/java/org/apache/accumulo/core/iteratorsImpl/system/SortedMapIterator.java
index 3176e52d2c..d6a78ba5f4 100644
---
a/core/src/main/java/org/apache/accumulo/core/iteratorsImpl/system/SortedMapIterator.java
+++
b/core/src/main/java/org/apache/accumulo/core/iteratorsImpl/system/SortedMapIterator.java
@@ -48,7 +48,7 @@ public class SortedMapIterator implements
InterruptibleIterator {
private Iterator<Entry<Key,Value>> iter;
private Entry<Key,Value> entry;
- private SortedMap<Key,Value> map;
+ private final SortedMap<Key,Value> map;
private Range range;
private AtomicBoolean interruptFlag;
diff --git
a/core/src/main/java/org/apache/accumulo/core/iteratorsImpl/system/SourceSwitchingIterator.java
b/core/src/main/java/org/apache/accumulo/core/iteratorsImpl/system/SourceSwitchingIterator.java
index f2de7f3700..15577ecada 100644
---
a/core/src/main/java/org/apache/accumulo/core/iteratorsImpl/system/SourceSwitchingIterator.java
+++
b/core/src/main/java/org/apache/accumulo/core/iteratorsImpl/system/SourceSwitchingIterator.java
@@ -70,7 +70,7 @@ public class SourceSwitchingIterator implements
InterruptibleIterator {
private boolean inclusive;
private Collection<ByteSequence> columnFamilies;
- private boolean onlySwitchAfterRow;
+ private final boolean onlySwitchAfterRow;
// Synchronization on copies synchronizes operations across all deep copies
of this instance.
//
diff --git
a/core/src/main/java/org/apache/accumulo/core/iteratorsImpl/system/StatsIterator.java
b/core/src/main/java/org/apache/accumulo/core/iteratorsImpl/system/StatsIterator.java
index 516d513dca..47a0881973 100644
---
a/core/src/main/java/org/apache/accumulo/core/iteratorsImpl/system/StatsIterator.java
+++
b/core/src/main/java/org/apache/accumulo/core/iteratorsImpl/system/StatsIterator.java
@@ -34,9 +34,9 @@ import
org.apache.accumulo.core.iterators.SortedKeyValueIterator;
public class StatsIterator extends ServerWrappingIterator {
private int numRead = 0;
- private AtomicLong seekCounter;
- private AtomicLong scanCounter;
- private LongAdder serverScanCounter;
+ private final AtomicLong seekCounter;
+ private final AtomicLong scanCounter;
+ private final LongAdder serverScanCounter;
public StatsIterator(SortedKeyValueIterator<Key,Value> source, AtomicLong
seekCounter,
AtomicLong tabletScanCounter, LongAdder serverScanCounter) {
diff --git
a/core/src/main/java/org/apache/accumulo/core/iteratorsImpl/system/TimeSettingIterator.java
b/core/src/main/java/org/apache/accumulo/core/iteratorsImpl/system/TimeSettingIterator.java
index 9fb340a5bc..b7fda5d2f9 100644
---
a/core/src/main/java/org/apache/accumulo/core/iteratorsImpl/system/TimeSettingIterator.java
+++
b/core/src/main/java/org/apache/accumulo/core/iteratorsImpl/system/TimeSettingIterator.java
@@ -33,8 +33,8 @@ import
org.apache.accumulo.core.iterators.SortedKeyValueIterator;
public class TimeSettingIterator implements InterruptibleIterator {
- private SortedKeyValueIterator<Key,Value> source;
- private long time;
+ private final SortedKeyValueIterator<Key,Value> source;
+ private final long time;
private Range range;
public TimeSettingIterator(SortedKeyValueIterator<Key,Value> source, long
time) {
diff --git
a/core/src/main/java/org/apache/accumulo/core/iteratorsImpl/system/VisibilityFilter.java
b/core/src/main/java/org/apache/accumulo/core/iteratorsImpl/system/VisibilityFilter.java
index fa5540278e..2f7167cdd9 100644
---
a/core/src/main/java/org/apache/accumulo/core/iteratorsImpl/system/VisibilityFilter.java
+++
b/core/src/main/java/org/apache/accumulo/core/iteratorsImpl/system/VisibilityFilter.java
@@ -46,7 +46,7 @@ public class VisibilityFilter extends
SynchronizedServerFilter {
protected final LRUMap<ByteSequence,Boolean> cache;
protected final Authorizations authorizations;
- private ArrayByteSequence testVis = new ArrayByteSequence(new byte[0]);
+ private final ArrayByteSequence testVis = new ArrayByteSequence(new byte[0]);
private static final Logger log =
LoggerFactory.getLogger(VisibilityFilter.class);
diff --git a/core/src/main/java/org/apache/accumulo/core/lock/ServiceLock.java
b/core/src/main/java/org/apache/accumulo/core/lock/ServiceLock.java
index d04d82714a..498377a56c 100644
--- a/core/src/main/java/org/apache/accumulo/core/lock/ServiceLock.java
+++ b/core/src/main/java/org/apache/accumulo/core/lock/ServiceLock.java
@@ -130,7 +130,7 @@ public class ServiceLock implements Watcher {
private static class LockWatcherWrapper implements AccumuloLockWatcher {
boolean acquiredLock = false;
- LockWatcher lw;
+ final LockWatcher lw;
public LockWatcherWrapper(LockWatcher lw2) {
this.lw = lw2;
diff --git
a/core/src/main/java/org/apache/accumulo/core/lock/ServiceLockData.java
b/core/src/main/java/org/apache/accumulo/core/lock/ServiceLockData.java
index afa40121e2..f3b3bf189c 100644
--- a/core/src/main/java/org/apache/accumulo/core/lock/ServiceLockData.java
+++ b/core/src/main/java/org/apache/accumulo/core/lock/ServiceLockData.java
@@ -137,7 +137,7 @@ public class ServiceLockData implements
Comparable<ServiceLockData> {
}
}
- private EnumMap<ThriftService,ServiceDescriptor> services;
+ private final EnumMap<ThriftService,ServiceDescriptor> services;
public ServiceLockData(ServiceDescriptors sds) {
this.services = new EnumMap<>(ThriftService.class);
diff --git
a/core/src/main/java/org/apache/accumulo/core/metadata/MetadataCachedTabletObtainer.java
b/core/src/main/java/org/apache/accumulo/core/metadata/MetadataCachedTabletObtainer.java
index bacf8084bf..a14c8209f0 100644
---
a/core/src/main/java/org/apache/accumulo/core/metadata/MetadataCachedTabletObtainer.java
+++
b/core/src/main/java/org/apache/accumulo/core/metadata/MetadataCachedTabletObtainer.java
@@ -70,8 +70,8 @@ import org.slf4j.LoggerFactory;
public class MetadataCachedTabletObtainer implements CachedTabletObtainer {
private static final Logger log =
LoggerFactory.getLogger(MetadataCachedTabletObtainer.class);
- private SortedSet<Column> locCols;
- private ArrayList<Column> columns;
+ private final SortedSet<Column> locCols;
+ private final ArrayList<Column> columns;
public MetadataCachedTabletObtainer() {
diff --git
a/core/src/main/java/org/apache/accumulo/core/metadata/schema/DataFileValue.java
b/core/src/main/java/org/apache/accumulo/core/metadata/schema/DataFileValue.java
index 4f87b3d413..3d47acac5a 100644
---
a/core/src/main/java/org/apache/accumulo/core/metadata/schema/DataFileValue.java
+++
b/core/src/main/java/org/apache/accumulo/core/metadata/schema/DataFileValue.java
@@ -25,8 +25,8 @@ import
org.apache.accumulo.core.iteratorsImpl.system.InterruptibleIterator;
import org.apache.accumulo.core.iteratorsImpl.system.TimeSettingIterator;
public class DataFileValue {
- private long size;
- private long numEntries;
+ private final long size;
+ private final long numEntries;
private long time = -1;
public DataFileValue(long size, long numEntries, long time) {
diff --git
a/core/src/main/java/org/apache/accumulo/core/metadata/schema/LinkingIterator.java
b/core/src/main/java/org/apache/accumulo/core/metadata/schema/LinkingIterator.java
index 7c8bf7b1d8..2358d32f61 100644
---
a/core/src/main/java/org/apache/accumulo/core/metadata/schema/LinkingIterator.java
+++
b/core/src/main/java/org/apache/accumulo/core/metadata/schema/LinkingIterator.java
@@ -51,8 +51,8 @@ public class LinkingIterator implements
Iterator<TabletMetadata> {
private static final Logger log =
LoggerFactory.getLogger(LinkingIterator.class);
- private Range range;
- private Function<Range,Iterator<TabletMetadata>> iteratorFactory;
+ private final Range range;
+ private final Function<Range,Iterator<TabletMetadata>> iteratorFactory;
private Iterator<TabletMetadata> source;
private TabletMetadata prevTablet = null;
diff --git
a/core/src/main/java/org/apache/accumulo/core/metadata/schema/TabletMetadataBuilder.java
b/core/src/main/java/org/apache/accumulo/core/metadata/schema/TabletMetadataBuilder.java
index 9016e1652a..44f1915e0e 100644
---
a/core/src/main/java/org/apache/accumulo/core/metadata/schema/TabletMetadataBuilder.java
+++
b/core/src/main/java/org/apache/accumulo/core/metadata/schema/TabletMetadataBuilder.java
@@ -74,7 +74,7 @@ public class TabletMetadataBuilder implements
Ample.TabletUpdates<TabletMetadata
}
private final InternalBuilder internalBuilder;
- EnumSet<TabletMetadata.ColumnType> fetched;
+ final EnumSet<TabletMetadata.ColumnType> fetched;
protected TabletMetadataBuilder(KeyExtent extent) {
internalBuilder = new InternalBuilder(extent);
diff --git
a/core/src/main/java/org/apache/accumulo/core/rpc/UGIAssumingTransport.java
b/core/src/main/java/org/apache/accumulo/core/rpc/UGIAssumingTransport.java
index 133999cbfd..24c06ec555 100644
--- a/core/src/main/java/org/apache/accumulo/core/rpc/UGIAssumingTransport.java
+++ b/core/src/main/java/org/apache/accumulo/core/rpc/UGIAssumingTransport.java
@@ -38,7 +38,7 @@ import org.apache.thrift.transport.TTransportException;
* Lifted from Apache Hive 0.14
*/
public class UGIAssumingTransport extends FilterTransport {
- protected UserGroupInformation ugi;
+ protected final UserGroupInformation ugi;
public UGIAssumingTransport(TTransport wrapped, UserGroupInformation ugi) {
super(wrapped);
diff --git
a/core/src/main/java/org/apache/accumulo/core/sample/impl/DataoutputHasher.java
b/core/src/main/java/org/apache/accumulo/core/sample/impl/DataoutputHasher.java
index cf2142187a..1ba503f0c7 100644
---
a/core/src/main/java/org/apache/accumulo/core/sample/impl/DataoutputHasher.java
+++
b/core/src/main/java/org/apache/accumulo/core/sample/impl/DataoutputHasher.java
@@ -26,7 +26,7 @@ import com.google.common.hash.Hasher;
public class DataoutputHasher implements DataOutput {
- private Hasher hasher;
+ private final Hasher hasher;
public DataoutputHasher(Hasher hasher) {
this.hasher = hasher;
diff --git a/core/src/main/java/org/apache/accumulo/core/schema/Section.java
b/core/src/main/java/org/apache/accumulo/core/schema/Section.java
index 6615140cc9..6624cd1b80 100644
--- a/core/src/main/java/org/apache/accumulo/core/schema/Section.java
+++ b/core/src/main/java/org/apache/accumulo/core/schema/Section.java
@@ -21,8 +21,8 @@ package org.apache.accumulo.core.schema;
import org.apache.accumulo.core.data.Range;
public class Section {
- private String rowPrefix;
- private Range range;
+ private final String rowPrefix;
+ private final Range range;
public Section(String startRow, boolean startInclusive, String endRow,
boolean endInclusive) {
rowPrefix = startRow;
diff --git
a/core/src/main/java/org/apache/accumulo/core/security/ColumnVisibility.java
b/core/src/main/java/org/apache/accumulo/core/security/ColumnVisibility.java
index bc49baca5f..51f7ce5348 100644
--- a/core/src/main/java/org/apache/accumulo/core/security/ColumnVisibility.java
+++ b/core/src/main/java/org/apache/accumulo/core/security/ColumnVisibility.java
@@ -117,8 +117,8 @@ public class ColumnVisibility {
* An empty list of nodes.
*/
public static final List<Node> EMPTY = Collections.emptyList();
- NodeType type;
- int start;
+ final NodeType type;
+ final int start;
int end;
List<Node> children = EMPTY;
@@ -182,7 +182,7 @@ public class ColumnVisibility {
public static class NodeComparator implements Comparator<Node>, Serializable
{
private static final long serialVersionUID = 1L;
- byte[] text;
+ final byte[] text;
/**
* Creates a new comparator.
diff --git
a/core/src/main/java/org/apache/accumulo/core/security/SystemPermission.java
b/core/src/main/java/org/apache/accumulo/core/security/SystemPermission.java
index 455d2c898f..317eeca891 100644
--- a/core/src/main/java/org/apache/accumulo/core/security/SystemPermission.java
+++ b/core/src/main/java/org/apache/accumulo/core/security/SystemPermission.java
@@ -45,7 +45,7 @@ public enum SystemPermission {
private byte permID;
- private static HashMap<Byte,SystemPermission> mapping;
+ private static final HashMap<Byte,SystemPermission> mapping;
static {
mapping = new HashMap<>(SystemPermission.values().length);
for (SystemPermission perm : SystemPermission.values()) {
diff --git
a/core/src/main/java/org/apache/accumulo/core/security/VisibilityParseException.java
b/core/src/main/java/org/apache/accumulo/core/security/VisibilityParseException.java
index 2d01c2c7bb..07c4b4f347 100644
---
a/core/src/main/java/org/apache/accumulo/core/security/VisibilityParseException.java
+++
b/core/src/main/java/org/apache/accumulo/core/security/VisibilityParseException.java
@@ -29,7 +29,7 @@ import
org.apache.accumulo.access.InvalidAccessExpressionException;
*/
public class VisibilityParseException extends ParseException {
private static final long serialVersionUID = 1L;
- private String visibility;
+ private final String visibility;
/**
* Creates a new exception.
diff --git
a/core/src/main/java/org/apache/accumulo/core/spi/balancer/GroupBalancer.java
b/core/src/main/java/org/apache/accumulo/core/spi/balancer/GroupBalancer.java
index 3527ba6f4c..ea6836d2ac 100644
---
a/core/src/main/java/org/apache/accumulo/core/spi/balancer/GroupBalancer.java
+++
b/core/src/main/java/org/apache/accumulo/core/spi/balancer/GroupBalancer.java
@@ -415,7 +415,7 @@ public abstract class GroupBalancer implements
TabletBalancer {
}
private static class Move {
- TserverGroupInfo dest;
+ final TserverGroupInfo dest;
int count;
public Move(TserverGroupInfo dest, int num) {
diff --git
a/core/src/main/java/org/apache/accumulo/core/spi/balancer/TableLoadBalancer.java
b/core/src/main/java/org/apache/accumulo/core/spi/balancer/TableLoadBalancer.java
index 44cf29d1e8..156777d3a6 100644
---
a/core/src/main/java/org/apache/accumulo/core/spi/balancer/TableLoadBalancer.java
+++
b/core/src/main/java/org/apache/accumulo/core/spi/balancer/TableLoadBalancer.java
@@ -61,7 +61,7 @@ public class TableLoadBalancer implements TabletBalancer {
public static final String TABLE_ASSIGNMENT_GROUP_PROPERTY =
"table.custom.assignment.group";
protected BalancerEnvironment environment;
- Map<TableId,TabletBalancer> perTableBalancers = new HashMap<>();
+ final Map<TableId,TabletBalancer> perTableBalancers = new HashMap<>();
@Override
public void init(BalancerEnvironment balancerEnvironment) {
diff --git
a/core/src/main/java/org/apache/accumulo/core/spi/fs/SpaceAwareVolumeChooser.java
b/core/src/main/java/org/apache/accumulo/core/spi/fs/SpaceAwareVolumeChooser.java
index 4699936cba..d1d96e8f73 100644
---
a/core/src/main/java/org/apache/accumulo/core/spi/fs/SpaceAwareVolumeChooser.java
+++
b/core/src/main/java/org/apache/accumulo/core/spi/fs/SpaceAwareVolumeChooser.java
@@ -50,12 +50,12 @@ public class SpaceAwareVolumeChooser extends
PreferredVolumeChooser {
public static final String RECOMPUTE_INTERVAL =
"spaceaware.volume.chooser.recompute.interval";
// Default time to wait in ms. Defaults to 5 min
- private long defaultComputationCacheDuration = 300000;
+ private final long defaultComputationCacheDuration = 300000;
private LoadingCache<Set<String>,WeightedRandomCollection> choiceCache =
null;
private static final Logger log =
LoggerFactory.getLogger(SpaceAwareVolumeChooser.class);
- private Configuration conf = new Configuration();
+ private final Configuration conf = new Configuration();
protected double getFreeSpace(String uri) throws IOException {
FileSystem pathFs = new Path(uri).getFileSystem(conf);
diff --git
a/core/src/main/java/org/apache/accumulo/core/spi/scan/DefaultScanDispatch.java
b/core/src/main/java/org/apache/accumulo/core/spi/scan/DefaultScanDispatch.java
index 26d0747ba0..d55f2cca0e 100644
---
a/core/src/main/java/org/apache/accumulo/core/spi/scan/DefaultScanDispatch.java
+++
b/core/src/main/java/org/apache/accumulo/core/spi/scan/DefaultScanDispatch.java
@@ -27,7 +27,7 @@ package org.apache.accumulo.core.spi.scan;
*/
class DefaultScanDispatch extends ScanDispatchImpl {
- static DefaultScanDispatch DEFAULT_SCAN_DISPATCH = new DefaultScanDispatch();
+ static final DefaultScanDispatch DEFAULT_SCAN_DISPATCH = new
DefaultScanDispatch();
private DefaultScanDispatch() {
super.build();
diff --git
a/core/src/main/java/org/apache/accumulo/core/spi/scan/SimpleScanDispatcher.java
b/core/src/main/java/org/apache/accumulo/core/spi/scan/SimpleScanDispatcher.java
index 4d2f4880e8..49486cf14f 100644
---
a/core/src/main/java/org/apache/accumulo/core/spi/scan/SimpleScanDispatcher.java
+++
b/core/src/main/java/org/apache/accumulo/core/spi/scan/SimpleScanDispatcher.java
@@ -65,7 +65,8 @@ public class SimpleScanDispatcher implements ScanDispatcher {
private ScanDispatch multiDispatch;
private Map<String,Map<ScanInfo.Type,ScanDispatch>> hintDispatch;
- private static Pattern CACHE_PATTERN =
Pattern.compile("cacheUsage[.](\\w+)([.](index|data))?");
+ private static final Pattern CACHE_PATTERN =
+ Pattern.compile("cacheUsage[.](\\w+)([.](index|data))?");
public static final String DEFAULT_SCAN_EXECUTOR_NAME = "default";
diff --git a/core/src/main/java/org/apache/accumulo/core/summary/Gatherer.java
b/core/src/main/java/org/apache/accumulo/core/summary/Gatherer.java
index e9ee45d763..d775d61a0a 100644
--- a/core/src/main/java/org/apache/accumulo/core/summary/Gatherer.java
+++ b/core/src/main/java/org/apache/accumulo/core/summary/Gatherer.java
@@ -107,20 +107,20 @@ public class Gatherer {
private static final Logger log = LoggerFactory.getLogger(Gatherer.class);
- private ClientContext ctx;
- private TableId tableId;
- private SummarizerFactory factory;
+ private final ClientContext ctx;
+ private final TableId tableId;
+ private final SummarizerFactory factory;
private Text startRow = null;
private Text endRow = null;
- private Range clipRange;
+ private final Range clipRange;
private Predicate<SummarizerConfiguration> summarySelector;
- private CryptoService cryptoService;
+ private final CryptoService cryptoService;
- private TSummaryRequest request;
+ private final TSummaryRequest request;
- private String summarizerPattern;
+ private final String summarizerPattern;
- private Set<SummarizerConfiguration> summaries;
+ private final Set<SummarizerConfiguration> summaries;
public Gatherer(ClientContext context, TSummaryRequest request,
AccumuloConfiguration tableConfig,
CryptoService cryptoService) {
@@ -284,10 +284,10 @@ public class Gatherer {
private class FilesProcessor implements Supplier<ProcessedFiles> {
- HostAndPort location;
- Map<StoredTabletFile,List<TRowRange>> allFiles;
- private TInfo tinfo;
- private AtomicBoolean cancelFlag;
+ final HostAndPort location;
+ final Map<StoredTabletFile,List<TRowRange>> allFiles;
+ private final TInfo tinfo;
+ private final AtomicBoolean cancelFlag;
public FilesProcessor(TInfo tinfo, HostAndPort location,
Map<StoredTabletFile,List<TRowRange>> allFiles, AtomicBoolean
cancelFlag) {
@@ -455,10 +455,10 @@ public class Gatherer {
private class GatherRequest implements Supplier<SummaryCollection> {
- private int remainder;
- private int modulus;
- private TInfo tinfo;
- private AtomicBoolean cancelFlag;
+ private final int remainder;
+ private final int modulus;
+ private final TInfo tinfo;
+ private final AtomicBoolean cancelFlag;
GatherRequest(TInfo tinfo, int remainder, int modulus, AtomicBoolean
cancelFlag) {
this.remainder = remainder;
@@ -542,8 +542,8 @@ public class Gatherer {
}
public static class RowRange {
- private Text startRow;
- private Text endRow;
+ private final Text startRow;
+ private final Text endRow;
public RowRange(KeyExtent ke) {
this.startRow = ke.prevEndRow();
diff --git
a/core/src/main/java/org/apache/accumulo/core/summary/SummaryCollection.java
b/core/src/main/java/org/apache/accumulo/core/summary/SummaryCollection.java
index 58f2475544..58b2a1833f 100644
--- a/core/src/main/java/org/apache/accumulo/core/summary/SummaryCollection.java
+++ b/core/src/main/java/org/apache/accumulo/core/summary/SummaryCollection.java
@@ -82,7 +82,7 @@ public class SummaryCollection {
}
- private Map<SummarizerConfiguration,MergedSummary> mergedSummaries;
+ private final Map<SummarizerConfiguration,MergedSummary> mergedSummaries;
private long totalFiles;
private long deletedFiles;
@@ -120,10 +120,10 @@ public class SummaryCollection {
static class FileSummary {
- private SummarizerConfiguration conf;
- private Map<String,Long> summary;
- private boolean exceededBoundry;
- private boolean exceededMaxSize;
+ private final SummarizerConfiguration conf;
+ private final Map<String,Long> summary;
+ private final boolean exceededBoundry;
+ private final boolean exceededMaxSize;
FileSummary(SummarizerConfiguration conf, Map<String,Long> summary,
boolean exceededBoundry) {
this.conf = conf;
diff --git
a/core/src/main/java/org/apache/accumulo/core/summary/SummaryReader.java
b/core/src/main/java/org/apache/accumulo/core/summary/SummaryReader.java
index 78f036a42e..034fc25885 100644
--- a/core/src/main/java/org/apache/accumulo/core/summary/SummaryReader.java
+++ b/core/src/main/java/org/apache/accumulo/core/summary/SummaryReader.java
@@ -57,8 +57,8 @@ public class SummaryReader {
private static class CompositeCache implements BlockCache {
- private BlockCache summaryCache;
- private BlockCache indexCache;
+ private final BlockCache summaryCache;
+ private final BlockCache indexCache;
CompositeCache(BlockCache summaryCache, BlockCache indexCache) {
this.summaryCache = summaryCache;
diff --git
a/core/src/main/java/org/apache/accumulo/core/summary/SummarySerializer.java
b/core/src/main/java/org/apache/accumulo/core/summary/SummarySerializer.java
index 8d16d81e15..58b6e12191 100644
--- a/core/src/main/java/org/apache/accumulo/core/summary/SummarySerializer.java
+++ b/core/src/main/java/org/apache/accumulo/core/summary/SummarySerializer.java
@@ -56,8 +56,8 @@ import com.google.common.collect.ImmutableMap;
*/
class SummarySerializer {
- private SummarizerConfiguration sconf;
- private LgSummaries[] allSummaries;
+ private final SummarizerConfiguration sconf;
+ private final LgSummaries[] allSummaries;
private SummarySerializer(SummarizerConfiguration sconf, LgSummaries[]
allSummaries) {
this.sconf = sconf;
@@ -126,11 +126,11 @@ class SummarySerializer {
}
private static class LgBuilder {
- private Summarizer summarizer;
- private SummarizerConfiguration conf;
+ private final Summarizer summarizer;
+ private final SummarizerConfiguration conf;
private Collector collector;
- private int maxSummaries = 10;
+ private final int maxSummaries = 10;
private int cutoff = 1000;
private int count = 0;
@@ -139,9 +139,9 @@ class SummarySerializer {
private Key lastKey;
- private SummaryStoreImpl sci = new SummaryStoreImpl();
+ private final SummaryStoreImpl sci = new SummaryStoreImpl();
- private String name;
+ private final String name;
private boolean sawFirst = false;
private Text firstRow;
@@ -270,14 +270,14 @@ class SummarySerializer {
}
public static class Builder {
- private Summarizer kvs;
+ private final Summarizer kvs;
- private SummarizerConfiguration conf;
+ private final SummarizerConfiguration conf;
- private List<LgBuilder> locGroups;
+ private final List<LgBuilder> locGroups;
private LgBuilder lgb;
- private long maxSize;
+ private final long maxSize;
public Builder(SummarizerConfiguration conf, Summarizer kvs, long maxSize)
{
this.conf = conf;
@@ -421,9 +421,9 @@ class SummarySerializer {
private static class LgSummaries {
- private Text firstRow;
- private SummaryInfo[] summaries;
- private String lgroupName;
+ private final Text firstRow;
+ private final SummaryInfo[] summaries;
+ private final String lgroupName;
LgSummaries(Text firstRow, SummaryInfo[] summaries, String lgroupName) {
this.firstRow = firstRow;
diff --git
a/core/src/main/java/org/apache/accumulo/core/summary/SummaryWriter.java
b/core/src/main/java/org/apache/accumulo/core/summary/SummaryWriter.java
index 72f0e200ac..90ef0d7344 100644
--- a/core/src/main/java/org/apache/accumulo/core/summary/SummaryWriter.java
+++ b/core/src/main/java/org/apache/accumulo/core/summary/SummaryWriter.java
@@ -39,11 +39,11 @@ public class SummaryWriter implements FileSKVWriter {
static final String METASTORE_INDEX = "accumulo.summaries.index";
// echo "accumulo summarize" | sha1sum | head -c 8
- static long MAGIC = 0x15ea283ec03e4c49L;
- static byte VER = 1;
+ static final long MAGIC = 0x15ea283ec03e4c49L;
+ static final byte VER = 1;
- private FileSKVWriter writer;
- private SummarySerializer.Builder[] summaryStores;
+ private final FileSKVWriter writer;
+ private final SummarySerializer.Builder[] summaryStores;
private SummaryWriter(FileSKVWriter writer, SummarizerFactory factory,
List<SummarizerConfiguration> configs, long maxSize) {
diff --git
a/core/src/main/java/org/apache/accumulo/core/util/compaction/CompactionPlanImpl.java
b/core/src/main/java/org/apache/accumulo/core/util/compaction/CompactionPlanImpl.java
index 2eff876b7d..ab1c924fc5 100644
---
a/core/src/main/java/org/apache/accumulo/core/util/compaction/CompactionPlanImpl.java
+++
b/core/src/main/java/org/apache/accumulo/core/util/compaction/CompactionPlanImpl.java
@@ -55,7 +55,7 @@ public class CompactionPlanImpl implements CompactionPlan {
public static class BuilderImpl implements CompactionPlan.Builder {
private final CompactionKind kind;
- private ArrayList<CompactionJob> jobs = new ArrayList<>();
+ private final ArrayList<CompactionJob> jobs = new ArrayList<>();
private final Set<CompactableFile> allFiles;
private final Set<CompactableFile> seenFiles = new HashSet<>();
private final Set<CompactableFile> candidates;
diff --git
a/core/src/main/java/org/apache/accumulo/core/util/format/DefaultFormatter.java
b/core/src/main/java/org/apache/accumulo/core/util/format/DefaultFormatter.java
index c5b32c5ce1..d795a48eaa 100644
---
a/core/src/main/java/org/apache/accumulo/core/util/format/DefaultFormatter.java
+++
b/core/src/main/java/org/apache/accumulo/core/util/format/DefaultFormatter.java
@@ -86,7 +86,7 @@ public class DefaultFormatter implements Formatter {
}
/* so a new date object doesn't get created for every record in the scan
result */
- private static ThreadLocal<Date> tmpDate =
ThreadLocal.withInitial(Date::new);
+ private static final ThreadLocal<Date> tmpDate =
ThreadLocal.withInitial(Date::new);
/** Does not show timestamps if timestampFormat is null */
public static String formatEntry(Entry<Key,Value> entry, DateFormat
timestampFormat) {
diff --git
a/core/src/main/java/org/apache/accumulo/core/util/format/ShardedTableDistributionFormatter.java
b/core/src/main/java/org/apache/accumulo/core/util/format/ShardedTableDistributionFormatter.java
index 4ad2269f48..cc8b782909 100644
---
a/core/src/main/java/org/apache/accumulo/core/util/format/ShardedTableDistributionFormatter.java
+++
b/core/src/main/java/org/apache/accumulo/core/util/format/ShardedTableDistributionFormatter.java
@@ -36,7 +36,7 @@ import org.apache.accumulo.core.data.Value;
*/
public class ShardedTableDistributionFormatter extends AggregatingFormatter {
- private Map<String,HashSet<String>> countsByDay = new HashMap<>();
+ private final Map<String,HashSet<String>> countsByDay = new HashMap<>();
@Override
protected void aggregateStats(Entry<Key,Value> entry) {
diff --git
a/core/src/main/java/org/apache/accumulo/core/util/threads/ThreadPools.java
b/core/src/main/java/org/apache/accumulo/core/util/threads/ThreadPools.java
index 3914c8da90..02f0e61719 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/threads/ThreadPools.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/threads/ThreadPools.java
@@ -103,7 +103,7 @@ public class ThreadPools {
private static final ConcurrentLinkedQueue<ScheduledFuture<?>>
NON_CRITICAL_RUNNING_TASKS =
new ConcurrentLinkedQueue<>();
- private static Runnable TASK_CHECKER = () -> {
+ private static final Runnable TASK_CHECKER = () -> {
final List<ConcurrentLinkedQueue<ScheduledFuture<?>>> queues =
List.of(CRITICAL_RUNNING_TASKS, NON_CRITICAL_RUNNING_TASKS);
while (true) {
