accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ktur...@apache.org
Subject [accumulo] branch master updated: Sort Modifiers for consistency. (#665)
Date Tue, 02 Oct 2018 14:47:56 GMT
This is an automated email from the ASF dual-hosted git repository.

kturner pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/master by this push:
     new 08644e6  Sort Modifiers for consistency. (#665)
08644e6 is described below

commit 08644e6858f2aa9b2f4ebf6e3d9cfdd70eb9e77d
Author: Christopher McTague <cjmctague@apache.org>
AuthorDate: Tue Oct 2 10:47:40 2018 -0400

    Sort Modifiers for consistency. (#665)
---
 .../accumulo/core/client/impl/BulkImport.java      |  2 +-
 .../core/client/impl/TabletServerBatchWriter.java  |  2 +-
 .../core/constraints/DefaultKeySizeConstraint.java |  2 +-
 .../org/apache/accumulo/core/data/KeyBuilder.java  |  2 +-
 .../core/file/blockfile/cache/lru/CachedBlock.java |  2 +-
 .../file/blockfile/cache/lru/LruBlockCache.java    |  2 +-
 .../accumulo/core/file/rfile/MultiLevelIndex.java  |  4 +--
 .../accumulo/core/file/rfile/bcfile/BCFile.java    | 12 ++++-----
 .../apache/accumulo/core/iterators/OrIterator.java |  8 +++---
 .../core/iterators/system/HeapIterator.java        | 12 ++++-----
 .../core/iterators/user/BigDecimalCombiner.java    |  2 +-
 .../core/iterators/user/IndexedDocIterator.java    |  2 +-
 .../core/iterators/user/TransformingIterator.java  |  6 ++---
 .../accumulo/core/security/ColumnVisibility.java   |  2 +-
 .../core/security/NamespacePermission.java         |  4 +--
 .../accumulo/core/security/TablePermission.java    |  4 +--
 .../accumulo/core/tabletserver/log/LogEntry.java   |  4 +--
 .../org/apache/accumulo/core/util/AddressUtil.java |  2 +-
 .../accumulo/core/util/CachedConfiguration.java    |  4 +--
 .../accumulo/core/util/LocalityGroupUtil.java      |  4 +--
 .../java/org/apache/accumulo/fate/AgeOffStore.java |  2 +-
 .../main/java/org/apache/accumulo/fate/Fate.java   |  2 +-
 .../org/apache/accumulo/fate/util/AddressUtil.java |  2 +-
 .../fate/zookeeper/DistributedReadWriteLock.java   |  2 +-
 .../fate/zookeeper/TransactionWatcher.java         |  4 +--
 .../apache/accumulo/fate/zookeeper/ZooLock.java    |  2 +-
 .../iterators/user/IndexedDocIteratorTest.java     |  2 +-
 .../iterators/user/TransformingIteratorTest.java   |  2 +-
 .../org/apache/accumulo/core/util/MergeTest.java   |  2 +-
 .../zookeeper/DistributedReadWriteLockTest.java    |  6 ++---
 .../fate/zookeeper/TransactionWatcherTest.java     |  2 +-
 .../org/apache/accumulo/proxy/ProxyServer.java     |  4 +--
 .../accumulo/server/client/BulkImporter.java       |  2 +-
 .../accumulo/server/conf/ServerConfiguration.java  |  6 ++---
 .../server/constraints/MetadataConstraints.java    |  4 +--
 .../accumulo/server/fs/VolumeManagerImpl.java      |  2 +-
 .../accumulo/server/log/WalStateManager.java       |  4 +--
 .../server/master/balancer/TabletBalancer.java     |  4 +--
 .../server/master/state/MetaDataStateStore.java    |  6 ++---
 .../server/master/state/MetaDataTableScanner.java  |  2 +-
 .../server/master/state/TabletLocationState.java   | 16 ++++++------
 .../server/master/state/TabletStateStore.java      | 14 +++++-----
 .../server/master/state/ZooTabletStateStore.java   |  2 +-
 .../server/metrics/MetricsConfiguration.java       |  2 +-
 .../apache/accumulo/server/monitor/LogService.java | 10 ++++----
 .../java/org/apache/accumulo/server/util/Halt.java |  2 +-
 .../accumulo/server/util/MetadataTableUtil.java    |  4 +--
 .../accumulo/server/util/ReplicationTableUtil.java |  4 +--
 .../server/util/time/BaseRelativeTime.java         |  4 +--
 .../master/balancer/TableLoadBalancerTest.java     |  4 +--
 .../apache/accumulo/master/EventCoordinator.java   |  2 +-
 .../java/org/apache/accumulo/master/Master.java    | 30 +++++++++++-----------
 .../master/metrics/Metrics2ReplicationMetrics.java |  2 +-
 .../apache/accumulo/master/state/MergeStats.java   |  2 +-
 .../apache/accumulo/master/tableOps/CleanUp.java   |  2 +-
 .../accumulo/master/tableOps/MasterRepo.java       |  2 +-
 .../master/tableOps/bulkVer2/LoadFiles.java        |  2 +-
 .../org/apache/accumulo/tracer/TraceFormatter.java |  2 +-
 .../org/apache/accumulo/tracer/TraceServer.java    | 18 ++++++-------
 .../org/apache/accumulo/tracer/ZooTraceClient.java |  4 +--
 .../tserver/compaction/CompactionStrategy.java     |  2 +-
 .../tserver/compaction/MajorCompactionRequest.java | 14 +++++-----
 .../strategies/ConfigurableCompactionStrategy.java |  6 ++---
 .../accumulo/tserver/log/TabletServerLogger.java   |  6 ++---
 .../org/apache/accumulo/tserver/tablet/Rate.java   |  4 +--
 .../apache/accumulo/tserver/tablet/ScanBatch.java  |  2 +-
 .../org/apache/accumulo/tserver/tablet/Tablet.java | 10 ++++----
 .../accumulo/tserver/tablet/TabletMemory.java      |  2 +-
 .../accumulo/tserver/logger/LogFileTest.java       |  2 +-
 .../main/java/org/apache/accumulo/shell/Shell.java |  2 +-
 .../vfs/AccumuloReloadingVFSClassLoader.java       |  2 +-
 .../classloader/vfs/AccumuloVFSClassLoader.java    |  2 +-
 .../start/classloader/vfs/ContextManager.java      |  2 +-
 .../org/apache/accumulo/test/BalanceFasterIT.java  |  2 +-
 .../org/apache/accumulo/test/HardListIterator.java |  2 +-
 .../org/apache/accumulo/test/LargeSplitRowIT.java  |  2 +-
 .../java/org/apache/accumulo/test/ManySplitIT.java |  2 +-
 .../org/apache/accumulo/test/ShellServerIT.java    |  6 ++---
 .../apache/accumulo/test/TestRandomDeletes.java    |  4 +--
 .../accumulo/test/VerifySerialRecoveryIT.java      |  4 +--
 .../test/functional/ConcurrentDeleteTableIT.java   |  2 +-
 .../test/functional/ConfigurableCompactionIT.java  |  2 +-
 .../accumulo/test/functional/DurabilityIT.java     |  2 +-
 .../test/functional/FunctionalTestUtils.java       |  6 ++---
 .../accumulo/test/functional/SlowIterator.java     |  4 +--
 .../accumulo/test/functional/ZombieTServer.java    |  4 +--
 .../test/performance/RollWALPerformanceIT.java     |  2 +-
 .../performance/metadata/FastBulkImportIT.java     |  2 +-
 .../test/performance/scan/CollectTabletStats.java  |  2 +-
 .../accumulo/test/proxy/SimpleProxyBase.java       |  2 +-
 .../security/KerberosTokenEmbeddedKDCTest.java     |  2 +-
 91 files changed, 190 insertions(+), 190 deletions(-)

diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/BulkImport.java b/core/src/main/java/org/apache/accumulo/core/client/impl/BulkImport.java
index 342139b..67f9c5d 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/BulkImport.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/BulkImport.java
@@ -195,7 +195,7 @@ public class BulkImport implements ImportDestinationArguments, ImportMappingOpti
     return this;
   }
 
-  private final static byte[] byte0 = {0};
+  private static final byte[] byte0 = {0};
 
   private static class MLong {
     public MLong(long i) {
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java b/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java
index a1f5be3..2b65f2f 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java
@@ -806,7 +806,7 @@ public class TabletServerBatchWriter {
 
     class SendTask implements Runnable {
 
-      final private String location;
+      private final String location;
 
       SendTask(String server) {
         this.location = server;
diff --git a/core/src/main/java/org/apache/accumulo/core/constraints/DefaultKeySizeConstraint.java b/core/src/main/java/org/apache/accumulo/core/constraints/DefaultKeySizeConstraint.java
index a2cc337..32e0ea7 100644
--- a/core/src/main/java/org/apache/accumulo/core/constraints/DefaultKeySizeConstraint.java
+++ b/core/src/main/java/org/apache/accumulo/core/constraints/DefaultKeySizeConstraint.java
@@ -41,7 +41,7 @@ public class DefaultKeySizeConstraint implements Constraint {
     return null;
   }
 
-  final static List<Short> NO_VIOLATIONS = new ArrayList<>();
+  static final List<Short> NO_VIOLATIONS = new ArrayList<>();
 
   @Override
   public List<Short> check(Environment env, Mutation mutation) {
diff --git a/core/src/main/java/org/apache/accumulo/core/data/KeyBuilder.java b/core/src/main/java/org/apache/accumulo/core/data/KeyBuilder.java
index 495edd6..4a2221b 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/KeyBuilder.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/KeyBuilder.java
@@ -432,7 +432,7 @@ public class KeyBuilder {
     }
 
     @Override
-    final public Build timestamp(long timestamp) {
+    public final Build timestamp(long timestamp) {
       this.timestamp = timestamp;
       return this;
     }
diff --git a/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/lru/CachedBlock.java b/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/lru/CachedBlock.java
index 87a734d..08282c0 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/lru/CachedBlock.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/lru/CachedBlock.java
@@ -35,7 +35,7 @@ import org.apache.accumulo.core.spi.cache.CacheEntry.Weighable;
  */
 public class CachedBlock implements HeapSize, Comparable<CachedBlock> {
 
-  public final static long PER_BLOCK_OVERHEAD = ClassSize
+  public static final long PER_BLOCK_OVERHEAD = ClassSize
       .align(ClassSize.OBJECT + (3 * ClassSize.REFERENCE) + (2 * SizeConstants.SIZEOF_LONG)
           + ClassSize.STRING + ClassSize.BYTE_BUFFER + ClassSize.REFERENCE);
 
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 6965ec0..dc6eb75 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
@@ -660,7 +660,7 @@ public class LruBlockCache extends SynchronousLoadingBlockCache implements Block
     }
   }
 
-  public final static long CACHE_FIXED_OVERHEAD = ClassSize
+  public static final long CACHE_FIXED_OVERHEAD = ClassSize
       .align((3 * SizeConstants.SIZEOF_LONG) + (8 * ClassSize.REFERENCE)
           + (5 * SizeConstants.SIZEOF_FLOAT) + SizeConstants.SIZEOF_BOOLEAN + ClassSize.OBJECT);
 
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 576c577..164fa77 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
@@ -131,7 +131,7 @@ public class MultiLevelIndex {
     }
   }
 
-  private static abstract class SerializedIndexBase<T> extends AbstractList<T>
+  private abstract static class SerializedIndexBase<T> extends AbstractList<T>
       implements RandomAccess {
     protected int[] offsets;
     protected byte[] data;
@@ -682,7 +682,7 @@ public class MultiLevelIndex {
       }
     }
 
-    static public class IndexIterator implements ListIterator<IndexEntry> {
+    public static class IndexIterator implements ListIterator<IndexEntry> {
 
       private Node node;
       private ListIterator<IndexEntry> liter;
diff --git a/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/BCFile.java b/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/BCFile.java
index 060ac00..f174650 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/BCFile.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/BCFile.java
@@ -104,7 +104,7 @@ public final class BCFile {
   /**
    * BCFile writer, the entry point for creating a new BCFile.
    */
-  static public class Writer implements Closeable {
+  public static class Writer implements Closeable {
     private final RateLimitedOutputStream out;
     private final Configuration conf;
     private FileEncrypter encrypter;
@@ -457,7 +457,7 @@ public final class BCFile {
   /**
    * BCFile Reader, interface to read the file's data and meta blocks.
    */
-  static public class Reader implements Closeable {
+  public static class Reader implements Closeable {
     private final SeekableDataInputStream in;
     private final Configuration conf;
     final DataIndex dataIndex;
@@ -470,7 +470,7 @@ public final class BCFile {
     /**
      * Intermediate class that maintain the state of a Readable Compression Block.
      */
-    static private final class RBlockState {
+    private static final class RBlockState {
       private final Algorithm compressAlgo;
       private Decompressor decompressor;
       private final BlockRegion region;
@@ -816,7 +816,7 @@ public final class BCFile {
   static final class MetaIndexEntry {
     private final String metaName;
     private final Algorithm compressionAlgorithm;
-    private final static String defaultPrefix = "data:";
+    private static final String defaultPrefix = "data:";
 
     private final BlockRegion region;
 
@@ -862,7 +862,7 @@ public final class BCFile {
    * Index of all compressed data blocks.
    */
   static class DataIndex {
-    final static String BLOCK_NAME = "BCFile.index";
+    static final String BLOCK_NAME = "BCFile.index";
 
     private final Algorithm defaultCompressionAlgorithm;
 
@@ -913,7 +913,7 @@ public final class BCFile {
    * Magic number uniquely identifying a BCFile in the header/footer.
    */
   static final class Magic {
-    private final static byte[] AB_MAGIC_BCFILE = {
+    private static final byte[] AB_MAGIC_BCFILE = {
         // ... total of 16 bytes
         (byte) 0xd1, (byte) 0x11, (byte) 0xd3, (byte) 0x68, (byte) 0x91, (byte) 0xb5, (byte) 0xd7,
         (byte) 0xb6, (byte) 0x39, (byte) 0xdf, (byte) 0x41, (byte) 0x40, (byte) 0x92, (byte) 0xba,
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 5134919..13c8d9d 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
@@ -197,7 +197,7 @@ public class OrIterator implements SortedKeyValueIterator<Key,Value>, OptionDesc
   }
 
   @Override
-  final public void next() throws IOException {
+  public final void next() throws IOException {
     LOG.trace("next()");
     if (currentTerm == null)
       return;
@@ -277,21 +277,21 @@ public class OrIterator implements SortedKeyValueIterator<Key,Value>, OptionDesc
   }
 
   @Override
-  final public Key getTopKey() {
+  public final Key getTopKey() {
     final Key k = currentTerm.iter.getTopKey();
     LOG.trace("getTopKey() = {}", k);
     return k;
   }
 
   @Override
-  final public Value getTopValue() {
+  public final Value getTopValue() {
     final Value v = currentTerm.iter.getTopValue();
     LOG.trace("getTopValue() = {}", v);
     return v;
   }
 
   @Override
-  final public boolean hasTop() {
+  public final boolean hasTop() {
     LOG.trace("hasTop()");
     return currentTerm != null;
   }
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/system/HeapIterator.java b/core/src/main/java/org/apache/accumulo/core/iterators/system/HeapIterator.java
index 43c15d9..a450474 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/system/HeapIterator.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/system/HeapIterator.java
@@ -49,22 +49,22 @@ public abstract class HeapIterator implements SortedKeyValueIterator<Key,Value>
   }
 
   @Override
-  final public Key getTopKey() {
+  public final Key getTopKey() {
     return topIdx.getTopKey();
   }
 
   @Override
-  final public Value getTopValue() {
+  public final Value getTopValue() {
     return topIdx.getTopValue();
   }
 
   @Override
-  final public boolean hasTop() {
+  public final boolean hasTop() {
     return topIdx != null;
   }
 
   @Override
-  final public void next() throws IOException {
+  public final void next() throws IOException {
     if (topIdx == null) {
       throw new IllegalStateException("Called next() when there is no top");
     }
@@ -106,13 +106,13 @@ public abstract class HeapIterator implements SortedKeyValueIterator<Key,Value>
     }
   }
 
-  final protected void clear() {
+  protected final void clear() {
     heap.clear();
     topIdx = null;
     nextKey = null;
   }
 
-  final protected void addSource(SortedKeyValueIterator<Key,Value> source) {
+  protected final void addSource(SortedKeyValueIterator<Key,Value> source) {
     if (source.hasTop()) {
       heap.add(source);
       if (topIdx != null) {
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/user/BigDecimalCombiner.java b/core/src/main/java/org/apache/accumulo/core/iterators/user/BigDecimalCombiner.java
index fedf0b9..abfcad3 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/user/BigDecimalCombiner.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/user/BigDecimalCombiner.java
@@ -36,7 +36,7 @@ import org.apache.accumulo.core.iterators.ValueFormatException;
  * BigDecimal String input/output functions.
  */
 public abstract class BigDecimalCombiner extends TypedValueCombiner<BigDecimal> {
-  private final static BigDecimalEncoder BDE = new BigDecimalEncoder();
+  private static final BigDecimalEncoder BDE = new BigDecimalEncoder();
 
   @Override
   public void init(SortedKeyValueIterator<Key,Value> source, Map<String,String> options,
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/user/IndexedDocIterator.java b/core/src/main/java/org/apache/accumulo/core/iterators/user/IndexedDocIterator.java
index 9257182..ab9840b 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/user/IndexedDocIterator.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/user/IndexedDocIterator.java
@@ -133,7 +133,7 @@ public class IndexedDocIterator extends IntersectingIterator {
   }
 
   @Override
-  synchronized public void init(SortedKeyValueIterator<Key,Value> source,
+  public synchronized void init(SortedKeyValueIterator<Key,Value> source,
       Map<String,String> options, IteratorEnvironment env) throws IOException {
     super.init(source, options, env);
     if (options.containsKey(indexFamilyOptionName))
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 4cfb044..e3da073 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
@@ -90,7 +90,7 @@ import org.slf4j.LoggerFactory;
  * iterator implements the security filtering rather than relying on a follow-on iterator to do it
  * so that we ensure the test is performed.
  */
-abstract public class TransformingIterator extends WrappingIterator implements OptionDescriber {
+public abstract class TransformingIterator extends WrappingIterator implements OptionDescriber {
   public static final String AUTH_OPT = "authorizations";
   public static final String MAX_BUFFER_SIZE_OPT = "maxBufferSize";
   private static final long DEFAULT_MAX_BUFFER_SIZE = 10000000;
@@ -675,7 +675,7 @@ abstract public class TransformingIterator extends WrappingIterator implements O
    *
    * @return the part of the key this iterator is not transforming
    */
-  abstract protected PartialKey getKeyPrefix();
+  protected abstract PartialKey getKeyPrefix();
 
   public interface KVBuffer {
     void append(Key key, Value val);
@@ -701,7 +701,7 @@ abstract public class TransformingIterator extends WrappingIterator implements O
    * @see #replaceKeyParts(Key, Text, Text)
    * @see #replaceKeyParts(Key, Text, Text, Text)
    */
-  abstract protected void transformRange(SortedKeyValueIterator<Key,Value> input, KVBuffer output)
+  protected abstract void transformRange(SortedKeyValueIterator<Key,Value> input, KVBuffer output)
       throws IOException;
 
   /**
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 19026d8..82f4a9a 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
@@ -105,7 +105,7 @@ public class ColumnVisibility {
     /**
      * An empty list of nodes.
      */
-    public final static List<Node> EMPTY = Collections.emptyList();
+    public static final List<Node> EMPTY = Collections.emptyList();
     NodeType type;
     int start;
     int end;
diff --git a/core/src/main/java/org/apache/accumulo/core/security/NamespacePermission.java b/core/src/main/java/org/apache/accumulo/core/security/NamespacePermission.java
index dc2e079..1caccf4 100644
--- a/core/src/main/java/org/apache/accumulo/core/security/NamespacePermission.java
+++ b/core/src/main/java/org/apache/accumulo/core/security/NamespacePermission.java
@@ -35,9 +35,9 @@ public enum NamespacePermission {
   BULK_IMPORT((byte) 7),
   DROP_NAMESPACE((byte) 8);
 
-  final private byte permID;
+  private final byte permID;
 
-  final private static NamespacePermission mapping[] = new NamespacePermission[9];
+  private static final NamespacePermission mapping[] = new NamespacePermission[9];
   static {
     for (NamespacePermission perm : NamespacePermission.values())
       mapping[perm.permID] = perm;
diff --git a/core/src/main/java/org/apache/accumulo/core/security/TablePermission.java b/core/src/main/java/org/apache/accumulo/core/security/TablePermission.java
index ce27ce5..49abc36 100644
--- a/core/src/main/java/org/apache/accumulo/core/security/TablePermission.java
+++ b/core/src/main/java/org/apache/accumulo/core/security/TablePermission.java
@@ -37,9 +37,9 @@ public enum TablePermission {
   DROP_TABLE((byte) 7),
   GET_SUMMARIES((byte) 8);
 
-  final private byte permID;
+  private final byte permID;
 
-  final private static TablePermission mapping[] = new TablePermission[9];
+  private static final TablePermission mapping[] = new TablePermission[9];
   static {
     for (TablePermission perm : TablePermission.values())
       mapping[perm.permID] = perm;
diff --git a/core/src/main/java/org/apache/accumulo/core/tabletserver/log/LogEntry.java b/core/src/main/java/org/apache/accumulo/core/tabletserver/log/LogEntry.java
index 3e4f0cc..cf3dde3 100644
--- a/core/src/main/java/org/apache/accumulo/core/tabletserver/log/LogEntry.java
+++ b/core/src/main/java/org/apache/accumulo/core/tabletserver/log/LogEntry.java
@@ -67,7 +67,7 @@ public class LogEntry {
     return Arrays.copyOf(out.getData(), out.getLength());
   }
 
-  static public LogEntry fromBytes(byte bytes[]) throws IOException {
+  public static LogEntry fromBytes(byte bytes[]) throws IOException {
     DataInputBuffer inp = new DataInputBuffer();
     inp.reset(bytes, bytes.length);
     KeyExtent extent = new KeyExtent();
@@ -78,7 +78,7 @@ public class LogEntry {
     return new LogEntry(extent, timestamp, server, filename);
   }
 
-  static private final Text EMPTY_TEXT = new Text();
+  private static final Text EMPTY_TEXT = new Text();
 
   public static LogEntry fromKeyValue(Key key, Value value) {
     String qualifier = key.getColumnQualifier().toString();
diff --git a/core/src/main/java/org/apache/accumulo/core/util/AddressUtil.java b/core/src/main/java/org/apache/accumulo/core/util/AddressUtil.java
index ab79f09..cdbae3f 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/AddressUtil.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/AddressUtil.java
@@ -18,7 +18,7 @@ package org.apache.accumulo.core.util;
 
 public class AddressUtil extends org.apache.accumulo.fate.util.AddressUtil {
 
-  static public HostAndPort parseAddress(String address, boolean ignoreMissingPort)
+  public static HostAndPort parseAddress(String address, boolean ignoreMissingPort)
       throws NumberFormatException {
     address = address.replace('+', ':');
     HostAndPort hap = HostAndPort.fromString(address);
diff --git a/core/src/main/java/org/apache/accumulo/core/util/CachedConfiguration.java b/core/src/main/java/org/apache/accumulo/core/util/CachedConfiguration.java
index 00cc063..f5206c6 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/CachedConfiguration.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/CachedConfiguration.java
@@ -21,13 +21,13 @@ import org.apache.hadoop.conf.Configuration;
 public class CachedConfiguration {
   private static Configuration configuration = null;
 
-  public synchronized static Configuration getInstance() {
+  public static synchronized Configuration getInstance() {
     if (configuration == null)
       setInstance(new Configuration());
     return configuration;
   }
 
-  public synchronized static Configuration setInstance(Configuration update) {
+  public static synchronized Configuration setInstance(Configuration update) {
     Configuration result = configuration;
     configuration = update;
     return result;
diff --git a/core/src/main/java/org/apache/accumulo/core/util/LocalityGroupUtil.java b/core/src/main/java/org/apache/accumulo/core/util/LocalityGroupUtil.java
index d8ef378..9d51fcf 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/LocalityGroupUtil.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/LocalityGroupUtil.java
@@ -73,7 +73,7 @@ public class LocalityGroupUtil {
   }
 
   @SuppressWarnings("serial")
-  static public class LocalityGroupConfigurationError extends AccumuloException {
+  public static class LocalityGroupConfigurationError extends AccumuloException {
     LocalityGroupConfigurationError(String why) {
       super(why);
     }
@@ -352,7 +352,7 @@ public class LocalityGroupUtil {
     reader.seek(range, families, inclusive);
   }
 
-  static public void ensureNonOverlappingGroups(Map<String,Set<Text>> groups) {
+  public static void ensureNonOverlappingGroups(Map<String,Set<Text>> groups) {
     HashSet<Text> all = new HashSet<>();
     for (Entry<String,Set<Text>> entry : groups.entrySet()) {
       if (!Collections.disjoint(all, entry.getValue())) {
diff --git a/core/src/main/java/org/apache/accumulo/fate/AgeOffStore.java b/core/src/main/java/org/apache/accumulo/fate/AgeOffStore.java
index c37cacc..3718b60 100644
--- a/core/src/main/java/org/apache/accumulo/fate/AgeOffStore.java
+++ b/core/src/main/java/org/apache/accumulo/fate/AgeOffStore.java
@@ -39,7 +39,7 @@ public class AgeOffStore<T> implements TStore<T> {
     long currentTimeMillis();
   }
 
-  final private static Logger log = LoggerFactory.getLogger(AgeOffStore.class);
+  private static final Logger log = LoggerFactory.getLogger(AgeOffStore.class);
 
   private TStore<T> store;
   private Map<Long,Long> candidates;
diff --git a/core/src/main/java/org/apache/accumulo/fate/Fate.java b/core/src/main/java/org/apache/accumulo/fate/Fate.java
index 62dd36f..e51b2c4 100644
--- a/core/src/main/java/org/apache/accumulo/fate/Fate.java
+++ b/core/src/main/java/org/apache/accumulo/fate/Fate.java
@@ -37,7 +37,7 @@ public class Fate<T> {
   private static final String EXCEPTION_PROP = "exception";
   private static final String RETURN_PROP = "return";
 
-  final private static Logger log = LoggerFactory.getLogger(Fate.class);
+  private static final Logger log = LoggerFactory.getLogger(Fate.class);
   private final Logger runnerLog = LoggerFactory.getLogger(TransactionRunner.class);
 
   private TStore<T> store;
diff --git a/core/src/main/java/org/apache/accumulo/fate/util/AddressUtil.java b/core/src/main/java/org/apache/accumulo/fate/util/AddressUtil.java
index 2f8c33f..0edf1ff 100644
--- a/core/src/main/java/org/apache/accumulo/fate/util/AddressUtil.java
+++ b/core/src/main/java/org/apache/accumulo/fate/util/AddressUtil.java
@@ -39,7 +39,7 @@ public class AddressUtil {
    * @throws IllegalArgumentException
    *           if dns failures are cached forever
    */
-  static public int getAddressCacheNegativeTtl(UnknownHostException originalException) {
+  public static int getAddressCacheNegativeTtl(UnknownHostException originalException) {
     int negativeTtl = 10;
     try {
       negativeTtl = Integer.parseInt(Security.getProperty("networkaddress.cache.negative.ttl"));
diff --git a/core/src/main/java/org/apache/accumulo/fate/zookeeper/DistributedReadWriteLock.java b/core/src/main/java/org/apache/accumulo/fate/zookeeper/DistributedReadWriteLock.java
index 97520aa..b891655 100644
--- a/core/src/main/java/org/apache/accumulo/fate/zookeeper/DistributedReadWriteLock.java
+++ b/core/src/main/java/org/apache/accumulo/fate/zookeeper/DistributedReadWriteLock.java
@@ -232,7 +232,7 @@ public class DistributedReadWriteLock implements java.util.concurrent.locks.Read
     this.data = Arrays.copyOf(data, data.length);
   }
 
-  static public Lock recoverLock(QueueLock qlock, byte[] data) {
+  public static Lock recoverLock(QueueLock qlock, byte[] data) {
     SortedMap<Long,byte[]> entries = qlock.getEarlierEntries(Long.MAX_VALUE);
     for (Entry<Long,byte[]> entry : entries.entrySet()) {
       ParsedLock parsed = new ParsedLock(entry.getValue());
diff --git a/core/src/main/java/org/apache/accumulo/fate/zookeeper/TransactionWatcher.java b/core/src/main/java/org/apache/accumulo/fate/zookeeper/TransactionWatcher.java
index 25988bc..a36cfc5 100644
--- a/core/src/main/java/org/apache/accumulo/fate/zookeeper/TransactionWatcher.java
+++ b/core/src/main/java/org/apache/accumulo/fate/zookeeper/TransactionWatcher.java
@@ -33,8 +33,8 @@ public class TransactionWatcher {
   }
 
   private static final Logger log = LoggerFactory.getLogger(TransactionWatcher.class);
-  final private Map<Long,AtomicInteger> counts = new HashMap<>();
-  final private Arbitrator arbitrator;
+  private final Map<Long,AtomicInteger> counts = new HashMap<>();
+  private final Arbitrator arbitrator;
 
   public TransactionWatcher(Arbitrator arbitrator) {
     this.arbitrator = arbitrator;
diff --git a/core/src/main/java/org/apache/accumulo/fate/zookeeper/ZooLock.java b/core/src/main/java/org/apache/accumulo/fate/zookeeper/ZooLock.java
index 172ddb0..6804eaa 100644
--- a/core/src/main/java/org/apache/accumulo/fate/zookeeper/ZooLock.java
+++ b/core/src/main/java/org/apache/accumulo/fate/zookeeper/ZooLock.java
@@ -60,7 +60,7 @@ public class ZooLock implements Watcher {
   }
 
   private boolean lockWasAcquired;
-  final private String path;
+  private final String path;
   protected final IZooReaderWriter zooKeeper;
   private String lock;
   private LockWatcher lockWatcher;
diff --git a/core/src/test/java/org/apache/accumulo/core/iterators/user/IndexedDocIteratorTest.java b/core/src/test/java/org/apache/accumulo/core/iterators/user/IndexedDocIteratorTest.java
index 07eae0c..2230d74 100644
--- a/core/src/test/java/org/apache/accumulo/core/iterators/user/IndexedDocIteratorTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/iterators/user/IndexedDocIteratorTest.java
@@ -173,7 +173,7 @@ public class IndexedDocIteratorTest {
     return trf.reader;
   }
 
-  private synchronized static void cleanup() throws IOException {
+  private static synchronized void cleanup() throws IOException {
     trf.closeReader();
     docid = 0;
   }
diff --git a/core/src/test/java/org/apache/accumulo/core/iterators/user/TransformingIteratorTest.java b/core/src/test/java/org/apache/accumulo/core/iterators/user/TransformingIteratorTest.java
index e2b3e07..89f1d99 100644
--- a/core/src/test/java/org/apache/accumulo/core/iterators/user/TransformingIteratorTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/iterators/user/TransformingIteratorTest.java
@@ -581,7 +581,7 @@ public class TransformingIteratorTest {
 
   }
 
-  public static abstract class ReversingKeyTransformingIterator extends TransformingIterator {
+  public abstract static class ReversingKeyTransformingIterator extends TransformingIterator {
 
     @Override
     protected void transformRange(SortedKeyValueIterator<Key,Value> input, KVBuffer output)
diff --git a/core/src/test/java/org/apache/accumulo/core/util/MergeTest.java b/core/src/test/java/org/apache/accumulo/core/util/MergeTest.java
index 11892a1..36b0642 100644
--- a/core/src/test/java/org/apache/accumulo/core/util/MergeTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/util/MergeTest.java
@@ -108,7 +108,7 @@ public class MergeTest {
     }
   }
 
-  static private int[] sizes(List<Size> sizes) {
+  private static int[] sizes(List<Size> sizes) {
     int result[] = new int[sizes.size()];
     int i = 0;
     for (Size s : sizes) {
diff --git a/core/src/test/java/org/apache/accumulo/fate/zookeeper/DistributedReadWriteLockTest.java b/core/src/test/java/org/apache/accumulo/fate/zookeeper/DistributedReadWriteLockTest.java
index 454ab2d..0e39726 100644
--- a/core/src/test/java/org/apache/accumulo/fate/zookeeper/DistributedReadWriteLockTest.java
+++ b/core/src/test/java/org/apache/accumulo/fate/zookeeper/DistributedReadWriteLockTest.java
@@ -37,14 +37,14 @@ public class DistributedReadWriteLockTest {
     final SortedMap<Long,byte[]> locks = new TreeMap<>();
 
     @Override
-    synchronized public SortedMap<Long,byte[]> getEarlierEntries(long entry) {
+    public synchronized SortedMap<Long,byte[]> getEarlierEntries(long entry) {
       SortedMap<Long,byte[]> result = new TreeMap<>();
       result.putAll(locks.headMap(entry + 1));
       return result;
     }
 
     @Override
-    synchronized public void removeEntry(long entry) {
+    public synchronized void removeEntry(long entry) {
       synchronized (locks) {
         locks.remove(entry);
         locks.notifyAll();
@@ -52,7 +52,7 @@ public class DistributedReadWriteLockTest {
     }
 
     @Override
-    synchronized public long addEntry(byte[] data) {
+    public synchronized long addEntry(byte[] data) {
       long result;
       synchronized (locks) {
         locks.put(result = next++, data);
diff --git a/core/src/test/java/org/apache/accumulo/fate/zookeeper/TransactionWatcherTest.java b/core/src/test/java/org/apache/accumulo/fate/zookeeper/TransactionWatcherTest.java
index 44599dd..f0b9b8c 100644
--- a/core/src/test/java/org/apache/accumulo/fate/zookeeper/TransactionWatcherTest.java
+++ b/core/src/test/java/org/apache/accumulo/fate/zookeeper/TransactionWatcherTest.java
@@ -70,7 +70,7 @@ public class TransactionWatcherTest {
     }
 
     @Override
-    synchronized public boolean transactionAlive(String txType, long tid) throws Exception {
+    public synchronized boolean transactionAlive(String txType, long tid) throws Exception {
       List<Long> txids = started.get(txType);
       if (txids == null)
         return false;
diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java b/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java
index 2d6b9bb..0bb9f55 100644
--- a/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java
+++ b/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java
@@ -135,12 +135,12 @@ public class ProxyServer implements AccumuloProxy.Iface {
 
   protected Class<? extends AuthenticationToken> tokenClass;
 
-  static protected class ScannerPlusIterator {
+  protected static class ScannerPlusIterator {
     public ScannerBase scanner;
     public Iterator<Map.Entry<Key,Value>> iterator;
   }
 
-  static protected class BatchWriterPlusProblem {
+  protected static class BatchWriterPlusProblem {
     public BatchWriter writer;
     public MutationsRejectedException exception = null;
   }
diff --git a/server/base/src/main/java/org/apache/accumulo/server/client/BulkImporter.java b/server/base/src/main/java/org/apache/accumulo/server/client/BulkImporter.java
index 80df178..d809997 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/client/BulkImporter.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/client/BulkImporter.java
@@ -673,7 +673,7 @@ public class BulkImporter {
     return start;
   }
 
-  final static byte[] byte0 = {0};
+  static final byte[] byte0 = {0};
 
   public static List<TabletLocation> findOverlappingTablets(ClientContext context, VolumeManager vm,
       TabletLocator locator, Path file, Text startRow, Text endRow) throws Exception {
diff --git a/server/base/src/main/java/org/apache/accumulo/server/conf/ServerConfiguration.java b/server/base/src/main/java/org/apache/accumulo/server/conf/ServerConfiguration.java
index 22e3890..948447d 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/conf/ServerConfiguration.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/conf/ServerConfiguration.java
@@ -22,10 +22,10 @@ import org.apache.accumulo.core.conf.AccumuloConfiguration;
 
 public abstract class ServerConfiguration {
 
-  abstract public TableConfiguration getTableConfiguration(Table.ID tableId);
+  public abstract TableConfiguration getTableConfiguration(Table.ID tableId);
 
-  abstract public NamespaceConfiguration getNamespaceConfiguration(Namespace.ID namespaceId);
+  public abstract NamespaceConfiguration getNamespaceConfiguration(Namespace.ID namespaceId);
 
-  abstract public AccumuloConfiguration getSystemConfiguration();
+  public abstract AccumuloConfiguration getSystemConfiguration();
 
 }
diff --git a/server/base/src/main/java/org/apache/accumulo/server/constraints/MetadataConstraints.java b/server/base/src/main/java/org/apache/accumulo/server/constraints/MetadataConstraints.java
index b19b56f..54ada0e 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/constraints/MetadataConstraints.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/constraints/MetadataConstraints.java
@@ -90,14 +90,14 @@ public class MetadataConstraints implements Constraint {
     return validColumnQuals.contains(new ColumnFQ(cu));
   }
 
-  static private ArrayList<Short> addViolation(ArrayList<Short> lst, int violation) {
+  private static ArrayList<Short> addViolation(ArrayList<Short> lst, int violation) {
     if (lst == null)
       lst = new ArrayList<>();
     lst.add((short) violation);
     return lst;
   }
 
-  static private ArrayList<Short> addIfNotPresent(ArrayList<Short> lst, int intViolation) {
+  private static ArrayList<Short> addIfNotPresent(ArrayList<Short> lst, int intViolation) {
     if (lst == null)
       return addViolation(null, intViolation);
     short violation = (short) intViolation;
diff --git a/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeManagerImpl.java b/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeManagerImpl.java
index 02bb9c4..c743911 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeManagerImpl.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeManagerImpl.java
@@ -333,7 +333,7 @@ public class VolumeManagerImpl implements VolumeManager {
     return v.getFileSystem().getDefaultReplication(path);
   }
 
-  static private final String DEFAULT = "";
+  private static final String DEFAULT = "";
 
   public static VolumeManager get(AccumuloConfiguration conf) throws IOException {
     return get(conf, CachedConfiguration.getInstance());
diff --git a/server/base/src/main/java/org/apache/accumulo/server/log/WalStateManager.java b/server/base/src/main/java/org/apache/accumulo/server/log/WalStateManager.java
index 2503e30..765c70f 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/log/WalStateManager.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/log/WalStateManager.java
@@ -68,7 +68,7 @@ import org.slf4j.LoggerFactory;
 public class WalStateManager {
 
   public class WalMarkerException extends Exception {
-    static private final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
     public WalMarkerException(Exception ex) {
       super(ex);
@@ -77,7 +77,7 @@ public class WalStateManager {
 
   private static final Logger log = LoggerFactory.getLogger(WalStateManager.class);
 
-  public final static String ZWALS = "/wals";
+  public static final String ZWALS = "/wals";
 
   public static enum WalState {
     /* log is open, and may be written to */
diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/balancer/TabletBalancer.java b/server/base/src/main/java/org/apache/accumulo/server/master/balancer/TabletBalancer.java
index 46a6e59..ab2c368 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/master/balancer/TabletBalancer.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/master/balancer/TabletBalancer.java
@@ -95,7 +95,7 @@ public abstract class TabletBalancer {
    * @param assignments
    *          A map from tablet to assigned server. Write-only.
    */
-  abstract public void getAssignments(SortedMap<TServerInstance,TabletServerStatus> current,
+  public abstract void getAssignments(SortedMap<TServerInstance,TabletServerStatus> current,
       Map<KeyExtent,TServerInstance> unassigned, Map<KeyExtent,TServerInstance> assignments);
 
   /**
@@ -136,7 +136,7 @@ public abstract class TabletBalancer {
    * Be sure to pass in a properly scoped Logger instance so that messages indicate what part of the
    * system is having trouble.
    */
-  protected static abstract class BalancerProblem implements Runnable {
+  protected abstract static class BalancerProblem implements Runnable {
     protected final Logger balancerLog;
 
     public BalancerProblem(Logger logger) {
diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/state/MetaDataStateStore.java b/server/base/src/main/java/org/apache/accumulo/server/master/state/MetaDataStateStore.java
index 2a1f3a8..ff1dccc 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/master/state/MetaDataStateStore.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/master/state/MetaDataStateStore.java
@@ -38,9 +38,9 @@ public class MetaDataStateStore extends TabletStateStore {
   private static final int LATENCY = 1000;
   private static final int MAX_MEMORY = 200 * 1024 * 1024;
 
-  final protected ClientContext context;
-  final protected CurrentState state;
-  final private String targetTableName;
+  protected final ClientContext context;
+  protected final CurrentState state;
+  private final String targetTableName;
 
   protected MetaDataStateStore(ClientContext context, CurrentState state, String targetTableName) {
     this.context = context;
diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/state/MetaDataTableScanner.java b/server/base/src/main/java/org/apache/accumulo/server/master/state/MetaDataTableScanner.java
index 6d00ce5..c778564 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/master/state/MetaDataTableScanner.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/master/state/MetaDataTableScanner.java
@@ -74,7 +74,7 @@ public class MetaDataTableScanner implements ClosableIterator<TabletLocationStat
     }
   }
 
-  static public void configureScanner(ScannerBase scanner, CurrentState state) {
+  public static void configureScanner(ScannerBase scanner, CurrentState state) {
     TabletsSection.TabletColumnFamily.PREV_ROW_COLUMN.fetch(scanner);
     scanner.fetchColumnFamily(TabletsSection.CurrentLocationColumnFamily.NAME);
     scanner.fetchColumnFamily(TabletsSection.FutureLocationColumnFamily.NAME);
diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/state/TabletLocationState.java b/server/base/src/main/java/org/apache/accumulo/server/master/state/TabletLocationState.java
index aa5bdb0..8f5b7a4 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/master/state/TabletLocationState.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/master/state/TabletLocationState.java
@@ -32,7 +32,7 @@ import org.apache.hadoop.io.Text;
  */
 public class TabletLocationState {
 
-  static public class BadLocationStateException extends Exception {
+  public static class BadLocationStateException extends Exception {
     private static final long serialVersionUID = 1L;
     private Text metadataTableEntry;
 
@@ -65,13 +65,13 @@ public class TabletLocationState {
     }
   }
 
-  final public KeyExtent extent;
-  final public TServerInstance future;
-  final public TServerInstance current;
-  final public TServerInstance last;
-  final public SuspendingTServer suspend;
-  final public Collection<Collection<String>> walogs;
-  final public boolean chopped;
+  public final KeyExtent extent;
+  public final TServerInstance future;
+  public final TServerInstance current;
+  public final TServerInstance last;
+  public final SuspendingTServer suspend;
+  public final Collection<Collection<String>> walogs;
+  public final boolean chopped;
 
   public TServerInstance futureOrCurrent() {
     if (current != null) {
diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/state/TabletStateStore.java b/server/base/src/main/java/org/apache/accumulo/server/master/state/TabletStateStore.java
index cd92959..f31c6f6 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/master/state/TabletStateStore.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/master/state/TabletStateStore.java
@@ -36,24 +36,24 @@ public abstract class TabletStateStore implements Iterable<TabletLocationState>
   /**
    * Identifying name for this tablet state store.
    */
-  abstract public String name();
+  public abstract String name();
 
   /**
    * Scan the information about the tablets covered by this store
    */
   @Override
-  abstract public ClosableIterator<TabletLocationState> iterator();
+  public abstract ClosableIterator<TabletLocationState> iterator();
 
   /**
    * Store the assigned locations in the data store.
    */
-  abstract public void setFutureLocations(Collection<Assignment> assignments)
+  public abstract void setFutureLocations(Collection<Assignment> assignments)
       throws DistributedStoreException;
 
   /**
    * Tablet servers will update the data store with the location when they bring the tablet online
    */
-  abstract public void setLocations(Collection<Assignment> assignments)
+  public abstract void setLocations(Collection<Assignment> assignments)
       throws DistributedStoreException;
 
   /**
@@ -64,21 +64,21 @@ public abstract class TabletStateStore implements Iterable<TabletLocationState>
    * @param logsForDeadServers
    *          a cache of logs in use by servers when they died
    */
-  abstract public void unassign(Collection<TabletLocationState> tablets,
+  public abstract void unassign(Collection<TabletLocationState> tablets,
       Map<TServerInstance,List<Path>> logsForDeadServers) throws DistributedStoreException;
 
   /**
    * Mark tablets as having no known or future location, but desiring to be returned to their
    * previous tserver.
    */
-  abstract public void suspend(Collection<TabletLocationState> tablets,
+  public abstract void suspend(Collection<TabletLocationState> tablets,
       Map<TServerInstance,List<Path>> logsForDeadServers, long suspensionTimestamp)
       throws DistributedStoreException;
 
   /**
    * Remove a suspension marker for a collection of tablets, moving them to being simply unassigned.
    */
-  abstract public void unsuspend(Collection<TabletLocationState> tablets)
+  public abstract void unsuspend(Collection<TabletLocationState> tablets)
       throws DistributedStoreException;
 
   public static void unassign(ServerContext context, TabletLocationState tls,
diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/state/ZooTabletStateStore.java b/server/base/src/main/java/org/apache/accumulo/server/master/state/ZooTabletStateStore.java
index 32f8cf0..5dd981c 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/master/state/ZooTabletStateStore.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/master/state/ZooTabletStateStore.java
@@ -38,7 +38,7 @@ import org.slf4j.LoggerFactory;
 public class ZooTabletStateStore extends TabletStateStore {
 
   private static final Logger log = LoggerFactory.getLogger(ZooTabletStateStore.class);
-  final private DistributedStore store;
+  private final DistributedStore store;
 
   public ZooTabletStateStore(DistributedStore store) {
     this.store = store;
diff --git a/server/base/src/main/java/org/apache/accumulo/server/metrics/MetricsConfiguration.java b/server/base/src/main/java/org/apache/accumulo/server/metrics/MetricsConfiguration.java
index 01ca214..4203480 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/metrics/MetricsConfiguration.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/metrics/MetricsConfiguration.java
@@ -59,7 +59,7 @@ public class MetricsConfiguration {
 
   private static int CONFIG_FILE_CHECK_COUNTER = 100;
 
-  public final static long CONFIG_FILE_RELOAD_DELAY = 60000;
+  public static final long CONFIG_FILE_RELOAD_DELAY = 60000;
 
   private MetricsConfigWatcher watcher = null;
 
diff --git a/server/base/src/main/java/org/apache/accumulo/server/monitor/LogService.java b/server/base/src/main/java/org/apache/accumulo/server/monitor/LogService.java
index 0d85673..be7fe3b 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/monitor/LogService.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/monitor/LogService.java
@@ -119,9 +119,9 @@ public class LogService extends org.apache.log4j.AppenderSkeleton {
     }
   }
 
-  static private LogService instance = null;
+  private static LogService instance = null;
 
-  synchronized public static LogService getInstance() {
+  public static synchronized LogService getInstance() {
     if (instance == null)
       return new LogService();
     return instance;
@@ -148,7 +148,7 @@ public class LogService extends org.apache.log4j.AppenderSkeleton {
   }
 
   @Override
-  synchronized protected void append(LoggingEvent ev) {
+  protected synchronized void append(LoggingEvent ev) {
     Object application = ev.getMDC("application");
     if (application == null || application.toString().isEmpty())
       return;
@@ -178,11 +178,11 @@ public class LogService extends org.apache.log4j.AppenderSkeleton {
     return false;
   }
 
-  synchronized public List<DedupedLogEvent> getEvents() {
+  public synchronized List<DedupedLogEvent> getEvents() {
     return new ArrayList<>(events.values());
   }
 
-  synchronized public void clear() {
+  public synchronized void clear() {
     events.clear();
   }
 }
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/Halt.java b/server/base/src/main/java/org/apache/accumulo/server/util/Halt.java
index 4228ce7..bf57a3d 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/Halt.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/Halt.java
@@ -25,7 +25,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class Halt {
-  static private final Logger log = LoggerFactory.getLogger(Halt.class);
+  private static final Logger log = LoggerFactory.getLogger(Halt.class);
 
   public static void halt(final String msg) {
     // ACCUMULO-3651 Changed level to error and added FATAL to message for slf4j compatibility
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java b/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java
index 1d41963..2951ed8 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java
@@ -111,7 +111,7 @@ public class MetadataTableUtil {
 
   private MetadataTableUtil() {}
 
-  public synchronized static Writer getMetadataTable(ServerContext context) {
+  public static synchronized Writer getMetadataTable(ServerContext context) {
     Credentials credentials = context.getCredentials();
     Writer metadataTable = metadata_tables.get(credentials);
     if (metadataTable == null) {
@@ -121,7 +121,7 @@ public class MetadataTableUtil {
     return metadataTable;
   }
 
-  public synchronized static Writer getRootTable(ServerContext context) {
+  public static synchronized Writer getRootTable(ServerContext context) {
     Credentials credentials = context.getCredentials();
     Writer rootTable = root_tables.get(credentials);
     if (rootTable == null) {
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/ReplicationTableUtil.java b/server/base/src/main/java/org/apache/accumulo/server/util/ReplicationTableUtil.java
index efb8721..879f2a6 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/ReplicationTableUtil.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/ReplicationTableUtil.java
@@ -77,11 +77,11 @@ public class ReplicationTableUtil {
    * @param writer
    *          A Writer to use for the given credentials
    */
-  synchronized static void addWriter(Credentials creds, Writer writer) {
+  static synchronized void addWriter(Credentials creds, Writer writer) {
     writers.put(creds, writer);
   }
 
-  synchronized static Writer getWriter(ClientContext context) {
+  static synchronized Writer getWriter(ClientContext context) {
     Writer replicationTable = writers.get(context.getCredentials());
     if (replicationTable == null) {
       AccumuloClient client;
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/time/BaseRelativeTime.java b/server/base/src/main/java/org/apache/accumulo/server/util/time/BaseRelativeTime.java
index 6a9dd26..d0cc830 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/time/BaseRelativeTime.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/time/BaseRelativeTime.java
@@ -38,7 +38,7 @@ public class BaseRelativeTime implements ProvidesTime {
   }
 
   @Override
-  synchronized public long currentTime() {
+  public synchronized long currentTime() {
     long localNow = local.currentTime();
     long result = localNow + diff;
     if (result < lastReportedTime)
@@ -47,7 +47,7 @@ public class BaseRelativeTime implements ProvidesTime {
     return result;
   }
 
-  synchronized public void updateTime(long advice) {
+  public synchronized void updateTime(long advice) {
     long localNow = local.currentTime();
     long diff = advice - localNow;
     // smooth in 20% of the change, not the whole thing.
diff --git a/server/base/src/test/java/org/apache/accumulo/server/master/balancer/TableLoadBalancerTest.java b/server/base/src/test/java/org/apache/accumulo/server/master/balancer/TableLoadBalancerTest.java
index cd69236..06a2806 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/master/balancer/TableLoadBalancerTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/master/balancer/TableLoadBalancerTest.java
@@ -59,11 +59,11 @@ public class TableLoadBalancerTest {
   private static Map<String,String> TABLE_ID_MAP = ImmutableMap.of("t1", "a1", "t2", "b12", "t3",
       "c4");
 
-  static private TServerInstance mkts(String address, String session) throws Exception {
+  private static TServerInstance mkts(String address, String session) throws Exception {
     return new TServerInstance(HostAndPort.fromParts(address, 1234), session);
   }
 
-  static private TabletServerStatus status(Object... config) {
+  private static TabletServerStatus status(Object... config) {
     TabletServerStatus result = new TabletServerStatus();
     result.tableMap = new HashMap<>();
     String tablename = null;
diff --git a/server/master/src/main/java/org/apache/accumulo/master/EventCoordinator.java b/server/master/src/main/java/org/apache/accumulo/master/EventCoordinator.java
index 28b38e2..d2f7a38 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/EventCoordinator.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/EventCoordinator.java
@@ -39,7 +39,7 @@ public class EventCoordinator {
     return eventCounter;
   }
 
-  synchronized public void event(String msg, Object... args) {
+  public synchronized void event(String msg, Object... args) {
     log.info(String.format(msg, args));
     eventCounter++;
     notifyAll();
diff --git a/server/master/src/main/java/org/apache/accumulo/master/Master.java b/server/master/src/main/java/org/apache/accumulo/master/Master.java
index fd66f2a..412b9c7 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/Master.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/Master.java
@@ -176,23 +176,23 @@ import com.google.common.collect.Iterables;
 public class Master
     implements LiveTServerSet.Listener, TableObserver, CurrentState, HighlyAvailableService {
 
-  final static Logger log = LoggerFactory.getLogger(Master.class);
-
-  final static int ONE_SECOND = 1000;
-  final static long TIME_TO_WAIT_BETWEEN_SCANS = 60 * ONE_SECOND;
-  final private static long TIME_BETWEEN_MIGRATION_CLEANUPS = 5 * 60 * ONE_SECOND;
-  final static long WAIT_BETWEEN_ERRORS = ONE_SECOND;
-  final private static long DEFAULT_WAIT_FOR_WATCHER = 10 * ONE_SECOND;
-  final private static int MAX_CLEANUP_WAIT_TIME = ONE_SECOND;
-  final private static int TIME_TO_WAIT_BETWEEN_LOCK_CHECKS = ONE_SECOND;
-  final static int MAX_TSERVER_WORK_CHUNK = 5000;
-  final private static int MAX_BAD_STATUS_COUNT = 3;
+  static final Logger log = LoggerFactory.getLogger(Master.class);
+
+  static final int ONE_SECOND = 1000;
+  static final long TIME_TO_WAIT_BETWEEN_SCANS = 60 * ONE_SECOND;
+  private static final long TIME_BETWEEN_MIGRATION_CLEANUPS = 5 * 60 * ONE_SECOND;
+  static final long WAIT_BETWEEN_ERRORS = ONE_SECOND;
+  private static final long DEFAULT_WAIT_FOR_WATCHER = 10 * ONE_SECOND;
+  private static final int MAX_CLEANUP_WAIT_TIME = ONE_SECOND;
+  private static final int TIME_TO_WAIT_BETWEEN_LOCK_CHECKS = ONE_SECOND;
+  static final int MAX_TSERVER_WORK_CHUNK = 5000;
+  private static final int MAX_BAD_STATUS_COUNT = 3;
 
   final VolumeManager fs;
-  final private String hostname;
-  final private Object balancedNotifier = new Object();
+  private final String hostname;
+  private final Object balancedNotifier = new Object();
   final LiveTServerSet tserverSet;
-  final private List<TabletGroupWatcher> watchers = new ArrayList<>();
+  private final List<TabletGroupWatcher> watchers = new ArrayList<>();
   final SecurityOperation security;
   final Map<TServerInstance,AtomicInteger> badServers = Collections
       .synchronizedMap(new DefaultMap<>(new AtomicInteger()));
@@ -200,7 +200,7 @@ public class Master
   final SortedMap<KeyExtent,TServerInstance> migrations = Collections
       .synchronizedSortedMap(new TreeMap<>());
   final EventCoordinator nextEvent = new EventCoordinator();
-  final private Object mergeLock = new Object();
+  private final Object mergeLock = new Object();
   private ReplicationDriver replicationWorkDriver;
   private WorkDriver replicationWorkAssigner;
   RecoveryManager recoveryManager = null;
diff --git a/server/master/src/main/java/org/apache/accumulo/master/metrics/Metrics2ReplicationMetrics.java b/server/master/src/main/java/org/apache/accumulo/master/metrics/Metrics2ReplicationMetrics.java
index aa77c31..4f147c9 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/metrics/Metrics2ReplicationMetrics.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/metrics/Metrics2ReplicationMetrics.java
@@ -52,7 +52,7 @@ public class Metrics2ReplicationMetrics implements Metrics, MetricsSource {
       REPLICATION_QUEUE_TIME_QUANTILES = "replicationQueue10m",
       REPLICATION_QUEUE_TIME = "replicationQueue";
 
-  private final static Logger log = LoggerFactory.getLogger(Metrics2ReplicationMetrics.class);
+  private static final Logger log = LoggerFactory.getLogger(Metrics2ReplicationMetrics.class);
 
   private final Master master;
   private final MetricsSystem system;
diff --git a/server/master/src/main/java/org/apache/accumulo/master/state/MergeStats.java b/server/master/src/main/java/org/apache/accumulo/master/state/MergeStats.java
index d659c41..f9d151a 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/state/MergeStats.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/state/MergeStats.java
@@ -50,7 +50,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class MergeStats {
-  final static private Logger log = LoggerFactory.getLogger(MergeStats.class);
+  private static final Logger log = LoggerFactory.getLogger(MergeStats.class);
   MergeInfo info;
   int hosted = 0;
   int unassigned = 0;
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/CleanUp.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/CleanUp.java
index ccf895f..83f90eb 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/CleanUp.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/CleanUp.java
@@ -55,7 +55,7 @@ import org.slf4j.LoggerFactory;
 
 class CleanUp extends MasterRepo {
 
-  final private static Logger log = LoggerFactory.getLogger(CleanUp.class);
+  private static final Logger log = LoggerFactory.getLogger(CleanUp.class);
 
   private static final long serialVersionUID = 1L;
 
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/MasterRepo.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/MasterRepo.java
index b46461c..bab475d 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/MasterRepo.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/MasterRepo.java
@@ -42,6 +42,6 @@ public abstract class MasterRepo implements Repo<Master> {
   }
 
   @Override
-  abstract public Repo<Master> call(long tid, Master environment) throws Exception;
+  public abstract Repo<Master> call(long tid, Master environment) throws Exception;
 
 }
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/bulkVer2/LoadFiles.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/bulkVer2/LoadFiles.java
index 087ae3b..4ea48f8 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/bulkVer2/LoadFiles.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/bulkVer2/LoadFiles.java
@@ -101,7 +101,7 @@ class LoadFiles extends MasterRepo {
     }
   }
 
-  private static abstract class Loader {
+  private abstract static class Loader {
     protected Path bulkDir;
     protected Master master;
     protected long tid;
diff --git a/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceFormatter.java b/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceFormatter.java
index 00a9e7d..f81a5f7 100644
--- a/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceFormatter.java
+++ b/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceFormatter.java
@@ -49,7 +49,7 @@ public class TraceFormatter implements Formatter {
     return formatter.get().format(date);
   }
 
-  private final static Text SPAN_CF = new Text("span");
+  private static final Text SPAN_CF = new Text("span");
 
   private Iterator<Entry<Key,Value>> scanner;
   private FormatterConfig config;
diff --git a/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java b/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java
index 48607db..8644a92 100644
--- a/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java
+++ b/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java
@@ -82,16 +82,16 @@ import org.slf4j.LoggerFactory;
 
 public class TraceServer implements Watcher {
 
-  final private static Logger log = LoggerFactory.getLogger(TraceServer.class);
-  final private ServerConfigurationFactory serverConfiguration;
-  final private ServerContext context;
-  final private TServer server;
-  final private AtomicReference<BatchWriter> writer;
-  final private AccumuloClient accumuloClient;
+  private static final Logger log = LoggerFactory.getLogger(TraceServer.class);
+  private final ServerConfigurationFactory serverConfiguration;
+  private final ServerContext context;
+  private final TServer server;
+  private final AtomicReference<BatchWriter> writer;
+  private final AccumuloClient accumuloClient;
   final String tableName;
-  final private static int BATCH_WRITER_MAX_LATENCY = 5;
-  final private static long SCHEDULE_PERIOD = 1000;
-  final private static long SCHEDULE_DELAY = 1000;
+  private static final int BATCH_WRITER_MAX_LATENCY = 5;
+  private static final long SCHEDULE_PERIOD = 1000;
+  private static final long SCHEDULE_DELAY = 1000;
 
   private static void put(Mutation m, String cf, String cq, byte[] bytes, int len) {
     m.put(new Text(cf), new Text(cq), new Value(bytes, 0, len));
diff --git a/server/tracer/src/main/java/org/apache/accumulo/tracer/ZooTraceClient.java b/server/tracer/src/main/java/org/apache/accumulo/tracer/ZooTraceClient.java
index bd66549..0375735 100644
--- a/server/tracer/src/main/java/org/apache/accumulo/tracer/ZooTraceClient.java
+++ b/server/tracer/src/main/java/org/apache/accumulo/tracer/ZooTraceClient.java
@@ -76,7 +76,7 @@ public class ZooTraceClient extends SendSpansViaThrift implements Watcher {
   }
 
   @Override
-  synchronized protected String getSpanKey(Map<String,String> data) {
+  protected synchronized String getSpanKey(Map<String,String> data) {
     if (hosts.size() > 0) {
       return hosts.get(random.nextInt(hosts.size()));
     }
@@ -143,7 +143,7 @@ public class ZooTraceClient extends SendSpansViaThrift implements Watcher {
     }
   }
 
-  synchronized private void updateHosts(String path, List<String> children) {
+  private synchronized void updateHosts(String path, List<String> children) {
     log.debug("Scanning trace hosts in zookeeper: {}", path);
     try {
       List<String> hosts = new ArrayList<>();
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/CompactionStrategy.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/CompactionStrategy.java
index eca7556..54ee836 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/CompactionStrategy.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/CompactionStrategy.java
@@ -81,7 +81,7 @@ public abstract class CompactionStrategy {
    *          basic details about the tablet
    * @return the plan for a major compaction, or null to cancel the compaction.
    */
-  abstract public CompactionPlan getCompactionPlan(MajorCompactionRequest request)
+  public abstract CompactionPlan getCompactionPlan(MajorCompactionRequest request)
       throws IOException;
 
 }
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/MajorCompactionRequest.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/MajorCompactionRequest.java
index 5886509..8b1ba08 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/MajorCompactionRequest.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/MajorCompactionRequest.java
@@ -57,14 +57,14 @@ import com.google.common.base.Preconditions;
  * Information that can be used to determine how a tablet is to be major compacted, if needed.
  */
 public class MajorCompactionRequest implements Cloneable {
-  final private KeyExtent extent;
-  final private MajorCompactionReason reason;
-  final private VolumeManager volumeManager;
-  final private AccumuloConfiguration tableConfig;
-  final private BlockCache indexCache;
-  final private BlockCache summaryCache;
+  private final KeyExtent extent;
+  private final MajorCompactionReason reason;
+  private final VolumeManager volumeManager;
+  private final AccumuloConfiguration tableConfig;
+  private final BlockCache indexCache;
+  private final BlockCache summaryCache;
   private Map<FileRef,DataFileValue> files;
-  final private ServerContext context;
+  private final ServerContext context;
 
   public MajorCompactionRequest(KeyExtent extent, MajorCompactionReason reason,
       VolumeManager manager, AccumuloConfiguration tabletConfig, BlockCache summaryCache,
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/strategies/ConfigurableCompactionStrategy.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/strategies/ConfigurableCompactionStrategy.java
index 5628c25..d64ce82 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/strategies/ConfigurableCompactionStrategy.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/strategies/ConfigurableCompactionStrategy.java
@@ -46,7 +46,7 @@ import org.apache.hadoop.fs.Path;
 
 public class ConfigurableCompactionStrategy extends CompactionStrategy {
 
-  private static abstract class Test {
+  private abstract static class Test {
     // Do any work that blocks in this method. This method is not always called before
     // shouldCompact(). See CompactionStrategy javadocs.
     void gatherInformation(MajorCompactionRequest request) {}
@@ -187,7 +187,7 @@ public class ConfigurableCompactionStrategy extends CompactionStrategy {
     }
   }
 
-  private static abstract class FileSizeTest extends Test {
+  private abstract static class FileSizeTest extends Test {
     private final long esize;
 
     private FileSizeTest(String s) {
@@ -203,7 +203,7 @@ public class ConfigurableCompactionStrategy extends CompactionStrategy {
     public abstract boolean shouldCompact(long fsize, long esize);
   }
 
-  private static abstract class PatternPathTest extends Test {
+  private abstract static class PatternPathTest extends Test {
     private Pattern pattern;
 
     private PatternPathTest(String p) {
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java
index ca726ae..11f0f0a 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java
@@ -106,7 +106,7 @@ public class TabletServerLogger {
 
   private final RetryFactory writeRetryFactory;
 
-  static private abstract class TestCallWithWriteLock {
+  private abstract static class TestCallWithWriteLock {
     abstract boolean test();
 
     abstract void withWriteLock() throws IOException;
@@ -208,7 +208,7 @@ public class TabletServerLogger {
     }
   }
 
-  synchronized private void createLogger() throws IOException {
+  private synchronized void createLogger() throws IOException {
     if (!logIdLock.isWriteLockedByCurrentThread()) {
       throw new IllegalStateException("createLoggers should be called with write lock held!");
     }
@@ -329,7 +329,7 @@ public class TabletServerLogger {
     }
   }
 
-  synchronized private void close() throws IOException {
+  private synchronized void close() throws IOException {
     if (!logIdLock.isWriteLockedByCurrentThread()) {
       throw new IllegalStateException("close should be called with write lock held!");
     }
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Rate.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Rate.java
index fa85f0e..87cddbf 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Rate.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Rate.java
@@ -34,7 +34,7 @@ public class Rate {
     this.ratio = ratio;
   }
 
-  synchronized public double update(long when, long counter) {
+  public synchronized double update(long when, long counter) {
     if (lastCounter < 0) {
       lastTime = when;
       lastCounter = counter;
@@ -50,7 +50,7 @@ public class Rate {
     return current;
   }
 
-  synchronized public double rate() {
+  public synchronized double rate() {
     return this.current;
   }
 }
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/ScanBatch.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/ScanBatch.java
index 7a29427..1ccbbbc 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/ScanBatch.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/ScanBatch.java
@@ -18,7 +18,7 @@ package org.apache.accumulo.tserver.tablet;
 
 import java.util.List;
 
-final public class ScanBatch {
+public final class ScanBatch {
   private final boolean more;
   private final List<KVEntry> results;
 
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
index 73abe2b..6d2b2df 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
@@ -165,7 +165,7 @@ import com.google.common.collect.ImmutableSet.Builder;
  *
  */
 public class Tablet implements TabletCommitter {
-  static private final Logger log = LoggerFactory.getLogger(Tablet.class);
+  private static final Logger log = LoggerFactory.getLogger(Tablet.class);
 
   private final TabletServer tabletServer;
   private final ServerContext context;
@@ -2638,7 +2638,7 @@ public class Tablet implements TabletCommitter {
     logLock.unlock();
   }
 
-  synchronized public void chopFiles() {
+  public synchronized void chopFiles() {
     initiateMajorCompaction(MajorCompactionReason.CHOP);
   }
 
@@ -2737,7 +2737,7 @@ public class Tablet implements TabletCommitter {
     return dataSourceDeletions.incrementAndGet();
   }
 
-  synchronized public void updateQueryStats(int size, long numBytes) {
+  public synchronized void updateQueryStats(int size, long numBytes) {
     queryCount += size;
     queryBytes += numBytes;
   }
@@ -2802,7 +2802,7 @@ public class Tablet implements TabletCommitter {
     return result;
   }
 
-  synchronized public void addActiveScans(ScanDataSource scanDataSource) {
+  public synchronized void addActiveScans(ScanDataSource scanDataSource) {
     activeScans.add(scanDataSource);
   }
 
@@ -2811,7 +2811,7 @@ public class Tablet implements TabletCommitter {
     return activeScans.size();
   }
 
-  synchronized public void setLastCompactionID(Long compactionId) {
+  public synchronized void setLastCompactionID(Long compactionId) {
     if (compactionId != null)
       this.lastCompactID = compactionId;
   }
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/TabletMemory.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/TabletMemory.java
index fcb8f83..cf1d1eb 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/TabletMemory.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/TabletMemory.java
@@ -31,7 +31,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 class TabletMemory implements Closeable {
-  static private final Logger log = LoggerFactory.getLogger(TabletMemory.class);
+  private static final Logger log = LoggerFactory.getLogger(TabletMemory.class);
 
   private final TabletCommitter tablet;
   private InMemoryMap memTable;
diff --git a/server/tserver/src/test/java/org/apache/accumulo/tserver/logger/LogFileTest.java b/server/tserver/src/test/java/org/apache/accumulo/tserver/logger/LogFileTest.java
index 63f1b05..12d2f2d 100644
--- a/server/tserver/src/test/java/org/apache/accumulo/tserver/logger/LogFileTest.java
+++ b/server/tserver/src/test/java/org/apache/accumulo/tserver/logger/LogFileTest.java
@@ -41,7 +41,7 @@ import org.junit.Test;
 
 public class LogFileTest {
 
-  static private void readWrite(LogEvents event, long seq, int tid, String filename,
+  private static void readWrite(LogEvents event, long seq, int tid, String filename,
       KeyExtent tablet, Mutation[] mutations, LogFileKey keyResult, LogFileValue valueResult)
       throws IOException {
     LogFileKey key = new LogFileKey();
diff --git a/shell/src/main/java/org/apache/accumulo/shell/Shell.java b/shell/src/main/java/org/apache/accumulo/shell/Shell.java
index df692db..1f7d072 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/Shell.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/Shell.java
@@ -860,7 +860,7 @@ public class Shell extends ShellOptions implements KeywordExecutable {
    * execute along with some methods to help tab completion, and return the command name, help, and
    * usage.
    */
-  public static abstract class Command {
+  public abstract static class Command {
     // Helper methods for completion
     public enum CompletionSet {
       TABLENAMES, USERNAMES, COMMANDS, NAMESPACES
diff --git a/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloReloadingVFSClassLoader.java b/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloReloadingVFSClassLoader.java
index 43ee314..3ccc5e3 100644
--- a/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloReloadingVFSClassLoader.java
+++ b/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloReloadingVFSClassLoader.java
@@ -195,7 +195,7 @@ public class AccumuloReloadingVFSClassLoader implements FileListener, ReloadingC
     this(uris, vfs, parent, DEFAULT_TIMEOUT, preDelegate);
   }
 
-  synchronized public FileObject[] getFiles() {
+  public synchronized FileObject[] getFiles() {
     return Arrays.copyOf(this.files, this.files.length);
   }
 
diff --git a/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloVFSClassLoader.java b/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloVFSClassLoader.java
index c3c9bc8..6c3ec6a 100644
--- a/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloVFSClassLoader.java
+++ b/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloVFSClassLoader.java
@@ -105,7 +105,7 @@ public class AccumuloVFSClassLoader {
     Runtime.getRuntime().addShutdownHook(new Thread(new AccumuloVFSClassLoaderShutdownThread()));
   }
 
-  public synchronized static <U> Class<? extends U> loadClass(String classname, Class<U> extension)
+  public static synchronized <U> Class<? extends U> loadClass(String classname, Class<U> extension)
       throws ClassNotFoundException {
     try {
       return getClassLoader().loadClass(classname).asSubclass(extension);
diff --git a/start/src/main/java/org/apache/accumulo/start/classloader/vfs/ContextManager.java b/start/src/main/java/org/apache/accumulo/start/classloader/vfs/ContextManager.java
index d0440bb..cb5ce68 100644
--- a/start/src/main/java/org/apache/accumulo/start/classloader/vfs/ContextManager.java
+++ b/start/src/main/java/org/apache/accumulo/start/classloader/vfs/ContextManager.java
@@ -103,7 +103,7 @@ public class ContextManager {
     ContextConfig getContextConfig(String context);
   }
 
-  public static abstract class DefaultContextsConfig implements ContextsConfig {
+  public abstract static class DefaultContextsConfig implements ContextsConfig {
 
     public abstract Map<String,String> getVfsContextClasspathProperties();
 
diff --git a/test/src/main/java/org/apache/accumulo/test/BalanceFasterIT.java b/test/src/main/java/org/apache/accumulo/test/BalanceFasterIT.java
index 3dac3ec..e4b792e 100644
--- a/test/src/main/java/org/apache/accumulo/test/BalanceFasterIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/BalanceFasterIT.java
@@ -57,7 +57,7 @@ public class BalanceFasterIT extends ConfigurableMacBase {
   }
 
   @BeforeClass
-  static public void checkMR() {
+  public static void checkMR() {
     assumeFalse(IntegrationTestMapReduce.isMapReduce());
   }
 
diff --git a/test/src/main/java/org/apache/accumulo/test/HardListIterator.java b/test/src/main/java/org/apache/accumulo/test/HardListIterator.java
index 96287c5..f373d0b 100644
--- a/test/src/main/java/org/apache/accumulo/test/HardListIterator.java
+++ b/test/src/main/java/org/apache/accumulo/test/HardListIterator.java
@@ -40,7 +40,7 @@ import org.apache.log4j.Logger;
  */
 public class HardListIterator implements SortedKeyValueIterator<Key,Value> {
   private static final Logger log = Logger.getLogger(HardListIterator.class);
-  public final static SortedMap<Key,Value> allEntriesToInject;
+  public static final SortedMap<Key,Value> allEntriesToInject;
   static {
     SortedMap<Key,Value> t = new TreeMap<>();
     t.put(new Key(new Text("a1"), new Text("colF3"), new Text("colQ3"), System.currentTimeMillis()),
diff --git a/test/src/main/java/org/apache/accumulo/test/LargeSplitRowIT.java b/test/src/main/java/org/apache/accumulo/test/LargeSplitRowIT.java
index 931f674..c92a19e 100644
--- a/test/src/main/java/org/apache/accumulo/test/LargeSplitRowIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/LargeSplitRowIT.java
@@ -48,7 +48,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class LargeSplitRowIT extends ConfigurableMacBase {
-  static private final Logger log = LoggerFactory.getLogger(LargeSplitRowIT.class);
+  private static final Logger log = LoggerFactory.getLogger(LargeSplitRowIT.class);
 
   @Override
   public void configure(MiniAccumuloConfigImpl cfg, Configuration hadoopCoreSite) {
diff --git a/test/src/main/java/org/apache/accumulo/test/ManySplitIT.java b/test/src/main/java/org/apache/accumulo/test/ManySplitIT.java
index 1bc565f..63ea2d1 100644
--- a/test/src/main/java/org/apache/accumulo/test/ManySplitIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/ManySplitIT.java
@@ -49,7 +49,7 @@ public class ManySplitIT extends ConfigurableMacBase {
   final int SPLITS = 10_000;
 
   @BeforeClass
-  static public void checkMR() {
+  public static void checkMR() {
     assumeFalse(IntegrationTestMapReduce.isMapReduce());
   }
 
diff --git a/test/src/main/java/org/apache/accumulo/test/ShellServerIT.java b/test/src/main/java/org/apache/accumulo/test/ShellServerIT.java
index daa382a..a0e59cb 100644
--- a/test/src/main/java/org/apache/accumulo/test/ShellServerIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/ShellServerIT.java
@@ -154,7 +154,7 @@ public class ShellServerIT extends SharedMiniClusterBase {
     }
   }
 
-  private static abstract class ErrorMessageCallback {
+  private abstract static class ErrorMessageCallback {
     public abstract String getErrorMessage();
   }
 
@@ -1266,8 +1266,8 @@ public class ShellServerIT extends SharedMiniClusterBase {
     private Iterator<Entry<Key,Value>> iter = null;
     private FormatterConfig config;
 
-    private final static String tab = "\t";
-    private final static String newline = "\n";
+    private static final String tab = "\t";
+    private static final String newline = "\n";
 
     @Override
     public boolean hasNext() {
diff --git a/test/src/main/java/org/apache/accumulo/test/TestRandomDeletes.java b/test/src/main/java/org/apache/accumulo/test/TestRandomDeletes.java
index 19e4e48..39b9e29 100644
--- a/test/src/main/java/org/apache/accumulo/test/TestRandomDeletes.java
+++ b/test/src/main/java/org/apache/accumulo/test/TestRandomDeletes.java
@@ -43,7 +43,7 @@ public class TestRandomDeletes {
   private static final Logger log = LoggerFactory.getLogger(TestRandomDeletes.class);
   private static Authorizations auths = new Authorizations("L1", "L2", "G1", "GROUP2");
 
-  static private class RowColumn implements Comparable<RowColumn> {
+  private static class RowColumn implements Comparable<RowColumn> {
     Text row;
     Column column;
     long timestamp;
@@ -126,7 +126,7 @@ public class TestRandomDeletes {
     return result;
   }
 
-  static public void main(String[] args) {
+  public static void main(String[] args) {
 
     ClientOnDefaultTable opts = new ClientOnDefaultTable("test_ingest");
     ScannerOpts scanOpts = new ScannerOpts();
diff --git a/test/src/main/java/org/apache/accumulo/test/VerifySerialRecoveryIT.java b/test/src/main/java/org/apache/accumulo/test/VerifySerialRecoveryIT.java
index 3443540..f480ff4 100644
--- a/test/src/main/java/org/apache/accumulo/test/VerifySerialRecoveryIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/VerifySerialRecoveryIT.java
@@ -46,9 +46,9 @@ import com.google.common.collect.Iterators;
 
 public class VerifySerialRecoveryIT extends ConfigurableMacBase {
 
-  private final static byte[] HEXCHARS = {0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38,
+  private static final byte[] HEXCHARS = {0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38,
       0x39, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66};
-  private final static Random random = new SecureRandom();
+  private static final Random random = new SecureRandom();
 
   public static byte[] randomHex(int n) {
     byte[] binary = new byte[n];
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ConcurrentDeleteTableIT.java b/test/src/main/java/org/apache/accumulo/test/functional/ConcurrentDeleteTableIT.java
index 0b1e38c..137405f 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/ConcurrentDeleteTableIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/ConcurrentDeleteTableIT.java
@@ -121,7 +121,7 @@ public class ConcurrentDeleteTableIT extends AccumuloClusterHarness {
     return splits;
   }
 
-  private static abstract class DelayedTableOp implements Runnable {
+  private abstract static class DelayedTableOp implements Runnable {
     private CountDownLatch cdl;
 
     DelayedTableOp(CountDownLatch cdl) {
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ConfigurableCompactionIT.java b/test/src/main/java/org/apache/accumulo/test/functional/ConfigurableCompactionIT.java
index 97dab3b..d1d87c0 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/ConfigurableCompactionIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/ConfigurableCompactionIT.java
@@ -142,7 +142,7 @@ public class ConfigurableCompactionIT extends ConfigurableMacBase {
     client.tableOperations().flush(tablename, null, null, true);
   }
 
-  final static Random r = new SecureRandom();
+  static final Random r = new SecureRandom();
 
   private void makeFile(AccumuloClient client, String tablename) throws Exception {
     BatchWriter bw = client.createBatchWriter(tablename, new BatchWriterConfig());
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/DurabilityIT.java b/test/src/main/java/org/apache/accumulo/test/functional/DurabilityIT.java
index 098372d..2adedca 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/DurabilityIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/DurabilityIT.java
@@ -60,7 +60,7 @@ public class DurabilityIT extends ConfigurableMacBase {
   }
 
   @BeforeClass
-  static public void checkMR() {
+  public static void checkMR() {
     assumeFalse(IntegrationTestMapReduce.isMapReduce());
   }
 
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/FunctionalTestUtils.java b/test/src/main/java/org/apache/accumulo/test/functional/FunctionalTestUtils.java
index 9127055..e80edcb 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/FunctionalTestUtils.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/FunctionalTestUtils.java
@@ -113,7 +113,7 @@ public class FunctionalTestUtils {
     }
   }
 
-  static public void checkSplits(AccumuloClient c, String table, int min, int max)
+  public static void checkSplits(AccumuloClient c, String table, int min, int max)
       throws Exception {
     Collection<Text> splits = c.tableOperations().listSplits(table);
     if (splits.size() < min || splits.size() > max) {
@@ -122,7 +122,7 @@ public class FunctionalTestUtils {
     }
   }
 
-  static public void createRFiles(final AccumuloClient c, final FileSystem fs, String path,
+  public static void createRFiles(final AccumuloClient c, final FileSystem fs, String path,
       int rows, int splits, int threads) throws Exception {
     fs.delete(new Path(path), true);
     ExecutorService threadPool = Executors.newFixedThreadPool(threads);
@@ -152,7 +152,7 @@ public class FunctionalTestUtils {
     assertFalse(fail.get());
   }
 
-  static public String readAll(InputStream is) throws IOException {
+  public static String readAll(InputStream is) throws IOException {
     byte[] buffer = new byte[4096];
     StringBuilder result = new StringBuilder();
     while (true) {
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/SlowIterator.java b/test/src/main/java/org/apache/accumulo/test/functional/SlowIterator.java
index 051b032..4153716 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/SlowIterator.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/SlowIterator.java
@@ -34,8 +34,8 @@ import org.apache.accumulo.core.iterators.WrappingIterator;
 
 public class SlowIterator extends WrappingIterator {
 
-  static private final String SLEEP_TIME = "sleepTime";
-  static private final String SEEK_SLEEP_TIME = "seekSleepTime";
+  private static final String SLEEP_TIME = "sleepTime";
+  private static final String SEEK_SLEEP_TIME = "seekSleepTime";
 
   private long sleepTime = 0;
   private long seekSleepTime = 0;
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ZombieTServer.java b/test/src/main/java/org/apache/accumulo/test/functional/ZombieTServer.java
index 5e65a79..eba0e8f 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/ZombieTServer.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/ZombieTServer.java
@@ -68,7 +68,7 @@ public class ZombieTServer {
     }
 
     @Override
-    synchronized public void fastHalt(TInfo tinfo, TCredentials credentials, String lock) {
+    public synchronized void fastHalt(TInfo tinfo, TCredentials credentials, String lock) {
       halted = true;
       notifyAll();
     }
@@ -88,7 +88,7 @@ public class ZombieTServer {
     }
 
     @Override
-    synchronized public void halt(TInfo tinfo, TCredentials credentials, String lock)
+    public synchronized void halt(TInfo tinfo, TCredentials credentials, String lock)
         throws ThriftSecurityException, TException {
       halted = true;
       notifyAll();
diff --git a/test/src/main/java/org/apache/accumulo/test/performance/RollWALPerformanceIT.java b/test/src/main/java/org/apache/accumulo/test/performance/RollWALPerformanceIT.java
index 687b094..d94eff3 100644
--- a/test/src/main/java/org/apache/accumulo/test/performance/RollWALPerformanceIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/performance/RollWALPerformanceIT.java
@@ -42,7 +42,7 @@ import org.junit.experimental.categories.Category;
 public class RollWALPerformanceIT extends ConfigurableMacBase {
 
   @BeforeClass
-  static public void checkMR() {
+  public static void checkMR() {
     assumeFalse(IntegrationTestMapReduce.isMapReduce());
   }
 
diff --git a/test/src/main/java/org/apache/accumulo/test/performance/metadata/FastBulkImportIT.java b/test/src/main/java/org/apache/accumulo/test/performance/metadata/FastBulkImportIT.java
index 252579f..04763d8 100644
--- a/test/src/main/java/org/apache/accumulo/test/performance/metadata/FastBulkImportIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/performance/metadata/FastBulkImportIT.java
@@ -45,7 +45,7 @@ import org.junit.Test;
 public class FastBulkImportIT extends ConfigurableMacBase {
 
   @BeforeClass
-  static public void checkMR() {
+  public static void checkMR() {
     assumeFalse(IntegrationTestMapReduce.isMapReduce());
   }
 
diff --git a/test/src/main/java/org/apache/accumulo/test/performance/scan/CollectTabletStats.java b/test/src/main/java/org/apache/accumulo/test/performance/scan/CollectTabletStats.java
index 722ddfc..f880776 100644
--- a/test/src/main/java/org/apache/accumulo/test/performance/scan/CollectTabletStats.java
+++ b/test/src/main/java/org/apache/accumulo/test/performance/scan/CollectTabletStats.java
@@ -251,7 +251,7 @@ public class CollectTabletStats {
     threadPool.shutdown();
   }
 
-  private static abstract class Test implements Runnable {
+  private abstract static class Test implements Runnable {
 
     private int count;
     private long t1;
diff --git a/test/src/main/java/org/apache/accumulo/test/proxy/SimpleProxyBase.java b/test/src/main/java/org/apache/accumulo/test/proxy/SimpleProxyBase.java
index eacaa1b..2f65440 100644
--- a/test/src/main/java/org/apache/accumulo/test/proxy/SimpleProxyBase.java
+++ b/test/src/main/java/org/apache/accumulo/test/proxy/SimpleProxyBase.java
@@ -2682,7 +2682,7 @@ public abstract class SimpleProxyBase extends SharedMiniClusterBase {
     return toRet;
   }
 
-  static private ByteBuffer t2bb(Text t) {
+  private static ByteBuffer t2bb(Text t) {
     return ByteBuffer.wrap(t.getBytes());
   }
 
diff --git a/test/src/test/java/org/apache/accumulo/test/security/KerberosTokenEmbeddedKDCTest.java b/test/src/test/java/org/apache/accumulo/test/security/KerberosTokenEmbeddedKDCTest.java
index dbda155..471ed45 100644
--- a/test/src/test/java/org/apache/accumulo/test/security/KerberosTokenEmbeddedKDCTest.java
+++ b/test/src/test/java/org/apache/accumulo/test/security/KerberosTokenEmbeddedKDCTest.java
@@ -43,7 +43,7 @@ public class KerberosTokenEmbeddedKDCTest {
   @Rule
   public TestName testName = new TestName();
 
-  private volatile static TestingKdc kdc;
+  private static volatile TestingKdc kdc;
 
   @BeforeClass
   public static void startKdc() throws Exception {


Mime
View raw message