accumulo-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From GitBox <...@apache.org>
Subject [GitHub] milleruntime closed pull request #398: ACCUMULO-4820 More code cleanup for 2.0
Date Mon, 19 Mar 2018 14:55:02 GMT
milleruntime closed pull request #398: ACCUMULO-4820 More code cleanup for 2.0
URL: https://github.com/apache/accumulo/pull/398
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java b/core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java
index 638f7ba34e..3e749753d2 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java
@@ -763,7 +763,7 @@ private void convertMutations(TabletServerMutations<QCMutation> mutations, Map<L
 
   static class ConditionComparator implements Comparator<Condition> {
 
-    private static final Long MAX = Long.valueOf(Long.MAX_VALUE);
+    private static final Long MAX = Long.MAX_VALUE;
 
     @Override
     public int compare(Condition c1, Condition c2) {
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/NamespaceOperationsImpl.java b/core/src/main/java/org/apache/accumulo/core/client/impl/NamespaceOperationsImpl.java
index 9cfb1a4e3a..c0fe56750a 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/NamespaceOperationsImpl.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/NamespaceOperationsImpl.java
@@ -115,8 +115,7 @@ public void create(String namespace) throws AccumuloException, AccumuloSecurityE
     checkArgument(namespace != null, "namespace is null");
 
     try {
-      doNamespaceFateOperation(FateOperation.NAMESPACE_CREATE, Arrays.asList(ByteBuffer.wrap(namespace.getBytes(UTF_8))),
-          Collections.<String,String> emptyMap(), namespace);
+      doNamespaceFateOperation(FateOperation.NAMESPACE_CREATE, Arrays.asList(ByteBuffer.wrap(namespace.getBytes(UTF_8))), Collections.emptyMap(), namespace);
     } catch (NamespaceNotFoundException e) {
       // should not happen
       throw new AssertionError(e);
diff --git a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/RangeInputSplit.java b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/RangeInputSplit.java
index b1a86bb0ec..13226e4e97 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/RangeInputSplit.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/RangeInputSplit.java
@@ -229,8 +229,8 @@ public void write(DataOutput out) throws IOException {
     out.writeUTF(tableName);
     out.writeUTF(tableId);
     out.writeInt(locations.length);
-    for (int i = 0; i < locations.length; ++i)
-      out.writeUTF(locations[i]);
+    for (String location : locations)
+      out.writeUTF(location);
 
     out.writeBoolean(null != isolatedScan);
     if (null != isolatedScan) {
diff --git a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/impl/InputConfigurator.java b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/impl/InputConfigurator.java
index 2212c9daf8..b9690d5890 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/impl/InputConfigurator.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/impl/InputConfigurator.java
@@ -639,7 +639,7 @@ public static void setInputTableConfigs(Class<?> implementingClass, Configuratio
       }
     }
     for (Map.Entry<Writable,Writable> entry : mapWritable.entrySet())
-      configs.put(((Text) entry.getKey()).toString(), (InputTableConfig) entry.getValue());
+      configs.put(entry.getKey().toString(), (InputTableConfig) entry.getValue());
 
     return configs;
   }
diff --git a/core/src/main/java/org/apache/accumulo/core/constraints/VisibilityConstraint.java b/core/src/main/java/org/apache/accumulo/core/constraints/VisibilityConstraint.java
index 04e01a33e2..198c61aa07 100644
--- a/core/src/main/java/org/apache/accumulo/core/constraints/VisibilityConstraint.java
+++ b/core/src/main/java/org/apache/accumulo/core/constraints/VisibilityConstraint.java
@@ -74,10 +74,10 @@ public String getViolationDescription(short violationCode) {
             ve = new VisibilityEvaluator(env.getAuthorizationsContainer());
 
           if (!ve.evaluate(new ColumnVisibility(cv)))
-            return Collections.singletonList(Short.valueOf((short) 2));
+            return Collections.singletonList((short) 2);
 
         } catch (BadArgumentException | VisibilityParseException bae) {
-          return Collections.singletonList(Short.valueOf((short) 1));
+          return Collections.singletonList((short) 1);
         }
 
         if (ok != null)
diff --git a/core/src/main/java/org/apache/accumulo/core/data/Mutation.java b/core/src/main/java/org/apache/accumulo/core/data/Mutation.java
index 6ebdcb01cb..64083a3395 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/Mutation.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/Mutation.java
@@ -1089,8 +1089,7 @@ public void write(DataOutput out) throws IOException {
 
     if (0x01 == (0x01 & hasValues)) {
       WritableUtils.writeVInt(out, values.size());
-      for (int i = 0; i < values.size(); i++) {
-        byte val[] = values.get(i);
+      for (byte[] val : values) {
         WritableUtils.writeVInt(out, val.length);
         out.write(val);
       }
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 7211f5dbb3..39b6f6d3ad 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
@@ -387,8 +387,8 @@ public void add(CachedBlock block) {
     public long free(long toFree) {
       CachedBlock[] blocks = queue.get();
       long freedBytes = 0;
-      for (int i = 0; i < blocks.length; i++) {
-        freedBytes += evictBlock(blocks[i]);
+      for (CachedBlock block : blocks) {
+        freedBytes += evictBlock(block);
         if (freedBytes >= toFree) {
           return freedBytes;
         }
diff --git a/core/src/main/java/org/apache/accumulo/core/file/rfile/RFile.java b/core/src/main/java/org/apache/accumulo/core/file/rfile/RFile.java
index f2e2463414..911b33f194 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/rfile/RFile.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/rfile/RFile.java
@@ -1233,11 +1233,11 @@ public Key getFirstKey() throws IOException {
 
       Key minKey = null;
 
-      for (int i = 0; i < currentReaders.length; i++) {
+      for (LocalityGroupReader currentReader : currentReaders) {
         if (minKey == null) {
-          minKey = currentReaders[i].getFirstKey();
+          minKey = currentReader.getFirstKey();
         } else {
-          Key firstKey = currentReaders[i].getFirstKey();
+          Key firstKey = currentReader.getFirstKey();
           if (firstKey != null && firstKey.compareTo(minKey) < 0)
             minKey = firstKey;
         }
@@ -1254,11 +1254,11 @@ public Key getLastKey() throws IOException {
 
       Key maxKey = null;
 
-      for (int i = 0; i < currentReaders.length; i++) {
+      for (LocalityGroupReader currentReader : currentReaders) {
         if (maxKey == null) {
-          maxKey = currentReaders[i].getLastKey();
+          maxKey = currentReader.getLastKey();
         } else {
-          Key lastKey = currentReaders[i].getLastKey();
+          Key lastKey = currentReader.getLastKey();
           if (lastKey != null && lastKey.compareTo(maxKey) > 0)
             maxKey = lastKey;
         }
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 ea6bc59182..d001393a49 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
@@ -317,7 +317,7 @@ public void flush() {
        */
       @Override
       public void close() throws IOException {
-        if (closed == true) {
+        if (closed) {
           return;
         }
         try {
@@ -373,13 +373,13 @@ public void close() throws IOException {
      */
     @Override
     public void close() throws IOException {
-      if (closed == true) {
+      if (closed) {
         return;
       }
 
       try {
         if (errorCount == 0) {
-          if (blkInProgress == true) {
+          if (blkInProgress) {
             throw new IllegalStateException("Close() called with active block appender.");
           }
 
@@ -417,7 +417,7 @@ private Algorithm getDefaultCompressionAlgorithm() {
     }
 
     private BlockAppender prepareMetaBlock(String name, Algorithm compressAlgo) throws IOException, MetaBlockAlreadyExists {
-      if (blkInProgress == true) {
+      if (blkInProgress) {
         throw new IllegalStateException("Cannot create Meta Block until previous block is closed.");
       }
 
@@ -471,11 +471,11 @@ public BlockAppender prepareMetaBlock(String name) throws IOException, MetaBlock
      * @return The BlockAppender stream
      */
     public BlockAppender prepareDataBlock() throws IOException {
-      if (blkInProgress == true) {
+      if (blkInProgress) {
         throw new IllegalStateException("Cannot create Data Block until previous block is closed.");
       }
 
-      if (metaBlkSeen == true) {
+      if (metaBlkSeen) {
         throw new IllegalStateException("Cannot create Data Block after Meta Blocks.");
       }
 
@@ -705,7 +705,7 @@ public void finish() throws IOException {
        */
       @Override
       public void close() throws IOException {
-        if (closed == true) {
+        if (closed) {
           return;
         }
         try {
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/LongCombiner.java b/core/src/main/java/org/apache/accumulo/core/iterators/LongCombiner.java
index 6cddea0ae9..0df99ab91a 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/LongCombiner.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/LongCombiner.java
@@ -105,7 +105,7 @@ public IteratorOptions describeOptions() {
 
   @Override
   public boolean validateOptions(Map<String,String> options) {
-    if (super.validateOptions(options) == false)
+    if (!super.validateOptions(options))
       return false;
     try {
       setEncoder(options);
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 c75bd54b2e..a522fce80d 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
@@ -102,7 +102,7 @@ public TermSource(SortedKeyValueIterator<Key,Value> iter, Text term) {
       this.iter = Objects.requireNonNull(iter);
       this.term = Objects.requireNonNull(term);
       // The desired column families for this source is the term itself
-      this.seekColfams = Collections.<ByteSequence> singletonList(new ArrayByteSequence(term.getBytes(), 0, term.getLength()));
+      this.seekColfams = Collections.singletonList(new ArrayByteSequence(term.getBytes(), 0, term.getLength()));
       // No current range until we're seek()'ed for the first time
       this.currentRange = null;
     }
@@ -303,7 +303,7 @@ public void init(SortedKeyValueIterator<Key,Value> source, Map<String,String> op
   public IteratorOptions describeOptions() {
     Map<String,String> options = new HashMap<>();
     options.put(COLUMNS_KEY, "A comma-separated list of families");
-    return new IteratorOptions("OrIterator", "Produces a sorted stream of qualifiers based on families", options, Collections.<String> emptyList());
+    return new IteratorOptions("OrIterator", "Produces a sorted stream of qualifiers based on families", options, Collections.emptyList());
   }
 
   @Override
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/TypedValueCombiner.java b/core/src/main/java/org/apache/accumulo/core/iterators/TypedValueCombiner.java
index 05e3955009..9c815009b6 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/TypedValueCombiner.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/TypedValueCombiner.java
@@ -198,7 +198,7 @@ public IteratorOptions describeOptions() {
 
   @Override
   public boolean validateOptions(Map<String,String> options) {
-    if (super.validateOptions(options) == false)
+    if (!super.validateOptions(options))
       return false;
     try {
       setLossyness(options);
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/WrappingIterator.java b/core/src/main/java/org/apache/accumulo/core/iterators/WrappingIterator.java
index 5b37b302c6..fd12be7970 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/WrappingIterator.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/WrappingIterator.java
@@ -56,21 +56,21 @@ protected void setSource(SortedKeyValueIterator<Key,Value> source) {
 
   @Override
   public Key getTopKey() {
-    if (seenSeek == false)
+    if (!seenSeek)
       throw new IllegalStateException("never been seeked");
     return getSource().getTopKey();
   }
 
   @Override
   public Value getTopValue() {
-    if (seenSeek == false)
+    if (!seenSeek)
       throw new IllegalStateException("never been seeked");
     return getSource().getTopValue();
   }
 
   @Override
   public boolean hasTop() {
-    if (seenSeek == false)
+    if (!seenSeek)
       throw new IllegalStateException("never been seeked");
     return getSource().hasTop();
   }
@@ -83,7 +83,7 @@ public void init(SortedKeyValueIterator<Key,Value> source, Map<String,String> op
 
   @Override
   public void next() throws IOException {
-    if (seenSeek == false)
+    if (!seenSeek)
       throw new IllegalStateException("never been seeked");
     getSource().next();
   }
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/system/MultiIterator.java b/core/src/main/java/org/apache/accumulo/core/iterators/system/MultiIterator.java
index 7ff07e6d5c..0c824ee9ce 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/system/MultiIterator.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/system/MultiIterator.java
@@ -89,7 +89,7 @@ public MultiIterator(List<SortedKeyValueIterator<Key,Value>> iters2, KeyExtent e
   }
 
   public MultiIterator(List<SortedKeyValueIterator<Key,Value>> readers, boolean init) {
-    this(readers, (Range) null, init);
+    this(readers, null, init);
   }
 
   @Override
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/user/AgeOffFilter.java b/core/src/main/java/org/apache/accumulo/core/iterators/user/AgeOffFilter.java
index ee28e26ef3..65349d132c 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/user/AgeOffFilter.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/user/AgeOffFilter.java
@@ -90,7 +90,7 @@ public IteratorOptions describeOptions() {
 
   @Override
   public boolean validateOptions(Map<String,String> options) {
-    if (super.validateOptions(options) == false)
+    if (!super.validateOptions(options))
       return false;
     try {
       Long.parseLong(options.get(TTL));
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 77f33d9fdb..54d7923547 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
@@ -53,7 +53,7 @@ public IteratorOptions describeOptions() {
 
   @Override
   public boolean validateOptions(Map<String,String> options) {
-    if (super.validateOptions(options) == false)
+    if (!super.validateOptions(options))
       return false;
     return true;
   }
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/user/CfCqSliceOpts.java b/core/src/main/java/org/apache/accumulo/core/iterators/user/CfCqSliceOpts.java
index d1a091174e..8d3cabba65 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/user/CfCqSliceOpts.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/user/CfCqSliceOpts.java
@@ -103,7 +103,7 @@ public CfCqSliceOpts(Map<String,String> options) {
       options.put(OPT_MIN_INCLUSIVE, OPT_MIN_INCLUSIVE_DESC);
       options.put(OPT_MAX_INCLUSIVE, OPT_MAX_INCLUSIVE_DESC);
       return new OptionDescriber.IteratorOptions("ColumnSliceFilter", "Returns all key/value pairs where the column is between the specified values", options,
-          Collections.<String> emptyList());
+          Collections.emptyList());
     }
 
     @Override
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/user/ColumnAgeOffFilter.java b/core/src/main/java/org/apache/accumulo/core/iterators/user/ColumnAgeOffFilter.java
index 71be2e94c0..ce1899c057 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/user/ColumnAgeOffFilter.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/user/ColumnAgeOffFilter.java
@@ -104,7 +104,7 @@ public IteratorOptions describeOptions() {
 
   @Override
   public boolean validateOptions(Map<String,String> options) {
-    if (super.validateOptions(options) == false)
+    if (!super.validateOptions(options))
       return false;
     try {
       this.ttls = new TTLSet(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 5320b22a7a..94d01b57e0 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
@@ -136,7 +136,7 @@ synchronized public void init(SortedKeyValueIterator<Key,Value> source, Map<Stri
     if (options.containsKey(docFamilyOptionName))
       docColf = new Text(options.get(docFamilyOptionName));
     docSource = source.deepCopy(env);
-    indexColfSet = Collections.singleton((ByteSequence) new ArrayByteSequence(indexColf.getBytes(), 0, indexColf.getLength()));
+    indexColfSet = Collections.singleton(new ArrayByteSequence(indexColf.getBytes(), 0, indexColf.getLength()));
 
     for (TermSource ts : this.sources) {
       ts.seekColfams = indexColfSet;
@@ -179,7 +179,7 @@ protected Key buildDocKey() {
     Text colf = new Text(docColf);
     colf.append(nullByte, 0, 1);
     colf.append(currentDocID.getBytes(), 0, zeroIndex);
-    docColfSet = Collections.singleton((ByteSequence) new ArrayByteSequence(colf.getBytes(), 0, colf.getLength()));
+    docColfSet = Collections.singleton(new ArrayByteSequence(colf.getBytes(), 0, colf.getLength()));
     if (log.isTraceEnabled())
       log.trace("{} {}", zeroIndex, currentDocID.getLength());
     Text colq = new Text();
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/user/IntersectingIterator.java b/core/src/main/java/org/apache/accumulo/core/iterators/user/IntersectingIterator.java
index 205fbbbab5..1cf3211f17 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/user/IntersectingIterator.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/user/IntersectingIterator.java
@@ -104,7 +104,7 @@ public TermSource(SortedKeyValueIterator<Key,Value> iter, Text term, boolean not
       this.term = term;
       this.notFlag = notFlag;
       // The desired column families for this source is the term itself
-      this.seekColfams = Collections.<ByteSequence> singletonList(new ArrayByteSequence(term.getBytes(), 0, term.getLength()));
+      this.seekColfams = Collections.singletonList(new ArrayByteSequence(term.getBytes(), 0, term.getLength()));
     }
 
     public String getTermString() {
@@ -175,7 +175,7 @@ private boolean seekOneSource(int sourceID) throws IOException {
 
     if (sources[sourceID].notFlag) {
       while (true) {
-        if (sources[sourceID].iter.hasTop() == false) {
+        if (!sources[sourceID].iter.hasTop()) {
           // an empty column that you are negating is a valid condition
           break;
         }
@@ -251,7 +251,7 @@ private boolean seekOneSource(int sourceID) throws IOException {
       }
     } else {
       while (true) {
-        if (sources[sourceID].iter.hasTop() == false) {
+        if (!sources[sourceID].iter.hasTop()) {
           currentPartition = null;
           // setting currentRow to null counts as advancing the cursor
           return true;
@@ -387,8 +387,8 @@ public static String stringTopKey(SortedKeyValueIterator<Key,Value> iter) {
    */
   protected static String encodeColumns(Text[] columns) {
     StringBuilder sb = new StringBuilder();
-    for (int i = 0; i < columns.length; i++) {
-      sb.append(Base64.getEncoder().encodeToString(TextUtil.getBytes(columns[i])));
+    for (Text column : columns) {
+      sb.append(Base64.getEncoder().encodeToString(TextUtil.getBytes(column)));
       sb.append('\n');
     }
     return sb.toString();
@@ -455,7 +455,7 @@ public void init(SortedKeyValueIterator<Key,Value> source, Map<String,String> op
     }
     if (notFlag[0]) {
       for (int i = 1; i < notFlag.length; i++) {
-        if (notFlag[i] == false) {
+        if (!notFlag[i]) {
           Text swapFamily = new Text(terms[0]);
           terms[0].set(terms[i]);
           terms[i].set(swapFamily);
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/user/RegExFilter.java b/core/src/main/java/org/apache/accumulo/core/iterators/user/RegExFilter.java
index 3d46abcf68..abf46ddaa9 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/user/RegExFilter.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/user/RegExFilter.java
@@ -163,7 +163,7 @@ public IteratorOptions describeOptions() {
 
   @Override
   public boolean validateOptions(Map<String,String> options) {
-    if (super.validateOptions(options) == false)
+    if (!super.validateOptions(options))
       return false;
 
     try {
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/user/RowEncodingIterator.java b/core/src/main/java/org/apache/accumulo/core/iterators/user/RowEncodingIterator.java
index ebfbea955b..dd7ebfa7c3 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/user/RowEncodingIterator.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/user/RowEncodingIterator.java
@@ -100,7 +100,7 @@ private void prepKeys() throws IOException {
       return;
     Text currentRow;
     do {
-      if (sourceIter.hasTop() == false)
+      if (!sourceIter.hasTop())
         return;
       currentRow = new Text(sourceIter.getTopKey().getRow());
       keys.clear();
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/user/SummingArrayCombiner.java b/core/src/main/java/org/apache/accumulo/core/iterators/user/SummingArrayCombiner.java
index 2e59b2cadf..1b52458fb0 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/user/SummingArrayCombiner.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/user/SummingArrayCombiner.java
@@ -132,7 +132,7 @@ public IteratorOptions describeOptions() {
 
   @Override
   public boolean validateOptions(Map<String,String> options) {
-    if (super.validateOptions(options) == false)
+    if (!super.validateOptions(options))
       return false;
     try {
       setEncoder(options);
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/user/TimestampFilter.java b/core/src/main/java/org/apache/accumulo/core/iterators/user/TimestampFilter.java
index 18c10e9163..8935213520 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/user/TimestampFilter.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/user/TimestampFilter.java
@@ -136,7 +136,7 @@ public IteratorOptions describeOptions() {
 
   @Override
   public boolean validateOptions(Map<String,String> options) {
-    if (super.validateOptions(options) == false)
+    if (!super.validateOptions(options))
       return false;
     boolean hasStart = false;
     boolean hasEnd = false;
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/user/WholeColumnFamilyIterator.java b/core/src/main/java/org/apache/accumulo/core/iterators/user/WholeColumnFamilyIterator.java
index 0a3f3e5f34..33e0bee98a 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/user/WholeColumnFamilyIterator.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/user/WholeColumnFamilyIterator.java
@@ -158,7 +158,7 @@ private void prepKeys() throws IOException {
     Text currentCf;
 
     do {
-      if (sourceIter.hasTop() == false)
+      if (!sourceIter.hasTop())
         return;
       currentRow = new Text(sourceIter.getTopKey().getRow());
       currentCf = new Text(sourceIter.getTopKey().getColumnFamily());
diff --git a/core/src/main/java/org/apache/accumulo/core/security/crypto/DefaultCryptoModule.java b/core/src/main/java/org/apache/accumulo/core/security/crypto/DefaultCryptoModule.java
index c8b3162cf5..bac3432e43 100644
--- a/core/src/main/java/org/apache/accumulo/core/security/crypto/DefaultCryptoModule.java
+++ b/core/src/main/java/org/apache/accumulo/core/security/crypto/DefaultCryptoModule.java
@@ -111,7 +111,7 @@ private boolean validateNotEmpty(String givenValue, boolean allIsWell, StringBui
       return false;
     }
 
-    return true && allIsWell;
+    return allIsWell;
   }
 
   private boolean validateNotNull(Object givenValue, boolean allIsWell, StringBuilder buf, String errorMessage) {
@@ -121,7 +121,7 @@ private boolean validateNotNull(Object givenValue, boolean allIsWell, StringBuil
       return false;
     }
 
-    return true && allIsWell;
+    return allIsWell;
   }
 
   private boolean validateNotZero(int givenValue, boolean allIsWell, StringBuilder buf, String errorMessage) {
@@ -131,7 +131,7 @@ private boolean validateNotZero(int givenValue, boolean allIsWell, StringBuilder
       return false;
     }
 
-    return true && allIsWell;
+    return allIsWell;
   }
 
   private boolean validateParamsObject(CryptoModuleParameters params, int cipherMode) {
diff --git a/core/src/main/java/org/apache/accumulo/core/util/ServerServices.java b/core/src/main/java/org/apache/accumulo/core/util/ServerServices.java
index 86531c17a4..2cde812a16 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/ServerServices.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/ServerServices.java
@@ -78,7 +78,7 @@ public int hashCode() {
   @Override
   public boolean equals(Object o) {
     if (o instanceof ServerServices)
-      return toString().equals(((ServerServices) o).toString());
+      return toString().equals(o.toString());
     return false;
   }
 
diff --git a/core/src/test/java/org/apache/accumulo/core/client/impl/ScannerOptionsTest.java b/core/src/test/java/org/apache/accumulo/core/client/impl/ScannerOptionsTest.java
index cfdbe6f894..eebf4f79c2 100644
--- a/core/src/test/java/org/apache/accumulo/core/client/impl/ScannerOptionsTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/client/impl/ScannerOptionsTest.java
@@ -79,7 +79,7 @@ public void testFetchColumn() {
   public void testFetchNullColumn() {
     try (ScannerOptions options = new ScannerOptions()) {
       // Require a non-null instance of Column
-      options.fetchColumn((IteratorSetting.Column) null);
+      options.fetchColumn(null);
     }
   }
 }
diff --git a/core/src/test/java/org/apache/accumulo/core/client/mock/MockConnectorTest.java b/core/src/test/java/org/apache/accumulo/core/client/mock/MockConnectorTest.java
index b70cb00ec9..bd956bd2c0 100644
--- a/core/src/test/java/org/apache/accumulo/core/client/mock/MockConnectorTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/client/mock/MockConnectorTest.java
@@ -115,7 +115,7 @@ public void testBadMutations() throws Exception {
       Assert.fail("addMutations should throw IAE for null iterable");
     } catch (IllegalArgumentException iae) {}
 
-    bw.addMutations(Collections.<Mutation> emptyList());
+    bw.addMutations(Collections.emptyList());
 
     Mutation bad = new Mutation("bad");
     try {
diff --git a/core/src/test/java/org/apache/accumulo/core/data/KeyExtentTest.java b/core/src/test/java/org/apache/accumulo/core/data/KeyExtentTest.java
index 592036408b..f50458f5cc 100644
--- a/core/src/test/java/org/apache/accumulo/core/data/KeyExtentTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/data/KeyExtentTest.java
@@ -301,11 +301,11 @@ public void testKeyExtentsForSimpleRange() {
     results = KeyExtent.getKeyExtentsForRange(null, null, null);
     assertTrue("Non-empty set returned from no extents", results.isEmpty());
 
-    results = KeyExtent.getKeyExtentsForRange(null, null, Collections.<KeyExtent> emptySet());
+    results = KeyExtent.getKeyExtentsForRange(null, null, Collections.emptySet());
     assertTrue("Non-empty set returned from no extents", results.isEmpty());
 
     KeyExtent t = nke("t", null, null);
-    results = KeyExtent.getKeyExtentsForRange(null, null, Collections.<KeyExtent> singleton(t));
+    results = KeyExtent.getKeyExtentsForRange(null, null, Collections.singleton(t));
     assertEquals("Single tablet should always be returned", 1, results.size());
     assertEquals(t, results.iterator().next());
   }
diff --git a/core/src/test/java/org/apache/accumulo/core/data/OldMutation.java b/core/src/test/java/org/apache/accumulo/core/data/OldMutation.java
index 5e7d7bdad5..9a654961ff 100644
--- a/core/src/test/java/org/apache/accumulo/core/data/OldMutation.java
+++ b/core/src/test/java/org/apache/accumulo/core/data/OldMutation.java
@@ -453,8 +453,7 @@ public void write(DataOutput out) throws IOException {
     else {
       out.writeBoolean(true);
       out.writeInt(values.size());
-      for (int i = 0; i < values.size(); i++) {
-        byte val[] = values.get(i);
+      for (byte[] val : values) {
         out.writeInt(val.length);
         out.write(val);
       }
diff --git a/core/src/test/java/org/apache/accumulo/core/data/RangeTest.java b/core/src/test/java/org/apache/accumulo/core/data/RangeTest.java
index eac2954191..80e303a202 100644
--- a/core/src/test/java/org/apache/accumulo/core/data/RangeTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/data/RangeTest.java
@@ -796,15 +796,12 @@ public void testReadFields_Check() throws Exception {
     r.write(dos);
     dos.close();
     ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
-    DataInputStream dis = new DataInputStream(bais);
     Range r2 = new Range();
-    try {
+    try (DataInputStream dis = new DataInputStream(bais)) {
       r2.readFields(dis);
       fail("readFields allowed invalid range");
     } catch (InvalidObjectException exc) {
       /* good! */
-    } finally {
-      dis.close();
     }
   }
 
diff --git a/core/src/test/java/org/apache/accumulo/core/file/rfile/MultiThreadedRFileTest.java b/core/src/test/java/org/apache/accumulo/core/file/rfile/MultiThreadedRFileTest.java
index 5ca906469d..628cc6443a 100644
--- a/core/src/test/java/org/apache/accumulo/core/file/rfile/MultiThreadedRFileTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/file/rfile/MultiThreadedRFileTest.java
@@ -339,7 +339,7 @@ private void writeData(TestRFile trfBase) throws IOException {
 
     try {
       for (int locality = 1; locality < 4; locality++) {
-        trfBase.writer.startNewLocalityGroup("locality" + locality, Collections.singleton((ByteSequence) (new ArrayByteSequence(getCf(locality)))));
+        trfBase.writer.startNewLocalityGroup("locality" + locality, Collections.singleton(new ArrayByteSequence(getCf(locality))));
         for (int part = 0; part < 4; part++) {
           for (int i = 0; i < 2048; i++) {
             trfBase.writer.append(getKey(part, locality, i), getValue(i));
diff --git a/core/src/test/java/org/apache/accumulo/core/file/rfile/bcfile/CompressionTest.java b/core/src/test/java/org/apache/accumulo/core/file/rfile/bcfile/CompressionTest.java
index 6e8b843a69..fdf9ce17e9 100644
--- a/core/src/test/java/org/apache/accumulo/core/file/rfile/bcfile/CompressionTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/file/rfile/bcfile/CompressionTest.java
@@ -77,7 +77,7 @@ public void testSupport() {
   public void testSingle() throws IOException {
 
     for (final Algorithm al : Algorithm.values()) {
-      if (isSupported.get(al) != null && isSupported.get(al) == true) {
+      if (isSupported.get(al) != null && isSupported.get(al)) {
 
         // first call to issupported should be true
         Assert.assertTrue(al + " is not supported, but should be", al.isSupported());
@@ -93,7 +93,7 @@ public void testSingle() throws IOException {
   public void testSingleNoSideEffect() throws IOException {
 
     for (final Algorithm al : Algorithm.values()) {
-      if (isSupported.get(al) != null && isSupported.get(al) == true) {
+      if (isSupported.get(al) != null && isSupported.get(al)) {
 
         Assert.assertTrue(al + " is not supported, but should be", al.isSupported());
 
@@ -111,7 +111,7 @@ public void testSingleNoSideEffect() throws IOException {
   public void testManyStartNotNull() throws IOException, InterruptedException, ExecutionException {
 
     for (final Algorithm al : Algorithm.values()) {
-      if (isSupported.get(al) != null && isSupported.get(al) == true) {
+      if (isSupported.get(al) != null && isSupported.get(al)) {
 
         // first call to issupported should be true
         Assert.assertTrue(al + " is not supported, but should be", al.isSupported());
@@ -157,7 +157,7 @@ public Boolean call() throws Exception {
   public void testManyDontStartUntilThread() throws IOException, InterruptedException, ExecutionException {
 
     for (final Algorithm al : Algorithm.values()) {
-      if (isSupported.get(al) != null && isSupported.get(al) == true) {
+      if (isSupported.get(al) != null && isSupported.get(al)) {
 
         // first call to issupported should be true
         Assert.assertTrue(al + " is not supported, but should be", al.isSupported());
@@ -197,7 +197,7 @@ public Boolean call() throws Exception {
   public void testThereCanBeOnlyOne() throws IOException, InterruptedException, ExecutionException {
 
     for (final Algorithm al : Algorithm.values()) {
-      if (isSupported.get(al) != null && isSupported.get(al) == true) {
+      if (isSupported.get(al) != null && isSupported.get(al)) {
 
         // first call to issupported should be true
         Assert.assertTrue(al + " is not supported, but should be", al.isSupported());
diff --git a/core/src/test/java/org/apache/accumulo/core/iterators/system/SourceSwitchingIteratorTest.java b/core/src/test/java/org/apache/accumulo/core/iterators/system/SourceSwitchingIteratorTest.java
index 326b35fd29..959dfbaede 100644
--- a/core/src/test/java/org/apache/accumulo/core/iterators/system/SourceSwitchingIteratorTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/iterators/system/SourceSwitchingIteratorTest.java
@@ -286,7 +286,7 @@ private Range yield(Range r, SourceSwitchingIterator ssi, YieldCallback<Key> yie
       if (!r.contains(yieldPosition)) {
         throw new IOException("Underlying iterator yielded to a position outside of its range: " + yieldPosition + " not in " + r);
       }
-      r = new Range(yieldPosition, false, (Key) null, r.isEndKeyInclusive());
+      r = new Range(yieldPosition, false, null, r.isEndKeyInclusive());
       ssi.seek(r, new ArrayList<>(), false);
     }
     return r;
diff --git a/core/src/test/java/org/apache/accumulo/core/iterators/user/RowFilterTest.java b/core/src/test/java/org/apache/accumulo/core/iterators/user/RowFilterTest.java
index 59a6a9b30d..ad2fae6723 100644
--- a/core/src/test/java/org/apache/accumulo/core/iterators/user/RowFilterTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/iterators/user/RowFilterTest.java
@@ -181,9 +181,9 @@ public void test1() throws Exception {
     ColumnFamilySkippingIterator source = new ColumnFamilySkippingIterator(new SortedMapIterator(createKeyValues()));
 
     RowFilter filter = new SummingRowFilter();
-    filter.init(source, Collections.<String,String> emptyMap(), new DefaultIteratorEnvironment());
+    filter.init(source, Collections.emptyMap(), new DefaultIteratorEnvironment());
 
-    filter.seek(new Range(), Collections.<ByteSequence> emptySet(), false);
+    filter.seek(new Range(), Collections.emptySet(), false);
 
     assertEquals(new HashSet<>(Arrays.asList("2", "3")), getRows(filter));
 
@@ -192,13 +192,13 @@ public void test1() throws Exception {
     filter.seek(new Range(), ImmutableSet.of(cf), true);
     assertEquals(new HashSet<>(Arrays.asList("1", "3", "0", "4")), getRows(filter));
 
-    filter.seek(new Range("0", "4"), Collections.<ByteSequence> emptySet(), false);
+    filter.seek(new Range("0", "4"), Collections.emptySet(), false);
     assertEquals(new HashSet<>(Arrays.asList("2", "3")), getRows(filter));
 
-    filter.seek(new Range("2"), Collections.<ByteSequence> emptySet(), false);
+    filter.seek(new Range("2"), Collections.emptySet(), false);
     assertEquals(new HashSet<>(Arrays.asList("2")), getRows(filter));
 
-    filter.seek(new Range("4"), Collections.<ByteSequence> emptySet(), false);
+    filter.seek(new Range("4"), Collections.emptySet(), false);
     assertEquals(new HashSet<String>(), getRows(filter));
 
     filter.seek(new Range("4"), ImmutableSet.of(cf), true);
@@ -211,12 +211,12 @@ public void testChainedRowFilters() throws Exception {
     SortedMapIterator source = new SortedMapIterator(createKeyValues());
 
     RowFilter filter0 = new TrueFilter();
-    filter0.init(source, Collections.<String,String> emptyMap(), new DefaultIteratorEnvironment());
+    filter0.init(source, Collections.emptyMap(), new DefaultIteratorEnvironment());
 
     RowFilter filter = new TrueFilter();
-    filter.init(filter0, Collections.<String,String> emptyMap(), new DefaultIteratorEnvironment());
+    filter.init(filter0, Collections.emptyMap(), new DefaultIteratorEnvironment());
 
-    filter.seek(new Range(), Collections.<ByteSequence> emptySet(), false);
+    filter.seek(new Range(), Collections.emptySet(), false);
 
     assertEquals(new HashSet<>(Arrays.asList("0", "1", "2", "3", "4")), getRows(filter));
   }
@@ -227,12 +227,12 @@ public void testFilterConjunction() throws Exception {
     SortedMapIterator source = new SortedMapIterator(createKeyValues());
 
     RowFilter filter0 = new RowZeroOrOneFilter();
-    filter0.init(source, Collections.<String,String> emptyMap(), new DefaultIteratorEnvironment());
+    filter0.init(source, Collections.emptyMap(), new DefaultIteratorEnvironment());
 
     RowFilter filter = new RowOneOrTwoFilter();
-    filter.init(filter0, Collections.<String,String> emptyMap(), new DefaultIteratorEnvironment());
+    filter.init(filter0, Collections.emptyMap(), new DefaultIteratorEnvironment());
 
-    filter.seek(new Range(), Collections.<ByteSequence> emptySet(), false);
+    filter.seek(new Range(), Collections.emptySet(), false);
 
     assertEquals(new HashSet<>(Arrays.asList("1")), getRows(filter));
   }
@@ -242,9 +242,9 @@ public void deepCopyCopiesTheSource() throws Exception {
     SortedMapIterator source = new SortedMapIterator(createKeyValues());
 
     RowFilter filter = new RowZeroOrOneFilter();
-    filter.init(source, Collections.<String,String> emptyMap(), new DefaultIteratorEnvironment());
+    filter.init(source, Collections.emptyMap(), new DefaultIteratorEnvironment());
 
-    filter.seek(new Range(), Collections.<ByteSequence> emptySet(), false);
+    filter.seek(new Range(), Collections.emptySet(), false);
 
     // Save off the first key and value
     Key firstKey = filter.getTopKey();
@@ -265,7 +265,7 @@ public void deepCopyCopiesTheSource() throws Exception {
     RowFilter copy = (RowFilter) filter.deepCopy(new DefaultIteratorEnvironment());
 
     // Because it's a copy, we should be able to safely seek this one without affecting the original
-    copy.seek(new Range(), Collections.<ByteSequence> emptySet(), false);
+    copy.seek(new Range(), Collections.emptySet(), false);
 
     assertTrue("deepCopy'ed RowFilter did not have a top key", copy.hasTop());
 
diff --git a/core/src/test/java/org/apache/accumulo/core/iterators/user/WholeColumnFamilyIteratorTest.java b/core/src/test/java/org/apache/accumulo/core/iterators/user/WholeColumnFamilyIteratorTest.java
index f865d73d93..21e1ba18a1 100644
--- a/core/src/test/java/org/apache/accumulo/core/iterators/user/WholeColumnFamilyIteratorTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/iterators/user/WholeColumnFamilyIteratorTest.java
@@ -44,7 +44,6 @@
 import org.apache.accumulo.core.data.Key;
 import org.apache.accumulo.core.data.Range;
 import org.apache.accumulo.core.data.Value;
-import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
 import org.apache.accumulo.core.iterators.SortedMapIterator;
 import org.apache.accumulo.core.iterators.system.MultiIterator;
 import org.apache.hadoop.io.Text;
@@ -180,8 +179,7 @@ public void testBug1() throws Exception {
     map.putAll(map1);
     map.putAll(map2);
 
-    MultiIterator source = new MultiIterator(Collections.singletonList((SortedKeyValueIterator<Key,Value>) new SortedMapIterator(map)), new Range(null, true,
-        new Text("row1"), true));
+    MultiIterator source = new MultiIterator(Collections.singletonList(new SortedMapIterator(map)), new Range(null, true, new Text("row1"), true));
     WholeColumnFamilyIterator iter = new WholeColumnFamilyIterator(source);
 
     Range range = new Range(new Text("row1"), true, new Text("row2"), true);
diff --git a/core/src/test/java/org/apache/accumulo/core/iterators/user/WholeRowIteratorTest.java b/core/src/test/java/org/apache/accumulo/core/iterators/user/WholeRowIteratorTest.java
index d755f14928..79fd3e0813 100644
--- a/core/src/test/java/org/apache/accumulo/core/iterators/user/WholeRowIteratorTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/iterators/user/WholeRowIteratorTest.java
@@ -33,7 +33,6 @@
 import org.apache.accumulo.core.data.Key;
 import org.apache.accumulo.core.data.Range;
 import org.apache.accumulo.core.data.Value;
-import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
 import org.apache.accumulo.core.iterators.SortedMapIterator;
 import org.apache.accumulo.core.iterators.system.MultiIterator;
 import org.apache.hadoop.io.Text;
@@ -178,8 +177,7 @@ public void testBug1() throws Exception {
     map.putAll(map1);
     map.putAll(map2);
 
-    MultiIterator source = new MultiIterator(Collections.singletonList((SortedKeyValueIterator<Key,Value>) new SortedMapIterator(map)), new Range(null, true,
-        new Text("row1"), true));
+    MultiIterator source = new MultiIterator(Collections.singletonList(new SortedMapIterator(map)), new Range(null, true, new Text("row1"), true));
     WholeRowIterator iter = new WholeRowIterator(source);
 
     Range range = new Range(new Text("row1"), true, new Text("row2"), true);
diff --git a/core/src/test/java/org/apache/accumulo/core/util/PairTest.java b/core/src/test/java/org/apache/accumulo/core/util/PairTest.java
index b6c0e82522..4cf38a3fde 100644
--- a/core/src/test/java/org/apache/accumulo/core/util/PairTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/util/PairTest.java
@@ -142,11 +142,11 @@ public void testFromEntry() {
     assertEquals(entry.getKey(), pair0.getFirst());
     assertEquals(entry.getValue(), pair0.getSecond());
 
-    Pair<Object,Object> pair = Pair.<Object,Object,Integer,String> fromEntry(entry);
+    Pair<Object,Object> pair = Pair.fromEntry(entry);
     assertEquals(entry.getKey(), pair.getFirst());
     assertEquals(entry.getValue(), pair.getSecond());
 
-    Pair<Number,CharSequence> pair2 = Pair.<Number,CharSequence,Integer,String> fromEntry(entry);
+    Pair<Number,CharSequence> pair2 = Pair.fromEntry(entry);
     assertEquals(entry.getKey(), pair2.getFirst());
     assertEquals(entry.getValue(), pair2.getSecond());
   }
diff --git a/fate/src/main/java/org/apache/accumulo/fate/Fate.java b/fate/src/main/java/org/apache/accumulo/fate/Fate.java
index 73257b6a39..286a5c7095 100644
--- a/fate/src/main/java/org/apache/accumulo/fate/Fate.java
+++ b/fate/src/main/java/org/apache/accumulo/fate/Fate.java
@@ -210,7 +210,7 @@ public void seedTransaction(long tid, Repo<T> repo, boolean autoCleanUp) {
         }
 
         if (autoCleanUp)
-          store.setProperty(tid, AUTO_CLEAN_PROP, Boolean.valueOf(autoCleanUp));
+          store.setProperty(tid, AUTO_CLEAN_PROP, autoCleanUp);
 
         store.setProperty(tid, DEBUG_PROP, repo.getDescription());
 
diff --git a/fate/src/test/java/org/apache/accumulo/fate/ReadOnlyStoreTest.java b/fate/src/test/java/org/apache/accumulo/fate/ReadOnlyStoreTest.java
index e8f0ceedba..d459d81cee 100644
--- a/fate/src/test/java/org/apache/accumulo/fate/ReadOnlyStoreTest.java
+++ b/fate/src/test/java/org/apache/accumulo/fate/ReadOnlyStoreTest.java
@@ -46,7 +46,7 @@ public void everythingPassesThrough() throws Exception {
 
     EasyMock.expect(mock.waitForStatusChange(0xdeadbeefl, EnumSet.allOf(TStatus.class))).andReturn(TStatus.UNKNOWN);
     EasyMock.expect(mock.getProperty(0xdeadbeefl, "com.example.anyproperty")).andReturn("property");
-    EasyMock.expect(mock.list()).andReturn(Collections.<Long> emptyList());
+    EasyMock.expect(mock.list()).andReturn(Collections.emptyList());
 
     EasyMock.replay(repo);
     EasyMock.replay(mock);
diff --git a/fate/src/test/java/org/apache/accumulo/fate/zookeeper/ZooReaderWriterTest.java b/fate/src/test/java/org/apache/accumulo/fate/zookeeper/ZooReaderWriterTest.java
index 9203b3960e..64b6b3a65f 100644
--- a/fate/src/test/java/org/apache/accumulo/fate/zookeeper/ZooReaderWriterTest.java
+++ b/fate/src/test/java/org/apache/accumulo/fate/zookeeper/ZooReaderWriterTest.java
@@ -97,7 +97,7 @@ public void testDeleteFailOnRetry() throws Exception {
   public void testMutateNodeCreationFails() throws Exception {
     final String path = "/foo";
     final byte[] value = new byte[] {0};
-    final List<ACL> acls = Collections.<ACL> emptyList();
+    final List<ACL> acls = Collections.emptyList();
     Mutator mutator = new Mutator() {
       @Override
       public byte[] mutate(byte[] currentValue) throws Exception {
@@ -119,7 +119,7 @@ public void testMutateNodeCreationFails() throws Exception {
   public void testMutateWithBadVersion() throws Exception {
     final String path = "/foo";
     final byte[] value = new byte[] {0};
-    final List<ACL> acls = Collections.<ACL> emptyList();
+    final List<ACL> acls = Collections.emptyList();
     final byte[] mutatedBytes = new byte[] {1};
     Mutator mutator = new Mutator() {
       @Override
@@ -154,7 +154,7 @@ public void testMutateWithBadVersion() throws Exception {
   public void testMutateWithRetryOnSetData() throws Exception {
     final String path = "/foo";
     final byte[] value = new byte[] {0};
-    final List<ACL> acls = Collections.<ACL> emptyList();
+    final List<ACL> acls = Collections.emptyList();
     final byte[] mutatedBytes = new byte[] {1};
     Mutator mutator = new Mutator() {
       @Override
diff --git a/iterator-test-harness/src/main/java/org/apache/accumulo/iteratortest/IteratorTestInput.java b/iterator-test-harness/src/main/java/org/apache/accumulo/iteratortest/IteratorTestInput.java
index 5bec064e64..d6b6e181d3 100644
--- a/iterator-test-harness/src/main/java/org/apache/accumulo/iteratortest/IteratorTestInput.java
+++ b/iterator-test-harness/src/main/java/org/apache/accumulo/iteratortest/IteratorTestInput.java
@@ -57,7 +57,7 @@
    */
   public IteratorTestInput(Class<? extends SortedKeyValueIterator<Key,Value>> iteratorClass, Map<String,String> iteratorOptions, Range range,
       SortedMap<Key,Value> input) {
-    this(iteratorClass, iteratorOptions, range, input, Collections.<ByteSequence> emptySet(), false);
+    this(iteratorClass, iteratorOptions, range, input, Collections.emptySet(), false);
   }
 
   /**
diff --git a/iterator-test-harness/src/test/java/org/apache/accumulo/iteratortest/framework/JUnitFrameworkTest.java b/iterator-test-harness/src/test/java/org/apache/accumulo/iteratortest/framework/JUnitFrameworkTest.java
index 133db622b8..ff68269247 100644
--- a/iterator-test-harness/src/test/java/org/apache/accumulo/iteratortest/framework/JUnitFrameworkTest.java
+++ b/iterator-test-harness/src/test/java/org/apache/accumulo/iteratortest/framework/JUnitFrameworkTest.java
@@ -59,7 +59,7 @@ public boolean verify(IteratorTestOutput expected, IteratorTestOutput actual) {
   public static Object[][] parameters() {
     IteratorTestInput input = getIteratorInput();
     IteratorTestOutput output = getIteratorOutput();
-    List<IteratorTestCase> tests = Collections.<IteratorTestCase> singletonList(new NoopIteratorTestCase());
+    List<IteratorTestCase> tests = Collections.singletonList(new NoopIteratorTestCase());
     return BaseJUnit4IteratorTest.createParameters(input, output, tests);
   }
 
@@ -74,7 +74,7 @@ public boolean verify(IteratorTestOutput expected, IteratorTestOutput actual) {
   }
 
   private static IteratorTestInput getIteratorInput() {
-    return new IteratorTestInput(IdentityIterator.class, Collections.<String,String> emptyMap(), new Range(), DATA);
+    return new IteratorTestInput(IdentityIterator.class, Collections.emptyMap(), new Range(), DATA);
   }
 
   private static IteratorTestOutput getIteratorOutput() {
diff --git a/minicluster/src/main/java/org/apache/accumulo/cluster/standalone/StandaloneClusterControl.java b/minicluster/src/main/java/org/apache/accumulo/cluster/standalone/StandaloneClusterControl.java
index 45028e93a3..6b3f4fa2c5 100644
--- a/minicluster/src/main/java/org/apache/accumulo/cluster/standalone/StandaloneClusterControl.java
+++ b/minicluster/src/main/java/org/apache/accumulo/cluster/standalone/StandaloneClusterControl.java
@@ -151,7 +151,7 @@ public void adminStopAll() throws IOException {
     String[] cmd = new String[] {serverCmdPrefix, accumuloPath, Admin.class.getName(), "stopAll"};
     // Directly invoke the RemoteShell
     Entry<Integer,String> pair = exec(master, cmd);
-    if (0 != pair.getKey().intValue()) {
+    if (0 != pair.getKey()) {
       throw new IOException("stopAll did not finish successfully, retcode=" + pair.getKey() + ", stdout=" + pair.getValue());
     }
   }
@@ -170,7 +170,7 @@ public void setGoalState(String goalState) throws IOException {
     String master = getHosts(MASTER_HOSTS_FILE).get(0);
     String[] cmd = new String[] {serverCmdPrefix, accumuloPath, SetGoalState.class.getName(), goalState};
     Entry<Integer,String> pair = exec(master, cmd);
-    if (0 != pair.getKey().intValue()) {
+    if (0 != pair.getKey()) {
       throw new IOException("SetGoalState did not finish successfully, retcode=" + pair.getKey() + ", stdout=" + pair.getValue());
     }
   }
@@ -370,8 +370,7 @@ protected File getServerConfDir() {
    * Read the provided file and return all lines which don't start with a '#' character
    */
   protected List<String> getHosts(File f) throws IOException {
-    BufferedReader reader = new BufferedReader(new FileReader(f));
-    try {
+    try (BufferedReader reader = new BufferedReader(new FileReader(f))) {
       List<String> hosts = new ArrayList<>();
       String line;
       while ((line = reader.readLine()) != null) {
@@ -382,8 +381,6 @@ protected File getServerConfDir() {
       }
 
       return hosts;
-    } finally {
-      reader.close();
     }
   }
 }
diff --git a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterControl.java b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterControl.java
index bd07b993bc..61e74b1622 100644
--- a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterControl.java
+++ b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterControl.java
@@ -134,7 +134,7 @@ public synchronized void startAllServers(ServerType server) throws IOException {
 
   @Override
   public synchronized void start(ServerType server, String hostname) throws IOException {
-    start(server, hostname, Collections.<String,String> emptyMap(), Integer.MAX_VALUE);
+    start(server, hostname, Collections.emptyMap(), Integer.MAX_VALUE);
   }
 
   public synchronized void start(ServerType server, String hostname, Map<String,String> configOverrides, int limit) throws IOException {
diff --git a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java
index 8064358afa..e1942ab5d2 100644
--- a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java
+++ b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java
@@ -275,7 +275,7 @@ public MiniAccumuloConfigImpl setInstanceName(String instanceName) {
    *          key/values that you normally put in accumulo-site.xml can be put here.
    */
   public MiniAccumuloConfigImpl setSiteConfig(Map<String,String> siteConfig) {
-    if (existingInstance != null && existingInstance.booleanValue())
+    if (existingInstance != null && existingInstance)
       throw new UnsupportedOperationException("Cannot set set config info when using an existing instance.");
 
     this.existingInstance = Boolean.FALSE;
@@ -298,7 +298,7 @@ private MiniAccumuloConfigImpl _setSiteConfig(Map<String,String> siteConfig) {
    * @since 1.6.0
    */
   public MiniAccumuloConfigImpl setZooKeeperPort(int zooKeeperPort) {
-    if (existingInstance != null && existingInstance.booleanValue())
+    if (existingInstance != null && existingInstance)
       throw new UnsupportedOperationException("Cannot set zookeeper info when using an existing instance.");
 
     this.existingInstance = Boolean.FALSE;
@@ -317,7 +317,7 @@ public MiniAccumuloConfigImpl setZooKeeperPort(int zooKeeperPort) {
    * @since 1.6.1
    */
   public MiniAccumuloConfigImpl setZooKeeperStartupTime(long zooKeeperStartupTime) {
-    if (existingInstance != null && existingInstance.booleanValue())
+    if (existingInstance != null && existingInstance)
       throw new UnsupportedOperationException("Cannot set zookeeper info when using an existing instance.");
 
     this.existingInstance = Boolean.FALSE;
@@ -638,7 +638,7 @@ public void setUseCredentialProvider(boolean useCredentialProvider) {
    *           when there are issues converting the provided Files to URLs
    */
   public MiniAccumuloConfigImpl useExistingInstance(File accumuloSite, File hadoopConfDir) throws IOException {
-    if (existingInstance != null && !existingInstance.booleanValue())
+    if (existingInstance != null && !existingInstance)
       throw new UnsupportedOperationException("Cannot set to useExistingInstance after specifying config/zookeeper");
 
     this.existingInstance = Boolean.TRUE;
diff --git a/minicluster/src/test/java/org/apache/accumulo/minicluster/impl/CleanShutdownMacTest.java b/minicluster/src/test/java/org/apache/accumulo/minicluster/impl/CleanShutdownMacTest.java
index 81f9d3d501..fa66e6e378 100644
--- a/minicluster/src/test/java/org/apache/accumulo/minicluster/impl/CleanShutdownMacTest.java
+++ b/minicluster/src/test/java/org/apache/accumulo/minicluster/impl/CleanShutdownMacTest.java
@@ -48,7 +48,7 @@ public void testExecutorServiceShutdown() throws Exception {
 
     EasyMock.expect(future.get()).andReturn(0).anyTimes();
     EasyMock.expect(mockService.<Integer> submit(EasyMock.anyObject(Callable.class))).andReturn(future).anyTimes();
-    EasyMock.expect(mockService.shutdownNow()).andReturn(Collections.<Runnable> emptyList()).once();
+    EasyMock.expect(mockService.shutdownNow()).andReturn(Collections.emptyList()).once();
 
     EasyMock.replay(mockService, future);
 
diff --git a/server/base/src/main/java/org/apache/accumulo/server/conf/TableConfiguration.java b/server/base/src/main/java/org/apache/accumulo/server/conf/TableConfiguration.java
index da47f05e45..ef2ad83cd7 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/conf/TableConfiguration.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/conf/TableConfiguration.java
@@ -68,7 +68,7 @@ public TableConfiguration(Instance instance, Table.ID tableId, NamespaceConfigur
 
     iteratorConfig = new EnumMap<>(IteratorScope.class);
     for (IteratorScope scope : IteratorScope.values()) {
-      iteratorConfig.put(scope, new AtomicReference<ParsedIteratorConfig>(null));
+      iteratorConfig.put(scope, new AtomicReference<>(null));
     }
   }
 
diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java b/server/base/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java
index 59f1c6d862..74822a79ee 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java
@@ -114,7 +114,7 @@ public void unloadTablet(ZooLock lock, KeyExtent extent, TUnloadTabletGoal goal,
 
     public TabletServerStatus getTableMap(boolean usePooledConnection) throws TException, ThriftSecurityException {
 
-      if (usePooledConnection == true)
+      if (usePooledConnection)
         throw new UnsupportedOperationException();
 
       long start = System.currentTimeMillis();
diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/balancer/ChaoticLoadBalancer.java b/server/base/src/main/java/org/apache/accumulo/server/master/balancer/ChaoticLoadBalancer.java
index 702478d22d..b04492bd9d 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/master/balancer/ChaoticLoadBalancer.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/master/balancer/ChaoticLoadBalancer.java
@@ -89,7 +89,7 @@ public void getAssignments(SortedMap<TServerInstance,TabletServerStatus> current
       int index = r.nextInt(tServerArray.size());
       TServerInstance dest = tServerArray.get(index);
       assignments.put(ke, dest);
-      long remaining = toAssign.get(dest).longValue() - 1;
+      long remaining = toAssign.get(dest) - 1;
       if (remaining == 0) {
         tServerArray.remove(index);
         toAssign.remove(dest);
diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/balancer/TableLoadBalancer.java b/server/base/src/main/java/org/apache/accumulo/server/master/balancer/TableLoadBalancer.java
index bc41f98f56..6b9b47be1b 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/master/balancer/TableLoadBalancer.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/master/balancer/TableLoadBalancer.java
@@ -75,7 +75,7 @@ protected TabletBalancer getBalancerForTable(Table.ID tableId) {
     if (clazzName == null)
       clazzName = DefaultLoadBalancer.class.getName();
     if (balancer != null) {
-      if (clazzName.equals(balancer.getClass().getName()) == false) {
+      if (!clazzName.equals(balancer.getClass().getName())) {
         // the balancer class for this table does not match the class specified in the configuration
         try {
           // attempt to construct a balancer with the specified class
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 c1229f97e2..b31b2d9eaf 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
@@ -154,7 +154,7 @@ public void run() {
    * Iff a TabletBalancer makes use of the migrations member to provide samples, then OutstandingMigrations is not thread safe.
    */
   protected static class OutstandingMigrations extends BalancerProblem {
-    public Set<KeyExtent> migrations = Collections.<KeyExtent> emptySet();
+    public Set<KeyExtent> migrations = Collections.emptySet();
 
     public OutstandingMigrations(Logger logger) {
       super(logger);
diff --git a/server/base/src/main/java/org/apache/accumulo/server/replication/ReplicationUtil.java b/server/base/src/main/java/org/apache/accumulo/server/replication/ReplicationUtil.java
index 0ef6cca90d..8df13730a6 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/replication/ReplicationUtil.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/replication/ReplicationUtil.java
@@ -175,7 +175,7 @@ public int getMaxReplicationThreads(MasterMonitorInfo mmi) {
         // TODO ACCUMULO-2835 once explicit lengths are tracked, we can give size-based estimates instead of just file-based
         Long count = counts.get(target);
         if (null == count) {
-          counts.put(target, Long.valueOf(1l));
+          counts.put(target, 1l);
         } else {
           counts.put(target, count + 1);
         }
diff --git a/server/base/src/main/java/org/apache/accumulo/server/security/UserImpersonation.java b/server/base/src/main/java/org/apache/accumulo/server/security/UserImpersonation.java
index 96d903293f..5a615bf61a 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/security/UserImpersonation.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/security/UserImpersonation.java
@@ -288,7 +288,7 @@ private void parseMultiPropertyConfiguration(Map<String,String> configProperties
             usersWithHosts.setUsers(users);
           }
           String[] userValues = StringUtils.split(userString, ',');
-          users.addAll(Arrays.<String> asList(userValues));
+          users.addAll(Arrays.asList(userValues));
         }
       } else if (HOSTS.equals(usersOrHosts)) {
         String hostsString = entry.getValue().trim();
@@ -301,7 +301,7 @@ private void parseMultiPropertyConfiguration(Map<String,String> configProperties
             usersWithHosts.setHosts(hosts);
           }
           String[] hostValues = StringUtils.split(hostsString, ',');
-          hosts.addAll(Arrays.<String> asList(hostValues));
+          hosts.addAll(Arrays.asList(hostValues));
         }
       } else {
         log.debug("Ignoring key {}", aclKey);
diff --git a/server/base/src/main/java/org/apache/accumulo/server/security/delegation/ZooAuthenticationKeyDistributor.java b/server/base/src/main/java/org/apache/accumulo/server/security/delegation/ZooAuthenticationKeyDistributor.java
index 7685559003..347e1ace98 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/security/delegation/ZooAuthenticationKeyDistributor.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/security/delegation/ZooAuthenticationKeyDistributor.java
@@ -100,7 +100,7 @@ public synchronized void initialize() throws KeeperException, InterruptedExcepti
 
     // Shortcircuit to avoid a list creation
     if (children.isEmpty()) {
-      return Collections.<AuthenticationKey> emptyList();
+      return Collections.emptyList();
     }
 
     // Deserialize each byte[] into an AuthenticationKey
diff --git a/server/base/src/main/java/org/apache/accumulo/server/security/handler/KerberosAuthenticator.java b/server/base/src/main/java/org/apache/accumulo/server/security/handler/KerberosAuthenticator.java
index a7010524c9..23d199d0c7 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/security/handler/KerberosAuthenticator.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/security/handler/KerberosAuthenticator.java
@@ -51,8 +51,7 @@
 public class KerberosAuthenticator implements Authenticator {
   private static final Logger log = LoggerFactory.getLogger(KerberosAuthenticator.class);
 
-  private static final Set<Class<? extends AuthenticationToken>> SUPPORTED_TOKENS = Sets.newHashSet(Arrays.<Class<? extends AuthenticationToken>> asList(
-      KerberosToken.class, SystemToken.class));
+  private static final Set<Class<? extends AuthenticationToken>> SUPPORTED_TOKENS = Sets.newHashSet(Arrays.asList(KerberosToken.class, SystemToken.class));
   private static final Set<String> SUPPORTED_TOKEN_NAMES = Sets.newHashSet(KerberosToken.class.getName(), SystemToken.class.getName());
 
   private final ZKAuthenticator zkAuthenticator = new ZKAuthenticator();
diff --git a/server/base/src/main/java/org/apache/accumulo/server/tablets/TabletTime.java b/server/base/src/main/java/org/apache/accumulo/server/tablets/TabletTime.java
index 3dd9e7b30e..dc5268bae8 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/tablets/TabletTime.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/tablets/TabletTime.java
@@ -183,7 +183,7 @@ public long getAndUpdateTime() {
     AtomicLong nextTime;
 
     private LogicalTime(Long time) {
-      this.nextTime = new AtomicLong(time.longValue() + 1);
+      this.nextTime = new AtomicLong(time + 1);
     }
 
     @Override
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/SendLogToChainsaw.java b/server/base/src/main/java/org/apache/accumulo/server/util/SendLogToChainsaw.java
index d06bc4e0d3..c967f9837f 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/SendLogToChainsaw.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/SendLogToChainsaw.java
@@ -32,7 +32,6 @@
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
-import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -45,9 +44,7 @@
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
 import org.apache.log4j.spi.Filter;
-import org.apache.log4j.spi.LocationInfo;
 import org.apache.log4j.spi.LoggingEvent;
-import org.apache.log4j.spi.ThrowableInformation;
 import org.apache.log4j.varia.LevelRangeFilter;
 import org.apache.log4j.xml.XMLLayout;
 
@@ -199,8 +196,7 @@ private String convertLine(String line, String threadName) throws UnsupportedEnc
         return null;
       Category c = Logger.getLogger(clazz);
       Level l = Level.toLevel(level);
-      LoggingEvent event = new LoggingEvent(clazz, c, ts, l, message, threadName, (ThrowableInformation) null, (String) null, (LocationInfo) null,
-          (Map<?,?>) null);
+      LoggingEvent event = new LoggingEvent(clazz, c, ts, l, message, threadName, null, null, null, null);
       // Check the log level filter
       if (null != levelFilter && (levelFilter.decide(event) == Filter.DENY)) {
         return null;
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/TableInfoUtil.java b/server/base/src/main/java/org/apache/accumulo/server/util/TableInfoUtil.java
index d804e1ca1b..d22d630954 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/TableInfoUtil.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/TableInfoUtil.java
@@ -77,7 +77,7 @@ public static TableInfo summarizeTableStats(TabletServerStatus status) {
         if (status != null && status.tableMap != null) {
           for (String table : status.tableMap.keySet()) {
             Double holdTime = compactingByTable.get(table);
-            compactingByTable.put(table, Math.max(holdTime == null ? 0. : holdTime.doubleValue(), status.holdTime));
+            compactingByTable.put(table, Math.max(holdTime == null ? 0. : holdTime, status.holdTime));
           }
         }
       }
diff --git a/server/base/src/test/java/org/apache/accumulo/server/fs/VolumeUtilTest.java b/server/base/src/test/java/org/apache/accumulo/server/fs/VolumeUtilTest.java
index d04b12427a..04ce01d3ed 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/fs/VolumeUtilTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/fs/VolumeUtilTest.java
@@ -209,11 +209,8 @@ public void testRootTableReplacement() throws IOException {
   }
 
   private void writeFile(FileSystem fs, Path dir, String filename, String data) throws IOException {
-    FSDataOutputStream out = fs.create(new Path(dir, filename));
-    try {
+    try (FSDataOutputStream out = fs.create(new Path(dir, filename))) {
       out.writeUTF(data);
-    } finally {
-      out.close();
     }
   }
 }
diff --git a/server/base/src/test/java/org/apache/accumulo/server/iterators/MetadataBulkLoadFilterTest.java b/server/base/src/test/java/org/apache/accumulo/server/iterators/MetadataBulkLoadFilterTest.java
index a9a1f7bfed..d07fb01355 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/iterators/MetadataBulkLoadFilterTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/iterators/MetadataBulkLoadFilterTest.java
@@ -22,7 +22,6 @@
 import java.util.TreeMap;
 
 import org.apache.accumulo.core.client.impl.BaseIteratorEnvironment;
-import org.apache.accumulo.core.data.ByteSequence;
 import org.apache.accumulo.core.data.Key;
 import org.apache.accumulo.core.data.Range;
 import org.apache.accumulo.core.data.Value;
@@ -102,7 +101,7 @@ public void testBasic() throws IOException {
     put(tm1, "2<", TabletsSection.BulkFileColumnFamily.NAME, "/t2/fileA", "2");
 
     TestMetadataBulkLoadFilter iter = new TestMetadataBulkLoadFilter();
-    iter.init(new SortedMapIterator(tm1), new HashMap<String,String>(), new BaseIteratorEnvironment() {
+    iter.init(new SortedMapIterator(tm1), new HashMap<>(), new BaseIteratorEnvironment() {
 
       @Override
       public boolean isFullMajorCompaction() {
@@ -115,7 +114,7 @@ public IteratorScope getIteratorScope() {
       }
     });
 
-    iter.seek(new Range(), new ArrayList<ByteSequence>(), false);
+    iter.seek(new Range(), new ArrayList<>(), false);
 
     TreeMap<Key,Value> actual = new TreeMap<>();
 
diff --git a/server/base/src/test/java/org/apache/accumulo/server/master/balancer/BaseHostRegexTableLoadBalancerTest.java b/server/base/src/test/java/org/apache/accumulo/server/master/balancer/BaseHostRegexTableLoadBalancerTest.java
index 8bcca0557b..48e5792410 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/master/balancer/BaseHostRegexTableLoadBalancerTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/master/balancer/BaseHostRegexTableLoadBalancerTest.java
@@ -250,19 +250,19 @@ public long getUpdateCount() {
     initialTableLocation.put(BAR.getTableName(), new TServerInstance("192.168.0.6:9997", 1));
     initialTableLocation.put(BAZ.getTableName(), new TServerInstance("192.168.0.11:9997", 1));
 
-    tableExtents.put(FOO.getTableName(), new ArrayList<KeyExtent>());
+    tableExtents.put(FOO.getTableName(), new ArrayList<>());
     tableExtents.get(FOO.getTableName()).add(new KeyExtent(FOO.getId(), new Text("1"), new Text("0")));
     tableExtents.get(FOO.getTableName()).add(new KeyExtent(FOO.getId(), new Text("2"), new Text("1")));
     tableExtents.get(FOO.getTableName()).add(new KeyExtent(FOO.getId(), new Text("3"), new Text("2")));
     tableExtents.get(FOO.getTableName()).add(new KeyExtent(FOO.getId(), new Text("4"), new Text("3")));
     tableExtents.get(FOO.getTableName()).add(new KeyExtent(FOO.getId(), new Text("5"), new Text("4")));
-    tableExtents.put(BAR.getTableName(), new ArrayList<KeyExtent>());
+    tableExtents.put(BAR.getTableName(), new ArrayList<>());
     tableExtents.get(BAR.getTableName()).add(new KeyExtent(BAR.getId(), new Text("11"), new Text("10")));
     tableExtents.get(BAR.getTableName()).add(new KeyExtent(BAR.getId(), new Text("12"), new Text("11")));
     tableExtents.get(BAR.getTableName()).add(new KeyExtent(BAR.getId(), new Text("13"), new Text("12")));
     tableExtents.get(BAR.getTableName()).add(new KeyExtent(BAR.getId(), new Text("14"), new Text("13")));
     tableExtents.get(BAR.getTableName()).add(new KeyExtent(BAR.getId(), new Text("15"), new Text("14")));
-    tableExtents.put(BAZ.getTableName(), new ArrayList<KeyExtent>());
+    tableExtents.put(BAZ.getTableName(), new ArrayList<>());
     tableExtents.get(BAZ.getTableName()).add(new KeyExtent(BAZ.getId(), new Text("21"), new Text("20")));
     tableExtents.get(BAZ.getTableName()).add(new KeyExtent(BAZ.getId(), new Text("22"), new Text("21")));
     tableExtents.get(BAZ.getTableName()).add(new KeyExtent(BAZ.getId(), new Text("23"), new Text("22")));
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 afcf6ac9df..ea78ae0697 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
@@ -176,9 +176,9 @@ public String get(Property property) {
     tls.balance(state, migrations, migrationsOut);
     int count = 0;
     Map<Table.ID,Integer> movedByTable = new HashMap<>();
-    movedByTable.put(Table.ID.of(t1Id), Integer.valueOf(0));
-    movedByTable.put(Table.ID.of(t2Id), Integer.valueOf(0));
-    movedByTable.put(Table.ID.of(t3Id), Integer.valueOf(0));
+    movedByTable.put(Table.ID.of(t1Id), 0);
+    movedByTable.put(Table.ID.of(t2Id), 0);
+    movedByTable.put(Table.ID.of(t3Id), 0);
     for (TabletMigration migration : migrationsOut) {
       if (migration.oldServer.equals(svr))
         count++;
diff --git a/server/base/src/test/java/org/apache/accumulo/server/security/UserImpersonationTest.java b/server/base/src/test/java/org/apache/accumulo/server/security/UserImpersonationTest.java
index 5b4e1b05fc..6548b1bb55 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/security/UserImpersonationTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/security/UserImpersonationTest.java
@@ -47,7 +47,7 @@
 
   @Before
   public void setup() {
-    cc = new ConfigurationCopy(new HashMap<String,String>());
+    cc = new ConfigurationCopy(new HashMap<>());
     conf = new AccumuloConfiguration() {
       DefaultConfiguration defaultConfig = DefaultConfiguration.getInstance();
 
diff --git a/server/base/src/test/java/org/apache/accumulo/server/security/delegation/ZooAuthenticationKeyDistributorTest.java b/server/base/src/test/java/org/apache/accumulo/server/security/delegation/ZooAuthenticationKeyDistributorTest.java
index ed40a109e4..34d838dd78 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/security/delegation/ZooAuthenticationKeyDistributorTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/security/delegation/ZooAuthenticationKeyDistributorTest.java
@@ -89,7 +89,7 @@ public void testInitializeCreatesParentNode() throws Exception {
 
     // Attempt to create the directory and fail
     expect(zrw.exists(baseNode)).andReturn(false);
-    expect(zrw.putPrivatePersistentData(eq(baseNode), (byte[]) anyObject(), eq(NodeExistsPolicy.FAIL))).andReturn(true);
+    expect(zrw.putPrivatePersistentData(eq(baseNode), anyObject(), eq(NodeExistsPolicy.FAIL))).andReturn(true);
 
     replay(zrw);
 
@@ -122,7 +122,7 @@ public void testMissingAcl() throws Exception {
 
     // Attempt to create the directory and fail
     expect(zrw.exists(baseNode)).andReturn(true);
-    expect(zrw.getACL(eq(baseNode), anyObject(Stat.class))).andReturn(Collections.<ACL> emptyList());
+    expect(zrw.getACL(eq(baseNode), anyObject(Stat.class))).andReturn(Collections.emptyList());
 
     replay(zrw);
 
diff --git a/server/base/src/test/java/org/apache/accumulo/server/security/delegation/ZooAuthenticationKeyWatcherTest.java b/server/base/src/test/java/org/apache/accumulo/server/security/delegation/ZooAuthenticationKeyWatcherTest.java
index 479281256e..7c55e4d303 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/security/delegation/ZooAuthenticationKeyWatcherTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/security/delegation/ZooAuthenticationKeyWatcherTest.java
@@ -84,7 +84,7 @@ public void setupMocks() {
   public void testBaseNodeCreated() throws Exception {
     WatchedEvent event = new WatchedEvent(EventType.NodeCreated, null, baseNode);
 
-    expect(zk.getChildren(baseNode, keyWatcher)).andReturn(Collections.<String> emptyList());
+    expect(zk.getChildren(baseNode, keyWatcher)).andReturn(Collections.emptyList());
     replay(instance, zk);
 
     keyWatcher.process(event);
diff --git a/server/base/src/test/java/org/apache/accumulo/server/util/AdminTest.java b/server/base/src/test/java/org/apache/accumulo/server/util/AdminTest.java
index 8d0e7f39d6..4fafbe9a76 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/util/AdminTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/util/AdminTest.java
@@ -81,7 +81,7 @@ public void testCannotQualifySessionId() {
     String server = "localhost:12345";
 
     String serverPath = root + "/" + server;
-    EasyMock.expect(zc.getChildren(serverPath)).andReturn(Collections.<String> emptyList());
+    EasyMock.expect(zc.getChildren(serverPath)).andReturn(Collections.emptyList());
 
     EasyMock.replay(zc);
 
diff --git a/server/base/src/test/java/org/apache/accumulo/server/util/FileUtilTest.java b/server/base/src/test/java/org/apache/accumulo/server/util/FileUtilTest.java
index 326dba4c32..3add5e56ca 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/util/FileUtilTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/util/FileUtilTest.java
@@ -29,7 +29,6 @@
 import java.util.Iterator;
 
 import org.apache.accumulo.core.conf.Property;
-import org.apache.accumulo.core.file.FileSKVIterator;
 import org.apache.accumulo.server.fs.FileRef;
 import org.apache.accumulo.server.fs.VolumeManager;
 import org.apache.accumulo.server.fs.VolumeManagerImpl;
@@ -92,7 +91,7 @@ public void testCleanupIndexOpWithDfsDir() throws IOException {
 
     VolumeManager fs = VolumeManagerImpl.getLocal(accumuloDir.getAbsolutePath());
 
-    FileUtil.cleanupIndexOp(tmpPath1, fs, new ArrayList<FileSKVIterator>());
+    FileUtil.cleanupIndexOp(tmpPath1, fs, new ArrayList<>());
 
     Assert.assertFalse("Expected " + tmp1 + " to be cleaned up but it wasn't", tmp1.exists());
   }
@@ -118,11 +117,11 @@ public void testCleanupIndexOpWithCommonParentVolume() throws IOException {
 
     VolumeManager fs = VolumeManagerImpl.getLocal(accumuloDir.getAbsolutePath());
 
-    FileUtil.cleanupIndexOp(tmpPath1, fs, new ArrayList<FileSKVIterator>());
+    FileUtil.cleanupIndexOp(tmpPath1, fs, new ArrayList<>());
 
     Assert.assertFalse("Expected " + tmp1 + " to be cleaned up but it wasn't", tmp1.exists());
 
-    FileUtil.cleanupIndexOp(tmpPath2, fs, new ArrayList<FileSKVIterator>());
+    FileUtil.cleanupIndexOp(tmpPath2, fs, new ArrayList<>());
 
     Assert.assertFalse("Expected " + tmp2 + " to be cleaned up but it wasn't", tmp2.exists());
   }
@@ -149,11 +148,11 @@ public void testCleanupIndexOpWithCommonParentVolumeWithDepth() throws IOExcepti
 
     VolumeManager fs = VolumeManagerImpl.getLocal(accumuloDir.getAbsolutePath());
 
-    FileUtil.cleanupIndexOp(tmpPath1, fs, new ArrayList<FileSKVIterator>());
+    FileUtil.cleanupIndexOp(tmpPath1, fs, new ArrayList<>());
 
     Assert.assertFalse("Expected " + tmp1 + " to be cleaned up but it wasn't", tmp1.exists());
 
-    FileUtil.cleanupIndexOp(tmpPath2, fs, new ArrayList<FileSKVIterator>());
+    FileUtil.cleanupIndexOp(tmpPath2, fs, new ArrayList<>());
 
     Assert.assertFalse("Expected " + tmp2 + " to be cleaned up but it wasn't", tmp2.exists());
   }
@@ -176,11 +175,11 @@ public void testCleanupIndexOpWithoutCommonParentVolume() throws IOException {
 
     VolumeManager fs = VolumeManagerImpl.getLocal(accumuloDir.getAbsolutePath());
 
-    FileUtil.cleanupIndexOp(tmpPath1, fs, new ArrayList<FileSKVIterator>());
+    FileUtil.cleanupIndexOp(tmpPath1, fs, new ArrayList<>());
 
     Assert.assertFalse("Expected " + tmp1 + " to be cleaned up but it wasn't", tmp1.exists());
 
-    FileUtil.cleanupIndexOp(tmpPath2, fs, new ArrayList<FileSKVIterator>());
+    FileUtil.cleanupIndexOp(tmpPath2, fs, new ArrayList<>());
 
     Assert.assertFalse("Expected " + tmp2 + " to be cleaned up but it wasn't", tmp2.exists());
   }
@@ -204,11 +203,11 @@ public void testCleanupIndexOpWithoutCommonParentVolumeWithDepth() throws IOExce
 
     VolumeManager fs = VolumeManagerImpl.getLocal(accumuloDir.getAbsolutePath());
 
-    FileUtil.cleanupIndexOp(tmpPath1, fs, new ArrayList<FileSKVIterator>());
+    FileUtil.cleanupIndexOp(tmpPath1, fs, new ArrayList<>());
 
     Assert.assertFalse("Expected " + tmp1 + " to be cleaned up but it wasn't", tmp1.exists());
 
-    FileUtil.cleanupIndexOp(tmpPath2, fs, new ArrayList<FileSKVIterator>());
+    FileUtil.cleanupIndexOp(tmpPath2, fs, new ArrayList<>());
 
     Assert.assertFalse("Expected " + tmp2 + " to be cleaned up but it wasn't", tmp2.exists());
   }
diff --git a/server/base/src/test/java/org/apache/accumulo/server/util/ReplicationTableUtilTest.java b/server/base/src/test/java/org/apache/accumulo/server/util/ReplicationTableUtilTest.java
index ccb0a36ed4..cd4623d67b 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/util/ReplicationTableUtilTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/util/ReplicationTableUtilTest.java
@@ -28,7 +28,6 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Map.Entry;
 import java.util.UUID;
 
 import org.apache.accumulo.core.client.Connector;
@@ -147,7 +146,7 @@ public void setsCombinerOnMetadataCorrectly() throws Exception {
     tops.attachIterator(myMetadataTable, combiner);
     expectLastCall().once();
 
-    expect(tops.getProperties(myMetadataTable)).andReturn(Collections.<Entry<String,String>> emptyList());
+    expect(tops.getProperties(myMetadataTable)).andReturn(Collections.emptyList());
     tops.setProperty(myMetadataTable, Property.TABLE_FORMATTER_CLASS.getKey(), ReplicationTableUtil.STATUS_FORMATTER_CLASS_NAME);
     expectLastCall().once();
 
diff --git a/server/base/src/test/java/org/apache/accumulo/server/util/TServerUtilsTest.java b/server/base/src/test/java/org/apache/accumulo/server/util/TServerUtilsTest.java
index 4546b8a051..c41d6f107c 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/util/TServerUtilsTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/util/TServerUtilsTest.java
@@ -230,12 +230,9 @@ public void testStartServerUsedPort() throws Exception {
     int port = getFreePort(1024);
     InetAddress addr = InetAddress.getByName("localhost");
     // Bind to the port
-    ServerSocket s = new ServerSocket(port, 50, addr);
     ((ConfigurationCopy) factory.getSystemConfiguration()).set(Property.TSERV_CLIENTPORT, Integer.toString(port));
-    try {
+    try (ServerSocket s = new ServerSocket(port, 50, addr)) {
       startServer();
-    } finally {
-      s.close();
     }
   }
 
@@ -245,10 +242,9 @@ public void testStartServerUsedPortWithSearch() throws Exception {
     int[] port = findTwoFreeSequentialPorts(1024);
     // Bind to the port
     InetAddress addr = InetAddress.getByName("localhost");
-    ServerSocket s = new ServerSocket(port[0], 50, addr);
     ((ConfigurationCopy) factory.getSystemConfiguration()).set(Property.TSERV_CLIENTPORT, Integer.toString(port[0]));
     ((ConfigurationCopy) factory.getSystemConfiguration()).set(Property.TSERV_PORTSEARCH, "true");
-    try {
+    try (ServerSocket s = new ServerSocket(port[0], 50, addr)) {
       ServerAddress address = startServer();
       assertNotNull(address);
       server = address.getServer();
@@ -258,7 +254,7 @@ public void testStartServerUsedPortWithSearch() throws Exception {
       if (null != server) {
         TServerUtils.stopTServer(server);
       }
-      s.close();
+
     }
   }
 
@@ -288,9 +284,8 @@ public void testStartServerPortRangeFirstPortUsed() throws Exception {
     int[] port = findTwoFreeSequentialPorts(1024);
     String portRange = Integer.toString(port[0]) + "-" + Integer.toString(port[1]);
     // Bind to the port
-    ServerSocket s = new ServerSocket(port[0], 50, addr);
     ((ConfigurationCopy) factory.getSystemConfiguration()).set(Property.TSERV_CLIENTPORT, portRange);
-    try {
+    try (ServerSocket s = new ServerSocket(port[0], 50, addr)) {
       ServerAddress address = startServer();
       assertNotNull(address);
       server = address.getServer();
@@ -300,7 +295,7 @@ public void testStartServerPortRangeFirstPortUsed() throws Exception {
       if (null != server) {
         TServerUtils.stopTServer(server);
       }
-      s.close();
+
     }
   }
 
diff --git a/server/gc/src/test/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogsTest.java b/server/gc/src/test/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogsTest.java
index 4665836c8f..f15373fbdb 100644
--- a/server/gc/src/test/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogsTest.java
+++ b/server/gc/src/test/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogsTest.java
@@ -65,8 +65,8 @@
   private final TabletLocationState tabletAssignedToServer2;
   {
     try {
-      tabletAssignedToServer1 = new TabletLocationState(extent, (TServerInstance) null, server1, (TServerInstance) null, null, walogs, false);
-      tabletAssignedToServer2 = new TabletLocationState(extent, (TServerInstance) null, server2, (TServerInstance) null, null, walogs, false);
+      tabletAssignedToServer1 = new TabletLocationState(extent, null, server1, null, null, walogs, false);
+      tabletAssignedToServer2 = new TabletLocationState(extent, null, server2, null, null, walogs, false);
     } catch (Exception ex) {
       throw new RuntimeException(ex);
     }
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/PopulateMetadataTable.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/PopulateMetadataTable.java
index 896ac38c8d..671f4a75a3 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/PopulateMetadataTable.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/PopulateMetadataTable.java
@@ -65,9 +65,8 @@
   }
 
   static Map<String,String> readMappingFile(VolumeManager fs, ImportedTableInfo tableInfo) throws Exception {
-    BufferedReader in = new BufferedReader(new InputStreamReader(fs.open(new Path(tableInfo.importDir, "mappings.txt")), UTF_8));
 
-    try {
+    try (BufferedReader in = new BufferedReader(new InputStreamReader(fs.open(new Path(tableInfo.importDir, "mappings.txt")), UTF_8))) {
       Map<String,String> map = new HashMap<>();
 
       String line = null;
@@ -77,8 +76,6 @@
       }
 
       return map;
-    } finally {
-      in.close();
     }
 
   }
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/replication/ReplicationResource.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/replication/ReplicationResource.java
index f256ebb91f..1be2075291 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/replication/ReplicationResource.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/replication/ReplicationResource.java
@@ -164,7 +164,7 @@
         // TODO ACCUMULO-2835 once explicit lengths are tracked, we can give size-based estimates instead of just file-based
         Long count = targetCounts.get(target);
         if (null == count) {
-          targetCounts.put(target, Long.valueOf(1l));
+          targetCounts.put(target, 1l);
         } else {
           targetCounts.put(target, count + 1);
         }
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/TablesResource.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/TablesResource.java
index 20b5d3ce7b..faa7195d06 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/TablesResource.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/TablesResource.java
@@ -95,7 +95,7 @@ public static TableInformationList getTables() {
       if (null != tableInfo && !tableState.equals(TableState.OFFLINE)) {
         Double holdTime = compactingByTable.get(tableId.canonicalID());
         if (holdTime == null)
-          holdTime = Double.valueOf(0.);
+          holdTime = 0.;
 
         tableList.addTable(new TableInformation(tableName, tableId, tableInfo, holdTime, tableState.name()));
       } else {
diff --git a/server/monitor/src/test/java/org/apache/accumulo/monitor/ShowTraceLinkTypeTest.java b/server/monitor/src/test/java/org/apache/accumulo/monitor/ShowTraceLinkTypeTest.java
index 1201d92d79..03bb700a72 100644
--- a/server/monitor/src/test/java/org/apache/accumulo/monitor/ShowTraceLinkTypeTest.java
+++ b/server/monitor/src/test/java/org/apache/accumulo/monitor/ShowTraceLinkTypeTest.java
@@ -19,14 +19,13 @@
 import java.util.ArrayList;
 import java.util.Collections;
 
-import org.apache.accumulo.tracer.thrift.Annotation;
 import org.apache.accumulo.tracer.thrift.RemoteSpan;
 import org.junit.Assert;
 import org.junit.Test;
 
 public class ShowTraceLinkTypeTest {
   private static RemoteSpan rs(long start, long stop, String description) {
-    return new RemoteSpan("sender", "svc", 0l, 0l, 0l, start, stop, description, Collections.<String,String> emptyMap(), Collections.<Annotation> emptyList());
+    return new RemoteSpan("sender", "svc", 0l, 0l, 0l, start, stop, description, Collections.emptyMap(), Collections.emptyList());
   }
 
   @Test
diff --git a/server/tracer/src/main/java/org/apache/accumulo/tracer/SpanTree.java b/server/tracer/src/main/java/org/apache/accumulo/tracer/SpanTree.java
index 11e852e8d3..ba2c33eda6 100644
--- a/server/tracer/src/main/java/org/apache/accumulo/tracer/SpanTree.java
+++ b/server/tracer/src/main/java/org/apache/accumulo/tracer/SpanTree.java
@@ -41,7 +41,7 @@ public void addNode(RemoteSpan span) {
 
   public Set<Long> visit(SpanTreeVisitor visitor) {
     Set<Long> visited = new HashSet<>();
-    List<Long> root = parentChildren.get(Long.valueOf(Span.ROOT_SPAN_ID));
+    List<Long> root = parentChildren.get(Span.ROOT_SPAN_ID);
     if (root == null || root.isEmpty())
       return visited;
     RemoteSpan rootSpan = nodes.get(root.iterator().next());
diff --git a/server/tracer/src/test/java/org/apache/accumulo/tracer/AsyncSpanReceiverTest.java b/server/tracer/src/test/java/org/apache/accumulo/tracer/AsyncSpanReceiverTest.java
index 06e3099b22..6890d652a6 100644
--- a/server/tracer/src/test/java/org/apache/accumulo/tracer/AsyncSpanReceiverTest.java
+++ b/server/tracer/src/test/java/org/apache/accumulo/tracer/AsyncSpanReceiverTest.java
@@ -66,7 +66,7 @@ int getQueueSize() {
 
   Span createSpan(long length) {
     long time = System.currentTimeMillis();
-    Span span = new MilliSpan.Builder().begin(time).end(time + length).description("desc").parents(Collections.<Long> emptyList()).spanId(1).traceId(2).build();
+    Span span = new MilliSpan.Builder().begin(time).end(time + length).description("desc").parents(Collections.emptyList()).spanId(1).traceId(2).build();
     return span;
   }
 
diff --git a/server/tracer/src/test/java/org/apache/accumulo/tracer/TracerTest.java b/server/tracer/src/test/java/org/apache/accumulo/tracer/TracerTest.java
index 6dcf7a4d50..fd4a5f125c 100644
--- a/server/tracer/src/test/java/org/apache/accumulo/tracer/TracerTest.java
+++ b/server/tracer/src/test/java/org/apache/accumulo/tracer/TracerTest.java
@@ -91,7 +91,7 @@ public void receiveSpan(org.apache.htrace.Span s) {
       SpanStruct span = new SpanStruct(traceId, s.getSpanId(), s.getParentId(), s.getStartTimeMillis(), s.getStopTimeMillis(), s.getDescription(),
           s.getKVAnnotations());
       if (!traces.containsKey(traceId))
-        traces.put(traceId, new ArrayList<SpanStruct>());
+        traces.put(traceId, new ArrayList<>());
       traces.get(traceId).add(span);
     }
 
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/InMemoryMap.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/InMemoryMap.java
index 04f79efeb1..b3520e7eea 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/InMemoryMap.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/InMemoryMap.java
@@ -518,8 +518,8 @@ public void mutate(List<Mutation> mutations, int kvCount) {
    */
   public void mutate(List<Mutation> mutations) {
     int numKVs = 0;
-    for (int i = 0; i < mutations.size(); i++)
-      numKVs += mutations.get(i).size();
+    for (Mutation mutation : mutations)
+      numKVs += mutation.size();
 
     // Can not update mutationCount while writes that started before
     // are in progress, this would cause partial mutations to be seen.
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
index 7b7839077b..088dc45ed9 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
@@ -1259,7 +1259,7 @@ private void writeConditionalMutations(Map<KeyExtent,List<ServerConditionalMutat
 
       Span walSpan = Trace.start("wal");
       try {
-        while (true && sendables.size() > 0) {
+        while (sendables.size() > 0) {
           try {
             long t1 = System.currentTimeMillis();
             logger.logManyTablets(sendables);
@@ -2697,7 +2697,7 @@ public void run() {
     // consider making other threads daemon threads so that objects don't
     // get prematurely finalized
     synchronized (this) {
-      while (shutdownComplete == false) {
+      while (!shutdownComplete) {
         try {
           this.wait(1000);
         } catch (InterruptedException e) {
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/TservConstraintEnv.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/TservConstraintEnv.java
index a6a0d65c3e..6541af496a 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/TservConstraintEnv.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/TservConstraintEnv.java
@@ -73,7 +73,7 @@ public AuthorizationContainer getAuthorizationsContainer() {
       public boolean contains(ByteSequence auth) {
         try {
           return security.authenticatedUserHasAuthorizations(credentials,
-              Collections.<ByteBuffer> singletonList(ByteBuffer.wrap(auth.getBackingArray(), auth.offset(), auth.length())));
+              Collections.singletonList(ByteBuffer.wrap(auth.getBackingArray(), auth.offset(), auth.length())));
         } catch (ThriftSecurityException e) {
           throw new RuntimeException(e);
         }
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/LogSorter.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/LogSorter.java
index c35a31518f..376a71e182 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/LogSorter.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/LogSorter.java
@@ -122,7 +122,7 @@ public void sort(String name, Path srcPath, String destPath) {
             // Creating a 'finished' marker will cause recovery to proceed normally and the
             // empty file will be correctly ignored downstream.
             fs.mkdirs(new Path(destPath));
-            writeBuffer(destPath, Collections.<Pair<LogFileKey,LogFileValue>> emptyList(), part++);
+            writeBuffer(destPath, Collections.emptyList(), part++);
             fs.create(SortedLogState.getFinishedMarkerPath(destPath)).close();
             return;
           }
@@ -179,9 +179,8 @@ private void writeBuffer(String destPath, List<Pair<LogFileKey,LogFileValue>> bu
       Path path = new Path(destPath, String.format("part-r-%05d", part));
       FileSystem ns = fs.getVolumeByPath(path).getFileSystem();
 
-      MapFile.Writer output = new MapFile.Writer(ns.getConf(), ns.makeQualified(path), MapFile.Writer.keyClass(LogFileKey.class),
-          MapFile.Writer.valueClass(LogFileValue.class));
-      try {
+      try (MapFile.Writer output = new MapFile.Writer(ns.getConf(), ns.makeQualified(path), MapFile.Writer.keyClass(LogFileKey.class),
+          MapFile.Writer.valueClass(LogFileValue.class))) {
         Collections.sort(buffer, new Comparator<Pair<LogFileKey,LogFileValue>>() {
           @Override
           public int compare(Pair<LogFileKey,LogFileValue> o1, Pair<LogFileKey,LogFileValue> o2) {
@@ -191,8 +190,6 @@ public int compare(Pair<LogFileKey,LogFileValue> o1, Pair<LogFileKey,LogFileValu
         for (Pair<LogFileKey,LogFileValue> entry : buffer) {
           output.append(entry.getFirst(), entry.getSecond());
         }
-      } finally {
-        output.close();
       }
     }
 
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/logger/LogReader.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/logger/LogReader.java
index 76056b4df8..e7bdfbeacc 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/logger/LogReader.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/logger/LogReader.java
@@ -111,9 +111,8 @@ public static void main(String[] args) throws IOException {
             log.warn("Could not read header for {} . Ignoring...", path);
             continue;
           }
-          DataInputStream input = streams.getDecryptingInputStream();
 
-          try {
+          try (DataInputStream input = streams.getDecryptingInputStream()) {
             while (true) {
               try {
                 key.readFields(input);
@@ -123,8 +122,6 @@ public static void main(String[] args) throws IOException {
               }
               printLogEvent(key, value, row, rowMatcher, ke, tabletIds, opts.maxMutations);
             }
-          } finally {
-            input.close();
           }
         }
       } else {
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/session/SessionManager.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/session/SessionManager.java
index 06bd6a51f9..791e50c063 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/session/SessionManager.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/session/SessionManager.java
@@ -60,7 +60,7 @@
   private final long maxIdle;
   private final long maxUpdateIdle;
   private final List<Session> idleSessions = new ArrayList<>();
-  private final Long expiredSessionMarker = Long.valueOf(-1);
+  private final Long expiredSessionMarker = (long) -1;
   private final AccumuloConfiguration aconf;
 
   public SessionManager(AccumuloConfiguration conf) {
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/MinorCompactor.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/MinorCompactor.java
index 7ea894fa87..f5c73c385c 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/MinorCompactor.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/MinorCompactor.java
@@ -24,7 +24,6 @@
 import java.util.Random;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.accumulo.core.client.IteratorSetting;
 import org.apache.accumulo.core.client.impl.Tables;
 import org.apache.accumulo.core.iterators.IteratorUtil.IteratorScope;
 import org.apache.accumulo.core.master.state.tables.TableState;
@@ -80,7 +79,7 @@ public RateLimiter getReadLimiter() {
       public RateLimiter getWriteLimiter() {
         return null;
       }
-    }, Collections.<IteratorSetting> emptyList(), mincReason.ordinal(), tableConfig);
+    }, Collections.emptyList(), mincReason.ordinal(), tableConfig);
     this.tabletServer = tabletServer;
   }
 
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 82132cdadb..ab09457c4e 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
@@ -796,7 +796,7 @@ Batch nextBatch(SortedKeyValueIterator<Key,Value> iter, Range range, int num, Se
       Metrics scanMetrics = getTabletServer().getScanMetrics();
       if (scanMetrics.isEnabled())
         scanMetrics.add(TabletServerScanMetrics.YIELD, 1);
-    } else if (iter.hasTop() == false) {
+    } else if (!iter.hasTop()) {
       // end of tablet has been reached
       continueKey = null;
       if (results.size() == 0)
@@ -1620,14 +1620,11 @@ private static int longestCommonLength(Text text, Text beforeMid) {
     for (Entry<FileRef,DataFileValue> entry : allFiles.entrySet()) {
       FileRef file = entry.getKey();
       FileSystem ns = fs.getVolumeByPath(file.path()).getFileSystem();
-      FileSKVIterator openReader = fileFactory.newReaderBuilder().forFile(file.path().toString(), ns, ns.getConf())
-          .withTableConfiguration(this.getTableConfiguration()).seekToBeginning().build();
-      try {
+      try (FileSKVIterator openReader = fileFactory.newReaderBuilder().forFile(file.path().toString(), ns, ns.getConf())
+          .withTableConfiguration(this.getTableConfiguration()).seekToBeginning().build()) {
         Key first = openReader.getFirstKey();
         Key last = openReader.getLastKey();
         result.put(file, new Pair<>(first, last));
-      } finally {
-        openReader.close();
       }
     }
     return result;
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/TabletData.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/TabletData.java
index 3874d954c7..a5a8c0fd9f 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/TabletData.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/TabletData.java
@@ -149,16 +149,13 @@ public TabletData(VolumeManager fs, ZooReader rdr, AccumuloConfiguration conf) t
       dataFiles.put(ref, dfv);
 
       FileSystem ns = fs.getVolumeByPath(path).getFileSystem();
-      FileSKVIterator reader = FileOperations.getInstance().newReaderBuilder().forFile(path.toString(), ns, ns.getConf()).withTableConfiguration(conf)
-          .seekToBeginning().build();
       long maxTime = -1;
-      try {
+      try (FileSKVIterator reader = FileOperations.getInstance().newReaderBuilder().forFile(path.toString(), ns, ns.getConf()).withTableConfiguration(conf)
+          .seekToBeginning().build()) {
         while (reader.hasTop()) {
           maxTime = Math.max(maxTime, reader.getTopKey().getTimestamp());
           reader.next();
         }
-      } finally {
-        reader.close();
       }
       if (maxTime > rtime) {
         time = TabletTime.LOGICAL_TIME_ID + "" + maxTime;
diff --git a/server/tserver/src/test/java/org/apache/accumulo/tserver/CheckTabletMetadataTest.java b/server/tserver/src/test/java/org/apache/accumulo/tserver/CheckTabletMetadataTest.java
index e9a6edd59a..e5f4b8f363 100644
--- a/server/tserver/src/test/java/org/apache/accumulo/tserver/CheckTabletMetadataTest.java
+++ b/server/tserver/src/test/java/org/apache/accumulo/tserver/CheckTabletMetadataTest.java
@@ -117,7 +117,7 @@ public void testBadTabletMetadata() throws Exception {
     put(copy, "1<", TabletsSection.FutureLocationColumnFamily.NAME, "5", "127.0.0.1:9998");
     assertFail(copy, ke, tsi);
 
-    assertFail(new TreeMap<Key,Value>(), ke, tsi);
+    assertFail(new TreeMap<>(), ke, tsi);
 
   }
 }
diff --git a/server/tserver/src/test/java/org/apache/accumulo/tserver/CountingIteratorTest.java b/server/tserver/src/test/java/org/apache/accumulo/tserver/CountingIteratorTest.java
index 423d5227a1..c9ec76d042 100644
--- a/server/tserver/src/test/java/org/apache/accumulo/tserver/CountingIteratorTest.java
+++ b/server/tserver/src/test/java/org/apache/accumulo/tserver/CountingIteratorTest.java
@@ -21,7 +21,6 @@
 import java.util.TreeMap;
 import java.util.concurrent.atomic.AtomicLong;
 
-import org.apache.accumulo.core.data.ByteSequence;
 import org.apache.accumulo.core.data.Key;
 import org.apache.accumulo.core.data.Range;
 import org.apache.accumulo.core.data.Value;
@@ -55,7 +54,7 @@ public void testDeepCopyCount() throws IOException {
   }
 
   private void readAll(CountingIterator ci) throws IOException {
-    ci.seek(new Range(), new HashSet<ByteSequence>(), false);
+    ci.seek(new Range(), new HashSet<>(), false);
     while (ci.hasTop()) {
       ci.next();
     }
diff --git a/server/tserver/src/test/java/org/apache/accumulo/tserver/InMemoryMapTest.java b/server/tserver/src/test/java/org/apache/accumulo/tserver/InMemoryMapTest.java
index 43f0c0f470..ffef448b9e 100644
--- a/server/tserver/src/test/java/org/apache/accumulo/tserver/InMemoryMapTest.java
+++ b/server/tserver/src/test/java/org/apache/accumulo/tserver/InMemoryMapTest.java
@@ -491,8 +491,8 @@ public void testDuplicateKey() throws Exception {
 
   static long sum(long[] counts) {
     long result = 0;
-    for (int i = 0; i < counts.length; i++)
-      result += counts[i];
+    for (long count : counts)
+      result += count;
     return result;
   }
 
@@ -531,8 +531,8 @@ public void run() {
       log.info(String.format("%.1f mutations per second with %d threads", mutationsPerSecond, threads));
     }
     // verify that more threads doesn't go a lot faster, or a lot slower than one thread
-    for (int i = 0; i < timings.size(); i++) {
-      double ratioFirst = timings.get(0) / timings.get(i);
+    for (Double timing : timings) {
+      double ratioFirst = timings.get(0) / timing;
       assertTrue(ratioFirst < 3);
       assertTrue(ratioFirst > 0.3);
     }
diff --git a/server/tserver/src/test/java/org/apache/accumulo/tserver/TabletServerSyncCheckTest.java b/server/tserver/src/test/java/org/apache/accumulo/tserver/TabletServerSyncCheckTest.java
index 515aa674ea..00a83cc323 100644
--- a/server/tserver/src/test/java/org/apache/accumulo/tserver/TabletServerSyncCheckTest.java
+++ b/server/tserver/src/test/java/org/apache/accumulo/tserver/TabletServerSyncCheckTest.java
@@ -48,7 +48,7 @@ public void testFailureOnExplicitAppendFalseConf() {
     conf.set(DFS_SUPPORT_APPEND, "false");
 
     FileSystem fs = new TestFileSystem(conf);
-    TestVolumeManagerImpl vm = new TestVolumeManagerImpl(ImmutableMap.<String,Volume> of("foo", new VolumeImpl(fs, "/")));
+    TestVolumeManagerImpl vm = new TestVolumeManagerImpl(ImmutableMap.of("foo", new VolumeImpl(fs, "/")));
 
     vm.ensureSyncIsEnabled();
   }
@@ -70,7 +70,7 @@ public Configuration getConf() {
   private class TestVolumeManagerImpl extends VolumeManagerImpl {
 
     public TestVolumeManagerImpl(Map<String,Volume> volumes) {
-      super(volumes, volumes.values().iterator().next(), new ConfigurationCopy(Collections.<String,String> emptyMap()));
+      super(volumes, volumes.values().iterator().next(), new ConfigurationCopy(Collections.emptyMap()));
     }
 
     @Override
diff --git a/server/tserver/src/test/java/org/apache/accumulo/tserver/TservConstraintEnvTest.java b/server/tserver/src/test/java/org/apache/accumulo/tserver/TservConstraintEnvTest.java
index fff2a84574..14a15fbd34 100644
--- a/server/tserver/src/test/java/org/apache/accumulo/tserver/TservConstraintEnvTest.java
+++ b/server/tserver/src/test/java/org/apache/accumulo/tserver/TservConstraintEnvTest.java
@@ -42,7 +42,7 @@ public void testGetAuthorizationsContainer() throws ThriftSecurityException {
     TCredentials badCred = createMock(TCredentials.class);
 
     ByteSequence bs = new ArrayByteSequence("foo".getBytes());
-    List<ByteBuffer> bbList = Collections.<ByteBuffer> singletonList(ByteBuffer.wrap(bs.getBackingArray(), bs.offset(), bs.length()));
+    List<ByteBuffer> bbList = Collections.singletonList(ByteBuffer.wrap(bs.getBackingArray(), bs.offset(), bs.length()));
 
     expect(security.authenticatedUserHasAuthorizations(goodCred, bbList)).andReturn(true);
     expect(security.authenticatedUserHasAuthorizations(badCred, bbList)).andReturn(false);
diff --git a/server/tserver/src/test/java/org/apache/accumulo/tserver/compaction/DefaultCompactionStrategyTest.java b/server/tserver/src/test/java/org/apache/accumulo/tserver/compaction/DefaultCompactionStrategyTest.java
index 8d0c21149d..b322d11d67 100644
--- a/server/tserver/src/test/java/org/apache/accumulo/tserver/compaction/DefaultCompactionStrategyTest.java
+++ b/server/tserver/src/test/java/org/apache/accumulo/tserver/compaction/DefaultCompactionStrategyTest.java
@@ -164,7 +164,7 @@ private MajorCompactionRequest createRequest(MajorCompactionReason reason, Objec
   private MajorCompactionRequest createRequest(KeyExtent extent, MajorCompactionReason reason, Object... objs) throws IOException {
     Map<FileRef,DataFileValue> files = new HashMap<>();
     for (int i = 0; i < objs.length; i += 2) {
-      files.put(new FileRef("hdfs://nn1/accumulo/tables/5/t-0001/" + (String) objs[i]), new DataFileValue(((Number) objs[i + 1]).longValue(), 0));
+      files.put(new FileRef("hdfs://nn1/accumulo/tables/5/t-0001/" + objs[i]), new DataFileValue(((Number) objs[i + 1]).longValue(), 0));
     }
     return new TestCompactionRequest(extent, reason, files);
   }
diff --git a/server/tserver/src/test/java/org/apache/accumulo/tserver/log/DfsLoggerTest.java b/server/tserver/src/test/java/org/apache/accumulo/tserver/log/DfsLoggerTest.java
index 6f10a4859c..0291747108 100644
--- a/server/tserver/src/test/java/org/apache/accumulo/tserver/log/DfsLoggerTest.java
+++ b/server/tserver/src/test/java/org/apache/accumulo/tserver/log/DfsLoggerTest.java
@@ -23,7 +23,6 @@
 import java.util.List;
 
 import org.apache.accumulo.core.client.Durability;
-import org.apache.accumulo.core.data.Mutation;
 import org.apache.accumulo.tserver.TabletMutations;
 import org.junit.Test;
 
@@ -33,25 +32,25 @@
   public void testDurabilityForGroupCommit() {
     List<TabletMutations> lst = new ArrayList<>();
     assertEquals(Durability.NONE, DfsLogger.chooseDurabilityForGroupCommit(lst));
-    TabletMutations m1 = new TabletMutations(0, 1, Collections.<Mutation> emptyList(), Durability.NONE);
+    TabletMutations m1 = new TabletMutations(0, 1, Collections.emptyList(), Durability.NONE);
     lst.add(m1);
     assertEquals(Durability.NONE, DfsLogger.chooseDurabilityForGroupCommit(lst));
-    TabletMutations m2 = new TabletMutations(0, 1, Collections.<Mutation> emptyList(), Durability.LOG);
+    TabletMutations m2 = new TabletMutations(0, 1, Collections.emptyList(), Durability.LOG);
     lst.add(m2);
     assertEquals(Durability.LOG, DfsLogger.chooseDurabilityForGroupCommit(lst));
-    TabletMutations m3 = new TabletMutations(0, 1, Collections.<Mutation> emptyList(), Durability.NONE);
+    TabletMutations m3 = new TabletMutations(0, 1, Collections.emptyList(), Durability.NONE);
     lst.add(m3);
     assertEquals(Durability.LOG, DfsLogger.chooseDurabilityForGroupCommit(lst));
-    TabletMutations m4 = new TabletMutations(0, 1, Collections.<Mutation> emptyList(), Durability.FLUSH);
+    TabletMutations m4 = new TabletMutations(0, 1, Collections.emptyList(), Durability.FLUSH);
     lst.add(m4);
     assertEquals(Durability.FLUSH, DfsLogger.chooseDurabilityForGroupCommit(lst));
-    TabletMutations m5 = new TabletMutations(0, 1, Collections.<Mutation> emptyList(), Durability.LOG);
+    TabletMutations m5 = new TabletMutations(0, 1, Collections.emptyList(), Durability.LOG);
     lst.add(m5);
     assertEquals(Durability.FLUSH, DfsLogger.chooseDurabilityForGroupCommit(lst));
-    TabletMutations m6 = new TabletMutations(0, 1, Collections.<Mutation> emptyList(), Durability.SYNC);
+    TabletMutations m6 = new TabletMutations(0, 1, Collections.emptyList(), Durability.SYNC);
     lst.add(m6);
     assertEquals(Durability.SYNC, DfsLogger.chooseDurabilityForGroupCommit(lst));
-    TabletMutations m7 = new TabletMutations(0, 1, Collections.<Mutation> emptyList(), Durability.FLUSH);
+    TabletMutations m7 = new TabletMutations(0, 1, Collections.emptyList(), Durability.FLUSH);
     lst.add(m7);
     assertEquals(Durability.SYNC, DfsLogger.chooseDurabilityForGroupCommit(lst));
   }
diff --git a/server/tserver/src/test/java/org/apache/accumulo/tserver/log/SortedLogRecoveryTest.java b/server/tserver/src/test/java/org/apache/accumulo/tserver/log/SortedLogRecoveryTest.java
index bedb96ea40..b945b74a78 100644
--- a/server/tserver/src/test/java/org/apache/accumulo/tserver/log/SortedLogRecoveryTest.java
+++ b/server/tserver/src/test/java/org/apache/accumulo/tserver/log/SortedLogRecoveryTest.java
@@ -124,7 +124,7 @@ public void receive(Mutation m) {
   }
 
   private static List<Mutation> recover(Map<String,KeyValue[]> logs, KeyExtent extent) throws IOException {
-    return recover(logs, new HashSet<String>(), extent);
+    return recover(logs, new HashSet<>(), extent);
   }
 
   private static List<Mutation> recover(Map<String,KeyValue[]> logs, Set<String> files, KeyExtent extent) throws IOException {
diff --git a/server/tserver/src/test/java/org/apache/accumulo/tserver/replication/AccumuloReplicaSystemTest.java b/server/tserver/src/test/java/org/apache/accumulo/tserver/replication/AccumuloReplicaSystemTest.java
index 1703b5f8c5..7a5bd4723c 100644
--- a/server/tserver/src/test/java/org/apache/accumulo/tserver/replication/AccumuloReplicaSystemTest.java
+++ b/server/tserver/src/test/java/org/apache/accumulo/tserver/replication/AccumuloReplicaSystemTest.java
@@ -26,7 +26,6 @@
 import java.io.ByteArrayOutputStream;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
-import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -87,7 +86,7 @@ public void onlyChooseMutationsForDesiredTableWithOpenStatus() throws Exception
     key.tablet = null;
     key.event = LogEvents.MUTATION;
     key.filename = "/accumulo/wals/tserver+port/" + UUID.randomUUID();
-    value.mutations = Arrays.<Mutation> asList(new ServerMutation(new Text("row")));
+    value.mutations = Arrays.asList(new ServerMutation(new Text("row")));
 
     key.write(dos);
     value.write(dos);
@@ -110,7 +109,7 @@ public void onlyChooseMutationsForDesiredTableWithOpenStatus() throws Exception
     key.tablet = null;
     key.event = LogEvents.MUTATION;
     key.filename = "/accumulo/wals/tserver+port/" + UUID.randomUUID();
-    value.mutations = Arrays.<Mutation> asList(new ServerMutation(new Text("badrow")));
+    value.mutations = Arrays.asList(new ServerMutation(new Text("badrow")));
 
     key.write(dos);
     value.write(dos);
@@ -142,7 +141,7 @@ public void onlyChooseMutationsForDesiredTableWithOpenStatus() throws Exception
     key.event = LogEvents.MUTATION;
     key.tid = 3;
     key.filename = "/accumulo/wals/tserver+port/" + UUID.randomUUID();
-    value.mutations = Arrays.<Mutation> asList(new ServerMutation(new Text("row")));
+    value.mutations = Arrays.asList(new ServerMutation(new Text("row")));
 
     key.write(dos);
     value.write(dos);
@@ -159,7 +158,7 @@ public void onlyChooseMutationsForDesiredTableWithOpenStatus() throws Exception
     Status status = Status.newBuilder().setBegin(0).setEnd(0).setInfiniteEnd(true).setClosed(false).build();
     DataInputStream dis = new DataInputStream(new ByteArrayInputStream(baos.toByteArray()));
     WalReplication repl = ars.getWalEdits(new ReplicationTarget("peer", "1", Table.ID.of("1")), dis, new Path("/accumulo/wals/tserver+port/wal"), status,
-        Long.MAX_VALUE, new HashSet<Integer>());
+        Long.MAX_VALUE, new HashSet<>());
 
     // We stopped because we got to the end of the file
     Assert.assertEquals(9, repl.entriesConsumed);
@@ -193,7 +192,7 @@ public void onlyChooseMutationsForDesiredTableWithClosedStatus() throws Exceptio
     key.tablet = null;
     key.event = LogEvents.MUTATION;
     key.filename = "/accumulo/wals/tserver+port/" + UUID.randomUUID();
-    value.mutations = Arrays.<Mutation> asList(new ServerMutation(new Text("row")));
+    value.mutations = Arrays.asList(new ServerMutation(new Text("row")));
 
     key.write(dos);
     value.write(dos);
@@ -216,7 +215,7 @@ public void onlyChooseMutationsForDesiredTableWithClosedStatus() throws Exceptio
     key.tablet = null;
     key.event = LogEvents.MUTATION;
     key.filename = "/accumulo/wals/tserver+port/" + UUID.randomUUID();
-    value.mutations = Arrays.<Mutation> asList(new ServerMutation(new Text("badrow")));
+    value.mutations = Arrays.asList(new ServerMutation(new Text("badrow")));
 
     key.write(dos);
     value.write(dos);
@@ -248,7 +247,7 @@ public void onlyChooseMutationsForDesiredTableWithClosedStatus() throws Exceptio
     key.event = LogEvents.MUTATION;
     key.tid = 3;
     key.filename = "/accumulo/wals/tserver+port/" + UUID.randomUUID();
-    value.mutations = Arrays.<Mutation> asList(new ServerMutation(new Text("row")));
+    value.mutations = Arrays.asList(new ServerMutation(new Text("row")));
 
     key.write(dos);
     value.write(dos);
@@ -267,7 +266,7 @@ public void onlyChooseMutationsForDesiredTableWithClosedStatus() throws Exceptio
     Status status = Status.newBuilder().setBegin(0).setEnd(0).setInfiniteEnd(true).setClosed(true).build();
     DataInputStream dis = new DataInputStream(new ByteArrayInputStream(baos.toByteArray()));
     WalReplication repl = ars.getWalEdits(new ReplicationTarget("peer", "1", Table.ID.of("1")), dis, new Path("/accumulo/wals/tserver+port/wal"), status,
-        Long.MAX_VALUE, new HashSet<Integer>());
+        Long.MAX_VALUE, new HashSet<>());
 
     // We stopped because we got to the end of the file
     Assert.assertEquals(Long.MAX_VALUE, repl.entriesConsumed);
@@ -333,7 +332,7 @@ public void endOfFileExceptionOnClosedWalImpliesFullyReplicated() throws Excepti
     Status status = Status.newBuilder().setBegin(100).setEnd(0).setInfiniteEnd(true).setClosed(true).build();
     DataInputStream dis = new DataInputStream(new ByteArrayInputStream(new byte[0]));
     WalReplication repl = ars.getWalEdits(new ReplicationTarget("peer", "1", Table.ID.of("1")), dis, new Path("/accumulo/wals/tserver+port/wal"), status,
-        Long.MAX_VALUE, new HashSet<Integer>());
+        Long.MAX_VALUE, new HashSet<>());
 
     // We stopped because we got to the end of the file
     Assert.assertEquals(Long.MAX_VALUE, repl.entriesConsumed);
@@ -356,7 +355,7 @@ public void endOfFileExceptionOnOpenWalImpliesMoreReplication() throws Exception
     Status status = Status.newBuilder().setBegin(100).setEnd(0).setInfiniteEnd(true).setClosed(false).build();
     DataInputStream dis = new DataInputStream(new ByteArrayInputStream(new byte[0]));
     WalReplication repl = ars.getWalEdits(new ReplicationTarget("peer", "1", Table.ID.of("1")), dis, new Path("/accumulo/wals/tserver+port/wal"), status,
-        Long.MAX_VALUE, new HashSet<Integer>());
+        Long.MAX_VALUE, new HashSet<>());
 
     // We stopped because we got to the end of the file
     Assert.assertEquals(0, repl.entriesConsumed);
@@ -390,7 +389,7 @@ public void restartInFileKnowsAboutPreviousTableDefines() throws Exception {
     key.tablet = null;
     key.event = LogEvents.MUTATION;
     key.filename = "/accumulo/wals/tserver+port/" + UUID.randomUUID();
-    value.mutations = Arrays.<Mutation> asList(new ServerMutation(new Text("row")));
+    value.mutations = Arrays.asList(new ServerMutation(new Text("row")));
 
     key.write(dos);
     value.write(dos);
@@ -399,7 +398,7 @@ public void restartInFileKnowsAboutPreviousTableDefines() throws Exception {
     key.event = LogEvents.MUTATION;
     key.tid = 1;
     key.filename = "/accumulo/wals/tserver+port/" + UUID.randomUUID();
-    value.mutations = Arrays.<Mutation> asList(new ServerMutation(new Text("row")));
+    value.mutations = Arrays.asList(new ServerMutation(new Text("row")));
 
     key.write(dos);
     value.write(dos);
@@ -444,7 +443,7 @@ public void restartInFileKnowsAboutPreviousTableDefines() throws Exception {
   public void dontSendEmptyDataToPeer() throws Exception {
     Client replClient = createMock(Client.class);
     AccumuloReplicaSystem ars = createMock(AccumuloReplicaSystem.class);
-    WalEdits edits = new WalEdits(Collections.<ByteBuffer> emptyList());
+    WalEdits edits = new WalEdits(Collections.emptyList());
     WalReplication walReplication = new WalReplication(edits, 0, 0, 0);
 
     ReplicationTarget target = new ReplicationTarget("peer", "2", Table.ID.of("1"));
@@ -473,7 +472,7 @@ public void dontSendEmptyDataToPeer() throws Exception {
   public void consumedButNotSentDataShouldBeRecorded() throws Exception {
     Client replClient = createMock(Client.class);
     AccumuloReplicaSystem ars = createMock(AccumuloReplicaSystem.class);
-    WalEdits edits = new WalEdits(Collections.<ByteBuffer> emptyList());
+    WalEdits edits = new WalEdits(Collections.emptyList());
     WalReplication walReplication = new WalReplication(edits, 0, 5, 0);
 
     ReplicationTarget target = new ReplicationTarget("peer", "2", Table.ID.of("1"));
diff --git a/server/tserver/src/test/java/org/apache/accumulo/tserver/tablet/TabletTest.java b/server/tserver/src/test/java/org/apache/accumulo/tserver/tablet/TabletTest.java
index d761a2183d..43441fd12b 100644
--- a/server/tserver/src/test/java/org/apache/accumulo/tserver/tablet/TabletTest.java
+++ b/server/tserver/src/test/java/org/apache/accumulo/tserver/tablet/TabletTest.java
@@ -17,7 +17,6 @@
 package org.apache.accumulo.tserver.tablet;
 
 import java.util.Collections;
-import java.util.Map.Entry;
 
 import org.apache.accumulo.core.conf.AccumuloConfiguration;
 import org.apache.accumulo.core.conf.ConfigurationObserver;
@@ -59,7 +58,7 @@ public void correctValuesSetForProperties() {
     int replication = 5;
     String compressType = "snappy";
 
-    EasyMock.expect(tableConf.iterator()).andReturn(Collections.<Entry<String,String>> emptyIterator());
+    EasyMock.expect(tableConf.iterator()).andReturn(Collections.emptyIterator());
     EasyMock.expect(writeParams.getHdfsBlockSize()).andReturn(hdfsBlockSize).times(2);
     EasyMock.expect(writeParams.getBlockSize()).andReturn(blockSize).times(2);
     EasyMock.expect(writeParams.getIndexBlockSize()).andReturn(indexBlockSize).times(2);
diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/InsertCommand.java b/shell/src/main/java/org/apache/accumulo/shell/commands/InsertCommand.java
index d6bc20b94f..b1339e4613 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/InsertCommand.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/InsertCommand.java
@@ -107,13 +107,13 @@ public int execute(final String fullCommand, final CommandLine cl, final Shell s
       bw.close();
     } catch (MutationsRejectedException e) {
       final ArrayList<String> lines = new ArrayList<>();
-      if (e.getSecurityErrorCodes().isEmpty() == false) {
+      if (!e.getSecurityErrorCodes().isEmpty()) {
         lines.add("\tAuthorization Failures:");
       }
       for (Entry<TabletId,Set<SecurityErrorCode>> entry : e.getSecurityErrorCodes().entrySet()) {
         lines.add("\t\t" + entry);
       }
-      if (e.getConstraintViolationSummaries().isEmpty() == false) {
+      if (!e.getConstraintViolationSummaries().isEmpty()) {
         lines.add("\tConstraint Failures:");
       }
       for (ConstraintViolationSummary cvs : e.getConstraintViolationSummaries()) {
diff --git a/shell/src/test/java/org/apache/accumulo/shell/ShellSetInstanceTest.java b/shell/src/test/java/org/apache/accumulo/shell/ShellSetInstanceTest.java
index b9a3378b86..1216c745fc 100644
--- a/shell/src/test/java/org/apache/accumulo/shell/ShellSetInstanceTest.java
+++ b/shell/src/test/java/org/apache/accumulo/shell/ShellSetInstanceTest.java
@@ -159,7 +159,7 @@ private void testSetInstance_HdfsZooInstance(boolean explicitHdfs, boolean onlyI
     expect(opts.getClientConfiguration()).andReturn(clientConf);
     expect(opts.isHdfsZooInstance()).andReturn(explicitHdfs);
     if (!explicitHdfs) {
-      expect(opts.getZooKeeperInstance()).andReturn(Collections.<String> emptyList());
+      expect(opts.getZooKeeperInstance()).andReturn(Collections.emptyList());
       if (onlyInstance) {
         expect(opts.getZooKeeperInstanceName()).andReturn("instance");
         expect(clientConf.withInstance("instance")).andReturn(clientConf);
@@ -253,7 +253,7 @@ private void testSetInstance_ZKInstance(boolean dashZ) throws Exception {
       expect(clientConf.getString(ClientProperty.INSTANCE_NAME.getKey())).andReturn("bar");
       expect(clientConf.withZkHosts("host3,host4")).andReturn(clientConf);
       expect(clientConf.getString(ClientProperty.INSTANCE_ZK_HOST.getKey())).andReturn("host3,host4");
-      expect(opts.getZooKeeperInstance()).andReturn(Collections.<String> emptyList());
+      expect(opts.getZooKeeperInstance()).andReturn(Collections.emptyList());
       expect(opts.getZooKeeperInstanceName()).andReturn("bar");
       expect(opts.getZooKeeperHosts()).andReturn("host3,host4");
     }
diff --git a/start/src/test/java/org/apache/accumulo/start/classloader/vfs/ContextManagerTest.java b/start/src/test/java/org/apache/accumulo/start/classloader/vfs/ContextManagerTest.java
index d1e6813739..1d3f00b2d7 100644
--- a/start/src/test/java/org/apache/accumulo/start/classloader/vfs/ContextManagerTest.java
+++ b/start/src/test/java/org/apache/accumulo/start/classloader/vfs/ContextManagerTest.java
@@ -120,7 +120,7 @@ public ContextConfig getContextConfig(String context) {
 
     Assert.assertFalse(defaultContextClass.equals(myContextClass));
 
-    cm.removeUnusedContexts(new HashSet<String>());
+    cm.removeUnusedContexts(new HashSet<>());
   }
 
   @Test
diff --git a/test/src/main/java/org/apache/accumulo/test/AuditMessageIT.java b/test/src/main/java/org/apache/accumulo/test/AuditMessageIT.java
index be4af24fd0..e63340e519 100644
--- a/test/src/main/java/org/apache/accumulo/test/AuditMessageIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/AuditMessageIT.java
@@ -415,8 +415,7 @@ public void testDeniedAudits() throws AccumuloSecurityException, AccumuloExcepti
       auditConnector.tableOperations().rename(OLD_TEST_TABLE_NAME, NEW_TEST_TABLE_NAME);
     } catch (AccumuloSecurityException ex) {}
     try {
-      auditConnector.tableOperations().clone(OLD_TEST_TABLE_NAME, NEW_TEST_TABLE_NAME, true, Collections.<String,String> emptyMap(),
-          Collections.<String> emptySet());
+      auditConnector.tableOperations().clone(OLD_TEST_TABLE_NAME, NEW_TEST_TABLE_NAME, true, Collections.emptyMap(), Collections.emptySet());
     } catch (AccumuloSecurityException ex) {}
     try {
       auditConnector.tableOperations().delete(OLD_TEST_TABLE_NAME);
diff --git a/test/src/main/java/org/apache/accumulo/test/MasterRepairsDualAssignmentIT.java b/test/src/main/java/org/apache/accumulo/test/MasterRepairsDualAssignmentIT.java
index 4f1a44d0a4..4e333d733b 100644
--- a/test/src/main/java/org/apache/accumulo/test/MasterRepairsDualAssignmentIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/MasterRepairsDualAssignmentIT.java
@@ -116,7 +116,7 @@ public void test() throws Exception {
         }
       }
       System.out.println(states + " size " + states.size() + " allAssigned " + allAssigned);
-      if (states.size() != 2 && allAssigned == true)
+      if (states.size() != 2 && allAssigned)
         break;
     }
     assertEquals(1, replStates.size());
diff --git a/test/src/main/java/org/apache/accumulo/test/MetaGetsReadersIT.java b/test/src/main/java/org/apache/accumulo/test/MetaGetsReadersIT.java
index ba59d8001b..25b105d205 100644
--- a/test/src/main/java/org/apache/accumulo/test/MetaGetsReadersIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/MetaGetsReadersIT.java
@@ -59,13 +59,13 @@ private static Thread slowScan(final Connector c, final String tableName, final
       @Override
       public void run() {
         try {
-          while (stop.get() == false) {
+          while (!stop.get()) {
             try (Scanner s = c.createScanner(tableName, Authorizations.EMPTY)) {
               IteratorSetting is = new IteratorSetting(50, SlowIterator.class);
               SlowIterator.setSleepTime(is, 10);
               s.addScanIterator(is);
               Iterator<Entry<Key,Value>> iterator = s.iterator();
-              while (iterator.hasNext() && stop.get() == false) {
+              while (iterator.hasNext() && !stop.get()) {
                 iterator.next();
               }
             }
diff --git a/test/src/main/java/org/apache/accumulo/test/NamespacesIT.java b/test/src/main/java/org/apache/accumulo/test/NamespacesIT.java
index 2c3b317dfb..47a806d034 100644
--- a/test/src/main/java/org/apache/accumulo/test/NamespacesIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/NamespacesIT.java
@@ -32,7 +32,6 @@
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Map.Entry;
-import java.util.Set;
 import java.util.SortedSet;
 import java.util.TreeSet;
 import java.util.concurrent.TimeUnit;
@@ -1071,7 +1070,7 @@ public void verifyTableOperationsExceptions() throws Exception {
             break;
           case 1:
             ops.create("a");
-            ops.clone("a", tableName, true, Collections.<String,String> emptyMap(), Collections.<String> emptySet());
+            ops.clone("a", tableName, true, Collections.emptyMap(), Collections.emptySet());
             fail();
             break;
           case 2:
@@ -1151,7 +1150,7 @@ public void verifyTableOperationsExceptions() throws Exception {
             fail();
             break;
           case 6:
-            ops.clone(tableName, "2", true, Collections.<String,String> emptyMap(), Collections.<String> emptySet());
+            ops.clone(tableName, "2", true, Collections.emptyMap(), Collections.emptySet());
             fail();
             break;
           case 7:
@@ -1239,7 +1238,7 @@ public void verifyTableOperationsExceptions() throws Exception {
             fail();
             break;
           case 28:
-            ops.setLocalityGroups(tableName, Collections.<String,Set<Text>> emptyMap());
+            ops.setLocalityGroups(tableName, Collections.emptyMap());
             fail();
             break;
           default:
diff --git a/test/src/main/java/org/apache/accumulo/test/SampleIT.java b/test/src/main/java/org/apache/accumulo/test/SampleIT.java
index 9e6b1068ba..e0c9758a57 100644
--- a/test/src/main/java/org/apache/accumulo/test/SampleIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/SampleIT.java
@@ -481,8 +481,7 @@ private void assertSampleNotPresent(SamplerConfiguration sc, ScannerBase... scan
       scanner.setSamplerConfiguration(sc);
 
       try {
-        for (Iterator<Entry<Key,Value>> i = scanner.iterator(); i.hasNext();) {
-          Entry<Key,Value> entry = i.next();
+        for (Entry<Key,Value> entry : scanner) {
           entry.getKey();
         }
         Assert.fail("Expected SampleNotPresentException, but it did not happen : " + scanner.getClass().getSimpleName());
@@ -491,8 +490,7 @@ private void assertSampleNotPresent(SamplerConfiguration sc, ScannerBase... scan
       }
 
       scanner.clearSamplerConfiguration();
-      for (Iterator<Entry<Key,Value>> i = scanner.iterator(); i.hasNext();) {
-        Entry<Key,Value> entry = i.next();
+      for (Entry<Key,Value> entry : scanner) {
         entry.getKey();
       }
 
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 3e10909d41..2040c91ed2 100644
--- a/test/src/main/java/org/apache/accumulo/test/ShellServerIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/ShellServerIT.java
@@ -1255,7 +1255,7 @@ public String next() {
 
       for (byte b : v.get()) {
         if ((b >= 48 && b <= 57) || (b >= 97 && b <= 102)) {
-          sb.append(String.format("0x%x ", Integer.valueOf(b)));
+          sb.append(String.format("0x%x ", (int) b));
         }
       }
 
diff --git a/test/src/main/java/org/apache/accumulo/test/TestIngest.java b/test/src/main/java/org/apache/accumulo/test/TestIngest.java
index d16ced8078..03c2e60f39 100644
--- a/test/src/main/java/org/apache/accumulo/test/TestIngest.java
+++ b/test/src/main/java/org/apache/accumulo/test/TestIngest.java
@@ -263,7 +263,7 @@ public static void ingest(Connector connector, FileSystem fs, Opts opts, BatchWr
           } else {
             byte value[];
             if (opts.random != null) {
-              value = genRandomValue(random, randomValue, opts.random.intValue(), rowid + opts.startRow, j);
+              value = genRandomValue(random, randomValue, opts.random, rowid + opts.startRow, j);
             } else {
               value = bytevals[j % bytevals.length];
             }
@@ -285,7 +285,7 @@ public static void ingest(Connector connector, FileSystem fs, Opts opts, BatchWr
           } else {
             byte value[];
             if (opts.random != null) {
-              value = genRandomValue(random, randomValue, opts.random.intValue(), rowid + opts.startRow, j);
+              value = genRandomValue(random, randomValue, opts.random, rowid + opts.startRow, j);
             } else {
               value = bytevals[j % bytevals.length];
             }
diff --git a/test/src/main/java/org/apache/accumulo/test/VerifyIngest.java b/test/src/main/java/org/apache/accumulo/test/VerifyIngest.java
index e3b71575ce..bea4267a2f 100644
--- a/test/src/main/java/org/apache/accumulo/test/VerifyIngest.java
+++ b/test/src/main/java/org/apache/accumulo/test/VerifyIngest.java
@@ -121,7 +121,7 @@ public static void verifyIngest(Connector connector, Opts opts, ScannerOpts scan
 
           byte ev[];
           if (opts.random != null) {
-            ev = TestIngest.genRandomValue(random, randomValue, opts.random.intValue(), expectedRow, expectedCol);
+            ev = TestIngest.genRandomValue(random, randomValue, opts.random, expectedRow, expectedCol);
           } else {
             ev = bytevals[expectedCol % bytevals.length];
           }
@@ -188,7 +188,7 @@ public static void verifyIngest(Connector connector, Opts opts, ScannerOpts scan
 
             byte value[];
             if (opts.random != null) {
-              value = TestIngest.genRandomValue(random, randomValue, opts.random.intValue(), expectedRow, colNum);
+              value = TestIngest.genRandomValue(random, randomValue, opts.random, expectedRow, colNum);
             } else {
               value = bytevals[colNum % bytevals.length];
             }
diff --git a/test/src/main/java/org/apache/accumulo/test/VolumeIT.java b/test/src/main/java/org/apache/accumulo/test/VolumeIT.java
index e9473fc820..9eb8fef604 100644
--- a/test/src/main/java/org/apache/accumulo/test/VolumeIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/VolumeIT.java
@@ -161,7 +161,7 @@ public void test() throws Exception {
       assertEquals(4, fileCount);
       List<DiskUsage> diskUsage = connector.tableOperations().getDiskUsage(Collections.singleton(tableName));
       assertEquals(1, diskUsage.size());
-      long usage = diskUsage.get(0).getUsage().longValue();
+      long usage = diskUsage.get(0).getUsage();
       log.debug("usage {}", usage);
       assertTrue(usage > 700 && usage < 800);
     }
diff --git a/test/src/main/java/org/apache/accumulo/test/WaitForBalanceIT.java b/test/src/main/java/org/apache/accumulo/test/WaitForBalanceIT.java
index 650df2e980..1cd5e24f68 100644
--- a/test/src/main/java/org/apache/accumulo/test/WaitForBalanceIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/WaitForBalanceIT.java
@@ -86,8 +86,8 @@ private boolean isBalanced() throws Exception {
             } else {
               Integer count = counts.get(location);
               if (count == null)
-                count = Integer.valueOf(0);
-              count = Integer.valueOf(count.intValue() + 1);
+                count = 0;
+              count = count + 1;
               counts.put(location, count);
             }
             location = null;
diff --git a/test/src/main/java/org/apache/accumulo/test/constraints/MaxMutationSize.java b/test/src/main/java/org/apache/accumulo/test/constraints/MaxMutationSize.java
index 1b68e96823..bc65a7e79e 100644
--- a/test/src/main/java/org/apache/accumulo/test/constraints/MaxMutationSize.java
+++ b/test/src/main/java/org/apache/accumulo/test/constraints/MaxMutationSize.java
@@ -29,7 +29,7 @@
 public class MaxMutationSize implements Constraint {
   static final long MAX_SIZE = Runtime.getRuntime().maxMemory() >> 8;
   static final List<Short> empty = Collections.emptyList();
-  static final List<Short> violations = Collections.singletonList(Short.valueOf((short) 0));
+  static final List<Short> violations = Collections.singletonList((short) 0);
 
   @Override
   public String getViolationDescription(short violationCode) {
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/CacheTestWriter.java b/test/src/main/java/org/apache/accumulo/test/functional/CacheTestWriter.java
index c19c111d30..32c2f9a317 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/CacheTestWriter.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/CacheTestWriter.java
@@ -130,9 +130,9 @@ public static void main(String[] args) throws Exception {
         if (files.length == numReaders) {
           boolean ok = true;
 
-          for (int i = 0; i < files.length; i++) {
+          for (File file : files) {
             try {
-              FileInputStream fis = new FileInputStream(files[i]);
+              FileInputStream fis = new FileInputStream(file);
               ObjectInputStream ois = new ObjectInputStream(fis);
 
               @SuppressWarnings("unchecked")
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/KerberosProxyIT.java b/test/src/main/java/org/apache/accumulo/test/functional/KerberosProxyIT.java
index 3becc773b5..c69eba23f2 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/KerberosProxyIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/KerberosProxyIT.java
@@ -344,10 +344,10 @@ public void testProxyClient() throws Exception {
     Map<ByteBuffer,List<ColumnUpdate>> updates = new HashMap<>();
     ColumnUpdate update = new ColumnUpdate(ByteBuffer.wrap("cf1".getBytes(UTF_8)), ByteBuffer.wrap("cq1".getBytes(UTF_8)));
     update.setValue(ByteBuffer.wrap("value1".getBytes(UTF_8)));
-    updates.put(ByteBuffer.wrap("row1".getBytes(UTF_8)), Collections.<ColumnUpdate> singletonList(update));
+    updates.put(ByteBuffer.wrap("row1".getBytes(UTF_8)), Collections.singletonList(update));
     update = new ColumnUpdate(ByteBuffer.wrap("cf2".getBytes(UTF_8)), ByteBuffer.wrap("cq2".getBytes(UTF_8)));
     update.setValue(ByteBuffer.wrap("value2".getBytes(UTF_8)));
-    updates.put(ByteBuffer.wrap("row2".getBytes(UTF_8)), Collections.<ColumnUpdate> singletonList(update));
+    updates.put(ByteBuffer.wrap("row2".getBytes(UTF_8)), Collections.singletonList(update));
     client.update(writer, updates);
 
     // Flush and close the writer
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/RowDeleteIT.java b/test/src/main/java/org/apache/accumulo/test/functional/RowDeleteIT.java
index 9db3615d83..170626f79d 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/RowDeleteIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/RowDeleteIT.java
@@ -64,7 +64,7 @@ public void run() throws Exception {
     c.tableOperations().create(tableName);
     Map<String,Set<Text>> groups = new HashMap<>();
     groups.put("lg1", Collections.singleton(new Text("foo")));
-    groups.put("dg", Collections.<Text> emptySet());
+    groups.put("dg", Collections.emptySet());
     c.tableOperations().setLocalityGroups(tableName, groups);
     IteratorSetting setting = new IteratorSetting(30, RowDeletingIterator.class);
     c.tableOperations().attachIterator(tableName, setting, EnumSet.of(IteratorScope.majc));
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/SessionDurabilityIT.java b/test/src/main/java/org/apache/accumulo/test/functional/SessionDurabilityIT.java
index 5f7ca88bb2..2031eb8bf3 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/SessionDurabilityIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/SessionDurabilityIT.java
@@ -137,7 +137,7 @@ private void conditionWriteSome(String tableName, int n, ConditionalWriterConfig
     Connector c = getConnector();
     ConditionalWriter cw = c.createConditionalWriter(tableName, cfg);
     for (int i = 0; i < n; i++) {
-      ConditionalMutation m = new ConditionalMutation((CharSequence) (i + ""), new Condition("", ""));
+      ConditionalMutation m = new ConditionalMutation(i + "", new Condition("", ""));
       m.put("", "", "X");
       assertEquals(Status.ACCEPTED, cw.write(m).getStatus());
     }
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/WALSunnyDayIT.java b/test/src/main/java/org/apache/accumulo/test/functional/WALSunnyDayIT.java
index df8289a2f8..bad2e52bfb 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/WALSunnyDayIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/WALSunnyDayIT.java
@@ -85,7 +85,7 @@ protected void configure(MiniAccumuloConfigImpl cfg, Configuration hadoopCoreSit
   int countTrue(Collection<Boolean> bools) {
     int result = 0;
     for (Boolean b : bools) {
-      if (b.booleanValue())
+      if (b)
         result++;
     }
     return result;
@@ -104,7 +104,7 @@ public void test() throws Exception {
     // wal markers are added lazily
     Map<String,Boolean> wals = getWALsAndAssertCount(c, 2);
     for (Boolean b : wals.values()) {
-      assertTrue("logs should be in use", b.booleanValue());
+      assertTrue("logs should be in use", b);
     }
 
     // roll log, get a new next
diff --git a/test/src/main/java/org/apache/accumulo/test/performance/metadata/MetadataBatchScanTest.java b/test/src/main/java/org/apache/accumulo/test/performance/metadata/MetadataBatchScanTest.java
index 1754f812fa..270400448f 100644
--- a/test/src/main/java/org/apache/accumulo/test/performance/metadata/MetadataBatchScanTest.java
+++ b/test/src/main/java/org/apache/accumulo/test/performance/metadata/MetadataBatchScanTest.java
@@ -157,12 +157,12 @@ public void run() {
 
       long t1 = System.currentTimeMillis();
 
-      for (int i = 0; i < threads.length; i++) {
-        threads[i].start();
+      for (Thread thread : threads) {
+        thread.start();
       }
 
-      for (int i = 0; i < threads.length; i++) {
-        threads[i].join();
+      for (Thread thread : threads) {
+        thread.join();
       }
 
       long t2 = System.currentTimeMillis();
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 7685668591..6bb69622a9 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
@@ -742,7 +742,7 @@ public void namespaceIdMapLoginFailure() throws Exception {
 
   @Test(expected = AccumuloSecurityException.class, timeout = 5000)
   public void attachNamespaceIteratorLoginFailure() throws Exception {
-    IteratorSetting setting = new IteratorSetting(100, "DebugTheThings", DebugIterator.class.getName(), Collections.<String,String> emptyMap());
+    IteratorSetting setting = new IteratorSetting(100, "DebugTheThings", DebugIterator.class.getName(), Collections.emptyMap());
     client.attachNamespaceIterator(badLogin, namespaceName, setting, EnumSet.allOf(IteratorScope.class));
   }
 
@@ -763,7 +763,7 @@ public void listNamespaceIteratorsLoginFailure() throws Exception {
 
   @Test(expected = AccumuloSecurityException.class, timeout = 5000)
   public void checkNamespaceIteratorConflictsLoginFailure() throws Exception {
-    IteratorSetting setting = new IteratorSetting(100, "DebugTheThings", DebugIterator.class.getName(), Collections.<String,String> emptyMap());
+    IteratorSetting setting = new IteratorSetting(100, "DebugTheThings", DebugIterator.class.getName(), Collections.emptyMap());
     client.checkNamespaceIteratorConflicts(badLogin, namespaceName, setting, EnumSet.allOf(IteratorScope.class));
   }
 
@@ -976,7 +976,7 @@ public void namespaceNotFound() throws Exception {
       fail("exception not thrown");
     } catch (NamespaceNotFoundException ex) {}
     try {
-      IteratorSetting setting = new IteratorSetting(100, "DebugTheThings", DebugIterator.class.getName(), Collections.<String,String> emptyMap());
+      IteratorSetting setting = new IteratorSetting(100, "DebugTheThings", DebugIterator.class.getName(), Collections.emptyMap());
       client.attachNamespaceIterator(creds, doesNotExist, setting, EnumSet.allOf(IteratorScope.class));
       fail("exception not thrown");
     } catch (NamespaceNotFoundException ex) {}
@@ -993,7 +993,7 @@ public void namespaceNotFound() throws Exception {
       fail("exception not thrown");
     } catch (NamespaceNotFoundException ex) {}
     try {
-      IteratorSetting setting = new IteratorSetting(100, "DebugTheThings", DebugIterator.class.getName(), Collections.<String,String> emptyMap());
+      IteratorSetting setting = new IteratorSetting(100, "DebugTheThings", DebugIterator.class.getName(), Collections.emptyMap());
       client.checkNamespaceIteratorConflicts(creds, doesNotExist, setting, EnumSet.allOf(IteratorScope.class));
       fail("exception not thrown");
     } catch (NamespaceNotFoundException ex) {}
@@ -2679,7 +2679,7 @@ public void namespaceOperations() throws Exception {
     assertTrue("Namespace ID map should contain namespace created during setup", client.namespaceIdMap(creds).containsKey(namespaceName));
 
     // namespace iterators
-    IteratorSetting setting = new IteratorSetting(100, "DebugTheThings", DebugIterator.class.getName(), Collections.<String,String> emptyMap());
+    IteratorSetting setting = new IteratorSetting(100, "DebugTheThings", DebugIterator.class.getName(), Collections.emptyMap());
     client.attachNamespaceIterator(creds, namespaceName, setting, EnumSet.of(IteratorScope.SCAN));
     assertEquals("Wrong iterator setting returned", setting, client.getNamespaceIteratorSetting(creds, namespaceName, "DebugTheThings", IteratorScope.SCAN));
     assertTrue("Namespace iterator settings should contain iterator just added",
diff --git a/test/src/main/java/org/apache/accumulo/test/replication/UnusedWalDoesntCloseReplicationStatusIT.java b/test/src/main/java/org/apache/accumulo/test/replication/UnusedWalDoesntCloseReplicationStatusIT.java
index 46a7a4109f..a1a494f11e 100644
--- a/test/src/main/java/org/apache/accumulo/test/replication/UnusedWalDoesntCloseReplicationStatusIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/replication/UnusedWalDoesntCloseReplicationStatusIT.java
@@ -124,7 +124,7 @@ public void test() throws Exception {
     key.tablet = null;
     key.event = LogEvents.MUTATION;
     key.filename = tserverWal.getAbsolutePath();
-    value.mutations = Arrays.<Mutation> asList(new ServerMutation(new Text("row")));
+    value.mutations = Arrays.asList(new ServerMutation(new Text("row")));
 
     key.write(dos);
     value.write(dos);
diff --git a/test/src/test/java/org/apache/accumulo/test/iterator/WholeRowIteratorTest.java b/test/src/test/java/org/apache/accumulo/test/iterator/WholeRowIteratorTest.java
index 5e26106977..615d7568dd 100644
--- a/test/src/test/java/org/apache/accumulo/test/iterator/WholeRowIteratorTest.java
+++ b/test/src/test/java/org/apache/accumulo/test/iterator/WholeRowIteratorTest.java
@@ -136,7 +136,7 @@
   }
 
   private static IteratorTestInput getIteratorInput() {
-    return new IteratorTestInput(WholeRowIterator.class, Collections.<String,String> emptyMap(), new Range(), INPUT_DATA);
+    return new IteratorTestInput(WholeRowIterator.class, Collections.emptyMap(), new Range(), INPUT_DATA);
   }
 
   private static IteratorTestOutput getIteratorOutput() {


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services

Mime
View raw message