accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [33/48] accumulo git commit: ACCUMULO-4514 Remove unnecessary code
Date Fri, 04 Nov 2016 22:23:15 GMT
http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/main/java/org/apache/accumulo/test/continuous/Histogram.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/continuous/Histogram.java b/test/src/main/java/org/apache/accumulo/test/continuous/Histogram.java
index 8dd3c9d..f4b21df 100644
--- a/test/src/main/java/org/apache/accumulo/test/continuous/Histogram.java
+++ b/test/src/main/java/org/apache/accumulo/test/continuous/Histogram.java
@@ -41,7 +41,7 @@ public class Histogram<T> implements Serializable {
 
   public Histogram() {
     sum = 0;
-    counts = new HashMap<T,HistData<T>>();
+    counts = new HashMap<>();
   }
 
   public void addPoint(T x) {
@@ -52,7 +52,7 @@ public class Histogram<T> implements Serializable {
 
     HistData<T> hd = counts.get(x);
     if (hd == null) {
-      hd = new HistData<T>(x);
+      hd = new HistData<>(x);
       counts.put(x, hd);
     }
 
@@ -80,7 +80,7 @@ public class Histogram<T> implements Serializable {
 
   public List<T> getKeysInCountSortedOrder() {
 
-    ArrayList<HistData<T>> sortedCounts = new ArrayList<HistData<T>>(counts.values());
+    ArrayList<HistData<T>> sortedCounts = new ArrayList<>(counts.values());
 
     Collections.sort(sortedCounts, new Comparator<HistData<T>>() {
       @Override
@@ -93,7 +93,7 @@ public class Histogram<T> implements Serializable {
       }
     });
 
-    ArrayList<T> sortedKeys = new ArrayList<T>();
+    ArrayList<T> sortedKeys = new ArrayList<>();
 
     for (Iterator<HistData<T>> iter = sortedCounts.iterator(); iter.hasNext();) {
       HistData<T> hd = iter.next();
@@ -104,7 +104,7 @@ public class Histogram<T> implements Serializable {
   }
 
   public void print(StringBuilder out) {
-    TreeSet<HistData<T>> sortedCounts = new TreeSet<HistData<T>>(counts.values());
+    TreeSet<HistData<T>> sortedCounts = new TreeSet<>(counts.values());
 
     int maxValueLen = 0;
 
@@ -133,7 +133,7 @@ public class Histogram<T> implements Serializable {
     BufferedOutputStream bos = new BufferedOutputStream(fos);
     PrintStream ps = new PrintStream(bos, false, UTF_8.name());
 
-    TreeSet<HistData<T>> sortedCounts = new TreeSet<HistData<T>>(counts.values());
+    TreeSet<HistData<T>> sortedCounts = new TreeSet<>(counts.values());
     for (Iterator<HistData<T>> iter = sortedCounts.iterator(); iter.hasNext();) {
       HistData<T> hd = iter.next();
       ps.println(" " + hd.bin + " " + hd.count);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/main/java/org/apache/accumulo/test/continuous/PrintScanTimeHistogram.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/continuous/PrintScanTimeHistogram.java b/test/src/main/java/org/apache/accumulo/test/continuous/PrintScanTimeHistogram.java
index a43c2ba..1a25bab 100644
--- a/test/src/main/java/org/apache/accumulo/test/continuous/PrintScanTimeHistogram.java
+++ b/test/src/main/java/org/apache/accumulo/test/continuous/PrintScanTimeHistogram.java
@@ -32,8 +32,8 @@ public class PrintScanTimeHistogram {
   private static final Logger log = LoggerFactory.getLogger(PrintScanTimeHistogram.class);
 
   public static void main(String[] args) throws Exception {
-    Histogram<String> srqHist = new Histogram<String>();
-    Histogram<String> fsrHist = new Histogram<String>();
+    Histogram<String> srqHist = new Histogram<>();
+    Histogram<String> fsrHist = new Histogram<>();
 
     processFile(System.in, srqHist, fsrHist);
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/main/java/org/apache/accumulo/test/continuous/TimeBinner.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/continuous/TimeBinner.java b/test/src/main/java/org/apache/accumulo/test/continuous/TimeBinner.java
index e40bc8e..6ecb14e 100644
--- a/test/src/main/java/org/apache/accumulo/test/continuous/TimeBinner.java
+++ b/test/src/main/java/org/apache/accumulo/test/continuous/TimeBinner.java
@@ -77,10 +77,10 @@ public class TimeBinner {
 
     String line = null;
 
-    HashMap<Long,DoubleWrapper> aggregation1 = new HashMap<Long,DoubleWrapper>();
-    HashMap<Long,DoubleWrapper> aggregation2 = new HashMap<Long,DoubleWrapper>();
-    HashMap<Long,DoubleWrapper> aggregation3 = new HashMap<Long,DoubleWrapper>();
-    HashMap<Long,DoubleWrapper> aggregation4 = new HashMap<Long,DoubleWrapper>();
+    HashMap<Long,DoubleWrapper> aggregation1 = new HashMap<>();
+    HashMap<Long,DoubleWrapper> aggregation2 = new HashMap<>();
+    HashMap<Long,DoubleWrapper> aggregation3 = new HashMap<>();
+    HashMap<Long,DoubleWrapper> aggregation4 = new HashMap<>();
 
     while ((line = in.readLine()) != null) {
 
@@ -144,7 +144,7 @@ public class TimeBinner {
       }
     }
 
-    TreeMap<Long,DoubleWrapper> sorted = new TreeMap<Long,DoubleWrapper>(aggregation1);
+    TreeMap<Long,DoubleWrapper> sorted = new TreeMap<>(aggregation1);
 
     Set<Entry<Long,DoubleWrapper>> es = sorted.entrySet();
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/main/java/org/apache/accumulo/test/continuous/UndefinedAnalyzer.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/continuous/UndefinedAnalyzer.java b/test/src/main/java/org/apache/accumulo/test/continuous/UndefinedAnalyzer.java
index 00c7eb0..bcd35d8 100644
--- a/test/src/main/java/org/apache/accumulo/test/continuous/UndefinedAnalyzer.java
+++ b/test/src/main/java/org/apache/accumulo/test/continuous/UndefinedAnalyzer.java
@@ -68,7 +68,7 @@ public class UndefinedAnalyzer {
 
   static class IngestInfo {
 
-    Map<String,TreeMap<Long,Long>> flushes = new HashMap<String,TreeMap<Long,Long>>();
+    Map<String,TreeMap<Long,Long>> flushes = new HashMap<>();
 
     public IngestInfo(String logDir) throws Exception {
       File dir = new File(logDir);
@@ -103,7 +103,7 @@ public class UndefinedAnalyzer {
             return;
           }
 
-          tm = new TreeMap<Long,Long>(Collections.reverseOrder());
+          tm = new TreeMap<>(Collections.reverseOrder());
           tm.put(0l, Long.parseLong(time));
           flushes.put(uuid, tm);
           break;
@@ -162,7 +162,7 @@ public class UndefinedAnalyzer {
 
   static class TabletHistory {
 
-    List<TabletAssignment> assignments = new ArrayList<TabletAssignment>();
+    List<TabletAssignment> assignments = new ArrayList<>();
 
     TabletHistory(String tableId, String acuLogDir) throws Exception {
       File dir = new File(acuLogDir);
@@ -263,7 +263,7 @@ public class UndefinedAnalyzer {
     BatchScannerOpts bsOpts = new BatchScannerOpts();
     opts.parseArgs(UndefinedAnalyzer.class.getName(), args, bsOpts);
 
-    List<UndefinedNode> undefs = new ArrayList<UndefinedNode>();
+    List<UndefinedNode> undefs = new ArrayList<>();
 
     BufferedReader reader = new BufferedReader(new InputStreamReader(System.in, UTF_8));
     String line;
@@ -278,20 +278,20 @@ public class UndefinedAnalyzer {
     Connector conn = opts.getConnector();
     BatchScanner bscanner = conn.createBatchScanner(opts.getTableName(), opts.auths, bsOpts.scanThreads);
     bscanner.setTimeout(bsOpts.scanTimeout, TimeUnit.MILLISECONDS);
-    List<Range> refs = new ArrayList<Range>();
+    List<Range> refs = new ArrayList<>();
 
     for (UndefinedNode undefinedNode : undefs)
       refs.add(new Range(new Text(undefinedNode.ref)));
 
     bscanner.setRanges(refs);
 
-    HashMap<String,List<String>> refInfo = new HashMap<String,List<String>>();
+    HashMap<String,List<String>> refInfo = new HashMap<>();
 
     for (Entry<Key,Value> entry : bscanner) {
       String ref = entry.getKey().getRow().toString();
       List<String> vals = refInfo.get(ref);
       if (vals == null) {
-        vals = new ArrayList<String>();
+        vals = new ArrayList<>();
         refInfo.put(ref, vals);
       }
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/main/java/org/apache/accumulo/test/functional/CacheTestReader.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/CacheTestReader.java b/test/src/main/java/org/apache/accumulo/test/functional/CacheTestReader.java
index fd8ba2c..5abae1e 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/CacheTestReader.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/CacheTestReader.java
@@ -51,7 +51,7 @@ public class CacheTestReader {
         return;
       }
 
-      Map<String,String> readData = new TreeMap<String,String>();
+      Map<String,String> readData = new TreeMap<>();
 
       for (int i = 0; i < numData; i++) {
         byte[] v = zc.get(rootDir + "/data" + i);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/main/java/org/apache/accumulo/test/functional/CacheTestWriter.java
----------------------------------------------------------------------
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 76e8168..84e55a5 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
@@ -57,7 +57,7 @@ public class CacheTestWriter {
 
     zk.putPersistentData(rootDir + "/dir", new byte[0], NodeExistsPolicy.FAIL);
 
-    ArrayList<String> children = new ArrayList<String>();
+    ArrayList<String> children = new ArrayList<>();
 
     Random r = new Random();
 
@@ -67,7 +67,7 @@ public class CacheTestWriter {
       // change children in dir
 
       for (int u = 0; u < r.nextInt(4) + 1; u++) {
-        expectedData = new TreeMap<String,String>();
+        expectedData = new TreeMap<>();
 
         if (r.nextFloat() < .5) {
           String child = UUID.randomUUID().toString();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/main/java/org/apache/accumulo/test/functional/ZombieTServer.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ZombieTServer.java b/test/src/main/java/org/apache/accumulo/test/functional/ZombieTServer.java
index da9f1d6..dbb0c29 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/ZombieTServer.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/ZombieTServer.java
@@ -23,7 +23,6 @@ import java.util.Random;
 
 import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException;
-import org.apache.accumulo.core.master.thrift.TableInfo;
 import org.apache.accumulo.core.master.thrift.TabletServerStatus;
 import org.apache.accumulo.core.security.thrift.TCredentials;
 import org.apache.accumulo.core.tabletserver.thrift.TabletClientService.Iface;
@@ -78,7 +77,7 @@ public class ZombieTServer {
       synchronized (this) {
         if (statusCount++ < 1) {
           TabletServerStatus result = new TabletServerStatus();
-          result.tableMap = new HashMap<String,TableInfo>();
+          result.tableMap = new HashMap<>();
           return result;
         }
       }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/main/java/org/apache/accumulo/test/performance/metadata/MetadataBatchScanTest.java
----------------------------------------------------------------------
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 1c7ce67..a8314d4 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
@@ -70,7 +70,7 @@ public class MetadataBatchScanTest {
     Instance inst = new ZooKeeperInstance(new ClientConfiguration().withInstance("acu14").withZkHosts("localhost"));
     final Connector connector = inst.getConnector(opts.getPrincipal(), opts.getToken());
 
-    TreeSet<Long> splits = new TreeSet<Long>();
+    TreeSet<Long> splits = new TreeSet<>();
     Random r = new Random(42);
 
     while (splits.size() < 99999) {
@@ -80,7 +80,7 @@ public class MetadataBatchScanTest {
     Text tid = new Text("8");
     Text per = null;
 
-    ArrayList<KeyExtent> extents = new ArrayList<KeyExtent>();
+    ArrayList<KeyExtent> extents = new ArrayList<>();
 
     for (Long split : splits) {
       Text er = new Text(String.format("%012d", split));
@@ -128,12 +128,12 @@ public class MetadataBatchScanTest {
       final int numLoop = Integer.parseInt(args[2]);
       int numLookups = Integer.parseInt(args[3]);
 
-      HashSet<Integer> indexes = new HashSet<Integer>();
+      HashSet<Integer> indexes = new HashSet<>();
       while (indexes.size() < numLookups) {
         indexes.add(r.nextInt(extents.size()));
       }
 
-      final List<Range> ranges = new ArrayList<Range>();
+      final List<Range> ranges = new ArrayList<>();
       for (Integer i : indexes) {
         ranges.add(extents.get(i).toMetadataRange());
       }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/main/java/org/apache/accumulo/test/performance/scan/CollectTabletStats.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/performance/scan/CollectTabletStats.java b/test/src/main/java/org/apache/accumulo/test/performance/scan/CollectTabletStats.java
index 9c1f777..18e0bff 100644
--- a/test/src/main/java/org/apache/accumulo/test/performance/scan/CollectTabletStats.java
+++ b/test/src/main/java/org/apache/accumulo/test/performance/scan/CollectTabletStats.java
@@ -119,7 +119,7 @@ public class CollectTabletStats {
       System.exit(-1);
     }
 
-    TreeMap<KeyExtent,String> tabletLocations = new TreeMap<KeyExtent,String>();
+    TreeMap<KeyExtent,String> tabletLocations = new TreeMap<>();
     List<KeyExtent> candidates = findTablets(context, !opts.selectFarTablets, opts.getTableName(), tabletLocations);
 
     if (candidates.size() < opts.numThreads) {
@@ -129,7 +129,7 @@ public class CollectTabletStats {
 
     List<KeyExtent> tabletsToTest = selectRandomTablets(opts.numThreads, candidates);
 
-    Map<KeyExtent,List<FileRef>> tabletFiles = new HashMap<KeyExtent,List<FileRef>>();
+    Map<KeyExtent,List<FileRef>> tabletFiles = new HashMap<>();
 
     for (KeyExtent ke : tabletsToTest) {
       List<FileRef> files = getTabletFiles(context, tableId, ke);
@@ -155,7 +155,7 @@ public class CollectTabletStats {
 
     for (int i = 0; i < opts.iterations; i++) {
 
-      ArrayList<Test> tests = new ArrayList<Test>();
+      ArrayList<Test> tests = new ArrayList<>();
 
       for (final KeyExtent ke : tabletsToTest) {
         final List<FileRef> files = tabletFiles.get(ke);
@@ -175,7 +175,7 @@ public class CollectTabletStats {
 
     for (int i = 0; i < opts.iterations; i++) {
 
-      ArrayList<Test> tests = new ArrayList<Test>();
+      ArrayList<Test> tests = new ArrayList<>();
 
       for (final KeyExtent ke : tabletsToTest) {
         final List<FileRef> files = tabletFiles.get(ke);
@@ -193,7 +193,7 @@ public class CollectTabletStats {
     }
 
     for (int i = 0; i < opts.iterations; i++) {
-      ArrayList<Test> tests = new ArrayList<Test>();
+      ArrayList<Test> tests = new ArrayList<>();
 
       for (final KeyExtent ke : tabletsToTest) {
         final List<FileRef> files = tabletFiles.get(ke);
@@ -212,7 +212,7 @@ public class CollectTabletStats {
 
     for (int i = 0; i < opts.iterations; i++) {
 
-      ArrayList<Test> tests = new ArrayList<Test>();
+      ArrayList<Test> tests = new ArrayList<>();
 
       final Connector conn = opts.getConnector();
 
@@ -354,7 +354,7 @@ public class CollectTabletStats {
 
     InetAddress localaddress = InetAddress.getLocalHost();
 
-    List<KeyExtent> candidates = new ArrayList<KeyExtent>();
+    List<KeyExtent> candidates = new ArrayList<>();
 
     for (Entry<KeyExtent,String> entry : tabletLocations.entrySet()) {
       String loc = entry.getValue();
@@ -372,7 +372,7 @@ public class CollectTabletStats {
   }
 
   private static List<KeyExtent> selectRandomTablets(int numThreads, List<KeyExtent> candidates) {
-    List<KeyExtent> tabletsToTest = new ArrayList<KeyExtent>();
+    List<KeyExtent> tabletsToTest = new ArrayList<>();
 
     Random rand = new Random();
     for (int i = 0; i < numThreads; i++) {
@@ -385,7 +385,7 @@ public class CollectTabletStats {
   }
 
   private static List<FileRef> getTabletFiles(ClientContext context, String tableId, KeyExtent ke) throws IOException {
-    return new ArrayList<FileRef>(MetadataTableUtil.getDataFileSizes(ke, context).keySet());
+    return new ArrayList<>(MetadataTableUtil.getDataFileSizes(ke, context).keySet());
   }
 
   private static void reportHdfsBlockLocations(List<FileRef> files) throws Exception {
@@ -423,7 +423,7 @@ public class CollectTabletStats {
 
     SortedMapIterator smi = new SortedMapIterator(new TreeMap<Key,Value>());
 
-    List<SortedKeyValueIterator<Key,Value>> iters = new ArrayList<SortedKeyValueIterator<Key,Value>>(mapfiles.size() + 1);
+    List<SortedKeyValueIterator<Key,Value>> iters = new ArrayList<>(mapfiles.size() + 1);
 
     iters.addAll(mapfiles);
     iters.add(smi);
@@ -461,7 +461,7 @@ public class CollectTabletStats {
   }
 
   private static HashSet<ByteSequence> createColumnBSS(String[] columns) {
-    HashSet<ByteSequence> columnSet = new HashSet<ByteSequence>();
+    HashSet<ByteSequence> columnSet = new HashSet<>();
     for (String c : columns) {
       columnSet.add(new ArrayByteSequence(c));
     }
@@ -473,7 +473,7 @@ public class CollectTabletStats {
 
     SortedKeyValueIterator<Key,Value> reader;
 
-    List<SortedKeyValueIterator<Key,Value>> readers = new ArrayList<SortedKeyValueIterator<Key,Value>>(files.size());
+    List<SortedKeyValueIterator<Key,Value>> readers = new ArrayList<>(files.size());
 
     for (FileRef file : files) {
       FileSystem ns = fs.getVolumeByPath(file.path()).getFileSystem();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/main/java/org/apache/accumulo/test/performance/thrift/NullTserver.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/performance/thrift/NullTserver.java b/test/src/main/java/org/apache/accumulo/test/performance/thrift/NullTserver.java
index d0de29f..c972d3b 100644
--- a/test/src/main/java/org/apache/accumulo/test/performance/thrift/NullTserver.java
+++ b/test/src/main/java/org/apache/accumulo/test/performance/thrift/NullTserver.java
@@ -180,7 +180,7 @@ public class NullTserver {
 
     @Override
     public List<ActiveScan> getActiveScans(TInfo tinfo, TCredentials credentials) throws ThriftSecurityException, TException {
-      return new ArrayList<ActiveScan>();
+      return new ArrayList<>();
     }
 
     @Override
@@ -206,7 +206,7 @@ public class NullTserver {
 
     @Override
     public List<ActiveCompaction> getActiveCompactions(TInfo tinfo, TCredentials credentials) throws ThriftSecurityException, TException {
-      return new ArrayList<ActiveCompaction>();
+      return new ArrayList<>();
     }
 
     @Override
@@ -267,7 +267,7 @@ public class NullTserver {
     MetaDataTableScanner s = new MetaDataTableScanner(context, tableRange);
     long randomSessionID = opts.port;
     TServerInstance instance = new TServerInstance(addr, randomSessionID);
-    List<Assignment> assignments = new ArrayList<Assignment>();
+    List<Assignment> assignments = new ArrayList<>();
     while (s.hasNext()) {
       TabletLocationState next = s.next();
       assignments.add(new Assignment(next.extent, instance));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/main/java/org/apache/accumulo/test/randomwalk/Framework.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/Framework.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/Framework.java
index f5b721b..fd5d5fa 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/Framework.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/Framework.java
@@ -29,7 +29,7 @@ import com.beust.jcommander.Parameter;
 public class Framework {
 
   private static final Logger log = Logger.getLogger(Framework.class);
-  private HashMap<String,Node> nodes = new HashMap<String,Node>();
+  private HashMap<String,Node> nodes = new HashMap<>();
   private String configDir = null;
   private static final Framework INSTANCE = new Framework();
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/main/java/org/apache/accumulo/test/randomwalk/Module.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/Module.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/Module.java
index e5af8e6..37b0417 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/Module.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/Module.java
@@ -116,8 +116,8 @@ public class Module extends Node {
     }
   }
 
-  private HashMap<String,Node> nodes = new HashMap<String,Node>();
-  private HashMap<String,Properties> localProps = new HashMap<String,Properties>();
+  private HashMap<String,Node> nodes = new HashMap<>();
+  private HashMap<String,Properties> localProps = new HashMap<>();
 
   private class Edge {
     String nodeId;
@@ -126,7 +126,7 @@ public class Module extends Node {
 
   private class AdjList {
 
-    private List<Edge> edges = new ArrayList<Edge>();
+    private List<Edge> edges = new ArrayList<>();
     private int totalWeight = 0;
     private Random rand = new Random();
 
@@ -167,9 +167,9 @@ public class Module extends Node {
     }
   }
 
-  private HashMap<String,String> prefixes = new HashMap<String,String>();
-  private HashMap<String,AdjList> adjMap = new HashMap<String,AdjList>();
-  private HashMap<String,Set<String>> aliasMap = new HashMap<String,Set<String>>();
+  private HashMap<String,String> prefixes = new HashMap<>();
+  private HashMap<String,AdjList> adjMap = new HashMap<>();
+  private HashMap<String,Set<String>> aliasMap = new HashMap<>();
   private final File xmlFile;
   private String initNodeId;
   private Fixture fixture = null;
@@ -275,7 +275,7 @@ public class Module extends Node {
           }
 
           // Wrap the visit of the next node in the module in a callable that returns a thrown exception
-          FutureTask<Exception> task = new FutureTask<Exception>(new Callable<Exception>() {
+          FutureTask<Exception> task = new FutureTask<>(new Callable<Exception>() {
 
             @Override
             public Exception call() throws Exception {
@@ -327,7 +327,7 @@ public class Module extends Node {
             log.debug("  " + entry.getKey() + ": " + entry.getValue());
           }
           log.debug("State information");
-          for (String key : new TreeSet<String>(state.getMap().keySet())) {
+          for (String key : new TreeSet<>(state.getMap().keySet())) {
             Object value = state.getMap().get(key);
             String logMsg = "  " + key + ": ";
             if (value == null)
@@ -565,7 +565,7 @@ public class Module extends Node {
 
       // parse aliases
       NodeList aliaslist = nodeEl.getElementsByTagName("alias");
-      Set<String> aliases = new TreeSet<String>();
+      Set<String> aliases = new TreeSet<>();
       for (int j = 0; j < aliaslist.getLength(); j++) {
         Element propEl = (Element) aliaslist.item(j);
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/main/java/org/apache/accumulo/test/randomwalk/State.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/State.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/State.java
index 9b74ad4..d906d00 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/State.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/State.java
@@ -23,7 +23,7 @@ import java.util.HashMap;
  */
 public class State {
 
-  private HashMap<String,Object> stateMap = new HashMap<String,Object>();
+  private HashMap<String,Object> stateMap = new HashMap<>();
 
   /**
    * Creates new empty state.

http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/main/java/org/apache/accumulo/test/randomwalk/bulk/BulkPlusOne.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/bulk/BulkPlusOne.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/bulk/BulkPlusOne.java
index c54a8e7..85d8658 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/bulk/BulkPlusOne.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/bulk/BulkPlusOne.java
@@ -45,7 +45,7 @@ public class BulkPlusOne extends BulkImportTest {
   public static final int COLS = 10;
   public static final int HEX_SIZE = (int) Math.ceil(Math.log(LOTS) / Math.log(16));
   public static final String FMT = "r%0" + HEX_SIZE + "x";
-  public static final List<Column> COLNAMES = new ArrayList<Column>();
+  public static final List<Column> COLNAMES = new ArrayList<>();
   public static final Text CHECK_COLUMN_FAMILY = new Text("cf");
   static {
     for (int i = 0; i < COLS; i++) {
@@ -66,19 +66,19 @@ public class BulkPlusOne extends BulkImportTest {
     fs.mkdirs(fail);
     final int parts = rand.nextInt(10) + 1;
 
-    TreeSet<Integer> startRows = new TreeSet<Integer>();
+    TreeSet<Integer> startRows = new TreeSet<>();
     startRows.add(0);
     while (startRows.size() < parts)
       startRows.add(rand.nextInt(LOTS));
 
-    List<String> printRows = new ArrayList<String>(startRows.size());
+    List<String> printRows = new ArrayList<>(startRows.size());
     for (Integer row : startRows)
       printRows.add(String.format(FMT, row));
 
     String markerColumnQualifier = String.format("%07d", counter.incrementAndGet());
     log.debug("preparing bulk files with start rows " + printRows + " last row " + String.format(FMT, LOTS - 1) + " marker " + markerColumnQualifier);
 
-    List<Integer> rows = new ArrayList<Integer>(startRows);
+    List<Integer> rows = new ArrayList<>(startRows);
     rows.add(LOTS);
 
     for (int i = 0; i < parts; i++) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/main/java/org/apache/accumulo/test/randomwalk/bulk/Split.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/bulk/Split.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/bulk/Split.java
index b69805d..641950e 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/bulk/Split.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/bulk/Split.java
@@ -28,7 +28,7 @@ public class Split extends SelectiveBulkTest {
 
   @Override
   protected void runLater(State state, Environment env) throws Exception {
-    SortedSet<Text> splits = new TreeSet<Text>();
+    SortedSet<Text> splits = new TreeSet<>();
     Random rand = (Random) state.get("rand");
     int count = rand.nextInt(20);
     for (int i = 0; i < count; i++)

http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/AddSplits.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/AddSplits.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/AddSplits.java
index 2727e62..dc040a6 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/AddSplits.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/AddSplits.java
@@ -41,11 +41,11 @@ public class AddSplits extends Test {
 
     @SuppressWarnings("unchecked")
     List<String> tableNames = (List<String>) state.get("tables");
-    tableNames = new ArrayList<String>(tableNames);
+    tableNames = new ArrayList<>(tableNames);
     tableNames.add(MetadataTable.NAME);
     String tableName = tableNames.get(rand.nextInt(tableNames.size()));
 
-    TreeSet<Text> splits = new TreeSet<Text>();
+    TreeSet<Text> splits = new TreeSet<>();
 
     for (int i = 0; i < rand.nextInt(10) + 1; i++)
       splits.add(new Text(String.format("%016x", rand.nextLong() & 0x7fffffffffffffffl)));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/BatchScan.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/BatchScan.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/BatchScan.java
index 187199f..111e6c7 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/BatchScan.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/BatchScan.java
@@ -52,7 +52,7 @@ public class BatchScan extends Test {
 
     try {
       BatchScanner bs = conn.createBatchScanner(tableName, Authorizations.EMPTY, 3);
-      List<Range> ranges = new ArrayList<Range>();
+      List<Range> ranges = new ArrayList<>();
       for (int i = 0; i < rand.nextInt(2000) + 1; i++)
         ranges.add(new Range(String.format("%016x", rand.nextLong() & 0x7fffffffffffffffl)));
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/BulkImport.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/BulkImport.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/BulkImport.java
index 5af08ec..d543889 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/BulkImport.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/BulkImport.java
@@ -115,7 +115,7 @@ public class BulkImport extends Test {
     try {
       BatchWriter bw = new RFileBatchWriter(conf, fs, bulkDir + "/file01.rf");
       try {
-        TreeSet<Long> rows = new TreeSet<Long>();
+        TreeSet<Long> rows = new TreeSet<>();
         int numRows = rand.nextInt(100000);
         for (int i = 0; i < numRows; i++) {
           rows.add(rand.nextLong() & 0x7fffffffffffffffl);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/ChangeAuthorizations.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/ChangeAuthorizations.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/ChangeAuthorizations.java
index 65502c3..646c415 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/ChangeAuthorizations.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/ChangeAuthorizations.java
@@ -43,7 +43,7 @@ public class ChangeAuthorizations extends Test {
 
     String userName = userNames.get(rand.nextInt(userNames.size()));
     try {
-      List<byte[]> auths = new ArrayList<byte[]>(conn.securityOperations().getUserAuthorizations(userName).getAuthorizations());
+      List<byte[]> auths = new ArrayList<>(conn.securityOperations().getUserAuthorizations(userName).getAuthorizations());
 
       if (rand.nextBoolean()) {
         String authorization = String.format("a%d", rand.nextInt(5000));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/ChangePermissions.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/ChangePermissions.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/ChangePermissions.java
index 680750a..7e8f789 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/ChangePermissions.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/ChangePermissions.java
@@ -88,13 +88,13 @@ public class ChangePermissions extends Test {
     more.removeAll(perms);
 
     if (rand.nextBoolean() && more.size() > 0) {
-      List<TablePermission> moreList = new ArrayList<TablePermission>(more);
+      List<TablePermission> moreList = new ArrayList<>(more);
       TablePermission choice = moreList.get(rand.nextInt(moreList.size()));
       log.debug("adding permission " + choice);
       conn.securityOperations().grantTablePermission(userName, tableName, choice);
     } else {
       if (perms.size() > 0) {
-        List<TablePermission> permList = new ArrayList<TablePermission>(perms);
+        List<TablePermission> permList = new ArrayList<>(perms);
         TablePermission choice = permList.get(rand.nextInt(permList.size()));
         log.debug("removing permission " + choice);
         conn.securityOperations().revokeTablePermission(userName, tableName, choice);
@@ -114,13 +114,13 @@ public class ChangePermissions extends Test {
     more.remove(SystemPermission.GRANT);
 
     if (rand.nextBoolean() && more.size() > 0) {
-      List<SystemPermission> moreList = new ArrayList<SystemPermission>(more);
+      List<SystemPermission> moreList = new ArrayList<>(more);
       SystemPermission choice = moreList.get(rand.nextInt(moreList.size()));
       log.debug("adding permission " + choice);
       conn.securityOperations().grantSystemPermission(userName, choice);
     } else {
       if (perms.size() > 0) {
-        List<SystemPermission> permList = new ArrayList<SystemPermission>(perms);
+        List<SystemPermission> permList = new ArrayList<>(perms);
         SystemPermission choice = permList.get(rand.nextInt(permList.size()));
         log.debug("removing permission " + choice);
         conn.securityOperations().revokeSystemPermission(userName, choice);
@@ -140,13 +140,13 @@ public class ChangePermissions extends Test {
     more.removeAll(perms);
 
     if (rand.nextBoolean() && more.size() > 0) {
-      List<NamespacePermission> moreList = new ArrayList<NamespacePermission>(more);
+      List<NamespacePermission> moreList = new ArrayList<>(more);
       NamespacePermission choice = moreList.get(rand.nextInt(moreList.size()));
       log.debug("adding permission " + choice);
       conn.securityOperations().grantNamespacePermission(userName, namespace, choice);
     } else {
       if (perms.size() > 0) {
-        List<NamespacePermission> permList = new ArrayList<NamespacePermission>(perms);
+        List<NamespacePermission> permList = new ArrayList<>(perms);
         NamespacePermission choice = permList.get(rand.nextInt(permList.size()));
         log.debug("removing permission " + choice);
         conn.securityOperations().revokeNamespacePermission(userName, namespace, choice);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/ConcurrentFixture.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/ConcurrentFixture.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/ConcurrentFixture.java
index b27f34c..403a66a 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/ConcurrentFixture.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/ConcurrentFixture.java
@@ -46,7 +46,7 @@ public class ConcurrentFixture extends Fixture {
    * @return A two element list with first being smaller than the second, but either value (or both) can be null
    */
   public static List<Text> generateRange(Random rand) {
-    ArrayList<Text> toRet = new ArrayList<Text>(2);
+    ArrayList<Text> toRet = new ArrayList<>(2);
 
     long firstLong = rand.nextLong();
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/DeleteRange.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/DeleteRange.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/DeleteRange.java
index 280f620..c164b6b 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/DeleteRange.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/DeleteRange.java
@@ -43,7 +43,7 @@ public class DeleteRange extends Test {
 
     String tableName = tableNames.get(rand.nextInt(tableNames.size()));
 
-    List<Text> range = new ArrayList<Text>();
+    List<Text> range = new ArrayList<>();
     do {
       range.add(new Text(String.format("%016x", rand.nextLong() & 0x7fffffffffffffffl)));
       range.add(new Text(String.format("%016x", rand.nextLong() & 0x7fffffffffffffffl)));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/IsolatedScan.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/IsolatedScan.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/IsolatedScan.java
index 1bb51bb..eac39fa 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/IsolatedScan.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/IsolatedScan.java
@@ -52,7 +52,7 @@ public class IsolatedScan extends Test {
       RowIterator iter = new RowIterator(new IsolatedScanner(conn.createScanner(tableName, Authorizations.EMPTY)));
 
       while (iter.hasNext()) {
-        PeekingIterator<Entry<Key,Value>> row = new PeekingIterator<Entry<Key,Value>>(iter.next());
+        PeekingIterator<Entry<Key,Value>> row = new PeekingIterator<>(iter.next());
         Entry<Key,Value> kv = null;
         if (row.hasNext())
           kv = row.peek();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/Merge.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/Merge.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/Merge.java
index a997c2b..fe84dca 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/Merge.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/Merge.java
@@ -40,7 +40,7 @@ public class Merge extends Test {
 
     @SuppressWarnings("unchecked")
     List<String> tableNames = (List<String>) state.get("tables");
-    tableNames = new ArrayList<String>(tableNames);
+    tableNames = new ArrayList<>(tableNames);
     tableNames.add(MetadataTable.NAME);
     String tableName = tableNames.get(rand.nextInt(tableNames.size()));
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/Setup.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/Setup.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/Setup.java
index c19fcbd..ee7ae32 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/Setup.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/Setup.java
@@ -36,8 +36,8 @@ public class Setup extends Test {
     int numNamespaces = Integer.parseInt(props.getProperty("numNamespaces", "2"));
     log.debug("numTables = " + numTables);
     log.debug("numNamespaces = " + numNamespaces);
-    List<String> tables = new ArrayList<String>();
-    List<String> namespaces = new ArrayList<String>();
+    List<String> tables = new ArrayList<>();
+    List<String> namespaces = new ArrayList<>();
 
     for (int i = 0; i < numNamespaces; i++) {
       namespaces.add(String.format("nspc_%03d", i));
@@ -62,7 +62,7 @@ public class Setup extends Test {
 
     int numUsers = Integer.parseInt(props.getProperty("numUsers", "5"));
     log.debug("numUsers = " + numUsers);
-    List<String> users = new ArrayList<String>();
+    List<String> users = new ArrayList<>();
     for (int i = 0; i < numUsers; i++)
       users.add(String.format("user%03d", i));
     state.set("users", users);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/StopTabletServer.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/StopTabletServer.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/StopTabletServer.java
index 995a72e..d819cc0 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/StopTabletServer.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/StopTabletServer.java
@@ -40,7 +40,7 @@ import org.apache.zookeeper.data.Stat;
 public class StopTabletServer extends Test {
 
   Set<TServerInstance> getTServers(Instance instance) throws KeeperException, InterruptedException {
-    Set<TServerInstance> result = new HashSet<TServerInstance>();
+    Set<TServerInstance> result = new HashSet<>();
     ZooReader rdr = new ZooReader(instance.getZooKeepers(), instance.getZooKeepersSessionTimeOut());
     String base = ZooUtil.getRoot(instance) + Constants.ZTSERVERS;
     for (String child : rdr.getChildren(base)) {
@@ -66,7 +66,7 @@ public class StopTabletServer extends Test {
 
     Instance instance = env.getInstance();
 
-    List<TServerInstance> currentServers = new ArrayList<TServerInstance>(getTServers(instance));
+    List<TServerInstance> currentServers = new ArrayList<>(getTServers(instance));
     Collections.shuffle(currentServers);
     Runtime runtime = Runtime.getRuntime();
     if (currentServers.size() > 1) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/main/java/org/apache/accumulo/test/randomwalk/conditional/Init.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/conditional/Init.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/conditional/Init.java
index ebe12ef..4668802 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/conditional/Init.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/conditional/Init.java
@@ -43,13 +43,13 @@ public class Init extends Test {
     int numAccts = (Integer) state.get("numAccts");
 
     // add some splits to spread ingest out a little
-    TreeSet<Text> splits = new TreeSet<Text>();
+    TreeSet<Text> splits = new TreeSet<>();
     for (int i = 1; i < 10; i++)
       splits.add(new Text(Utils.getBank((int) (numBanks * .1 * i))));
     env.getConnector().tableOperations().addSplits((String) state.get("tableName"), splits);
     log.debug("Added splits " + splits);
 
-    ArrayList<Integer> banks = new ArrayList<Integer>();
+    ArrayList<Integer> banks = new ArrayList<>();
     for (int i = 0; i < numBanks; i++)
       banks.add(i);
     // shuffle for case when multiple threads are adding banks

http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/main/java/org/apache/accumulo/test/randomwalk/conditional/Split.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/conditional/Split.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/conditional/Split.java
index a1ca830..0d7fee1 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/conditional/Split.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/conditional/Split.java
@@ -39,7 +39,7 @@ public class Split extends Test {
     String row = Utils.getBank(rand.nextInt((Integer) state.get("numBanks")));
 
     log.debug("adding split " + row);
-    conn.tableOperations().addSplits(table, new TreeSet<Text>(Arrays.asList(new Text(row))));
+    conn.tableOperations().addSplits(table, new TreeSet<>(Arrays.asList(new Text(row))));
   }
 
 }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/main/java/org/apache/accumulo/test/randomwalk/image/ImageFixture.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/image/ImageFixture.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/image/ImageFixture.java
index 3bcc41c..b37ff90 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/image/ImageFixture.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/image/ImageFixture.java
@@ -47,7 +47,7 @@ public class ImageFixture extends Fixture {
     Connector conn = env.getConnector();
     Instance instance = env.getInstance();
 
-    SortedSet<Text> splits = new TreeSet<Text>();
+    SortedSet<Text> splits = new TreeSet<>();
     for (int i = 1; i < 256; i++) {
       splits.add(new Text(String.format("%04x", i << 8)));
     }
@@ -94,13 +94,13 @@ public class ImageFixture extends Fixture {
   }
 
   static Map<String,Set<Text>> getLocalityGroups() {
-    Map<String,Set<Text>> groups = new HashMap<String,Set<Text>>();
+    Map<String,Set<Text>> groups = new HashMap<>();
 
-    HashSet<Text> lg1 = new HashSet<Text>();
+    HashSet<Text> lg1 = new HashSet<>();
     lg1.add(Write.CONTENT_COLUMN_FAMILY);
     groups.put("lg1", lg1);
 
-    HashSet<Text> lg2 = new HashSet<Text>();
+    HashSet<Text> lg2 = new HashSet<>();
     lg2.add(Write.META_COLUMN_FAMILY);
     groups.put("lg2", lg2);
     return groups;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/main/java/org/apache/accumulo/test/randomwalk/image/ScanMeta.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/image/ScanMeta.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/image/ScanMeta.java
index 4b801c2..49d33d0 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/image/ScanMeta.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/image/ScanMeta.java
@@ -63,7 +63,7 @@ public class ScanMeta extends Test {
     Random rand = new Random();
     int numToScan = rand.nextInt(maxScan - minScan) + minScan;
 
-    Map<Text,Text> hashes = new HashMap<Text,Text>();
+    Map<Text,Text> hashes = new HashMap<>();
 
     Iterator<Entry<Key,Value>> iter = imageScanner.iterator();
 
@@ -84,14 +84,14 @@ public class ScanMeta extends Test {
 
     // use batch scanner to verify all of these exist in index
     BatchScanner indexScanner = conn.createBatchScanner(indexTableName, Authorizations.EMPTY, 3);
-    ArrayList<Range> ranges = new ArrayList<Range>();
+    ArrayList<Range> ranges = new ArrayList<>();
     for (Text row : hashes.keySet()) {
       ranges.add(new Range(row));
     }
 
     indexScanner.setRanges(ranges);
 
-    Map<Text,Text> hashes2 = new HashMap<Text,Text>();
+    Map<Text,Text> hashes2 = new HashMap<>();
 
     for (Entry<Key,Value> entry : indexScanner)
       hashes2.put(entry.getKey().getRow(), new Text(entry.getValue().get()));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/main/java/org/apache/accumulo/test/randomwalk/image/TableOp.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/image/TableOp.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/image/TableOp.java
index b62ec34..d2b5e2f 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/image/TableOp.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/image/TableOp.java
@@ -72,7 +72,7 @@ public class TableOp extends Test {
         groups = ImageFixture.getLocalityGroups();
       } else {
         log.debug("Removing locality groups from " + state.getString("imageTableName"));
-        groups = new HashMap<String,Set<Text>>();
+        groups = new HashMap<>();
       }
 
       tableOps.setLocalityGroups(state.getString("imageTableName"), groups);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/CopyTable.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/CopyTable.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/CopyTable.java
index 0f040b1..d1207f2 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/CopyTable.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/CopyTable.java
@@ -34,7 +34,7 @@ public class CopyTable extends Test {
   private final TreeSet<Text> splits;
 
   public CopyTable() {
-    splits = new TreeSet<Text>();
+    splits = new TreeSet<>();
     for (int i = 1; i < 10; i++) {
       splits.add(new Text(Integer.toString(i)));
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/CreateTable.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/CreateTable.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/CreateTable.java
index 84c359b..ee573e3 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/CreateTable.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/CreateTable.java
@@ -33,7 +33,7 @@ public class CreateTable extends Test {
   private final TreeSet<Text> splits;
 
   public CreateTable() {
-    splits = new TreeSet<Text>();
+    splits = new TreeSet<>();
     for (int i = 1; i < 10; i++) {
       splits.add(new Text(Integer.toString(i)));
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/main/java/org/apache/accumulo/test/randomwalk/security/TableOp.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/security/TableOp.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/security/TableOp.java
index 2612fc9..b7dac75 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/security/TableOp.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/security/TableOp.java
@@ -195,7 +195,7 @@ public class TableOp extends Test {
         break;
       case BULK_IMPORT:
         key = WalkingSecurity.get(state, env).getLastKey() + "1";
-        SortedSet<Key> keys = new TreeSet<Key>();
+        SortedSet<Key> keys = new TreeSet<>();
         for (String s : WalkingSecurity.get(state, env).getAuthsArray()) {
           Key k = new Key(key, "", "", s);
           keys.add(k);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/main/java/org/apache/accumulo/test/randomwalk/security/WalkingSecurity.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/security/WalkingSecurity.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/security/WalkingSecurity.java
index 457b478..0c440af 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/security/WalkingSecurity.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/security/WalkingSecurity.java
@@ -154,7 +154,7 @@ public class WalkingSecurity extends SecurityOperation implements Authorizor, Au
 
   @Override
   public Set<String> listUsers() throws AccumuloSecurityException {
-    Set<String> userList = new TreeSet<String>();
+    Set<String> userList = new TreeSet<>();
     for (String user : new String[] {getSysUserName(), getTabUserName()}) {
       if (userExists(user))
         userList.add(user);
@@ -488,7 +488,7 @@ public class WalkingSecurity extends SecurityOperation implements Authorizor, Au
 
   @Override
   public Set<Class<? extends AuthenticationToken>> getSupportedTokenTypes() {
-    Set<Class<? extends AuthenticationToken>> cs = new HashSet<Class<? extends AuthenticationToken>>();
+    Set<Class<? extends AuthenticationToken>> cs = new HashSet<>();
     cs.add(PasswordToken.class);
     return cs;
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/main/java/org/apache/accumulo/test/randomwalk/sequential/BatchVerify.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/sequential/BatchVerify.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/sequential/BatchVerify.java
index 9ae1bf7..074cbcf 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/sequential/BatchVerify.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/sequential/BatchVerify.java
@@ -55,7 +55,7 @@ public class BatchVerify extends Test {
 
     try {
       int count = 0;
-      List<Range> ranges = new ArrayList<Range>();
+      List<Range> ranges = new ArrayList<>();
       while (count < numVerify) {
         long rangeStart = rand.nextInt((int) numWrites);
         long rangeEnd = rangeStart + 99;
@@ -81,7 +81,7 @@ public class BatchVerify extends Test {
 
       scanner.setRanges(ranges);
 
-      List<Key> keys = new ArrayList<Key>();
+      List<Key> keys = new ArrayList<>();
       for (Entry<Key,Value> entry : scanner) {
         keys.add(entry.getKey());
       }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/CompactFilter.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/CompactFilter.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/CompactFilter.java
index a73b311..42dc9dc 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/CompactFilter.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/CompactFilter.java
@@ -49,7 +49,7 @@ public class CompactFilter extends Test {
     String deleteChar = Integer.toHexString(rand.nextInt(16)) + "";
     String regex = "^[0-9a-f][" + deleteChar + "].*";
 
-    ArrayList<IteratorSetting> documentFilters = new ArrayList<IteratorSetting>();
+    ArrayList<IteratorSetting> documentFilters = new ArrayList<>();
 
     IteratorSetting is = new IteratorSetting(21, "ii", RegExFilter.class);
     RegExFilter.setRegexs(is, regex, null, null, null, false);
@@ -61,7 +61,7 @@ public class CompactFilter extends Test {
     long t2 = System.currentTimeMillis();
     long t3 = t2 - t1;
 
-    ArrayList<IteratorSetting> indexFilters = new ArrayList<IteratorSetting>();
+    ArrayList<IteratorSetting> indexFilters = new ArrayList<>();
 
     is = new IteratorSetting(21, RegExFilter.class);
     RegExFilter.setRegexs(is, null, null, regex, null, false);
@@ -76,7 +76,7 @@ public class CompactFilter extends Test {
 
     BatchScanner bscanner = env.getConnector().createBatchScanner(docTableName, new Authorizations(), 10);
 
-    List<Range> ranges = new ArrayList<Range>();
+    List<Range> ranges = new ArrayList<>();
     for (int i = 0; i < 16; i++) {
       ranges.add(Range.prefix(new Text(Integer.toHexString(i) + "" + deleteChar)));
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/DeleteSomeDocs.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/DeleteSomeDocs.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/DeleteSomeDocs.java
index f7fb1df..08fcb4f 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/DeleteSomeDocs.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/DeleteSomeDocs.java
@@ -43,7 +43,7 @@ public class DeleteSomeDocs extends Test {
     String indexTableName = (String) state.get("indexTableName");
     String dataTableName = (String) state.get("docTableName");
 
-    ArrayList<String> patterns = new ArrayList<String>();
+    ArrayList<String> patterns = new ArrayList<>();
 
     for (Object key : props.keySet())
       if (key instanceof String && ((String) key).startsWith("pattern"))

http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/DeleteWord.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/DeleteWord.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/DeleteWord.java
index 28b1899..9de0240 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/DeleteWord.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/DeleteWord.java
@@ -54,7 +54,7 @@ public class DeleteWord extends Test {
     Scanner scanner = env.getConnector().createScanner(indexTableName, Authorizations.EMPTY);
     scanner.fetchColumnFamily(new Text(wordToDelete));
 
-    ArrayList<Range> documentsToDelete = new ArrayList<Range>();
+    ArrayList<Range> documentsToDelete = new ArrayList<>();
 
     for (Entry<Key,Value> entry : scanner)
       documentsToDelete.add(new Range(entry.getKey().getColumnQualifier()));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/ExportIndex.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/ExportIndex.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/ExportIndex.java
index ca273ac..5b57ace 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/ExportIndex.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/ExportIndex.java
@@ -89,17 +89,17 @@ public class ExportIndex extends Test {
     fs.delete(new Path(exportDir), true);
     fs.delete(new Path(copyDir), true);
 
-    HashSet<Text> splits1 = new HashSet<Text>(env.getConnector().tableOperations().listSplits(indexTableName));
-    HashSet<Text> splits2 = new HashSet<Text>(env.getConnector().tableOperations().listSplits(tmpIndexTableName));
+    HashSet<Text> splits1 = new HashSet<>(env.getConnector().tableOperations().listSplits(indexTableName));
+    HashSet<Text> splits2 = new HashSet<>(env.getConnector().tableOperations().listSplits(tmpIndexTableName));
 
     if (!splits1.equals(splits2))
       throw new Exception("Splits not equals " + indexTableName + " " + tmpIndexTableName);
 
-    HashMap<String,String> props1 = new HashMap<String,String>();
+    HashMap<String,String> props1 = new HashMap<>();
     for (Entry<String,String> entry : env.getConnector().tableOperations().getProperties(indexTableName))
       props1.put(entry.getKey(), entry.getValue());
 
-    HashMap<String,String> props2 = new HashMap<String,String>();
+    HashMap<String,String> props2 = new HashMap<>();
     for (Entry<String,String> entry : env.getConnector().tableOperations().getProperties(tmpIndexTableName))
       props2.put(entry.getKey(), entry.getValue());
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/Grep.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/Grep.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/Grep.java
index d5c5e5d..7409ea7 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/Grep.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/Grep.java
@@ -59,7 +59,7 @@ public class Grep extends Test {
     bs.addScanIterator(ii);
     bs.setRanges(Collections.singleton(new Range()));
 
-    HashSet<Text> documentsFoundInIndex = new HashSet<Text>();
+    HashSet<Text> documentsFoundInIndex = new HashSet<>();
 
     for (Entry<Key,Value> entry2 : bs) {
       documentsFoundInIndex.add(entry2.getKey().getColumnQualifier());
@@ -77,7 +77,7 @@ public class Grep extends Test {
 
     bs.setRanges(Collections.singleton(new Range()));
 
-    HashSet<Text> documentsFoundByGrep = new HashSet<Text>();
+    HashSet<Text> documentsFoundByGrep = new HashSet<>();
 
     for (Entry<Key,Value> entry2 : bs) {
       documentsFoundByGrep.add(entry2.getKey().getRow());

http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/Insert.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/Insert.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/Insert.java
index 4fdbbb9..8482a59 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/Insert.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/Insert.java
@@ -115,7 +115,7 @@ public class Insert extends Test {
 
     Mutation m = new Mutation(partition);
 
-    HashSet<String> tokensSeen = new HashSet<String>();
+    HashSet<String> tokensSeen = new HashSet<>();
 
     for (String token : tokens) {
       token = token.toLowerCase();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/Merge.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/Merge.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/Merge.java
index 36a70f6..910e64c 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/Merge.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/Merge.java
@@ -33,7 +33,7 @@ public class Merge extends Test {
     String indexTableName = (String) state.get("indexTableName");
 
     Collection<Text> splits = env.getConnector().tableOperations().listSplits(indexTableName);
-    SortedSet<Text> splitSet = new TreeSet<Text>(splits);
+    SortedSet<Text> splitSet = new TreeSet<>(splits);
     log.debug("merging " + indexTableName);
     env.getConnector().tableOperations().merge(indexTableName, null, null);
     org.apache.accumulo.core.util.Merge merge = new org.apache.accumulo.core.util.Merge();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/Search.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/Search.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/Search.java
index 899ec42..bccb280 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/Search.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/Search.java
@@ -57,7 +57,7 @@ public class Search extends Test {
     if (numSearchTerms < 2)
       numSearchTerms = 2;
 
-    HashSet<String> searchTerms = new HashSet<String>();
+    HashSet<String> searchTerms = new HashSet<>();
     while (searchTerms.size() < numSearchTerms)
       searchTerms.add(tokens[rand.nextInt(tokens.length)]);
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/ShardFixture.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/ShardFixture.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/ShardFixture.java
index 63500a0..99e3a61 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/ShardFixture.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/ShardFixture.java
@@ -39,7 +39,7 @@ public class ShardFixture extends Fixture {
     long distance = max / numTablets;
     long split = distance;
 
-    TreeSet<Text> splits = new TreeSet<Text>();
+    TreeSet<Text> splits = new TreeSet<>();
 
     for (int i = 0; i < numSplits; i++) {
       splits.add(new Text(String.format(format, split)));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/main/java/org/apache/accumulo/test/replication/merkle/MerkleTree.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/replication/merkle/MerkleTree.java b/test/src/main/java/org/apache/accumulo/test/replication/merkle/MerkleTree.java
index 03eb466..9a4b127 100644
--- a/test/src/main/java/org/apache/accumulo/test/replication/merkle/MerkleTree.java
+++ b/test/src/main/java/org/apache/accumulo/test/replication/merkle/MerkleTree.java
@@ -67,7 +67,7 @@ public class MerkleTree {
 
       // At the same level
       if (left.getLevel() == right.getLevel()) {
-        return new Pair<Integer,Integer>(i, j);
+        return new Pair<>(i, j);
       }
 
       // Peek to see if we have another element
@@ -77,14 +77,14 @@ public class MerkleTree {
         j++;
       } else {
         // Otherwise, the last two elements must be paired
-        return new Pair<Integer,Integer>(i, j);
+        return new Pair<>(i, j);
       }
     }
 
     if (2 < nodes.size()) {
       throw new IllegalStateException("Should not have exited loop without pairing two elements when we have at least 3 nodes");
     } else if (2 == nodes.size()) {
-      return new Pair<Integer,Integer>(0, 1);
+      return new Pair<>(0, 1);
     } else {
       throw new IllegalStateException("Must have at least two nodes to pair");
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/main/java/org/apache/accumulo/test/replication/merkle/MerkleTreeNode.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/replication/merkle/MerkleTreeNode.java b/test/src/main/java/org/apache/accumulo/test/replication/merkle/MerkleTreeNode.java
index 33ec056..f392f12 100644
--- a/test/src/main/java/org/apache/accumulo/test/replication/merkle/MerkleTreeNode.java
+++ b/test/src/main/java/org/apache/accumulo/test/replication/merkle/MerkleTreeNode.java
@@ -58,7 +58,7 @@ public class MerkleTreeNode {
 
   public MerkleTreeNode(List<MerkleTreeNode> children, String digestAlgorithm) throws NoSuchAlgorithmException {
     level = 0;
-    this.children = new ArrayList<Range>(children.size());
+    this.children = new ArrayList<>(children.size());
     MessageDigest digest = MessageDigest.getInstance(digestAlgorithm);
 
     Range childrenRange = null;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/main/java/org/apache/accumulo/test/replication/merkle/cli/ComputeRootHash.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/replication/merkle/cli/ComputeRootHash.java b/test/src/main/java/org/apache/accumulo/test/replication/merkle/cli/ComputeRootHash.java
index cb2761b..56a5931 100644
--- a/test/src/main/java/org/apache/accumulo/test/replication/merkle/cli/ComputeRootHash.java
+++ b/test/src/main/java/org/apache/accumulo/test/replication/merkle/cli/ComputeRootHash.java
@@ -76,7 +76,7 @@ public class ComputeRootHash {
   protected ArrayList<MerkleTreeNode> getLeaves(Connector conn, String tableName) throws TableNotFoundException {
     // TODO make this a bit more resilient to very large merkle trees by lazily reading more data from the table when necessary
     final Scanner s = conn.createScanner(tableName, Authorizations.EMPTY);
-    final ArrayList<MerkleTreeNode> leaves = new ArrayList<MerkleTreeNode>();
+    final ArrayList<MerkleTreeNode> leaves = new ArrayList<>();
 
     for (Entry<Key,Value> entry : s) {
       Range range = RangeSerialization.toRange(entry.getKey());

http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/main/java/org/apache/accumulo/test/replication/merkle/cli/GenerateHashes.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/replication/merkle/cli/GenerateHashes.java b/test/src/main/java/org/apache/accumulo/test/replication/merkle/cli/GenerateHashes.java
index b1ef6c3..72da0ae 100644
--- a/test/src/main/java/org/apache/accumulo/test/replication/merkle/cli/GenerateHashes.java
+++ b/test/src/main/java/org/apache/accumulo/test/replication/merkle/cli/GenerateHashes.java
@@ -129,7 +129,7 @@ public class GenerateHashes {
       return endRowsToRanges(endRows);
     } else {
       log.info("Using provided split points");
-      ArrayList<Text> splits = new ArrayList<Text>();
+      ArrayList<Text> splits = new ArrayList<>();
 
       String line;
       java.util.Scanner file = new java.util.Scanner(new File(splitsFile), UTF_8.name());
@@ -249,7 +249,7 @@ public class GenerateHashes {
   }
 
   public TreeSet<Range> endRowsToRanges(Collection<Text> endRows) {
-    ArrayList<Text> sortedEndRows = new ArrayList<Text>(endRows);
+    ArrayList<Text> sortedEndRows = new ArrayList<>(endRows);
     Collections.sort(sortedEndRows);
 
     Text prevEndRow = null;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/main/java/org/apache/accumulo/test/scalability/ScaleTest.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/scalability/ScaleTest.java b/test/src/main/java/org/apache/accumulo/test/scalability/ScaleTest.java
index f908296..2f82bfa 100644
--- a/test/src/main/java/org/apache/accumulo/test/scalability/ScaleTest.java
+++ b/test/src/main/java/org/apache/accumulo/test/scalability/ScaleTest.java
@@ -70,7 +70,7 @@ public abstract class ScaleTest {
     int numSplits = numTabletServers - 1;
     long distance = (Long.MAX_VALUE / numTabletServers) + 1;
     long split = distance;
-    TreeSet<Text> keys = new TreeSet<Text>();
+    TreeSet<Text> keys = new TreeSet<>();
     for (int i = 0; i < numSplits; i++) {
       keys.add(new Text(String.format("%016x", split)));
       split += distance;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/test/java/org/apache/accumulo/harness/conf/AccumuloClusterPropertyConfiguration.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/harness/conf/AccumuloClusterPropertyConfiguration.java b/test/src/test/java/org/apache/accumulo/harness/conf/AccumuloClusterPropertyConfiguration.java
index 4e04db9..779c111 100644
--- a/test/src/test/java/org/apache/accumulo/harness/conf/AccumuloClusterPropertyConfiguration.java
+++ b/test/src/test/java/org/apache/accumulo/harness/conf/AccumuloClusterPropertyConfiguration.java
@@ -139,7 +139,7 @@ public abstract class AccumuloClusterPropertyConfiguration implements AccumuloCl
         throw new IllegalArgumentException("Unknown ClusterType: " + type);
     }
 
-    Map<String,String> configuration = new HashMap<String,String>();
+    Map<String,String> configuration = new HashMap<>();
 
     Properties systemProperties = System.getProperties();
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/test/java/org/apache/accumulo/test/AssignmentThreadsIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/AssignmentThreadsIT.java b/test/src/test/java/org/apache/accumulo/test/AssignmentThreadsIT.java
index fd7ea6c..133cabd 100644
--- a/test/src/test/java/org/apache/accumulo/test/AssignmentThreadsIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/AssignmentThreadsIT.java
@@ -63,7 +63,7 @@ public class AssignmentThreadsIT extends ConfigurableMacIT {
     Connector c = getConnector();
     log.info("Creating table");
     c.tableOperations().create(tableName);
-    SortedSet<Text> splits = new TreeSet<Text>();
+    SortedSet<Text> splits = new TreeSet<>();
     for (int i = 0; i < 1000; i++) {
       splits.add(new Text(randomHex(8)));
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/test/java/org/apache/accumulo/test/AuditMessageIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/AuditMessageIT.java b/test/src/test/java/org/apache/accumulo/test/AuditMessageIT.java
index 268965f..479c781 100644
--- a/test/src/test/java/org/apache/accumulo/test/AuditMessageIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/AuditMessageIT.java
@@ -94,7 +94,7 @@ public class AuditMessageIT extends ConfigurableMacIT {
   private Connector conn;
 
   private static ArrayList<String> findAuditMessage(ArrayList<String> input, String pattern) {
-    ArrayList<String> result = new ArrayList<String>();
+    ArrayList<String> result = new ArrayList<>();
     for (String s : input) {
       if (s.matches(".*" + pattern + ".*"))
         result.add(s);
@@ -125,7 +125,7 @@ public class AuditMessageIT extends ConfigurableMacIT {
     // Grab the audit messages
     System.out.println("Start of captured audit messages for step " + stepName);
 
-    ArrayList<String> result = new ArrayList<String>();
+    ArrayList<String> result = new ArrayList<>();
     File[] files = getCluster().getConfig().getLogDir().listFiles();
     assertNotNull(files);
     for (File file : files) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/test/java/org/apache/accumulo/test/BadDeleteMarkersCreatedIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/BadDeleteMarkersCreatedIT.java b/test/src/test/java/org/apache/accumulo/test/BadDeleteMarkersCreatedIT.java
index 25337b2..2e48b4c 100644
--- a/test/src/test/java/org/apache/accumulo/test/BadDeleteMarkersCreatedIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/BadDeleteMarkersCreatedIT.java
@@ -147,7 +147,7 @@ public class BadDeleteMarkersCreatedIT extends AccumuloClusterIT {
     Assert.assertNotNull("Expected to find a tableId", tableId);
 
     // add some splits
-    SortedSet<Text> splits = new TreeSet<Text>();
+    SortedSet<Text> splits = new TreeSet<>();
     for (int i = 0; i < 10; i++) {
       splits.add(new Text("" + i));
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/test/java/org/apache/accumulo/test/BalanceFasterIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/BalanceFasterIT.java b/test/src/test/java/org/apache/accumulo/test/BalanceFasterIT.java
index 2cc5d34..4d5b77a 100644
--- a/test/src/test/java/org/apache/accumulo/test/BalanceFasterIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/BalanceFasterIT.java
@@ -53,7 +53,7 @@ public class BalanceFasterIT extends ConfigurableMacIT {
     String tableName = getUniqueNames(1)[0];
     Connector conn = getConnector();
     conn.tableOperations().create(tableName);
-    SortedSet<Text> splits = new TreeSet<Text>();
+    SortedSet<Text> splits = new TreeSet<>();
     for (int i = 0; i < 1000; i++) {
       splits.add(new Text("" + i));
     }
@@ -64,7 +64,7 @@ public class BalanceFasterIT extends ConfigurableMacIT {
     Scanner s = conn.createScanner(MetadataTable.NAME, Authorizations.EMPTY);
     s.fetchColumnFamily(MetadataSchema.TabletsSection.CurrentLocationColumnFamily.NAME);
     s.setRange(MetadataSchema.TabletsSection.getRange());
-    Map<String,Integer> counts = new HashMap<String,Integer>();
+    Map<String,Integer> counts = new HashMap<>();
     while (true) {
       int total = 0;
       counts.clear();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/test/java/org/apache/accumulo/test/BalanceIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/BalanceIT.java b/test/src/test/java/org/apache/accumulo/test/BalanceIT.java
index f793925..7604166 100644
--- a/test/src/test/java/org/apache/accumulo/test/BalanceIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/BalanceIT.java
@@ -32,7 +32,7 @@ public class BalanceIT extends ConfigurableMacIT {
     Connector c = getConnector();
     System.out.println("Creating table");
     c.tableOperations().create(tableName);
-    SortedSet<Text> splits = new TreeSet<Text>();
+    SortedSet<Text> splits = new TreeSet<>();
     for (int i = 0; i < 10; i++) {
       splits.add(new Text("" + i));
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/test/java/org/apache/accumulo/test/ConditionalWriterIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/ConditionalWriterIT.java b/test/src/test/java/org/apache/accumulo/test/ConditionalWriterIT.java
index ab6a1dd..87f813a 100644
--- a/test/src/test/java/org/apache/accumulo/test/ConditionalWriterIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/ConditionalWriterIT.java
@@ -520,7 +520,7 @@ public class ConditionalWriterIT extends AccumuloClusterIT {
     cm5.put("count2", "comments", "1");
 
     Iterator<Result> results = cw.write(Arrays.asList(cm3, cm4, cm5).iterator());
-    Map<String,Status> actual = new HashMap<String,Status>();
+    Map<String,Status> actual = new HashMap<>();
 
     while (results.hasNext()) {
       Result result = results.next();
@@ -529,7 +529,7 @@ public class ConditionalWriterIT extends AccumuloClusterIT {
       actual.put(k, result.getStatus());
     }
 
-    Map<String,Status> expected = new HashMap<String,Status>();
+    Map<String,Status> expected = new HashMap<>();
     expected.put("ACCUMULO-1000", Status.ACCEPTED);
     expected.put("ACCUMULO-1001", Status.ACCEPTED);
     expected.put("ACCUMULO-1002", Status.REJECTED);
@@ -648,7 +648,7 @@ public class ConditionalWriterIT extends AccumuloClusterIT {
     cm5.put("count", "comments", "3");
 
     Iterator<Result> results = cw.write(Arrays.asList(cm3, cm4, cm5).iterator());
-    Map<String,Status> actual = new HashMap<String,Status>();
+    Map<String,Status> actual = new HashMap<>();
 
     while (results.hasNext()) {
       Result result = results.next();
@@ -659,7 +659,7 @@ public class ConditionalWriterIT extends AccumuloClusterIT {
 
     cw.close();
 
-    Map<String,Status> expected = new HashMap<String,Status>();
+    Map<String,Status> expected = new HashMap<>();
     expected.put("ACCUMULO-1000", Status.ACCEPTED);
     expected.put("ACCUMULO-1001", Status.ACCEPTED);
     expected.put("ACCUMULO-1002", Status.REJECTED);
@@ -681,7 +681,7 @@ public class ConditionalWriterIT extends AccumuloClusterIT {
 
     ColumnVisibility cvab = new ColumnVisibility("A|B");
 
-    ArrayList<ConditionalMutation> mutations = new ArrayList<ConditionalMutation>();
+    ArrayList<ConditionalMutation> mutations = new ArrayList<>();
 
     ConditionalMutation cm0 = new ConditionalMutation("99006", new Condition("tx", "seq").setVisibility(cvab));
     cm0.put("name", "last", cvab, "doe");
@@ -721,7 +721,7 @@ public class ConditionalWriterIT extends AccumuloClusterIT {
       Assert.assertEquals("1", entry.getValue().toString());
     }
 
-    TreeSet<Text> splits = new TreeSet<Text>();
+    TreeSet<Text> splits = new TreeSet<>();
     splits.add(new Text("7"));
     splits.add(new Text("3"));
     conn.tableOperations().addSplits(tableName, splits);
@@ -791,8 +791,8 @@ public class ConditionalWriterIT extends AccumuloClusterIT {
 
     int num = 100;
 
-    ArrayList<byte[]> rows = new ArrayList<byte[]>(num);
-    ArrayList<ConditionalMutation> cml = new ArrayList<ConditionalMutation>(num);
+    ArrayList<byte[]> rows = new ArrayList<>(num);
+    ArrayList<ConditionalMutation> cml = new ArrayList<>(num);
 
     Random r = new Random();
     byte[] e = new byte[0];
@@ -825,7 +825,7 @@ public class ConditionalWriterIT extends AccumuloClusterIT {
 
     Assert.assertEquals("Did not receive the expected number of results", num, count);
 
-    ArrayList<ConditionalMutation> cml2 = new ArrayList<ConditionalMutation>(num);
+    ArrayList<ConditionalMutation> cml2 = new ArrayList<>(num);
 
     for (int i = 0; i < num; i++) {
       ConditionalMutation cm = new ConditionalMutation(rows.get(i), new Condition("meta", "seq").setValue("1"));
@@ -875,7 +875,7 @@ public class ConditionalWriterIT extends AccumuloClusterIT {
         break;
     }
 
-    ArrayList<ConditionalMutation> mutations = new ArrayList<ConditionalMutation>();
+    ArrayList<ConditionalMutation> mutations = new ArrayList<>();
 
     ConditionalMutation cm0 = new ConditionalMutation("99006", new Condition("tx", "seq").setVisibility(cvaob));
     cm0.put("name+", "last", cvaob, "doe");
@@ -903,7 +903,7 @@ public class ConditionalWriterIT extends AccumuloClusterIT {
 
     ConditionalWriter cw = conn.createConditionalWriter(tableName, new ConditionalWriterConfig().setAuthorizations(new Authorizations("A")));
     Iterator<Result> results = cw.write(mutations.iterator());
-    HashSet<String> rows = new HashSet<String>();
+    HashSet<String> rows = new HashSet<>();
     while (results.hasNext()) {
       Result result = results.next();
       String row = new String(result.getMutation().getRow());
@@ -1081,8 +1081,8 @@ public class ConditionalWriterIT extends AccumuloClusterIT {
         for (int i = 0; i < 20; i++) {
           int numRows = rand.nextInt(10) + 1;
 
-          ArrayList<ByteSequence> changes = new ArrayList<ByteSequence>(numRows);
-          ArrayList<ConditionalMutation> mutations = new ArrayList<ConditionalMutation>();
+          ArrayList<ByteSequence> changes = new ArrayList<>(numRows);
+          ArrayList<ConditionalMutation> mutations = new ArrayList<>();
 
           for (int j = 0; j < numRows; j++)
             changes.add(rows.get(rand.nextInt(rows.size())));
@@ -1094,7 +1094,7 @@ public class ConditionalWriterIT extends AccumuloClusterIT {
             mutations.add(stats.toMutation());
           }
 
-          ArrayList<ByteSequence> changed = new ArrayList<ByteSequence>(numRows);
+          ArrayList<ByteSequence> changed = new ArrayList<>(numRows);
           Iterator<Result> results = cw.write(mutations.iterator());
           while (results.hasNext()) {
             Result result = results.next();
@@ -1137,18 +1137,18 @@ public class ConditionalWriterIT extends AccumuloClusterIT {
 
     ConditionalWriter cw = conn.createConditionalWriter(table, new ConditionalWriterConfig());
 
-    ArrayList<ByteSequence> rows = new ArrayList<ByteSequence>();
+    ArrayList<ByteSequence> rows = new ArrayList<>();
 
     for (int i = 0; i < 1000; i++) {
       rows.add(new ArrayByteSequence(FastFormat.toZeroPaddedString(abs(rand.nextLong()), 16, 16, new byte[0])));
     }
 
-    ArrayList<ConditionalMutation> mutations = new ArrayList<ConditionalMutation>();
+    ArrayList<ConditionalMutation> mutations = new ArrayList<>();
 
     for (ByteSequence row : rows)
       mutations.add(new Stats(row).toMutation());
 
-    ArrayList<ByteSequence> rows2 = new ArrayList<ByteSequence>();
+    ArrayList<ByteSequence> rows2 = new ArrayList<>();
     Iterator<Result> results = cw.write(mutations.iterator());
     while (results.hasNext()) {
       Result result = results.next();
@@ -1187,7 +1187,7 @@ public class ConditionalWriterIT extends AccumuloClusterIT {
   }
 
   private SortedSet<Text> nss(String... splits) {
-    TreeSet<Text> ret = new TreeSet<Text>();
+    TreeSet<Text> ret = new TreeSet<>();
     for (String split : splits)
       ret.add(new Text(split));
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/test/java/org/apache/accumulo/test/ConfigurableMajorCompactionIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/ConfigurableMajorCompactionIT.java b/test/src/test/java/org/apache/accumulo/test/ConfigurableMajorCompactionIT.java
index 2a13aed..04239e6 100644
--- a/test/src/test/java/org/apache/accumulo/test/ConfigurableMajorCompactionIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/ConfigurableMajorCompactionIT.java
@@ -53,7 +53,7 @@ public class ConfigurableMajorCompactionIT extends ConfigurableMacIT {
 
   @Override
   public void configure(MiniAccumuloConfigImpl cfg, Configuration hadoopCoreSite) {
-    Map<String,String> siteConfig = new HashMap<String,String>();
+    Map<String,String> siteConfig = new HashMap<>();
     siteConfig.put(Property.TSERV_MAJC_DELAY.getKey(), "1s");
     cfg.setSiteConfig(siteConfig);
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/test/java/org/apache/accumulo/test/CreateTableWithNewTableConfigIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/CreateTableWithNewTableConfigIT.java b/test/src/test/java/org/apache/accumulo/test/CreateTableWithNewTableConfigIT.java
index 93b36ba..ce48fc7 100644
--- a/test/src/test/java/org/apache/accumulo/test/CreateTableWithNewTableConfigIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/CreateTableWithNewTableConfigIT.java
@@ -171,7 +171,7 @@ public class CreateTableWithNewTableConfigIT extends SharedMiniClusterIT {
     log.info("Starting addCustomPropAndChangeExisting");
 
     // Create and populate initial properties map for creating table 1
-    Map<String,String> properties = new HashMap<String,String>();
+    Map<String,String> properties = new HashMap<>();
     String propertyName = Property.TABLE_SPLIT_THRESHOLD.getKey();
     String volume = "10K";
     properties.put(propertyName, volume);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/test/java/org/apache/accumulo/test/InMemoryMapIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/InMemoryMapIT.java b/test/src/test/java/org/apache/accumulo/test/InMemoryMapIT.java
index f13cd2f..2700a04 100644
--- a/test/src/test/java/org/apache/accumulo/test/InMemoryMapIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/InMemoryMapIT.java
@@ -274,7 +274,7 @@ public class InMemoryMapIT {
   private List<MemKey> getArrayOfMemKeys(InMemoryMap imm) {
     SortedKeyValueIterator<Key,Value> skvi = imm.compactionIterator();
 
-    List<MemKey> memKeys = new ArrayList<MemKey>();
+    List<MemKey> memKeys = new ArrayList<>();
     try {
       skvi.seek(new Range(), new ArrayList<ByteSequence>(), false); // everything
       while (skvi.hasTop()) {
@@ -305,7 +305,7 @@ public class InMemoryMapIT {
   }
 
   private int getUniqKVCount(List<MemKey> memKeys) {
-    List<Integer> kvCounts = new ArrayList<Integer>();
+    List<Integer> kvCounts = new ArrayList<>();
     for (MemKey m : memKeys) {
       kvCounts.add(m.getKVCount());
     }
@@ -313,7 +313,7 @@ public class InMemoryMapIT {
   }
 
   private Map<String,Set<ByteSequence>> getLocalityGroups() {
-    Map<String,Set<ByteSequence>> locgro = new HashMap<String,Set<ByteSequence>>();
+    Map<String,Set<ByteSequence>> locgro = new HashMap<>();
     locgro.put("a", newCFSet("cf", "cf2"));
     locgro.put("b", newCFSet("cf3", "cf4"));
     return locgro;
@@ -321,7 +321,7 @@ public class InMemoryMapIT {
 
   // from InMemoryMapTest
   private Set<ByteSequence> newCFSet(String... cfs) {
-    HashSet<ByteSequence> cfSet = new HashSet<ByteSequence>();
+    HashSet<ByteSequence> cfSet = new HashSet<>();
     for (String cf : cfs) {
       cfSet.add(new ArrayByteSequence(cf));
     }


Mime
View raw message