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 493ebd3cd5 Mark fields as final in multiple modules (#4831) 493ebd3cd5 is described below commit 493ebd3cd57f63ddde74aaeede7ab838aaf4eb82 Author: Christopher L. Shannon <cshan...@apache.org> AuthorDate: Sat Aug 24 15:08:24 2024 -0400 Mark fields as final in multiple modules (#4831) Modules updated include: * hadoop-mapreduce * compactor * gc * manager --- .../mapreduce/partition/KeyRangePartitioner.java | 2 +- .../hadoopImpl/mapred/AccumuloRecordWriter.java | 8 ++++---- .../hadoopImpl/mapreduce/AccumuloRecordWriter.java | 6 +++--- .../mapreduce/FileOutputFormatBuilderImpl.java | 2 +- .../mapreduce/InputFormatBuilderImpl.java | 2 +- .../mapreduce/OutputFormatBuilderImpl.java | 2 +- .../org/apache/accumulo/compactor/ExtCEnv.java | 6 +++--- .../apache/accumulo/gc/SimpleGarbageCollector.java | 2 +- .../accumulo/manager/TabletGroupWatcher.java | 4 ++-- .../coordinator/CompactionCoordinator.java | 4 ++-- .../queue/CompactionJobPriorityQueue.java | 2 +- .../accumulo/manager/recovery/RecoveryManager.java | 22 +++++++++++----------- .../accumulo/manager/split/SeedSplitTask.java | 2 +- .../apache/accumulo/manager/split/Splitter.java | 2 +- .../apache/accumulo/manager/state/TableCounts.java | 2 +- .../manager/tableOps/ChangeTableState.java | 6 +++--- .../accumulo/manager/tableOps/TraceRepo.java | 4 ++-- .../tableOps/bulkVer2/CleanUpBulkImport.java | 2 +- .../manager/tableOps/clone/CloneMetadata.java | 2 +- .../manager/tableOps/clone/ClonePermissions.java | 2 +- .../manager/tableOps/clone/CloneTable.java | 2 +- .../manager/tableOps/clone/CloneZookeeper.java | 2 +- .../manager/tableOps/clone/FinishCloneTable.java | 2 +- .../manager/tableOps/compact/CompactRange.java | 2 +- .../manager/tableOps/compact/CompactionDriver.java | 4 ++-- .../tableOps/compact/cancel/CancelCompactions.java | 4 ++-- .../compact/cancel/FinishCancelCompaction.java | 4 ++-- .../manager/tableOps/create/SetupPermissions.java | 2 +- .../accumulo/manager/tableOps/delete/CleanUp.java | 4 ++-- .../manager/tableOps/delete/DeleteTable.java | 4 ++-- .../manager/tableOps/delete/PreDeleteTable.java | 4 ++-- .../tableOps/namespace/create/CreateNamespace.java | 2 +- .../namespace/create/FinishCreateNamespace.java | 2 +- .../create/SetupNamespacePermissions.java | 2 +- .../tableOps/namespace/delete/DeleteNamespace.java | 2 +- .../namespace/delete/NamespaceCleanUp.java | 2 +- .../tableOps/namespace/rename/RenameNamespace.java | 6 +++--- .../manager/tableOps/rename/RenameTable.java | 8 ++++---- .../tableOps/tableImport/CreateImportDir.java | 2 +- .../tableOps/tableImport/FinishImportTable.java | 2 +- .../tableImport/ImportPopulateZookeeper.java | 2 +- .../tableImport/ImportSetupPermissions.java | 2 +- .../tableOps/tableImport/MapImportFileNames.java | 2 +- .../tableOps/tableImport/MoveExportedFiles.java | 2 +- 44 files changed, 77 insertions(+), 77 deletions(-) diff --git a/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoop/mapreduce/partition/KeyRangePartitioner.java b/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoop/mapreduce/partition/KeyRangePartitioner.java index c28133a3ec..e7d2e99c3f 100644 --- a/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoop/mapreduce/partition/KeyRangePartitioner.java +++ b/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoop/mapreduce/partition/KeyRangePartitioner.java @@ -31,7 +31,7 @@ import org.apache.hadoop.mapreduce.Partitioner; * @since 2.0.0 */ public class KeyRangePartitioner extends Partitioner<Key,Writable> implements Configurable { - private RangePartitioner rp = new RangePartitioner(); + private final RangePartitioner rp = new RangePartitioner(); @Override public int getPartition(Key key, Writable value, int numPartitions) { diff --git a/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoopImpl/mapred/AccumuloRecordWriter.java b/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoopImpl/mapred/AccumuloRecordWriter.java index a29caf9c7f..af698505b3 100644 --- a/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoopImpl/mapred/AccumuloRecordWriter.java +++ b/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoopImpl/mapred/AccumuloRecordWriter.java @@ -52,11 +52,11 @@ public class AccumuloRecordWriter implements RecordWriter<Text,Mutation> { private static final Class<AccumuloOutputFormat> CLASS = AccumuloOutputFormat.class; private static final Logger log = LoggerFactory.getLogger(AccumuloRecordWriter.class); private MultiTableBatchWriter mtbw = null; - private HashMap<Text,BatchWriter> bws; - private Text defaultTableName; + private final HashMap<Text,BatchWriter> bws; + private final Text defaultTableName; - private boolean simulate; - private boolean createTables; + private final boolean simulate; + private final boolean createTables; private long mutCount = 0; private long valCount = 0; diff --git a/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoopImpl/mapreduce/AccumuloRecordWriter.java b/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoopImpl/mapreduce/AccumuloRecordWriter.java index fb21102ff2..5aa41ac618 100644 --- a/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoopImpl/mapreduce/AccumuloRecordWriter.java +++ b/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoopImpl/mapreduce/AccumuloRecordWriter.java @@ -53,10 +53,10 @@ public class AccumuloRecordWriter extends RecordWriter<Text,Mutation> { private static final Logger log = LoggerFactory.getLogger(AccumuloRecordWriter.class); private MultiTableBatchWriter mtbw = null; private final HashMap<Text,BatchWriter> bws; - private Text defaultTableName; + private final Text defaultTableName; - private boolean simulate; - private boolean createTables; + private final boolean simulate; + private final boolean createTables; private long mutCount = 0; private long valCount = 0; diff --git a/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoopImpl/mapreduce/FileOutputFormatBuilderImpl.java b/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoopImpl/mapreduce/FileOutputFormatBuilderImpl.java index 36a3f73db1..3fd301c7a3 100644 --- a/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoopImpl/mapreduce/FileOutputFormatBuilderImpl.java +++ b/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoopImpl/mapreduce/FileOutputFormatBuilderImpl.java @@ -36,7 +36,7 @@ import org.apache.hadoop.mapreduce.Job; public class FileOutputFormatBuilderImpl<T> implements FileOutputFormatBuilder, FileOutputFormatBuilder.PathParams<T>, FileOutputFormatBuilder.OutputOptions<T> { - Class<?> callingClass; + final Class<?> callingClass; Path outputPath; Optional<String> comp = Optional.empty(); Optional<Long> dataBlockSize = Optional.empty(); diff --git a/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoopImpl/mapreduce/InputFormatBuilderImpl.java b/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoopImpl/mapreduce/InputFormatBuilderImpl.java index c97de2b697..c097b5f272 100644 --- a/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoopImpl/mapreduce/InputFormatBuilderImpl.java +++ b/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoopImpl/mapreduce/InputFormatBuilderImpl.java @@ -46,7 +46,7 @@ public class InputFormatBuilderImpl<T> implements InputFormatBuilder, InputFormatBuilder.ClientParams<T>, InputFormatBuilder.TableParams<T>, InputFormatBuilder.InputFormatOptions<T> { - private Class<?> callingClass; + private final Class<?> callingClass; private Properties clientProps; private String clientPropsPath; private String currentTable; diff --git a/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoopImpl/mapreduce/OutputFormatBuilderImpl.java b/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoopImpl/mapreduce/OutputFormatBuilderImpl.java index f6a5c4d3b7..80fd02ccdf 100644 --- a/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoopImpl/mapreduce/OutputFormatBuilderImpl.java +++ b/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoopImpl/mapreduce/OutputFormatBuilderImpl.java @@ -37,7 +37,7 @@ public class OutputFormatBuilderImpl<T> // optional values private Optional<String> defaultTableName = Optional.empty(); private boolean createTables = false; - private boolean simulationMode = false; + private final boolean simulationMode = false; public OutputFormatBuilderImpl(Class<?> callingClass) { this.callingClass = callingClass; diff --git a/server/compactor/src/main/java/org/apache/accumulo/compactor/ExtCEnv.java b/server/compactor/src/main/java/org/apache/accumulo/compactor/ExtCEnv.java index 490e5908ba..62498e5ab2 100644 --- a/server/compactor/src/main/java/org/apache/accumulo/compactor/ExtCEnv.java +++ b/server/compactor/src/main/java/org/apache/accumulo/compactor/ExtCEnv.java @@ -37,12 +37,12 @@ import com.google.common.annotations.VisibleForTesting; public class ExtCEnv implements CompactionEnv { private final CompactionJobHolder jobHolder; - private TExternalCompactionJob job; - private String groupName; + private final TExternalCompactionJob job; + private final String groupName; public static class CompactorIterEnv extends TabletIteratorEnvironment { - private String groupName; + private final String groupName; public CompactorIterEnv(ServerContext context, IteratorScope scope, boolean fullMajC, AccumuloConfiguration tableConfig, TableId tableId, CompactionKind kind, String groupName) { diff --git a/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java b/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java index a4c9b5f574..d0e76b5286 100644 --- a/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java +++ b/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java @@ -91,7 +91,7 @@ public class SimpleGarbageCollector extends AbstractServer implements Iface { private final GcCycleMetrics gcCycleMetrics = new GcCycleMetrics(); private ServiceLock gcLock; - private Timer lastCompactorCheck = Timer.startNew(); + private final Timer lastCompactorCheck = Timer.startNew(); SimpleGarbageCollector(ConfigOpts opts, String[] args) { super("gc", opts, ServerContext::new, args); diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/TabletGroupWatcher.java b/server/manager/src/main/java/org/apache/accumulo/manager/TabletGroupWatcher.java index 94bf353ffb..9ebe9eee42 100644 --- a/server/manager/src/main/java/org/apache/accumulo/manager/TabletGroupWatcher.java +++ b/server/manager/src/main/java/org/apache/accumulo/manager/TabletGroupWatcher.java @@ -120,7 +120,7 @@ abstract class TabletGroupWatcher extends AccumuloDaemonThread { private SortedSet<TServerInstance> lastScanServers = Collections.emptySortedSet(); private final EventHandler eventHandler; private final ManagerMetrics metrics; - private WalStateManager walStateManager; + private final WalStateManager walStateManager; private volatile Set<TServerInstance> filteredServersToShutdown = Set.of(); TabletGroupWatcher(Manager manager, TabletStateStore store, TabletGroupWatcher dependentWatcher, @@ -411,7 +411,7 @@ abstract class TabletGroupWatcher extends AccumuloDaemonThread { } private static class TableMgmtStats { - int[] counts = new int[TabletState.values().length]; + final int[] counts = new int[TabletState.values().length]; private int totalUnloaded; private long totalVolumeReplacements; private int tabletsWithErrors; diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/CompactionCoordinator.java b/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/CompactionCoordinator.java index 9b31ca33f1..85b0492860 100644 --- a/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/CompactionCoordinator.java +++ b/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/CompactionCoordinator.java @@ -176,7 +176,7 @@ public class CompactionCoordinator private final CompactionJobQueues jobQueues; private final AtomicReference<Map<FateInstanceType,Fate<Manager>>> fateInstances; // Exposed for tests - protected CountDownLatch shutdown = new CountDownLatch(1); + protected final CountDownLatch shutdown = new CountDownLatch(1); private final ScheduledThreadPoolExecutor schedExecutor; @@ -185,7 +185,7 @@ public class CompactionCoordinator private final Cache<Path,Integer> tabletDirCache; private final DeadCompactionDetector deadCompactionDetector; - private QueueMetrics queueMetrics; + private final QueueMetrics queueMetrics; private final Manager manager; private final LoadingCache<String,Integer> compactorCounts; diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/compaction/queue/CompactionJobPriorityQueue.java b/server/manager/src/main/java/org/apache/accumulo/manager/compaction/queue/CompactionJobPriorityQueue.java index 9a4c726463..2e868360df 100644 --- a/server/manager/src/main/java/org/apache/accumulo/manager/compaction/queue/CompactionJobPriorityQueue.java +++ b/server/manager/src/main/java/org/apache/accumulo/manager/compaction/queue/CompactionJobPriorityQueue.java @@ -108,7 +108,7 @@ public class CompactionJobPriorityQueue { // efficiently removing entries from anywhere in the queue. Efficient removal is needed for the // case where tablets decided to issues different compaction jobs than what is currently queued. private final TreeMap<CjpqKey,CompactionJobQueues.MetaJob> jobQueue; - private AtomicInteger maxSize; + private final AtomicInteger maxSize; private final AtomicLong rejectedJobs; private final AtomicLong dequeuedJobs; private final ArrayDeque<CompletableFuture<CompactionJobQueues.MetaJob>> futures; diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/recovery/RecoveryManager.java b/server/manager/src/main/java/org/apache/accumulo/manager/recovery/RecoveryManager.java index d0eeb9b58d..7a5250070b 100644 --- a/server/manager/src/main/java/org/apache/accumulo/manager/recovery/RecoveryManager.java +++ b/server/manager/src/main/java/org/apache/accumulo/manager/recovery/RecoveryManager.java @@ -59,13 +59,13 @@ public class RecoveryManager { private static final Logger log = LoggerFactory.getLogger(RecoveryManager.class); - private Map<String,Long> recoveryDelay = new HashMap<>(); - private Set<String> closeTasksQueued = new HashSet<>(); - private Set<String> sortsQueued = new HashSet<>(); - private Cache<Path,Boolean> existenceCache; - private ScheduledExecutorService executor; - private Manager manager; - private ZooCache zooCache; + private final Map<String,Long> recoveryDelay = new HashMap<>(); + private final Set<String> closeTasksQueued = new HashSet<>(); + private final Set<String> sortsQueued = new HashSet<>(); + private final Cache<Path,Boolean> existenceCache; + private final ScheduledExecutorService executor; + private final Manager manager; + private final ZooCache zooCache; public RecoveryManager(Manager manager, long timeToCacheExistsInMillis) { this.manager = manager; @@ -88,10 +88,10 @@ public class RecoveryManager { } private class LogSortTask implements Runnable { - private String source; - private String destination; - private String sortId; - private LogCloser closer; + private final String source; + private final String destination; + private final String sortId; + private final LogCloser closer; public LogSortTask(LogCloser closer, String source, String destination, String sortId) { this.closer = closer; diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/split/SeedSplitTask.java b/server/manager/src/main/java/org/apache/accumulo/manager/split/SeedSplitTask.java index f63047ee54..95904229aa 100644 --- a/server/manager/src/main/java/org/apache/accumulo/manager/split/SeedSplitTask.java +++ b/server/manager/src/main/java/org/apache/accumulo/manager/split/SeedSplitTask.java @@ -33,7 +33,7 @@ public class SeedSplitTask implements Runnable { private static final Logger log = LoggerFactory.getLogger(SeedSplitTask.class); private final Manager manager; - private KeyExtent extent; + private final KeyExtent extent; public SeedSplitTask(Manager manager, KeyExtent extent) { this.manager = manager; diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/split/Splitter.java b/server/manager/src/main/java/org/apache/accumulo/manager/split/Splitter.java index b2ff72b419..9a99465820 100644 --- a/server/manager/src/main/java/org/apache/accumulo/manager/split/Splitter.java +++ b/server/manager/src/main/java/org/apache/accumulo/manager/split/Splitter.java @@ -147,7 +147,7 @@ public class Splitter { } - LoadingCache<CacheKey,FileInfo> splitFileCache; + final LoadingCache<CacheKey,FileInfo> splitFileCache; public Splitter(ServerContext context) { int numThreads = context.getConfiguration().getCount(Property.MANAGER_SPLIT_WORKER_THREADS); diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/state/TableCounts.java b/server/manager/src/main/java/org/apache/accumulo/manager/state/TableCounts.java index 0f1b4ca6fa..e8f480852b 100644 --- a/server/manager/src/main/java/org/apache/accumulo/manager/state/TableCounts.java +++ b/server/manager/src/main/java/org/apache/accumulo/manager/state/TableCounts.java @@ -21,7 +21,7 @@ package org.apache.accumulo.manager.state; import org.apache.accumulo.core.metadata.TabletState; public class TableCounts { - int[] counts = new int[TabletState.values().length]; + final int[] counts = new int[TabletState.values().length]; public int unassigned() { return counts[TabletState.UNASSIGNED.ordinal()]; diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/ChangeTableState.java b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/ChangeTableState.java index 378f72460d..bbd894f062 100644 --- a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/ChangeTableState.java +++ b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/ChangeTableState.java @@ -33,9 +33,9 @@ import org.slf4j.LoggerFactory; public class ChangeTableState extends ManagerRepo { private static final long serialVersionUID = 1L; - private TableId tableId; - private NamespaceId namespaceId; - private TableOperation top; + private final TableId tableId; + private final NamespaceId namespaceId; + private final TableOperation top; private final EnumSet<TableState> expectedCurrStates; public ChangeTableState(NamespaceId namespaceId, TableId tableId, TableOperation top, diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/TraceRepo.java b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/TraceRepo.java index 1c6227862e..dc8ce2a04c 100644 --- a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/TraceRepo.java +++ b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/TraceRepo.java @@ -33,8 +33,8 @@ public class TraceRepo<T> implements Repo<T> { private static final long serialVersionUID = 1L; - TInfo tinfo; - Repo<T> repo; + final TInfo tinfo; + final Repo<T> repo; public TraceRepo(Repo<T> repo) { this.repo = repo; diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/bulkVer2/CleanUpBulkImport.java b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/bulkVer2/CleanUpBulkImport.java index 0210584cb5..3200369525 100644 --- a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/bulkVer2/CleanUpBulkImport.java +++ b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/bulkVer2/CleanUpBulkImport.java @@ -50,7 +50,7 @@ public class CleanUpBulkImport extends ManagerRepo { private static final Logger log = LoggerFactory.getLogger(CleanUpBulkImport.class); - private BulkInfo info; + private final BulkInfo info; public CleanUpBulkImport(BulkInfo info) { this.info = info; diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/clone/CloneMetadata.java b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/clone/CloneMetadata.java index 4e10c777b5..e7b554b559 100644 --- a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/clone/CloneMetadata.java +++ b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/clone/CloneMetadata.java @@ -28,7 +28,7 @@ import org.slf4j.LoggerFactory; class CloneMetadata extends ManagerRepo { private static final long serialVersionUID = 1L; - private CloneInfo cloneInfo; + private final CloneInfo cloneInfo; public CloneMetadata(CloneInfo cloneInfo) { this.cloneInfo = cloneInfo; diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/clone/ClonePermissions.java b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/clone/ClonePermissions.java index 338cd270a5..474aab0a14 100644 --- a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/clone/ClonePermissions.java +++ b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/clone/ClonePermissions.java @@ -34,7 +34,7 @@ class ClonePermissions extends ManagerRepo { private static final long serialVersionUID = 1L; - private CloneInfo cloneInfo; + private final CloneInfo cloneInfo; public ClonePermissions(CloneInfo cloneInfo) { this.cloneInfo = cloneInfo; diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/clone/CloneTable.java b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/clone/CloneTable.java index b0c6bb6262..4899723952 100644 --- a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/clone/CloneTable.java +++ b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/clone/CloneTable.java @@ -34,7 +34,7 @@ import org.apache.accumulo.manager.tableOps.Utils; public class CloneTable extends ManagerRepo { private static final long serialVersionUID = 1L; - private CloneInfo cloneInfo; + private final CloneInfo cloneInfo; public CloneTable(String user, NamespaceId namespaceId, TableId srcTableId, String tableName, Map<String,String> propertiesToSet, Set<String> propertiesToExclude, boolean keepOffline) { diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/clone/CloneZookeeper.java b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/clone/CloneZookeeper.java index 4163a4a259..5b7dbdfd0c 100644 --- a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/clone/CloneZookeeper.java +++ b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/clone/CloneZookeeper.java @@ -34,7 +34,7 @@ class CloneZookeeper extends ManagerRepo { private static final long serialVersionUID = 1L; - private CloneInfo cloneInfo; + private final CloneInfo cloneInfo; public CloneZookeeper(CloneInfo cloneInfo, ClientContext context) throws NamespaceNotFoundException { diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/clone/FinishCloneTable.java b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/clone/FinishCloneTable.java index 8dff1c78f1..1730a81792 100644 --- a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/clone/FinishCloneTable.java +++ b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/clone/FinishCloneTable.java @@ -32,7 +32,7 @@ import org.slf4j.LoggerFactory; class FinishCloneTable extends ManagerRepo { private static final long serialVersionUID = 1L; - private CloneInfo cloneInfo; + private final CloneInfo cloneInfo; public FinishCloneTable(CloneInfo cloneInfo) { this.cloneInfo = cloneInfo; diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/compact/CompactRange.java b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/compact/CompactRange.java index a42b41088c..bba52a18a1 100644 --- a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/compact/CompactRange.java +++ b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/compact/CompactRange.java @@ -56,7 +56,7 @@ public class CompactRange extends ManagerRepo { private final NamespaceId namespaceId; private byte[] startRow; private byte[] endRow; - private byte[] config; + private final byte[] config; public CompactRange(NamespaceId namespaceId, TableId tableId, CompactionConfig compactionConfig) throws AcceptableThriftTableOperationException { diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/compact/CompactionDriver.java b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/compact/CompactionDriver.java index 990b1a0d74..758245c447 100644 --- a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/compact/CompactionDriver.java +++ b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/compact/CompactionDriver.java @@ -77,8 +77,8 @@ public class CompactionDriver extends ManagerRepo { private final TableId tableId; private final NamespaceId namespaceId; - private byte[] startRow; - private byte[] endRow; + private final byte[] startRow; + private final byte[] endRow; public CompactionDriver(NamespaceId namespaceId, TableId tableId, byte[] startRow, byte[] endRow) { diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/compact/cancel/CancelCompactions.java b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/compact/cancel/CancelCompactions.java index 9868ce94bc..77ebb9a001 100644 --- a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/compact/cancel/CancelCompactions.java +++ b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/compact/cancel/CancelCompactions.java @@ -34,8 +34,8 @@ import org.slf4j.LoggerFactory; public class CancelCompactions extends ManagerRepo { private static final long serialVersionUID = 1L; - private TableId tableId; - private NamespaceId namespaceId; + private final TableId tableId; + private final NamespaceId namespaceId; private static final Logger log = LoggerFactory.getLogger(CancelCompactions.class); diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/compact/cancel/FinishCancelCompaction.java b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/compact/cancel/FinishCancelCompaction.java index fab9e487fb..2674663031 100644 --- a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/compact/cancel/FinishCancelCompaction.java +++ b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/compact/cancel/FinishCancelCompaction.java @@ -29,8 +29,8 @@ import org.apache.accumulo.manager.tableOps.Utils; class FinishCancelCompaction extends ManagerRepo { private static final long serialVersionUID = 1L; - private TableId tableId; - private NamespaceId namespaceId; + private final TableId tableId; + private final NamespaceId namespaceId; public FinishCancelCompaction(NamespaceId namespaceId, TableId tableId) { this.tableId = tableId; diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/create/SetupPermissions.java b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/create/SetupPermissions.java index b39d7db9bc..19787fb41d 100644 --- a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/create/SetupPermissions.java +++ b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/create/SetupPermissions.java @@ -32,7 +32,7 @@ class SetupPermissions extends ManagerRepo { private static final long serialVersionUID = 1L; - private TableInfo tableInfo; + private final TableInfo tableInfo; SetupPermissions(TableInfo ti) { this.tableInfo = ti; diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/delete/CleanUp.java b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/delete/CleanUp.java index 9dd234eba9..9944c14265 100644 --- a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/delete/CleanUp.java +++ b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/delete/CleanUp.java @@ -56,8 +56,8 @@ class CleanUp extends ManagerRepo { private static final long serialVersionUID = 1L; - private TableId tableId; - private NamespaceId namespaceId; + private final TableId tableId; + private final NamespaceId namespaceId; private long creationTime; diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/delete/DeleteTable.java b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/delete/DeleteTable.java index 893fff7fe9..08da62a949 100644 --- a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/delete/DeleteTable.java +++ b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/delete/DeleteTable.java @@ -35,8 +35,8 @@ public class DeleteTable extends ManagerRepo { private static final long serialVersionUID = 1L; - private TableId tableId; - private NamespaceId namespaceId; + private final TableId tableId; + private final NamespaceId namespaceId; public DeleteTable(NamespaceId namespaceId, TableId tableId) { this.namespaceId = namespaceId; diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/delete/PreDeleteTable.java b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/delete/PreDeleteTable.java index 6094960b38..72d4e2874a 100644 --- a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/delete/PreDeleteTable.java +++ b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/delete/PreDeleteTable.java @@ -43,8 +43,8 @@ public class PreDeleteTable extends ManagerRepo { private static final long serialVersionUID = 1L; - private TableId tableId; - private NamespaceId namespaceId; + private final TableId tableId; + private final NamespaceId namespaceId; public PreDeleteTable(NamespaceId namespaceId, TableId tableId) { this.tableId = tableId; diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/namespace/create/CreateNamespace.java b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/namespace/create/CreateNamespace.java index 854bc28aa6..61585037cf 100644 --- a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/namespace/create/CreateNamespace.java +++ b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/namespace/create/CreateNamespace.java @@ -30,7 +30,7 @@ import org.apache.accumulo.manager.tableOps.Utils; public class CreateNamespace extends ManagerRepo { private static final long serialVersionUID = 1L; - private NamespaceInfo namespaceInfo; + private final NamespaceInfo namespaceInfo; public CreateNamespace(String user, String namespaceName, Map<String,String> props) { namespaceInfo = new NamespaceInfo(); diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/namespace/create/FinishCreateNamespace.java b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/namespace/create/FinishCreateNamespace.java index 95d1419706..550ce2ab80 100644 --- a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/namespace/create/FinishCreateNamespace.java +++ b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/namespace/create/FinishCreateNamespace.java @@ -30,7 +30,7 @@ class FinishCreateNamespace extends ManagerRepo { private static final long serialVersionUID = 1L; - private NamespaceInfo namespaceInfo; + private final NamespaceInfo namespaceInfo; public FinishCreateNamespace(NamespaceInfo ti) { this.namespaceInfo = ti; diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/namespace/create/SetupNamespacePermissions.java b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/namespace/create/SetupNamespacePermissions.java index bee3a21a51..e2aa1b7a49 100644 --- a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/namespace/create/SetupNamespacePermissions.java +++ b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/namespace/create/SetupNamespacePermissions.java @@ -31,7 +31,7 @@ class SetupNamespacePermissions extends ManagerRepo { private static final long serialVersionUID = 1L; - private NamespaceInfo namespaceInfo; + private final NamespaceInfo namespaceInfo; public SetupNamespacePermissions(NamespaceInfo ti) { this.namespaceInfo = ti; diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/namespace/delete/DeleteNamespace.java b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/namespace/delete/DeleteNamespace.java index 44dc9a950c..6de8c92a18 100644 --- a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/namespace/delete/DeleteNamespace.java +++ b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/namespace/delete/DeleteNamespace.java @@ -31,7 +31,7 @@ public class DeleteNamespace extends ManagerRepo { private static final long serialVersionUID = 1L; - private NamespaceId namespaceId; + private final NamespaceId namespaceId; public DeleteNamespace(NamespaceId namespaceId) { this.namespaceId = namespaceId; diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/namespace/delete/NamespaceCleanUp.java b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/namespace/delete/NamespaceCleanUp.java index e3b9337e0a..e02d0e45c2 100644 --- a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/namespace/delete/NamespaceCleanUp.java +++ b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/namespace/delete/NamespaceCleanUp.java @@ -35,7 +35,7 @@ class NamespaceCleanUp extends ManagerRepo { private static final long serialVersionUID = 1L; - private NamespaceId namespaceId; + private final NamespaceId namespaceId; public NamespaceCleanUp(NamespaceId namespaceId) { this.namespaceId = namespaceId; diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/namespace/rename/RenameNamespace.java b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/namespace/rename/RenameNamespace.java index 40ce34db1b..82763a9835 100644 --- a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/namespace/rename/RenameNamespace.java +++ b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/namespace/rename/RenameNamespace.java @@ -37,9 +37,9 @@ import org.slf4j.LoggerFactory; public class RenameNamespace extends ManagerRepo { private static final long serialVersionUID = 1L; - private NamespaceId namespaceId; - private String oldName; - private String newName; + private final NamespaceId namespaceId; + private final String oldName; + private final String newName; @Override public long isReady(FateId fateId, Manager environment) throws Exception { diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/rename/RenameTable.java b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/rename/RenameTable.java index f826066e54..8926a801a9 100644 --- a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/rename/RenameTable.java +++ b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/rename/RenameTable.java @@ -42,10 +42,10 @@ import org.slf4j.LoggerFactory; public class RenameTable extends ManagerRepo { private static final long serialVersionUID = 1L; - private TableId tableId; - private NamespaceId namespaceId; - private String oldTableName; - private String newTableName; + private final TableId tableId; + private final NamespaceId namespaceId; + private final String oldTableName; + private final String newTableName; @Override public long isReady(FateId fateId, Manager env) throws Exception { diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/tableImport/CreateImportDir.java b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/tableImport/CreateImportDir.java index 2102a08fcb..2639241e7b 100644 --- a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/tableImport/CreateImportDir.java +++ b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/tableImport/CreateImportDir.java @@ -35,7 +35,7 @@ class CreateImportDir extends ManagerRepo { private static final Logger log = LoggerFactory.getLogger(CreateImportDir.class); private static final long serialVersionUID = 1L; - private ImportedTableInfo tableInfo; + private final ImportedTableInfo tableInfo; CreateImportDir(ImportedTableInfo ti) { this.tableInfo = ti; diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/tableImport/FinishImportTable.java b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/tableImport/FinishImportTable.java index a5a55dcd6c..707f708e3d 100644 --- a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/tableImport/FinishImportTable.java +++ b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/tableImport/FinishImportTable.java @@ -36,7 +36,7 @@ class FinishImportTable extends ManagerRepo { private static final long serialVersionUID = 1L; - private ImportedTableInfo tableInfo; + private final ImportedTableInfo tableInfo; public FinishImportTable(ImportedTableInfo ti) { this.tableInfo = ti; diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/tableImport/ImportPopulateZookeeper.java b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/tableImport/ImportPopulateZookeeper.java index 1825477df1..fda9186597 100644 --- a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/tableImport/ImportPopulateZookeeper.java +++ b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/tableImport/ImportPopulateZookeeper.java @@ -44,7 +44,7 @@ class ImportPopulateZookeeper extends ManagerRepo { private static final long serialVersionUID = 1L; - private ImportedTableInfo tableInfo; + private final ImportedTableInfo tableInfo; ImportPopulateZookeeper(ImportedTableInfo ti) { this.tableInfo = ti; diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/tableImport/ImportSetupPermissions.java b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/tableImport/ImportSetupPermissions.java index e462a169c2..f92be7c1fa 100644 --- a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/tableImport/ImportSetupPermissions.java +++ b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/tableImport/ImportSetupPermissions.java @@ -31,7 +31,7 @@ class ImportSetupPermissions extends ManagerRepo { private static final long serialVersionUID = 1L; - private ImportedTableInfo tableInfo; + private final ImportedTableInfo tableInfo; public ImportSetupPermissions(ImportedTableInfo ti) { this.tableInfo = ti; diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/tableImport/MapImportFileNames.java b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/tableImport/MapImportFileNames.java index 9cb94144e1..f0fefaa3ad 100644 --- a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/tableImport/MapImportFileNames.java +++ b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/tableImport/MapImportFileNames.java @@ -45,7 +45,7 @@ class MapImportFileNames extends ManagerRepo { private static final long serialVersionUID = 1L; - private ImportedTableInfo tableInfo; + private final ImportedTableInfo tableInfo; MapImportFileNames(ImportedTableInfo ti) { this.tableInfo = ti; diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/tableImport/MoveExportedFiles.java b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/tableImport/MoveExportedFiles.java index 12adab912a..432d6c9a32 100644 --- a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/tableImport/MoveExportedFiles.java +++ b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/tableImport/MoveExportedFiles.java @@ -51,7 +51,7 @@ class MoveExportedFiles extends ManagerRepo { private static final long serialVersionUID = 1L; - private ImportedTableInfo tableInfo; + private final ImportedTableInfo tableInfo; MoveExportedFiles(ImportedTableInfo ti) { this.tableInfo = ti;