accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [18/32] accumulo git commit: ACCUMULO-4357 Remove unneeded code for readability
Date Fri, 01 Jul 2016 01:59:15 GMT
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloReloadingVFSClassLoader.java
----------------------------------------------------------------------
diff --git a/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloReloadingVFSClassLoader.java b/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloReloadingVFSClassLoader.java
index 539f9f5..6a884e9 100644
--- a/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloReloadingVFSClassLoader.java
+++ b/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloReloadingVFSClassLoader.java
@@ -56,7 +56,7 @@ public class AccumuloReloadingVFSClassLoader implements FileListener, ReloadingC
   private final boolean preDelegate;
   private final ThreadPoolExecutor executor;
   {
-    BlockingQueue<Runnable> queue = new ArrayBlockingQueue<Runnable>(2);
+    BlockingQueue<Runnable> queue = new ArrayBlockingQueue<>(2);
     ThreadFactory factory = new ThreadFactory() {
 
       @Override
@@ -140,7 +140,7 @@ public class AccumuloReloadingVFSClassLoader implements FileListener, ReloadingC
     this.parent = parent;
     this.preDelegate = preDelegate;
 
-    ArrayList<FileObject> pathsToMonitor = new ArrayList<FileObject>();
+    ArrayList<FileObject> pathsToMonitor = new ArrayList<>();
     files = AccumuloVFSClassLoader.resolve(vfs, uris, pathsToMonitor);
 
     if (preDelegate)

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloVFSClassLoader.java
----------------------------------------------------------------------
diff --git a/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloVFSClassLoader.java b/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloVFSClassLoader.java
index 8c7067f..db070ec 100644
--- a/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloVFSClassLoader.java
+++ b/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloVFSClassLoader.java
@@ -125,7 +125,7 @@ public class AccumuloVFSClassLoader {
     if (uris == null)
       return new FileObject[0];
 
-    ArrayList<FileObject> classpath = new ArrayList<FileObject>();
+    ArrayList<FileObject> classpath = new ArrayList<>();
 
     pathsToMonitor.clear();
 
@@ -281,7 +281,7 @@ public class AccumuloVFSClassLoader {
     vfs.setReplicator(new UniqueFileReplicator(cacheDir));
     vfs.setCacheStrategy(CacheStrategy.ON_RESOLVE);
     vfs.init();
-    vfsInstances.add(new WeakReference<DefaultFileSystemManager>(vfs));
+    vfsInstances.add(new WeakReference<>(vfs));
     return vfs;
   }
 
@@ -307,7 +307,7 @@ public class AccumuloVFSClassLoader {
   public static void printClassPath(Printer out) {
     try {
       ClassLoader cl = getClassLoader();
-      ArrayList<ClassLoader> classloaders = new ArrayList<ClassLoader>();
+      ArrayList<ClassLoader> classloaders = new ArrayList<>();
 
       while (cl != null) {
         classloaders.add(cl);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/start/src/main/java/org/apache/accumulo/start/classloader/vfs/ContextManager.java
----------------------------------------------------------------------
diff --git a/start/src/main/java/org/apache/accumulo/start/classloader/vfs/ContextManager.java b/start/src/main/java/org/apache/accumulo/start/classloader/vfs/ContextManager.java
index c873fa6..7145b4a 100644
--- a/start/src/main/java/org/apache/accumulo/start/classloader/vfs/ContextManager.java
+++ b/start/src/main/java/org/apache/accumulo/start/classloader/vfs/ContextManager.java
@@ -58,7 +58,7 @@ public class ContextManager {
     }
   }
 
-  private Map<String,Context> contexts = new HashMap<String,Context>();
+  private Map<String,Context> contexts = new HashMap<>();
 
   private volatile ContextsConfig config;
   private FileSystemManager vfs;
@@ -197,7 +197,7 @@ public class ContextManager {
     // the set of currently configured contexts. We will close the contexts that are
     // no longer in the configuration.
     synchronized (this) {
-      unused = new HashMap<String,Context>(contexts);
+      unused = new HashMap<>(contexts);
       unused.keySet().removeAll(configuredContexts);
       contexts.keySet().removeAll(unused.keySet());
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/harness/conf/AccumuloClusterPropertyConfiguration.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/harness/conf/AccumuloClusterPropertyConfiguration.java b/test/src/main/java/org/apache/accumulo/harness/conf/AccumuloClusterPropertyConfiguration.java
index cedb4d0..5062384 100644
--- a/test/src/main/java/org/apache/accumulo/harness/conf/AccumuloClusterPropertyConfiguration.java
+++ b/test/src/main/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/b102e760/test/src/main/java/org/apache/accumulo/test/AssignmentThreadsIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/AssignmentThreadsIT.java b/test/src/main/java/org/apache/accumulo/test/AssignmentThreadsIT.java
index 48955f8..7253e45 100644
--- a/test/src/main/java/org/apache/accumulo/test/AssignmentThreadsIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/AssignmentThreadsIT.java
@@ -67,7 +67,7 @@ public class AssignmentThreadsIT extends ConfigurableMacBase {
     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/b102e760/test/src/main/java/org/apache/accumulo/test/AuditMessageIT.java
----------------------------------------------------------------------
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 ac97f00..1f47793 100644
--- a/test/src/main/java/org/apache/accumulo/test/AuditMessageIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/AuditMessageIT.java
@@ -94,7 +94,7 @@ public class AuditMessageIT extends ConfigurableMacBase {
   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 ConfigurableMacBase {
     // 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/b102e760/test/src/main/java/org/apache/accumulo/test/BadDeleteMarkersCreatedIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/BadDeleteMarkersCreatedIT.java b/test/src/main/java/org/apache/accumulo/test/BadDeleteMarkersCreatedIT.java
index 5dfc136..aa1ad54 100644
--- a/test/src/main/java/org/apache/accumulo/test/BadDeleteMarkersCreatedIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/BadDeleteMarkersCreatedIT.java
@@ -149,7 +149,7 @@ public class BadDeleteMarkersCreatedIT extends AccumuloClusterHarness {
     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/b102e760/test/src/main/java/org/apache/accumulo/test/BalanceFasterIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/BalanceFasterIT.java b/test/src/main/java/org/apache/accumulo/test/BalanceFasterIT.java
index 15a19a3..327b42b 100644
--- a/test/src/main/java/org/apache/accumulo/test/BalanceFasterIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/BalanceFasterIT.java
@@ -65,7 +65,7 @@ public class BalanceFasterIT extends ConfigurableMacBase {
     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));
     }
@@ -76,7 +76,7 @@ public class BalanceFasterIT extends ConfigurableMacBase {
     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/b102e760/test/src/main/java/org/apache/accumulo/test/BalanceIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/BalanceIT.java b/test/src/main/java/org/apache/accumulo/test/BalanceIT.java
index 605ac94..fa1d857 100644
--- a/test/src/main/java/org/apache/accumulo/test/BalanceIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/BalanceIT.java
@@ -40,7 +40,7 @@ public class BalanceIT extends AccumuloClusterHarness {
     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 < 10; i++) {
       splits.add(new Text("" + i));
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/BalanceWithOfflineTableIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/BalanceWithOfflineTableIT.java b/test/src/main/java/org/apache/accumulo/test/BalanceWithOfflineTableIT.java
index 9acefc4..9dad4e9 100644
--- a/test/src/main/java/org/apache/accumulo/test/BalanceWithOfflineTableIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/BalanceWithOfflineTableIT.java
@@ -50,7 +50,7 @@ public class BalanceWithOfflineTableIT extends ConfigurableMacBase {
     final Connector c = getConnector();
     log.info("Creating table " + tableName);
     c.tableOperations().create(tableName);
-    ;
+
     final SortedSet<Text> splits = new TreeSet<>();
     for (String split : "a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z".split(",")) {
       splits.add(new Text(split));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/BatchWriterIterator.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/BatchWriterIterator.java b/test/src/main/java/org/apache/accumulo/test/BatchWriterIterator.java
index 289bac0..6a6604f 100644
--- a/test/src/main/java/org/apache/accumulo/test/BatchWriterIterator.java
+++ b/test/src/main/java/org/apache/accumulo/test/BatchWriterIterator.java
@@ -197,7 +197,7 @@ public class BatchWriterIterator extends WrappingIterator {
           if (clearCacheAfterFirstWrite)
             TabletLocator.clearLocators();
           if (splitAfterFirstWrite) {
-            SortedSet<Text> splits = new TreeSet<Text>();
+            SortedSet<Text> splits = new TreeSet<>();
             splits.add(new Text(row));
             connector.tableOperations().addSplits(tableName, splits);
           }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/BulkImportDirectory.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/BulkImportDirectory.java b/test/src/main/java/org/apache/accumulo/test/BulkImportDirectory.java
index a0cc26e..4cbba8e 100644
--- a/test/src/main/java/org/apache/accumulo/test/BulkImportDirectory.java
+++ b/test/src/main/java/org/apache/accumulo/test/BulkImportDirectory.java
@@ -41,7 +41,7 @@ public class BulkImportDirectory {
     @Parameter(names = {"-f", "--failures"}, description = "directory to copy failures into: will be deleted before the bulk import")
     String failures = null;
     @Parameter(description = "<username> <password> <tablename> <sourcedir> <failuredir>")
-    List<String> args = new ArrayList<String>();
+    List<String> args = new ArrayList<>();
   }
 
   public static void main(String[] args) throws IOException, AccumuloException, AccumuloSecurityException, TableNotFoundException {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/BulkImportMonitoringIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/BulkImportMonitoringIT.java b/test/src/main/java/org/apache/accumulo/test/BulkImportMonitoringIT.java
index 018717a..9c7abf3 100644
--- a/test/src/main/java/org/apache/accumulo/test/BulkImportMonitoringIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/BulkImportMonitoringIT.java
@@ -107,7 +107,7 @@ public class BulkImportMonitoringIT extends ConfigurableMacBase {
             }
             writer.close();
           }
-          return new Pair<String,String>(files.toString(), bulkFailures.toString());
+          return new Pair<>(files.toString(), bulkFailures.toString());
         }
       }));
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/ClientSideIteratorIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/ClientSideIteratorIT.java b/test/src/main/java/org/apache/accumulo/test/ClientSideIteratorIT.java
index 11fb6b0..180eed1 100644
--- a/test/src/main/java/org/apache/accumulo/test/ClientSideIteratorIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/ClientSideIteratorIT.java
@@ -49,15 +49,15 @@ public class ClientSideIteratorIT extends AccumuloClusterHarness {
 
   @Before
   public void setupData() {
-    resultSet1 = new ArrayList<Key>();
+    resultSet1 = new ArrayList<>();
     resultSet1.add(new Key("row1", "colf", "colq", 4l));
     resultSet1.add(new Key("row1", "colf", "colq", 3l));
-    resultSet2 = new ArrayList<Key>();
+    resultSet2 = new ArrayList<>();
     resultSet2.add(new Key("row1", "colf", "colq", 4l));
     resultSet2.add(new Key("row1", "colf", "colq", 3l));
     resultSet2.add(new Key("row1", "colf", "colq", 2l));
     resultSet2.add(new Key("row1", "colf", "colq", 1l));
-    resultSet3 = new ArrayList<Key>();
+    resultSet3 = new ArrayList<>();
     resultSet3.add(new Key("part1", "", "doc2"));
     resultSet3.add(new Key("part2", "", "DOC2"));
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/CloneIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/CloneIT.java b/test/src/main/java/org/apache/accumulo/test/CloneIT.java
index cd59ce4..713be3b 100644
--- a/test/src/main/java/org/apache/accumulo/test/CloneIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/CloneIT.java
@@ -113,7 +113,7 @@ public class CloneIT extends AccumuloClusterHarness {
     Scanner scanner = conn.createScanner(tableName, Authorizations.EMPTY);
     scanner.setRange(new KeyExtent("1", null, null).toMetadataRange());
 
-    HashSet<String> files = new HashSet<String>();
+    HashSet<String> files = new HashSet<>();
 
     for (Entry<Key,Value> entry : scanner) {
       if (entry.getKey().getColumnFamily().equals(DataFileColumnFamily.NAME))
@@ -154,7 +154,7 @@ public class CloneIT extends AccumuloClusterHarness {
     Scanner scanner = conn.createScanner(tableName, Authorizations.EMPTY);
     scanner.setRange(new KeyExtent("1", null, null).toMetadataRange());
 
-    HashSet<String> files = new HashSet<String>();
+    HashSet<String> files = new HashSet<>();
 
     int count = 0;
     for (Entry<Key,Value> entry : scanner) {
@@ -204,7 +204,7 @@ public class CloneIT extends AccumuloClusterHarness {
     Scanner scanner = conn.createScanner(tableName, Authorizations.EMPTY);
     scanner.setRange(new KeyExtent("1", null, null).toMetadataRange());
 
-    HashSet<String> files = new HashSet<String>();
+    HashSet<String> files = new HashSet<>();
 
     int count = 0;
 
@@ -274,7 +274,7 @@ public class CloneIT extends AccumuloClusterHarness {
     Scanner scanner = conn.createScanner(tableName, Authorizations.EMPTY);
     scanner.setRange(new KeyExtent("1", null, null).toMetadataRange());
 
-    HashSet<String> files = new HashSet<String>();
+    HashSet<String> files = new HashSet<>();
 
     int count = 0;
     for (Entry<Key,Value> entry : scanner) {
@@ -339,7 +339,7 @@ public class CloneIT extends AccumuloClusterHarness {
     Scanner scanner = conn.createScanner(tableName, Authorizations.EMPTY);
     scanner.setRange(new KeyExtent("1", null, null).toMetadataRange());
 
-    HashSet<String> files = new HashSet<String>();
+    HashSet<String> files = new HashSet<>();
 
     int count = 0;
     for (Entry<Key,Value> entry : scanner) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/ConditionalWriterIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/ConditionalWriterIT.java b/test/src/main/java/org/apache/accumulo/test/ConditionalWriterIT.java
index a3eed9f..f0b46b5 100644
--- a/test/src/main/java/org/apache/accumulo/test/ConditionalWriterIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/ConditionalWriterIT.java
@@ -520,7 +520,7 @@ public class ConditionalWriterIT extends AccumuloClusterHarness {
       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 AccumuloClusterHarness {
         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);
@@ -647,7 +647,7 @@ public class ConditionalWriterIT extends AccumuloClusterHarness {
       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();
@@ -656,7 +656,7 @@ public class ConditionalWriterIT extends AccumuloClusterHarness {
         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);
@@ -677,7 +677,7 @@ public class ConditionalWriterIT extends AccumuloClusterHarness {
 
     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");
@@ -717,7 +717,7 @@ public class ConditionalWriterIT extends AccumuloClusterHarness {
         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);
@@ -786,8 +786,8 @@ public class ConditionalWriterIT extends AccumuloClusterHarness {
 
     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];
@@ -820,7 +820,7 @@ public class ConditionalWriterIT extends AccumuloClusterHarness {
 
       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"));
@@ -869,7 +869,7 @@ public class ConditionalWriterIT extends AccumuloClusterHarness {
         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");
@@ -897,7 +897,7 @@ public class ConditionalWriterIT extends AccumuloClusterHarness {
 
     try (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());
@@ -1071,8 +1071,8 @@ public class ConditionalWriterIT extends AccumuloClusterHarness {
         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())));
@@ -1084,7 +1084,7 @@ public class ConditionalWriterIT extends AccumuloClusterHarness {
             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();
@@ -1125,18 +1125,18 @@ public class ConditionalWriterIT extends AccumuloClusterHarness {
 
     try (ConditionalWriter cw = conn.createConditionalWriter(tableName, 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();
@@ -1177,7 +1177,7 @@ public class ConditionalWriterIT extends AccumuloClusterHarness {
   }
 
   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/b102e760/test/src/main/java/org/apache/accumulo/test/ConfigurableMajorCompactionIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/ConfigurableMajorCompactionIT.java b/test/src/main/java/org/apache/accumulo/test/ConfigurableMajorCompactionIT.java
index bc45dda..20979af 100644
--- a/test/src/main/java/org/apache/accumulo/test/ConfigurableMajorCompactionIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/ConfigurableMajorCompactionIT.java
@@ -53,7 +53,7 @@ public class ConfigurableMajorCompactionIT extends ConfigurableMacBase {
 
   @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/b102e760/test/src/main/java/org/apache/accumulo/test/CreateTableWithNewTableConfigIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/CreateTableWithNewTableConfigIT.java b/test/src/main/java/org/apache/accumulo/test/CreateTableWithNewTableConfigIT.java
index 1aa27d5..a78b583 100644
--- a/test/src/main/java/org/apache/accumulo/test/CreateTableWithNewTableConfigIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/CreateTableWithNewTableConfigIT.java
@@ -159,7 +159,7 @@ public class CreateTableWithNewTableConfigIT extends SharedMiniClusterBase {
     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/b102e760/test/src/main/java/org/apache/accumulo/test/FairVolumeChooser.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/FairVolumeChooser.java b/test/src/main/java/org/apache/accumulo/test/FairVolumeChooser.java
index 2325086..7c94004 100644
--- a/test/src/main/java/org/apache/accumulo/test/FairVolumeChooser.java
+++ b/test/src/main/java/org/apache/accumulo/test/FairVolumeChooser.java
@@ -26,7 +26,7 @@ import org.apache.accumulo.server.fs.VolumeChooserEnvironment;
  */
 public class FairVolumeChooser implements VolumeChooser {
 
-  private final ConcurrentHashMap<Integer,Integer> optionLengthToLastChoice = new ConcurrentHashMap<Integer,Integer>();
+  private final ConcurrentHashMap<Integer,Integer> optionLengthToLastChoice = new ConcurrentHashMap<>();
 
   @Override
   public String choose(VolumeChooserEnvironment env, String[] options) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/FaultyConditionalWriter.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/FaultyConditionalWriter.java b/test/src/main/java/org/apache/accumulo/test/FaultyConditionalWriter.java
index adafdfb..b1a5e91 100644
--- a/test/src/main/java/org/apache/accumulo/test/FaultyConditionalWriter.java
+++ b/test/src/main/java/org/apache/accumulo/test/FaultyConditionalWriter.java
@@ -44,8 +44,8 @@ public class FaultyConditionalWriter implements ConditionalWriter {
 
   @Override
   public Iterator<Result> write(Iterator<ConditionalMutation> mutations) {
-    ArrayList<Result> resultList = new ArrayList<Result>();
-    ArrayList<ConditionalMutation> writes = new ArrayList<ConditionalMutation>();
+    ArrayList<Result> resultList = new ArrayList<>();
+    ArrayList<ConditionalMutation> writes = new ArrayList<>();
 
     while (mutations.hasNext()) {
       ConditionalMutation cm = mutations.next();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/FindMaxIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/FindMaxIT.java b/test/src/main/java/org/apache/accumulo/test/FindMaxIT.java
index f6e68b3..96ab317 100644
--- a/test/src/main/java/org/apache/accumulo/test/FindMaxIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/FindMaxIT.java
@@ -74,7 +74,7 @@ public class FindMaxIT extends AccumuloClusterHarness {
 
     Scanner scanner = conn.createScanner(tableName, Authorizations.EMPTY);
 
-    ArrayList<Text> rows = new ArrayList<Text>();
+    ArrayList<Text> rows = new ArrayList<>();
 
     for (Entry<Key,Value> entry : scanner) {
       rows.add(entry.getKey().getRow());

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/GetFileInfoBulkIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/GetFileInfoBulkIT.java b/test/src/main/java/org/apache/accumulo/test/GetFileInfoBulkIT.java
index c3aba52..22a8cef 100644
--- a/test/src/main/java/org/apache/accumulo/test/GetFileInfoBulkIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/GetFileInfoBulkIT.java
@@ -132,7 +132,7 @@ public class GetFileInfoBulkIT extends ConfigurableMacBase {
             }
             writer.close();
           }
-          return new Pair<String,String>(files.toString(), bulkFailures.toString());
+          return new Pair<>(files.toString(), bulkFailures.toString());
         }
       }));
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/IMMLGBenchmark.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/IMMLGBenchmark.java b/test/src/main/java/org/apache/accumulo/test/IMMLGBenchmark.java
index 0f00caf..59c46ec 100644
--- a/test/src/main/java/org/apache/accumulo/test/IMMLGBenchmark.java
+++ b/test/src/main/java/org/apache/accumulo/test/IMMLGBenchmark.java
@@ -58,13 +58,13 @@ public class IMMLGBenchmark {
 
     int numlg = Integer.parseInt(args[0]);
 
-    ArrayList<byte[]> cfset = new ArrayList<byte[]>();
+    ArrayList<byte[]> cfset = new ArrayList<>();
 
     for (int i = 0; i < 32; i++) {
       cfset.add(String.format("%04x", i).getBytes());
     }
 
-    Map<String,Stat> stats = new TreeMap<String,Stat>();
+    Map<String,Stat> stats = new TreeMap<>();
 
     for (int i = 0; i < 5; i++) {
       runTest(conn, numlg, cfset, i > 1 ? stats : null);
@@ -169,9 +169,9 @@ public class IMMLGBenchmark {
       int gNum = 0;
 
       Iterator<byte[]> cfiter = cfset.iterator();
-      Map<String,Set<Text>> groups = new HashMap<String,Set<Text>>();
+      Map<String,Set<Text>> groups = new HashMap<>();
       while (cfiter.hasNext()) {
-        HashSet<Text> groupCols = new HashSet<Text>();
+        HashSet<Text> groupCols = new HashSet<>();
         for (int i = 0; i < numCF && cfiter.hasNext(); i++) {
           groupCols.add(new Text(cfiter.next()));
         }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/InMemoryMapIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/InMemoryMapIT.java b/test/src/main/java/org/apache/accumulo/test/InMemoryMapIT.java
index 299a13d..8c1bc07 100644
--- a/test/src/main/java/org/apache/accumulo/test/InMemoryMapIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/InMemoryMapIT.java
@@ -287,7 +287,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()) {
@@ -318,7 +318,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());
     }
@@ -349,7 +349,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;
@@ -357,7 +357,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));
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/InterruptibleScannersIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/InterruptibleScannersIT.java b/test/src/main/java/org/apache/accumulo/test/InterruptibleScannersIT.java
index a272bc2..bdf62a1 100644
--- a/test/src/main/java/org/apache/accumulo/test/InterruptibleScannersIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/InterruptibleScannersIT.java
@@ -67,7 +67,7 @@ public class InterruptibleScannersIT extends AccumuloClusterHarness {
           // ensure the scan is running: not perfect, the metadata tables could be scanned, too.
           String tserver = conn.instanceOperations().getTabletServers().iterator().next();
           do {
-            ArrayList<ActiveScan> scans = new ArrayList<ActiveScan>(conn.instanceOperations().getActiveScans(tserver));
+            ArrayList<ActiveScan> scans = new ArrayList<>(conn.instanceOperations().getActiveScans(tserver));
             Iterator<ActiveScan> iter = scans.iterator();
             while (iter.hasNext()) {
               ActiveScan scan = iter.next();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/LargeSplitRowIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/LargeSplitRowIT.java b/test/src/main/java/org/apache/accumulo/test/LargeSplitRowIT.java
index 479bb0e..52e331a 100644
--- a/test/src/main/java/org/apache/accumulo/test/LargeSplitRowIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/LargeSplitRowIT.java
@@ -52,7 +52,7 @@ public class LargeSplitRowIT extends ConfigurableMacBase {
   public void configure(MiniAccumuloConfigImpl cfg, Configuration hadoopCoreSite) {
     cfg.setNumTservers(1);
 
-    Map<String,String> siteConfig = new HashMap<String,String>();
+    Map<String,String> siteConfig = new HashMap<>();
     siteConfig.put(Property.TSERV_MAJC_DELAY.getKey(), "50ms");
     cfg.setSiteConfig(siteConfig);
   }
@@ -77,7 +77,7 @@ public class LargeSplitRowIT extends ConfigurableMacBase {
     batchWriter.close();
 
     // Create a split point that is too large to be an end row and fill it with all 'm'
-    SortedSet<Text> partitionKeys = new TreeSet<Text>();
+    SortedSet<Text> partitionKeys = new TreeSet<>();
     byte data[] = new byte[(int) (TableConfiguration.getMemoryInBytes(Property.TABLE_MAX_END_ROW_SIZE.getDefaultValue()) + 2)];
     for (int i = 0; i < data.length; i++) {
       data[i] = 'm';

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/LocatorIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/LocatorIT.java b/test/src/main/java/org/apache/accumulo/test/LocatorIT.java
index b7b8a48..f5caf3c 100644
--- a/test/src/main/java/org/apache/accumulo/test/LocatorIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/LocatorIT.java
@@ -101,7 +101,7 @@ public class LocatorIT extends AccumuloClusterHarness {
     ret = conn.tableOperations().locate(tableName, ranges);
     assertContains(ret, tservers, ImmutableMap.of(r1, ImmutableSet.of(t1), r2, ImmutableSet.of(t1)), ImmutableMap.of(t1, ImmutableSet.of(r1, r2)));
 
-    TreeSet<Text> splits = new TreeSet<Text>();
+    TreeSet<Text> splits = new TreeSet<>();
     splits.add(new Text("r"));
     conn.tableOperations().addSplits(tableName, splits);
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/ManySplitIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/ManySplitIT.java b/test/src/main/java/org/apache/accumulo/test/ManySplitIT.java
index cdd7223..09aa777 100644
--- a/test/src/main/java/org/apache/accumulo/test/ManySplitIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/ManySplitIT.java
@@ -63,7 +63,7 @@ public class ManySplitIT extends ConfigurableMacBase {
 
     log.info("splitting metadata table");
     tableOperations.create(tableName);
-    SortedSet<Text> splits = new TreeSet<Text>();
+    SortedSet<Text> splits = new TreeSet<>();
     for (byte b : "123456789abcde".getBytes(UTF_8)) {
       splits.add(new Text(new byte[] {'1', ';', b}));
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/MasterRepairsDualAssignmentIT.java
----------------------------------------------------------------------
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 f2ad475..4f1a44d 100644
--- a/test/src/main/java/org/apache/accumulo/test/MasterRepairsDualAssignmentIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/MasterRepairsDualAssignmentIT.java
@@ -77,14 +77,14 @@ public class MasterRepairsDualAssignmentIT extends ConfigurableMacBase {
     c.securityOperations().grantTablePermission("root", MetadataTable.NAME, TablePermission.WRITE);
     c.securityOperations().grantTablePermission("root", RootTable.NAME, TablePermission.WRITE);
     c.tableOperations().create(table);
-    SortedSet<Text> partitions = new TreeSet<Text>();
+    SortedSet<Text> partitions = new TreeSet<>();
     for (String part : "a b c d e f g h i j k l m n o p q r s t u v w x y z".split(" ")) {
       partitions.add(new Text(part));
     }
     c.tableOperations().addSplits(table, partitions);
     // scan the metadata table and get the two table location states
-    Set<TServerInstance> states = new HashSet<TServerInstance>();
-    Set<TabletLocationState> oldLocations = new HashSet<TabletLocationState>();
+    Set<TServerInstance> states = new HashSet<>();
+    Set<TabletLocationState> oldLocations = new HashSet<>();
     MetaDataStateStore store = new MetaDataStateStore(context, null);
     while (states.size() < 2) {
       UtilWaitThread.sleep(250);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/MetaSplitIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/MetaSplitIT.java b/test/src/main/java/org/apache/accumulo/test/MetaSplitIT.java
index 0bc78fb..045b291 100644
--- a/test/src/main/java/org/apache/accumulo/test/MetaSplitIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/MetaSplitIT.java
@@ -59,7 +59,7 @@ public class MetaSplitIT extends AccumuloClusterHarness {
         log.info("Existing splits on metadata table. Saving them, and applying single original split of '~'");
         metadataSplits = splits;
         conn.tableOperations().merge(MetadataTable.NAME, null, null);
-        conn.tableOperations().addSplits(MetadataTable.NAME, new TreeSet<Text>(Collections.singleton(new Text("~"))));
+        conn.tableOperations().addSplits(MetadataTable.NAME, new TreeSet<>(Collections.singleton(new Text("~"))));
       }
     }
   }
@@ -70,14 +70,14 @@ public class MetaSplitIT extends AccumuloClusterHarness {
       log.info("Restoring split on metadata table");
       Connector conn = getConnector();
       conn.tableOperations().merge(MetadataTable.NAME, null, null);
-      conn.tableOperations().addSplits(MetadataTable.NAME, new TreeSet<Text>(metadataSplits));
+      conn.tableOperations().addSplits(MetadataTable.NAME, new TreeSet<>(metadataSplits));
     }
   }
 
   @Test(expected = AccumuloException.class)
   public void testRootTableSplit() throws Exception {
     TableOperations opts = getConnector().tableOperations();
-    SortedSet<Text> splits = new TreeSet<Text>();
+    SortedSet<Text> splits = new TreeSet<>();
     splits.add(new Text("5"));
     opts.addSplits(RootTable.NAME, splits);
   }
@@ -89,7 +89,7 @@ public class MetaSplitIT extends AccumuloClusterHarness {
   }
 
   private void addSplits(TableOperations opts, String... points) throws Exception {
-    SortedSet<Text> splits = new TreeSet<Text>();
+    SortedSet<Text> splits = new TreeSet<>();
     for (String point : points) {
       splits.add(new Text(point));
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/MultiTableBatchWriterIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/MultiTableBatchWriterIT.java b/test/src/main/java/org/apache/accumulo/test/MultiTableBatchWriterIT.java
index 2b03780..d33b12c 100644
--- a/test/src/main/java/org/apache/accumulo/test/MultiTableBatchWriterIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/MultiTableBatchWriterIT.java
@@ -99,16 +99,16 @@ public class MultiTableBatchWriterIT extends AccumuloClusterHarness {
 
       mtbw.close();
 
-      Map<Entry<String,String>,String> table1Expectations = new HashMap<Entry<String,String>,String>();
+      Map<Entry<String,String>,String> table1Expectations = new HashMap<>();
       table1Expectations.put(Maps.immutableEntry("bar", "col1"), "val1");
 
-      Map<Entry<String,String>,String> table2Expectations = new HashMap<Entry<String,String>,String>();
+      Map<Entry<String,String>,String> table2Expectations = new HashMap<>();
       table2Expectations.put(Maps.immutableEntry("foo", "col1"), "val1");
       table2Expectations.put(Maps.immutableEntry("bar", "col1"), "val1");
 
       Scanner s = connector.createScanner(table1, new Authorizations());
       s.setRange(new Range());
-      Map<Entry<String,String>,String> actual = new HashMap<Entry<String,String>,String>();
+      Map<Entry<String,String>,String> actual = new HashMap<>();
       for (Entry<Key,Value> entry : s) {
         actual.put(Maps.immutableEntry(entry.getKey().getRow().toString(), entry.getKey().getColumnFamily().toString()), entry.getValue().toString());
       }
@@ -117,7 +117,7 @@ public class MultiTableBatchWriterIT extends AccumuloClusterHarness {
 
       s = connector.createScanner(table2, new Authorizations());
       s.setRange(new Range());
-      actual = new HashMap<Entry<String,String>,String>();
+      actual = new HashMap<>();
       for (Entry<Key,Value> entry : s) {
         actual.put(Maps.immutableEntry(entry.getKey().getRow().toString(), entry.getKey().getColumnFamily().toString()), entry.getValue().toString());
       }
@@ -164,7 +164,7 @@ public class MultiTableBatchWriterIT extends AccumuloClusterHarness {
 
       mtbw.close();
 
-      Map<Entry<String,String>,String> expectations = new HashMap<Entry<String,String>,String>();
+      Map<Entry<String,String>,String> expectations = new HashMap<>();
       expectations.put(Maps.immutableEntry("foo", "col1"), "val1");
       expectations.put(Maps.immutableEntry("foo", "col2"), "val2");
       expectations.put(Maps.immutableEntry("bar", "col1"), "val1");
@@ -173,7 +173,7 @@ public class MultiTableBatchWriterIT extends AccumuloClusterHarness {
       for (String table : Arrays.asList(newTable1, newTable2)) {
         Scanner s = connector.createScanner(table, new Authorizations());
         s.setRange(new Range());
-        Map<Entry<String,String>,String> actual = new HashMap<Entry<String,String>,String>();
+        Map<Entry<String,String>,String> actual = new HashMap<>();
         for (Entry<Key,Value> entry : s) {
           actual.put(Maps.immutableEntry(entry.getKey().getRow().toString(), entry.getKey().getColumnFamily().toString()), entry.getValue().toString());
         }
@@ -240,7 +240,7 @@ public class MultiTableBatchWriterIT extends AccumuloClusterHarness {
 
       mtbw.close();
 
-      Map<Entry<String,String>,String> expectations = new HashMap<Entry<String,String>,String>();
+      Map<Entry<String,String>,String> expectations = new HashMap<>();
       expectations.put(Maps.immutableEntry("foo", "col1"), "val1");
       expectations.put(Maps.immutableEntry("foo", "col2"), "val2");
       expectations.put(Maps.immutableEntry("bar", "col1"), "val1");
@@ -249,7 +249,7 @@ public class MultiTableBatchWriterIT extends AccumuloClusterHarness {
       for (String table : Arrays.asList(newTable1, newTable2)) {
         Scanner s = connector.createScanner(table, new Authorizations());
         s.setRange(new Range());
-        Map<Entry<String,String>,String> actual = new HashMap<Entry<String,String>,String>();
+        Map<Entry<String,String>,String> actual = new HashMap<>();
         for (Entry<Key,Value> entry : s) {
           actual.put(Maps.immutableEntry(entry.getKey().getRow().toString(), entry.getKey().getColumnFamily().toString()), entry.getValue().toString());
         }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/NativeMapPerformanceTest.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/NativeMapPerformanceTest.java b/test/src/main/java/org/apache/accumulo/test/NativeMapPerformanceTest.java
index b5293dc..f2a8dfe 100644
--- a/test/src/main/java/org/apache/accumulo/test/NativeMapPerformanceTest.java
+++ b/test/src/main/java/org/apache/accumulo/test/NativeMapPerformanceTest.java
@@ -61,7 +61,7 @@ public class NativeMapPerformanceTest {
     NativeMap nm = null;
 
     if (mapType.equals("SKIP_LIST"))
-      tm = new ConcurrentSkipListMap<Key,Value>();
+      tm = new ConcurrentSkipListMap<>();
     else if (mapType.equals("TREE_MAP"))
       tm = Collections.synchronizedSortedMap(new TreeMap<Key,Value>());
     else if (mapType.equals("NATIVE_MAP"))

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/NativeMapStressTest.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/NativeMapStressTest.java b/test/src/main/java/org/apache/accumulo/test/NativeMapStressTest.java
index d527a60..27c7ab9 100644
--- a/test/src/main/java/org/apache/accumulo/test/NativeMapStressTest.java
+++ b/test/src/main/java/org/apache/accumulo/test/NativeMapStressTest.java
@@ -56,7 +56,7 @@ public class NativeMapStressTest {
 
   private static void testLotsOfGetsAndScans() {
 
-    ArrayList<Thread> threads = new ArrayList<Thread>();
+    ArrayList<Thread> threads = new ArrayList<>();
 
     final int numThreads = 8;
     final int totalGets = 100000000;
@@ -182,7 +182,7 @@ public class NativeMapStressTest {
 
     System.out.println("insertsPerMapPerThread " + insertsPerMapPerThread);
 
-    ArrayList<Thread> threads = new ArrayList<Thread>();
+    ArrayList<Thread> threads = new ArrayList<>();
 
     for (int i = 0; i < numThreads; i++) {
       Runnable r = new Runnable() {
@@ -236,14 +236,14 @@ public class NativeMapStressTest {
   }
 
   private static void testLotsOfOverwrites() {
-    final Map<Integer,NativeMap> nativeMaps = new HashMap<Integer,NativeMap>();
+    final Map<Integer,NativeMap> nativeMaps = new HashMap<>();
 
     int numThreads = 8;
     final int insertsPerThread = (int) (100000000 / (double) numThreads);
     final int rowRange = 10000;
     final int numMaps = 50;
 
-    ArrayList<Thread> threads = new ArrayList<Thread>();
+    ArrayList<Thread> threads = new ArrayList<>();
 
     for (int i = 0; i < numThreads; i++) {
       Runnable r = new Runnable() {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/QueryMetadataTable.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/QueryMetadataTable.java b/test/src/main/java/org/apache/accumulo/test/QueryMetadataTable.java
index 469f4e0..4dcd39d 100644
--- a/test/src/main/java/org/apache/accumulo/test/QueryMetadataTable.java
+++ b/test/src/main/java/org/apache/accumulo/test/QueryMetadataTable.java
@@ -106,7 +106,7 @@ public class QueryMetadataTable {
     scanner.setBatchSize(scanOpts.scanBatchSize);
     Text mdrow = new Text(KeyExtent.getMetadataEntry(MetadataTable.ID, null));
 
-    HashSet<Text> rowSet = new HashSet<Text>();
+    HashSet<Text> rowSet = new HashSet<>();
 
     int count = 0;
 
@@ -127,7 +127,7 @@ public class QueryMetadataTable {
 
     System.out.printf(" %,d%n", count);
 
-    ArrayList<Text> rows = new ArrayList<Text>(rowSet);
+    ArrayList<Text> rows = new ArrayList<>(rowSet);
 
     Random r = new Random();
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/RewriteTabletDirectoriesIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/RewriteTabletDirectoriesIT.java b/test/src/main/java/org/apache/accumulo/test/RewriteTabletDirectoriesIT.java
index b3f8959..3317558 100644
--- a/test/src/main/java/org/apache/accumulo/test/RewriteTabletDirectoriesIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/RewriteTabletDirectoriesIT.java
@@ -87,7 +87,7 @@ public class RewriteTabletDirectoriesIT extends ConfigurableMacBase {
 
     // Write some data to a table and add some splits
     BatchWriter bw = c.createBatchWriter(tableName, null);
-    final SortedSet<Text> splits = new TreeSet<Text>();
+    final SortedSet<Text> splits = new TreeSet<>();
     for (String split : "a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z".split(",")) {
       splits.add(new Text(split));
       Mutation m = new Mutation(new Text(split));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/SampleIT.java
----------------------------------------------------------------------
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 196672a..15ca4a6 100644
--- a/test/src/main/java/org/apache/accumulo/test/SampleIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/SampleIT.java
@@ -123,7 +123,7 @@ public class SampleIT extends AccumuloClusterHarness {
 
     BatchWriter bw = conn.createBatchWriter(tableName, new BatchWriterConfig());
 
-    TreeMap<Key,Value> expected = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> expected = new TreeMap<>();
     String someRow = writeData(bw, SC1, expected);
     Assert.assertEquals(20, expected.size());
 
@@ -303,7 +303,7 @@ public class SampleIT extends AccumuloClusterHarness {
 
     BatchWriter bw = conn.createBatchWriter(tableName, new BatchWriterConfig());
 
-    TreeMap<Key,Value> expected = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> expected = new TreeMap<>();
     writeData(bw, SC1, expected);
 
     ArrayList<Key> keys = new ArrayList<>(expected.keySet());
@@ -389,7 +389,7 @@ public class SampleIT extends AccumuloClusterHarness {
 
     BatchWriter bw = conn.createBatchWriter(tableName, new BatchWriterConfig());
 
-    TreeMap<Key,Value> expected = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> expected = new TreeMap<>();
     writeData(bw, SC1, expected);
 
     Scanner scanner = conn.createScanner(tableName, Authorizations.EMPTY);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/ShellServerIT.java
----------------------------------------------------------------------
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 f11c34f..31481d3 100644
--- a/test/src/main/java/org/apache/accumulo/test/ShellServerIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/ShellServerIT.java
@@ -1197,8 +1197,8 @@ public class ShellServerIT extends SharedMiniClusterBase {
 
     ts.exec("deletetable -f formatter_test", true);
 
-    assertTrue(Iterables.elementsEqual(expectedDefault, new ArrayList<String>(actualDefault)));
-    assertTrue(Iterables.elementsEqual(expectedFormatted, new ArrayList<String>(actualFormatted)));
+    assertTrue(Iterables.elementsEqual(expectedDefault, new ArrayList<>(actualDefault)));
+    assertTrue(Iterables.elementsEqual(expectedFormatted, new ArrayList<>(actualFormatted)));
   }
 
   /**
@@ -1510,7 +1510,7 @@ public class ShellServerIT extends SharedMiniClusterBase {
     };
     thread.start();
 
-    List<String> scans = new ArrayList<String>();
+    List<String> scans = new ArrayList<>();
     // Try to find the active scan for about 15seconds
     for (int i = 0; i < 50 && scans.isEmpty(); i++) {
       String currentScans = ts.exec("listscans", true);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/SplitCancelsMajCIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/SplitCancelsMajCIT.java b/test/src/main/java/org/apache/accumulo/test/SplitCancelsMajCIT.java
index fc54b64..a3cfcd2 100644
--- a/test/src/main/java/org/apache/accumulo/test/SplitCancelsMajCIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/SplitCancelsMajCIT.java
@@ -63,7 +63,7 @@ public class SplitCancelsMajCIT extends SharedMiniClusterBase {
     }
     bw.flush();
     // start majc
-    final AtomicReference<Exception> ex = new AtomicReference<Exception>();
+    final AtomicReference<Exception> ex = new AtomicReference<>();
     Thread thread = new Thread() {
       @Override
       public void run() {
@@ -79,7 +79,7 @@ public class SplitCancelsMajCIT extends SharedMiniClusterBase {
     long now = System.currentTimeMillis();
     sleepUninterruptibly(10, TimeUnit.SECONDS);
     // split the table, interrupts the compaction
-    SortedSet<Text> partitionKeys = new TreeSet<Text>();
+    SortedSet<Text> partitionKeys = new TreeSet<>();
     partitionKeys.add(new Text("10"));
     c.tableOperations().addSplits(tableName, partitionKeys);
     thread.join();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/TableConfigurationUpdateIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/TableConfigurationUpdateIT.java b/test/src/main/java/org/apache/accumulo/test/TableConfigurationUpdateIT.java
index 1dd964c..d91d76e 100644
--- a/test/src/main/java/org/apache/accumulo/test/TableConfigurationUpdateIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/TableConfigurationUpdateIT.java
@@ -68,7 +68,7 @@ public class TableConfigurationUpdateIT extends AccumuloClusterHarness {
     long start = System.currentTimeMillis();
     ExecutorService svc = Executors.newFixedThreadPool(numThreads);
     CountDownLatch countDown = new CountDownLatch(numThreads);
-    ArrayList<Future<Exception>> futures = new ArrayList<Future<Exception>>(numThreads);
+    ArrayList<Future<Exception>> futures = new ArrayList<>(numThreads);
 
     for (int i = 0; i < numThreads; i++) {
       futures.add(svc.submit(new TableConfRunner(randomMax, iterations, tableConf, countDown)));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/TableOperationsIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/TableOperationsIT.java b/test/src/main/java/org/apache/accumulo/test/TableOperationsIT.java
index 4bb0735..d1a52fb 100644
--- a/test/src/main/java/org/apache/accumulo/test/TableOperationsIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/TableOperationsIT.java
@@ -141,7 +141,7 @@ public class TableOperationsIT extends AccumuloClusterHarness {
     connector.tableOperations().clone(tableName, newTable, false, null, null);
 
     // verify tables are exactly the same
-    Set<String> tables = new HashSet<String>();
+    Set<String> tables = new HashSet<>();
     tables.add(tableName);
     tables.add(newTable);
     diskUsages = connector.tableOperations().getDiskUsage(tables);
@@ -230,7 +230,7 @@ public class TableOperationsIT extends AccumuloClusterHarness {
   }
 
   private Map<String,String> propsToMap(Iterable<Map.Entry<String,String>> props) {
-    Map<String,String> map = new HashMap<String,String>();
+    Map<String,String> map = new HashMap<>();
     for (Map.Entry<String,String> prop : props) {
       map.put(prop.getKey(), prop.getValue());
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/TestBinaryRows.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/TestBinaryRows.java b/test/src/main/java/org/apache/accumulo/test/TestBinaryRows.java
index 2615ae2..a7f151d 100644
--- a/test/src/main/java/org/apache/accumulo/test/TestBinaryRows.java
+++ b/test/src/main/java/org/apache/accumulo/test/TestBinaryRows.java
@@ -185,7 +185,7 @@ public class TestBinaryRows {
       System.out.printf("rate    : %9.2f lookups/sec%n", numLookups / ((t2 - t1) / 1000.0));
 
     } else if (opts.mode.equals("split")) {
-      TreeSet<Text> splits = new TreeSet<Text>();
+      TreeSet<Text> splits = new TreeSet<>();
       int shift = (int) opts.start;
       int count = (int) opts.num;
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/TestIngest.java
----------------------------------------------------------------------
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 7d19253..de092e0 100644
--- a/test/src/main/java/org/apache/accumulo/test/TestIngest.java
+++ b/test/src/main/java/org/apache/accumulo/test/TestIngest.java
@@ -129,7 +129,7 @@ public class TestIngest {
 
     long pos = start + splitSize;
 
-    TreeSet<Text> splits = new TreeSet<Text>();
+    TreeSet<Text> splits = new TreeSet<>();
 
     while (pos < end) {
       splits.add(new Text(String.format("row_%010d", pos)));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/TestMultiTableIngest.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/TestMultiTableIngest.java b/test/src/main/java/org/apache/accumulo/test/TestMultiTableIngest.java
index 9eb42ec..ae37430 100644
--- a/test/src/main/java/org/apache/accumulo/test/TestMultiTableIngest.java
+++ b/test/src/main/java/org/apache/accumulo/test/TestMultiTableIngest.java
@@ -72,7 +72,7 @@ public class TestMultiTableIngest {
   }
 
   public static void main(String[] args) throws Exception {
-    ArrayList<String> tableNames = new ArrayList<String>();
+    ArrayList<String> tableNames = new ArrayList<>();
 
     Opts opts = new Opts();
     ScannerOpts scanOpts = new ScannerOpts();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/TestRandomDeletes.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/TestRandomDeletes.java b/test/src/main/java/org/apache/accumulo/test/TestRandomDeletes.java
index 3b09b67..5292b87 100644
--- a/test/src/main/java/org/apache/accumulo/test/TestRandomDeletes.java
+++ b/test/src/main/java/org/apache/accumulo/test/TestRandomDeletes.java
@@ -79,7 +79,7 @@ public class TestRandomDeletes {
   }
 
   private static TreeSet<RowColumn> scanAll(ClientOnDefaultTable opts, ScannerOpts scanOpts, String tableName) throws Exception {
-    TreeSet<RowColumn> result = new TreeSet<RowColumn>();
+    TreeSet<RowColumn> result = new TreeSet<>();
     Connector conn = opts.getConnector();
     Scanner scanner = conn.createScanner(tableName, auths);
     scanner.setBatchSize(scanOpts.scanBatchSize);
@@ -95,7 +95,7 @@ public class TestRandomDeletes {
   private static long scrambleDeleteHalfAndCheck(ClientOnDefaultTable opts, ScannerOpts scanOpts, BatchWriterOpts bwOpts, String tableName, Set<RowColumn> rows)
       throws Exception {
     int result = 0;
-    ArrayList<RowColumn> entries = new ArrayList<RowColumn>(rows);
+    ArrayList<RowColumn> entries = new ArrayList<>(rows);
     java.util.Collections.shuffle(entries);
 
     Connector connector = opts.getConnector();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/TextMemoryUsageTest.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/TextMemoryUsageTest.java b/test/src/main/java/org/apache/accumulo/test/TextMemoryUsageTest.java
index b9bc37a..b7664cb 100644
--- a/test/src/main/java/org/apache/accumulo/test/TextMemoryUsageTest.java
+++ b/test/src/main/java/org/apache/accumulo/test/TextMemoryUsageTest.java
@@ -41,7 +41,7 @@ class TextMemoryUsageTest extends MemoryUsageTest {
 
   @Override
   void init() {
-    map = new TreeMap<Text,Value>();
+    map = new TreeMap<>();
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/TransportCachingIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/TransportCachingIT.java b/test/src/main/java/org/apache/accumulo/test/TransportCachingIT.java
index 4829c46..10cde74 100644
--- a/test/src/main/java/org/apache/accumulo/test/TransportCachingIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/TransportCachingIT.java
@@ -60,7 +60,7 @@ public class TransportCachingIT extends AccumuloClusterHarness {
     long rpcTimeout = DefaultConfiguration.getTimeInMillis(Property.GENERAL_RPC_TIMEOUT.getDefaultValue());
 
     // create list of servers
-    ArrayList<ThriftTransportKey> servers = new ArrayList<ThriftTransportKey>();
+    ArrayList<ThriftTransportKey> servers = new ArrayList<>();
 
     // add tservers
     ZooCache zc = new ZooCacheFactory().getZooCache(instance.getZooKeepers(), instance.getZooKeepersSessionTimeOut());

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/UserCompactionStrategyIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/UserCompactionStrategyIT.java b/test/src/main/java/org/apache/accumulo/test/UserCompactionStrategyIT.java
index 845842b..4451987 100644
--- a/test/src/main/java/org/apache/accumulo/test/UserCompactionStrategyIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/UserCompactionStrategyIT.java
@@ -139,7 +139,7 @@ public class UserCompactionStrategyIT extends AccumuloClusterHarness {
     c.instanceOperations().setProperty(Property.VFS_CONTEXT_CLASSPATH_PROPERTY.getKey() + "context1", destFile.toString());
     c.tableOperations().setProperty(tableName, Property.TABLE_CLASSPATH.getKey(), "context1");
 
-    c.tableOperations().addSplits(tableName, new TreeSet<Text>(Arrays.asList(new Text("efg"))));
+    c.tableOperations().addSplits(tableName, new TreeSet<>(Arrays.asList(new Text("efg"))));
 
     writeFlush(c, tableName, "a");
     writeFlush(c, tableName, "b");
@@ -288,7 +288,7 @@ public class UserCompactionStrategyIT extends AccumuloClusterHarness {
   }
 
   private Set<String> getRows(Connector c, String tableName) throws TableNotFoundException {
-    Set<String> rows = new HashSet<String>();
+    Set<String> rows = new HashSet<>();
     Scanner scanner = c.createScanner(tableName, Authorizations.EMPTY);
 
     for (Entry<Key,Value> entry : scanner)

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/VerifySerialRecoveryIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/VerifySerialRecoveryIT.java b/test/src/main/java/org/apache/accumulo/test/VerifySerialRecoveryIT.java
index 1204ee0..3ec0e30 100644
--- a/test/src/main/java/org/apache/accumulo/test/VerifySerialRecoveryIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/VerifySerialRecoveryIT.java
@@ -58,7 +58,7 @@ public class VerifySerialRecoveryIT extends ConfigurableMacBase {
     String tableName = getUniqueNames(1)[0];
     Connector c = getConnector();
     c.tableOperations().create(tableName);
-    SortedSet<Text> splits = new TreeSet<Text>();
+    SortedSet<Text> splits = new TreeSet<>();
     for (int i = 0; i < 200; i++) {
       splits.add(new Text(AssignmentThreadsIT.randomHex(8)));
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/VolumeChooserIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/VolumeChooserIT.java b/test/src/main/java/org/apache/accumulo/test/VolumeChooserIT.java
index 19e4a73..6f575c7 100644
--- a/test/src/main/java/org/apache/accumulo/test/VolumeChooserIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/VolumeChooserIT.java
@@ -80,7 +80,7 @@ public class VolumeChooserIT extends ConfigurableMacBase {
     namespace2 = "ns_" + getUniqueNames(2)[1];
 
     // Set the general volume chooser to the PerTableVolumeChooser so that different choosers can be specified
-    Map<String,String> siteConfig = new HashMap<String,String>();
+    Map<String,String> siteConfig = new HashMap<>();
     siteConfig.put(Property.GENERAL_VOLUME_CHOOSER.getKey(), PerTableVolumeChooser.class.getName());
     cfg.setSiteConfig(siteConfig);
 
@@ -108,7 +108,7 @@ public class VolumeChooserIT extends ConfigurableMacBase {
 
   public void addSplits(Connector connector, String tableName) throws TableNotFoundException, AccumuloException, AccumuloSecurityException {
     // Add 10 splits to the table
-    SortedSet<Text> partitions = new TreeSet<Text>();
+    SortedSet<Text> partitions = new TreeSet<>();
     for (String s : "b,e,g,j,l,o,q,t,v,y".split(","))
       partitions.add(new Text(s));
     connector.tableOperations().addSplits(tableName, partitions);
@@ -135,7 +135,7 @@ public class VolumeChooserIT extends ConfigurableMacBase {
 
   public void verifyVolumes(Connector connector, String tableName, Range tableRange, String vol) throws TableNotFoundException {
     // Verify the new files are written to the Volumes specified
-    ArrayList<String> volumes = new ArrayList<String>();
+    ArrayList<String> volumes = new ArrayList<>();
     for (String s : vol.split(","))
       volumes.add(s);
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/VolumeIT.java
----------------------------------------------------------------------
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 5cacfdd..f9a6a326 100644
--- a/test/src/main/java/org/apache/accumulo/test/VolumeIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/VolumeIT.java
@@ -121,7 +121,7 @@ public class VolumeIT extends ConfigurableMacBase {
     Connector connector = getConnector();
     String tableName = getUniqueNames(1)[0];
     connector.tableOperations().create(tableName);
-    SortedSet<Text> partitions = new TreeSet<Text>();
+    SortedSet<Text> partitions = new TreeSet<>();
     // with some splits
     for (String s : "d,m,t".split(","))
       partitions.add(new Text(s));
@@ -164,7 +164,7 @@ public class VolumeIT extends ConfigurableMacBase {
 
   private void verifyData(List<String> expected, Scanner createScanner) {
 
-    List<String> actual = new ArrayList<String>();
+    List<String> actual = new ArrayList<>();
 
     for (Entry<Key,Value> entry : createScanner) {
       Key k = entry.getKey();
@@ -180,7 +180,7 @@ public class VolumeIT extends ConfigurableMacBase {
   @Test
   public void testRelativePaths() throws Exception {
 
-    List<String> expected = new ArrayList<String>();
+    List<String> expected = new ArrayList<>();
 
     Connector connector = getConnector();
     String tableName = getUniqueNames(1)[0];
@@ -188,7 +188,7 @@ public class VolumeIT extends ConfigurableMacBase {
 
     String tableId = connector.tableOperations().tableIdMap().get(tableName);
 
-    SortedSet<Text> partitions = new TreeSet<Text>();
+    SortedSet<Text> partitions = new TreeSet<>();
     // with some splits
     for (String s : "c,g,k,p,s,v".split(","))
       partitions.add(new Text(s));
@@ -346,7 +346,7 @@ public class VolumeIT extends ConfigurableMacBase {
     cluster.start();
 
     // Make sure we can still read the tables (tableNames[0] is very likely to have a file still on v1)
-    List<String> expected = new ArrayList<String>();
+    List<String> expected = new ArrayList<>();
     for (int i = 0; i < 100; i++) {
       String row = String.format("%06d", i * 100 + 3);
       expected.add(row + ":cf1:cq1:1");
@@ -360,7 +360,7 @@ public class VolumeIT extends ConfigurableMacBase {
 
   private void writeData(String tableName, Connector conn) throws AccumuloException, AccumuloSecurityException, TableExistsException, TableNotFoundException,
       MutationsRejectedException {
-    TreeSet<Text> splits = new TreeSet<Text>();
+    TreeSet<Text> splits = new TreeSet<>();
     for (int i = 1; i < 100; i++) {
       splits.add(new Text(String.format("%06d", i * 100)));
     }
@@ -383,7 +383,7 @@ public class VolumeIT extends ConfigurableMacBase {
 
     Connector conn = getConnector();
 
-    List<String> expected = new ArrayList<String>();
+    List<String> expected = new ArrayList<>();
     for (int i = 0; i < 100; i++) {
       String row = String.format("%06d", i * 100 + 3);
       expected.add(row + ":cf1:cq1:1");

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/WaitForBalanceIT.java
----------------------------------------------------------------------
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 07cbdd4..c6abbce 100644
--- a/test/src/main/java/org/apache/accumulo/test/WaitForBalanceIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/WaitForBalanceIT.java
@@ -56,7 +56,7 @@ public class WaitForBalanceIT extends ConfigurableMacBase {
     final String tableName = getUniqueNames(1)[0];
     c.tableOperations().create(tableName);
     c.instanceOperations().waitForBalance();
-    final SortedSet<Text> partitionKeys = new TreeSet<Text>();
+    final SortedSet<Text> partitionKeys = new TreeSet<>();
     for (int i = 0; i < 1000; i++) {
       partitionKeys.add(new Text("" + i));
     }
@@ -67,7 +67,7 @@ public class WaitForBalanceIT extends ConfigurableMacBase {
   }
 
   private boolean isBalanced() throws Exception {
-    final Map<String,Integer> counts = new HashMap<String,Integer>();
+    final Map<String,Integer> counts = new HashMap<>();
     int offline = 0;
     final Connector c = getConnector();
     for (String tableName : new String[] {MetadataTable.NAME, RootTable.NAME}) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousBatchWalker.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousBatchWalker.java b/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousBatchWalker.java
index dc77f37..e08be10 100644
--- a/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousBatchWalker.java
+++ b/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousBatchWalker.java
@@ -68,7 +68,7 @@ public class ContinuousBatchWalker {
       bs.setTimeout(bsOpts.scanTimeout, TimeUnit.MILLISECONDS);
 
       Set<Text> batch = getBatch(scanner, opts.min, opts.max, scanOpts.scanBatchSize, r);
-      List<Range> ranges = new ArrayList<Range>(batch.size());
+      List<Range> ranges = new ArrayList<>(batch.size());
 
       for (Text row : batch) {
         ranges.add(new Range(row));
@@ -84,7 +84,7 @@ public class ContinuousBatchWalker {
   private static void runBatchScan(int batchSize, BatchScanner bs, Set<Text> batch, List<Range> ranges) {
     bs.setRanges(ranges);
 
-    Set<Text> rowsSeen = new HashSet<Text>();
+    Set<Text> rowsSeen = new HashSet<>();
 
     int count = 0;
 
@@ -104,8 +104,8 @@ public class ContinuousBatchWalker {
     long t2 = System.currentTimeMillis();
 
     if (!rowsSeen.equals(batch)) {
-      HashSet<Text> copy1 = new HashSet<Text>(rowsSeen);
-      HashSet<Text> copy2 = new HashSet<Text>(batch);
+      HashSet<Text> copy1 = new HashSet<>(rowsSeen);
+      HashSet<Text> copy2 = new HashSet<>(batch);
 
       copy1.removeAll(batch);
       copy2.removeAll(rowsSeen);
@@ -133,7 +133,7 @@ public class ContinuousBatchWalker {
     }
   }
 
-  private static HashSet<Text> rowsToQuery = new HashSet<Text>();
+  private static HashSet<Text> rowsToQuery = new HashSet<>();
 
   private static Set<Text> getBatch(Scanner scanner, long min, long max, int batchSize, Random r) {
 
@@ -160,7 +160,7 @@ public class ContinuousBatchWalker {
       sleepUninterruptibly(100, TimeUnit.MILLISECONDS);
     }
 
-    HashSet<Text> ret = new HashSet<Text>();
+    HashSet<Text> ret = new HashSet<>();
 
     Iterator<Text> iter = rowsToQuery.iterator();
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousIngest.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousIngest.java b/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousIngest.java
index ddc36aa..b59cf04 100644
--- a/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousIngest.java
+++ b/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousIngest.java
@@ -57,7 +57,7 @@ public class ContinuousIngest {
       return;
     }
 
-    visibilities = new ArrayList<ColumnVisibility>();
+    visibilities = new ArrayList<>();
 
     FileSystem fs = FileSystem.get(new Configuration());
     BufferedReader in = new BufferedReader(new InputStreamReader(fs.open(new Path(opts.visFile)), UTF_8));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousStatsCollector.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousStatsCollector.java b/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousStatsCollector.java
index c0f46df..b880085 100644
--- a/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousStatsCollector.java
+++ b/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousStatsCollector.java
@@ -143,7 +143,7 @@ public class ContinuousStatsCollector {
         MasterMonitorInfo stats = client.getMasterStats(Tracer.traceInfo(), context.rpcCreds());
 
         TableInfo all = new TableInfo();
-        Map<String,TableInfo> tableSummaries = new HashMap<String,TableInfo>();
+        Map<String,TableInfo> tableSummaries = new HashMap<>();
 
         for (TabletServerStatus server : stats.tServerInfo) {
           for (Entry<String,TableInfo> info : server.tableMap.entrySet()) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousVerify.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousVerify.java b/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousVerify.java
index 3380559..4222005 100644
--- a/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousVerify.java
+++ b/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousVerify.java
@@ -105,7 +105,7 @@ public class ContinuousVerify extends Configured implements Tool {
   }
 
   public static class CReducer extends Reducer<LongWritable,VLongWritable,Text,Text> {
-    private ArrayList<Long> refs = new ArrayList<Long>();
+    private ArrayList<Long> refs = new ArrayList<>();
 
     @Override
     public void reduce(LongWritable key, Iterable<VLongWritable> values, Context context) throws IOException, InterruptedException {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousWalk.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousWalk.java b/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousWalk.java
index f2e4805..3f75d5a 100644
--- a/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousWalk.java
+++ b/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousWalk.java
@@ -85,7 +85,7 @@ public class ContinuousWalk {
         return;
       }
 
-      auths = new ArrayList<Authorizations>();
+      auths = new ArrayList<>();
 
       FileSystem fs = FileSystem.get(new Configuration());
       BufferedReader in = new BufferedReader(new InputStreamReader(fs.open(new Path(file)), UTF_8));
@@ -113,7 +113,7 @@ public class ContinuousWalk {
 
     Random r = new Random();
 
-    ArrayList<Value> values = new ArrayList<Value>();
+    ArrayList<Value> values = new ArrayList<>();
 
     while (true) {
       Scanner scanner = ContinuousUtil.createScanner(conn, clientOpts.getTableName(), opts.randomAuths.getAuths(r));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/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/b102e760/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/b102e760/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/b102e760/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);
       }
 


Mime
View raw message