You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ct...@apache.org on 2016/07/01 01:58:58 UTC

[01/32] accumulo git commit: ACCUMULO-4357 Remove unneeded code for readability

Repository: accumulo
Updated Branches:
  refs/heads/1.8 56604640e -> b102e7605
  refs/heads/master b69291a34 -> fd67a6c85


http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/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 69cf23c..dea1b7f 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);
@@ -462,7 +462,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));
     }
@@ -474,7 +474,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/b102e760/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 4d4402b..63a7771 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
@@ -183,7 +183,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
@@ -270,7 +270,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/b102e760/test/src/main/java/org/apache/accumulo/test/proxy/ProxyDurabilityIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/proxy/ProxyDurabilityIT.java b/test/src/main/java/org/apache/accumulo/test/proxy/ProxyDurabilityIT.java
index 133c09c..d9a1027 100644
--- a/test/src/main/java/org/apache/accumulo/test/proxy/ProxyDurabilityIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/proxy/ProxyDurabilityIT.java
@@ -96,7 +96,7 @@ public class ProxyDurabilityIT extends ConfigurableMacBase {
     while (!proxyServer.isServing())
       sleepUninterruptibly(100, TimeUnit.MILLISECONDS);
     Client client = new TestProxyClient("localhost", proxyPort, protocol).proxy();
-    Map<String,String> properties = new TreeMap<String,String>();
+    Map<String,String> properties = new TreeMap<>();
     properties.put("password", ROOT_PASSWORD);
     ByteBuffer login = client.login("root", properties);
 
@@ -107,7 +107,7 @@ public class ProxyDurabilityIT extends ConfigurableMacBase {
     WriterOptions options = new WriterOptions();
     options.setDurability(Durability.NONE);
     String writer = client.createWriter(login, tableName, options);
-    Map<ByteBuffer,List<ColumnUpdate>> cells = new TreeMap<ByteBuffer,List<ColumnUpdate>>();
+    Map<ByteBuffer,List<ColumnUpdate>> cells = new TreeMap<>();
     ColumnUpdate column = new ColumnUpdate(bytes("cf"), bytes("cq"));
     column.setValue("value".getBytes());
     cells.put(bytes("row"), Collections.singletonList(column));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/proxy/SimpleProxyBase.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/proxy/SimpleProxyBase.java b/test/src/main/java/org/apache/accumulo/test/proxy/SimpleProxyBase.java
index a972443..cfb572d 100644
--- a/test/src/main/java/org/apache/accumulo/test/proxy/SimpleProxyBase.java
+++ b/test/src/main/java/org/apache/accumulo/test/proxy/SimpleProxyBase.java
@@ -451,7 +451,7 @@ public abstract class SimpleProxyBase extends SharedMiniClusterBase {
 
   @Test(expected = AccumuloSecurityException.class, timeout = 5000)
   public void setLocalityGroupsLoginFailure() throws Exception {
-    Map<String,Set<String>> groups = new HashMap<String,Set<String>>();
+    Map<String,Set<String>> groups = new HashMap<>();
     groups.put("group1", Collections.singleton("cf1"));
     groups.put("group2", Collections.singleton("cf2"));
     client.setLocalityGroups(badLogin, tableName, groups);
@@ -523,7 +523,7 @@ public abstract class SimpleProxyBase extends SharedMiniClusterBase {
 
   @Test(expected = AccumuloSecurityException.class, timeout = 5000)
   public void changeUserAuthorizationsLoginFailure() throws Exception {
-    HashSet<ByteBuffer> auths = new HashSet<ByteBuffer>(Arrays.asList(s2bb("A"), s2bb("B")));
+    HashSet<ByteBuffer> auths = new HashSet<>(Arrays.asList(s2bb("A"), s2bb("B")));
     client.changeUserAuthorizations(badLogin, "stooge", auths);
   }
 
@@ -1236,7 +1236,7 @@ public abstract class SimpleProxyBase extends SharedMiniClusterBase {
     t.start();
 
     // look for the scan many times
-    List<ActiveScan> scans = new ArrayList<ActiveScan>();
+    List<ActiveScan> scans = new ArrayList<>();
     for (int i = 0; i < 100 && scans.isEmpty(); i++) {
       for (String tserver : client.getTabletServers(creds)) {
         List<ActiveScan> scansForServer = client.getActiveScans(creds, tserver);
@@ -1323,7 +1323,7 @@ public abstract class SimpleProxyBase extends SharedMiniClusterBase {
     assertNotNull(desiredTableId);
 
     // try to catch it in the act
-    List<ActiveCompaction> compactions = new ArrayList<ActiveCompaction>();
+    List<ActiveCompaction> compactions = new ArrayList<>();
     for (int i = 0; i < 100 && compactions.isEmpty(); i++) {
       // Iterate over the tservers
       for (String tserver : client.getTabletServers(creds)) {
@@ -1392,12 +1392,12 @@ public abstract class SimpleProxyBase extends SharedMiniClusterBase {
     client.createLocalUser(creds, user, password);
     // change auths
     Set<String> users = client.listLocalUsers(creds);
-    Set<String> expectedUsers = new HashSet<String>(Arrays.asList(clientPrincipal, user));
+    Set<String> expectedUsers = new HashSet<>(Arrays.asList(clientPrincipal, user));
     assertTrue("Did not find all expected users: " + expectedUsers, users.containsAll(expectedUsers));
-    HashSet<ByteBuffer> auths = new HashSet<ByteBuffer>(Arrays.asList(s2bb("A"), s2bb("B")));
+    HashSet<ByteBuffer> auths = new HashSet<>(Arrays.asList(s2bb("A"), s2bb("B")));
     client.changeUserAuthorizations(creds, user, auths);
     List<ByteBuffer> update = client.getUserAuthorizations(creds, user);
-    assertEquals(auths, new HashSet<ByteBuffer>(update));
+    assertEquals(auths, new HashSet<>(update));
 
     // change password
     if (!isKerberosEnabled()) {
@@ -1840,7 +1840,7 @@ public abstract class SimpleProxyBase extends SharedMiniClusterBase {
   @Test
   public void tableMergesAndSplits() throws Exception {
     // add some splits
-    client.addSplits(creds, tableName, new HashSet<ByteBuffer>(Arrays.asList(s2bb("a"), s2bb("m"), s2bb("z"))));
+    client.addSplits(creds, tableName, new HashSet<>(Arrays.asList(s2bb("a"), s2bb("m"), s2bb("z"))));
     List<ByteBuffer> splits = client.listSplits(creds, tableName, 1);
     assertEquals(Arrays.asList(s2bb("m")), splits);
 
@@ -1861,7 +1861,7 @@ public abstract class SimpleProxyBase extends SharedMiniClusterBase {
   @Test
   public void iteratorFunctionality() throws Exception {
     // iterators
-    HashMap<String,String> options = new HashMap<String,String>();
+    HashMap<String,String> options = new HashMap<>();
     options.put("type", "STRING");
     options.put("columns", "cf");
     IteratorSetting setting = new IteratorSetting(10, tableName, SummingCombiner.class.getName(), options);
@@ -1949,7 +1949,7 @@ public abstract class SimpleProxyBase extends SharedMiniClusterBase {
 
     // Clone the table
     client.cloneTable(creds, tableName, TABLE_TEST2, true, null, null);
-    Set<String> tablesToScan = new HashSet<String>();
+    Set<String> tablesToScan = new HashSet<>();
     tablesToScan.add(tableName);
     tablesToScan.add(TABLE_TEST2);
     tablesToScan.add("foo");
@@ -2027,7 +2027,7 @@ public abstract class SimpleProxyBase extends SharedMiniClusterBase {
 
   @Test
   public void localityGroups() throws Exception {
-    Map<String,Set<String>> groups = new HashMap<String,Set<String>>();
+    Map<String,Set<String>> groups = new HashMap<>();
     groups.put("group1", Collections.singleton("cf1"));
     groups.put("group2", Collections.singleton("cf2"));
     client.setLocalityGroups(creds, tableName, groups);
@@ -2151,7 +2151,7 @@ public abstract class SimpleProxyBase extends SharedMiniClusterBase {
 
     String cwid = client.createConditionalWriter(creds, tableName, new ConditionalWriterOptions());
 
-    Map<ByteBuffer,ConditionalUpdates> updates = new HashMap<ByteBuffer,ConditionalUpdates>();
+    Map<ByteBuffer,ConditionalUpdates> updates = new HashMap<>();
 
     updates.put(
         s2bb("00345"),
@@ -2248,7 +2248,7 @@ public abstract class SimpleProxyBase extends SharedMiniClusterBase {
 
     // following test w/ iterator setup should succeed
     Condition iterCond = newCondition("data", "count", "3");
-    Map<String,String> props = new HashMap<String,String>();
+    Map<String,String> props = new HashMap<>();
     props.put("type", "STRING");
     props.put("columns", "data:count");
     IteratorSetting is = new IteratorSetting(1, "sumc", SummingCombiner.class.getName(), props);
@@ -2534,7 +2534,7 @@ public abstract class SimpleProxyBase extends SharedMiniClusterBase {
   }
 
   private Map<String,String> s2pp(String cf) {
-    Map<String,String> toRet = new TreeMap<String,String>();
+    Map<String,String> toRet = new TreeMap<>();
     toRet.put("password", cf);
     return toRet;
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/proxy/TestProxyClient.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/proxy/TestProxyClient.java b/test/src/main/java/org/apache/accumulo/test/proxy/TestProxyClient.java
index ff92795..bb03934 100644
--- a/test/src/main/java/org/apache/accumulo/test/proxy/TestProxyClient.java
+++ b/test/src/main/java/org/apache/accumulo/test/proxy/TestProxyClient.java
@@ -96,7 +96,7 @@ public class TestProxyClient {
 
     TestProxyClient tpc = new TestProxyClient("localhost", 42424);
     String principal = "root";
-    Map<String,String> props = new TreeMap<String,String>();
+    Map<String,String> props = new TreeMap<>();
     props.put("password", "secret");
 
     System.out.println("Logging in");
@@ -127,7 +127,7 @@ public class TestProxyClient {
     Date then = new Date();
     int maxInserts = 1000000;
     String format = "%1$05d";
-    Map<ByteBuffer,List<ColumnUpdate>> mutations = new HashMap<ByteBuffer,List<ColumnUpdate>>();
+    Map<ByteBuffer,List<ColumnUpdate>> mutations = new HashMap<>();
     for (int i = 0; i < maxInserts; i++) {
       String result = String.format(format, i);
       ColumnUpdate update = new ColumnUpdate(ByteBuffer.wrap(("cf" + i).getBytes(UTF_8)), ByteBuffer.wrap(("cq" + i).getBytes(UTF_8)));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/proxy/TestProxyReadWrite.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/proxy/TestProxyReadWrite.java b/test/src/main/java/org/apache/accumulo/test/proxy/TestProxyReadWrite.java
index 1a75fea..764a08c 100644
--- a/test/src/main/java/org/apache/accumulo/test/proxy/TestProxyReadWrite.java
+++ b/test/src/main/java/org/apache/accumulo/test/proxy/TestProxyReadWrite.java
@@ -104,7 +104,7 @@ public class TestProxyReadWrite {
   @Test
   public void readWriteBatchOneShotWithRange() throws Exception {
     int maxInserts = 100000;
-    Map<ByteBuffer,List<ColumnUpdate>> mutations = new HashMap<ByteBuffer,List<ColumnUpdate>>();
+    Map<ByteBuffer,List<ColumnUpdate>> mutations = new HashMap<>();
     String format = "%1$05d";
     for (int i = 0; i < maxInserts; i++) {
       addMutation(mutations, String.format(format, i), "cf" + i, "cq" + i, Util.randString(10));
@@ -140,7 +140,7 @@ public class TestProxyReadWrite {
   @Test
   public void readWriteBatchOneShotWithColumnFamilyOnly() throws Exception {
     int maxInserts = 100000;
-    Map<ByteBuffer,List<ColumnUpdate>> mutations = new HashMap<ByteBuffer,List<ColumnUpdate>>();
+    Map<ByteBuffer,List<ColumnUpdate>> mutations = new HashMap<>();
     String format = "%1$05d";
     for (int i = 0; i < maxInserts; i++) {
 
@@ -179,7 +179,7 @@ public class TestProxyReadWrite {
   @Test
   public void readWriteBatchOneShotWithFullColumn() throws Exception {
     int maxInserts = 100000;
-    Map<ByteBuffer,List<ColumnUpdate>> mutations = new HashMap<ByteBuffer,List<ColumnUpdate>>();
+    Map<ByteBuffer,List<ColumnUpdate>> mutations = new HashMap<>();
     String format = "%1$05d";
     for (int i = 0; i < maxInserts; i++) {
 
@@ -218,7 +218,7 @@ public class TestProxyReadWrite {
   @Test
   public void readWriteBatchOneShotWithFilterIterator() throws Exception {
     int maxInserts = 10000;
-    Map<ByteBuffer,List<ColumnUpdate>> mutations = new HashMap<ByteBuffer,List<ColumnUpdate>>();
+    Map<ByteBuffer,List<ColumnUpdate>> mutations = new HashMap<>();
     String format = "%1$05d";
     for (int i = 0; i < maxInserts; i++) {
       addMutation(mutations, String.format(format, i), "cf" + i, "cq" + i, Util.randString(10));
@@ -258,7 +258,7 @@ public class TestProxyReadWrite {
   @Test
   public void readWriteOneShotWithRange() throws Exception {
     int maxInserts = 100000;
-    Map<ByteBuffer,List<ColumnUpdate>> mutations = new HashMap<ByteBuffer,List<ColumnUpdate>>();
+    Map<ByteBuffer,List<ColumnUpdate>> mutations = new HashMap<>();
     String format = "%1$05d";
     for (int i = 0; i < maxInserts; i++) {
       addMutation(mutations, String.format(format, i), "cf" + i, "cq" + i, Util.randString(10));
@@ -293,7 +293,7 @@ public class TestProxyReadWrite {
   @Test
   public void readWriteOneShotWithFilterIterator() throws Exception {
     int maxInserts = 10000;
-    Map<ByteBuffer,List<ColumnUpdate>> mutations = new HashMap<ByteBuffer,List<ColumnUpdate>>();
+    Map<ByteBuffer,List<ColumnUpdate>> mutations = new HashMap<>();
     String format = "%1$05d";
     for (int i = 0; i < maxInserts; i++) {
       addMutation(mutations, String.format(format, i), "cf" + i, "cq" + i, Util.randString(10));
@@ -336,7 +336,7 @@ public class TestProxyReadWrite {
   // This test takes kind of a long time. Enable it if you think you may have memory issues.
   public void manyWritesAndReads() throws Exception {
     int maxInserts = 1000000;
-    Map<ByteBuffer,List<ColumnUpdate>> mutations = new HashMap<ByteBuffer,List<ColumnUpdate>>();
+    Map<ByteBuffer,List<ColumnUpdate>> mutations = new HashMap<>();
     String format = "%1$06d";
     String writer = tpc.proxy().createWriter(userpass, testtable, null);
     for (int i = 0; i < maxInserts; i++) {
@@ -376,7 +376,7 @@ public class TestProxyReadWrite {
   @Test
   public void asynchReadWrite() throws Exception {
     int maxInserts = 10000;
-    Map<ByteBuffer,List<ColumnUpdate>> mutations = new HashMap<ByteBuffer,List<ColumnUpdate>>();
+    Map<ByteBuffer,List<ColumnUpdate>> mutations = new HashMap<>();
     String format = "%1$05d";
     String writer = tpc.proxy().createWriter(userpass, testtable, null);
     for (int i = 0; i < maxInserts; i++) {
@@ -421,12 +421,12 @@ public class TestProxyReadWrite {
   @Test
   public void testVisibility() throws Exception {
 
-    Set<ByteBuffer> auths = new HashSet<ByteBuffer>();
+    Set<ByteBuffer> auths = new HashSet<>();
     auths.add(ByteBuffer.wrap("even".getBytes()));
     tpc.proxy().changeUserAuthorizations(userpass, "root", auths);
 
     int maxInserts = 10000;
-    Map<ByteBuffer,List<ColumnUpdate>> mutations = new HashMap<ByteBuffer,List<ColumnUpdate>>();
+    Map<ByteBuffer,List<ColumnUpdate>> mutations = new HashMap<>();
     String format = "%1$05d";
     String writer = tpc.proxy().createWriter(userpass, testtable, null);
     for (int i = 0; i < maxInserts; i++) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/proxy/TestProxySecurityOperations.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/proxy/TestProxySecurityOperations.java b/test/src/main/java/org/apache/accumulo/test/proxy/TestProxySecurityOperations.java
index c2ddfb7..fa6c52e 100644
--- a/test/src/main/java/org/apache/accumulo/test/proxy/TestProxySecurityOperations.java
+++ b/test/src/main/java/org/apache/accumulo/test/proxy/TestProxySecurityOperations.java
@@ -130,7 +130,7 @@ public class TestProxySecurityOperations {
 
   @Test
   public void auths() throws TException {
-    HashSet<ByteBuffer> newauths = new HashSet<ByteBuffer>();
+    HashSet<ByteBuffer> newauths = new HashSet<>();
     newauths.add(ByteBuffer.wrap("BBR".getBytes()));
     newauths.add(ByteBuffer.wrap("Barney".getBytes()));
     tpc.proxy().changeUserAuthorizations(userpass, testuser, newauths);
@@ -152,7 +152,7 @@ public class TestProxySecurityOperations {
   }
 
   private Map<String,String> bb2pp(ByteBuffer cf) {
-    Map<String,String> toRet = new TreeMap<String,String>();
+    Map<String,String> toRet = new TreeMap<>();
     toRet.put("password", ByteBufferUtil.toString(cf));
     return toRet;
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/proxy/TestProxyTableOperations.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/proxy/TestProxyTableOperations.java b/test/src/main/java/org/apache/accumulo/test/proxy/TestProxyTableOperations.java
index e8d7b1e..404bcbe 100644
--- a/test/src/main/java/org/apache/accumulo/test/proxy/TestProxyTableOperations.java
+++ b/test/src/main/java/org/apache/accumulo/test/proxy/TestProxyTableOperations.java
@@ -104,7 +104,7 @@ public class TestProxyTableOperations {
   // This test does not yet function because the backing Mock instance does not yet support merging
   @Test
   public void merge() throws TException {
-    Set<ByteBuffer> splits = new HashSet<ByteBuffer>();
+    Set<ByteBuffer> splits = new HashSet<>();
     splits.add(ByteBuffer.wrap("a".getBytes()));
     splits.add(ByteBuffer.wrap("c".getBytes()));
     splits.add(ByteBuffer.wrap("z".getBytes()));
@@ -124,7 +124,7 @@ public class TestProxyTableOperations {
 
   @Test
   public void splits() throws TException {
-    Set<ByteBuffer> splits = new HashSet<ByteBuffer>();
+    Set<ByteBuffer> splits = new HashSet<>();
     splits.add(ByteBuffer.wrap("a".getBytes()));
     splits.add(ByteBuffer.wrap("b".getBytes()));
     splits.add(ByteBuffer.wrap("z".getBytes()));
@@ -149,11 +149,11 @@ public class TestProxyTableOperations {
 
   @Test
   public void localityGroups() throws TException {
-    Map<String,Set<String>> groups = new HashMap<String,Set<String>>();
-    Set<String> group1 = new HashSet<String>();
+    Map<String,Set<String>> groups = new HashMap<>();
+    Set<String> group1 = new HashSet<>();
     group1.add("cf1");
     groups.put("group1", group1);
-    Set<String> group2 = new HashSet<String>();
+    Set<String> group2 = new HashSet<>();
     group2.add("cf2");
     group2.add("cf3");
     groups.put("group2", group2);
@@ -187,7 +187,7 @@ public class TestProxyTableOperations {
 
   @Test
   public void tableOperationsRowMethods() throws TException {
-    Map<ByteBuffer,List<ColumnUpdate>> mutations = new HashMap<ByteBuffer,List<ColumnUpdate>>();
+    Map<ByteBuffer,List<ColumnUpdate>> mutations = new HashMap<>();
     for (int i = 0; i < 10; i++) {
       addMutation(mutations, "" + i, "cf", "cq", "");
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/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/b102e760/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/b102e760/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/b102e760/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 79660e6..1fb8717 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/b102e760/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/b102e760/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/b102e760/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/b102e760/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 ec89a5a..0e5e439 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
@@ -116,7 +116,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/b102e760/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/b102e760/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/b102e760/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/b102e760/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/b102e760/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/b102e760/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/b102e760/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/b102e760/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/b102e760/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/b102e760/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/b102e760/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/b102e760/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/b102e760/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/b102e760/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 d02cb42..46ae035 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/b102e760/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 27ab09c..2669d9d 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/b102e760/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 d895c55..477d95f 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/b102e760/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/b102e760/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/b102e760/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/b102e760/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/b102e760/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/b102e760/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/b102e760/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/b102e760/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/b102e760/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/b102e760/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/b102e760/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/b102e760/test/src/main/java/org/apache/accumulo/test/replication/CyclicReplicationIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/replication/CyclicReplicationIT.java b/test/src/main/java/org/apache/accumulo/test/replication/CyclicReplicationIT.java
index 16c317f..8603cd6 100644
--- a/test/src/main/java/org/apache/accumulo/test/replication/CyclicReplicationIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/replication/CyclicReplicationIT.java
@@ -113,7 +113,7 @@ public class CyclicReplicationIT {
     // Set the same SSL information from the primary when present
     Map<String,String> primarySiteConfig = primaryCfg.getSiteConfig();
     if ("true".equals(primarySiteConfig.get(Property.INSTANCE_RPC_SSL_ENABLED.getKey()))) {
-      Map<String,String> peerSiteConfig = new HashMap<String,String>();
+      Map<String,String> peerSiteConfig = new HashMap<>();
       peerSiteConfig.put(Property.INSTANCE_RPC_SSL_ENABLED.getKey(), "true");
       String keystorePath = primarySiteConfig.get(Property.RPC_SSL_KEYSTORE_PATH.getKey());
       Assert.assertNotNull("Keystore Path was null", keystorePath);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/replication/GarbageCollectorCommunicatesWithTServersIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/replication/GarbageCollectorCommunicatesWithTServersIT.java b/test/src/main/java/org/apache/accumulo/test/replication/GarbageCollectorCommunicatesWithTServersIT.java
index 2852387..fccb238 100644
--- a/test/src/main/java/org/apache/accumulo/test/replication/GarbageCollectorCommunicatesWithTServersIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/replication/GarbageCollectorCommunicatesWithTServersIT.java
@@ -110,7 +110,7 @@ public class GarbageCollectorCommunicatesWithTServersIT extends ConfigurableMacB
     ZooReaderWriter zk = new ZooReaderWriter(i.getZooKeepers(), i.getZooKeepersSessionTimeOut(), "");
     WalStateManager wals = new WalStateManager(conn.getInstance(), zk);
 
-    Set<String> result = new HashSet<String>();
+    Set<String> result = new HashSet<>();
     for (Entry<Path,WalState> entry : wals.getAllState().entrySet()) {
       log.debug("Reading WALs: {}={}", entry.getKey(), entry.getValue());
       result.add(entry.getKey().toString());
@@ -132,7 +132,7 @@ public class GarbageCollectorCommunicatesWithTServersIT extends ConfigurableMacB
     s.setRange(r);
     s.fetchColumnFamily(MetadataSchema.TabletsSection.DataFileColumnFamily.NAME);
 
-    Set<String> rfiles = new HashSet<String>();
+    Set<String> rfiles = new HashSet<>();
     for (Entry<Key,Value> entry : s) {
       log.debug("Reading RFiles: {}={}", entry.getKey().toStringNoTruncate(), entry.getValue());
       // uri://path/to/wal
@@ -159,7 +159,7 @@ public class GarbageCollectorCommunicatesWithTServersIT extends ConfigurableMacB
     s.setRange(r);
     s.fetchColumn(MetadataSchema.ReplicationSection.COLF, new Text(tableId));
 
-    Map<String,Status> fileToStatus = new HashMap<String,Status>();
+    Map<String,Status> fileToStatus = new HashMap<>();
     for (Entry<Key,Value> entry : s) {
       Text file = new Text();
       MetadataSchema.ReplicationSection.getFile(entry.getKey(), file);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/replication/MultiInstanceReplicationIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/replication/MultiInstanceReplicationIT.java b/test/src/main/java/org/apache/accumulo/test/replication/MultiInstanceReplicationIT.java
index 0c68af6..33e0a55 100644
--- a/test/src/main/java/org/apache/accumulo/test/replication/MultiInstanceReplicationIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/replication/MultiInstanceReplicationIT.java
@@ -116,7 +116,7 @@ public class MultiInstanceReplicationIT extends ConfigurableMacBase {
     // Set the same SSL information from the primary when present
     Map<String,String> primarySiteConfig = primaryCfg.getSiteConfig();
     if ("true".equals(primarySiteConfig.get(Property.INSTANCE_RPC_SSL_ENABLED.getKey()))) {
-      Map<String,String> peerSiteConfig = new HashMap<String,String>();
+      Map<String,String> peerSiteConfig = new HashMap<>();
       peerSiteConfig.put(Property.INSTANCE_RPC_SSL_ENABLED.getKey(), "true");
       String keystorePath = primarySiteConfig.get(Property.RPC_SSL_KEYSTORE_PATH.getKey());
       Assert.assertNotNull("Keystore Path was null", keystorePath);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/replication/StatusCombinerMacIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/replication/StatusCombinerMacIT.java b/test/src/main/java/org/apache/accumulo/test/replication/StatusCombinerMacIT.java
index b0a787b..59bfab0 100644
--- a/test/src/main/java/org/apache/accumulo/test/replication/StatusCombinerMacIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/replication/StatusCombinerMacIT.java
@@ -66,7 +66,7 @@ public class StatusCombinerMacIT extends SharedMiniClusterBase {
     Assert.assertTrue(scopes.contains(IteratorScope.majc));
 
     Iterable<Entry<String,String>> propIter = tops.getProperties(MetadataTable.NAME);
-    HashMap<String,String> properties = new HashMap<String,String>();
+    HashMap<String,String> properties = new HashMap<>();
     for (Entry<String,String> entry : propIter) {
       properties.put(entry.getKey(), entry.getValue());
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/replication/UnorderedWorkAssignerReplicationIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/replication/UnorderedWorkAssignerReplicationIT.java b/test/src/main/java/org/apache/accumulo/test/replication/UnorderedWorkAssignerReplicationIT.java
index 5d4e637..ec0361b 100644
--- a/test/src/main/java/org/apache/accumulo/test/replication/UnorderedWorkAssignerReplicationIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/replication/UnorderedWorkAssignerReplicationIT.java
@@ -122,7 +122,7 @@ public class UnorderedWorkAssignerReplicationIT extends ConfigurableMacBase {
     // Set the same SSL information from the primary when present
     Map<String,String> primarySiteConfig = primaryCfg.getSiteConfig();
     if ("true".equals(primarySiteConfig.get(Property.INSTANCE_RPC_SSL_ENABLED.getKey()))) {
-      Map<String,String> peerSiteConfig = new HashMap<String,String>();
+      Map<String,String> peerSiteConfig = new HashMap<>();
       peerSiteConfig.put(Property.INSTANCE_RPC_SSL_ENABLED.getKey(), "true");
       String keystorePath = primarySiteConfig.get(Property.RPC_SSL_KEYSTORE_PATH.getKey());
       Assert.assertNotNull("Keystore Path was null", keystorePath);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/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/b102e760/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/b102e760/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/b102e760/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/b102e760/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/b102e760/test/src/main/java/org/apache/accumulo/test/util/CertUtils.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/util/CertUtils.java b/test/src/main/java/org/apache/accumulo/test/util/CertUtils.java
index 2345ea7..95042d2 100644
--- a/test/src/main/java/org/apache/accumulo/test/util/CertUtils.java
+++ b/test/src/main/java/org/apache/accumulo/test/util/CertUtils.java
@@ -135,7 +135,7 @@ public class CertUtils {
 
           @Override
           public Iterator<Entry<String,String>> iterator() {
-            TreeMap<String,String> map = new TreeMap<String,String>();
+            TreeMap<String,String> map = new TreeMap<>();
             for (Entry<String,String> props : DefaultConfiguration.getInstance())
               map.put(props.getKey(), props.getValue());
             for (Entry<String,String> props : xml)

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/test/java/org/apache/accumulo/test/iterator/RegExTest.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/iterator/RegExTest.java b/test/src/test/java/org/apache/accumulo/test/iterator/RegExTest.java
index 6189ee3..4b2de22 100644
--- a/test/src/test/java/org/apache/accumulo/test/iterator/RegExTest.java
+++ b/test/src/test/java/org/apache/accumulo/test/iterator/RegExTest.java
@@ -41,7 +41,7 @@ public class RegExTest {
   @BeforeClass
   public static void setupTests() throws Exception {
 
-    ArrayList<Character> chars = new ArrayList<Character>();
+    ArrayList<Character> chars = new ArrayList<>();
     for (char c = 'a'; c <= 'z'; c++)
       chars.add(c);
 


[08/32] accumulo git commit: ACCUMULO-4357 Remove unneeded code for readability

Posted by ct...@apache.org.
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/conf/TableConfiguration.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/conf/TableConfiguration.java b/server/base/src/main/java/org/apache/accumulo/server/conf/TableConfiguration.java
index d4712b9..6c53c5b 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/conf/TableConfiguration.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/conf/TableConfiguration.java
@@ -35,7 +35,7 @@ import com.google.common.base.Predicate;
 public class TableConfiguration extends ObservableConfiguration {
   private static final Logger log = LoggerFactory.getLogger(TableConfiguration.class);
 
-  private static final Map<PropCacheKey,ZooCache> propCaches = new java.util.HashMap<PropCacheKey,ZooCache>();
+  private static final Map<PropCacheKey,ZooCache> propCaches = new java.util.HashMap<>();
 
   private ZooCachePropertyAccessor propCacheAccessor = null;
   private final Instance instance;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/conf/ZooConfigurationFactory.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/conf/ZooConfigurationFactory.java b/server/base/src/main/java/org/apache/accumulo/server/conf/ZooConfigurationFactory.java
index 6c8ceca..0cfbff8 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/conf/ZooConfigurationFactory.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/conf/ZooConfigurationFactory.java
@@ -35,7 +35,7 @@ import org.apache.hadoop.fs.Path;
  * A factory for {@link ZooConfiguration} objects.
  */
 class ZooConfigurationFactory {
-  private static final Map<String,ZooConfiguration> instances = new HashMap<String,ZooConfiguration>();
+  private static final Map<String,ZooConfiguration> instances = new HashMap<>();
 
   /**
    * Gets a configuration object for the given instance with the given parent. Repeated calls will return the same object.

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/constraints/MetadataConstraints.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/constraints/MetadataConstraints.java b/server/base/src/main/java/org/apache/accumulo/server/constraints/MetadataConstraints.java
index fd5af14..7815a3d 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/constraints/MetadataConstraints.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/constraints/MetadataConstraints.java
@@ -64,12 +64,12 @@ public class MetadataConstraints implements Constraint {
     }
   }
 
-  private static final HashSet<ColumnFQ> validColumnQuals = new HashSet<ColumnFQ>(Arrays.asList(TabletsSection.TabletColumnFamily.PREV_ROW_COLUMN,
+  private static final HashSet<ColumnFQ> validColumnQuals = new HashSet<>(Arrays.asList(TabletsSection.TabletColumnFamily.PREV_ROW_COLUMN,
       TabletsSection.TabletColumnFamily.OLD_PREV_ROW_COLUMN, TabletsSection.ServerColumnFamily.DIRECTORY_COLUMN,
       TabletsSection.TabletColumnFamily.SPLIT_RATIO_COLUMN, TabletsSection.ServerColumnFamily.TIME_COLUMN, TabletsSection.ServerColumnFamily.LOCK_COLUMN,
       TabletsSection.ServerColumnFamily.FLUSH_COLUMN, TabletsSection.ServerColumnFamily.COMPACT_COLUMN));
 
-  private static final HashSet<Text> validColumnFams = new HashSet<Text>(Arrays.asList(TabletsSection.BulkFileColumnFamily.NAME, LogColumnFamily.NAME,
+  private static final HashSet<Text> validColumnFams = new HashSet<>(Arrays.asList(TabletsSection.BulkFileColumnFamily.NAME, LogColumnFamily.NAME,
       ScanFileColumnFamily.NAME, DataFileColumnFamily.NAME, TabletsSection.CurrentLocationColumnFamily.NAME, TabletsSection.LastLocationColumnFamily.NAME,
       TabletsSection.FutureLocationColumnFamily.NAME, ChoppedColumnFamily.NAME, ClonedColumnFamily.NAME));
 
@@ -86,7 +86,7 @@ public class MetadataConstraints implements Constraint {
 
   static private ArrayList<Short> addViolation(ArrayList<Short> lst, int violation) {
     if (lst == null)
-      lst = new ArrayList<Short>();
+      lst = new ArrayList<>();
     lst.add((short) violation);
     return lst;
   }
@@ -194,8 +194,8 @@ public class MetadataConstraints implements Constraint {
           // See ACCUMULO-1230.
           boolean isLocationMutation = false;
 
-          HashSet<Text> dataFiles = new HashSet<Text>();
-          HashSet<Text> loadedFiles = new HashSet<Text>();
+          HashSet<Text> dataFiles = new HashSet<>();
+          HashSet<Text> loadedFiles = new HashSet<>();
 
           String tidString = new String(columnUpdate.getValue(), UTF_8);
           int otherTidCount = 0;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/fs/PerTableVolumeChooser.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/fs/PerTableVolumeChooser.java b/server/base/src/main/java/org/apache/accumulo/server/fs/PerTableVolumeChooser.java
index e51df03..594a0a2 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/fs/PerTableVolumeChooser.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/fs/PerTableVolumeChooser.java
@@ -32,7 +32,7 @@ public class PerTableVolumeChooser implements VolumeChooser {
   private final VolumeChooser fallbackVolumeChooser = new RandomVolumeChooser();
   // TODO Add hint of expected size to construction, see ACCUMULO-3410
   /* Track VolumeChooser instances so they can keep state. */
-  private final ConcurrentHashMap<String,VolumeChooser> tableSpecificChooser = new ConcurrentHashMap<String,VolumeChooser>();
+  private final ConcurrentHashMap<String,VolumeChooser> tableSpecificChooser = new ConcurrentHashMap<>();
   // TODO has to be lazily initialized currently because of the reliance on HdfsZooInstance. see ACCUMULO-3411
   private volatile ServerConfigurationFactory serverConfs;
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/fs/PreferredVolumeChooser.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/fs/PreferredVolumeChooser.java b/server/base/src/main/java/org/apache/accumulo/server/fs/PreferredVolumeChooser.java
index 6bc225f..ec7c360 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/fs/PreferredVolumeChooser.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/fs/PreferredVolumeChooser.java
@@ -43,7 +43,7 @@ import com.google.common.base.Predicate;
  * to selecting from all of the options presented. Can be customized via the table property {@value #PREFERRED_VOLUMES_CUSTOM_KEY}, which should contain a comma
  * separated list of {@link Volume} URIs. Note that both the property name and the format of its value are specific to this particular implementation.
  */
-public class PreferredVolumeChooser extends RandomVolumeChooser implements VolumeChooser {
+public class PreferredVolumeChooser extends RandomVolumeChooser {
   private static final Logger log = LoggerFactory.getLogger(PreferredVolumeChooser.class);
 
   /**
@@ -77,7 +77,7 @@ public class PreferredVolumeChooser extends RandomVolumeChooser implements Volum
       serverConfs = localConf;
     }
     TableConfiguration tableConf = localConf.getTableConfiguration(env.getTableId());
-    final Map<String,String> props = new HashMap<String,String>();
+    final Map<String,String> props = new HashMap<>();
     tableConf.getProperties(props, PREFERRED_VOLUMES_FILTER);
     if (props.isEmpty()) {
       log.warn("No preferred volumes specified. Defaulting to randomly choosing from instance volumes");
@@ -93,12 +93,12 @@ public class PreferredVolumeChooser extends RandomVolumeChooser implements Volum
     // If the preferred volumes property was specified, split the returned string by the comma and add use it to filter the given options.
     Set<String> preferred = parsedPreferredVolumes.get(volumes);
     if (preferred == null) {
-      preferred = new HashSet<String>(Arrays.asList(StringUtils.split(volumes, ',')));
+      preferred = new HashSet<>(Arrays.asList(StringUtils.split(volumes, ',')));
       parsedPreferredVolumes.put(volumes, preferred);
     }
 
     // Only keep the options that are in the preferred set
-    final ArrayList<String> filteredOptions = new ArrayList<String>(Arrays.asList(options));
+    final ArrayList<String> filteredOptions = new ArrayList<>(Arrays.asList(options));
     filteredOptions.retainAll(preferred);
 
     // If there are no preferred volumes left, then warn the user and choose randomly from the instance volumes

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeManagerImpl.java b/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeManagerImpl.java
index 5317485..d9df424 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeManagerImpl.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeManagerImpl.java
@@ -65,7 +65,7 @@ public class VolumeManagerImpl implements VolumeManager {
 
   private static final Logger log = LoggerFactory.getLogger(VolumeManagerImpl.class);
 
-  private static final HashSet<String> WARNED_ABOUT_SYNCONCLOSE = new HashSet<String>();
+  private static final HashSet<String> WARNED_ABOUT_SYNCONCLOSE = new HashSet<>();
 
   private final Map<String,Volume> volumesByName;
   private final Multimap<URI,Volume> volumesByFileSystemUri;
@@ -326,7 +326,7 @@ public class VolumeManagerImpl implements VolumeManager {
   }
 
   public static VolumeManager get(AccumuloConfiguration conf, final Configuration hadoopConf) throws IOException {
-    final Map<String,Volume> volumes = new HashMap<String,Volume>();
+    final Map<String,Volume> volumes = new HashMap<>();
 
     // The "default" Volume for Accumulo (in case no volumes are specified)
     for (String volumeUriOrDir : VolumeConfiguration.getVolumeUris(conf, hadoopConf)) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeUtil.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeUtil.java b/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeUtil.java
index 0c3092b..192ae77 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeUtil.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeUtil.java
@@ -126,7 +126,7 @@ public class VolumeUtil {
     else
       switchedPath = le.filename;
 
-    ArrayList<String> switchedLogs = new ArrayList<String>();
+    ArrayList<String> switchedLogs = new ArrayList<>();
     String switchedLog = switchVolume(le.filename, FileType.WAL, replacements);
     if (switchedLog != null) {
       switchedLogs.add(switchedLog);
@@ -153,8 +153,8 @@ public class VolumeUtil {
     public SortedMap<FileRef,DataFileValue> datafiles;
 
     public TabletFiles() {
-      logEntries = new ArrayList<LogEntry>();
-      datafiles = new TreeMap<FileRef,DataFileValue>();
+      logEntries = new ArrayList<>();
+      datafiles = new TreeMap<>();
     }
 
     public TabletFiles(String dir, List<LogEntry> logEntries, SortedMap<FileRef,DataFileValue> datafiles) {
@@ -183,11 +183,11 @@ public class VolumeUtil {
     List<Pair<Path,Path>> replacements = ServerConstants.getVolumeReplacements();
     log.trace("Using volume replacements: " + replacements);
 
-    List<LogEntry> logsToRemove = new ArrayList<LogEntry>();
-    List<LogEntry> logsToAdd = new ArrayList<LogEntry>();
+    List<LogEntry> logsToRemove = new ArrayList<>();
+    List<LogEntry> logsToAdd = new ArrayList<>();
 
-    List<FileRef> filesToRemove = new ArrayList<FileRef>();
-    SortedMap<FileRef,DataFileValue> filesToAdd = new TreeMap<FileRef,DataFileValue>();
+    List<FileRef> filesToRemove = new ArrayList<>();
+    SortedMap<FileRef,DataFileValue> filesToAdd = new TreeMap<>();
 
     TabletFiles ret = new TabletFiles();
 
@@ -345,7 +345,7 @@ public class VolumeUtil {
   }
 
   private static HashSet<String> getFileNames(FileStatus[] filesStatuses) {
-    HashSet<String> names = new HashSet<String>();
+    HashSet<String> names = new HashSet<>();
     for (FileStatus fileStatus : filesStatuses)
       if (fileStatus.isDirectory())
         throw new IllegalArgumentException("expected " + fileStatus.getPath() + " to be a file");

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java b/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java
index 5a4cac1..0ccf51f 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java
@@ -155,9 +155,9 @@ public class Initialize implements KeywordExecutable {
     return zoo;
   }
 
-  private static HashMap<String,String> initialMetadataConf = new HashMap<String,String>();
-  private static HashMap<String,String> initialMetadataCombinerConf = new HashMap<String,String>();
-  private static HashMap<String,String> initialReplicationTableConf = new HashMap<String,String>();
+  private static HashMap<String,String> initialMetadataConf = new HashMap<>();
+  private static HashMap<String,String> initialMetadataCombinerConf = new HashMap<>();
+  private static HashMap<String,String> initialReplicationTableConf = new HashMap<>();
 
   static {
     initialMetadataConf.put(Property.TABLE_FILE_COMPRESSED_BLOCK_SIZE.getKey(), "32K");
@@ -575,7 +575,8 @@ public class Initialize implements KeywordExecutable {
       if (opts.clearInstanceName) {
         exists = false;
         break;
-      } else if (exists = zoo.exists(instanceNamePath)) {
+      } else if (zoo.exists(instanceNamePath)) {
+        exists = true;
         String decision = getConsoleReader().readLine("Instance name \"" + instanceName + "\" exists. Delete existing entry from zookeeper? [Y/N] : ");
         if (decision == null)
           System.exit(0);
@@ -696,10 +697,10 @@ public class Initialize implements KeywordExecutable {
 
     String[] volumeURIs = VolumeConfiguration.getVolumeUris(SiteConfiguration.getInstance());
 
-    HashSet<String> initializedDirs = new HashSet<String>();
+    HashSet<String> initializedDirs = new HashSet<>();
     initializedDirs.addAll(Arrays.asList(ServerConstants.checkBaseUris(volumeURIs, true)));
 
-    HashSet<String> uinitializedDirs = new HashSet<String>();
+    HashSet<String> uinitializedDirs = new HashSet<>();
     uinitializedDirs.addAll(Arrays.asList(volumeURIs));
     uinitializedDirs.removeAll(initializedDirs);
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/iterators/MetadataBulkLoadFilter.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/iterators/MetadataBulkLoadFilter.java b/server/base/src/main/java/org/apache/accumulo/server/iterators/MetadataBulkLoadFilter.java
index 772be32..3a76442 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/iterators/MetadataBulkLoadFilter.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/iterators/MetadataBulkLoadFilter.java
@@ -82,7 +82,7 @@ public class MetadataBulkLoadFilter extends Filter {
       throw new IOException("This iterator not intended for use at scan time");
     }
 
-    bulkTxStatusCache = new HashMap<Long,MetadataBulkLoadFilter.Status>();
+    bulkTxStatusCache = new HashMap<>();
     arbitrator = getArbitrator();
   }
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java b/server/base/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java
index 0c0cceb..46f5f8b 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java
@@ -205,15 +205,15 @@ public class LiveTServerSet implements Watcher {
       this.connection = connection;
       this.instance = instance;
     }
-  };
+  }
 
   // The set of active tservers with locks, indexed by their name in zookeeper
-  private Map<String,TServerInfo> current = new HashMap<String,TServerInfo>();
+  private Map<String,TServerInfo> current = new HashMap<>();
   // as above, indexed by TServerInstance
-  private Map<TServerInstance,TServerInfo> currentInstances = new HashMap<TServerInstance,TServerInfo>();
+  private Map<TServerInstance,TServerInfo> currentInstances = new HashMap<>();
 
   // The set of entries in zookeeper without locks, and the first time each was noticed
-  private Map<String,Long> locklessServers = new HashMap<String,Long>();
+  private Map<String,Long> locklessServers = new HashMap<>();
 
   public LiveTServerSet(ClientContext context, Listener cback) {
     this.cback = cback;
@@ -238,12 +238,12 @@ public class LiveTServerSet implements Watcher {
 
   public synchronized void scanServers() {
     try {
-      final Set<TServerInstance> updates = new HashSet<TServerInstance>();
-      final Set<TServerInstance> doomed = new HashSet<TServerInstance>();
+      final Set<TServerInstance> updates = new HashSet<>();
+      final Set<TServerInstance> doomed = new HashSet<>();
 
       final String path = ZooUtil.getRoot(context.getInstance()) + Constants.ZTSERVERS;
 
-      HashSet<String> all = new HashSet<String>(current.keySet());
+      HashSet<String> all = new HashSet<>(current.keySet());
       all.addAll(getZooCache().getChildren(path));
 
       locklessServers.keySet().retainAll(all);
@@ -332,8 +332,8 @@ public class LiveTServerSet implements Watcher {
 
           String server = event.getPath().substring(pos + 1);
 
-          final Set<TServerInstance> updates = new HashSet<TServerInstance>();
-          final Set<TServerInstance> doomed = new HashSet<TServerInstance>();
+          final Set<TServerInstance> updates = new HashSet<>();
+          final Set<TServerInstance> doomed = new HashSet<>();
 
           final String path = ZooUtil.getRoot(context.getInstance()) + Constants.ZTSERVERS;
 
@@ -359,7 +359,7 @@ public class LiveTServerSet implements Watcher {
   }
 
   public synchronized Set<TServerInstance> getCurrentServers() {
-    return new HashSet<TServerInstance>(currentInstances.keySet());
+    return new HashSet<>(currentInstances.keySet());
   }
 
   public synchronized int size() {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/master/balancer/ChaoticLoadBalancer.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/balancer/ChaoticLoadBalancer.java b/server/base/src/main/java/org/apache/accumulo/server/master/balancer/ChaoticLoadBalancer.java
index fd3dfd8..112fcc1 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/master/balancer/ChaoticLoadBalancer.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/master/balancer/ChaoticLoadBalancer.java
@@ -69,8 +69,8 @@ public class ChaoticLoadBalancer extends TabletBalancer {
       Map<KeyExtent,TServerInstance> assignments) {
     long total = assignments.size() + unassigned.size();
     long avg = (long) Math.ceil(((double) total) / current.size());
-    Map<TServerInstance,Long> toAssign = new HashMap<TServerInstance,Long>();
-    List<TServerInstance> tServerArray = new ArrayList<TServerInstance>();
+    Map<TServerInstance,Long> toAssign = new HashMap<>();
+    List<TServerInstance> tServerArray = new ArrayList<>();
     for (Entry<TServerInstance,TabletServerStatus> e : current.entrySet()) {
       long numTablets = 0;
       for (TableInfo ti : e.getValue().getTableMap().values()) {
@@ -105,8 +105,8 @@ public class ChaoticLoadBalancer extends TabletBalancer {
 
   @Override
   public long balance(SortedMap<TServerInstance,TabletServerStatus> current, Set<KeyExtent> migrations, List<TabletMigration> migrationsOut) {
-    Map<TServerInstance,Long> numTablets = new HashMap<TServerInstance,Long>();
-    List<TServerInstance> underCapacityTServer = new ArrayList<TServerInstance>();
+    Map<TServerInstance,Long> numTablets = new HashMap<>();
+    List<TServerInstance> underCapacityTServer = new ArrayList<>();
 
     if (!migrations.isEmpty()) {
       outstandingMigrations.migrations = migrations;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/master/balancer/DefaultLoadBalancer.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/balancer/DefaultLoadBalancer.java b/server/base/src/main/java/org/apache/accumulo/server/master/balancer/DefaultLoadBalancer.java
index 56b3839..c31eb37 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/master/balancer/DefaultLoadBalancer.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/master/balancer/DefaultLoadBalancer.java
@@ -53,7 +53,7 @@ public class DefaultLoadBalancer extends TabletBalancer {
   }
 
   List<TServerInstance> randomize(Set<TServerInstance> locations) {
-    List<TServerInstance> result = new ArrayList<TServerInstance>(locations);
+    List<TServerInstance> result = new ArrayList<>(locations);
     Collections.shuffle(result);
     return result;
   }
@@ -123,11 +123,11 @@ public class DefaultLoadBalancer extends TabletBalancer {
       if (current.size() < 2) {
         return false;
       }
-      final Map<String,Map<KeyExtent,TabletStats>> donerTabletStats = new HashMap<String,Map<KeyExtent,TabletStats>>();
+      final Map<String,Map<KeyExtent,TabletStats>> donerTabletStats = new HashMap<>();
 
       // Sort by total number of online tablets, per server
       int total = 0;
-      ArrayList<ServerCounts> totals = new ArrayList<ServerCounts>();
+      ArrayList<ServerCounts> totals = new ArrayList<>();
       for (Entry<TServerInstance,TabletServerStatus> entry : current.entrySet()) {
         int serverTotal = 0;
         if (entry.getValue() != null && entry.getValue().tableMap != null) {
@@ -197,7 +197,7 @@ public class DefaultLoadBalancer extends TabletBalancer {
    */
   List<TabletMigration> move(ServerCounts tooMuch, ServerCounts tooLittle, int count, Map<String,Map<KeyExtent,TabletStats>> donerTabletStats) {
 
-    List<TabletMigration> result = new ArrayList<TabletMigration>();
+    List<TabletMigration> result = new ArrayList<>();
     if (count == 0)
       return result;
 
@@ -235,7 +235,7 @@ public class DefaultLoadBalancer extends TabletBalancer {
       Map<KeyExtent,TabletStats> onlineTabletsForTable = donerTabletStats.get(table);
       try {
         if (onlineTabletsForTable == null) {
-          onlineTabletsForTable = new HashMap<KeyExtent,TabletStats>();
+          onlineTabletsForTable = new HashMap<>();
           List<TabletStats> stats = getOnlineTabletsForTable(tooMuch.server, table);
           if (null == stats) {
             log.warn("Unable to find tablets to move");
@@ -271,7 +271,7 @@ public class DefaultLoadBalancer extends TabletBalancer {
   }
 
   static Map<String,Integer> tabletCountsPerTable(TabletServerStatus status) {
-    Map<String,Integer> result = new HashMap<String,Integer>();
+    Map<String,Integer> result = new HashMap<>();
     if (status != null && status.tableMap != null) {
       Map<String,TableInfo> tableMap = status.tableMap;
       for (Entry<String,TableInfo> entry : tableMap.entrySet()) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/master/balancer/GroupBalancer.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/balancer/GroupBalancer.java b/server/base/src/main/java/org/apache/accumulo/server/master/balancer/GroupBalancer.java
index b2b2ed5..1838536 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/master/balancer/GroupBalancer.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/master/balancer/GroupBalancer.java
@@ -145,7 +145,7 @@ public abstract class GroupBalancer extends TabletBalancer {
         }
       }
 
-      tabletsByGroup.add(new ComparablePair<String,KeyExtent>(partitioner.apply(entry.getKey()), entry.getKey()));
+      tabletsByGroup.add(new ComparablePair<>(partitioner.apply(entry.getKey()), entry.getKey()));
     }
 
     Collections.sort(tabletsByGroup);
@@ -528,7 +528,7 @@ public abstract class GroupBalancer extends TabletBalancer {
             if (srcTgi.getExtras().size() <= maxExtraGroups) {
               serversToRemove.add(srcTgi.getTserverInstance());
             } else {
-              serversGroupsToRemove.add(new Pair<String,TServerInstance>(group, srcTgi.getTserverInstance()));
+              serversGroupsToRemove.add(new Pair<>(group, srcTgi.getTserverInstance()));
             }
 
             if (destTgi.getExtras().size() >= maxExtraGroups || moves.size() >= getMaxMigrations()) {
@@ -593,7 +593,7 @@ public abstract class GroupBalancer extends TabletBalancer {
             moves.move(group, 1, srcTgi, destTgi);
 
             if (num == 2) {
-              serversToRemove.add(new Pair<String,TserverGroupInfo>(group, srcTgi));
+              serversToRemove.add(new Pair<>(group, srcTgi));
             }
 
             if (destTgi.getExtras().size() >= maxExtraGroups || moves.size() >= getMaxMigrations()) {
@@ -655,7 +655,7 @@ public abstract class GroupBalancer extends TabletBalancer {
             if (srcTgi.getExtras().size() <= expectedExtra) {
               emptyServers.add(srcTgi.getTserverInstance());
             } else if (srcTgi.getExtras().get(group) == null) {
-              emptyServerGroups.add(new Pair<String,TServerInstance>(group, srcTgi.getTserverInstance()));
+              emptyServerGroups.add(new Pair<>(group, srcTgi.getTserverInstance()));
             }
 
             if (destTgi.getExtras().size() >= expectedExtra || moves.size() >= getMaxMigrations()) {
@@ -761,7 +761,7 @@ public abstract class GroupBalancer extends TabletBalancer {
         }
       }
 
-      return new Pair<KeyExtent,Location>(extent, loc);
+      return new Pair<>(extent, loc);
     }
 
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancer.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancer.java b/server/base/src/main/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancer.java
index 0506b5c..0fd217c 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancer.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancer.java
@@ -89,7 +89,7 @@ public class HostRegexTableLoadBalancer extends TableLoadBalancer implements Con
   private volatile long lastOOBCheck = System.currentTimeMillis();
   private volatile long lastPoolRecheck = 0;
   private boolean isIpBasedRegex = false;
-  private Map<String,SortedMap<TServerInstance,TabletServerStatus>> pools = new HashMap<String,SortedMap<TServerInstance,TabletServerStatus>>();
+  private Map<String,SortedMap<TServerInstance,TabletServerStatus>> pools = new HashMap<>();
   private int maxTServerMigrations = HOST_BALANCER_REGEX_MAX_MIGRATIONS_DEFAULT;
 
   /**
@@ -103,13 +103,13 @@ public class HostRegexTableLoadBalancer extends TableLoadBalancer implements Con
   protected synchronized Map<String,SortedMap<TServerInstance,TabletServerStatus>> splitCurrentByRegex(SortedMap<TServerInstance,TabletServerStatus> current) {
     if ((System.currentTimeMillis() - lastPoolRecheck) > poolRecheckMillis) {
       LOG.debug("Performing pool recheck - regrouping tablet servers based on regular expressions");
-      Map<String,SortedMap<TServerInstance,TabletServerStatus>> newPools = new HashMap<String,SortedMap<TServerInstance,TabletServerStatus>>();
+      Map<String,SortedMap<TServerInstance,TabletServerStatus>> newPools = new HashMap<>();
       for (Entry<TServerInstance,TabletServerStatus> e : current.entrySet()) {
         List<String> poolNames = getPoolNamesForHost(e.getKey().host());
         for (String pool : poolNames) {
           SortedMap<TServerInstance,TabletServerStatus> np = newPools.get(pool);
           if (null == np) {
-            np = new TreeMap<TServerInstance,TabletServerStatus>(current.comparator());
+            np = new TreeMap<>(current.comparator());
             newPools.put(pool, np);
           }
           np.put(e.getKey(), e.getValue());
@@ -265,18 +265,18 @@ public class HostRegexTableLoadBalancer extends TableLoadBalancer implements Con
 
     Map<String,SortedMap<TServerInstance,TabletServerStatus>> pools = splitCurrentByRegex(current);
     // group the unassigned into tables
-    Map<String,Map<KeyExtent,TServerInstance>> groupedUnassigned = new HashMap<String,Map<KeyExtent,TServerInstance>>();
+    Map<String,Map<KeyExtent,TServerInstance>> groupedUnassigned = new HashMap<>();
     for (Entry<KeyExtent,TServerInstance> e : unassigned.entrySet()) {
       Map<KeyExtent,TServerInstance> tableUnassigned = groupedUnassigned.get(e.getKey().getTableId());
       if (tableUnassigned == null) {
-        tableUnassigned = new HashMap<KeyExtent,TServerInstance>();
+        tableUnassigned = new HashMap<>();
         groupedUnassigned.put(e.getKey().getTableId(), tableUnassigned);
       }
       tableUnassigned.put(e.getKey(), e.getValue());
     }
     // Send a view of the current servers to the tables tablet balancer
     for (Entry<String,Map<KeyExtent,TServerInstance>> e : groupedUnassigned.entrySet()) {
-      Map<KeyExtent,TServerInstance> newAssignments = new HashMap<KeyExtent,TServerInstance>();
+      Map<KeyExtent,TServerInstance> newAssignments = new HashMap<>();
       String tableName = tableIdToTableName.get(e.getKey());
       String poolName = getPoolNameForTable(tableName);
       SortedMap<TServerInstance,TabletServerStatus> currentView = pools.get(poolName);
@@ -377,7 +377,7 @@ public class HostRegexTableLoadBalancer extends TableLoadBalancer implements Con
             this.poolRecheckMillis);
         continue;
       }
-      ArrayList<TabletMigration> newMigrations = new ArrayList<TabletMigration>();
+      ArrayList<TabletMigration> newMigrations = new ArrayList<>();
       long tableBalanceTime = getBalancerForTable(s).balance(currentView, migrations, newMigrations);
       if (tableBalanceTime < minBalanceTime) {
         minBalanceTime = tableBalanceTime;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/master/balancer/TableLoadBalancer.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/balancer/TableLoadBalancer.java b/server/base/src/main/java/org/apache/accumulo/server/master/balancer/TableLoadBalancer.java
index 4bae545..de3f4f7 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/master/balancer/TableLoadBalancer.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/master/balancer/TableLoadBalancer.java
@@ -43,7 +43,7 @@ public class TableLoadBalancer extends TabletBalancer {
 
   private static final Logger log = LoggerFactory.getLogger(TableLoadBalancer.class);
 
-  Map<String,TabletBalancer> perTableBalancers = new HashMap<String,TabletBalancer>();
+  Map<String,TabletBalancer> perTableBalancers = new HashMap<>();
 
   private TabletBalancer constructNewBalancerForTable(String clazzName, String table) throws Exception {
     String context = null;
@@ -114,17 +114,17 @@ public class TableLoadBalancer extends TabletBalancer {
   public void getAssignments(SortedMap<TServerInstance,TabletServerStatus> current, Map<KeyExtent,TServerInstance> unassigned,
       Map<KeyExtent,TServerInstance> assignments) {
     // separate the unassigned into tables
-    Map<String,Map<KeyExtent,TServerInstance>> groupedUnassigned = new HashMap<String,Map<KeyExtent,TServerInstance>>();
+    Map<String,Map<KeyExtent,TServerInstance>> groupedUnassigned = new HashMap<>();
     for (Entry<KeyExtent,TServerInstance> e : unassigned.entrySet()) {
       Map<KeyExtent,TServerInstance> tableUnassigned = groupedUnassigned.get(e.getKey().getTableId());
       if (tableUnassigned == null) {
-        tableUnassigned = new HashMap<KeyExtent,TServerInstance>();
+        tableUnassigned = new HashMap<>();
         groupedUnassigned.put(e.getKey().getTableId(), tableUnassigned);
       }
       tableUnassigned.put(e.getKey(), e.getValue());
     }
     for (Entry<String,Map<KeyExtent,TServerInstance>> e : groupedUnassigned.entrySet()) {
-      Map<KeyExtent,TServerInstance> newAssignments = new HashMap<KeyExtent,TServerInstance>();
+      Map<KeyExtent,TServerInstance> newAssignments = new HashMap<>();
       getBalancerForTable(e.getKey()).getAssignments(current, e.getValue(), newAssignments);
       assignments.putAll(newAssignments);
     }
@@ -152,7 +152,7 @@ public class TableLoadBalancer extends TabletBalancer {
     if (t == null)
       return minBalanceTime;
     for (String s : t.tableIdMap().values()) {
-      ArrayList<TabletMigration> newMigrations = new ArrayList<TabletMigration>();
+      ArrayList<TabletMigration> newMigrations = new ArrayList<>();
       long tableBalanceTime = getBalancerForTable(s).balance(current, migrations, newMigrations);
       if (tableBalanceTime < minBalanceTime)
         minBalanceTime = tableBalanceTime;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/master/balancer/TabletBalancer.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/balancer/TabletBalancer.java b/server/base/src/main/java/org/apache/accumulo/server/master/balancer/TabletBalancer.java
index a199288..a160bb0 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/master/balancer/TabletBalancer.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/master/balancer/TabletBalancer.java
@@ -213,7 +213,7 @@ public abstract class TabletBalancer {
    * @return A list of TabletMigration object that passed sanity checks.
    */
   public static List<TabletMigration> checkMigrationSanity(Set<TServerInstance> current, List<TabletMigration> migrations) {
-    List<TabletMigration> result = new ArrayList<TabletMigration>(migrations.size());
+    List<TabletMigration> result = new ArrayList<>(migrations.size());
     for (TabletMigration m : migrations) {
       if (m.tablet == null) {
         log.warn("Balancer gave back a null tablet " + m);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/master/state/DeadServerList.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/state/DeadServerList.java b/server/base/src/main/java/org/apache/accumulo/server/master/state/DeadServerList.java
index 3cd2517..0be5f45 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/master/state/DeadServerList.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/master/state/DeadServerList.java
@@ -46,7 +46,7 @@ public class DeadServerList {
   }
 
   public List<DeadServer> getList() {
-    List<DeadServer> result = new ArrayList<DeadServer>();
+    List<DeadServer> result = new ArrayList<>();
     IZooReaderWriter zoo = ZooReaderWriter.getInstance();
     try {
       List<String> children = zoo.getChildren(path);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/master/state/MetaDataTableScanner.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/state/MetaDataTableScanner.java b/server/base/src/main/java/org/apache/accumulo/server/master/state/MetaDataTableScanner.java
index 536e1a5..14486a6 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/master/state/MetaDataTableScanner.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/master/state/MetaDataTableScanner.java
@@ -137,7 +137,7 @@ public class MetaDataTableScanner implements ClosableIterator<TabletLocationStat
     TServerInstance current = null;
     TServerInstance last = null;
     long lastTimestamp = 0;
-    List<Collection<String>> walogs = new ArrayList<Collection<String>>();
+    List<Collection<String>> walogs = new ArrayList<>();
     boolean chopped = false;
 
     for (Entry<Key,Value> entry : decodedRow.entrySet()) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/master/state/TabletServerState.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/state/TabletServerState.java b/server/base/src/main/java/org/apache/accumulo/server/master/state/TabletServerState.java
index 942eabf..d618d8b 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/master/state/TabletServerState.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/master/state/TabletServerState.java
@@ -45,8 +45,8 @@ public enum TabletServerState {
   private static HashSet<TabletServerState> badStates;
 
   static {
-    mapping = new HashMap<Byte,TabletServerState>(TabletServerState.values().length);
-    badStates = new HashSet<TabletServerState>();
+    mapping = new HashMap<>(TabletServerState.values().length);
+    badStates = new HashSet<>();
     for (TabletServerState state : TabletServerState.values()) {
       mapping.put(state.id, state);
       if (state.id > 99)

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/master/state/TabletStateChangeIterator.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/state/TabletStateChangeIterator.java b/server/base/src/main/java/org/apache/accumulo/server/master/state/TabletStateChangeIterator.java
index 26d98a8..973bbd2 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/master/state/TabletStateChangeIterator.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/master/state/TabletStateChangeIterator.java
@@ -90,7 +90,7 @@ public class TabletStateChangeIterator extends SkippingIterator {
     if (migrations == null)
       return Collections.emptySet();
     try {
-      Set<KeyExtent> result = new HashSet<KeyExtent>();
+      Set<KeyExtent> result = new HashSet<>();
       DataInputBuffer buffer = new DataInputBuffer();
       byte[] data = Base64.decodeBase64(migrations.getBytes(UTF_8));
       buffer.reset(data, data.length);
@@ -108,7 +108,7 @@ public class TabletStateChangeIterator extends SkippingIterator {
   private Set<String> parseTables(String tables) {
     if (tables == null)
       return null;
-    Set<String> result = new HashSet<String>();
+    Set<String> result = new HashSet<>();
     for (String table : tables.split(","))
       result.add(table);
     return result;
@@ -118,7 +118,7 @@ public class TabletStateChangeIterator extends SkippingIterator {
     if (servers == null)
       return null;
     // parse "host:port[INSTANCE]"
-    Set<TServerInstance> result = new HashSet<TServerInstance>();
+    Set<TServerInstance> result = new HashSet<>();
     if (servers.length() > 0) {
       for (String part : servers.split(",")) {
         String parts[] = part.split("\\[", 2);
@@ -136,7 +136,7 @@ public class TabletStateChangeIterator extends SkippingIterator {
     if (merges == null)
       return null;
     try {
-      Map<String,MergeInfo> result = new HashMap<String,MergeInfo>();
+      Map<String,MergeInfo> result = new HashMap<>();
       DataInputBuffer buffer = new DataInputBuffer();
       byte[] data = Base64.decodeBase64(merges.getBytes(UTF_8));
       buffer.reset(data, data.length);
@@ -215,7 +215,7 @@ public class TabletStateChangeIterator extends SkippingIterator {
 
   public static void setCurrentServers(IteratorSetting cfg, Set<TServerInstance> goodServers) {
     if (goodServers != null) {
-      List<String> servers = new ArrayList<String>();
+      List<String> servers = new ArrayList<>();
       for (TServerInstance server : goodServers)
         servers.add(server.toString());
       cfg.addOption(SERVERS_OPTION, Joiner.on(",").join(servers));
@@ -262,7 +262,7 @@ public class TabletStateChangeIterator extends SkippingIterator {
 
   public static void setShuttingDown(IteratorSetting cfg, Set<TServerInstance> servers) {
     if (servers != null) {
-      List<String> serverList = new ArrayList<String>();
+      List<String> serverList = new ArrayList<>();
       for (TServerInstance server : servers) {
         serverList.add(server.toString());
       }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/master/state/ZooTabletStateStore.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/state/ZooTabletStateStore.java b/server/base/src/main/java/org/apache/accumulo/server/master/state/ZooTabletStateStore.java
index 720046f..8f92db5 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/master/state/ZooTabletStateStore.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/master/state/ZooTabletStateStore.java
@@ -84,7 +84,7 @@ public class ZooTabletStateStore extends TabletStateStore {
             currentSession = parse(current);
             futureSession = null;
           }
-          List<Collection<String>> logs = new ArrayList<Collection<String>>();
+          List<Collection<String>> logs = new ArrayList<>();
           for (String entry : store.getChildren(RootTable.ZROOT_TABLET_WALOGS)) {
             byte[] logInfo = store.get(RootTable.ZROOT_TABLET_WALOGS + "/" + entry);
             if (logInfo != null) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/master/tableOps/UserCompactionConfig.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/tableOps/UserCompactionConfig.java b/server/base/src/main/java/org/apache/accumulo/server/master/tableOps/UserCompactionConfig.java
index 02c6ac3..def0696 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/master/tableOps/UserCompactionConfig.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/master/tableOps/UserCompactionConfig.java
@@ -89,7 +89,7 @@ public class UserCompactionConfig implements Writable {
     }
 
     int num = in.readInt();
-    iterators = new ArrayList<IteratorSetting>(num);
+    iterators = new ArrayList<>(num);
 
     for (int i = 0; i < num; i++) {
       iterators.add(new IteratorSetting(in));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/metrics/AbstractMetricsImpl.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/metrics/AbstractMetricsImpl.java b/server/base/src/main/java/org/apache/accumulo/server/metrics/AbstractMetricsImpl.java
index 42d2d00..24a9750 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/metrics/AbstractMetricsImpl.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/metrics/AbstractMetricsImpl.java
@@ -93,7 +93,7 @@ public abstract class AbstractMetricsImpl implements Metrics {
 
   static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(AbstractMetricsImpl.class);
 
-  private static ConcurrentHashMap<String,Metric> registry = new ConcurrentHashMap<String,Metric>();
+  private static ConcurrentHashMap<String,Metric> registry = new ConcurrentHashMap<>();
 
   private boolean currentlyLogging = false;
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/monitor/LogService.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/monitor/LogService.java b/server/base/src/main/java/org/apache/accumulo/server/monitor/LogService.java
index fce1ca9..d59267a 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/monitor/LogService.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/monitor/LogService.java
@@ -181,7 +181,7 @@ public class LogService extends org.apache.log4j.AppenderSkeleton {
   }
 
   synchronized public List<DedupedLogEvent> getEvents() {
-    return new ArrayList<DedupedLogEvent>(events.values());
+    return new ArrayList<>(events.values());
   }
 
   synchronized public void clear() {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/problems/ProblemReports.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/problems/ProblemReports.java b/server/base/src/main/java/org/apache/accumulo/server/problems/ProblemReports.java
index d44efb1..82e9f5b 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/problems/ProblemReports.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/problems/ProblemReports.java
@@ -305,12 +305,12 @@ public class ProblemReports implements Iterable<ProblemReport> {
 
   public Map<String,Map<ProblemType,Integer>> summarize() {
 
-    TreeMap<String,Map<ProblemType,Integer>> summary = new TreeMap<String,Map<ProblemType,Integer>>();
+    TreeMap<String,Map<ProblemType,Integer>> summary = new TreeMap<>();
 
     for (ProblemReport pr : this) {
       Map<ProblemType,Integer> tableProblems = summary.get(pr.getTableName());
       if (tableProblems == null) {
-        tableProblems = new EnumMap<ProblemType,Integer>(ProblemType.class);
+        tableProblems = new EnumMap<>(ProblemType.class);
         summary.put(pr.getTableName(), tableProblems);
       }
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/replication/StatusCombiner.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/replication/StatusCombiner.java b/server/base/src/main/java/org/apache/accumulo/server/replication/StatusCombiner.java
index aacf64d..84e4742 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/replication/StatusCombiner.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/replication/StatusCombiner.java
@@ -45,7 +45,7 @@ import com.google.protobuf.InvalidProtocolBufferException;
 public class StatusCombiner extends TypedValueCombiner<Status> {
   private static final Logger log = LoggerFactory.getLogger(StatusCombiner.class);
 
-  public static class StatusEncoder extends AbstractEncoder<Status> implements Encoder<Status> {
+  public static class StatusEncoder extends AbstractEncoder<Status> {
     private static final Logger log = LoggerFactory.getLogger(StatusEncoder.class);
 
     @Override

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/rpc/RpcWrapper.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/rpc/RpcWrapper.java b/server/base/src/main/java/org/apache/accumulo/server/rpc/RpcWrapper.java
index ec68166..b942913 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/rpc/RpcWrapper.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/rpc/RpcWrapper.java
@@ -106,7 +106,7 @@ public class RpcWrapper {
     isOnewayMethod.setAccessible(true);
 
     try {
-      final Set<String> onewayMethods = new HashSet<String>();
+      final Set<String> onewayMethods = new HashSet<>();
       for (Entry<String,?> entry : processorView.entrySet()) {
         try {
           if ((Boolean) isOnewayMethod.invoke(entry.getValue())) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/rpc/TCredentialsUpdatingWrapper.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/rpc/TCredentialsUpdatingWrapper.java b/server/base/src/main/java/org/apache/accumulo/server/rpc/TCredentialsUpdatingWrapper.java
index 698cf9e..54f61dd 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/rpc/TCredentialsUpdatingWrapper.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/rpc/TCredentialsUpdatingWrapper.java
@@ -29,7 +29,7 @@ import org.apache.accumulo.core.conf.AccumuloConfiguration;
 public class TCredentialsUpdatingWrapper {
 
   public static <T> T service(final T instance, final Class<? extends T> originalClass, AccumuloConfiguration conf) {
-    InvocationHandler handler = new TCredentialsUpdatingInvocationHandler<T>(instance, conf);
+    InvocationHandler handler = new TCredentialsUpdatingInvocationHandler<>(instance, conf);
 
     @SuppressWarnings("unchecked")
     T proxiedInstance = (T) Proxy.newProxyInstance(originalClass.getClassLoader(), originalClass.getInterfaces(), handler);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/rpc/TServerUtils.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/rpc/TServerUtils.java b/server/base/src/main/java/org/apache/accumulo/server/rpc/TServerUtils.java
index f874353..49995d6 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/rpc/TServerUtils.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/rpc/TServerUtils.java
@@ -71,7 +71,7 @@ public class TServerUtils {
   /**
    * Static instance, passed to {@link ClientInfoProcessorFactory}, which will contain the client address of any incoming RPC.
    */
-  public static final ThreadLocal<String> clientAddress = new ThreadLocal<String>();
+  public static final ThreadLocal<String> clientAddress = new ThreadLocal<>();
 
   /**
    *
@@ -339,7 +339,7 @@ public class TServerUtils {
 
       // Be nice for the user and automatically remove protocols that might not exist in their JVM. Keeps us from forcing config alterations too
       // e.g. TLSv1.1 and TLSv1.2 don't exist in JDK6
-      Set<String> socketEnabledProtocols = new HashSet<String>(Arrays.asList(sslServerSock.getEnabledProtocols()));
+      Set<String> socketEnabledProtocols = new HashSet<>(Arrays.asList(sslServerSock.getEnabledProtocols()));
       // Keep only the enabled protocols that were specified by the configuration
       socketEnabledProtocols.retainAll(Arrays.asList(protocols));
       if (socketEnabledProtocols.isEmpty()) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/rpc/UGIAssumingProcessor.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/rpc/UGIAssumingProcessor.java b/server/base/src/main/java/org/apache/accumulo/server/rpc/UGIAssumingProcessor.java
index 48d18f4..27f15c7 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/rpc/UGIAssumingProcessor.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/rpc/UGIAssumingProcessor.java
@@ -40,8 +40,8 @@ import org.slf4j.LoggerFactory;
 public class UGIAssumingProcessor implements TProcessor {
   private static final Logger log = LoggerFactory.getLogger(UGIAssumingProcessor.class);
 
-  public static final ThreadLocal<String> rpcPrincipal = new ThreadLocal<String>();
-  public static final ThreadLocal<SaslMechanism> rpcMechanism = new ThreadLocal<SaslMechanism>();
+  public static final ThreadLocal<String> rpcPrincipal = new ThreadLocal<>();
+  public static final ThreadLocal<SaslMechanism> rpcMechanism = new ThreadLocal<>();
 
   private final TProcessor wrapped;
   private final UserGroupInformation loginUser;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/security/AuditedSecurityOperation.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/security/AuditedSecurityOperation.java b/server/base/src/main/java/org/apache/accumulo/server/security/AuditedSecurityOperation.java
index 7fc9d81..e5ca006 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/security/AuditedSecurityOperation.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/security/AuditedSecurityOperation.java
@@ -130,7 +130,7 @@ public class AuditedSecurityOperation extends SecurityOperation {
   private static final int MAX_ELEMENTS_TO_LOG = 10;
 
   private static List<String> truncate(Collection<?> list) {
-    List<String> result = new ArrayList<String>();
+    List<String> result = new ArrayList<>();
     int i = 0;
     for (Object obj : list) {
       if (i++ > MAX_ELEMENTS_TO_LOG) {
@@ -173,7 +173,7 @@ public class AuditedSecurityOperation extends SecurityOperation {
       @SuppressWarnings({"unchecked", "rawtypes"})
       Map<KeyExtent,List<Range>> convertedBatch = Translator.translate(tbatch, new Translator.TKeyExtentTranslator(), new Translator.ListTranslator(
           new Translator.TRangeTranslator()));
-      Map<KeyExtent,List<String>> truncated = new HashMap<KeyExtent,List<String>>();
+      Map<KeyExtent,List<String>> truncated = new HashMap<>();
       for (Entry<KeyExtent,List<Range>> entry : convertedBatch.entrySet()) {
         truncated.put(entry.getKey(), truncate(entry.getValue()));
       }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/security/delegation/AuthenticationTokenSecretManager.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/security/delegation/AuthenticationTokenSecretManager.java b/server/base/src/main/java/org/apache/accumulo/server/security/delegation/AuthenticationTokenSecretManager.java
index 99a088a..a648cb5 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/security/delegation/AuthenticationTokenSecretManager.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/security/delegation/AuthenticationTokenSecretManager.java
@@ -58,7 +58,7 @@ public class AuthenticationTokenSecretManager extends SecretManager<Authenticati
 
   private final Instance instance;
   private final long tokenMaxLifetime;
-  private final ConcurrentHashMap<Integer,AuthenticationKey> allKeys = new ConcurrentHashMap<Integer,AuthenticationKey>();
+  private final ConcurrentHashMap<Integer,AuthenticationKey> allKeys = new ConcurrentHashMap<>();
   private AuthenticationKey currentKey;
 
   /**
@@ -168,7 +168,7 @@ public class AuthenticationTokenSecretManager extends SecretManager<Authenticati
     }
     // The use of the ServiceLoader inside Token doesn't work to automatically get the Identifier
     // Explicitly returning the identifier also saves an extra deserialization
-    Token<AuthenticationTokenIdentifier> token = new Token<AuthenticationTokenIdentifier>(id.getBytes(), password, id.getKind(), new Text(svcName.toString()));
+    Token<AuthenticationTokenIdentifier> token = new Token<>(id.getBytes(), password, id.getKind(), new Text(svcName.toString()));
     return Maps.immutableEntry(token, id);
   }
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/security/handler/InsecureAuthenticator.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/security/handler/InsecureAuthenticator.java b/server/base/src/main/java/org/apache/accumulo/server/security/handler/InsecureAuthenticator.java
index a57608c..8170ea3 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/security/handler/InsecureAuthenticator.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/security/handler/InsecureAuthenticator.java
@@ -73,7 +73,7 @@ public class InsecureAuthenticator implements Authenticator {
 
   @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(NullToken.class);
     return cs;
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKAuthenticator.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKAuthenticator.java b/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKAuthenticator.java
index a1616c1..6623fc6 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKAuthenticator.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKAuthenticator.java
@@ -103,7 +103,7 @@ public final class ZKAuthenticator implements Authenticator {
 
   @Override
   public Set<String> listUsers() {
-    return new TreeSet<String>(zooCache.getChildren(ZKUserPath));
+    return new TreeSet<>(zooCache.getChildren(ZKUserPath));
   }
 
   @Override
@@ -200,7 +200,7 @@ public final class ZKAuthenticator implements Authenticator {
 
   @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/b102e760/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKAuthorizor.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKAuthorizor.java b/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKAuthorizor.java
index 2d7f7bb..2803627 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKAuthorizor.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKAuthorizor.java
@@ -86,10 +86,10 @@ public class ZKAuthorizor implements Authorizor {
     IZooReaderWriter zoo = ZooReaderWriter.getInstance();
 
     // create the root user with all system privileges, no table privileges, and no record-level authorizations
-    Set<SystemPermission> rootPerms = new TreeSet<SystemPermission>();
+    Set<SystemPermission> rootPerms = new TreeSet<>();
     for (SystemPermission p : SystemPermission.values())
       rootPerms.add(p);
-    Map<String,Set<TablePermission>> tablePerms = new HashMap<String,Set<TablePermission>>();
+    Map<String,Set<TablePermission>> tablePerms = new HashMap<>();
     // Allow the root user to flush the metadata tables
     tablePerms.put(MetadataTable.ID, Collections.singleton(TablePermission.ALTER_TABLE));
     tablePerms.put(RootTable.ID, Collections.singleton(TablePermission.ALTER_TABLE));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKPermHandler.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKPermHandler.java b/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKPermHandler.java
index 06433c4..cf43aee 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKPermHandler.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKPermHandler.java
@@ -180,7 +180,7 @@ public class ZKPermHandler implements PermissionHandler {
       byte[] permBytes = zooCache.get(ZKUserPath + "/" + user + ZKUserSysPerms);
       Set<SystemPermission> perms;
       if (permBytes == null) {
-        perms = new TreeSet<SystemPermission>();
+        perms = new TreeSet<>();
       } else {
         perms = ZKSecurityTool.convertSystemPermissions(permBytes);
       }
@@ -208,7 +208,7 @@ public class ZKPermHandler implements PermissionHandler {
     if (serializedPerms != null)
       tablePerms = ZKSecurityTool.convertTablePermissions(serializedPerms);
     else
-      tablePerms = new TreeSet<TablePermission>();
+      tablePerms = new TreeSet<>();
 
     try {
       if (tablePerms.add(permission)) {
@@ -234,7 +234,7 @@ public class ZKPermHandler implements PermissionHandler {
     if (serializedPerms != null)
       namespacePerms = ZKSecurityTool.convertNamespacePermissions(serializedPerms);
     else
-      namespacePerms = new TreeSet<NamespacePermission>();
+      namespacePerms = new TreeSet<>();
 
     try {
       if (namespacePerms.add(permission)) {
@@ -377,15 +377,15 @@ public class ZKPermHandler implements PermissionHandler {
     IZooReaderWriter zoo = ZooReaderWriter.getInstance();
 
     // create the root user with all system privileges, no table privileges, and no record-level authorizations
-    Set<SystemPermission> rootPerms = new TreeSet<SystemPermission>();
+    Set<SystemPermission> rootPerms = new TreeSet<>();
     for (SystemPermission p : SystemPermission.values())
       rootPerms.add(p);
-    Map<String,Set<TablePermission>> tablePerms = new HashMap<String,Set<TablePermission>>();
+    Map<String,Set<TablePermission>> tablePerms = new HashMap<>();
     // Allow the root user to flush the system tables
     tablePerms.put(RootTable.ID, Collections.singleton(TablePermission.ALTER_TABLE));
     tablePerms.put(MetadataTable.ID, Collections.singleton(TablePermission.ALTER_TABLE));
     // essentially the same but on the system namespace, the ALTER_TABLE permission is now redundant
-    Map<String,Set<NamespacePermission>> namespacePerms = new HashMap<String,Set<NamespacePermission>>();
+    Map<String,Set<NamespacePermission>> namespacePerms = new HashMap<>();
     namespacePerms.put(Namespaces.ACCUMULO_NAMESPACE_ID, Collections.singleton(NamespacePermission.ALTER_NAMESPACE));
     namespacePerms.put(Namespaces.ACCUMULO_NAMESPACE_ID, Collections.singleton(NamespacePermission.ALTER_TABLE));
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKSecurityTool.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKSecurityTool.java b/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKSecurityTool.java
index 6401190..a3da0d8 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKSecurityTool.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKSecurityTool.java
@@ -120,7 +120,7 @@ class ZKSecurityTool {
   public static Set<SystemPermission> convertSystemPermissions(byte[] systempermissions) {
     ByteArrayInputStream bytes = new ByteArrayInputStream(systempermissions);
     DataInputStream in = new DataInputStream(bytes);
-    Set<SystemPermission> toReturn = new HashSet<SystemPermission>();
+    Set<SystemPermission> toReturn = new HashSet<>();
     try {
       while (in.available() > 0)
         toReturn.add(SystemPermission.getPermissionById(in.readByte()));
@@ -145,7 +145,7 @@ class ZKSecurityTool {
   }
 
   public static Set<TablePermission> convertTablePermissions(byte[] tablepermissions) {
-    Set<TablePermission> toReturn = new HashSet<TablePermission>();
+    Set<TablePermission> toReturn = new HashSet<>();
     for (byte b : tablepermissions)
       toReturn.add(TablePermission.getPermissionById(b));
     return toReturn;
@@ -165,7 +165,7 @@ class ZKSecurityTool {
   }
 
   public static Set<NamespacePermission> convertNamespacePermissions(byte[] namespacepermissions) {
-    Set<NamespacePermission> toReturn = new HashSet<NamespacePermission>();
+    Set<NamespacePermission> toReturn = new HashSet<>();
     for (byte b : namespacepermissions)
       toReturn.add(NamespacePermission.getPermissionById(b));
     return toReturn;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java b/server/base/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java
index 176b247..01faacd 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java
@@ -51,7 +51,7 @@ public class LargestFirstMemoryManager implements MemoryManager {
   // The fraction of memory that needs to be used before we begin flushing.
   private double compactionThreshold;
   private long maxObserved;
-  private final HashMap<String,Long> mincIdleThresholds = new HashMap<String,Long>();
+  private final HashMap<String,Long> mincIdleThresholds = new HashMap<>();
   private ServerConfiguration config = null;
 
   private static class TabletInfo {
@@ -71,7 +71,7 @@ public class LargestFirstMemoryManager implements MemoryManager {
   // A little map that will hold the "largest" N tablets, where largest is a result of the timeMemoryLoad function
   private static class LargestMap {
     final int max;
-    final TreeMap<Long,List<TabletInfo>> map = new TreeMap<Long,List<TabletInfo>>();
+    final TreeMap<Long,List<TabletInfo>> map = new TreeMap<>();
 
     LargestMap(int n) {
       max = n;
@@ -98,7 +98,7 @@ public class LargestFirstMemoryManager implements MemoryManager {
       if (lst != null) {
         lst.add(value);
       } else {
-        lst = new ArrayList<TabletInfo>();
+        lst = new ArrayList<>();
         lst.add(value);
         map.put(key, lst);
       }
@@ -159,7 +159,7 @@ public class LargestFirstMemoryManager implements MemoryManager {
 
     mincIdleThresholds.clear();
     final MemoryManagementActions result = new MemoryManagementActions();
-    result.tabletsToMinorCompact = new ArrayList<KeyExtent>();
+    result.tabletsToMinorCompact = new ArrayList<>();
 
     LargestMap largestMemTablets = new LargestMap(maxMinCs);
     final LargestMap largestIdleMemTablets = new LargestMap(maxConcurrentMincs);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/util/Admin.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/Admin.java b/server/base/src/main/java/org/apache/accumulo/server/util/Admin.java
index df18fbf..ea2f458 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/Admin.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/Admin.java
@@ -90,13 +90,13 @@ public class Admin implements KeywordExecutable {
   @Parameters(commandDescription = "stop the tablet server on the given hosts")
   static class StopCommand {
     @Parameter(description = "<host> {<host> ... }")
-    List<String> args = new ArrayList<String>();
+    List<String> args = new ArrayList<>();
   }
 
   @Parameters(commandDescription = "Ping tablet servers.  If no arguments, pings all.")
   static class PingCommand {
     @Parameter(description = "{<host> ... }")
-    List<String> args = new ArrayList<String>();
+    List<String> args = new ArrayList<>();
   }
 
   @Parameters(commandDescription = "print tablets that are offline in online tables")
@@ -139,7 +139,7 @@ public class Admin implements KeywordExecutable {
     @Parameter(names = {"-n", "--namespaces"}, description = "print the namespace configuration")
     boolean namespaceConfiguration = false;
     @Parameter(names = {"-t", "--tables"}, description = "print per-table configuration")
-    List<String> tables = new ArrayList<String>();
+    List<String> tables = new ArrayList<>();
     @Parameter(names = {"-u", "--users"}, description = "print users and their authorizations and permissions")
     boolean users = false;
   }
@@ -518,7 +518,7 @@ public class Admin implements KeywordExecutable {
     File namespaceScript = new File(outputDirectory, namespace + NS_FILE_SUFFIX);
     FileWriter nsWriter = new FileWriter(namespaceScript);
     nsWriter.write(createNsFormat.format(new String[] {namespace}));
-    TreeMap<String,String> props = new TreeMap<String,String>();
+    TreeMap<String,String> props = new TreeMap<>();
     for (Entry<String,String> p : connector.namespaceOperations().getProperties(namespace)) {
       props.put(p.getKey(), p.getValue());
     }
@@ -565,14 +565,14 @@ public class Admin implements KeywordExecutable {
 
   private void printSystemConfiguration(Connector connector, File outputDirectory) throws IOException, AccumuloException, AccumuloSecurityException {
     Configuration conf = new Configuration(false);
-    TreeMap<String,String> site = new TreeMap<String,String>(siteConfig);
+    TreeMap<String,String> site = new TreeMap<>(siteConfig);
     for (Entry<String,String> prop : site.entrySet()) {
       String defaultValue = getDefaultConfigValue(prop.getKey());
       if (!prop.getValue().equals(defaultValue) && !systemConfig.containsKey(prop.getKey())) {
         conf.set(prop.getKey(), prop.getValue());
       }
     }
-    TreeMap<String,String> system = new TreeMap<String,String>(systemConfig);
+    TreeMap<String,String> system = new TreeMap<>(systemConfig);
     for (Entry<String,String> prop : system.entrySet()) {
       String defaultValue = getDefaultConfigValue(prop.getKey());
       if (!prop.getValue().equals(defaultValue)) {
@@ -593,7 +593,7 @@ public class Admin implements KeywordExecutable {
     File tableBackup = new File(outputDirectory, tableName + ".cfg");
     FileWriter writer = new FileWriter(tableBackup);
     writer.write(createTableFormat.format(new String[] {tableName}));
-    TreeMap<String,String> props = new TreeMap<String,String>();
+    TreeMap<String,String> props = new TreeMap<>();
     for (Entry<String,String> p : connector.tableOperations().getProperties(tableName)) {
       props.put(p.getKey(), p.getValue());
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/util/ChangeSecret.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/ChangeSecret.java b/server/base/src/main/java/org/apache/accumulo/server/util/ChangeSecret.java
index a9ecf47..43863b5 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/ChangeSecret.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/ChangeSecret.java
@@ -54,7 +54,7 @@ public class ChangeSecret {
 
   public static void main(String[] args) throws Exception {
     Opts opts = new Opts();
-    List<String> argsList = new ArrayList<String>(args.length + 2);
+    List<String> argsList = new ArrayList<>(args.length + 2);
     argsList.add("--old");
     argsList.add("--new");
     argsList.addAll(Arrays.asList(args));
@@ -90,7 +90,7 @@ public class ChangeSecret {
   private static boolean verifyAccumuloIsDown(Instance inst, String oldPassword) {
     ZooReader zooReader = new ZooReaderWriter(inst.getZooKeepers(), inst.getZooKeepersSessionTimeOut(), oldPassword);
     String root = ZooUtil.getRoot(inst);
-    final List<String> ephemerals = new ArrayList<String>();
+    final List<String> ephemerals = new ArrayList<>();
     recurse(zooReader, root, new Visitor() {
       @Override
       public void visit(ZooReader zoo, String path) throws Exception {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/util/CheckForMetadataProblems.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/CheckForMetadataProblems.java b/server/base/src/main/java/org/apache/accumulo/server/util/CheckForMetadataProblems.java
index 867cd67..4f69c72 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/CheckForMetadataProblems.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/CheckForMetadataProblems.java
@@ -90,7 +90,7 @@ public class CheckForMetadataProblems {
 
   public static void checkMetadataAndRootTableEntries(String tableNameToCheck, ClientOpts opts, VolumeManager fs) throws Exception {
     System.out.println("Checking table: " + tableNameToCheck);
-    Map<String,TreeSet<KeyExtent>> tables = new HashMap<String,TreeSet<KeyExtent>>();
+    Map<String,TreeSet<KeyExtent>> tables = new HashMap<>();
 
     Scanner scanner;
 
@@ -124,7 +124,7 @@ public class CheckForMetadataProblems {
 
         tables.clear();
 
-        tablets = new TreeSet<KeyExtent>();
+        tablets = new TreeSet<>();
         tables.put(tableName, tablets);
       }
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/util/DeleteZooInstance.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/DeleteZooInstance.java b/server/base/src/main/java/org/apache/accumulo/server/util/DeleteZooInstance.java
index ba27733..0c4578c 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/DeleteZooInstance.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/DeleteZooInstance.java
@@ -60,8 +60,8 @@ public class DeleteZooInstance {
 
     IZooReaderWriter zk = ZooReaderWriter.getInstance();
     // try instance name:
-    Set<String> instances = new HashSet<String>(zk.getChildren(Constants.ZROOT + Constants.ZINSTANCES));
-    Set<String> uuids = new HashSet<String>(zk.getChildren(Constants.ZROOT));
+    Set<String> instances = new HashSet<>(zk.getChildren(Constants.ZROOT + Constants.ZINSTANCES));
+    Set<String> uuids = new HashSet<>(zk.getChildren(Constants.ZROOT));
     uuids.remove("instances");
     if (instances.contains(opts.instance)) {
       String path = Constants.ZROOT + Constants.ZINSTANCES + "/" + opts.instance;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/util/FileSystemMonitor.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/FileSystemMonitor.java b/server/base/src/main/java/org/apache/accumulo/server/util/FileSystemMonitor.java
index 11d0e0f..5e9959c 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/FileSystemMonitor.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/FileSystemMonitor.java
@@ -56,7 +56,7 @@ public class FileSystemMonitor {
       mountPoint = tokens[1].trim();
       filesystemType = tokens[2].trim().toLowerCase();
 
-      options = new HashSet<String>(Arrays.asList(tokens[3].split(",")));
+      options = new HashSet<>(Arrays.asList(tokens[3].split(",")));
     }
 
     @Override
@@ -80,7 +80,7 @@ public class FileSystemMonitor {
   }
 
   static List<Mount> getMountsFromFile(BufferedReader br) throws IOException {
-    List<Mount> mounts = new ArrayList<Mount>();
+    List<Mount> mounts = new ArrayList<>();
     String line;
     while ((line = br.readLine()) != null) {
       Mount mount = new Mount(line);
@@ -94,7 +94,7 @@ public class FileSystemMonitor {
     return mounts;
   }
 
-  private Map<String,Boolean> readWriteFilesystems = new HashMap<String,Boolean>();
+  private Map<String,Boolean> readWriteFilesystems = new HashMap<>();
 
   public FileSystemMonitor(final String procFile, long period) throws IOException {
     List<Mount> mounts = parse(procFile);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/util/FileUtil.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/FileUtil.java b/server/base/src/main/java/org/apache/accumulo/server/util/FileUtil.java
index 491a830..a686bae 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/FileUtil.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/FileUtil.java
@@ -109,7 +109,7 @@ public class FileUtil {
 
   public static Collection<String> reduceFiles(AccumuloConfiguration acuConf, Configuration conf, VolumeManager fs, Text prevEndRow, Text endRow,
       Collection<String> mapFiles, int maxFiles, Path tmpDir, int pass) throws IOException {
-    ArrayList<String> paths = new ArrayList<String>(mapFiles);
+    ArrayList<String> paths = new ArrayList<>(mapFiles);
 
     if (paths.size() <= maxFiles)
       return paths;
@@ -118,7 +118,7 @@ public class FileUtil {
 
     int start = 0;
 
-    ArrayList<String> outFiles = new ArrayList<String>();
+    ArrayList<String> outFiles = new ArrayList<>();
 
     int count = 0;
 
@@ -134,7 +134,7 @@ public class FileUtil {
       FileSystem ns = fs.getVolumeByPath(new Path(newMapFile)).getFileSystem();
       FileSKVWriter writer = new RFileOperations().newWriterBuilder().forFile(newMapFile.toString(), ns, ns.getConf()).withTableConfiguration(acuConf).build();
       writer.startDefaultLocalityGroup();
-      List<SortedKeyValueIterator<Key,Value>> iters = new ArrayList<SortedKeyValueIterator<Key,Value>>(inFiles.size());
+      List<SortedKeyValueIterator<Key,Value>> iters = new ArrayList<>(inFiles.size());
 
       FileSKVIterator reader = null;
       try {
@@ -202,7 +202,7 @@ public class FileUtil {
     Path tmpDir = null;
 
     int maxToOpen = acuconf.getCount(Property.TSERV_TABLET_SPLIT_FINDMIDPOINT_MAXOPEN);
-    ArrayList<FileSKVIterator> readers = new ArrayList<FileSKVIterator>(mapFiles.size());
+    ArrayList<FileSKVIterator> readers = new ArrayList<>(mapFiles.size());
 
     try {
       if (mapFiles.size() > maxToOpen) {
@@ -275,7 +275,7 @@ public class FileUtil {
     Path tmpDir = null;
 
     int maxToOpen = acuConf.getCount(Property.TSERV_TABLET_SPLIT_FINDMIDPOINT_MAXOPEN);
-    ArrayList<FileSKVIterator> readers = new ArrayList<FileSKVIterator>(mapFiles.size());
+    ArrayList<FileSKVIterator> readers = new ArrayList<>(mapFiles.size());
 
     try {
       if (mapFiles.size() > maxToOpen) {
@@ -319,7 +319,7 @@ public class FileUtil {
         mmfi.next();
 
       // read half of the keys in the index
-      TreeMap<Double,Key> ret = new TreeMap<Double,Key>();
+      TreeMap<Double,Key> ret = new TreeMap<>();
       Key lastKey = null;
       long keysRead = 0;
 
@@ -436,7 +436,7 @@ public class FileUtil {
 
   public static Map<FileRef,FileInfo> tryToGetFirstAndLastRows(VolumeManager fs, AccumuloConfiguration acuConf, Set<FileRef> mapfiles) {
 
-    HashMap<FileRef,FileInfo> mapFilesInfo = new HashMap<FileRef,FileInfo>();
+    HashMap<FileRef,FileInfo> mapFilesInfo = new HashMap<>();
 
     long t1 = System.currentTimeMillis();
 
@@ -517,7 +517,7 @@ public class FileUtil {
       VolumeManager fs) throws IOException {
 
     long totalIndexEntries = 0;
-    Map<KeyExtent,MLong> counts = new TreeMap<KeyExtent,MLong>();
+    Map<KeyExtent,MLong> counts = new TreeMap<>();
     for (KeyExtent keyExtent : extents)
       counts.put(keyExtent, new MLong(0));
 
@@ -548,7 +548,7 @@ public class FileUtil {
       }
     }
 
-    Map<KeyExtent,Long> results = new TreeMap<KeyExtent,Long>();
+    Map<KeyExtent,Long> results = new TreeMap<>();
     for (KeyExtent keyExtent : extents) {
       double numEntries = counts.get(keyExtent).l;
       if (numEntries == 0)
@@ -560,7 +560,7 @@ public class FileUtil {
   }
 
   public static Collection<String> toPathStrings(Collection<FileRef> refs) {
-    ArrayList<String> ret = new ArrayList<String>();
+    ArrayList<String> ret = new ArrayList<>();
     for (FileRef fileRef : refs) {
       ret.add(fileRef.path().toString());
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/util/ListInstances.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/ListInstances.java b/server/base/src/main/java/org/apache/accumulo/server/util/ListInstances.java
index 9dc1251..0674bea 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/ListInstances.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/ListInstances.java
@@ -172,7 +172,7 @@ public class ListInstances {
 
     String instancesPath = Constants.ZROOT + Constants.ZINSTANCES;
 
-    TreeMap<String,UUID> tm = new TreeMap<String,UUID>();
+    TreeMap<String,UUID> tm = new TreeMap<>();
 
     List<String> names;
 
@@ -198,7 +198,7 @@ public class ListInstances {
   }
 
   private static TreeSet<UUID> getInstanceIDs(ZooReader zk, boolean printErrors) {
-    TreeSet<UUID> ts = new TreeSet<UUID>();
+    TreeSet<UUID> ts = new TreeSet<>();
 
     try {
       List<String> children = zk.getChildren(Constants.ZROOT);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/util/ListVolumesUsed.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/ListVolumesUsed.java b/server/base/src/main/java/org/apache/accumulo/server/util/ListVolumesUsed.java
index 9ad461b..3e30aaf 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/ListVolumesUsed.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/ListVolumesUsed.java
@@ -67,10 +67,10 @@ public class ListVolumesUsed {
 
   private static void listZookeeper() throws Exception {
     System.out.println("Listing volumes referenced in zookeeper");
-    TreeSet<String> volumes = new TreeSet<String>();
+    TreeSet<String> volumes = new TreeSet<>();
 
     volumes.add(getTableURI(MetadataTableUtil.getRootTabletDir()));
-    ArrayList<LogEntry> result = new ArrayList<LogEntry>();
+    ArrayList<LogEntry> result = new ArrayList<>();
     MetadataTableUtil.getRootLogEntries(result);
     for (LogEntry logEntry : result) {
       getLogURIs(volumes, logEntry);
@@ -92,7 +92,7 @@ public class ListVolumesUsed {
     scanner.fetchColumnFamily(MetadataSchema.TabletsSection.LogColumnFamily.NAME);
     MetadataSchema.TabletsSection.ServerColumnFamily.DIRECTORY_COLUMN.fetch(scanner);
 
-    TreeSet<String> volumes = new TreeSet<String>();
+    TreeSet<String> volumes = new TreeSet<>();
 
     for (Entry<Key,Value> entry : scanner) {
       if (entry.getKey().getColumnFamily().equals(MetadataSchema.TabletsSection.DataFileColumnFamily.NAME)) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/util/LocalityCheck.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/LocalityCheck.java b/server/base/src/main/java/org/apache/accumulo/server/util/LocalityCheck.java
index 5d49fa7..2e43505 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/LocalityCheck.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/LocalityCheck.java
@@ -53,9 +53,9 @@ public class LocalityCheck {
     scanner.fetchColumnFamily(DataFileColumnFamily.NAME);
     scanner.setRange(MetadataSchema.TabletsSection.getRange());
 
-    Map<String,Long> totalBlocks = new HashMap<String,Long>();
-    Map<String,Long> localBlocks = new HashMap<String,Long>();
-    ArrayList<String> files = new ArrayList<String>();
+    Map<String,Long> totalBlocks = new HashMap<>();
+    Map<String,Long> localBlocks = new HashMap<>();
+    ArrayList<String> files = new ArrayList<>();
 
     for (Entry<Key,Value> entry : scanner) {
       Key key = entry.getKey();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/util/LoginProperties.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/LoginProperties.java b/server/base/src/main/java/org/apache/accumulo/server/util/LoginProperties.java
index 8ffe586..7c102e6 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/LoginProperties.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/LoginProperties.java
@@ -46,7 +46,7 @@ public class LoginProperties implements KeywordExecutable {
     Authenticator authenticator = AccumuloVFSClassLoader.getClassLoader().loadClass(config.get(Property.INSTANCE_SECURITY_AUTHENTICATOR))
         .asSubclass(Authenticator.class).newInstance();
 
-    List<Set<TokenProperty>> tokenProps = new ArrayList<Set<TokenProperty>>();
+    List<Set<TokenProperty>> tokenProps = new ArrayList<>();
 
     for (Class<? extends AuthenticationToken> tokenType : authenticator.getSupportedTokenTypes()) {
       tokenProps.add(tokenType.newInstance().getProperties());

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/util/MasterMetadataUtil.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/MasterMetadataUtil.java b/server/base/src/main/java/org/apache/accumulo/server/util/MasterMetadataUtil.java
index 5aa61bc..1bdd255 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/MasterMetadataUtil.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/MasterMetadataUtil.java
@@ -161,11 +161,11 @@ public class MasterMetadataUtil {
       } else {
         log.info("Finishing incomplete split " + metadataEntry + " " + metadataPrevEndRow);
 
-        List<FileRef> highDatafilesToRemove = new ArrayList<FileRef>();
+        List<FileRef> highDatafilesToRemove = new ArrayList<>();
 
-        SortedMap<FileRef,DataFileValue> origDatafileSizes = new TreeMap<FileRef,DataFileValue>();
-        SortedMap<FileRef,DataFileValue> highDatafileSizes = new TreeMap<FileRef,DataFileValue>();
-        SortedMap<FileRef,DataFileValue> lowDatafileSizes = new TreeMap<FileRef,DataFileValue>();
+        SortedMap<FileRef,DataFileValue> origDatafileSizes = new TreeMap<>();
+        SortedMap<FileRef,DataFileValue> highDatafileSizes = new TreeMap<>();
+        SortedMap<FileRef,DataFileValue> lowDatafileSizes = new TreeMap<>();
 
         try (Scanner scanner3 = new ScannerImpl(context, MetadataTable.ID, Authorizations.EMPTY)) {
           Key rowKey = new Key(metadataEntry);


[18/32] accumulo git commit: ACCUMULO-4357 Remove unneeded code for readability

Posted by ct...@apache.org.
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);
       }
 


[16/32] accumulo git commit: ACCUMULO-4357 Remove unneeded code for readability

Posted by ct...@apache.org.
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/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 69cf23c..dea1b7f 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);
@@ -462,7 +462,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));
     }
@@ -474,7 +474,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/b102e760/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 4d4402b..63a7771 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
@@ -183,7 +183,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
@@ -270,7 +270,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/b102e760/test/src/main/java/org/apache/accumulo/test/proxy/ProxyDurabilityIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/proxy/ProxyDurabilityIT.java b/test/src/main/java/org/apache/accumulo/test/proxy/ProxyDurabilityIT.java
index 133c09c..d9a1027 100644
--- a/test/src/main/java/org/apache/accumulo/test/proxy/ProxyDurabilityIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/proxy/ProxyDurabilityIT.java
@@ -96,7 +96,7 @@ public class ProxyDurabilityIT extends ConfigurableMacBase {
     while (!proxyServer.isServing())
       sleepUninterruptibly(100, TimeUnit.MILLISECONDS);
     Client client = new TestProxyClient("localhost", proxyPort, protocol).proxy();
-    Map<String,String> properties = new TreeMap<String,String>();
+    Map<String,String> properties = new TreeMap<>();
     properties.put("password", ROOT_PASSWORD);
     ByteBuffer login = client.login("root", properties);
 
@@ -107,7 +107,7 @@ public class ProxyDurabilityIT extends ConfigurableMacBase {
     WriterOptions options = new WriterOptions();
     options.setDurability(Durability.NONE);
     String writer = client.createWriter(login, tableName, options);
-    Map<ByteBuffer,List<ColumnUpdate>> cells = new TreeMap<ByteBuffer,List<ColumnUpdate>>();
+    Map<ByteBuffer,List<ColumnUpdate>> cells = new TreeMap<>();
     ColumnUpdate column = new ColumnUpdate(bytes("cf"), bytes("cq"));
     column.setValue("value".getBytes());
     cells.put(bytes("row"), Collections.singletonList(column));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/proxy/SimpleProxyBase.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/proxy/SimpleProxyBase.java b/test/src/main/java/org/apache/accumulo/test/proxy/SimpleProxyBase.java
index a972443..cfb572d 100644
--- a/test/src/main/java/org/apache/accumulo/test/proxy/SimpleProxyBase.java
+++ b/test/src/main/java/org/apache/accumulo/test/proxy/SimpleProxyBase.java
@@ -451,7 +451,7 @@ public abstract class SimpleProxyBase extends SharedMiniClusterBase {
 
   @Test(expected = AccumuloSecurityException.class, timeout = 5000)
   public void setLocalityGroupsLoginFailure() throws Exception {
-    Map<String,Set<String>> groups = new HashMap<String,Set<String>>();
+    Map<String,Set<String>> groups = new HashMap<>();
     groups.put("group1", Collections.singleton("cf1"));
     groups.put("group2", Collections.singleton("cf2"));
     client.setLocalityGroups(badLogin, tableName, groups);
@@ -523,7 +523,7 @@ public abstract class SimpleProxyBase extends SharedMiniClusterBase {
 
   @Test(expected = AccumuloSecurityException.class, timeout = 5000)
   public void changeUserAuthorizationsLoginFailure() throws Exception {
-    HashSet<ByteBuffer> auths = new HashSet<ByteBuffer>(Arrays.asList(s2bb("A"), s2bb("B")));
+    HashSet<ByteBuffer> auths = new HashSet<>(Arrays.asList(s2bb("A"), s2bb("B")));
     client.changeUserAuthorizations(badLogin, "stooge", auths);
   }
 
@@ -1236,7 +1236,7 @@ public abstract class SimpleProxyBase extends SharedMiniClusterBase {
     t.start();
 
     // look for the scan many times
-    List<ActiveScan> scans = new ArrayList<ActiveScan>();
+    List<ActiveScan> scans = new ArrayList<>();
     for (int i = 0; i < 100 && scans.isEmpty(); i++) {
       for (String tserver : client.getTabletServers(creds)) {
         List<ActiveScan> scansForServer = client.getActiveScans(creds, tserver);
@@ -1323,7 +1323,7 @@ public abstract class SimpleProxyBase extends SharedMiniClusterBase {
     assertNotNull(desiredTableId);
 
     // try to catch it in the act
-    List<ActiveCompaction> compactions = new ArrayList<ActiveCompaction>();
+    List<ActiveCompaction> compactions = new ArrayList<>();
     for (int i = 0; i < 100 && compactions.isEmpty(); i++) {
       // Iterate over the tservers
       for (String tserver : client.getTabletServers(creds)) {
@@ -1392,12 +1392,12 @@ public abstract class SimpleProxyBase extends SharedMiniClusterBase {
     client.createLocalUser(creds, user, password);
     // change auths
     Set<String> users = client.listLocalUsers(creds);
-    Set<String> expectedUsers = new HashSet<String>(Arrays.asList(clientPrincipal, user));
+    Set<String> expectedUsers = new HashSet<>(Arrays.asList(clientPrincipal, user));
     assertTrue("Did not find all expected users: " + expectedUsers, users.containsAll(expectedUsers));
-    HashSet<ByteBuffer> auths = new HashSet<ByteBuffer>(Arrays.asList(s2bb("A"), s2bb("B")));
+    HashSet<ByteBuffer> auths = new HashSet<>(Arrays.asList(s2bb("A"), s2bb("B")));
     client.changeUserAuthorizations(creds, user, auths);
     List<ByteBuffer> update = client.getUserAuthorizations(creds, user);
-    assertEquals(auths, new HashSet<ByteBuffer>(update));
+    assertEquals(auths, new HashSet<>(update));
 
     // change password
     if (!isKerberosEnabled()) {
@@ -1840,7 +1840,7 @@ public abstract class SimpleProxyBase extends SharedMiniClusterBase {
   @Test
   public void tableMergesAndSplits() throws Exception {
     // add some splits
-    client.addSplits(creds, tableName, new HashSet<ByteBuffer>(Arrays.asList(s2bb("a"), s2bb("m"), s2bb("z"))));
+    client.addSplits(creds, tableName, new HashSet<>(Arrays.asList(s2bb("a"), s2bb("m"), s2bb("z"))));
     List<ByteBuffer> splits = client.listSplits(creds, tableName, 1);
     assertEquals(Arrays.asList(s2bb("m")), splits);
 
@@ -1861,7 +1861,7 @@ public abstract class SimpleProxyBase extends SharedMiniClusterBase {
   @Test
   public void iteratorFunctionality() throws Exception {
     // iterators
-    HashMap<String,String> options = new HashMap<String,String>();
+    HashMap<String,String> options = new HashMap<>();
     options.put("type", "STRING");
     options.put("columns", "cf");
     IteratorSetting setting = new IteratorSetting(10, tableName, SummingCombiner.class.getName(), options);
@@ -1949,7 +1949,7 @@ public abstract class SimpleProxyBase extends SharedMiniClusterBase {
 
     // Clone the table
     client.cloneTable(creds, tableName, TABLE_TEST2, true, null, null);
-    Set<String> tablesToScan = new HashSet<String>();
+    Set<String> tablesToScan = new HashSet<>();
     tablesToScan.add(tableName);
     tablesToScan.add(TABLE_TEST2);
     tablesToScan.add("foo");
@@ -2027,7 +2027,7 @@ public abstract class SimpleProxyBase extends SharedMiniClusterBase {
 
   @Test
   public void localityGroups() throws Exception {
-    Map<String,Set<String>> groups = new HashMap<String,Set<String>>();
+    Map<String,Set<String>> groups = new HashMap<>();
     groups.put("group1", Collections.singleton("cf1"));
     groups.put("group2", Collections.singleton("cf2"));
     client.setLocalityGroups(creds, tableName, groups);
@@ -2151,7 +2151,7 @@ public abstract class SimpleProxyBase extends SharedMiniClusterBase {
 
     String cwid = client.createConditionalWriter(creds, tableName, new ConditionalWriterOptions());
 
-    Map<ByteBuffer,ConditionalUpdates> updates = new HashMap<ByteBuffer,ConditionalUpdates>();
+    Map<ByteBuffer,ConditionalUpdates> updates = new HashMap<>();
 
     updates.put(
         s2bb("00345"),
@@ -2248,7 +2248,7 @@ public abstract class SimpleProxyBase extends SharedMiniClusterBase {
 
     // following test w/ iterator setup should succeed
     Condition iterCond = newCondition("data", "count", "3");
-    Map<String,String> props = new HashMap<String,String>();
+    Map<String,String> props = new HashMap<>();
     props.put("type", "STRING");
     props.put("columns", "data:count");
     IteratorSetting is = new IteratorSetting(1, "sumc", SummingCombiner.class.getName(), props);
@@ -2534,7 +2534,7 @@ public abstract class SimpleProxyBase extends SharedMiniClusterBase {
   }
 
   private Map<String,String> s2pp(String cf) {
-    Map<String,String> toRet = new TreeMap<String,String>();
+    Map<String,String> toRet = new TreeMap<>();
     toRet.put("password", cf);
     return toRet;
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/proxy/TestProxyClient.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/proxy/TestProxyClient.java b/test/src/main/java/org/apache/accumulo/test/proxy/TestProxyClient.java
index ff92795..bb03934 100644
--- a/test/src/main/java/org/apache/accumulo/test/proxy/TestProxyClient.java
+++ b/test/src/main/java/org/apache/accumulo/test/proxy/TestProxyClient.java
@@ -96,7 +96,7 @@ public class TestProxyClient {
 
     TestProxyClient tpc = new TestProxyClient("localhost", 42424);
     String principal = "root";
-    Map<String,String> props = new TreeMap<String,String>();
+    Map<String,String> props = new TreeMap<>();
     props.put("password", "secret");
 
     System.out.println("Logging in");
@@ -127,7 +127,7 @@ public class TestProxyClient {
     Date then = new Date();
     int maxInserts = 1000000;
     String format = "%1$05d";
-    Map<ByteBuffer,List<ColumnUpdate>> mutations = new HashMap<ByteBuffer,List<ColumnUpdate>>();
+    Map<ByteBuffer,List<ColumnUpdate>> mutations = new HashMap<>();
     for (int i = 0; i < maxInserts; i++) {
       String result = String.format(format, i);
       ColumnUpdate update = new ColumnUpdate(ByteBuffer.wrap(("cf" + i).getBytes(UTF_8)), ByteBuffer.wrap(("cq" + i).getBytes(UTF_8)));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/proxy/TestProxyReadWrite.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/proxy/TestProxyReadWrite.java b/test/src/main/java/org/apache/accumulo/test/proxy/TestProxyReadWrite.java
index 1a75fea..764a08c 100644
--- a/test/src/main/java/org/apache/accumulo/test/proxy/TestProxyReadWrite.java
+++ b/test/src/main/java/org/apache/accumulo/test/proxy/TestProxyReadWrite.java
@@ -104,7 +104,7 @@ public class TestProxyReadWrite {
   @Test
   public void readWriteBatchOneShotWithRange() throws Exception {
     int maxInserts = 100000;
-    Map<ByteBuffer,List<ColumnUpdate>> mutations = new HashMap<ByteBuffer,List<ColumnUpdate>>();
+    Map<ByteBuffer,List<ColumnUpdate>> mutations = new HashMap<>();
     String format = "%1$05d";
     for (int i = 0; i < maxInserts; i++) {
       addMutation(mutations, String.format(format, i), "cf" + i, "cq" + i, Util.randString(10));
@@ -140,7 +140,7 @@ public class TestProxyReadWrite {
   @Test
   public void readWriteBatchOneShotWithColumnFamilyOnly() throws Exception {
     int maxInserts = 100000;
-    Map<ByteBuffer,List<ColumnUpdate>> mutations = new HashMap<ByteBuffer,List<ColumnUpdate>>();
+    Map<ByteBuffer,List<ColumnUpdate>> mutations = new HashMap<>();
     String format = "%1$05d";
     for (int i = 0; i < maxInserts; i++) {
 
@@ -179,7 +179,7 @@ public class TestProxyReadWrite {
   @Test
   public void readWriteBatchOneShotWithFullColumn() throws Exception {
     int maxInserts = 100000;
-    Map<ByteBuffer,List<ColumnUpdate>> mutations = new HashMap<ByteBuffer,List<ColumnUpdate>>();
+    Map<ByteBuffer,List<ColumnUpdate>> mutations = new HashMap<>();
     String format = "%1$05d";
     for (int i = 0; i < maxInserts; i++) {
 
@@ -218,7 +218,7 @@ public class TestProxyReadWrite {
   @Test
   public void readWriteBatchOneShotWithFilterIterator() throws Exception {
     int maxInserts = 10000;
-    Map<ByteBuffer,List<ColumnUpdate>> mutations = new HashMap<ByteBuffer,List<ColumnUpdate>>();
+    Map<ByteBuffer,List<ColumnUpdate>> mutations = new HashMap<>();
     String format = "%1$05d";
     for (int i = 0; i < maxInserts; i++) {
       addMutation(mutations, String.format(format, i), "cf" + i, "cq" + i, Util.randString(10));
@@ -258,7 +258,7 @@ public class TestProxyReadWrite {
   @Test
   public void readWriteOneShotWithRange() throws Exception {
     int maxInserts = 100000;
-    Map<ByteBuffer,List<ColumnUpdate>> mutations = new HashMap<ByteBuffer,List<ColumnUpdate>>();
+    Map<ByteBuffer,List<ColumnUpdate>> mutations = new HashMap<>();
     String format = "%1$05d";
     for (int i = 0; i < maxInserts; i++) {
       addMutation(mutations, String.format(format, i), "cf" + i, "cq" + i, Util.randString(10));
@@ -293,7 +293,7 @@ public class TestProxyReadWrite {
   @Test
   public void readWriteOneShotWithFilterIterator() throws Exception {
     int maxInserts = 10000;
-    Map<ByteBuffer,List<ColumnUpdate>> mutations = new HashMap<ByteBuffer,List<ColumnUpdate>>();
+    Map<ByteBuffer,List<ColumnUpdate>> mutations = new HashMap<>();
     String format = "%1$05d";
     for (int i = 0; i < maxInserts; i++) {
       addMutation(mutations, String.format(format, i), "cf" + i, "cq" + i, Util.randString(10));
@@ -336,7 +336,7 @@ public class TestProxyReadWrite {
   // This test takes kind of a long time. Enable it if you think you may have memory issues.
   public void manyWritesAndReads() throws Exception {
     int maxInserts = 1000000;
-    Map<ByteBuffer,List<ColumnUpdate>> mutations = new HashMap<ByteBuffer,List<ColumnUpdate>>();
+    Map<ByteBuffer,List<ColumnUpdate>> mutations = new HashMap<>();
     String format = "%1$06d";
     String writer = tpc.proxy().createWriter(userpass, testtable, null);
     for (int i = 0; i < maxInserts; i++) {
@@ -376,7 +376,7 @@ public class TestProxyReadWrite {
   @Test
   public void asynchReadWrite() throws Exception {
     int maxInserts = 10000;
-    Map<ByteBuffer,List<ColumnUpdate>> mutations = new HashMap<ByteBuffer,List<ColumnUpdate>>();
+    Map<ByteBuffer,List<ColumnUpdate>> mutations = new HashMap<>();
     String format = "%1$05d";
     String writer = tpc.proxy().createWriter(userpass, testtable, null);
     for (int i = 0; i < maxInserts; i++) {
@@ -421,12 +421,12 @@ public class TestProxyReadWrite {
   @Test
   public void testVisibility() throws Exception {
 
-    Set<ByteBuffer> auths = new HashSet<ByteBuffer>();
+    Set<ByteBuffer> auths = new HashSet<>();
     auths.add(ByteBuffer.wrap("even".getBytes()));
     tpc.proxy().changeUserAuthorizations(userpass, "root", auths);
 
     int maxInserts = 10000;
-    Map<ByteBuffer,List<ColumnUpdate>> mutations = new HashMap<ByteBuffer,List<ColumnUpdate>>();
+    Map<ByteBuffer,List<ColumnUpdate>> mutations = new HashMap<>();
     String format = "%1$05d";
     String writer = tpc.proxy().createWriter(userpass, testtable, null);
     for (int i = 0; i < maxInserts; i++) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/proxy/TestProxySecurityOperations.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/proxy/TestProxySecurityOperations.java b/test/src/main/java/org/apache/accumulo/test/proxy/TestProxySecurityOperations.java
index c2ddfb7..fa6c52e 100644
--- a/test/src/main/java/org/apache/accumulo/test/proxy/TestProxySecurityOperations.java
+++ b/test/src/main/java/org/apache/accumulo/test/proxy/TestProxySecurityOperations.java
@@ -130,7 +130,7 @@ public class TestProxySecurityOperations {
 
   @Test
   public void auths() throws TException {
-    HashSet<ByteBuffer> newauths = new HashSet<ByteBuffer>();
+    HashSet<ByteBuffer> newauths = new HashSet<>();
     newauths.add(ByteBuffer.wrap("BBR".getBytes()));
     newauths.add(ByteBuffer.wrap("Barney".getBytes()));
     tpc.proxy().changeUserAuthorizations(userpass, testuser, newauths);
@@ -152,7 +152,7 @@ public class TestProxySecurityOperations {
   }
 
   private Map<String,String> bb2pp(ByteBuffer cf) {
-    Map<String,String> toRet = new TreeMap<String,String>();
+    Map<String,String> toRet = new TreeMap<>();
     toRet.put("password", ByteBufferUtil.toString(cf));
     return toRet;
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/proxy/TestProxyTableOperations.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/proxy/TestProxyTableOperations.java b/test/src/main/java/org/apache/accumulo/test/proxy/TestProxyTableOperations.java
index e8d7b1e..404bcbe 100644
--- a/test/src/main/java/org/apache/accumulo/test/proxy/TestProxyTableOperations.java
+++ b/test/src/main/java/org/apache/accumulo/test/proxy/TestProxyTableOperations.java
@@ -104,7 +104,7 @@ public class TestProxyTableOperations {
   // This test does not yet function because the backing Mock instance does not yet support merging
   @Test
   public void merge() throws TException {
-    Set<ByteBuffer> splits = new HashSet<ByteBuffer>();
+    Set<ByteBuffer> splits = new HashSet<>();
     splits.add(ByteBuffer.wrap("a".getBytes()));
     splits.add(ByteBuffer.wrap("c".getBytes()));
     splits.add(ByteBuffer.wrap("z".getBytes()));
@@ -124,7 +124,7 @@ public class TestProxyTableOperations {
 
   @Test
   public void splits() throws TException {
-    Set<ByteBuffer> splits = new HashSet<ByteBuffer>();
+    Set<ByteBuffer> splits = new HashSet<>();
     splits.add(ByteBuffer.wrap("a".getBytes()));
     splits.add(ByteBuffer.wrap("b".getBytes()));
     splits.add(ByteBuffer.wrap("z".getBytes()));
@@ -149,11 +149,11 @@ public class TestProxyTableOperations {
 
   @Test
   public void localityGroups() throws TException {
-    Map<String,Set<String>> groups = new HashMap<String,Set<String>>();
-    Set<String> group1 = new HashSet<String>();
+    Map<String,Set<String>> groups = new HashMap<>();
+    Set<String> group1 = new HashSet<>();
     group1.add("cf1");
     groups.put("group1", group1);
-    Set<String> group2 = new HashSet<String>();
+    Set<String> group2 = new HashSet<>();
     group2.add("cf2");
     group2.add("cf3");
     groups.put("group2", group2);
@@ -187,7 +187,7 @@ public class TestProxyTableOperations {
 
   @Test
   public void tableOperationsRowMethods() throws TException {
-    Map<ByteBuffer,List<ColumnUpdate>> mutations = new HashMap<ByteBuffer,List<ColumnUpdate>>();
+    Map<ByteBuffer,List<ColumnUpdate>> mutations = new HashMap<>();
     for (int i = 0; i < 10; i++) {
       addMutation(mutations, "" + i, "cf", "cq", "");
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/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/b102e760/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/b102e760/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/b102e760/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 79660e6..1fb8717 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/b102e760/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/b102e760/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/b102e760/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/b102e760/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 ec89a5a..0e5e439 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
@@ -116,7 +116,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/b102e760/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/b102e760/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/b102e760/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/b102e760/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/b102e760/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/b102e760/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/b102e760/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/b102e760/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/b102e760/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/b102e760/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/b102e760/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/b102e760/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/b102e760/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/b102e760/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 d02cb42..46ae035 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/b102e760/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 27ab09c..2669d9d 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/b102e760/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 d895c55..477d95f 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/b102e760/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/b102e760/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/b102e760/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/b102e760/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/b102e760/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/b102e760/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/b102e760/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/b102e760/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/b102e760/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/b102e760/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/b102e760/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/b102e760/test/src/main/java/org/apache/accumulo/test/replication/CyclicReplicationIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/replication/CyclicReplicationIT.java b/test/src/main/java/org/apache/accumulo/test/replication/CyclicReplicationIT.java
index 16c317f..8603cd6 100644
--- a/test/src/main/java/org/apache/accumulo/test/replication/CyclicReplicationIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/replication/CyclicReplicationIT.java
@@ -113,7 +113,7 @@ public class CyclicReplicationIT {
     // Set the same SSL information from the primary when present
     Map<String,String> primarySiteConfig = primaryCfg.getSiteConfig();
     if ("true".equals(primarySiteConfig.get(Property.INSTANCE_RPC_SSL_ENABLED.getKey()))) {
-      Map<String,String> peerSiteConfig = new HashMap<String,String>();
+      Map<String,String> peerSiteConfig = new HashMap<>();
       peerSiteConfig.put(Property.INSTANCE_RPC_SSL_ENABLED.getKey(), "true");
       String keystorePath = primarySiteConfig.get(Property.RPC_SSL_KEYSTORE_PATH.getKey());
       Assert.assertNotNull("Keystore Path was null", keystorePath);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/replication/GarbageCollectorCommunicatesWithTServersIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/replication/GarbageCollectorCommunicatesWithTServersIT.java b/test/src/main/java/org/apache/accumulo/test/replication/GarbageCollectorCommunicatesWithTServersIT.java
index 2852387..fccb238 100644
--- a/test/src/main/java/org/apache/accumulo/test/replication/GarbageCollectorCommunicatesWithTServersIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/replication/GarbageCollectorCommunicatesWithTServersIT.java
@@ -110,7 +110,7 @@ public class GarbageCollectorCommunicatesWithTServersIT extends ConfigurableMacB
     ZooReaderWriter zk = new ZooReaderWriter(i.getZooKeepers(), i.getZooKeepersSessionTimeOut(), "");
     WalStateManager wals = new WalStateManager(conn.getInstance(), zk);
 
-    Set<String> result = new HashSet<String>();
+    Set<String> result = new HashSet<>();
     for (Entry<Path,WalState> entry : wals.getAllState().entrySet()) {
       log.debug("Reading WALs: {}={}", entry.getKey(), entry.getValue());
       result.add(entry.getKey().toString());
@@ -132,7 +132,7 @@ public class GarbageCollectorCommunicatesWithTServersIT extends ConfigurableMacB
     s.setRange(r);
     s.fetchColumnFamily(MetadataSchema.TabletsSection.DataFileColumnFamily.NAME);
 
-    Set<String> rfiles = new HashSet<String>();
+    Set<String> rfiles = new HashSet<>();
     for (Entry<Key,Value> entry : s) {
       log.debug("Reading RFiles: {}={}", entry.getKey().toStringNoTruncate(), entry.getValue());
       // uri://path/to/wal
@@ -159,7 +159,7 @@ public class GarbageCollectorCommunicatesWithTServersIT extends ConfigurableMacB
     s.setRange(r);
     s.fetchColumn(MetadataSchema.ReplicationSection.COLF, new Text(tableId));
 
-    Map<String,Status> fileToStatus = new HashMap<String,Status>();
+    Map<String,Status> fileToStatus = new HashMap<>();
     for (Entry<Key,Value> entry : s) {
       Text file = new Text();
       MetadataSchema.ReplicationSection.getFile(entry.getKey(), file);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/replication/MultiInstanceReplicationIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/replication/MultiInstanceReplicationIT.java b/test/src/main/java/org/apache/accumulo/test/replication/MultiInstanceReplicationIT.java
index 0c68af6..33e0a55 100644
--- a/test/src/main/java/org/apache/accumulo/test/replication/MultiInstanceReplicationIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/replication/MultiInstanceReplicationIT.java
@@ -116,7 +116,7 @@ public class MultiInstanceReplicationIT extends ConfigurableMacBase {
     // Set the same SSL information from the primary when present
     Map<String,String> primarySiteConfig = primaryCfg.getSiteConfig();
     if ("true".equals(primarySiteConfig.get(Property.INSTANCE_RPC_SSL_ENABLED.getKey()))) {
-      Map<String,String> peerSiteConfig = new HashMap<String,String>();
+      Map<String,String> peerSiteConfig = new HashMap<>();
       peerSiteConfig.put(Property.INSTANCE_RPC_SSL_ENABLED.getKey(), "true");
       String keystorePath = primarySiteConfig.get(Property.RPC_SSL_KEYSTORE_PATH.getKey());
       Assert.assertNotNull("Keystore Path was null", keystorePath);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/replication/StatusCombinerMacIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/replication/StatusCombinerMacIT.java b/test/src/main/java/org/apache/accumulo/test/replication/StatusCombinerMacIT.java
index b0a787b..59bfab0 100644
--- a/test/src/main/java/org/apache/accumulo/test/replication/StatusCombinerMacIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/replication/StatusCombinerMacIT.java
@@ -66,7 +66,7 @@ public class StatusCombinerMacIT extends SharedMiniClusterBase {
     Assert.assertTrue(scopes.contains(IteratorScope.majc));
 
     Iterable<Entry<String,String>> propIter = tops.getProperties(MetadataTable.NAME);
-    HashMap<String,String> properties = new HashMap<String,String>();
+    HashMap<String,String> properties = new HashMap<>();
     for (Entry<String,String> entry : propIter) {
       properties.put(entry.getKey(), entry.getValue());
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/replication/UnorderedWorkAssignerReplicationIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/replication/UnorderedWorkAssignerReplicationIT.java b/test/src/main/java/org/apache/accumulo/test/replication/UnorderedWorkAssignerReplicationIT.java
index 5d4e637..ec0361b 100644
--- a/test/src/main/java/org/apache/accumulo/test/replication/UnorderedWorkAssignerReplicationIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/replication/UnorderedWorkAssignerReplicationIT.java
@@ -122,7 +122,7 @@ public class UnorderedWorkAssignerReplicationIT extends ConfigurableMacBase {
     // Set the same SSL information from the primary when present
     Map<String,String> primarySiteConfig = primaryCfg.getSiteConfig();
     if ("true".equals(primarySiteConfig.get(Property.INSTANCE_RPC_SSL_ENABLED.getKey()))) {
-      Map<String,String> peerSiteConfig = new HashMap<String,String>();
+      Map<String,String> peerSiteConfig = new HashMap<>();
       peerSiteConfig.put(Property.INSTANCE_RPC_SSL_ENABLED.getKey(), "true");
       String keystorePath = primarySiteConfig.get(Property.RPC_SSL_KEYSTORE_PATH.getKey());
       Assert.assertNotNull("Keystore Path was null", keystorePath);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/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/b102e760/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/b102e760/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/b102e760/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/b102e760/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/b102e760/test/src/main/java/org/apache/accumulo/test/util/CertUtils.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/util/CertUtils.java b/test/src/main/java/org/apache/accumulo/test/util/CertUtils.java
index 2345ea7..95042d2 100644
--- a/test/src/main/java/org/apache/accumulo/test/util/CertUtils.java
+++ b/test/src/main/java/org/apache/accumulo/test/util/CertUtils.java
@@ -135,7 +135,7 @@ public class CertUtils {
 
           @Override
           public Iterator<Entry<String,String>> iterator() {
-            TreeMap<String,String> map = new TreeMap<String,String>();
+            TreeMap<String,String> map = new TreeMap<>();
             for (Entry<String,String> props : DefaultConfiguration.getInstance())
               map.put(props.getKey(), props.getValue());
             for (Entry<String,String> props : xml)

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/test/java/org/apache/accumulo/test/iterator/RegExTest.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/iterator/RegExTest.java b/test/src/test/java/org/apache/accumulo/test/iterator/RegExTest.java
index 6189ee3..4b2de22 100644
--- a/test/src/test/java/org/apache/accumulo/test/iterator/RegExTest.java
+++ b/test/src/test/java/org/apache/accumulo/test/iterator/RegExTest.java
@@ -41,7 +41,7 @@ public class RegExTest {
   @BeforeClass
   public static void setupTests() throws Exception {
 
-    ArrayList<Character> chars = new ArrayList<Character>();
+    ArrayList<Character> chars = new ArrayList<>();
     for (char c = 'a'; c <= 'z'; c++)
       chars.add(c);
 


[10/32] accumulo git commit: ACCUMULO-4357 Remove unneeded code for readability

Posted by ct...@apache.org.
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/iterators/user/FilterTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/iterators/user/FilterTest.java b/core/src/test/java/org/apache/accumulo/core/iterators/user/FilterTest.java
index 0c4ffa2..61d98e6 100644
--- a/core/src/test/java/org/apache/accumulo/core/iterators/user/FilterTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/iterators/user/FilterTest.java
@@ -48,8 +48,8 @@ import org.junit.Test;
 
 public class FilterTest {
 
-  private static final Collection<ByteSequence> EMPTY_COL_FAMS = new ArrayList<ByteSequence>();
-  private static final Map<String,String> EMPTY_OPTS = new HashMap<String,String>();
+  private static final Collection<ByteSequence> EMPTY_COL_FAMS = new ArrayList<>();
+  private static final Map<String,String> EMPTY_OPTS = new HashMap<>();
 
   public static class SimpleFilter extends Filter {
     @Override
@@ -85,7 +85,7 @@ public class FilterTest {
     Text colf = new Text("a");
     Text colq = new Text("b");
     Value dv = new Value();
-    TreeMap<Key,Value> tm = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm = new TreeMap<>();
 
     for (int i = 0; i < 1000; i++) {
       Key k = new Key(new Text(String.format("%03d", i)), colf, colq);
@@ -120,7 +120,7 @@ public class FilterTest {
     Text colf = new Text("a");
     Text colq = new Text("b");
     Value dv = new Value();
-    TreeMap<Key,Value> tm = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm = new TreeMap<>();
 
     for (int i = 0; i < 1000; i++) {
       Key k = new Key(new Text(String.format("%03d", i)), colf, colq);
@@ -157,7 +157,7 @@ public class FilterTest {
     Text colf = new Text("a");
     Text colq = new Text("b");
     Value dv = new Value();
-    TreeMap<Key,Value> tm = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm = new TreeMap<>();
 
     for (int i = 0; i < 1000; i++) {
       Key k = new Key(new Text(String.format("%03d", i)), colf, colq);
@@ -185,7 +185,7 @@ public class FilterTest {
     Text colf = new Text("a");
     Text colq = new Text("b");
     Value dv = new Value();
-    TreeMap<Key,Value> tm = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm = new TreeMap<>();
 
     for (int i = 0; i < 1000; i++) {
       Key k = new Key(new Text(String.format("%03d", i)), colf, colq);
@@ -218,7 +218,7 @@ public class FilterTest {
     Text colf = new Text("a");
     Text colq = new Text("b");
     Value dv = new Value();
-    TreeMap<Key,Value> tm = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm = new TreeMap<>();
     IteratorSetting is = new IteratorSetting(1, ColumnAgeOffFilter.class);
     ColumnAgeOffFilter.addTTL(is, new IteratorSetting.Column("a"), 901l);
     long ts = System.currentTimeMillis();
@@ -253,8 +253,8 @@ public class FilterTest {
   @Test
   public void test3() throws IOException {
     Value dv = new Value();
-    TreeMap<Key,Value> tm = new TreeMap<Key,Value>();
-    HashSet<Column> hsc = new HashSet<Column>();
+    TreeMap<Key,Value> tm = new TreeMap<>();
+    HashSet<Column> hsc = new HashSet<>();
     hsc.add(new Column("c".getBytes(), null, null));
 
     Text colf1 = new Text("a");
@@ -281,14 +281,14 @@ public class FilterTest {
     a.seek(new Range(), EMPTY_COL_FAMS, false);
     assertEquals(size(a), 1000);
 
-    hsc = new HashSet<Column>();
+    hsc = new HashSet<>();
     hsc.add(new Column("a".getBytes(), "b".getBytes(), null));
     a = new ColumnQualifierFilter(new SortedMapIterator(tm), hsc);
     a.seek(new Range(), EMPTY_COL_FAMS, false);
     int size = size(a);
     assertTrue("size was " + size, size == 500);
 
-    hsc = new HashSet<Column>();
+    hsc = new HashSet<>();
     a = new ColumnQualifierFilter(new SortedMapIterator(tm), hsc);
     a.seek(new Range(), EMPTY_COL_FAMS, false);
     size = size(a);
@@ -298,7 +298,7 @@ public class FilterTest {
   @Test
   public void test4() throws IOException {
     Value dv = new Value();
-    TreeMap<Key,Value> tm = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm = new TreeMap<>();
 
     ColumnVisibility le1 = new ColumnVisibility("L1");
     ColumnVisibility le2 = new ColumnVisibility("L0&OFFICIAL");
@@ -320,7 +320,7 @@ public class FilterTest {
   }
 
   private ColumnQualifierFilter ncqf(TreeMap<Key,Value> tm, Column... columns) throws IOException {
-    HashSet<Column> hsc = new HashSet<Column>();
+    HashSet<Column> hsc = new HashSet<>();
 
     for (Column column : columns) {
       hsc.add(column);
@@ -334,7 +334,7 @@ public class FilterTest {
   @Test
   public void test5() throws IOException {
     Value dv = new Value();
-    TreeMap<Key,Value> tm = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm = new TreeMap<>();
 
     tm.put(new Key(new Text(String.format("%03d", 1)), new Text("a"), new Text("x")), dv);
     tm.put(new Key(new Text(String.format("%03d", 2)), new Text("a"), new Text("y")), dv);
@@ -365,7 +365,7 @@ public class FilterTest {
 
   @Test
   public void testNoVisFilter() throws IOException {
-    TreeMap<Key,Value> tm = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm = new TreeMap<>();
     Value v = new Value();
     for (int i = 0; i < 1000; i++) {
       Key k = new Key(String.format("%03d", i), "a", "b", i % 10 == 0 ? "vis" : "");
@@ -385,7 +385,7 @@ public class FilterTest {
     Text colf = new Text("a");
     Text colq = new Text("b");
     Value dv = new Value();
-    TreeMap<Key,Value> tm = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm = new TreeMap<>();
 
     for (int i = 0; i < 100; i++) {
       Key k = new Key(new Text(String.format("%02d", i)), colf, colq);
@@ -482,7 +482,7 @@ public class FilterTest {
     Text colf = new Text("a");
     Text colq = new Text("b");
     Value dv = new Value();
-    TreeMap<Key,Value> tm = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm = new TreeMap<>();
 
     Key k = new Key(new Text("0"), colf, colq);
     tm.put(k, dv);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/iterators/user/GrepIteratorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/iterators/user/GrepIteratorTest.java b/core/src/test/java/org/apache/accumulo/core/iterators/user/GrepIteratorTest.java
index 23af994..3a47f5a 100644
--- a/core/src/test/java/org/apache/accumulo/core/iterators/user/GrepIteratorTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/iterators/user/GrepIteratorTest.java
@@ -38,14 +38,14 @@ import org.junit.Before;
 import org.junit.Test;
 
 public class GrepIteratorTest {
-  private static final Collection<ByteSequence> EMPTY_COL_FAMS = new ArrayList<ByteSequence>();
+  private static final Collection<ByteSequence> EMPTY_COL_FAMS = new ArrayList<>();
   SortedMap<Key,Value> input;
   SortedMap<Key,Value> output;
 
   @Before
   public void init() {
-    input = new TreeMap<Key,Value>();
-    output = new TreeMap<Key,Value>();
+    input = new TreeMap<>();
+    output = new TreeMap<>();
     input.put(new Key("abcdef", "xyz", "xyz", 0), new Value("xyz".getBytes()));
     output.put(new Key("abcdef", "xyz", "xyz", 0), new Value("xyz".getBytes()));
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/iterators/user/IndexedDocIteratorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/iterators/user/IndexedDocIteratorTest.java b/core/src/test/java/org/apache/accumulo/core/iterators/user/IndexedDocIteratorTest.java
index 117fcac..cb6d3f7 100644
--- a/core/src/test/java/org/apache/accumulo/core/iterators/user/IndexedDocIteratorTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/iterators/user/IndexedDocIteratorTest.java
@@ -46,7 +46,7 @@ public class IndexedDocIteratorTest extends TestCase {
 
   private static final Logger log = Logger.getLogger(IndexedDocIteratorTest.class);
 
-  private static final Collection<ByteSequence> EMPTY_COL_FAMS = new ArrayList<ByteSequence>();
+  private static final Collection<ByteSequence> EMPTY_COL_FAMS = new ArrayList<>();
   private static final byte[] nullByte = {0};
 
   private static IteratorEnvironment env = new DefaultIteratorEnvironment();
@@ -71,7 +71,7 @@ public class IndexedDocIteratorTest extends TestCase {
     StringBuilder sb = new StringBuilder();
     Random r = new Random();
     Value v = new Value(new byte[0]);
-    TreeMap<Key,Value> map = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> map = new TreeMap<>();
     boolean[] negateMask = new boolean[columnFamilies.length];
 
     for (int i = 0; i < columnFamilies.length; i++) {
@@ -189,7 +189,7 @@ public class IndexedDocIteratorTest extends TestCase {
     otherColumnFamilies[3] = new Text("F");
 
     float hitRatio = 0.5f;
-    HashSet<Text> docs = new HashSet<Text>();
+    HashSet<Text> docs = new HashSet<>();
     SortedKeyValueIterator<Key,Value> source = createIteratorStack(hitRatio, NUM_ROWS, NUM_DOCIDS, columnFamilies, otherColumnFamilies, docs);
     IteratorSetting is = new IteratorSetting(1, IndexedDocIterator.class);
     IndexedDocIterator.setColumnFamilies(is, columnFamilies);
@@ -227,7 +227,7 @@ public class IndexedDocIteratorTest extends TestCase {
     otherColumnFamilies[3] = new Text("F");
 
     float hitRatio = 0.5f;
-    HashSet<Text> docs = new HashSet<Text>();
+    HashSet<Text> docs = new HashSet<>();
     SortedKeyValueIterator<Key,Value> source = createIteratorStack(hitRatio, NUM_ROWS, NUM_DOCIDS, columnFamilies, otherColumnFamilies, docs);
     IteratorSetting is = new IteratorSetting(1, IndexedDocIterator.class);
     IndexedDocIterator.setColumnFamilies(is, columnFamilies);
@@ -264,10 +264,10 @@ public class IndexedDocIteratorTest extends TestCase {
     otherColumnFamilies[3] = new Text("F");
 
     float hitRatio = 0.5f;
-    HashSet<Text> docs = new HashSet<Text>();
+    HashSet<Text> docs = new HashSet<>();
     SortedKeyValueIterator<Key,Value> source = createIteratorStack(hitRatio, NUM_ROWS, NUM_DOCIDS, columnFamilies, otherColumnFamilies, docs);
     SortedKeyValueIterator<Key,Value> source2 = createIteratorStack(hitRatio, NUM_ROWS, NUM_DOCIDS, columnFamilies, otherColumnFamilies, docs);
-    ArrayList<SortedKeyValueIterator<Key,Value>> sourceIters = new ArrayList<SortedKeyValueIterator<Key,Value>>();
+    ArrayList<SortedKeyValueIterator<Key,Value>> sourceIters = new ArrayList<>();
     sourceIters.add(source);
     sourceIters.add(source2);
     MultiIterator mi = new MultiIterator(sourceIters, false);
@@ -310,7 +310,7 @@ public class IndexedDocIteratorTest extends TestCase {
     otherColumnFamilies[3] = new Text("F");
 
     float hitRatio = 0.5f;
-    HashSet<Text> docs = new HashSet<Text>();
+    HashSet<Text> docs = new HashSet<>();
     SortedKeyValueIterator<Key,Value> source = createIteratorStack(hitRatio, NUM_ROWS, NUM_DOCIDS, columnFamilies, otherColumnFamilies, docs, negatedColumns);
     IteratorSetting is = new IteratorSetting(1, IndexedDocIterator.class);
     IndexedDocIterator.setColumnFamilies(is, columnFamilies, notFlags);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/iterators/user/IntersectingIteratorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/iterators/user/IntersectingIteratorTest.java b/core/src/test/java/org/apache/accumulo/core/iterators/user/IntersectingIteratorTest.java
index 700f93b..aad2e54 100644
--- a/core/src/test/java/org/apache/accumulo/core/iterators/user/IntersectingIteratorTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/iterators/user/IntersectingIteratorTest.java
@@ -42,11 +42,11 @@ import org.junit.rules.TestName;
 
 public class IntersectingIteratorTest {
 
-  private static final Collection<ByteSequence> EMPTY_COL_FAMS = new ArrayList<ByteSequence>();
+  private static final Collection<ByteSequence> EMPTY_COL_FAMS = new ArrayList<>();
   private static IteratorEnvironment env = new DefaultIteratorEnvironment();
 
   TreeMap<Key,Value> map;
-  HashSet<Text> docs = new HashSet<Text>();
+  HashSet<Text> docs = new HashSet<>();
   Text[] columnFamilies;
   Text[] negatedColumns;
   Text[] otherColumnFamilies;
@@ -59,7 +59,7 @@ public class IntersectingIteratorTest {
       HashSet<Text> docs, Text[] negatedColumns) {
     Random r = new Random();
     Value v = new Value(new byte[0]);
-    TreeMap<Key,Value> map = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> map = new TreeMap<>();
     boolean[] negateMask = new boolean[columnFamilies.length];
 
     for (int i = 0; i < columnFamilies.length; i++) {
@@ -198,7 +198,7 @@ public class IntersectingIteratorTest {
     float hitRatio = 0.5f;
     SortedKeyValueIterator<Key,Value> source = createIteratorStack(hitRatio, NUM_ROWS, NUM_DOCIDS, columnFamilies, otherColumnFamilies, docs);
     SortedKeyValueIterator<Key,Value> source2 = createIteratorStack(hitRatio, NUM_ROWS, NUM_DOCIDS, columnFamilies, otherColumnFamilies, docs);
-    ArrayList<SortedKeyValueIterator<Key,Value>> sourceIters = new ArrayList<SortedKeyValueIterator<Key,Value>>();
+    ArrayList<SortedKeyValueIterator<Key,Value>> sourceIters = new ArrayList<>();
     sourceIters.add(source);
     sourceIters.add(source2);
     MultiIterator mi = new MultiIterator(sourceIters, false);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/iterators/user/LargeRowFilterTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/iterators/user/LargeRowFilterTest.java b/core/src/test/java/org/apache/accumulo/core/iterators/user/LargeRowFilterTest.java
index af610ca..1d5a108 100644
--- a/core/src/test/java/org/apache/accumulo/core/iterators/user/LargeRowFilterTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/iterators/user/LargeRowFilterTest.java
@@ -66,18 +66,18 @@ public class LargeRowFilterTest extends TestCase {
   }
 
   public void testBasic() throws Exception {
-    TreeMap<Key,Value> testData = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> testData = new TreeMap<>();
 
     genTestData(testData, 20);
 
     for (int i = 1; i <= 20; i++) {
-      TreeMap<Key,Value> expectedData = new TreeMap<Key,Value>();
+      TreeMap<Key,Value> expectedData = new TreeMap<>();
       genTestData(expectedData, i);
 
       LargeRowFilter lrfi = setupIterator(testData, i, IteratorScope.scan);
       lrfi.seek(new Range(), LocalityGroupUtil.EMPTY_CF_SET, false);
 
-      TreeMap<Key,Value> filteredData = new TreeMap<Key,Value>();
+      TreeMap<Key,Value> filteredData = new TreeMap<>();
 
       while (lrfi.hasTop()) {
         filteredData.put(lrfi.getTopKey(), lrfi.getTopValue());
@@ -89,17 +89,17 @@ public class LargeRowFilterTest extends TestCase {
   }
 
   public void testSeek() throws Exception {
-    TreeMap<Key,Value> testData = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> testData = new TreeMap<>();
 
     genTestData(testData, 20);
 
     for (int i = 1; i <= 20; i++) {
-      TreeMap<Key,Value> expectedData = new TreeMap<Key,Value>();
+      TreeMap<Key,Value> expectedData = new TreeMap<>();
       genTestData(expectedData, i);
 
       LargeRowFilter lrfi = setupIterator(testData, i, IteratorScope.scan);
 
-      TreeMap<Key,Value> filteredData = new TreeMap<Key,Value>();
+      TreeMap<Key,Value> filteredData = new TreeMap<>();
 
       // seek to each row... rows that exceed max columns should be filtered
       for (int j = 1; j <= i; j++) {
@@ -117,7 +117,7 @@ public class LargeRowFilterTest extends TestCase {
   }
 
   public void testSeek2() throws Exception {
-    TreeMap<Key,Value> testData = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> testData = new TreeMap<>();
 
     genTestData(testData, 20);
 
@@ -130,10 +130,10 @@ public class LargeRowFilterTest extends TestCase {
 
     lrfi.seek(new Range(new Key(genRow(10), "cf001", genCQ(4), 5), true, new Key(genRow(10)).followingKey(PartialKey.ROW), false),
         LocalityGroupUtil.EMPTY_CF_SET, false);
-    TreeMap<Key,Value> expectedData = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> expectedData = new TreeMap<>();
     genRow(expectedData, 10, 4, 10);
 
-    TreeMap<Key,Value> filteredData = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> filteredData = new TreeMap<>();
     while (lrfi.hasTop()) {
       filteredData.put(lrfi.getTopKey(), lrfi.getTopValue());
       lrfi.next();
@@ -143,14 +143,14 @@ public class LargeRowFilterTest extends TestCase {
   }
 
   public void testCompaction() throws Exception {
-    TreeMap<Key,Value> testData = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> testData = new TreeMap<>();
 
     genTestData(testData, 20);
 
     LargeRowFilter lrfi = setupIterator(testData, 13, IteratorScope.majc);
     lrfi.seek(new Range(), LocalityGroupUtil.EMPTY_CF_SET, false);
 
-    TreeMap<Key,Value> compactedData = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> compactedData = new TreeMap<>();
     while (lrfi.hasTop()) {
       compactedData.put(lrfi.getTopKey(), lrfi.getTopValue());
       lrfi.next();
@@ -167,10 +167,10 @@ public class LargeRowFilterTest extends TestCase {
     lrfi.seek(new Range(), LocalityGroupUtil.EMPTY_CF_SET, false);
 
     // only expect to see 13 rows
-    TreeMap<Key,Value> expectedData = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> expectedData = new TreeMap<>();
     genTestData(expectedData, 13);
 
-    TreeMap<Key,Value> filteredData = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> filteredData = new TreeMap<>();
     while (lrfi.hasTop()) {
       filteredData.put(lrfi.getTopKey(), lrfi.getTopValue());
       lrfi.next();
@@ -185,7 +185,7 @@ public class LargeRowFilterTest extends TestCase {
     assertFalse(lrfi.hasTop());
 
     // test seeking w/ column families
-    HashSet<ByteSequence> colfams = new HashSet<ByteSequence>();
+    HashSet<ByteSequence> colfams = new HashSet<>();
     colfams.add(new ArrayByteSequence("cf001"));
     lrfi.seek(new Range(new Key(genRow(15), "cf001", genCQ(4), 5), true, new Key(genRow(15)).followingKey(PartialKey.ROW), false), colfams, true);
     assertFalse(lrfi.hasTop());
@@ -194,20 +194,20 @@ public class LargeRowFilterTest extends TestCase {
   // in other test data is generated in such a way that once a row
   // is suppressed, all subsequent rows are suppressed
   public void testSuppressInner() throws Exception {
-    TreeMap<Key,Value> testData = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> testData = new TreeMap<>();
     genRow(testData, 1, 0, 2);
     genRow(testData, 2, 0, 50);
     genRow(testData, 3, 0, 15);
     genRow(testData, 4, 0, 5);
 
-    TreeMap<Key,Value> expectedData = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> expectedData = new TreeMap<>();
     genRow(expectedData, 1, 0, 2);
     genRow(expectedData, 4, 0, 5);
 
     LargeRowFilter lrfi = setupIterator(testData, 13, IteratorScope.scan);
     lrfi.seek(new Range(), LocalityGroupUtil.EMPTY_CF_SET, false);
 
-    TreeMap<Key,Value> filteredData = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> filteredData = new TreeMap<>();
     while (lrfi.hasTop()) {
       filteredData.put(lrfi.getTopKey(), lrfi.getTopValue());
       lrfi.next();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/iterators/user/RegExFilterTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/iterators/user/RegExFilterTest.java b/core/src/test/java/org/apache/accumulo/core/iterators/user/RegExFilterTest.java
index 61acc09..f31514a 100644
--- a/core/src/test/java/org/apache/accumulo/core/iterators/user/RegExFilterTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/iterators/user/RegExFilterTest.java
@@ -37,7 +37,7 @@ import org.junit.Test;
 
 public class RegExFilterTest {
 
-  private static final Collection<ByteSequence> EMPTY_COL_FAMS = new ArrayList<ByteSequence>();
+  private static final Collection<ByteSequence> EMPTY_COL_FAMS = new ArrayList<>();
 
   private Key nkv(TreeMap<Key,Value> tm, String row, String cf, String cq, String val) {
     Key k = nk(row, cf, cq);
@@ -51,7 +51,7 @@ public class RegExFilterTest {
 
   @Test
   public void test1() throws IOException {
-    TreeMap<Key,Value> tm = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm = new TreeMap<>();
 
     Key k1 = nkv(tm, "boo1", "yup", "20080201", "dog");
     Key k2 = nkv(tm, "boo1", "yap", "20080202", "cat");
@@ -242,7 +242,7 @@ public class RegExFilterTest {
 
   @Test
   public void testNullByteInKey() throws IOException {
-    TreeMap<Key,Value> tm = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm = new TreeMap<>();
 
     String s1 = "first", s2 = "second";
     byte[] b1 = s1.getBytes(), b2 = s2.getBytes(), ball;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/iterators/user/RowDeletingIteratorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/iterators/user/RowDeletingIteratorTest.java b/core/src/test/java/org/apache/accumulo/core/iterators/user/RowDeletingIteratorTest.java
index bdaf112..4ec0269 100644
--- a/core/src/test/java/org/apache/accumulo/core/iterators/user/RowDeletingIteratorTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/iterators/user/RowDeletingIteratorTest.java
@@ -76,7 +76,7 @@ public class RowDeletingIteratorTest extends TestCase {
 
   public void test1() throws Exception {
 
-    TreeMap<Key,Value> tm1 = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm1 = new TreeMap<>();
     put(tm1, "r1", "", "", 10, RowDeletingIterator.DELETE_ROW_VALUE);
     put(tm1, "r1", "cf1", "cq1", 5, "v1");
     put(tm1, "r1", "cf1", "cq3", 5, "v1");
@@ -115,7 +115,7 @@ public class RowDeletingIteratorTest extends TestCase {
 
   public void test2() throws Exception {
 
-    TreeMap<Key,Value> tm1 = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm1 = new TreeMap<>();
     put(tm1, "r1", "", "", 10, RowDeletingIterator.DELETE_ROW_VALUE);
     put(tm1, "r1", "cf1", "cq1", 5, "v1");
     put(tm1, "r1", "cf1", "cq3", 15, "v1");
@@ -156,7 +156,7 @@ public class RowDeletingIteratorTest extends TestCase {
 
   public void test3() throws Exception {
 
-    TreeMap<Key,Value> tm1 = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm1 = new TreeMap<>();
     put(tm1, "r1", "", "", 10, RowDeletingIterator.DELETE_ROW_VALUE);
     put(tm1, "r1", "", "cq1", 5, "v1");
     put(tm1, "r1", "cf1", "cq1", 5, "v1");
@@ -166,7 +166,7 @@ public class RowDeletingIteratorTest extends TestCase {
     RowDeletingIterator rdi = new RowDeletingIterator();
     rdi.init(new ColumnFamilySkippingIterator(new SortedMapIterator(tm1)), null, new TestIE(IteratorScope.scan, false));
 
-    HashSet<ByteSequence> cols = new HashSet<ByteSequence>();
+    HashSet<ByteSequence> cols = new HashSet<>();
     cols.add(new ArrayByteSequence("cf1".getBytes()));
 
     rdi.seek(new Range(), cols, true);
@@ -186,7 +186,7 @@ public class RowDeletingIteratorTest extends TestCase {
 
   public void test4() throws Exception {
 
-    TreeMap<Key,Value> tm1 = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm1 = new TreeMap<>();
     put(tm1, "r1", "", "", 10, RowDeletingIterator.DELETE_ROW_VALUE);
     put(tm1, "r1", "cf1", "cq1", 5, "v1");
     put(tm1, "r1", "cf1", "cq3", 15, "v1");

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/iterators/user/RowEncodingIteratorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/iterators/user/RowEncodingIteratorTest.java b/core/src/test/java/org/apache/accumulo/core/iterators/user/RowEncodingIteratorTest.java
index d9aa174..d531517 100644
--- a/core/src/test/java/org/apache/accumulo/core/iterators/user/RowEncodingIteratorTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/iterators/user/RowEncodingIteratorTest.java
@@ -62,9 +62,9 @@ public class RowEncodingIteratorTest {
     public static SortedMap<Key,Value> decodeRow(Key rowKey, Value rowValue) throws IOException {
       DataInputStream dis = new DataInputStream(new ByteArrayInputStream(rowValue.get()));
       int numKeys = dis.readInt();
-      List<Key> decodedKeys = new ArrayList<Key>();
-      List<Value> decodedValues = new ArrayList<Value>();
-      SortedMap<Key,Value> out = new TreeMap<Key,Value>();
+      List<Key> decodedKeys = new ArrayList<>();
+      List<Value> decodedValues = new ArrayList<>();
+      SortedMap<Key,Value> out = new TreeMap<>();
       for (int i = 0; i < numKeys; i++) {
         Key k = new Key();
         k.readFields(dis);
@@ -115,26 +115,26 @@ public class RowEncodingIteratorTest {
   public void testEncodeAll() throws IOException {
     byte[] kbVal = new byte[1024];
     // This code is shamelessly borrowed from the WholeRowIteratorTest.
-    SortedMap<Key,Value> map1 = new TreeMap<Key,Value>();
+    SortedMap<Key,Value> map1 = new TreeMap<>();
     pkv(map1, "row1", "cf1", "cq1", "cv1", 5, kbVal);
     pkv(map1, "row1", "cf1", "cq2", "cv1", 6, kbVal);
 
-    SortedMap<Key,Value> map2 = new TreeMap<Key,Value>();
+    SortedMap<Key,Value> map2 = new TreeMap<>();
     pkv(map2, "row2", "cf1", "cq1", "cv1", 5, kbVal);
     pkv(map2, "row2", "cf1", "cq2", "cv1", 6, kbVal);
 
-    SortedMap<Key,Value> map3 = new TreeMap<Key,Value>();
+    SortedMap<Key,Value> map3 = new TreeMap<>();
     pkv(map3, "row3", "cf1", "cq1", "cv1", 5, kbVal);
     pkv(map3, "row3", "cf1", "cq2", "cv1", 6, kbVal);
 
-    SortedMap<Key,Value> map = new TreeMap<Key,Value>();
+    SortedMap<Key,Value> map = new TreeMap<>();
     map.putAll(map1);
     map.putAll(map2);
     map.putAll(map3);
     SortedMapIterator src = new SortedMapIterator(map);
     Range range = new Range(new Text("row1"), true, new Text("row2"), true);
     RowEncodingIteratorImpl iter = new RowEncodingIteratorImpl();
-    Map<String,String> bigBufferOpts = new HashMap<String,String>();
+    Map<String,String> bigBufferOpts = new HashMap<>();
     bigBufferOpts.put(RowEncodingIterator.MAX_BUFFER_SIZE_OPT, "3K");
     iter.init(src, bigBufferOpts, new DummyIteratorEnv());
     iter.seek(range, new ArrayList<ByteSequence>(), false);
@@ -159,16 +159,16 @@ public class RowEncodingIteratorTest {
   public void testEncodeSome() throws IOException {
     byte[] kbVal = new byte[1024];
     // This code is shamelessly borrowed from the WholeRowIteratorTest.
-    SortedMap<Key,Value> map1 = new TreeMap<Key,Value>();
+    SortedMap<Key,Value> map1 = new TreeMap<>();
     pkv(map1, "row1", "cf1", "cq1", "cv1", 5, kbVal);
     pkv(map1, "row1", "cf1", "cq2", "cv1", 6, kbVal);
 
-    SortedMap<Key,Value> map = new TreeMap<Key,Value>();
+    SortedMap<Key,Value> map = new TreeMap<>();
     map.putAll(map1);
     SortedMapIterator src = new SortedMapIterator(map);
     Range range = new Range(new Text("row1"), true, new Text("row2"), true);
     RowEncodingIteratorImpl iter = new RowEncodingIteratorImpl();
-    Map<String,String> bigBufferOpts = new HashMap<String,String>();
+    Map<String,String> bigBufferOpts = new HashMap<>();
     bigBufferOpts.put(RowEncodingIterator.MAX_BUFFER_SIZE_OPT, "1K");
     iter.init(src, bigBufferOpts, new DummyIteratorEnv());
     iter.seek(range, new ArrayList<ByteSequence>(), false);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/iterators/user/RowFilterTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/iterators/user/RowFilterTest.java b/core/src/test/java/org/apache/accumulo/core/iterators/user/RowFilterTest.java
index f0892b2..4294eb3 100644
--- a/core/src/test/java/org/apache/accumulo/core/iterators/user/RowFilterTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/iterators/user/RowFilterTest.java
@@ -83,7 +83,7 @@ public class RowFilterTest {
   }
 
   public static class RowZeroOrOneFilter extends RowFilter {
-    private static final Set<String> passRows = new HashSet<String>(Arrays.asList("0", "1"));
+    private static final Set<String> passRows = new HashSet<>(Arrays.asList("0", "1"));
 
     @Override
     public boolean acceptRow(SortedKeyValueIterator<Key,Value> rowIterator) throws IOException {
@@ -92,7 +92,7 @@ public class RowFilterTest {
   }
 
   public static class RowOneOrTwoFilter extends RowFilter {
-    private static final Set<String> passRows = new HashSet<String>(Arrays.asList("1", "2"));
+    private static final Set<String> passRows = new HashSet<>(Arrays.asList("1", "2"));
 
     @Override
     public boolean acceptRow(SortedKeyValueIterator<Key,Value> rowIterator) throws IOException {
@@ -108,7 +108,7 @@ public class RowFilterTest {
   }
 
   public List<Mutation> createMutations() {
-    List<Mutation> mutations = new LinkedList<Mutation>();
+    List<Mutation> mutations = new LinkedList<>();
     Mutation m = new Mutation("0");
     m.put("cf1", "cq1", "1");
     m.put("cf1", "cq2", "1");
@@ -157,7 +157,7 @@ public class RowFilterTest {
 
   public TreeMap<Key,Value> createKeyValues() {
     List<Mutation> mutations = createMutations();
-    TreeMap<Key,Value> keyValues = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> keyValues = new TreeMap<>();
 
     final Text cf = new Text(), cq = new Text();
     for (Mutation m : mutations) {
@@ -185,24 +185,24 @@ public class RowFilterTest {
 
     filter.seek(new Range(), Collections.<ByteSequence> emptySet(), false);
 
-    assertEquals(new HashSet<String>(Arrays.asList("2", "3")), getRows(filter));
+    assertEquals(new HashSet<>(Arrays.asList("2", "3")), getRows(filter));
 
     ByteSequence cf = new ArrayByteSequence("cf2");
 
     filter.seek(new Range(), ImmutableSet.of(cf), true);
-    assertEquals(new HashSet<String>(Arrays.asList("1", "3", "0", "4")), getRows(filter));
+    assertEquals(new HashSet<>(Arrays.asList("1", "3", "0", "4")), getRows(filter));
 
     filter.seek(new Range("0", "4"), Collections.<ByteSequence> emptySet(), false);
-    assertEquals(new HashSet<String>(Arrays.asList("2", "3")), getRows(filter));
+    assertEquals(new HashSet<>(Arrays.asList("2", "3")), getRows(filter));
 
     filter.seek(new Range("2"), Collections.<ByteSequence> emptySet(), false);
-    assertEquals(new HashSet<String>(Arrays.asList("2")), getRows(filter));
+    assertEquals(new HashSet<>(Arrays.asList("2")), getRows(filter));
 
     filter.seek(new Range("4"), Collections.<ByteSequence> emptySet(), false);
     assertEquals(new HashSet<String>(), getRows(filter));
 
     filter.seek(new Range("4"), ImmutableSet.of(cf), true);
-    assertEquals(new HashSet<String>(Arrays.asList("4")), getRows(filter));
+    assertEquals(new HashSet<>(Arrays.asList("4")), getRows(filter));
 
   }
 
@@ -218,7 +218,7 @@ public class RowFilterTest {
 
     filter.seek(new Range(), Collections.<ByteSequence> emptySet(), false);
 
-    assertEquals(new HashSet<String>(Arrays.asList("0", "1", "2", "3", "4")), getRows(filter));
+    assertEquals(new HashSet<>(Arrays.asList("0", "1", "2", "3", "4")), getRows(filter));
   }
 
   @Test
@@ -234,7 +234,7 @@ public class RowFilterTest {
 
     filter.seek(new Range(), Collections.<ByteSequence> emptySet(), false);
 
-    assertEquals(new HashSet<String>(Arrays.asList("1")), getRows(filter));
+    assertEquals(new HashSet<>(Arrays.asList("1")), getRows(filter));
   }
 
   @Test
@@ -284,7 +284,7 @@ public class RowFilterTest {
   }
 
   private HashSet<String> getRows(RowFilter filter) throws IOException {
-    HashSet<String> rows = new HashSet<String>();
+    HashSet<String> rows = new HashSet<>();
     while (filter.hasTop()) {
       rows.add(filter.getTopKey().getRowData().toString());
       filter.next();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/iterators/user/TestCfCqSlice.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/iterators/user/TestCfCqSlice.java b/core/src/test/java/org/apache/accumulo/core/iterators/user/TestCfCqSlice.java
index d379778..20d9bcb 100644
--- a/core/src/test/java/org/apache/accumulo/core/iterators/user/TestCfCqSlice.java
+++ b/core/src/test/java/org/apache/accumulo/core/iterators/user/TestCfCqSlice.java
@@ -109,7 +109,7 @@ public abstract class TestCfCqSlice {
     assertTrue("slice param must be less than LR_DIM", sliceMinCq < LR_DIM);
     assertTrue("slice param must be less than LR_DIM", sliceMaxCf < LR_DIM);
     assertTrue("slice param must be less than LR_DIM", sliceMaxCq < LR_DIM);
-    Map<String,String> opts = new HashMap<String,String>();
+    Map<String,String> opts = new HashMap<>();
     opts.put(CfCqSliceOpts.OPT_MIN_CF, new String(LONG_LEX.encode(sliceMinCf), UTF_8));
     opts.put(CfCqSliceOpts.OPT_MIN_CQ, new String(LONG_LEX.encode(sliceMinCq), UTF_8));
     opts.put(CfCqSliceOpts.OPT_MAX_CF, new String(LONG_LEX.encode(sliceMaxCf), UTF_8));
@@ -135,7 +135,7 @@ public abstract class TestCfCqSlice {
     long sliceMinCq = 20;
     long sliceMaxCf = 20;
     long sliceMaxCq = 20;
-    Map<String,String> opts = new HashMap<String,String>();
+    Map<String,String> opts = new HashMap<>();
     opts.put(CfCqSliceOpts.OPT_MIN_CF, new String(LONG_LEX.encode(sliceMinCf), UTF_8));
     opts.put(CfCqSliceOpts.OPT_MIN_CQ, new String(LONG_LEX.encode(sliceMinCq), UTF_8));
     opts.put(CfCqSliceOpts.OPT_MAX_CF, new String(LONG_LEX.encode(sliceMaxCf), UTF_8));
@@ -161,7 +161,7 @@ public abstract class TestCfCqSlice {
     long sliceMinCq = 20;
     long sliceMaxCf = 22;
     long sliceMaxCq = 22;
-    Map<String,String> opts = new HashMap<String,String>();
+    Map<String,String> opts = new HashMap<>();
     opts.put(CfCqSliceOpts.OPT_MIN_CF, new String(LONG_LEX.encode(sliceMinCf), UTF_8));
     opts.put(CfCqSliceOpts.OPT_MIN_CQ, new String(LONG_LEX.encode(sliceMinCq), UTF_8));
     opts.put(CfCqSliceOpts.OPT_MAX_CF, new String(LONG_LEX.encode(sliceMaxCf), UTF_8));
@@ -187,7 +187,7 @@ public abstract class TestCfCqSlice {
     boolean[][][] foundKvs = new boolean[LR_DIM][LR_DIM][LR_DIM];
     long sliceMinCq = 10;
     long sliceMaxCq = 30;
-    Map<String,String> opts = new HashMap<String,String>();
+    Map<String,String> opts = new HashMap<>();
     opts.put(CfCqSliceOpts.OPT_MIN_CQ, new String(LONG_LEX.encode(sliceMinCq), UTF_8));
     opts.put(CfCqSliceOpts.OPT_MAX_CQ, new String(LONG_LEX.encode(sliceMaxCq), UTF_8));
     loadKvs(foundKvs, opts, INFINITY);
@@ -209,7 +209,7 @@ public abstract class TestCfCqSlice {
     boolean[][][] foundKvs = new boolean[LR_DIM][LR_DIM][LR_DIM];
     long sliceMinCf = 10;
     long sliceMaxCf = 30;
-    Map<String,String> opts = new HashMap<String,String>();
+    Map<String,String> opts = new HashMap<>();
     opts.put(CfCqSliceOpts.OPT_MIN_CF, new String(LONG_LEX.encode(sliceMinCf), UTF_8));
     opts.put(CfCqSliceOpts.OPT_MAX_CF, new String(LONG_LEX.encode(sliceMaxCf), UTF_8));
     loadKvs(foundKvs, opts, INFINITY);
@@ -233,7 +233,7 @@ public abstract class TestCfCqSlice {
     long sliceMinCq = LR_DIM + 1;
     long sliceMaxCf = LR_DIM + 1;
     long sliceMaxCq = LR_DIM + 1;
-    Map<String,String> opts = new HashMap<String,String>();
+    Map<String,String> opts = new HashMap<>();
     opts.put(CfCqSliceOpts.OPT_MIN_CF, new String(LONG_LEX.encode(sliceMinCf), UTF_8));
     opts.put(CfCqSliceOpts.OPT_MIN_CQ, new String(LONG_LEX.encode(sliceMinCq), UTF_8));
     opts.put(CfCqSliceOpts.OPT_MAX_CF, new String(LONG_LEX.encode(sliceMaxCf), UTF_8));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/iterators/user/TransformingIteratorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/iterators/user/TransformingIteratorTest.java b/core/src/test/java/org/apache/accumulo/core/iterators/user/TransformingIteratorTest.java
index 97ebe5c..d02b7f2 100644
--- a/core/src/test/java/org/apache/accumulo/core/iterators/user/TransformingIteratorTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/iterators/user/TransformingIteratorTest.java
@@ -64,7 +64,7 @@ public class TransformingIteratorTest {
   private static final Map<String,String> EMPTY_OPTS = ImmutableMap.of();
   private TransformingIterator titer;
 
-  private TreeMap<Key,Value> data = new TreeMap<Key,Value>();
+  private TreeMap<Key,Value> data = new TreeMap<>();
 
   @Before
   public void createData() throws Exception {
@@ -113,7 +113,7 @@ public class TransformingIteratorTest {
     // the same key/value pair for every getTopKey/getTopValue call. The code
     // will always return the final key/value if we didn't copy the original key
     // in the iterator.
-    TreeMap<Key,Value> expected = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> expected = new TreeMap<>();
     for (int row = 1; row <= 3; ++row) {
       for (int cf = 1; cf <= 3; ++cf) {
         for (int cq = 1; cq <= 3; ++cq) {
@@ -129,7 +129,7 @@ public class TransformingIteratorTest {
 
   @Test
   public void testNoRangeScan() throws Exception {
-    List<Class<? extends ReversingKeyTransformingIterator>> classes = new ArrayList<Class<? extends ReversingKeyTransformingIterator>>();
+    List<Class<? extends ReversingKeyTransformingIterator>> classes = new ArrayList<>();
     classes.add(ColFamReversingKeyTransformingIterator.class);
     classes.add(ColQualReversingKeyTransformingIterator.class);
     classes.add(ColVisReversingKeyTransformingIterator.class);
@@ -140,7 +140,7 @@ public class TransformingIteratorTest {
 
       // All rows with visibilities reversed
       TransformingIterator iter = clazz.newInstance();
-      TreeMap<Key,Value> expected = new TreeMap<Key,Value>();
+      TreeMap<Key,Value> expected = new TreeMap<>();
       for (int row = 1; row <= 3; ++row) {
         for (int cf = 1; cf <= 3; ++cf) {
           for (int cq = 1; cq <= 3; ++cq) {
@@ -166,7 +166,7 @@ public class TransformingIteratorTest {
     // Make sure it shows up in the output with the default test auths which include
     // vis0.
     setUpTransformIterator(ColVisReversingKeyTransformingIterator.class);
-    TreeMap<Key,Value> expected = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> expected = new TreeMap<>();
     for (int row = 1; row <= 3; ++row) {
       for (int cf = 1; cf <= 3; ++cf) {
         for (int cq = 1; cq <= 3; ++cq) {
@@ -194,7 +194,7 @@ public class TransformingIteratorTest {
   public void testRangeStart() throws Exception {
     setUpTransformIterator(ColVisReversingKeyTransformingIterator.class);
 
-    TreeMap<Key,Value> expected = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> expected = new TreeMap<>();
     putExpected(expected, 1, 2, 2, 1, PartialKey.ROW_COLFAM_COLQUAL); // before the range start, but transforms in the range
     putExpected(expected, 1, 2, 2, 2, PartialKey.ROW_COLFAM_COLQUAL);
 
@@ -205,7 +205,7 @@ public class TransformingIteratorTest {
   public void testRangeEnd() throws Exception {
     setUpTransformIterator(ColVisReversingKeyTransformingIterator.class);
 
-    TreeMap<Key,Value> expected = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> expected = new TreeMap<>();
     // putExpected(expected, 1, 2, 2, 1, part); // transforms vis outside range end
     putExpected(expected, 1, 2, 2, 2, PartialKey.ROW_COLFAM_COLQUAL);
     putExpected(expected, 1, 2, 2, 3, PartialKey.ROW_COLFAM_COLQUAL);
@@ -220,7 +220,7 @@ public class TransformingIteratorTest {
     // the data with untransformed col fam cf3 will transform to cf0 and
     // be inside the range.
 
-    TreeMap<Key,Value> expected = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> expected = new TreeMap<>();
     for (int cq = 1; cq <= 3; ++cq)
       for (int cv = 1; cv <= 3; ++cv)
         putExpected(expected, 1, 3, cq, cv, PartialKey.ROW);
@@ -266,7 +266,7 @@ public class TransformingIteratorTest {
     int expectedCF = 1;
     setUpTransformIterator(ColFamReversingKeyTransformingIterator.class);
 
-    TreeMap<Key,Value> expected = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> expected = new TreeMap<>();
     for (int row = 1; row <= 3; ++row)
       for (int cq = 1; cq <= 3; ++cq)
         for (int cv = 1; cv <= 3; ++cv)
@@ -317,7 +317,7 @@ public class TransformingIteratorTest {
     int expectedCF = 1;
     setUpTransformIterator(ColFamReversingCompactionKeyTransformingIterator.class);
 
-    TreeMap<Key,Value> expected = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> expected = new TreeMap<>();
     for (int row = 1; row <= 3; ++row)
       for (int cq = 1; cq <= 3; ++cq)
         for (int cv = 1; cv <= 3; ++cv)
@@ -332,7 +332,7 @@ public class TransformingIteratorTest {
     // should still show up.
     setUpTransformIterator(BadVisCompactionKeyTransformingIterator.class);
 
-    TreeMap<Key,Value> expected = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> expected = new TreeMap<>();
     for (int rowID = 1; rowID <= 3; ++rowID) {
       for (int cfID = 1; cfID <= 3; ++cfID) {
         for (int cqID = 1; cqID <= 3; ++cqID) {
@@ -391,7 +391,7 @@ public class TransformingIteratorTest {
     TransformingIterator.setMaxBufferSize(is, 10000000);
     Assert.assertTrue(ti.validateOptions(is.getOptions()));
 
-    Map<String,String> opts = new HashMap<String,String>();
+    Map<String,String> opts = new HashMap<>();
 
     opts.put(TransformingIterator.MAX_BUFFER_SIZE_OPT, "10M");
     Assert.assertTrue(ti.validateOptions(is.getOptions()));
@@ -583,7 +583,7 @@ public class TransformingIteratorTest {
 
     @Override
     protected Collection<ByteSequence> untransformColumnFamilies(Collection<ByteSequence> columnFamilies) {
-      HashSet<ByteSequence> untransformed = new HashSet<ByteSequence>();
+      HashSet<ByteSequence> untransformed = new HashSet<>();
       for (ByteSequence cf : columnFamilies)
         untransformed.add(untransformColumnFamily(cf));
       return untransformed;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/iterators/user/VersioningIteratorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/iterators/user/VersioningIteratorTest.java b/core/src/test/java/org/apache/accumulo/core/iterators/user/VersioningIteratorTest.java
index fa42998..cdd0074 100644
--- a/core/src/test/java/org/apache/accumulo/core/iterators/user/VersioningIteratorTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/iterators/user/VersioningIteratorTest.java
@@ -40,7 +40,7 @@ import org.slf4j.LoggerFactory;
 
 public class VersioningIteratorTest {
   // add test for seek function
-  private static final Collection<ByteSequence> EMPTY_COL_FAMS = new ArrayList<ByteSequence>();
+  private static final Collection<ByteSequence> EMPTY_COL_FAMS = new ArrayList<>();
   private static final Encoder<Long> encoder = LongCombiner.FIXED_LEN_ENCODER;
   private static final Logger log = LoggerFactory.getLogger(VersioningIteratorTest.class);
 
@@ -56,7 +56,7 @@ public class VersioningIteratorTest {
   }
 
   TreeMap<Key,Value> iteratorOverTestData(VersioningIterator it) throws IOException {
-    TreeMap<Key,Value> tmOut = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tmOut = new TreeMap<>();
     while (it.hasTop()) {
       tmOut.put(it.getTopKey(), it.getTopValue());
       it.next();
@@ -70,7 +70,7 @@ public class VersioningIteratorTest {
     Text colf = new Text("a");
     Text colq = new Text("b");
 
-    TreeMap<Key,Value> tm = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm = new TreeMap<>();
 
     createTestData(tm, colf, colq);
 
@@ -101,7 +101,7 @@ public class VersioningIteratorTest {
     Text colf = new Text("a");
     Text colq = new Text("b");
 
-    TreeMap<Key,Value> tm = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm = new TreeMap<>();
 
     createTestData(tm, colf, colq);
 
@@ -137,7 +137,7 @@ public class VersioningIteratorTest {
     Text colf = new Text("a");
     Text colq = new Text("b");
 
-    TreeMap<Key,Value> tm = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm = new TreeMap<>();
 
     createTestData(tm, colf, colq);
 
@@ -186,7 +186,7 @@ public class VersioningIteratorTest {
     Text colf = new Text("a");
     Text colq = new Text("b");
 
-    TreeMap<Key,Value> tm = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm = new TreeMap<>();
 
     createTestData(tm, colf, colq);
 
@@ -215,7 +215,7 @@ public class VersioningIteratorTest {
     Text colf = new Text("a");
     Text colq = new Text("b");
 
-    TreeMap<Key,Value> tm = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm = new TreeMap<>();
 
     createTestData(tm, colf, colq);
 
@@ -237,7 +237,7 @@ public class VersioningIteratorTest {
     Text colf = new Text("a");
     Text colq = new Text("b");
 
-    TreeMap<Key,Value> tm = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm = new TreeMap<>();
 
     createTestData(tm, colf, colq);
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/iterators/user/VisibilityFilterTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/iterators/user/VisibilityFilterTest.java b/core/src/test/java/org/apache/accumulo/core/iterators/user/VisibilityFilterTest.java
index 810c355..8de1472 100644
--- a/core/src/test/java/org/apache/accumulo/core/iterators/user/VisibilityFilterTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/iterators/user/VisibilityFilterTest.java
@@ -39,7 +39,7 @@ import org.junit.Test;
 
 public class VisibilityFilterTest {
 
-  private static final Collection<ByteSequence> EMPTY_COL_FAMS = new ArrayList<ByteSequence>();
+  private static final Collection<ByteSequence> EMPTY_COL_FAMS = new ArrayList<>();
 
   private static final Text BAD = new Text("bad");
   private static final Text GOOD = new Text("good");
@@ -50,7 +50,7 @@ public class VisibilityFilterTest {
   private static final Value EMPTY_VALUE = new Value(new byte[0]);
 
   private TreeMap<Key,Value> createUnprotectedSource(int numPublic, int numHidden) {
-    TreeMap<Key,Value> source = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> source = new TreeMap<>();
     for (int i = 0; i < numPublic; i++)
       source.put(new Key(new Text(String.format("%03d", i)), GOOD, GOOD, EMPTY_VIS), EMPTY_VALUE);
     for (int i = 0; i < numHidden; i++)
@@ -59,7 +59,7 @@ public class VisibilityFilterTest {
   }
 
   private TreeMap<Key,Value> createPollutedSource(int numGood, int numBad) {
-    TreeMap<Key,Value> source = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> source = new TreeMap<>();
     for (int i = 0; i < numGood; i++)
       source.put(new Key(new Text(String.format("%03d", i)), GOOD, GOOD, GOOD_VIS), EMPTY_VALUE);
     for (int i = 0; i < numBad; i++)
@@ -68,7 +68,7 @@ public class VisibilityFilterTest {
   }
 
   private TreeMap<Key,Value> createSourceWithHiddenData(int numViewable, int numHidden) {
-    TreeMap<Key,Value> source = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> source = new TreeMap<>();
     for (int i = 0; i < numViewable; i++)
       source.put(new Key(new Text(String.format("%03d", i)), GOOD, GOOD, GOOD_VIS), EMPTY_VALUE);
     for (int i = 0; i < numHidden; i++)

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/iterators/user/WholeColumnFamilyIteratorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/iterators/user/WholeColumnFamilyIteratorTest.java b/core/src/test/java/org/apache/accumulo/core/iterators/user/WholeColumnFamilyIteratorTest.java
index f5440cd..882c82a 100644
--- a/core/src/test/java/org/apache/accumulo/core/iterators/user/WholeColumnFamilyIteratorTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/iterators/user/WholeColumnFamilyIteratorTest.java
@@ -56,9 +56,9 @@ import org.junit.Assert;
 public class WholeColumnFamilyIteratorTest extends TestCase {
 
   public void testEmptyStuff() throws IOException {
-    SortedMap<Key,Value> map = new TreeMap<Key,Value>();
-    SortedMap<Key,Value> map2 = new TreeMap<Key,Value>();
-    final Map<Text,Boolean> toInclude = new HashMap<Text,Boolean>();
+    SortedMap<Key,Value> map = new TreeMap<>();
+    SortedMap<Key,Value> map2 = new TreeMap<>();
+    final Map<Text,Boolean> toInclude = new HashMap<>();
     map.put(new Key(new Text("r1"), new Text("cf1"), new Text("cq1"), new Text("cv1"), 1l), new Value("val1".getBytes()));
     map.put(new Key(new Text("r1"), new Text("cf1"), new Text("cq2"), new Text("cv1"), 2l), new Value("val2".getBytes()));
     map.put(new Key(new Text("r2"), new Text("cf1"), new Text("cq1"), new Text("cv1"), 3l), new Value("val3".getBytes()));
@@ -88,7 +88,7 @@ public class WholeColumnFamilyIteratorTest extends TestCase {
     }
     SortedMapIterator source = new SortedMapIterator(map);
     WholeColumnFamilyIterator iter = new WholeColumnFamilyIterator(source);
-    SortedMap<Key,Value> resultMap = new TreeMap<Key,Value>();
+    SortedMap<Key,Value> resultMap = new TreeMap<>();
     iter.seek(new Range(), new ArrayList<ByteSequence>(), false);
     int numRows = 0;
     while (iter.hasTop()) {
@@ -129,19 +129,19 @@ public class WholeColumnFamilyIteratorTest extends TestCase {
   }
 
   public void testContinue() throws Exception {
-    SortedMap<Key,Value> map1 = new TreeMap<Key,Value>();
+    SortedMap<Key,Value> map1 = new TreeMap<>();
     pkv(map1, "row1", "cf1", "cq1", "cv1", 5, "foo");
     pkv(map1, "row1", "cf1", "cq2", "cv1", 6, "bar");
 
-    SortedMap<Key,Value> map2 = new TreeMap<Key,Value>();
+    SortedMap<Key,Value> map2 = new TreeMap<>();
     pkv(map2, "row2", "cf1", "cq1", "cv1", 5, "foo");
     pkv(map2, "row2", "cf1", "cq2", "cv1", 6, "bar");
 
-    SortedMap<Key,Value> map3 = new TreeMap<Key,Value>();
+    SortedMap<Key,Value> map3 = new TreeMap<>();
     pkv(map3, "row3", "cf1", "cq1", "cv1", 5, "foo");
     pkv(map3, "row3", "cf1", "cq2", "cv1", 6, "bar");
 
-    SortedMap<Key,Value> map = new TreeMap<Key,Value>();
+    SortedMap<Key,Value> map = new TreeMap<>();
     map.putAll(map1);
     map.putAll(map2);
     map.putAll(map3);
@@ -170,14 +170,14 @@ public class WholeColumnFamilyIteratorTest extends TestCase {
   }
 
   public void testBug1() throws Exception {
-    SortedMap<Key,Value> map1 = new TreeMap<Key,Value>();
+    SortedMap<Key,Value> map1 = new TreeMap<>();
     pkv(map1, "row1", "cf1", "cq1", "cv1", 5, "foo");
     pkv(map1, "row1", "cf1", "cq2", "cv1", 6, "bar");
 
-    SortedMap<Key,Value> map2 = new TreeMap<Key,Value>();
+    SortedMap<Key,Value> map2 = new TreeMap<>();
     pkv(map2, "row2", "cf1", "cq1", "cv1", 5, "foo");
 
-    SortedMap<Key,Value> map = new TreeMap<Key,Value>();
+    SortedMap<Key,Value> map = new TreeMap<>();
     map.putAll(map1);
     map.putAll(map2);
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/iterators/user/WholeRowIteratorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/iterators/user/WholeRowIteratorTest.java b/core/src/test/java/org/apache/accumulo/core/iterators/user/WholeRowIteratorTest.java
index b47ef3e..8d37d6c 100644
--- a/core/src/test/java/org/apache/accumulo/core/iterators/user/WholeRowIteratorTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/iterators/user/WholeRowIteratorTest.java
@@ -55,9 +55,9 @@ public class WholeRowIteratorTest {
 
   @Test
   public void testEmptyStuff() throws IOException {
-    SortedMap<Key,Value> map = new TreeMap<Key,Value>();
-    SortedMap<Key,Value> map2 = new TreeMap<Key,Value>();
-    final Map<Text,Boolean> toInclude = new HashMap<Text,Boolean>();
+    SortedMap<Key,Value> map = new TreeMap<>();
+    SortedMap<Key,Value> map2 = new TreeMap<>();
+    final Map<Text,Boolean> toInclude = new HashMap<>();
     map.put(new Key(new Text("r1"), new Text("cf1"), new Text("cq1"), new Text("cv1"), 1l), new Value("val1".getBytes()));
     map.put(new Key(new Text("r1"), new Text("cf1"), new Text("cq2"), new Text("cv1"), 2l), new Value("val2".getBytes()));
     map.put(new Key(new Text("r2"), new Text("cf1"), new Text("cq1"), new Text("cv1"), 3l), new Value("val3".getBytes()));
@@ -87,7 +87,7 @@ public class WholeRowIteratorTest {
     }
     SortedMapIterator source = new SortedMapIterator(map);
     WholeRowIterator iter = new WholeRowIterator(source);
-    SortedMap<Key,Value> resultMap = new TreeMap<Key,Value>();
+    SortedMap<Key,Value> resultMap = new TreeMap<>();
     iter.seek(new Range(), new ArrayList<ByteSequence>(), false);
     int numRows = 0;
     while (iter.hasTop()) {
@@ -126,19 +126,19 @@ public class WholeRowIteratorTest {
 
   @Test
   public void testContinue() throws Exception {
-    SortedMap<Key,Value> map1 = new TreeMap<Key,Value>();
+    SortedMap<Key,Value> map1 = new TreeMap<>();
     pkv(map1, "row1", "cf1", "cq1", "cv1", 5, "foo");
     pkv(map1, "row1", "cf1", "cq2", "cv1", 6, "bar");
 
-    SortedMap<Key,Value> map2 = new TreeMap<Key,Value>();
+    SortedMap<Key,Value> map2 = new TreeMap<>();
     pkv(map2, "row2", "cf1", "cq1", "cv1", 5, "foo");
     pkv(map2, "row2", "cf1", "cq2", "cv1", 6, "bar");
 
-    SortedMap<Key,Value> map3 = new TreeMap<Key,Value>();
+    SortedMap<Key,Value> map3 = new TreeMap<>();
     pkv(map3, "row3", "cf1", "cq1", "cv1", 5, "foo");
     pkv(map3, "row3", "cf1", "cq2", "cv1", 6, "bar");
 
-    SortedMap<Key,Value> map = new TreeMap<Key,Value>();
+    SortedMap<Key,Value> map = new TreeMap<>();
     map.putAll(map1);
     map.putAll(map2);
     map.putAll(map3);
@@ -168,14 +168,14 @@ public class WholeRowIteratorTest {
 
   @Test
   public void testBug1() throws Exception {
-    SortedMap<Key,Value> map1 = new TreeMap<Key,Value>();
+    SortedMap<Key,Value> map1 = new TreeMap<>();
     pkv(map1, "row1", "cf1", "cq1", "cv1", 5, "foo");
     pkv(map1, "row1", "cf1", "cq2", "cv1", 6, "bar");
 
-    SortedMap<Key,Value> map2 = new TreeMap<Key,Value>();
+    SortedMap<Key,Value> map2 = new TreeMap<>();
     pkv(map2, "row2", "cf1", "cq1", "cv1", 5, "foo");
 
-    SortedMap<Key,Value> map = new TreeMap<Key,Value>();
+    SortedMap<Key,Value> map = new TreeMap<>();
     map.putAll(map1);
     map.putAll(map2);
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/util/LocalityGroupUtilTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/util/LocalityGroupUtilTest.java b/core/src/test/java/org/apache/accumulo/core/util/LocalityGroupUtilTest.java
index 60464a6..c4c46cb 100644
--- a/core/src/test/java/org/apache/accumulo/core/util/LocalityGroupUtilTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/util/LocalityGroupUtilTest.java
@@ -80,8 +80,8 @@ public class LocalityGroupUtilTest {
     assertEquals(ecf, LocalityGroupUtil.encodeColumnFamily(bs2));
 
     // test encoding multiple column fams containing binary data
-    HashSet<Text> in = new HashSet<Text>();
-    HashSet<ByteSequence> in2 = new HashSet<ByteSequence>();
+    HashSet<Text> in = new HashSet<>();
+    HashSet<ByteSequence> in2 = new HashSet<>();
     in.add(new Text(test1));
     in2.add(new ArrayByteSequence(test1));
     in.add(new Text(test2));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/util/MergeTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/util/MergeTest.java b/core/src/test/java/org/apache/accumulo/core/util/MergeTest.java
index 6fe240a..b7804f6 100644
--- a/core/src/test/java/org/apache/accumulo/core/util/MergeTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/util/MergeTest.java
@@ -32,8 +32,8 @@ import org.junit.Test;
 public class MergeTest {
 
   static class MergeTester extends Merge {
-    public List<List<Size>> merges = new ArrayList<List<Size>>();
-    public List<Size> tablets = new ArrayList<Size>();
+    public List<List<Size>> merges = new ArrayList<>();
+    public List<Size> tablets = new ArrayList<>();
 
     MergeTester(Integer... sizes) {
       Text start = null;
@@ -95,7 +95,7 @@ public class MergeTest {
 
     @Override
     protected void merge(Connector conn, String table, List<Size> sizes, int numToMerge) throws MergeException {
-      List<Size> merge = new ArrayList<Size>();
+      List<Size> merge = new ArrayList<>();
       for (int i = 0; i < numToMerge; i++) {
         merge.add(sizes.get(i));
       }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/util/PairTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/util/PairTest.java b/core/src/test/java/org/apache/accumulo/core/util/PairTest.java
index 60af90e..6effc9e 100644
--- a/core/src/test/java/org/apache/accumulo/core/util/PairTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/util/PairTest.java
@@ -30,8 +30,8 @@ public class PairTest {
    */
   @Test
   public void testEqualsObject() {
-    Pair<Integer,String> pair = new Pair<Integer,String>(25, "twenty-five");
-    Pair<Integer,String> pair2 = new Pair<Integer,String>(25, "twenty-five");
+    Pair<Integer,String> pair = new Pair<>(25, "twenty-five");
+    Pair<Integer,String> pair2 = new Pair<>(25, "twenty-five");
     assertEquals(pair, pair2);
   }
 
@@ -40,7 +40,7 @@ public class PairTest {
    */
   @Test
   public void testGetFirst() {
-    Pair<Integer,String> pair = new Pair<Integer,String>(25, "twenty-five");
+    Pair<Integer,String> pair = new Pair<>(25, "twenty-five");
     assertEquals((Integer) 25, pair.getFirst());
   }
 
@@ -49,7 +49,7 @@ public class PairTest {
    */
   @Test
   public void testGetSecond() {
-    Pair<Integer,String> pair = new Pair<Integer,String>(25, "twenty-five");
+    Pair<Integer,String> pair = new Pair<>(25, "twenty-five");
     assertEquals("twenty-five", pair.getSecond());
   }
 
@@ -58,7 +58,7 @@ public class PairTest {
    */
   @Test
   public void testToString() {
-    Pair<Integer,String> pair = new Pair<Integer,String>(25, "twenty-five");
+    Pair<Integer,String> pair = new Pair<>(25, "twenty-five");
     assertEquals("(25,twenty-five)", pair.toString());
   }
 
@@ -67,7 +67,7 @@ public class PairTest {
    */
   @Test
   public void testToStringStringStringString() {
-    Pair<Integer,String> pair = new Pair<Integer,String>(25, "twenty-five");
+    Pair<Integer,String> pair = new Pair<>(25, "twenty-five");
     assertEquals("---25~~~twenty-five+++", pair.toString("---", "~~~", "+++"));
   }
 
@@ -76,7 +76,7 @@ public class PairTest {
    */
   @Test
   public void testToMapEntry() {
-    Pair<Integer,String> pair = new Pair<Integer,String>(10, "IO");
+    Pair<Integer,String> pair = new Pair<>(10, "IO");
 
     Entry<Integer,String> entry = pair.toMapEntry();
     assertEquals(pair.getFirst(), entry.getKey());
@@ -88,9 +88,9 @@ public class PairTest {
    */
   @Test
   public void testSwap() {
-    Pair<Integer,String> pair = new Pair<Integer,String>(25, "twenty-five");
+    Pair<Integer,String> pair = new Pair<>(25, "twenty-five");
     assertEquals(pair, pair.swap().swap());
-    Pair<String,Integer> pair2 = new Pair<String,Integer>("twenty-five", 25);
+    Pair<String,Integer> pair2 = new Pair<>("twenty-five", 25);
     assertEquals(pair, pair2.swap());
     assertEquals(pair2, pair.swap());
   }
@@ -100,7 +100,7 @@ public class PairTest {
    */
   @Test
   public void testFromEntry() {
-    Entry<Integer,String> entry = new SimpleImmutableEntry<Integer,String>(10, "IO");
+    Entry<Integer,String> entry = new SimpleImmutableEntry<>(10, "IO");
 
     Pair<Integer,String> pair0 = Pair.fromEntry(entry);
     assertEquals(entry.getKey(), pair0.getFirst());

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/util/PartitionerTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/util/PartitionerTest.java b/core/src/test/java/org/apache/accumulo/core/util/PartitionerTest.java
index 8ab2beb..7568aba 100644
--- a/core/src/test/java/org/apache/accumulo/core/util/PartitionerTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/util/PartitionerTest.java
@@ -112,7 +112,7 @@ public class PartitionerTest {
   }
 
   private Set<Key> toKeySet(Mutation... expected) {
-    HashSet<Key> ret = new HashSet<Key>();
+    HashSet<Key> ret = new HashSet<>();
     for (Mutation mutation : expected)
       for (ColumnUpdate cu : mutation.getUpdates())
         ret.add(new Key(mutation.getRow(), cu.getColumnFamily(), cu.getColumnQualifier(), cu.getColumnVisibility(), cu.getTimestamp()));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/util/format/DateStringFormatterTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/util/format/DateStringFormatterTest.java b/core/src/test/java/org/apache/accumulo/core/util/format/DateStringFormatterTest.java
index 505c198..22af5b0 100644
--- a/core/src/test/java/org/apache/accumulo/core/util/format/DateStringFormatterTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/util/format/DateStringFormatterTest.java
@@ -36,7 +36,7 @@ public class DateStringFormatterTest {
   @Before
   public void setUp() {
     formatter = new DateStringFormatter();
-    data = new TreeMap<Key,Value>();
+    data = new TreeMap<>();
     data.put(new Key("", "", "", 0), new Value());
   }
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/util/format/DefaultFormatterTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/util/format/DefaultFormatterTest.java b/core/src/test/java/org/apache/accumulo/core/util/format/DefaultFormatterTest.java
index eed455c..9c688db 100644
--- a/core/src/test/java/org/apache/accumulo/core/util/format/DefaultFormatterTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/util/format/DefaultFormatterTest.java
@@ -68,7 +68,7 @@ public class DefaultFormatterTest {
   @Test
   public void testFormatEntry() {
     final long timestamp = 0;
-    Map<Key,Value> map = new TreeMap<Key,Value>();
+    Map<Key,Value> map = new TreeMap<>();
     map.put(new Key("a", "ab", "abc", timestamp), new Value("abcd".getBytes()));
 
     FormatterConfig config;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/util/format/HexFormatterTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/util/format/HexFormatterTest.java b/core/src/test/java/org/apache/accumulo/core/util/format/HexFormatterTest.java
index 7f20dfc..c267fbe 100644
--- a/core/src/test/java/org/apache/accumulo/core/util/format/HexFormatterTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/util/format/HexFormatterTest.java
@@ -35,7 +35,7 @@ public class HexFormatterTest {
 
   @Before
   public void setUp() {
-    data = new TreeMap<Key,Value>();
+    data = new TreeMap<>();
     formatter = new HexFormatter();
   }
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/util/format/ShardedTableDistributionFormatterTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/util/format/ShardedTableDistributionFormatterTest.java b/core/src/test/java/org/apache/accumulo/core/util/format/ShardedTableDistributionFormatterTest.java
index d6afe99..ce733fe 100644
--- a/core/src/test/java/org/apache/accumulo/core/util/format/ShardedTableDistributionFormatterTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/util/format/ShardedTableDistributionFormatterTest.java
@@ -39,7 +39,7 @@ public class ShardedTableDistributionFormatterTest {
 
   @Before
   public void setUp() {
-    data = new TreeMap<Key,Value>();
+    data = new TreeMap<>();
     formatter = new ShardedTableDistributionFormatter();
   }
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/util/format/StatisticsDisplayFormatterTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/util/format/StatisticsDisplayFormatterTest.java b/core/src/test/java/org/apache/accumulo/core/util/format/StatisticsDisplayFormatterTest.java
index 69342d7..d559d73 100644
--- a/core/src/test/java/org/apache/accumulo/core/util/format/StatisticsDisplayFormatterTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/util/format/StatisticsDisplayFormatterTest.java
@@ -35,7 +35,7 @@ public class StatisticsDisplayFormatterTest {
 
   @Before
   public void setUp() {
-    data = new TreeMap<Key,Value>();
+    data = new TreeMap<>();
     formatter = new StatisticsDisplayFormatter();
   }
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchScanner.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchScanner.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchScanner.java
index 4bd1e61..e762e7d 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchScanner.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchScanner.java
@@ -116,8 +116,8 @@ public class RandomBatchScanner {
    */
   static boolean doRandomQueries(int num, long min, long max, int evs, Random r, BatchScanner tsbr) {
 
-    HashSet<Range> ranges = new HashSet<Range>(num);
-    HashMap<Text,Boolean> expectedRows = new java.util.HashMap<Text,Boolean>();
+    HashSet<Range> ranges = new HashSet<>(num);
+    HashMap<Text,Boolean> expectedRows = new java.util.HashMap<>();
 
     generateRandomQueries(num, min, max, r, ranges, expectedRows);
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchWriter.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchWriter.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchWriter.java
index 610eb5c..51aee8f 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchWriter.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchWriter.java
@@ -143,7 +143,7 @@ public class RandomBatchWriter {
     ColumnVisibility cv = opts.visiblity;
 
     // Generate num unique row ids in the given range
-    HashSet<Long> rowids = new HashSet<Long>(opts.num);
+    HashSet<Long> rowids = new HashSet<>(opts.num);
     while (rowids.size() < opts.num) {
       rowids.add((abs(r.nextLong()) % (opts.max - opts.min)) + opts.min);
     }
@@ -156,12 +156,12 @@ public class RandomBatchWriter {
       bw.close();
     } catch (MutationsRejectedException e) {
       if (e.getSecurityErrorCodes().size() > 0) {
-        HashMap<String,Set<SecurityErrorCode>> tables = new HashMap<String,Set<SecurityErrorCode>>();
+        HashMap<String,Set<SecurityErrorCode>> tables = new HashMap<>();
         for (Entry<TabletId,Set<SecurityErrorCode>> ke : e.getSecurityErrorCodes().entrySet()) {
           String tableId = ke.getKey().getTableId().toString();
           Set<SecurityErrorCode> secCodes = tables.get(tableId);
           if (secCodes == null) {
-            secCodes = new HashSet<SecurityErrorCode>();
+            secCodes = new HashSet<>();
             tables.put(tableId, secCodes);
           }
           secCodes.addAll(ke.getValue());

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/ReadWriteExample.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/ReadWriteExample.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/ReadWriteExample.java
index 70effb1..44d4b6f 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/ReadWriteExample.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/ReadWriteExample.java
@@ -88,7 +88,7 @@ public class ReadWriteExample {
 
     // create table
     if (opts.createtable) {
-      SortedSet<Text> partitionKeys = new TreeSet<Text>();
+      SortedSet<Text> partitionKeys = new TreeSet<>();
       for (int i = Byte.MIN_VALUE; i < Byte.MAX_VALUE; i++)
         partitionKeys.add(new Text(new byte[] {(byte) i}));
       conn.tableOperations().create(opts.getTableName());

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/examples/simple/src/main/java/org/apache/accumulo/examples/simple/constraints/AlphaNumKeyConstraint.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/constraints/AlphaNumKeyConstraint.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/constraints/AlphaNumKeyConstraint.java
index f265e18..14e3c8e 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/constraints/AlphaNumKeyConstraint.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/constraints/AlphaNumKeyConstraint.java
@@ -55,7 +55,7 @@ public class AlphaNumKeyConstraint implements Constraint {
 
   private Set<Short> addViolation(Set<Short> violations, short violation) {
     if (violations == null) {
-      violations = new LinkedHashSet<Short>();
+      violations = new LinkedHashSet<>();
       violations.add(violation);
     } else if (!violations.contains(violation)) {
       violations.add(violation);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/examples/simple/src/main/java/org/apache/accumulo/examples/simple/dirlist/Ingest.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/dirlist/Ingest.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/dirlist/Ingest.java
index 17c9ee8..c0808fe 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/dirlist/Ingest.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/dirlist/Ingest.java
@@ -132,7 +132,7 @@ public class Ingest {
     @Parameter(names = "--chunkSize", description = "the size of chunks when breaking down files")
     int chunkSize = 100000;
     @Parameter(description = "<dir> { <dir> ... }")
-    List<String> directories = new ArrayList<String>();
+    List<String> directories = new ArrayList<>();
   }
 
   public static void main(String[] args) throws Exception {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/examples/simple/src/main/java/org/apache/accumulo/examples/simple/dirlist/QueryUtil.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/dirlist/QueryUtil.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/dirlist/QueryUtil.java
index a79b9d2..2c76264 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/dirlist/QueryUtil.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/dirlist/QueryUtil.java
@@ -143,7 +143,7 @@ public class QueryUtil {
       path = path.substring(0, path.length() - 1);
     Scanner scanner = conn.createScanner(tableName, auths);
     scanner.setRange(new Range(getRow(path)));
-    Map<String,String> data = new TreeMap<String,String>();
+    Map<String,String> data = new TreeMap<>();
     for (Entry<Key,Value> e : scanner) {
       String type = getType(e.getKey().getColumnFamily());
       data.put("fullname", e.getKey().getRow().toString().substring(3));
@@ -161,7 +161,7 @@ public class QueryUtil {
   public Map<String,Map<String,String>> getDirList(String path) throws TableNotFoundException {
     if (!path.endsWith("/"))
       path = path + "/";
-    Map<String,Map<String,String>> fim = new TreeMap<String,Map<String,String>>();
+    Map<String,Map<String,String>> fim = new TreeMap<>();
     Scanner scanner = conn.createScanner(tableName, auths);
     scanner.setRange(Range.prefix(getRow(path)));
     for (Entry<Key,Value> e : scanner) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/ChunkInputFormat.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/ChunkInputFormat.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/ChunkInputFormat.java
index f5da4e5..bb7715b 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/ChunkInputFormat.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/ChunkInputFormat.java
@@ -45,8 +45,8 @@ public class ChunkInputFormat extends InputFormatBase<List<Entry<Key,Value>>,Inp
       @Override
       public void initialize(InputSplit inSplit, TaskAttemptContext attempt) throws IOException {
         super.initialize(inSplit, attempt);
-        peekingScannerIterator = new PeekingIterator<Entry<Key,Value>>(scannerIterator);
-        currentK = new ArrayList<Entry<Key,Value>>();
+        peekingScannerIterator = new PeekingIterator<>(scannerIterator);
+        currentK = new ArrayList<>();
         currentV = new ChunkInputStream();
       }
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/ChunkInputStream.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/ChunkInputStream.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/ChunkInputStream.java
index 0e6e319..1774227 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/ChunkInputStream.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/ChunkInputStream.java
@@ -59,7 +59,7 @@ public class ChunkInputStream extends InputStream {
     if (source != null)
       throw new IOException("setting new source without closing old one");
     this.source = in;
-    currentVis = new TreeSet<Text>();
+    currentVis = new TreeSet<>();
     count = pos = 0;
     if (!source.hasNext()) {
       log.debug("source has no next");

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/FileDataIngest.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/FileDataIngest.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/FileDataIngest.java
index e899ff5..1a0ec5d 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/FileDataIngest.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/FileDataIngest.java
@@ -178,7 +178,7 @@ public class FileDataIngest {
     int chunkSize = 64 * 1024;
 
     @Parameter(description = "<file> { <file> ... }")
-    List<String> files = new ArrayList<String>();
+    List<String> files = new ArrayList<>();
   }
 
   public static void main(String[] args) throws Exception {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/FileDataQuery.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/FileDataQuery.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/FileDataQuery.java
index 75e32ae..48746d0 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/FileDataQuery.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/FileDataQuery.java
@@ -49,7 +49,7 @@ public class FileDataQuery {
       throws AccumuloException, AccumuloSecurityException, TableNotFoundException {
     ZooKeeperInstance instance = new ZooKeeperInstance(ClientConfiguration.loadDefault().withInstance(instanceName).withZkHosts(zooKeepers));
     conn = instance.getConnector(user, token);
-    lastRefs = new ArrayList<Entry<Key,Value>>();
+    lastRefs = new ArrayList<>();
     cis = new ChunkInputStream();
     scanner = conn.createScanner(tableName, auths);
   }
@@ -62,7 +62,7 @@ public class FileDataQuery {
     scanner.setRange(new Range(hash));
     scanner.setBatchSize(1);
     lastRefs.clear();
-    PeekingIterator<Entry<Key,Value>> pi = new PeekingIterator<Entry<Key,Value>>(scanner.iterator());
+    PeekingIterator<Entry<Key,Value>> pi = new PeekingIterator<>(scanner.iterator());
     if (pi.hasNext()) {
       while (!pi.peek().getKey().getColumnFamily().equals(FileDataIngest.CHUNK_CF)) {
         lastRefs.add(pi.peek());

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/KeyUtil.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/KeyUtil.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/KeyUtil.java
index 2f09785..f9c52ba 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/KeyUtil.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/KeyUtil.java
@@ -50,7 +50,7 @@ public class KeyUtil {
    * @return an array of strings
    */
   public static String[] splitNullSepText(Text t) {
-    ArrayList<String> s = new ArrayList<String>();
+    ArrayList<String> s = new ArrayList<>();
     byte[] b = t.getBytes();
     int lastindex = 0;
     for (int i = 0; i < t.getLength(); i++) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/VisibilityCombiner.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/VisibilityCombiner.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/VisibilityCombiner.java
index ab2e7fc..b205ec1 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/VisibilityCombiner.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/VisibilityCombiner.java
@@ -25,7 +25,7 @@ import org.apache.accumulo.core.data.ByteSequence;
  */
 public class VisibilityCombiner {
 
-  private TreeSet<String> visibilities = new TreeSet<String>();
+  private TreeSet<String> visibilities = new TreeSet<>();
 
   void add(ByteSequence cv) {
     if (cv.length() == 0)

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/examples/simple/src/main/java/org/apache/accumulo/examples/simple/isolation/InterferenceTest.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/isolation/InterferenceTest.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/isolation/InterferenceTest.java
index 9fe6857..a2afcdf 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/isolation/InterferenceTest.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/isolation/InterferenceTest.java
@@ -108,7 +108,7 @@ public class InterferenceTest {
 
         // all columns in a row should have the same value,
         // use this hash set to track that
-        HashSet<String> values = new HashSet<String>();
+        HashSet<String> values = new HashSet<>();
 
         for (Entry<Key,Value> entry : scanner) {
           if (row == null)

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/NGramIngest.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/NGramIngest.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/NGramIngest.java
index 441f6ad..3355454 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/NGramIngest.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/NGramIngest.java
@@ -87,7 +87,7 @@ public class NGramIngest extends Configured implements Tool {
     if (!opts.getConnector().tableOperations().exists(opts.getTableName())) {
       log.info("Creating table " + opts.getTableName());
       opts.getConnector().tableOperations().create(opts.getTableName());
-      SortedSet<Text> splits = new TreeSet<Text>();
+      SortedSet<Text> splits = new TreeSet<>();
       String numbers[] = "1 2 3 4 5 6 7 8 9".split("\\s");
       String lower[] = "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("\\s");
       String upper[] = "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("\\s");

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/RowHash.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/RowHash.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/RowHash.java
index 9af2563..d27758e 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/RowHash.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/RowHash.java
@@ -75,7 +75,7 @@ public class RowHash extends Configured implements Tool {
     Text cf = new Text(idx < 0 ? col : col.substring(0, idx));
     Text cq = idx < 0 ? null : new Text(col.substring(idx + 1));
     if (cf.getLength() > 0)
-      AccumuloInputFormat.fetchColumns(job, Collections.singleton(new Pair<Text,Text>(cf, cq)));
+      AccumuloInputFormat.fetchColumns(job, Collections.singleton(new Pair<>(cf, cq)));
 
     job.setMapperClass(HashDataMapper.class);
     job.setMapOutputKeyClass(Text.class);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TableToFile.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TableToFile.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TableToFile.java
index 7eb6b42..96603ad 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TableToFile.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TableToFile.java
@@ -60,7 +60,7 @@ public class TableToFile extends Configured implements Tool {
   public static class TTFMapper extends Mapper<Key,Value,NullWritable,Text> {
     @Override
     public void map(Key row, Value data, Context context) throws IOException, InterruptedException {
-      Map.Entry<Key,Value> entry = new SimpleImmutableEntry<Key,Value>(row, data);
+      Map.Entry<Key,Value> entry = new SimpleImmutableEntry<>(row, data);
       context.write(NullWritable.get(), new Text(DefaultFormatter.formatEntry(entry, false)));
       context.setStatus("Outputed Value");
     }
@@ -77,13 +77,13 @@ public class TableToFile extends Configured implements Tool {
     job.setInputFormatClass(AccumuloInputFormat.class);
     opts.setAccumuloConfigs(job);
 
-    HashSet<Pair<Text,Text>> columnsToFetch = new HashSet<Pair<Text,Text>>();
+    HashSet<Pair<Text,Text>> columnsToFetch = new HashSet<>();
     for (String col : opts.columns.split(",")) {
       int idx = col.indexOf(":");
       Text cf = new Text(idx < 0 ? col : col.substring(0, idx));
       Text cq = idx < 0 ? null : new Text(col.substring(idx + 1));
       if (cf.getLength() > 0)
-        columnsToFetch.add(new Pair<Text,Text>(cf, cq));
+        columnsToFetch.add(new Pair<>(cf, cq));
     }
     if (!columnsToFetch.isEmpty())
       AccumuloInputFormat.fetchColumns(job, columnsToFetch);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TeraSortIngest.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TeraSortIngest.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TeraSortIngest.java
index 1005df4..b0b5177 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TeraSortIngest.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TeraSortIngest.java
@@ -167,7 +167,7 @@ public class TeraSortIngest extends Configured implements Tool {
       int numSplits = job.getConfiguration().getInt(NUMSPLITS, 1);
       long rowsPerSplit = totalRows / numSplits;
       System.out.println("Generating " + totalRows + " using " + numSplits + " maps with step of " + rowsPerSplit);
-      ArrayList<InputSplit> splits = new ArrayList<InputSplit>(numSplits);
+      ArrayList<InputSplit> splits = new ArrayList<>(numSplits);
       long currentRow = 0;
       for (int split = 0; split < numSplits - 1; ++split) {
         splits.add(new RangeInputSplit(currentRow, rowsPerSplit));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/bulk/SetupTable.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/bulk/SetupTable.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/bulk/SetupTable.java
index 8651c39..0fc3110 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/bulk/SetupTable.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/bulk/SetupTable.java
@@ -30,7 +30,7 @@ public class SetupTable {
 
   static class Opts extends ClientOnRequiredTable {
     @Parameter(description = "<split> { <split> ... } ")
-    List<String> splits = new ArrayList<String>();
+    List<String> splits = new ArrayList<>();
   }
 
   public static void main(String[] args) throws Exception {
@@ -40,7 +40,7 @@ public class SetupTable {
     conn.tableOperations().create(opts.getTableName());
     if (!opts.splits.isEmpty()) {
       // create a table with initial partitions
-      TreeSet<Text> intialPartitions = new TreeSet<Text>();
+      TreeSet<Text> intialPartitions = new TreeSet<>();
       for (String split : opts.splits) {
         intialPartitions.add(new Text(split));
       }


[30/32] accumulo git commit: ACCUMULO-4357 Remove unneeded code for readability

Posted by ct...@apache.org.
ACCUMULO-4357 Remove unneeded code for readability

* Remove extra semicolons
* Remove redundant interface declarations
* Remove unnecessary generics parameters when diamond would suffice


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b102e760
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b102e760
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b102e760

Branch: refs/heads/master
Commit: b102e7605035cc7eb128bd0a9ee95b2417389bc9
Parents: 5660464
Author: Christopher Tubbs <ct...@apache.org>
Authored: Thu Jun 30 21:32:12 2016 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Thu Jun 30 21:32:12 2016 -0400

----------------------------------------------------------------------
 .../apache/accumulo/core/cli/ClientOpts.java    |  2 +-
 .../accumulo/core/client/BatchWriterConfig.java |  2 +-
 .../core/client/ClientConfiguration.java        |  6 +-
 .../core/client/ClientSideIteratorScanner.java  |  4 +-
 .../accumulo/core/client/IsolatedScanner.java   |  2 +-
 .../accumulo/core/client/IteratorSetting.java   |  4 +-
 .../core/client/MutationsRejectedException.java |  6 +-
 .../accumulo/core/client/RowIterator.java       |  2 +-
 .../accumulo/core/client/TimedOutException.java |  2 +-
 .../core/client/admin/ActiveCompaction.java     |  4 +-
 .../client/admin/NewTableConfiguration.java     |  4 +-
 .../core/client/impl/ActiveCompactionImpl.java  |  2 +-
 .../core/client/impl/ActiveScanImpl.java        |  4 +-
 .../core/client/impl/CompressedIterators.java   | 10 +--
 .../core/client/impl/ConditionalWriterImpl.java | 40 +++++------
 .../client/impl/InstanceOperationsImpl.java     |  8 +--
 .../client/impl/MultiTableBatchWriterImpl.java  |  2 +-
 .../client/impl/NamespaceOperationsHelper.java  | 14 ++--
 .../client/impl/NamespaceOperationsImpl.java    |  6 +-
 .../accumulo/core/client/impl/Namespaces.java   |  6 +-
 .../core/client/impl/OfflineIterator.java       | 15 ++--
 .../core/client/impl/RootTabletLocator.java     |  2 +-
 .../core/client/impl/ScannerIterator.java       |  2 +-
 .../core/client/impl/ScannerOptions.java        | 20 +++---
 .../accumulo/core/client/impl/ServerClient.java |  4 +-
 .../core/client/impl/TableOperationsHelper.java | 14 ++--
 .../core/client/impl/TableOperationsImpl.java   | 58 +++++++--------
 .../accumulo/core/client/impl/Tables.java       |  8 +--
 .../core/client/impl/TabletLocator.java         | 10 +--
 .../core/client/impl/TabletLocatorImpl.java     | 28 ++++----
 .../client/impl/TabletServerBatchReader.java    |  2 +-
 .../impl/TabletServerBatchReaderIterator.java   | 52 +++++++-------
 .../client/impl/TabletServerBatchWriter.java    | 34 ++++-----
 .../core/client/impl/ThriftScanner.java         |  6 +-
 .../core/client/impl/ThriftTransportPool.java   | 24 +++----
 .../accumulo/core/client/impl/Translator.java   |  6 +-
 .../client/lexicoder/BigIntegerLexicoder.java   | 10 +--
 .../core/client/lexicoder/BytesLexicoder.java   |  2 +-
 .../core/client/lexicoder/DateLexicoder.java    |  6 +-
 .../core/client/lexicoder/DoubleLexicoder.java  |  2 +-
 .../core/client/lexicoder/IntegerLexicoder.java |  2 +-
 .../core/client/lexicoder/ListLexicoder.java    |  4 +-
 .../core/client/lexicoder/PairLexicoder.java    | 11 ++-
 .../core/client/lexicoder/ReverseLexicoder.java |  6 +-
 .../core/client/lexicoder/StringLexicoder.java  |  6 +-
 .../core/client/lexicoder/TextLexicoder.java    |  2 +-
 .../client/lexicoder/UIntegerLexicoder.java     |  2 +-
 .../core/client/lexicoder/ULongLexicoder.java   |  2 +-
 .../core/client/lexicoder/UUIDLexicoder.java    |  2 +-
 .../core/client/lexicoder/impl/ByteUtils.java   |  2 +-
 .../core/client/mapred/AbstractInputFormat.java | 14 ++--
 .../client/mapred/AccumuloOutputFormat.java     |  6 +-
 .../client/mapred/AccumuloRowInputFormat.java   |  2 +-
 .../client/mapreduce/AbstractInputFormat.java   | 14 ++--
 .../client/mapreduce/AccumuloOutputFormat.java  |  6 +-
 .../mapreduce/AccumuloRowInputFormat.java       |  2 +-
 .../core/client/mapreduce/InputTableConfig.java |  8 +--
 .../core/client/mapreduce/RangeInputSplit.java  |  6 +-
 .../client/mapreduce/impl/BatchInputSplit.java  |  2 +-
 .../mapreduce/lib/impl/InputConfigurator.java   | 24 +++----
 .../lib/partition/RangePartitioner.java         |  2 +-
 .../accumulo/core/client/mock/MockAccumulo.java |  8 +--
 .../core/client/mock/MockBatchScanner.java      |  2 +-
 .../accumulo/core/client/mock/MockInstance.java |  2 +-
 .../client/mock/MockInstanceOperations.java     |  6 +-
 .../client/mock/MockMultiTableBatchWriter.java  |  2 +-
 .../core/client/mock/MockNamespace.java         |  6 +-
 .../client/mock/MockNamespaceOperations.java    |  4 +-
 .../core/client/mock/MockScannerBase.java       | 11 ++-
 .../accumulo/core/client/mock/MockTable.java    | 10 +--
 .../core/client/mock/MockTableOperations.java   | 12 ++--
 .../client/mock/impl/MockTabletLocator.java     |  2 +-
 .../core/client/rfile/RFileScannerBuilder.java  |  2 +-
 .../accumulo/core/client/rfile/RFileWriter.java |  6 +-
 .../core/client/rfile/RFileWriterBuilder.java   |  2 +-
 .../security/tokens/AuthenticationToken.java    |  2 +-
 .../tokens/CredentialProviderToken.java         |  2 +-
 .../client/security/tokens/PasswordToken.java   |  2 +-
 .../core/conf/AccumuloConfiguration.java        |  6 +-
 .../accumulo/core/conf/ConfigurationDocGen.java |  4 +-
 .../conf/CredentialProviderFactoryShim.java     |  4 +-
 .../core/conf/DefaultConfiguration.java         |  2 +-
 .../core/conf/ObservableConfiguration.java      |  2 +-
 .../org/apache/accumulo/core/conf/Property.java |  8 +--
 .../apache/accumulo/core/conf/PropertyType.java |  2 +-
 .../constraints/DefaultKeySizeConstraint.java   |  4 +-
 .../accumulo/core/constraints/Violations.java   |  4 +-
 .../core/constraints/VisibilityConstraint.java  |  2 +-
 .../apache/accumulo/core/data/Condition.java    |  4 +-
 .../accumulo/core/data/ConditionalMutation.java |  4 +-
 .../org/apache/accumulo/core/data/Mutation.java |  8 +--
 .../org/apache/accumulo/core/data/Range.java    |  4 +-
 .../accumulo/core/data/impl/KeyExtent.java      | 12 ++--
 .../accumulo/core/file/BloomFilterLayer.java    |  6 +-
 .../accumulo/core/file/FileOperations.java      |  2 +-
 .../core/file/blockfile/cache/CachedBlock.java  |  2 +-
 .../file/blockfile/cache/CachedBlockQueue.java  |  6 +-
 .../file/blockfile/impl/CachableBlockFile.java  |  6 +-
 .../accumulo/core/file/rfile/BlockIndex.java    |  2 +-
 .../accumulo/core/file/rfile/CreateEmpty.java   |  2 +-
 .../core/file/rfile/MultiLevelIndex.java        |  8 +--
 .../accumulo/core/file/rfile/PrintInfo.java     |  2 +-
 .../apache/accumulo/core/file/rfile/RFile.java  | 32 ++++-----
 .../accumulo/core/file/rfile/SplitLarge.java    |  2 +-
 .../accumulo/core/file/rfile/bcfile/BCFile.java | 10 +--
 .../core/file/rfile/bcfile/Compression.java     |  2 +-
 .../core/iterators/AggregatingIterator.java     |  3 +-
 .../core/iterators/FirstEntryInRowIterator.java |  2 +-
 .../accumulo/core/iterators/IteratorUtil.java   | 22 +++---
 .../accumulo/core/iterators/LongCombiner.java   |  6 +-
 .../core/iterators/OptionDescriber.java         | 12 ++--
 .../accumulo/core/iterators/OrIterator.java     |  6 +-
 .../core/iterators/TypedValueCombiner.java      |  2 +-
 .../accumulo/core/iterators/conf/ColumnSet.java |  8 +--
 .../iterators/conf/ColumnToClassMapping.java    |  4 +-
 .../system/ColumnFamilySkippingIterator.java    |  4 +-
 .../iterators/system/ColumnQualifierFilter.java |  6 +-
 .../core/iterators/system/HeapIterator.java     |  2 +-
 .../iterators/system/LocalityGroupIterator.java |  2 +-
 .../core/iterators/system/MultiIterator.java    |  2 +-
 .../system/SourceSwitchingIterator.java         |  2 +-
 .../iterators/system/SynchronizedIterator.java  |  2 +-
 .../core/iterators/user/BigDecimalCombiner.java |  3 +-
 .../core/iterators/user/CfCqSliceFilter.java    |  9 ++-
 .../core/iterators/user/CfCqSliceOpts.java      |  2 +-
 .../core/iterators/user/LargeRowFilter.java     |  8 +--
 .../iterators/user/RowDeletingIterator.java     |  4 +-
 .../iterators/user/RowEncodingIterator.java     |  6 +-
 .../iterators/user/SummingArrayCombiner.java    | 10 +--
 .../iterators/user/TransformingIterator.java    |  8 +--
 .../core/iterators/user/VisibilityFilter.java   |  3 +-
 .../user/WholeColumnFamilyIterator.java         |  6 +-
 .../core/iterators/user/WholeRowIterator.java   |  2 +-
 .../core/metadata/MetadataLocationObtainer.java | 20 +++---
 .../apache/accumulo/core/rpc/ThriftUtil.java    |  2 +-
 .../sample/impl/SamplerConfigurationImpl.java   |  6 +-
 .../accumulo/core/security/Authorizations.java  | 10 +--
 .../core/security/ColumnVisibility.java         |  4 +-
 .../core/security/NamespacePermission.java      |  2 +-
 .../core/security/SystemPermission.java         |  4 +-
 .../accumulo/core/security/TablePermission.java |  2 +-
 .../core/security/VisibilityEvaluator.java      |  2 +-
 .../CachingHDFSSecretKeyEncryptionStrategy.java |  2 +-
 .../security/crypto/CryptoModuleFactory.java    |  4 +-
 .../security/crypto/DefaultCryptoModule.java    |  2 +-
 .../accumulo/core/trace/DistributedTrace.java   |  2 +-
 .../accumulo/core/trace/wrappers/TraceWrap.java |  4 +-
 .../apache/accumulo/core/util/ByteArraySet.java |  2 +-
 .../accumulo/core/util/ByteBufferUtil.java      |  4 +-
 .../accumulo/core/util/LocalityGroupUtil.java   | 12 ++--
 .../apache/accumulo/core/util/MapCounter.java   |  4 +-
 .../org/apache/accumulo/core/util/Merge.java    |  4 +-
 .../org/apache/accumulo/core/util/Pair.java     |  4 +-
 .../accumulo/core/util/ServerServices.java      |  2 +-
 .../apache/accumulo/core/util/StopWatch.java    |  4 +-
 .../ShardedTableDistributionFormatter.java      |  2 +-
 .../util/format/StatisticsDisplayFormatter.java | 12 ++--
 .../core/util/interpret/HexScanInterpreter.java |  2 +-
 .../core/client/IteratorSettingTest.java        |  2 +-
 .../accumulo/core/client/RowIteratorTest.java   |  6 +-
 .../core/client/ZooKeeperInstanceTest.java      |  2 +-
 .../core/client/impl/ClientContextTest.java     |  2 +-
 .../client/impl/TableOperationsHelperTest.java  |  6 +-
 .../core/client/impl/TabletLocatorImplTest.java | 58 +++++++--------
 .../core/client/lexicoder/LexicoderTest.java    |  6 +-
 .../client/lexicoder/ListLexicoderTest.java     | 28 ++++----
 .../client/lexicoder/PairLexicoderTest.java     | 17 +++--
 .../client/lexicoder/ReverseLexicoderTest.java  | 16 ++---
 .../client/lexicoder/UUIDLexicoderTest.java     |  2 +-
 .../AccumuloMultiTableInputFormatTest.java      |  6 +-
 .../core/client/mapred/RangeInputSplitTest.java |  8 +--
 .../mapreduce/AccumuloInputFormatTest.java      | 10 +--
 .../AccumuloMultiTableInputFormatTest.java      |  4 +-
 .../client/mapreduce/InputTableConfigTest.java  |  8 +--
 .../client/mapreduce/RangeInputSplitTest.java   |  8 +--
 .../mapreduce/impl/BatchInputSplitTest.java     |  8 +--
 .../core/client/mock/MockConnectorTest.java     |  2 +-
 .../core/client/mock/MockNamespacesTest.java    |  2 +-
 .../client/mock/MockTableOperationsTest.java    |  4 +-
 .../client/security/SecurityErrorCodeTest.java  |  4 +-
 .../core/conf/ConfigSanityCheckTest.java        |  2 +-
 .../conf/CredentialProviderFactoryShimTest.java |  8 +--
 .../core/conf/DefaultConfigurationTest.java     |  2 +-
 .../apache/accumulo/core/conf/PropertyTest.java | 12 ++--
 .../core/conf/SiteConfigurationTest.java        |  2 +-
 .../accumulo/core/data/KeyExtentTest.java       | 20 +++---
 .../org/apache/accumulo/core/data/KeyTest.java  |  2 +-
 .../apache/accumulo/core/data/OldMutation.java  |  4 +-
 .../apache/accumulo/core/data/RangeTest.java    |  4 +-
 .../apache/accumulo/core/data/ValueTest.java    |  2 +-
 .../core/file/BloomFilterLayerLookupTest.java   |  4 +-
 .../core/file/rfile/CreateCompatTestFile.java   |  2 +-
 .../accumulo/core/file/rfile/RFileTest.java     | 38 +++++-----
 .../core/file/rfile/RelativeKeyTest.java        |  6 +-
 .../core/iterators/AggregatingIteratorTest.java | 36 +++++-----
 .../iterators/FirstEntryInRowIteratorTest.java  |  4 +-
 .../core/iterators/FirstEntryInRowTest.java     |  8 +--
 .../core/iterators/IteratorUtilTest.java        | 18 ++---
 .../ColumnFamilySkippingIteratorTest.java       | 24 +++----
 .../core/iterators/system/ColumnFilterTest.java |  6 +-
 .../iterators/system/DeletingIteratorTest.java  | 14 ++--
 .../iterators/system/MultiIteratorTest.java     | 38 +++++-----
 .../system/SourceSwitchingIteratorTest.java     | 22 +++---
 .../system/TimeSettingIteratorTest.java         |  4 +-
 .../iterators/system/VisibilityFilterTest.java  |  2 +-
 .../iterators/user/BigDecimalCombinerTest.java  |  4 +-
 .../iterators/user/ColumnSliceFilterTest.java   |  4 +-
 .../core/iterators/user/CombinerTest.java       | 46 ++++++------
 .../core/iterators/user/FilterTest.java         | 34 ++++-----
 .../core/iterators/user/GrepIteratorTest.java   |  6 +-
 .../iterators/user/IndexedDocIteratorTest.java  | 14 ++--
 .../user/IntersectingIteratorTest.java          |  8 +--
 .../core/iterators/user/LargeRowFilterTest.java | 34 ++++-----
 .../core/iterators/user/RegExFilterTest.java    |  6 +-
 .../iterators/user/RowDeletingIteratorTest.java | 10 +--
 .../iterators/user/RowEncodingIteratorTest.java | 22 +++---
 .../core/iterators/user/RowFilterTest.java      | 24 +++----
 .../core/iterators/user/TestCfCqSlice.java      | 12 ++--
 .../user/TransformingIteratorTest.java          | 26 +++----
 .../iterators/user/VersioningIteratorTest.java  | 16 ++---
 .../iterators/user/VisibilityFilterTest.java    |  8 +--
 .../user/WholeColumnFamilyIteratorTest.java     | 22 +++---
 .../iterators/user/WholeRowIteratorTest.java    | 22 +++---
 .../core/util/LocalityGroupUtilTest.java        |  4 +-
 .../apache/accumulo/core/util/MergeTest.java    |  6 +-
 .../org/apache/accumulo/core/util/PairTest.java | 20 +++---
 .../accumulo/core/util/PartitionerTest.java     |  2 +-
 .../util/format/DateStringFormatterTest.java    |  2 +-
 .../core/util/format/DefaultFormatterTest.java  |  2 +-
 .../core/util/format/HexFormatterTest.java      |  2 +-
 .../ShardedTableDistributionFormatterTest.java  |  2 +-
 .../format/StatisticsDisplayFormatterTest.java  |  2 +-
 .../simple/client/RandomBatchScanner.java       |  4 +-
 .../simple/client/RandomBatchWriter.java        |  6 +-
 .../simple/client/ReadWriteExample.java         |  2 +-
 .../constraints/AlphaNumKeyConstraint.java      |  2 +-
 .../examples/simple/dirlist/Ingest.java         |  2 +-
 .../examples/simple/dirlist/QueryUtil.java      |  4 +-
 .../simple/filedata/ChunkInputFormat.java       |  4 +-
 .../simple/filedata/ChunkInputStream.java       |  2 +-
 .../simple/filedata/FileDataIngest.java         |  2 +-
 .../examples/simple/filedata/FileDataQuery.java |  4 +-
 .../examples/simple/filedata/KeyUtil.java       |  2 +-
 .../simple/filedata/VisibilityCombiner.java     |  2 +-
 .../simple/isolation/InterferenceTest.java      |  2 +-
 .../examples/simple/mapreduce/NGramIngest.java  |  2 +-
 .../examples/simple/mapreduce/RowHash.java      |  2 +-
 .../examples/simple/mapreduce/TableToFile.java  |  6 +-
 .../simple/mapreduce/TeraSortIngest.java        |  2 +-
 .../simple/mapreduce/bulk/SetupTable.java       |  4 +-
 .../examples/simple/reservations/ARS.java       |  4 +-
 .../examples/simple/shard/ContinuousQuery.java  |  4 +-
 .../accumulo/examples/simple/shard/Index.java   |  4 +-
 .../accumulo/examples/simple/shard/Query.java   |  4 +-
 .../examples/simple/shell/DebugCommand.java     |  2 +-
 .../simple/filedata/ChunkCombinerTest.java      | 30 ++++----
 .../simple/filedata/ChunkInputStreamTest.java   | 28 ++++----
 .../org/apache/accumulo/fate/AdminUtil.java     |  8 +--
 .../org/apache/accumulo/fate/AgeOffStore.java   |  4 +-
 .../org/apache/accumulo/fate/ReadOnlyStore.java |  2 +-
 .../java/org/apache/accumulo/fate/ZooStore.java | 12 ++--
 .../zookeeper/DistributedReadWriteLock.java     |  2 +-
 .../fate/zookeeper/TransactionWatcher.java      |  2 +-
 .../accumulo/fate/zookeeper/ZooCache.java       |  6 +-
 .../fate/zookeeper/ZooCacheFactory.java         |  2 +-
 .../apache/accumulo/fate/zookeeper/ZooLock.java |  6 +-
 .../accumulo/fate/zookeeper/ZooQueueLock.java   |  2 +-
 .../accumulo/fate/zookeeper/ZooSession.java     |  2 +-
 .../apache/accumulo/fate/zookeeper/ZooUtil.java |  6 +-
 .../apache/accumulo/fate/AgeOffStoreTest.java   | 42 +++++------
 .../apache/accumulo/fate/ReadOnlyStoreTest.java |  2 +-
 .../org/apache/accumulo/fate/SimpleStore.java   |  6 +-
 .../zookeeper/DistributedReadWriteLockTest.java |  4 +-
 .../fate/zookeeper/TransactionWatcherTest.java  | 10 +--
 .../maven/plugin/AbstractAccumuloMojo.java      |  2 +-
 .../standalone/StandaloneClusterControl.java    |  2 +-
 .../minicluster/MiniAccumuloRunner.java         |  2 +-
 .../impl/MiniAccumuloClusterControl.java        |  2 +-
 .../impl/MiniAccumuloClusterImpl.java           | 22 +++---
 .../impl/MiniAccumuloConfigImpl.java            | 22 +++---
 .../minicluster/MiniAccumuloClusterTest.java    |  4 +-
 .../impl/MiniAccumuloConfigImplTest.java        |  2 +-
 .../java/org/apache/accumulo/proxy/Proxy.java   |  2 +-
 .../org/apache/accumulo/proxy/ProxyServer.java  | 50 ++++++-------
 .../apache/accumulo/proxy/ProxyServerTest.java  |  4 +-
 .../org/apache/accumulo/server/Accumulo.java    |  6 +-
 .../server/GarbageCollectionLogger.java         |  2 +-
 .../apache/accumulo/server/ServerConstants.java |  8 +--
 .../accumulo/server/client/BulkImporter.java    | 46 ++++++------
 .../server/client/ClientServiceHandler.java     |  8 +--
 .../server/conf/NamespaceConfiguration.java     |  2 +-
 .../server/conf/ServerConfigurationFactory.java |  6 +-
 .../server/conf/TableConfiguration.java         |  2 +-
 .../server/conf/ZooConfigurationFactory.java    |  2 +-
 .../server/constraints/MetadataConstraints.java | 10 +--
 .../server/fs/PerTableVolumeChooser.java        |  2 +-
 .../server/fs/PreferredVolumeChooser.java       |  8 +--
 .../accumulo/server/fs/VolumeManagerImpl.java   |  4 +-
 .../apache/accumulo/server/fs/VolumeUtil.java   | 16 ++---
 .../apache/accumulo/server/init/Initialize.java | 13 ++--
 .../iterators/MetadataBulkLoadFilter.java       |  2 +-
 .../accumulo/server/master/LiveTServerSet.java  | 20 +++---
 .../master/balancer/ChaoticLoadBalancer.java    |  8 +--
 .../master/balancer/DefaultLoadBalancer.java    | 12 ++--
 .../server/master/balancer/GroupBalancer.java   | 10 +--
 .../balancer/HostRegexTableLoadBalancer.java    | 14 ++--
 .../master/balancer/TableLoadBalancer.java      | 10 +--
 .../server/master/balancer/TabletBalancer.java  |  2 +-
 .../server/master/state/DeadServerList.java     |  2 +-
 .../master/state/MetaDataTableScanner.java      |  2 +-
 .../server/master/state/TabletServerState.java  |  4 +-
 .../master/state/TabletStateChangeIterator.java | 12 ++--
 .../master/state/ZooTabletStateStore.java       |  2 +-
 .../master/tableOps/UserCompactionConfig.java   |  2 +-
 .../server/metrics/AbstractMetricsImpl.java     |  2 +-
 .../accumulo/server/monitor/LogService.java     |  2 +-
 .../server/problems/ProblemReports.java         |  4 +-
 .../server/replication/StatusCombiner.java      |  2 +-
 .../apache/accumulo/server/rpc/RpcWrapper.java  |  2 +-
 .../server/rpc/TCredentialsUpdatingWrapper.java |  2 +-
 .../accumulo/server/rpc/TServerUtils.java       |  4 +-
 .../server/rpc/UGIAssumingProcessor.java        |  4 +-
 .../security/AuditedSecurityOperation.java      |  4 +-
 .../AuthenticationTokenSecretManager.java       |  4 +-
 .../security/handler/InsecureAuthenticator.java |  2 +-
 .../security/handler/ZKAuthenticator.java       |  4 +-
 .../server/security/handler/ZKAuthorizor.java   |  4 +-
 .../server/security/handler/ZKPermHandler.java  | 12 ++--
 .../server/security/handler/ZKSecurityTool.java |  6 +-
 .../tabletserver/LargestFirstMemoryManager.java |  8 +--
 .../org/apache/accumulo/server/util/Admin.java  | 14 ++--
 .../accumulo/server/util/ChangeSecret.java      |  4 +-
 .../server/util/CheckForMetadataProblems.java   |  4 +-
 .../accumulo/server/util/DeleteZooInstance.java |  4 +-
 .../accumulo/server/util/FileSystemMonitor.java |  6 +-
 .../apache/accumulo/server/util/FileUtil.java   | 20 +++---
 .../accumulo/server/util/ListInstances.java     |  4 +-
 .../accumulo/server/util/ListVolumesUsed.java   |  6 +-
 .../accumulo/server/util/LocalityCheck.java     |  6 +-
 .../accumulo/server/util/LoginProperties.java   |  2 +-
 .../server/util/MasterMetadataUtil.java         |  8 +--
 .../accumulo/server/util/MetadataTableUtil.java | 26 +++----
 .../util/RemoveEntriesForMissingFiles.java      |  4 +-
 .../server/util/ReplicationTableUtil.java       |  2 +-
 .../accumulo/server/util/RestoreZookeeper.java  |  2 +-
 .../accumulo/server/util/TableDiskUsage.java    | 32 ++++-----
 .../accumulo/server/util/TableInfoUtil.java     |  2 +-
 .../accumulo/server/util/TabletIterator.java    |  2 +-
 .../server/util/VerifyTabletAssignments.java    | 10 +--
 .../server/zookeeper/DistributedWorkQueue.java  |  2 +-
 .../accumulo/server/ServerConstantsTest.java    |  2 +-
 .../server/client/BulkImporterTest.java         |  2 +-
 .../server/conf/NamespaceConfigurationTest.java |  4 +-
 .../server/conf/TableConfigurationTest.java     |  4 +-
 .../conf/ZooCachePropertyAccessorTest.java      | 12 ++--
 .../apache/accumulo/server/fs/FileRefTest.java  |  2 +-
 .../accumulo/server/fs/VolumeUtilTest.java      | 48 ++++++-------
 .../iterators/MetadataBulkLoadFilterTest.java   |  6 +-
 .../balancer/ChaoticLoadBalancerTest.java       | 18 ++---
 .../balancer/DefaultLoadBalancerTest.java       | 28 ++++----
 .../master/balancer/GroupBalancerTest.java      |  2 +-
 ...gexTableLoadBalancerReconfigurationTest.java |  4 +-
 .../HostRegexTableLoadBalancerTest.java         |  6 +-
 .../master/balancer/TableLoadBalancerTest.java  | 10 +--
 .../master/state/TabletLocationStateTest.java   | 12 ++--
 .../problems/ProblemReportingIteratorTest.java  |  2 +-
 .../accumulo/server/rpc/RpcWrapperTest.java     | 11 ++-
 ...redentialsUpdatingInvocationHandlerTest.java | 26 +++----
 .../security/handler/ZKAuthenticatorTest.java   |  4 +-
 .../server/tablets/LogicalTimeTest.java         |  4 +-
 .../accumulo/server/tablets/MillisTimeTest.java |  4 +-
 .../accumulo/server/util/DefaultMapTest.java    |  2 +-
 .../server/util/FileSystemMonitorTest.java      |  2 +-
 .../accumulo/server/util/FileUtilTest.java      | 12 ++--
 .../server/util/ReplicationTableUtilTest.java   |  2 +-
 .../accumulo/server/util/TServerUtilsTest.java  |  2 +-
 .../accumulo/gc/GarbageCollectionAlgorithm.java |  8 +--
 .../accumulo/gc/SimpleGarbageCollector.java     |  4 +-
 .../gc/GarbageCollectWriteAheadLogsTest.java    |  6 +-
 .../accumulo/gc/GarbageCollectionTest.java      | 18 ++---
 .../accumulo/master/FateServiceHandler.java     | 36 +++++-----
 .../java/org/apache/accumulo/master/Master.java | 44 ++++++------
 .../master/MasterClientServiceHandler.java      |  6 +-
 .../accumulo/master/TabletGroupWatcher.java     | 24 +++----
 .../master/recovery/RecoveryManager.java        |  6 +-
 .../accumulo/master/state/TableStats.java       |  4 +-
 .../master/tableOps/CompactionDriver.java       |  2 +-
 .../accumulo/master/tableOps/CopyFailed.java    |  8 +--
 .../accumulo/master/tableOps/LoadFiles.java     |  8 +--
 .../master/tableOps/PopulateMetadataTable.java  |  2 +-
 .../accumulo/master/tableOps/TraceRepo.java     |  2 +-
 .../master/tableOps/WriteExportFiles.java       |  2 +-
 .../apache/accumulo/master/util/FateAdmin.java  | 10 +--
 .../apache/accumulo/master/DefaultMapTest.java  |  2 +-
 .../master/state/RootTabletStateStoreTest.java  | 10 +--
 .../org/apache/accumulo/monitor/Monitor.java    | 56 +++++++--------
 .../accumulo/monitor/ZooKeeperStatus.java       |  4 +-
 .../monitor/servlets/GcStatusServlet.java       |  2 +-
 .../accumulo/monitor/servlets/JSONServlet.java  | 10 +--
 .../monitor/servlets/MasterServlet.java         |  8 +--
 .../monitor/servlets/ProblemServlet.java        |  2 +-
 .../monitor/servlets/ReplicationServlet.java    |  2 +-
 .../accumulo/monitor/servlets/ShellServlet.java |  2 +-
 .../monitor/servlets/TServersServlet.java       |  8 +--
 .../monitor/servlets/TablesServlet.java         |  8 +--
 .../accumulo/monitor/servlets/VisServlet.java   |  2 +-
 .../accumulo/monitor/servlets/XMLServlet.java   |  2 +-
 .../accumulo/monitor/servlets/trace/Basic.java  |  2 +-
 .../monitor/servlets/trace/Summary.java         |  2 +-
 .../org/apache/accumulo/monitor/util/Table.java |  8 +--
 .../apache/accumulo/monitor/util/TableRow.java  |  4 +-
 .../accumulo/monitor/ShowTraceLinkTypeTest.java |  2 +-
 .../accumulo/monitor/ZooKeeperStatusTest.java   |  4 +-
 .../accumulo/tracer/AsyncSpanReceiver.java      |  6 +-
 .../org/apache/accumulo/tracer/SpanTree.java    |  8 +--
 .../org/apache/accumulo/tracer/TraceDump.java   |  4 +-
 .../org/apache/accumulo/tracer/TraceServer.java |  2 +-
 .../apache/accumulo/tracer/ZooTraceClient.java  |  4 +-
 .../org/apache/accumulo/tracer/TracerTest.java  |  2 +-
 .../accumulo/tserver/CompactionQueue.java       |  2 +-
 .../tserver/ConditionalMutationSet.java         |  4 +-
 .../apache/accumulo/tserver/FileManager.java    | 34 ++++-----
 .../apache/accumulo/tserver/InMemoryMap.java    |  8 +--
 .../org/apache/accumulo/tserver/NativeMap.java  | 10 +--
 .../org/apache/accumulo/tserver/RowLocks.java   | 10 +--
 .../tserver/TabletIteratorEnvironment.java      |  4 +-
 .../apache/accumulo/tserver/TabletServer.java   | 75 ++++++++++----------
 .../tserver/TabletServerResourceManager.java    |  8 +--
 .../apache/accumulo/tserver/WriteTracker.java   |  4 +-
 .../tserver/compaction/CompactionPlan.java      |  8 +--
 .../compaction/DefaultCompactionStrategy.java   | 10 +--
 .../compaction/SizeLimitCompactionStrategy.java |  2 +-
 .../tserver/constraints/ConstraintChecker.java  |  2 +-
 .../apache/accumulo/tserver/log/DfsLogger.java  | 14 ++--
 .../apache/accumulo/tserver/log/LogSorter.java  |  6 +-
 .../accumulo/tserver/log/SortedLogRecovery.java |  4 +-
 .../tserver/log/TabletServerLogger.java         |  6 +-
 .../accumulo/tserver/logger/LogFileValue.java   |  2 +-
 .../accumulo/tserver/logger/LogReader.java      |  4 +-
 .../replication/AccumuloReplicaSystem.java      |  2 +-
 .../accumulo/tserver/scan/LookupTask.java       | 10 +--
 .../apache/accumulo/tserver/scan/ScanTask.java  |  4 +-
 .../tserver/session/MultiScanSession.java       |  2 +-
 .../tserver/session/SessionManager.java         | 16 ++---
 .../accumulo/tserver/session/UpdateSession.java |  8 +--
 .../accumulo/tserver/tablet/CompactionInfo.java |  6 +-
 .../tserver/tablet/CompactionWatcher.java       |  6 +-
 .../accumulo/tserver/tablet/Compactor.java      |  8 +--
 .../tserver/tablet/CountingIterator.java        |  2 +-
 .../tserver/tablet/DatafileManager.java         | 26 +++----
 .../accumulo/tserver/tablet/RootFiles.java      |  2 +-
 .../accumulo/tserver/tablet/ScanDataSource.java |  2 +-
 .../apache/accumulo/tserver/tablet/Tablet.java  | 74 +++++++++----------
 .../accumulo/tserver/tablet/TabletMemory.java   |  2 +-
 .../accumulo/tserver/AssignmentWatcherTest.java |  2 +-
 .../tserver/CheckTabletMetadataTest.java        | 10 +--
 .../accumulo/tserver/CountingIteratorTest.java  |  2 +-
 .../accumulo/tserver/InMemoryMapTest.java       |  4 +-
 .../DefaultCompactionStrategyTest.java          | 10 +--
 .../SizeLimitCompactionStrategyTest.java        |  6 +-
 .../constraints/ConstraintCheckerTest.java      |  2 +-
 .../accumulo/tserver/log/DfsLoggerTest.java     |  2 +-
 .../tserver/log/SortedLogRecoveryTest.java      | 44 ++++++------
 .../accumulo/tserver/tablet/RootFilesTest.java  | 10 +--
 .../java/org/apache/accumulo/shell/Shell.java   | 22 +++---
 .../apache/accumulo/shell/ShellOptionsJC.java   |  6 +-
 .../java/org/apache/accumulo/shell/Token.java   |  8 +--
 .../commands/ActiveCompactionIterator.java      |  8 +--
 .../shell/commands/ActiveScanIterator.java      |  2 +-
 .../shell/commands/AddSplitsCommand.java        |  2 +-
 .../shell/commands/CloneTableCommand.java       |  4 +-
 .../accumulo/shell/commands/ConfigCommand.java  | 12 ++--
 .../shell/commands/CreateTableCommand.java      |  4 +-
 .../accumulo/shell/commands/DUCommand.java      |  2 +-
 .../shell/commands/DeleteAuthsCommand.java      |  2 +-
 .../shell/commands/ExtensionCommand.java        |  6 +-
 .../accumulo/shell/commands/FateCommand.java    |  6 +-
 .../shell/commands/GetAuthsCommand.java         |  2 +-
 .../accumulo/shell/commands/HelpCommand.java    |  2 +-
 .../accumulo/shell/commands/InsertCommand.java  |  2 +-
 .../shell/commands/ListBulkCommand.java         |  2 +-
 .../shell/commands/ListCompactionsCommand.java  |  2 +-
 .../shell/commands/ListIterCommand.java         |  4 +-
 .../shell/commands/ListScansCommand.java        |  2 +-
 .../shell/commands/NamespacesCommand.java       |  2 +-
 .../accumulo/shell/commands/PingCommand.java    |  2 +-
 .../shell/commands/QuotedStringTokenizer.java   |  2 +-
 .../accumulo/shell/commands/ScriptCommand.java  |  4 +-
 .../shell/commands/SetGroupsCommand.java        |  4 +-
 .../accumulo/shell/commands/SetIterCommand.java |  6 +-
 .../shell/commands/SetScanIterCommand.java      |  4 +-
 .../shell/commands/SetShellIterCommand.java     |  4 +-
 .../accumulo/shell/commands/TableOperation.java |  2 +-
 .../accumulo/shell/commands/TablesCommand.java  |  2 +-
 .../accumulo/shell/ShellSetInstanceTest.java    |  2 +-
 .../shell/commands/DeleteTableCommandTest.java  |  4 +-
 .../shell/format/DeleterFormatterTest.java      |  9 +--
 .../start/classloader/AccumuloClassLoader.java  |  6 +-
 .../vfs/AccumuloReloadingVFSClassLoader.java    |  4 +-
 .../classloader/vfs/AccumuloVFSClassLoader.java |  6 +-
 .../start/classloader/vfs/ContextManager.java   |  4 +-
 .../AccumuloClusterPropertyConfiguration.java   |  2 +-
 .../accumulo/test/AssignmentThreadsIT.java      |  2 +-
 .../apache/accumulo/test/AuditMessageIT.java    |  4 +-
 .../test/BadDeleteMarkersCreatedIT.java         |  2 +-
 .../apache/accumulo/test/BalanceFasterIT.java   |  4 +-
 .../org/apache/accumulo/test/BalanceIT.java     |  2 +-
 .../test/BalanceWithOfflineTableIT.java         |  2 +-
 .../accumulo/test/BatchWriterIterator.java      |  2 +-
 .../accumulo/test/BulkImportDirectory.java      |  2 +-
 .../accumulo/test/BulkImportMonitoringIT.java   |  2 +-
 .../accumulo/test/ClientSideIteratorIT.java     |  6 +-
 .../java/org/apache/accumulo/test/CloneIT.java  | 10 +--
 .../accumulo/test/ConditionalWriterIT.java      | 36 +++++-----
 .../test/ConfigurableMajorCompactionIT.java     |  2 +-
 .../test/CreateTableWithNewTableConfigIT.java   |  2 +-
 .../apache/accumulo/test/FairVolumeChooser.java |  2 +-
 .../accumulo/test/FaultyConditionalWriter.java  |  4 +-
 .../org/apache/accumulo/test/FindMaxIT.java     |  2 +-
 .../apache/accumulo/test/GetFileInfoBulkIT.java |  2 +-
 .../apache/accumulo/test/IMMLGBenchmark.java    |  8 +--
 .../org/apache/accumulo/test/InMemoryMapIT.java |  8 +--
 .../accumulo/test/InterruptibleScannersIT.java  |  2 +-
 .../apache/accumulo/test/LargeSplitRowIT.java   |  4 +-
 .../org/apache/accumulo/test/LocatorIT.java     |  2 +-
 .../org/apache/accumulo/test/ManySplitIT.java   |  2 +-
 .../test/MasterRepairsDualAssignmentIT.java     |  6 +-
 .../org/apache/accumulo/test/MetaSplitIT.java   |  8 +--
 .../accumulo/test/MultiTableBatchWriterIT.java  | 16 ++---
 .../accumulo/test/NativeMapPerformanceTest.java |  2 +-
 .../accumulo/test/NativeMapStressTest.java      |  8 +--
 .../accumulo/test/QueryMetadataTable.java       |  4 +-
 .../test/RewriteTabletDirectoriesIT.java        |  2 +-
 .../java/org/apache/accumulo/test/SampleIT.java |  6 +-
 .../org/apache/accumulo/test/ShellServerIT.java |  6 +-
 .../accumulo/test/SplitCancelsMajCIT.java       |  4 +-
 .../test/TableConfigurationUpdateIT.java        |  2 +-
 .../apache/accumulo/test/TableOperationsIT.java |  4 +-
 .../apache/accumulo/test/TestBinaryRows.java    |  2 +-
 .../org/apache/accumulo/test/TestIngest.java    |  2 +-
 .../accumulo/test/TestMultiTableIngest.java     |  2 +-
 .../apache/accumulo/test/TestRandomDeletes.java |  4 +-
 .../accumulo/test/TextMemoryUsageTest.java      |  2 +-
 .../accumulo/test/TransportCachingIT.java       |  2 +-
 .../accumulo/test/UserCompactionStrategyIT.java |  4 +-
 .../accumulo/test/VerifySerialRecoveryIT.java   |  2 +-
 .../apache/accumulo/test/VolumeChooserIT.java   |  6 +-
 .../java/org/apache/accumulo/test/VolumeIT.java | 14 ++--
 .../apache/accumulo/test/WaitForBalanceIT.java  |  4 +-
 .../test/continuous/ContinuousBatchWalker.java  | 12 ++--
 .../test/continuous/ContinuousIngest.java       |  2 +-
 .../continuous/ContinuousStatsCollector.java    |  2 +-
 .../test/continuous/ContinuousVerify.java       |  2 +-
 .../test/continuous/ContinuousWalk.java         |  4 +-
 .../accumulo/test/continuous/Histogram.java     | 12 ++--
 .../test/continuous/PrintScanTimeHistogram.java |  4 +-
 .../accumulo/test/continuous/TimeBinner.java    | 10 +--
 .../test/continuous/UndefinedAnalyzer.java      | 14 ++--
 .../test/examples/simple/dirlist/CountIT.java   | 10 +--
 .../simple/filedata/ChunkInputFormatIT.java     |  4 +-
 .../simple/filedata/ChunkInputStreamIT.java     |  8 +--
 .../accumulo/test/functional/AddSplitIT.java    |  6 +-
 .../functional/BalanceAfterCommsFailureIT.java  |  6 +-
 .../BalanceInPresenceOfOfflineTableIT.java      |  2 +-
 .../test/functional/BatchScanSplitIT.java       |  6 +-
 .../test/functional/BatchWriterFlushIT.java     |  2 +-
 .../accumulo/test/functional/BinaryIT.java      |  2 +-
 .../accumulo/test/functional/BloomFilterIT.java |  4 +-
 .../accumulo/test/functional/BulkFileIT.java    |  2 +-
 .../test/functional/CacheTestReader.java        |  2 +-
 .../test/functional/CacheTestWriter.java        |  4 +-
 .../test/functional/ChaoticBalancerIT.java      |  2 +-
 .../accumulo/test/functional/CloneTestIT.java   | 20 +++---
 .../functional/ConfigurableCompactionIT.java    |  2 +-
 .../accumulo/test/functional/ConstraintIT.java  |  2 +-
 .../test/functional/CreateAndUseIT.java         |  4 +-
 .../accumulo/test/functional/DeleteRowsIT.java  |  4 +-
 .../test/functional/DeleteRowsSplitIT.java      |  6 +-
 .../functional/DeleteTableDuringSplitIT.java    |  6 +-
 .../accumulo/test/functional/DurabilityIT.java  |  2 +-
 .../test/functional/FateStarvationIT.java       |  2 +-
 .../test/functional/FunctionalTestUtils.java    |  4 +-
 .../test/functional/HalfDeadTServerIT.java      |  2 +-
 .../accumulo/test/functional/LargeRowIT.java    |  2 +-
 .../accumulo/test/functional/LogicalTimeIT.java |  2 +-
 .../accumulo/test/functional/MaxOpenIT.java     |  2 +-
 .../accumulo/test/functional/MergeIT.java       | 12 ++--
 .../accumulo/test/functional/MetadataIT.java    |  8 +--
 .../test/functional/MetadataMaxFilesIT.java     |  2 +-
 .../accumulo/test/functional/NativeMapIT.java   |  6 +-
 .../accumulo/test/functional/PermissionsIT.java | 10 +--
 .../accumulo/test/functional/ReadWriteIT.java   |  6 +-
 .../accumulo/test/functional/RowDeleteIT.java   |  2 +-
 .../accumulo/test/functional/ScanIdIT.java      |  6 +-
 .../test/functional/ScanIteratorIT.java         |  6 +-
 .../accumulo/test/functional/ScanRangeIT.java   |  2 +-
 .../test/functional/SessionBlockVerifyIT.java   |  2 +-
 .../accumulo/test/functional/ShutdownIT.java    |  2 +-
 .../functional/SimpleBalancerFairnessIT.java    |  2 +-
 .../test/functional/SplitRecoveryIT.java        | 12 ++--
 .../accumulo/test/functional/TabletIT.java      |  2 +-
 .../functional/TabletStateChangeIteratorIT.java |  6 +-
 .../accumulo/test/functional/VisibilityIT.java  | 18 ++---
 .../accumulo/test/functional/WALSunnyDayIT.java |  2 +-
 .../accumulo/test/functional/WriteLotsIT.java   |  2 +-
 .../accumulo/test/functional/ZombieTServer.java |  5 +-
 .../accumulo/test/functional/ZooCacheIT.java    |  4 +-
 .../test/functional/ZookeeperRestartIT.java     |  2 +-
 .../test/mapred/AccumuloInputFormatIT.java      |  2 +-
 .../mapred/AccumuloMultiTableInputFormatIT.java |  2 +-
 .../test/mapred/AccumuloRowInputFormatIT.java   |  6 +-
 .../test/mapreduce/AccumuloInputFormatIT.java   | 10 +--
 .../AccumuloMultiTableInputFormatIT.java        |  2 +-
 .../mapreduce/AccumuloRowInputFormatIT.java     |  6 +-
 .../test/performance/RollWALPerformanceIT.java  |  2 +-
 .../metadata/MetadataBatchScanTest.java         |  8 +--
 .../performance/scan/CollectTabletStats.java    | 24 +++----
 .../test/performance/thrift/NullTserver.java    |  6 +-
 .../accumulo/test/proxy/ProxyDurabilityIT.java  |  4 +-
 .../accumulo/test/proxy/SimpleProxyBase.java    | 28 ++++----
 .../accumulo/test/proxy/TestProxyClient.java    |  4 +-
 .../accumulo/test/proxy/TestProxyReadWrite.java | 20 +++---
 .../test/proxy/TestProxySecurityOperations.java |  4 +-
 .../test/proxy/TestProxyTableOperations.java    | 12 ++--
 .../accumulo/test/randomwalk/Framework.java     |  2 +-
 .../apache/accumulo/test/randomwalk/Module.java | 18 ++---
 .../apache/accumulo/test/randomwalk/State.java  |  2 +-
 .../test/randomwalk/bulk/BulkPlusOne.java       |  8 +--
 .../accumulo/test/randomwalk/bulk/Split.java    |  2 +-
 .../test/randomwalk/concurrent/AddSplits.java   |  4 +-
 .../test/randomwalk/concurrent/BatchScan.java   |  2 +-
 .../test/randomwalk/concurrent/BulkImport.java  |  2 +-
 .../concurrent/ChangeAuthorizations.java        |  2 +-
 .../concurrent/ChangePermissions.java           | 12 ++--
 .../concurrent/ConcurrentFixture.java           |  2 +-
 .../test/randomwalk/concurrent/DeleteRange.java |  2 +-
 .../randomwalk/concurrent/IsolatedScan.java     |  2 +-
 .../test/randomwalk/concurrent/Merge.java       |  2 +-
 .../test/randomwalk/concurrent/Setup.java       |  6 +-
 .../randomwalk/concurrent/StopTabletServer.java |  4 +-
 .../test/randomwalk/conditional/Init.java       |  4 +-
 .../test/randomwalk/conditional/Split.java      |  2 +-
 .../test/randomwalk/image/ImageFixture.java     |  8 +--
 .../test/randomwalk/image/ScanMeta.java         |  6 +-
 .../accumulo/test/randomwalk/image/TableOp.java |  2 +-
 .../test/randomwalk/multitable/CopyTable.java   |  2 +-
 .../test/randomwalk/multitable/CreateTable.java |  2 +-
 .../test/randomwalk/security/TableOp.java       |  2 +-
 .../randomwalk/security/WalkingSecurity.java    |  4 +-
 .../test/randomwalk/sequential/BatchVerify.java |  4 +-
 .../test/randomwalk/shard/CompactFilter.java    |  6 +-
 .../test/randomwalk/shard/DeleteSomeDocs.java   |  2 +-
 .../test/randomwalk/shard/DeleteWord.java       |  2 +-
 .../test/randomwalk/shard/ExportIndex.java      |  8 +--
 .../accumulo/test/randomwalk/shard/Grep.java    |  4 +-
 .../accumulo/test/randomwalk/shard/Insert.java  |  2 +-
 .../accumulo/test/randomwalk/shard/Merge.java   |  2 +-
 .../accumulo/test/randomwalk/shard/Search.java  |  2 +-
 .../test/randomwalk/shard/ShardFixture.java     |  2 +-
 .../test/replication/CyclicReplicationIT.java   |  2 +-
 ...bageCollectorCommunicatesWithTServersIT.java |  6 +-
 .../replication/MultiInstanceReplicationIT.java |  2 +-
 .../test/replication/StatusCombinerMacIT.java   |  2 +-
 .../UnorderedWorkAssignerReplicationIT.java     |  2 +-
 .../test/replication/merkle/MerkleTree.java     |  6 +-
 .../test/replication/merkle/MerkleTreeNode.java |  2 +-
 .../replication/merkle/cli/ComputeRootHash.java |  2 +-
 .../replication/merkle/cli/GenerateHashes.java  |  4 +-
 .../accumulo/test/scalability/ScaleTest.java    |  2 +-
 .../apache/accumulo/test/util/CertUtils.java    |  2 +-
 .../accumulo/test/iterator/RegExTest.java       |  2 +-
 671 files changed, 2399 insertions(+), 2410 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java b/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java
index 71ee6d1..c07c4cb 100644
--- a/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java
+++ b/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java
@@ -122,7 +122,7 @@ public class ClientOpts extends Help {
 
   @DynamicParameter(names = "-l",
       description = "login properties in the format key=value. Reuse -l for each property (prompt for properties if this option is missing")
-  public Map<String,String> loginProps = new LinkedHashMap<String,String>();
+  public Map<String,String> loginProps = new LinkedHashMap<>();
 
   public AuthenticationToken getToken() {
     if (null != tokenClassName) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/BatchWriterConfig.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/BatchWriterConfig.java b/core/src/main/java/org/apache/accumulo/core/client/BatchWriterConfig.java
index 3421f76..521e0ce 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/BatchWriterConfig.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/BatchWriterConfig.java
@@ -196,7 +196,7 @@ public class BatchWriterConfig implements Writable {
   @Override
   public void write(DataOutput out) throws IOException {
     // write this out in a human-readable way
-    ArrayList<String> fields = new ArrayList<String>();
+    ArrayList<String> fields = new ArrayList<>();
     if (maxMemory != null)
       addField(fields, "maxMemory", maxMemory);
     if (maxLatency != null)

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java b/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java
index d5bf920..1b9b380 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java
@@ -145,7 +145,7 @@ public class ClientConfiguration extends CompositeConfiguration {
           return prop;
       return null;
     }
-  };
+  }
 
   public ClientConfiguration(String configFile) throws ConfigurationException {
     this(new PropertiesConfiguration(), configFile);
@@ -215,7 +215,7 @@ public class ClientConfiguration extends CompositeConfiguration {
 
   private static ClientConfiguration loadFromSearchPath(List<String> paths) {
     try {
-      List<Configuration> configs = new LinkedList<Configuration>();
+      List<Configuration> configs = new LinkedList<>();
       for (String path : paths) {
         File conf = new File(path);
         if (conf.isFile() && conf.canRead()) {
@@ -272,7 +272,7 @@ public class ClientConfiguration extends CompositeConfiguration {
       // ~/.accumulo/config
       // $ACCUMULO_CONF_DIR/client.conf -OR- $ACCUMULO_HOME/conf/client.conf (depending on whether $ACCUMULO_CONF_DIR is set)
       // /etc/accumulo/client.conf
-      clientConfPaths = new LinkedList<String>();
+      clientConfPaths = new LinkedList<>();
       clientConfPaths.add(System.getProperty("user.home") + File.separator + USER_ACCUMULO_DIR_NAME + File.separator + USER_CONF_FILENAME);
       if (System.getenv("ACCUMULO_CONF_DIR") != null) {
         clientConfPaths.add(System.getenv("ACCUMULO_CONF_DIR") + File.separator + GLOBAL_CONF_FILENAME);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/ClientSideIteratorScanner.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/ClientSideIteratorScanner.java b/core/src/main/java/org/apache/accumulo/core/client/ClientSideIteratorScanner.java
index 9f9449a..d4622c6 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/ClientSideIteratorScanner.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/ClientSideIteratorScanner.java
@@ -251,7 +251,7 @@ public class ClientSideIteratorScanner extends ScannerOptions implements Scanner
 
     smi.samplerConfig = getSamplerConfiguration();
 
-    final TreeMap<Integer,IterInfo> tm = new TreeMap<Integer,IterInfo>();
+    final TreeMap<Integer,IterInfo> tm = new TreeMap<>();
 
     for (IterInfo iterInfo : serverSideIteratorList) {
       tm.put(iterInfo.getPriority(), iterInfo);
@@ -265,7 +265,7 @@ public class ClientSideIteratorScanner extends ScannerOptions implements Scanner
       throw new RuntimeException(e);
     }
 
-    final Set<ByteSequence> colfs = new TreeSet<ByteSequence>();
+    final Set<ByteSequence> colfs = new TreeSet<>();
     for (Column c : this.getFetchedColumns()) {
       colfs.add(new ArrayByteSequence(c.getColumnFamily()));
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/IsolatedScanner.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/IsolatedScanner.java b/core/src/main/java/org/apache/accumulo/core/client/IsolatedScanner.java
index 0479f3b..90e8637 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/IsolatedScanner.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/IsolatedScanner.java
@@ -194,7 +194,7 @@ public class IsolatedScanner extends ScannerOptions implements Scanner {
 
   public static class MemoryRowBuffer implements RowBuffer {
 
-    private ArrayList<Entry<Key,Value>> buffer = new ArrayList<Entry<Key,Value>>();
+    private ArrayList<Entry<Key,Value>> buffer = new ArrayList<>();
 
     @Override
     public void add(Entry<Key,Value> entry) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/IteratorSetting.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/IteratorSetting.java b/core/src/main/java/org/apache/accumulo/core/client/IteratorSetting.java
index e7bbbdf..a6d9a09 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/IteratorSetting.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/IteratorSetting.java
@@ -140,7 +140,7 @@ public class IteratorSetting implements Writable {
     setPriority(priority);
     setName(name);
     setIteratorClass(iteratorClass);
-    this.properties = new HashMap<String,String>();
+    this.properties = new HashMap<>();
     addOptions(properties);
   }
 
@@ -209,7 +209,7 @@ public class IteratorSetting implements Writable {
    * @since 1.5.0
    */
   public IteratorSetting(DataInput din) throws IOException {
-    this.properties = new HashMap<String,String>();
+    this.properties = new HashMap<>();
     this.readFields(din);
   }
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/MutationsRejectedException.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/MutationsRejectedException.java b/core/src/main/java/org/apache/accumulo/core/client/MutationsRejectedException.java
index e8f675b..676957a 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/MutationsRejectedException.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/MutationsRejectedException.java
@@ -47,7 +47,7 @@ public class MutationsRejectedException extends AccumuloException {
   private int unknownErrors;
 
   private static <K,V,L> Map<L,V> transformKeys(Map<K,V> map, Function<K,L> keyFunction) {
-    HashMap<L,V> ret = new HashMap<L,V>();
+    HashMap<L,V> ret = new HashMap<>();
     for (Entry<K,V> entry : map.entrySet()) {
       ret.put(keyFunction.apply(entry.getKey()), entry.getValue());
     }
@@ -125,7 +125,7 @@ public class MutationsRejectedException extends AccumuloException {
   }
 
   private static String format(Map<TabletId,Set<SecurityErrorCode>> hashMap, Instance instance) {
-    Map<String,Set<SecurityErrorCode>> result = new HashMap<String,Set<SecurityErrorCode>>();
+    Map<String,Set<SecurityErrorCode>> result = new HashMap<>();
 
     for (Entry<TabletId,Set<SecurityErrorCode>> entry : hashMap.entrySet()) {
       String tableInfo = Tables.getPrintableTableInfoFromId(instance, entry.getKey().getTableId().toString());
@@ -153,7 +153,7 @@ public class MutationsRejectedException extends AccumuloException {
    */
   @Deprecated
   public List<org.apache.accumulo.core.data.KeyExtent> getAuthorizationFailures() {
-    return new ArrayList<org.apache.accumulo.core.data.KeyExtent>(Collections2.transform(af.keySet(), TabletIdImpl.TID_2_KE_OLD));
+    return new ArrayList<>(Collections2.transform(af.keySet(), TabletIdImpl.TID_2_KE_OLD));
   }
 
   /**

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/RowIterator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/RowIterator.java b/core/src/main/java/org/apache/accumulo/core/client/RowIterator.java
index 190b0b2..c8dab71 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/RowIterator.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/RowIterator.java
@@ -107,7 +107,7 @@ public class RowIterator implements Iterator<Iterator<Entry<Key,Value>>> {
    * Create an iterator from an (ordered) sequence of KeyValue pairs.
    */
   public RowIterator(Iterator<Entry<Key,Value>> iterator) {
-    this.iter = new PeekingIterator<Entry<Key,Value>>(iterator);
+    this.iter = new PeekingIterator<>(iterator);
   }
 
   /**

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/TimedOutException.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/TimedOutException.java b/core/src/main/java/org/apache/accumulo/core/client/TimedOutException.java
index 5ec9c59..e5bba3e 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/TimedOutException.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/TimedOutException.java
@@ -34,7 +34,7 @@ public class TimedOutException extends RuntimeException {
       return set.toString();
     }
 
-    return new ArrayList<String>(set).subList(0, 10).toString() + " ... " + (set.size() - 10) + " servers not shown";
+    return new ArrayList<>(set).subList(0, 10).toString() + " ... " + (set.size() - 10) + " servers not shown";
   }
 
   public TimedOutException(Set<String> timedoutServers) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/admin/ActiveCompaction.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/admin/ActiveCompaction.java b/core/src/main/java/org/apache/accumulo/core/client/admin/ActiveCompaction.java
index 89d30b1..5228391 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/admin/ActiveCompaction.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/admin/ActiveCompaction.java
@@ -45,7 +45,7 @@ public abstract class ActiveCompaction {
      * compaction that merges all of a tablets files into one file
      */
     FULL
-  };
+  }
 
   public static enum CompactionReason {
     /**
@@ -68,7 +68,7 @@ public abstract class ActiveCompaction {
      * Compaction initiated to close a unload a tablet
      */
     CLOSE
-  };
+  }
 
   /**
    *

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/admin/NewTableConfiguration.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/admin/NewTableConfiguration.java b/core/src/main/java/org/apache/accumulo/core/client/admin/NewTableConfiguration.java
index e7dc898..4694e1e 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/admin/NewTableConfiguration.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/admin/NewTableConfiguration.java
@@ -41,7 +41,7 @@ public class NewTableConfiguration {
 
   private boolean limitVersion = true;
 
-  private Map<String,String> properties = new HashMap<String,String>();
+  private Map<String,String> properties = new HashMap<>();
   private SamplerConfiguration samplerConfiguration;
 
   /**
@@ -90,7 +90,7 @@ public class NewTableConfiguration {
     checkArgument(prop != null, "properties is null");
     SamplerConfigurationImpl.checkDisjoint(prop, samplerConfiguration);
 
-    this.properties = new HashMap<String,String>(prop);
+    this.properties = new HashMap<>(prop);
     return this;
   }
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/impl/ActiveCompactionImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/ActiveCompactionImpl.java b/core/src/main/java/org/apache/accumulo/core/client/impl/ActiveCompactionImpl.java
index 838baa9..bdd5d51 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/ActiveCompactionImpl.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/ActiveCompactionImpl.java
@@ -104,7 +104,7 @@ public class ActiveCompactionImpl extends ActiveCompaction {
 
   @Override
   public List<IteratorSetting> getIterators() {
-    ArrayList<IteratorSetting> ret = new ArrayList<IteratorSetting>();
+    ArrayList<IteratorSetting> ret = new ArrayList<>();
 
     for (IterInfo ii : tac.getSsiList()) {
       IteratorSetting settings = new IteratorSetting(ii.getPriority(), ii.getIterName(), ii.getClassName());

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/impl/ActiveScanImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/ActiveScanImpl.java b/core/src/main/java/org/apache/accumulo/core/client/impl/ActiveScanImpl.java
index 7015303..9021190 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/ActiveScanImpl.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/ActiveScanImpl.java
@@ -67,12 +67,12 @@ public class ActiveScanImpl extends ActiveScan {
     this.extent = new KeyExtent(activeScan.extent);
     this.authorizations = new Authorizations(activeScan.authorizations);
 
-    this.columns = new ArrayList<Column>(activeScan.columns.size());
+    this.columns = new ArrayList<>(activeScan.columns.size());
 
     for (TColumn tcolumn : activeScan.columns)
       this.columns.add(new Column(tcolumn));
 
-    this.ssiList = new ArrayList<String>();
+    this.ssiList = new ArrayList<>();
     for (IterInfo ii : activeScan.ssiList) {
       this.ssiList.add(ii.iterName + "=" + ii.priority + "," + ii.className);
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/impl/CompressedIterators.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/CompressedIterators.java b/core/src/main/java/org/apache/accumulo/core/client/impl/CompressedIterators.java
index 96d58a7..c227b40 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/CompressedIterators.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/CompressedIterators.java
@@ -32,13 +32,13 @@ public class CompressedIterators {
   private List<String> symbolTable;
 
   public static class IterConfig {
-    public List<IterInfo> ssiList = new ArrayList<IterInfo>();
-    public Map<String,Map<String,String>> ssio = new HashMap<String,Map<String,String>>();
+    public List<IterInfo> ssiList = new ArrayList<>();
+    public Map<String,Map<String,String>> ssio = new HashMap<>();
   }
 
   public CompressedIterators() {
-    symbolMap = new HashMap<String,Integer>();
-    symbolTable = new ArrayList<String>();
+    symbolMap = new HashMap<>();
+    symbolTable = new ArrayList<>();
   }
 
   public CompressedIterators(List<String> symbols) {
@@ -96,7 +96,7 @@ public class CompressedIterators {
 
       int numOpts = in.readVInt();
 
-      HashMap<String,String> opts = new HashMap<String,String>();
+      HashMap<String,String> opts = new HashMap<>();
 
       for (int j = 0; j < numOpts; j++) {
         String key = symbolTable.get(in.readVInt());

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java b/core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java
index 1c1aaf3..98a15ca 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java
@@ -119,12 +119,12 @@ class ConditionalWriterImpl implements ConditionalWriter {
   private final String classLoaderContext;
 
   private static class ServerQueue {
-    BlockingQueue<TabletServerMutations<QCMutation>> queue = new LinkedBlockingQueue<TabletServerMutations<QCMutation>>();
+    BlockingQueue<TabletServerMutations<QCMutation>> queue = new LinkedBlockingQueue<>();
     boolean taskQueued = false;
   }
 
   private Map<String,ServerQueue> serverQueues;
-  private DelayQueue<QCMutation> failedMutations = new DelayQueue<QCMutation>();
+  private DelayQueue<QCMutation> failedMutations = new DelayQueue<>();
   private ScheduledThreadPoolExecutor threadPool;
 
   private class RQIterator implements Iterator<Result> {
@@ -262,7 +262,7 @@ class ConditionalWriterImpl implements ConditionalWriter {
 
       long time = System.currentTimeMillis();
 
-      ArrayList<QCMutation> mutations2 = new ArrayList<ConditionalWriterImpl.QCMutation>(mutations.size());
+      ArrayList<QCMutation> mutations2 = new ArrayList<>(mutations.size());
 
       for (QCMutation qcm : mutations) {
         qcm.resetDelay();
@@ -290,8 +290,8 @@ class ConditionalWriterImpl implements ConditionalWriter {
   }
 
   private void queue(List<QCMutation> mutations) {
-    List<QCMutation> failures = new ArrayList<QCMutation>();
-    Map<String,TabletServerMutations<QCMutation>> binnedMutations = new HashMap<String,TabletLocator.TabletServerMutations<QCMutation>>();
+    List<QCMutation> failures = new ArrayList<>();
+    Map<String,TabletServerMutations<QCMutation>> binnedMutations = new HashMap<>();
 
     try {
       locator.binMutations(context, mutations, binnedMutations, failures);
@@ -355,7 +355,7 @@ class ConditionalWriterImpl implements ConditionalWriter {
   private TabletServerMutations<QCMutation> dequeue(String location) {
     BlockingQueue<TabletServerMutations<QCMutation>> queue = getServerQueue(location).queue;
 
-    ArrayList<TabletServerMutations<QCMutation>> mutations = new ArrayList<TabletLocator.TabletServerMutations<QCMutation>>();
+    ArrayList<TabletServerMutations<QCMutation>> mutations = new ArrayList<>();
     queue.drainTo(mutations);
 
     if (mutations.size() == 0)
@@ -371,7 +371,7 @@ class ConditionalWriterImpl implements ConditionalWriter {
         for (Entry<KeyExtent,List<QCMutation>> entry : mutations.get(i).getMutations().entrySet()) {
           List<QCMutation> list = tsm.getMutations().get(entry.getKey());
           if (list == null) {
-            list = new ArrayList<QCMutation>();
+            list = new ArrayList<>();
             tsm.getMutations().put(entry.getKey(), list);
           }
 
@@ -389,7 +389,7 @@ class ConditionalWriterImpl implements ConditionalWriter {
     this.ve = new VisibilityEvaluator(config.getAuthorizations());
     this.threadPool = new ScheduledThreadPoolExecutor(config.getMaxWriteThreads(), new NamingThreadFactory(this.getClass().getSimpleName()));
     this.locator = new SyncingTabletLocator(context, tableId);
-    this.serverQueues = new HashMap<String,ServerQueue>();
+    this.serverQueues = new HashMap<>();
     this.tableId = tableId;
     this.timeout = config.getTimeout(TimeUnit.MILLISECONDS);
     this.durability = config.getDurability();
@@ -399,7 +399,7 @@ class ConditionalWriterImpl implements ConditionalWriter {
 
       @Override
       public void run() {
-        List<QCMutation> mutations = new ArrayList<QCMutation>();
+        List<QCMutation> mutations = new ArrayList<>();
         failedMutations.drainTo(mutations);
         if (mutations.size() > 0)
           queue(mutations);
@@ -414,9 +414,9 @@ class ConditionalWriterImpl implements ConditionalWriter {
   @Override
   public Iterator<Result> write(Iterator<ConditionalMutation> mutations) {
 
-    BlockingQueue<Result> resultQueue = new LinkedBlockingQueue<Result>();
+    BlockingQueue<Result> resultQueue = new LinkedBlockingQueue<>();
 
-    List<QCMutation> mutationList = new ArrayList<QCMutation>();
+    List<QCMutation> mutationList = new ArrayList<>();
 
     int count = 0;
 
@@ -491,7 +491,7 @@ class ConditionalWriterImpl implements ConditionalWriter {
     }
   }
 
-  private HashMap<HostAndPort,SessionID> cachedSessionIDs = new HashMap<HostAndPort,SessionID>();
+  private HashMap<HostAndPort,SessionID> cachedSessionIDs = new HashMap<>();
 
   private SessionID reserveSessionID(HostAndPort location, TabletClientService.Iface client, TInfo tinfo) throws ThriftSecurityException, TException {
     // avoid cost of repeatedly making RPC to create sessions, reuse sessions
@@ -548,7 +548,7 @@ class ConditionalWriterImpl implements ConditionalWriter {
   }
 
   List<SessionID> getActiveSessions() {
-    ArrayList<SessionID> activeSessions = new ArrayList<SessionID>();
+    ArrayList<SessionID> activeSessions = new ArrayList<>();
     for (SessionID sid : cachedSessionIDs.values())
       if (sid.isActive())
         activeSessions.add(sid);
@@ -569,13 +569,13 @@ class ConditionalWriterImpl implements ConditionalWriter {
 
     TInfo tinfo = Tracer.traceInfo();
 
-    Map<Long,CMK> cmidToCm = new HashMap<Long,CMK>();
+    Map<Long,CMK> cmidToCm = new HashMap<>();
     MutableLong cmid = new MutableLong(0);
 
     SessionID sessionId = null;
 
     try {
-      Map<TKeyExtent,List<TConditionalMutation>> tmutations = new HashMap<TKeyExtent,List<TConditionalMutation>>();
+      Map<TKeyExtent,List<TConditionalMutation>> tmutations = new HashMap<>();
 
       CompressedIterators compressedIters = new CompressedIterators();
       convertMutations(mutations, cmidToCm, cmid, tmutations, compressedIters);
@@ -594,9 +594,9 @@ class ConditionalWriterImpl implements ConditionalWriter {
         }
       }
 
-      HashSet<KeyExtent> extentsToInvalidate = new HashSet<KeyExtent>();
+      HashSet<KeyExtent> extentsToInvalidate = new HashSet<>();
 
-      ArrayList<QCMutation> ignored = new ArrayList<QCMutation>();
+      ArrayList<QCMutation> ignored = new ArrayList<>();
 
       for (TCMResult tcmResult : tresults) {
         if (tcmResult.status == TCMStatus.IGNORED) {
@@ -637,7 +637,7 @@ class ConditionalWriterImpl implements ConditionalWriter {
   }
 
   private void queueRetry(Map<Long,CMK> cmidToCm, HostAndPort location) {
-    ArrayList<QCMutation> ignored = new ArrayList<QCMutation>();
+    ArrayList<QCMutation> ignored = new ArrayList<>();
     for (CMK cmk : cmidToCm.values())
       ignored.add(cmk.cm);
     queueRetry(ignored, location);
@@ -739,7 +739,7 @@ class ConditionalWriterImpl implements ConditionalWriter {
 
     for (Entry<KeyExtent,List<QCMutation>> entry : mutations.getMutations().entrySet()) {
       TKeyExtent tke = entry.getKey().toThrift();
-      ArrayList<TConditionalMutation> tcondMutaions = new ArrayList<TConditionalMutation>();
+      ArrayList<TConditionalMutation> tcondMutaions = new ArrayList<>();
 
       List<QCMutation> condMutations = entry.getValue();
 
@@ -792,7 +792,7 @@ class ConditionalWriterImpl implements ConditionalWriter {
   private static final ConditionComparator CONDITION_COMPARATOR = new ConditionComparator();
 
   private List<TCondition> convertConditions(ConditionalMutation cm, CompressedIterators compressedIters) {
-    List<TCondition> conditions = new ArrayList<TCondition>(cm.getConditions().size());
+    List<TCondition> conditions = new ArrayList<>(cm.getConditions().size());
 
     // sort conditions inorder to get better lookup performance. Sort on client side so tserver does not have to do it.
     Condition[] ca = cm.getConditions().toArray(new Condition[cm.getConditions().size()]);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/impl/InstanceOperationsImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/InstanceOperationsImpl.java b/core/src/main/java/org/apache/accumulo/core/client/impl/InstanceOperationsImpl.java
index 32a7ec0..d716650 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/InstanceOperationsImpl.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/InstanceOperationsImpl.java
@@ -110,11 +110,11 @@ public class InstanceOperationsImpl implements InstanceOperations {
     Instance instance = context.getInstance();
     ZooCache cache = new ZooCacheFactory().getZooCache(instance.getZooKeepers(), instance.getZooKeepersSessionTimeOut());
     String path = ZooUtil.getRoot(instance) + Constants.ZTSERVERS;
-    List<String> results = new ArrayList<String>();
+    List<String> results = new ArrayList<>();
     for (String candidate : cache.getChildren(path)) {
       List<String> children = cache.getChildren(path + "/" + candidate);
       if (children != null && children.size() > 0) {
-        List<String> copy = new ArrayList<String>(children);
+        List<String> copy = new ArrayList<>(children);
         Collections.sort(copy);
         byte[] data = cache.get(path + "/" + candidate + "/" + copy.get(0));
         if (data != null && !"master".equals(new String(data, UTF_8))) {
@@ -132,7 +132,7 @@ public class InstanceOperationsImpl implements InstanceOperations {
     try {
       client = ThriftUtil.getTServerClient(parsedTserver, context);
 
-      List<ActiveScan> as = new ArrayList<ActiveScan>();
+      List<ActiveScan> as = new ArrayList<>();
       for (org.apache.accumulo.core.tabletserver.thrift.ActiveScan activeScan : client.getActiveScans(Tracer.traceInfo(), context.rpcCreds())) {
         try {
           as.add(new ActiveScanImpl(context.getInstance(), activeScan));
@@ -170,7 +170,7 @@ public class InstanceOperationsImpl implements InstanceOperations {
     try {
       client = ThriftUtil.getTServerClient(parsedTserver, context);
 
-      List<ActiveCompaction> as = new ArrayList<ActiveCompaction>();
+      List<ActiveCompaction> as = new ArrayList<>();
       for (org.apache.accumulo.core.tabletserver.thrift.ActiveCompaction activeCompaction : client.getActiveCompactions(Tracer.traceInfo(), context.rpcCreds())) {
         as.add(new ActiveCompactionImpl(context.getInstance(), activeCompaction));
       }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/impl/MultiTableBatchWriterImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/MultiTableBatchWriterImpl.java b/core/src/main/java/org/apache/accumulo/core/client/impl/MultiTableBatchWriterImpl.java
index 6f700a3..15d1c34 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/MultiTableBatchWriterImpl.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/MultiTableBatchWriterImpl.java
@@ -118,7 +118,7 @@ public class MultiTableBatchWriterImpl implements MultiTableBatchWriter {
     checkArgument(cacheTimeUnit != null, "cacheTimeUnit is null");
     this.context = context;
     this.bw = new TabletServerBatchWriter(context, config);
-    tableWriters = new ConcurrentHashMap<String,BatchWriter>();
+    tableWriters = new ConcurrentHashMap<>();
     this.closed = new AtomicBoolean(false);
     this.cacheLastState = new AtomicLong(0);
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/impl/NamespaceOperationsHelper.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/NamespaceOperationsHelper.java b/core/src/main/java/org/apache/accumulo/core/client/impl/NamespaceOperationsHelper.java
index 2dac1fa..9b3a358 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/NamespaceOperationsHelper.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/NamespaceOperationsHelper.java
@@ -66,7 +66,7 @@ public abstract class NamespaceOperationsHelper implements NamespaceOperations {
       NamespaceNotFoundException {
     if (!exists(namespace))
       throw new NamespaceNotFoundException(null, namespace, null);
-    Map<String,String> copy = new TreeMap<String,String>();
+    Map<String,String> copy = new TreeMap<>();
     for (Entry<String,String> property : this.getProperties(namespace)) {
       copy.put(property.getKey(), property.getValue());
     }
@@ -86,7 +86,7 @@ public abstract class NamespaceOperationsHelper implements NamespaceOperations {
       throw new NamespaceNotFoundException(null, namespace, null);
     int priority = -1;
     String classname = null;
-    Map<String,String> settings = new HashMap<String,String>();
+    Map<String,String> settings = new HashMap<>();
 
     String root = String.format("%s%s.%s", Property.TABLE_ITERATOR_PREFIX, scope.name().toLowerCase(), name);
     String opt = root + ".opt.";
@@ -112,7 +112,7 @@ public abstract class NamespaceOperationsHelper implements NamespaceOperations {
   public Map<String,EnumSet<IteratorScope>> listIterators(String namespace) throws AccumuloSecurityException, AccumuloException, NamespaceNotFoundException {
     if (!exists(namespace))
       throw new NamespaceNotFoundException(null, namespace, null);
-    Map<String,EnumSet<IteratorScope>> result = new TreeMap<String,EnumSet<IteratorScope>>();
+    Map<String,EnumSet<IteratorScope>> result = new TreeMap<>();
     for (Entry<String,String> property : this.getProperties(namespace)) {
       String name = property.getKey();
       String[] parts = name.split("\\.");
@@ -137,7 +137,7 @@ public abstract class NamespaceOperationsHelper implements NamespaceOperations {
       String scopeStr = String.format("%s%s", Property.TABLE_ITERATOR_PREFIX, scope.name().toLowerCase());
       String nameStr = String.format("%s.%s", scopeStr, setting.getName());
       String optStr = String.format("%s.opt.", nameStr);
-      Map<String,String> optionConflicts = new TreeMap<String,String>();
+      Map<String,String> optionConflicts = new TreeMap<>();
       for (Entry<String,String> property : this.getProperties(namespace)) {
         if (property.getKey().startsWith(scopeStr)) {
           if (property.getKey().equals(nameStr))
@@ -165,8 +165,8 @@ public abstract class NamespaceOperationsHelper implements NamespaceOperations {
 
   @Override
   public int addConstraint(String namespace, String constraintClassName) throws AccumuloException, AccumuloSecurityException, NamespaceNotFoundException {
-    TreeSet<Integer> constraintNumbers = new TreeSet<Integer>();
-    TreeMap<String,Integer> constraintClasses = new TreeMap<String,Integer>();
+    TreeSet<Integer> constraintNumbers = new TreeSet<>();
+    TreeMap<String,Integer> constraintClasses = new TreeMap<>();
     int i;
     for (Entry<String,String> property : this.getProperties(namespace)) {
       if (property.getKey().startsWith(Property.TABLE_CONSTRAINT_PREFIX.toString())) {
@@ -196,7 +196,7 @@ public abstract class NamespaceOperationsHelper implements NamespaceOperations {
 
   @Override
   public Map<String,Integer> listConstraints(String namespace) throws AccumuloException, NamespaceNotFoundException, AccumuloSecurityException {
-    Map<String,Integer> constraints = new TreeMap<String,Integer>();
+    Map<String,Integer> constraints = new TreeMap<>();
     for (Entry<String,String> property : this.getProperties(namespace)) {
       if (property.getKey().startsWith(Property.TABLE_CONSTRAINT_PREFIX.toString())) {
         if (constraints.containsKey(property.getValue()))

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/impl/NamespaceOperationsImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/NamespaceOperationsImpl.java b/core/src/main/java/org/apache/accumulo/core/client/impl/NamespaceOperationsImpl.java
index ae5fc81..0716122 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/NamespaceOperationsImpl.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/NamespaceOperationsImpl.java
@@ -76,7 +76,7 @@ public class NamespaceOperationsImpl extends NamespaceOperationsHelper {
       timer = new OpTimer().start();
     }
 
-    TreeSet<String> namespaces = new TreeSet<String>(Namespaces.getNameToIdMap(context.getInstance()).keySet());
+    TreeSet<String> namespaces = new TreeSet<>(Namespaces.getNameToIdMap(context.getInstance()).keySet());
 
     if (timer != null) {
       timer.stop();
@@ -137,7 +137,7 @@ public class NamespaceOperationsImpl extends NamespaceOperationsHelper {
     }
 
     List<ByteBuffer> args = Arrays.asList(ByteBuffer.wrap(namespace.getBytes(UTF_8)));
-    Map<String,String> opts = new HashMap<String,String>();
+    Map<String,String> opts = new HashMap<>();
 
     try {
       doNamespaceFateOperation(FateOperation.NAMESPACE_DELETE, args, opts, namespace);
@@ -153,7 +153,7 @@ public class NamespaceOperationsImpl extends NamespaceOperationsHelper {
       NamespaceExistsException {
 
     List<ByteBuffer> args = Arrays.asList(ByteBuffer.wrap(oldNamespaceName.getBytes(UTF_8)), ByteBuffer.wrap(newNamespaceName.getBytes(UTF_8)));
-    Map<String,String> opts = new HashMap<String,String>();
+    Map<String,String> opts = new HashMap<>();
     doNamespaceFateOperation(FateOperation.NAMESPACE_RENAME, args, opts, oldNamespaceName);
   }
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/impl/Namespaces.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/Namespaces.java b/core/src/main/java/org/apache/accumulo/core/client/impl/Namespaces.java
index 433b020..39d5822 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/Namespaces.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/Namespaces.java
@@ -93,7 +93,7 @@ public class Namespaces {
 
     List<String> namespaceIds = zc.getChildren(ZooUtil.getRoot(instance) + Constants.ZNAMESPACES);
 
-    TreeMap<String,String> namespaceMap = new TreeMap<String,String>();
+    TreeMap<String,String> namespaceMap = new TreeMap<>();
 
     for (String id : namespaceIds) {
       byte[] path = zc.get(ZooUtil.getRoot(instance) + Constants.ZNAMESPACES + "/" + id + Constants.ZNAMESPACE_NAME);
@@ -137,7 +137,7 @@ public class Namespaces {
 
   public static List<String> getTableIds(Instance instance, String namespaceId) throws NamespaceNotFoundException {
     String namespace = getNamespaceName(instance, namespaceId);
-    List<String> names = new LinkedList<String>();
+    List<String> names = new LinkedList<>();
     for (Entry<String,String> nameToId : Tables.getNameToIdMap(instance).entrySet())
       if (namespace.equals(Tables.qualify(nameToId.getKey()).getFirst()))
         names.add(nameToId.getValue());
@@ -146,7 +146,7 @@ public class Namespaces {
 
   public static List<String> getTableNames(Instance instance, String namespaceId) throws NamespaceNotFoundException {
     String namespace = getNamespaceName(instance, namespaceId);
-    List<String> names = new LinkedList<String>();
+    List<String> names = new LinkedList<>();
     for (String name : Tables.getNameToIdMap(instance).keySet())
       if (namespace.equals(Tables.qualify(name).getFirst()))
         names.add(name);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineIterator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineIterator.java b/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineIterator.java
index 54fe4ff..9f51704 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineIterator.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineIterator.java
@@ -39,7 +39,6 @@ import org.apache.accumulo.core.client.sample.SamplerConfiguration;
 import org.apache.accumulo.core.conf.AccumuloConfiguration;
 import org.apache.accumulo.core.conf.ConfigurationCopy;
 import org.apache.accumulo.core.conf.Property;
-import org.apache.accumulo.core.data.Column;
 import org.apache.accumulo.core.data.Key;
 import org.apache.accumulo.core.data.KeyValue;
 import org.apache.accumulo.core.data.PartialKey;
@@ -105,7 +104,7 @@ class OfflineIterator implements Iterator<Entry<Key,Value>> {
       return false;
     }
 
-    private ArrayList<SortedKeyValueIterator<Key,Value>> topLevelIterators = new ArrayList<SortedKeyValueIterator<Key,Value>>();
+    private ArrayList<SortedKeyValueIterator<Key,Value>> topLevelIterators = new ArrayList<>();
 
     @Override
     public void registerSideChannel(SortedKeyValueIterator<Key,Value> iter) {
@@ -120,7 +119,7 @@ class OfflineIterator implements Iterator<Entry<Key,Value>> {
     SortedKeyValueIterator<Key,Value> getTopLevelIterator(SortedKeyValueIterator<Key,Value> iter) {
       if (topLevelIterators.isEmpty())
         return iter;
-      ArrayList<SortedKeyValueIterator<Key,Value>> allIters = new ArrayList<SortedKeyValueIterator<Key,Value>>(topLevelIterators);
+      ArrayList<SortedKeyValueIterator<Key,Value>> allIters = new ArrayList<>(topLevelIterators);
       allIters.add(iter);
       return new MultiIterator(allIters, false);
     }
@@ -165,7 +164,7 @@ class OfflineIterator implements Iterator<Entry<Key,Value>> {
 
     this.tableId = table.toString();
     this.authorizations = authorizations;
-    this.readers = new ArrayList<SortedKeyValueIterator<Key,Value>>();
+    this.readers = new ArrayList<>();
 
     try {
       conn = instance.getConnector(credentials.getPrincipal(), credentials.getToken());
@@ -233,7 +232,7 @@ class OfflineIterator implements Iterator<Entry<Key,Value>> {
       nextRange = new Range(currentExtent.getMetadataEntry(), false, null, false);
     }
 
-    List<String> relFiles = new ArrayList<String>();
+    List<String> relFiles = new ArrayList<>();
 
     Pair<KeyExtent,String> eloc = getTabletFiles(nextRange, relFiles);
 
@@ -264,7 +263,7 @@ class OfflineIterator implements Iterator<Entry<Key,Value>> {
     @SuppressWarnings("deprecation")
     String tablesDir = config.get(Property.INSTANCE_DFS_DIR) + Constants.HDFS_TABLES_DIR;
 
-    List<String> absFiles = new ArrayList<String>();
+    List<String> absFiles = new ArrayList<>();
     for (String relPath : relFiles) {
       if (relPath.contains(":")) {
         absFiles.add(relPath);
@@ -313,7 +312,7 @@ class OfflineIterator implements Iterator<Entry<Key,Value>> {
       }
 
     }
-    return new Pair<KeyExtent,String>(extent, location);
+    return new Pair<>(extent, location);
   }
 
   private SortedKeyValueIterator<Key,Value> createIterator(KeyExtent extent, List<String> absFiles) throws TableNotFoundException, AccumuloException,
@@ -359,7 +358,7 @@ class OfflineIterator implements Iterator<Entry<Key,Value>> {
     ColumnVisibility cv = new ColumnVisibility(acuTableConf.get(Property.TABLE_DEFAULT_SCANTIME_VISIBILITY));
     defaultSecurityLabel = cv.getExpression();
 
-    SortedKeyValueIterator<Key,Value> visFilter = IteratorUtil.setupSystemScanIterators(multiIter, new HashSet<Column>(options.fetchedColumns), authorizations,
+    SortedKeyValueIterator<Key,Value> visFilter = IteratorUtil.setupSystemScanIterators(multiIter, new HashSet<>(options.fetchedColumns), authorizations,
         defaultSecurityLabel);
 
     return iterEnv.getTopLevelIterator(IteratorUtil.loadIterators(IteratorScope.scan, visFilter, extent, acuTableConf, options.serverSideIteratorList,

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/impl/RootTabletLocator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/RootTabletLocator.java b/core/src/main/java/org/apache/accumulo/core/client/impl/RootTabletLocator.java
index 4df2e08..9fdbb25 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/RootTabletLocator.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/RootTabletLocator.java
@@ -61,7 +61,7 @@ public class RootTabletLocator extends TabletLocator {
       throws AccumuloException, AccumuloSecurityException, TableNotFoundException {
     TabletLocation rootTabletLocation = getRootTabletLocation(context);
     if (rootTabletLocation != null) {
-      TabletServerMutations<T> tsm = new TabletServerMutations<T>(rootTabletLocation.tablet_session);
+      TabletServerMutations<T> tsm = new TabletServerMutations<>(rootTabletLocation.tablet_session);
       for (T mutation : mutations) {
         tsm.addMutation(RootTable.EXTENT, mutation);
       }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/impl/ScannerIterator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/ScannerIterator.java b/core/src/main/java/org/apache/accumulo/core/client/impl/ScannerIterator.java
index 18b90e0..ae55cc0 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/ScannerIterator.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/ScannerIterator.java
@@ -111,7 +111,7 @@ public class ScannerIterator implements Iterator<Entry<Key,Value>> {
 
     this.options = new ScannerOptions(options);
 
-    synchQ = new ArrayBlockingQueue<Object>(1);
+    synchQ = new ArrayBlockingQueue<>(1);
 
     if (this.options.fetchedColumns.size() > 0) {
       range = range.bound(this.options.fetchedColumns.first(), this.options.fetchedColumns.last());

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/impl/ScannerOptions.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/ScannerOptions.java b/core/src/main/java/org/apache/accumulo/core/client/impl/ScannerOptions.java
index c3a1a63..a986d87 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/ScannerOptions.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/ScannerOptions.java
@@ -47,7 +47,7 @@ public class ScannerOptions implements ScannerBase {
   protected List<IterInfo> serverSideIteratorList = Collections.emptyList();
   protected Map<String,Map<String,String>> serverSideIteratorOptions = Collections.emptyMap();
 
-  protected SortedSet<Column> fetchedColumns = new TreeSet<Column>();
+  protected SortedSet<Column> fetchedColumns = new TreeSet<>();
 
   protected long timeOut = Long.MAX_VALUE;
 
@@ -69,7 +69,7 @@ public class ScannerOptions implements ScannerBase {
   public synchronized void addScanIterator(IteratorSetting si) {
     checkArgument(si != null, "si is null");
     if (serverSideIteratorList.size() == 0)
-      serverSideIteratorList = new ArrayList<IterInfo>();
+      serverSideIteratorList = new ArrayList<>();
 
     for (IterInfo ii : serverSideIteratorList) {
       if (ii.iterName.equals(si.getName()))
@@ -81,12 +81,12 @@ public class ScannerOptions implements ScannerBase {
     serverSideIteratorList.add(new IterInfo(si.getPriority(), si.getIteratorClass(), si.getName()));
 
     if (serverSideIteratorOptions.size() == 0)
-      serverSideIteratorOptions = new HashMap<String,Map<String,String>>();
+      serverSideIteratorOptions = new HashMap<>();
 
     Map<String,String> opts = serverSideIteratorOptions.get(si.getName());
 
     if (opts == null) {
-      opts = new HashMap<String,String>();
+      opts = new HashMap<>();
       serverSideIteratorOptions.put(si.getName(), opts);
     }
     opts.putAll(si.getOptions());
@@ -115,12 +115,12 @@ public class ScannerOptions implements ScannerBase {
     checkArgument(key != null, "key is null");
     checkArgument(value != null, "value is null");
     if (serverSideIteratorOptions.size() == 0)
-      serverSideIteratorOptions = new HashMap<String,Map<String,String>>();
+      serverSideIteratorOptions = new HashMap<>();
 
     Map<String,String> opts = serverSideIteratorOptions.get(iteratorName);
 
     if (opts == null) {
-      opts = new HashMap<String,String>();
+      opts = new HashMap<>();
       serverSideIteratorOptions.put(iteratorName, opts);
     }
     opts.put(key, value);
@@ -167,14 +167,14 @@ public class ScannerOptions implements ScannerBase {
     synchronized (dst) {
       synchronized (src) {
         dst.regexIterName = src.regexIterName;
-        dst.fetchedColumns = new TreeSet<Column>(src.fetchedColumns);
-        dst.serverSideIteratorList = new ArrayList<IterInfo>(src.serverSideIteratorList);
+        dst.fetchedColumns = new TreeSet<>(src.fetchedColumns);
+        dst.serverSideIteratorList = new ArrayList<>(src.serverSideIteratorList);
         dst.classLoaderContext = src.classLoaderContext;
 
-        dst.serverSideIteratorOptions = new HashMap<String,Map<String,String>>();
+        dst.serverSideIteratorOptions = new HashMap<>();
         Set<Entry<String,Map<String,String>>> es = src.serverSideIteratorOptions.entrySet();
         for (Entry<String,Map<String,String>> entry : es)
-          dst.serverSideIteratorOptions.put(entry.getKey(), new HashMap<String,String>(entry.getValue()));
+          dst.serverSideIteratorOptions.put(entry.getKey(), new HashMap<>(entry.getValue()));
 
         dst.samplerConfig = src.samplerConfig;
         dst.batchTimeOut = src.batchTimeOut;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/impl/ServerClient.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/ServerClient.java b/core/src/main/java/org/apache/accumulo/core/client/impl/ServerClient.java
index 680d23a..501b4df 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/ServerClient.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/ServerClient.java
@@ -123,7 +123,7 @@ public class ServerClient {
       throws TTransportException {
     checkArgument(context != null, "context is null");
     // create list of servers
-    ArrayList<ThriftTransportKey> servers = new ArrayList<ThriftTransportKey>();
+    ArrayList<ThriftTransportKey> servers = new ArrayList<>();
 
     // add tservers
     Instance instance = context.getInstance();
@@ -144,7 +144,7 @@ public class ServerClient {
       ClientService.Client client = ThriftUtil.createClient(new ClientService.Client.Factory(), pair.getSecond());
       opened = true;
       warnedAboutTServersBeingDown = false;
-      return new Pair<String,ClientService.Client>(pair.getFirst(), client);
+      return new Pair<>(pair.getFirst(), client);
     } finally {
       if (!opened) {
         if (!warnedAboutTServersBeingDown) {


[11/32] accumulo git commit: ACCUMULO-4357 Remove unneeded code for readability

Posted by ct...@apache.org.
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/client/mapred/AccumuloMultiTableInputFormatTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/client/mapred/AccumuloMultiTableInputFormatTest.java b/core/src/test/java/org/apache/accumulo/core/client/mapred/AccumuloMultiTableInputFormatTest.java
index ef19901..4e75ab6 100644
--- a/core/src/test/java/org/apache/accumulo/core/client/mapred/AccumuloMultiTableInputFormatTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/client/mapred/AccumuloMultiTableInputFormatTest.java
@@ -48,14 +48,14 @@ public class AccumuloMultiTableInputFormatTest {
     JobConf job = new JobConf();
 
     InputTableConfig table1 = new InputTableConfig().setRanges(Collections.singletonList(new Range("a", "b")))
-        .fetchColumns(Collections.singleton(new Pair<Text,Text>(new Text("CF1"), new Text("CQ1"))))
+        .fetchColumns(Collections.singleton(new Pair<>(new Text("CF1"), new Text("CQ1"))))
         .setIterators(Collections.singletonList(new IteratorSetting(50, "iter1", "iterclass1")));
 
     InputTableConfig table2 = new InputTableConfig().setRanges(Collections.singletonList(new Range("a", "b")))
-        .fetchColumns(Collections.singleton(new Pair<Text,Text>(new Text("CF1"), new Text("CQ1"))))
+        .fetchColumns(Collections.singleton(new Pair<>(new Text("CF1"), new Text("CQ1"))))
         .setIterators(Collections.singletonList(new IteratorSetting(50, "iter1", "iterclass1")));
 
-    Map<String,InputTableConfig> configMap = new HashMap<String,InputTableConfig>();
+    Map<String,InputTableConfig> configMap = new HashMap<>();
     configMap.put(table1Name, table1);
     configMap.put(table2Name, table2);
     AccumuloMultiTableInputFormat.setInputTableConfigs(job, configMap);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/client/mapred/RangeInputSplitTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/client/mapred/RangeInputSplitTest.java b/core/src/test/java/org/apache/accumulo/core/client/mapred/RangeInputSplitTest.java
index 6c75ec2..c399fb0 100644
--- a/core/src/test/java/org/apache/accumulo/core/client/mapred/RangeInputSplitTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/client/mapred/RangeInputSplitTest.java
@@ -64,13 +64,13 @@ public class RangeInputSplitTest {
   public void testAllFieldsWritable() throws IOException {
     RangeInputSplit split = new RangeInputSplit("table", "1", new Range(new Key("a"), new Key("b")), new String[] {"localhost"});
 
-    Set<Pair<Text,Text>> fetchedColumns = new HashSet<Pair<Text,Text>>();
+    Set<Pair<Text,Text>> fetchedColumns = new HashSet<>();
 
-    fetchedColumns.add(new Pair<Text,Text>(new Text("colf1"), new Text("colq1")));
-    fetchedColumns.add(new Pair<Text,Text>(new Text("colf2"), new Text("colq2")));
+    fetchedColumns.add(new Pair<>(new Text("colf1"), new Text("colq1")));
+    fetchedColumns.add(new Pair<>(new Text("colf2"), new Text("colq2")));
 
     // Fake some iterators
-    ArrayList<IteratorSetting> iterators = new ArrayList<IteratorSetting>();
+    ArrayList<IteratorSetting> iterators = new ArrayList<>();
     IteratorSetting setting = new IteratorSetting(50, SummingCombiner.class);
     setting.addOption("foo", "bar");
     iterators.add(setting);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormatTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormatTest.java b/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormatTest.java
index 56c8195..3eef024 100644
--- a/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormatTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormatTest.java
@@ -175,12 +175,12 @@ public class AccumuloInputFormatTest {
   @Test
   public void testEmptyColumnFamily() throws IOException {
     Job job = Job.getInstance();
-    Set<Pair<Text,Text>> cols = new HashSet<Pair<Text,Text>>();
+    Set<Pair<Text,Text>> cols = new HashSet<>();
     cols.add(new Pair<Text,Text>(new Text(""), null));
-    cols.add(new Pair<Text,Text>(new Text("foo"), new Text("bar")));
-    cols.add(new Pair<Text,Text>(new Text(""), new Text("bar")));
-    cols.add(new Pair<Text,Text>(new Text(""), new Text("")));
-    cols.add(new Pair<Text,Text>(new Text("foo"), new Text("")));
+    cols.add(new Pair<>(new Text("foo"), new Text("bar")));
+    cols.add(new Pair<>(new Text(""), new Text("bar")));
+    cols.add(new Pair<>(new Text(""), new Text("")));
+    cols.add(new Pair<>(new Text("foo"), new Text("")));
     AccumuloInputFormat.fetchColumns(job, cols);
     Set<Pair<Text,Text>> setCols = AccumuloInputFormat.getFetchedColumns(job);
     assertEquals(cols, setCols);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloMultiTableInputFormatTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloMultiTableInputFormatTest.java b/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloMultiTableInputFormatTest.java
index 1137916..12849fe 100644
--- a/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloMultiTableInputFormatTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloMultiTableInputFormatTest.java
@@ -47,10 +47,10 @@ public class AccumuloMultiTableInputFormatTest {
     Job job = Job.getInstance();
 
     InputTableConfig tableConfig = new InputTableConfig().setRanges(Collections.singletonList(new Range("a", "b")))
-        .fetchColumns(Collections.singleton(new Pair<Text,Text>(new Text("CF1"), new Text("CQ1"))))
+        .fetchColumns(Collections.singleton(new Pair<>(new Text("CF1"), new Text("CQ1"))))
         .setIterators(Collections.singletonList(new IteratorSetting(50, "iter1", "iterclass1")));
 
-    Map<String,InputTableConfig> configMap = new HashMap<String,InputTableConfig>();
+    Map<String,InputTableConfig> configMap = new HashMap<>();
     configMap.put(table1, tableConfig);
     configMap.put(table2, tableConfig);
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/client/mapreduce/InputTableConfigTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/client/mapreduce/InputTableConfigTest.java b/core/src/test/java/org/apache/accumulo/core/client/mapreduce/InputTableConfigTest.java
index 4953654..f6f7b2f 100644
--- a/core/src/test/java/org/apache/accumulo/core/client/mapreduce/InputTableConfigTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/client/mapreduce/InputTableConfigTest.java
@@ -66,7 +66,7 @@ public class InputTableConfigTest {
 
   @Test
   public void testSerialization_ranges() throws IOException {
-    List<Range> ranges = new ArrayList<Range>();
+    List<Range> ranges = new ArrayList<>();
     ranges.add(new Range("a", "b"));
     ranges.add(new Range("c", "d"));
     tableQueryConfig.setRanges(ranges);
@@ -79,8 +79,8 @@ public class InputTableConfigTest {
 
   @Test
   public void testSerialization_columns() throws IOException {
-    Set<Pair<Text,Text>> columns = new HashSet<Pair<Text,Text>>();
-    columns.add(new Pair<Text,Text>(new Text("cf1"), new Text("cq1")));
+    Set<Pair<Text,Text>> columns = new HashSet<>();
+    columns.add(new Pair<>(new Text("cf1"), new Text("cq1")));
     columns.add(new Pair<Text,Text>(new Text("cf2"), null));
     tableQueryConfig.fetchColumns(columns);
 
@@ -92,7 +92,7 @@ public class InputTableConfigTest {
 
   @Test
   public void testSerialization_iterators() throws IOException {
-    List<IteratorSetting> settings = new ArrayList<IteratorSetting>();
+    List<IteratorSetting> settings = new ArrayList<>();
     settings.add(new IteratorSetting(50, "iter", "iterclass"));
     settings.add(new IteratorSetting(55, "iter2", "iterclass2"));
     tableQueryConfig.setIterators(settings);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/client/mapreduce/RangeInputSplitTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/client/mapreduce/RangeInputSplitTest.java b/core/src/test/java/org/apache/accumulo/core/client/mapreduce/RangeInputSplitTest.java
index 1cf8c55..0eb8010 100644
--- a/core/src/test/java/org/apache/accumulo/core/client/mapreduce/RangeInputSplitTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/client/mapreduce/RangeInputSplitTest.java
@@ -66,13 +66,13 @@ public class RangeInputSplitTest {
   public void testAllFieldsWritable() throws IOException {
     RangeInputSplit split = new RangeInputSplit("table", "1", new Range(new Key("a"), new Key("b")), new String[] {"localhost"});
 
-    Set<Pair<Text,Text>> fetchedColumns = new HashSet<Pair<Text,Text>>();
+    Set<Pair<Text,Text>> fetchedColumns = new HashSet<>();
 
-    fetchedColumns.add(new Pair<Text,Text>(new Text("colf1"), new Text("colq1")));
-    fetchedColumns.add(new Pair<Text,Text>(new Text("colf2"), new Text("colq2")));
+    fetchedColumns.add(new Pair<>(new Text("colf1"), new Text("colq1")));
+    fetchedColumns.add(new Pair<>(new Text("colf2"), new Text("colq2")));
 
     // Fake some iterators
-    ArrayList<IteratorSetting> iterators = new ArrayList<IteratorSetting>();
+    ArrayList<IteratorSetting> iterators = new ArrayList<>();
     IteratorSetting setting = new IteratorSetting(50, SummingCombiner.class);
     setting.addOption("foo", "bar");
     iterators.add(setting);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/client/mapreduce/impl/BatchInputSplitTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/client/mapreduce/impl/BatchInputSplitTest.java b/core/src/test/java/org/apache/accumulo/core/client/mapreduce/impl/BatchInputSplitTest.java
index 74c3438..17c781d 100644
--- a/core/src/test/java/org/apache/accumulo/core/client/mapreduce/impl/BatchInputSplitTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/client/mapreduce/impl/BatchInputSplitTest.java
@@ -68,13 +68,13 @@ public class BatchInputSplitTest {
     Range[] ranges = new Range[] {new Range(new Key("a"), new Key("b"))};
     BatchInputSplit split = new BatchInputSplit("table", "1", Arrays.asList(ranges), new String[] {"localhost"});
 
-    Set<Pair<Text,Text>> fetchedColumns = new HashSet<Pair<Text,Text>>();
+    Set<Pair<Text,Text>> fetchedColumns = new HashSet<>();
 
-    fetchedColumns.add(new Pair<Text,Text>(new Text("colf1"), new Text("colq1")));
-    fetchedColumns.add(new Pair<Text,Text>(new Text("colf2"), new Text("colq2")));
+    fetchedColumns.add(new Pair<>(new Text("colf1"), new Text("colq1")));
+    fetchedColumns.add(new Pair<>(new Text("colf2"), new Text("colq2")));
 
     // Fake some iterators
-    ArrayList<IteratorSetting> iterators = new ArrayList<IteratorSetting>();
+    ArrayList<IteratorSetting> iterators = new ArrayList<>();
     IteratorSetting setting = new IteratorSetting(50, SummingCombiner.class);
     setting.addOption("foo", "bar");
     iterators.add(setting);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/client/mock/MockConnectorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/client/mock/MockConnectorTest.java b/core/src/test/java/org/apache/accumulo/core/client/mock/MockConnectorTest.java
index 4a78a4b..b70cb00 100644
--- a/core/src/test/java/org/apache/accumulo/core/client/mock/MockConnectorTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/client/mock/MockConnectorTest.java
@@ -125,7 +125,7 @@ public class MockConnectorTest {
 
     Mutation good = new Mutation("good");
     good.put(asText(random.nextInt()), asText(random.nextInt()), new Value("good".getBytes()));
-    List<Mutation> mutations = new ArrayList<Mutation>();
+    List<Mutation> mutations = new ArrayList<>();
     mutations.add(good);
     mutations.add(bad);
     try {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/client/mock/MockNamespacesTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/client/mock/MockNamespacesTest.java b/core/src/test/java/org/apache/accumulo/core/client/mock/MockNamespacesTest.java
index c1f39e2..ca12838 100644
--- a/core/src/test/java/org/apache/accumulo/core/client/mock/MockNamespacesTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/client/mock/MockNamespacesTest.java
@@ -248,7 +248,7 @@ public class MockNamespacesTest {
     conn.tableOperations().create(tableName);
 
     IteratorSetting setting = new IteratorSetting(250, iter, SimpleFilter.class.getName());
-    HashSet<IteratorScope> scope = new HashSet<IteratorScope>();
+    HashSet<IteratorScope> scope = new HashSet<>();
     scope.add(IteratorScope.scan);
     conn.namespaceOperations().attachIterator(namespace, setting, EnumSet.copyOf(scope));
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/client/mock/MockTableOperationsTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/client/mock/MockTableOperationsTest.java b/core/src/test/java/org/apache/accumulo/core/client/mock/MockTableOperationsTest.java
index 9bd1455..58f3777 100644
--- a/core/src/test/java/org/apache/accumulo/core/client/mock/MockTableOperationsTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/client/mock/MockTableOperationsTest.java
@@ -228,9 +228,9 @@ public class MockTableOperationsTest {
     FileSKVWriter writer = FileOperations.getInstance().newWriterBuilder().forFile(tempFile.toString(), fs, defaultConf)
         .withTableConfiguration(AccumuloConfiguration.getDefaultConfiguration()).build();
     writer.startDefaultLocalityGroup();
-    List<Pair<Key,Value>> keyVals = new ArrayList<Pair<Key,Value>>();
+    List<Pair<Key,Value>> keyVals = new ArrayList<>();
     for (int i = 0; i < 5; i++) {
-      keyVals.add(new Pair<Key,Value>(new Key("a" + i, "b" + i, "c" + i, new ColumnVisibility(""), 1000l + i), new Value(Integer.toString(i).getBytes())));
+      keyVals.add(new Pair<>(new Key("a" + i, "b" + i, "c" + i, new ColumnVisibility(""), 1000l + i), new Value(Integer.toString(i).getBytes())));
     }
     for (Pair<Key,Value> keyVal : keyVals) {
       writer.append(keyVal.getFirst(), keyVal.getSecond());

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/client/security/SecurityErrorCodeTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/client/security/SecurityErrorCodeTest.java b/core/src/test/java/org/apache/accumulo/core/client/security/SecurityErrorCodeTest.java
index 75d4c35..8843e3a 100644
--- a/core/src/test/java/org/apache/accumulo/core/client/security/SecurityErrorCodeTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/client/security/SecurityErrorCodeTest.java
@@ -28,8 +28,8 @@ public class SecurityErrorCodeTest {
 
   @Test
   public void testEnumsSame() {
-    HashSet<String> secNames1 = new HashSet<String>();
-    HashSet<String> secNames2 = new HashSet<String>();
+    HashSet<String> secNames1 = new HashSet<>();
+    HashSet<String> secNames2 = new HashSet<>();
 
     for (SecurityErrorCode sec : SecurityErrorCode.values())
       secNames1.add(sec.name());

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/conf/ConfigSanityCheckTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/conf/ConfigSanityCheckTest.java b/core/src/test/java/org/apache/accumulo/core/conf/ConfigSanityCheckTest.java
index f34bf3b..7ac2113 100644
--- a/core/src/test/java/org/apache/accumulo/core/conf/ConfigSanityCheckTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/conf/ConfigSanityCheckTest.java
@@ -27,7 +27,7 @@ public class ConfigSanityCheckTest {
 
   @Before
   public void setUp() {
-    m = new java.util.HashMap<String,String>();
+    m = new java.util.HashMap<>();
   }
 
   @Test

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/conf/CredentialProviderFactoryShimTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/conf/CredentialProviderFactoryShimTest.java b/core/src/test/java/org/apache/accumulo/core/conf/CredentialProviderFactoryShimTest.java
index 37dff20..e540b72 100644
--- a/core/src/test/java/org/apache/accumulo/core/conf/CredentialProviderFactoryShimTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/conf/CredentialProviderFactoryShimTest.java
@@ -83,7 +83,7 @@ public class CredentialProviderFactoryShimTest {
     List<String> keys = CredentialProviderFactoryShim.getKeys(conf);
     Assert.assertNotNull(keys);
 
-    Assert.assertEquals(expectation.keySet(), new HashSet<String>(keys));
+    Assert.assertEquals(expectation.keySet(), new HashSet<>(keys));
     for (String expectedKey : keys) {
       char[] value = CredentialProviderFactoryShim.getValueFromCredentialProvider(conf, expectedKey);
       Assert.assertNotNull(value);
@@ -96,7 +96,7 @@ public class CredentialProviderFactoryShimTest {
     String absPath = getKeyStoreUrl(populatedKeyStore);
     Configuration conf = new Configuration();
     conf.set(CredentialProviderFactoryShim.CREDENTIAL_PROVIDER_PATH, absPath);
-    Map<String,String> expectations = new HashMap<String,String>();
+    Map<String,String> expectations = new HashMap<>();
     expectations.put("key1", "value1");
     expectations.put("key2", "value2");
 
@@ -117,7 +117,7 @@ public class CredentialProviderFactoryShimTest {
     String populatedAbsPath = getKeyStoreUrl(populatedKeyStore), emptyAbsPath = getKeyStoreUrl(emptyKeyStore);
     Configuration conf = new Configuration();
     conf.set(CredentialProviderFactoryShim.CREDENTIAL_PROVIDER_PATH, populatedAbsPath + "," + emptyAbsPath);
-    Map<String,String> expectations = new HashMap<String,String>();
+    Map<String,String> expectations = new HashMap<>();
     expectations.put("key1", "value1");
     expectations.put("key2", "value2");
 
@@ -186,7 +186,7 @@ public class CredentialProviderFactoryShimTest {
       Configuration cpConf = CredentialProviderFactoryShim.getConfiguration(dfsConfiguration, "jceks://hdfs/accumulo.jceks");
 
       // The values in the keystore
-      Map<String,String> expectations = new HashMap<String,String>();
+      Map<String,String> expectations = new HashMap<>();
       expectations.put("key1", "value1");
       expectations.put("key2", "value2");
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/conf/DefaultConfigurationTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/conf/DefaultConfigurationTest.java b/core/src/test/java/org/apache/accumulo/core/conf/DefaultConfigurationTest.java
index 9566f2e..cb6810c 100644
--- a/core/src/test/java/org/apache/accumulo/core/conf/DefaultConfigurationTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/conf/DefaultConfigurationTest.java
@@ -42,7 +42,7 @@ public class DefaultConfigurationTest {
   @Test
   public void testGetProperties() {
     Predicate<String> all = Predicates.alwaysTrue();
-    Map<String,String> p = new java.util.HashMap<String,String>();
+    Map<String,String> p = new java.util.HashMap<>();
     c.getProperties(p, all);
     assertEquals(Property.MASTER_CLIENTPORT.getDefaultValue(), p.get(Property.MASTER_CLIENTPORT.getKey()));
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/conf/PropertyTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/conf/PropertyTest.java b/core/src/test/java/org/apache/accumulo/core/conf/PropertyTest.java
index 297f5f8..79f2f21 100644
--- a/core/src/test/java/org/apache/accumulo/core/conf/PropertyTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/conf/PropertyTest.java
@@ -36,12 +36,12 @@ import org.junit.Test;
 public class PropertyTest {
   @Test
   public void testProperties() {
-    HashSet<String> validPrefixes = new HashSet<String>();
+    HashSet<String> validPrefixes = new HashSet<>();
     for (Property prop : Property.values())
       if (prop.getType().equals(PropertyType.PREFIX))
         validPrefixes.add(prop.getKey());
 
-    HashSet<String> propertyNames = new HashSet<String>();
+    HashSet<String> propertyNames = new HashSet<>();
     for (Property prop : Property.values()) {
       // make sure properties default values match their type
       if (prop.getType() == PropertyType.PREFIX) {
@@ -72,7 +72,7 @@ public class PropertyTest {
 
   @Test
   public void testPorts() {
-    HashSet<Integer> usedPorts = new HashSet<Integer>();
+    HashSet<Integer> usedPorts = new HashSet<>();
     for (Property prop : Property.values())
       if (prop.getType().equals(PropertyType.PORT)) {
         int port = Integer.parseInt(prop.getDefaultValue());
@@ -98,7 +98,7 @@ public class PropertyTest {
 
   @Test
   public void testSensitiveKeys() {
-    final TreeMap<String,String> extras = new TreeMap<String,String>();
+    final TreeMap<String,String> extras = new TreeMap<>();
     extras.put("trace.token.property.blah", "something");
 
     AccumuloConfiguration conf = new DefaultConfiguration() {
@@ -126,14 +126,14 @@ public class PropertyTest {
         };
       }
     };
-    TreeSet<String> expected = new TreeSet<String>();
+    TreeSet<String> expected = new TreeSet<>();
     for (Entry<String,String> entry : conf) {
       String key = entry.getKey();
       if (key.equals(Property.INSTANCE_SECRET.getKey()) || key.toLowerCase().contains("password") || key.toLowerCase().endsWith("secret")
           || key.startsWith(Property.TRACE_TOKEN_PROPERTY_PREFIX.getKey()))
         expected.add(key);
     }
-    TreeSet<String> actual = new TreeSet<String>();
+    TreeSet<String> actual = new TreeSet<>();
     for (Entry<String,String> entry : conf) {
       String key = entry.getKey();
       if (Property.isSensitive(key))

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/conf/SiteConfigurationTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/conf/SiteConfigurationTest.java b/core/src/test/java/org/apache/accumulo/core/conf/SiteConfigurationTest.java
index a0d48b9..f89dbfa 100644
--- a/core/src/test/java/org/apache/accumulo/core/conf/SiteConfigurationTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/conf/SiteConfigurationTest.java
@@ -66,7 +66,7 @@ public class SiteConfigurationTest {
 
     EasyMock.replay(siteCfg);
 
-    Map<String,String> props = new HashMap<String,String>();
+    Map<String,String> props = new HashMap<>();
     Predicate<String> all = Predicates.alwaysTrue();
     siteCfg.getProperties(props, all);
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/data/KeyExtentTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/data/KeyExtentTest.java b/core/src/test/java/org/apache/accumulo/core/data/KeyExtentTest.java
index 724bfee..79968be 100644
--- a/core/src/test/java/org/apache/accumulo/core/data/KeyExtentTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/data/KeyExtentTest.java
@@ -52,7 +52,7 @@ public class KeyExtentTest {
 
   @Before
   public void setup() {
-    set0 = new TreeSet<KeyExtent>();
+    set0 = new TreeSet<>();
   }
 
   @Test
@@ -90,7 +90,7 @@ public class KeyExtentTest {
     assertNull(KeyExtent.findContainingExtent(nke("t", "1", null), set0));
     assertNull(KeyExtent.findContainingExtent(nke("t", null, "0"), set0));
 
-    TreeSet<KeyExtent> set1 = new TreeSet<KeyExtent>();
+    TreeSet<KeyExtent> set1 = new TreeSet<>();
 
     set1.add(nke("t", null, null));
 
@@ -99,7 +99,7 @@ public class KeyExtentTest {
     assertEquals(nke("t", null, null), KeyExtent.findContainingExtent(nke("t", "1", null), set1));
     assertEquals(nke("t", null, null), KeyExtent.findContainingExtent(nke("t", null, "0"), set1));
 
-    TreeSet<KeyExtent> set2 = new TreeSet<KeyExtent>();
+    TreeSet<KeyExtent> set2 = new TreeSet<>();
 
     set2.add(nke("t", "g", null));
     set2.add(nke("t", null, "g"));
@@ -123,7 +123,7 @@ public class KeyExtentTest {
     assertEquals(nke("t", null, "g"), KeyExtent.findContainingExtent(nke("t", "z", "h"), set2));
     assertEquals(nke("t", null, "g"), KeyExtent.findContainingExtent(nke("t", null, "h"), set2));
 
-    TreeSet<KeyExtent> set3 = new TreeSet<KeyExtent>();
+    TreeSet<KeyExtent> set3 = new TreeSet<>();
 
     set3.add(nke("t", "g", null));
     set3.add(nke("t", "s", "g"));
@@ -149,7 +149,7 @@ public class KeyExtentTest {
     assertEquals(nke("t", "g", null), KeyExtent.findContainingExtent(nke("t", "f", null), set3));
     assertNull(KeyExtent.findContainingExtent(nke("t", "h", null), set3));
 
-    TreeSet<KeyExtent> set4 = new TreeSet<KeyExtent>();
+    TreeSet<KeyExtent> set4 = new TreeSet<>();
 
     set4.add(nke("t1", "d", null));
     set4.add(nke("t1", "q", "d"));
@@ -185,14 +185,14 @@ public class KeyExtentTest {
 
   @Test
   public void testOverlaps() {
-    SortedMap<KeyExtent,Object> set0 = new TreeMap<KeyExtent,Object>();
+    SortedMap<KeyExtent,Object> set0 = new TreeMap<>();
     set0.put(nke("a", null, null), null);
 
     // Nothing overlaps with the empty set
     assertFalse(overlaps(nke("t", null, null), null));
     assertFalse(overlaps(nke("t", null, null), set0));
 
-    SortedMap<KeyExtent,Object> set1 = new TreeMap<KeyExtent,Object>();
+    SortedMap<KeyExtent,Object> set1 = new TreeMap<>();
 
     // Everything overlaps with the infinite range
     set1.put(nke("t", null, null), null);
@@ -206,7 +206,7 @@ public class KeyExtentTest {
     assertTrue(overlaps(nke("t", null, "a"), set1));
 
     // simple overlaps
-    SortedMap<KeyExtent,Object> set2 = new TreeMap<KeyExtent,Object>();
+    SortedMap<KeyExtent,Object> set2 = new TreeMap<>();
     set2.put(nke("a", null, null), null);
     set2.put(nke("t", "m", "j"), null);
     set2.put(nke("z", null, null), null);
@@ -225,7 +225,7 @@ public class KeyExtentTest {
     assertFalse(overlaps(nke("t", null, "m"), set2));
 
     // infinite overlaps
-    SortedMap<KeyExtent,Object> set3 = new TreeMap<KeyExtent,Object>();
+    SortedMap<KeyExtent,Object> set3 = new TreeMap<>();
     set3.put(nke("t", "j", null), null);
     set3.put(nke("t", null, "m"), null);
     assertTrue(overlaps(nke("t", "k", "a"), set3));
@@ -237,7 +237,7 @@ public class KeyExtentTest {
     // falls between
     assertFalse(overlaps(nke("t", "l", "k"), set3));
 
-    SortedMap<KeyExtent,Object> set4 = new TreeMap<KeyExtent,Object>();
+    SortedMap<KeyExtent,Object> set4 = new TreeMap<>();
     set4.put(nke("t", null, null), null);
     assertTrue(overlaps(nke("t", "k", "a"), set4));
     assertTrue(overlaps(nke("t", "k", null), set4));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/data/KeyTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/data/KeyTest.java b/core/src/test/java/org/apache/accumulo/core/data/KeyTest.java
index 9cee691..c94c6b4 100644
--- a/core/src/test/java/org/apache/accumulo/core/data/KeyTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/data/KeyTest.java
@@ -141,7 +141,7 @@ public class KeyTest {
 
   @Test
   public void testCompressDecompress() {
-    List<KeyValue> kvs = new ArrayList<KeyValue>();
+    List<KeyValue> kvs = new ArrayList<>();
     kvs.add(new KeyValue(new Key(), new byte[] {}));
     kvs.add(new KeyValue(new Key("r"), new byte[] {}));
     kvs.add(new KeyValue(new Key("r", "cf"), new byte[] {}));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/data/OldMutation.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/data/OldMutation.java b/core/src/test/java/org/apache/accumulo/core/data/OldMutation.java
index a40f4e0..5e7d7bd 100644
--- a/core/src/test/java/org/apache/accumulo/core/data/OldMutation.java
+++ b/core/src/test/java/org/apache/accumulo/core/data/OldMutation.java
@@ -221,7 +221,7 @@ public class OldMutation implements Writable {
       put(val);
     } else {
       if (values == null)
-        values = new ArrayList<byte[]>();
+        values = new ArrayList<>();
       byte copy[] = new byte[val.length];
       System.arraycopy(val, 0, copy, 0, val.length);
       values.add(copy);
@@ -428,7 +428,7 @@ public class OldMutation implements Writable {
     if (!valuesPresent) {
       values = null;
     } else {
-      values = new ArrayList<byte[]>();
+      values = new ArrayList<>();
       int numValues = in.readInt();
       for (int i = 0; i < numValues; i++) {
         len = in.readInt();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/data/RangeTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/data/RangeTest.java b/core/src/test/java/org/apache/accumulo/core/data/RangeTest.java
index 2641ef1..c4837fe 100644
--- a/core/src/test/java/org/apache/accumulo/core/data/RangeTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/data/RangeTest.java
@@ -49,8 +49,8 @@ public class RangeTest extends TestCase {
   }
 
   private void check(List<Range> rl, List<Range> expected) {
-    HashSet<Range> s1 = new HashSet<Range>(rl);
-    HashSet<Range> s2 = new HashSet<Range>(expected);
+    HashSet<Range> s1 = new HashSet<>(rl);
+    HashSet<Range> s2 = new HashSet<>(expected);
 
     assertTrue("got : " + rl + " expected : " + expected, s1.equals(s2));
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/data/ValueTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/data/ValueTest.java b/core/src/test/java/org/apache/accumulo/core/data/ValueTest.java
index 0cae140..93fab1f 100644
--- a/core/src/test/java/org/apache/accumulo/core/data/ValueTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/data/ValueTest.java
@@ -202,7 +202,7 @@ public class ValueTest {
   @Test
   @Deprecated
   public void testToArray() {
-    List<byte[]> l = new java.util.ArrayList<byte[]>();
+    List<byte[]> l = new java.util.ArrayList<>();
     byte[] one = toBytes("one");
     byte[] two = toBytes("two");
     byte[] three = toBytes("three");

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/file/BloomFilterLayerLookupTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/file/BloomFilterLayerLookupTest.java b/core/src/test/java/org/apache/accumulo/core/file/BloomFilterLayerLookupTest.java
index 5470722..065438c 100644
--- a/core/src/test/java/org/apache/accumulo/core/file/BloomFilterLayerLookupTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/file/BloomFilterLayerLookupTest.java
@@ -59,12 +59,12 @@ public class BloomFilterLayerLookupTest {
 
   @Test
   public void test() throws IOException {
-    HashSet<Integer> valsSet = new HashSet<Integer>();
+    HashSet<Integer> valsSet = new HashSet<>();
     for (int i = 0; i < 100000; i++) {
       valsSet.add(random.nextInt(Integer.MAX_VALUE));
     }
 
-    ArrayList<Integer> vals = new ArrayList<Integer>(valsSet);
+    ArrayList<Integer> vals = new ArrayList<>(valsSet);
     Collections.sort(vals);
 
     ConfigurationCopy acuconf = new ConfigurationCopy(AccumuloConfiguration.getDefaultConfiguration());

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/file/rfile/CreateCompatTestFile.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/file/rfile/CreateCompatTestFile.java b/core/src/test/java/org/apache/accumulo/core/file/rfile/CreateCompatTestFile.java
index ad29a69..e7c8b46 100644
--- a/core/src/test/java/org/apache/accumulo/core/file/rfile/CreateCompatTestFile.java
+++ b/core/src/test/java/org/apache/accumulo/core/file/rfile/CreateCompatTestFile.java
@@ -32,7 +32,7 @@ import org.apache.hadoop.fs.Path;
 public class CreateCompatTestFile {
 
   public static Set<ByteSequence> ncfs(String... colFams) {
-    HashSet<ByteSequence> cfs = new HashSet<ByteSequence>();
+    HashSet<ByteSequence> cfs = new HashSet<>();
 
     for (String cf : colFams) {
       cfs.add(new ArrayByteSequence(cf));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/file/rfile/RFileTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/file/rfile/RFileTest.java b/core/src/test/java/org/apache/accumulo/core/file/rfile/RFileTest.java
index a60dfa4..069077c 100644
--- a/core/src/test/java/org/apache/accumulo/core/file/rfile/RFileTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/file/rfile/RFileTest.java
@@ -110,7 +110,7 @@ public class RFileTest {
     }
   }
 
-  private static final Collection<ByteSequence> EMPTY_COL_FAMS = new ArrayList<ByteSequence>();
+  private static final Collection<ByteSequence> EMPTY_COL_FAMS = new ArrayList<>();
 
   @Rule
   public TemporaryFolder tempFolder = new TemporaryFolder(new File(System.getProperty("user.dir") + "/target"));
@@ -373,8 +373,8 @@ public class RFileTest {
 
     int val = 0;
 
-    ArrayList<Key> expectedKeys = new ArrayList<Key>(10000);
-    ArrayList<Value> expectedValues = new ArrayList<Value>(10000);
+    ArrayList<Key> expectedKeys = new ArrayList<>(10000);
+    ArrayList<Value> expectedValues = new ArrayList<>(10000);
 
     for (int row = 0; row < 4; row++) {
       String rowS = nf("r_", row);
@@ -797,7 +797,7 @@ public class RFileTest {
   }
 
   public static Set<ByteSequence> ncfs(String... colFams) {
-    HashSet<ByteSequence> cfs = new HashSet<ByteSequence>();
+    HashSet<ByteSequence> cfs = new HashSet<>();
 
     for (String cf : colFams) {
       cfs.add(new ArrayByteSequence(cf));
@@ -1394,7 +1394,7 @@ public class RFileTest {
   }
 
   private Set<ByteSequence> t18ncfs(int... colFams) {
-    HashSet<ByteSequence> cfs = new HashSet<ByteSequence>();
+    HashSet<ByteSequence> cfs = new HashSet<>();
     for (int i : colFams) {
       cfs.add(new ArrayByteSequence(t18ncf(i)));
     }
@@ -1411,7 +1411,7 @@ public class RFileTest {
   private void t18Verify(Set<ByteSequence> cfs, SortedKeyValueIterator<Key,Value> iter, Reader reader, HashSet<ByteSequence> allCf, int eialg, int eealg)
       throws IOException {
 
-    HashSet<ByteSequence> colFamsSeen = new HashSet<ByteSequence>();
+    HashSet<ByteSequence> colFamsSeen = new HashSet<>();
 
     iter.seek(new Range(), cfs, true);
     assertEquals(eialg, reader.getNumLocalityGroupsSeeked());
@@ -1421,7 +1421,7 @@ public class RFileTest {
       iter.next();
     }
 
-    HashSet<ByteSequence> expected = new HashSet<ByteSequence>(allCf);
+    HashSet<ByteSequence> expected = new HashSet<>(allCf);
     expected.retainAll(cfs);
     assertEquals(expected, colFamsSeen);
 
@@ -1434,7 +1434,7 @@ public class RFileTest {
       iter.next();
     }
 
-    HashSet<ByteSequence> nonExcluded = new HashSet<ByteSequence>(allCf);
+    HashSet<ByteSequence> nonExcluded = new HashSet<>(allCf);
     nonExcluded.removeAll(cfs);
     assertEquals(nonExcluded, colFamsSeen);
   }
@@ -1447,7 +1447,7 @@ public class RFileTest {
 
     trf.openWriter(false);
 
-    HashSet<ByteSequence> allCf = new HashSet<ByteSequence>();
+    HashSet<ByteSequence> allCf = new HashSet<>();
 
     trf.writer.startNewLocalityGroup("lg1", t18ncfs(0));
     for (int i = 0; i < 1; i++)
@@ -1850,7 +1850,7 @@ public class RFileTest {
 
   private static void add(TestRFile trf, Key key, Value val, Hasher dataHasher, List<Entry<Key,Value>> sample, Sampler sampler) throws IOException {
     if (sampler.accept(key)) {
-      sample.add(new AbstractMap.SimpleImmutableEntry<Key,Value>(key, val));
+      sample.add(new AbstractMap.SimpleImmutableEntry<>(key, val));
     }
 
     hash(dataHasher, key, val);
@@ -1862,7 +1862,7 @@ public class RFileTest {
     ArrayList<Entry<Key,Value>> ret = new ArrayList<>();
 
     while (sample.hasTop()) {
-      ret.add(new AbstractMap.SimpleImmutableEntry<Key,Value>(new Key(sample.getTopKey()), new Value(sample.getTopValue())));
+      ret.add(new AbstractMap.SimpleImmutableEntry<>(new Key(sample.getTopKey()), new Value(sample.getTopValue())));
       sample.next();
     }
 
@@ -1929,7 +1929,7 @@ public class RFileTest {
 
       for (int modulus : new int[] {19, 103, 1019}) {
         Hasher dataHasher = Hashing.md5().newHasher();
-        List<Entry<Key,Value>> sampleData = new ArrayList<Entry<Key,Value>>();
+        List<Entry<Key,Value>> sampleData = new ArrayList<>();
 
         ConfigurationCopy sampleConf = new ConfigurationCopy(conf == null ? AccumuloConfiguration.getDefaultConfiguration() : conf);
         sampleConf.set(Property.TABLE_SAMPLER, RowSampler.class.getName());
@@ -2009,8 +2009,8 @@ public class RFileTest {
       RFile.setSampleBufferSize(sampleBufferSize);
 
       for (int modulus : new int[] {19, 103, 1019}) {
-        List<Entry<Key,Value>> sampleDataLG1 = new ArrayList<Entry<Key,Value>>();
-        List<Entry<Key,Value>> sampleDataLG2 = new ArrayList<Entry<Key,Value>>();
+        List<Entry<Key,Value>> sampleDataLG1 = new ArrayList<>();
+        List<Entry<Key,Value>> sampleDataLG2 = new ArrayList<>();
 
         ConfigurationCopy sampleConf = new ConfigurationCopy(conf == null ? AccumuloConfiguration.getDefaultConfiguration() : conf);
         sampleConf.set(Property.TABLE_SAMPLER, RowSampler.class.getName());
@@ -2035,9 +2035,9 @@ public class RFileTest {
           Value v3 = new Value(("" + r * 113).getBytes());
 
           if (sampler.accept(k1)) {
-            sampleDataLG1.add(new AbstractMap.SimpleImmutableEntry<Key,Value>(k1, v1));
-            sampleDataLG1.add(new AbstractMap.SimpleImmutableEntry<Key,Value>(k2, v2));
-            sampleDataLG1.add(new AbstractMap.SimpleImmutableEntry<Key,Value>(k3, v3));
+            sampleDataLG1.add(new AbstractMap.SimpleImmutableEntry<>(k1, v1));
+            sampleDataLG1.add(new AbstractMap.SimpleImmutableEntry<>(k2, v2));
+            sampleDataLG1.add(new AbstractMap.SimpleImmutableEntry<>(k3, v3));
           }
 
           trf.writer.append(k1, v1);
@@ -2054,7 +2054,7 @@ public class RFileTest {
           Value v1 = new Value(("" + r).getBytes());
 
           if (sampler.accept(k1)) {
-            sampleDataLG2.add(new AbstractMap.SimpleImmutableEntry<Key,Value>(k1, v1));
+            sampleDataLG2.add(new AbstractMap.SimpleImmutableEntry<>(k1, v1));
           }
 
           trf.writer.append(k1, v1);
@@ -2076,7 +2076,7 @@ public class RFileTest {
         checkSample(sample, sampleDataLG2, ncfs("metaA", "metaB"), false);
         checkSample(sample, sampleDataLG2, ncfs("dataA"), true);
 
-        ArrayList<Entry<Key,Value>> allSampleData = new ArrayList<Entry<Key,Value>>();
+        ArrayList<Entry<Key,Value>> allSampleData = new ArrayList<>();
         allSampleData.addAll(sampleDataLG1);
         allSampleData.addAll(sampleDataLG2);
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/file/rfile/RelativeKeyTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/file/rfile/RelativeKeyTest.java b/core/src/test/java/org/apache/accumulo/core/file/rfile/RelativeKeyTest.java
index 4ca4b6c..4334ccc 100644
--- a/core/src/test/java/org/apache/accumulo/core/file/rfile/RelativeKeyTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/file/rfile/RelativeKeyTest.java
@@ -122,9 +122,9 @@ public class RelativeKeyTest {
     baos = new ByteArrayOutputStream();
     DataOutputStream out = new DataOutputStream(baos);
 
-    expectedKeys = new ArrayList<Key>(initialListSize);
-    expectedValues = new ArrayList<Value>(initialListSize);
-    expectedPositions = new ArrayList<Integer>(initialListSize);
+    expectedKeys = new ArrayList<>(initialListSize);
+    expectedValues = new ArrayList<>(initialListSize);
+    expectedPositions = new ArrayList<>(initialListSize);
 
     Key prev = null;
     int val = 0;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/iterators/AggregatingIteratorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/iterators/AggregatingIteratorTest.java b/core/src/test/java/org/apache/accumulo/core/iterators/AggregatingIteratorTest.java
index e39d0d5..09064a5 100644
--- a/core/src/test/java/org/apache/accumulo/core/iterators/AggregatingIteratorTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/iterators/AggregatingIteratorTest.java
@@ -39,7 +39,7 @@ import org.junit.Test;
 
 public class AggregatingIteratorTest {
 
-  private static final Collection<ByteSequence> EMPTY_COL_FAMS = new ArrayList<ByteSequence>();
+  private static final Collection<ByteSequence> EMPTY_COL_FAMS = new ArrayList<>();
 
   /**
    * @deprecated since 1.4; visible only for testing
@@ -101,7 +101,7 @@ public class AggregatingIteratorTest {
   @Test
   public void test1() throws IOException {
 
-    TreeMap<Key,Value> tm1 = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm1 = new TreeMap<>();
 
     // keys that do not aggregate
     nkv(tm1, 1, 1, 1, 1, false, "2");
@@ -162,7 +162,7 @@ public class AggregatingIteratorTest {
   @SuppressWarnings("deprecation")
   @Test
   public void test2() throws IOException {
-    TreeMap<Key,Value> tm1 = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm1 = new TreeMap<>();
 
     // keys that aggregate
     nkv(tm1, 1, 1, 1, 1, false, "2");
@@ -171,7 +171,7 @@ public class AggregatingIteratorTest {
 
     AggregatingIterator ai = new AggregatingIterator();
 
-    Map<String,String> opts = new HashMap<String,String>();
+    Map<String,String> opts = new HashMap<>();
 
     opts.put("cf001", SummationAggregator.class.getName());
 
@@ -224,7 +224,7 @@ public class AggregatingIteratorTest {
   @Test
   public void test3() throws IOException {
 
-    TreeMap<Key,Value> tm1 = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm1 = new TreeMap<>();
 
     // keys that aggregate
     nkv(tm1, 1, 1, 1, 1, false, "2");
@@ -237,7 +237,7 @@ public class AggregatingIteratorTest {
 
     AggregatingIterator ai = new AggregatingIterator();
 
-    Map<String,String> opts = new HashMap<String,String>();
+    Map<String,String> opts = new HashMap<>();
 
     opts.put("cf001", SummationAggregator.class.getName());
 
@@ -290,7 +290,7 @@ public class AggregatingIteratorTest {
   @Test
   public void test4() throws IOException {
 
-    TreeMap<Key,Value> tm1 = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm1 = new TreeMap<>();
 
     // keys that do not aggregate
     nkv(tm1, 0, 0, 1, 1, false, "7");
@@ -306,7 +306,7 @@ public class AggregatingIteratorTest {
 
     AggregatingIterator ai = new AggregatingIterator();
 
-    Map<String,String> opts = new HashMap<String,String>();
+    Map<String,String> opts = new HashMap<>();
 
     opts.put("cf001", SummationAggregator.class.getName());
 
@@ -367,20 +367,20 @@ public class AggregatingIteratorTest {
     // try aggregating across multiple data sets that contain
     // the exact same keys w/ different values
 
-    TreeMap<Key,Value> tm1 = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm1 = new TreeMap<>();
     nkv(tm1, 1, 1, 1, 1, false, "2");
 
-    TreeMap<Key,Value> tm2 = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm2 = new TreeMap<>();
     nkv(tm2, 1, 1, 1, 1, false, "3");
 
-    TreeMap<Key,Value> tm3 = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm3 = new TreeMap<>();
     nkv(tm3, 1, 1, 1, 1, false, "4");
 
     AggregatingIterator ai = new AggregatingIterator();
-    Map<String,String> opts = new HashMap<String,String>();
+    Map<String,String> opts = new HashMap<>();
     opts.put("cf001", SummationAggregator.class.getName());
 
-    List<SortedKeyValueIterator<Key,Value>> sources = new ArrayList<SortedKeyValueIterator<Key,Value>>(3);
+    List<SortedKeyValueIterator<Key,Value>> sources = new ArrayList<>(3);
     sources.add(new SortedMapIterator(tm1));
     sources.add(new SortedMapIterator(tm2));
     sources.add(new SortedMapIterator(tm3));
@@ -397,7 +397,7 @@ public class AggregatingIteratorTest {
   @SuppressWarnings("deprecation")
   @Test
   public void test6() throws IOException {
-    TreeMap<Key,Value> tm1 = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm1 = new TreeMap<>();
 
     // keys that aggregate
     nkv(tm1, 1, 1, 1, 1, false, "2");
@@ -406,7 +406,7 @@ public class AggregatingIteratorTest {
 
     AggregatingIterator ai = new AggregatingIterator();
 
-    Map<String,String> opts = new HashMap<String,String>();
+    Map<String,String> opts = new HashMap<>();
 
     opts.put("cf001", SummationAggregator.class.getName());
 
@@ -425,7 +425,7 @@ public class AggregatingIteratorTest {
   public void test7() throws IOException {
     // test that delete is not aggregated
 
-    TreeMap<Key,Value> tm1 = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm1 = new TreeMap<>();
 
     nkv(tm1, 1, 1, 1, 2, true, "");
     nkv(tm1, 1, 1, 1, 3, false, "4");
@@ -433,7 +433,7 @@ public class AggregatingIteratorTest {
 
     AggregatingIterator ai = new AggregatingIterator();
 
-    Map<String,String> opts = new HashMap<String,String>();
+    Map<String,String> opts = new HashMap<>();
 
     opts.put("cf001", SummationAggregator.class.getName());
 
@@ -453,7 +453,7 @@ public class AggregatingIteratorTest {
     ai.next();
     assertFalse(ai.hasTop());
 
-    tm1 = new TreeMap<Key,Value>();
+    tm1 = new TreeMap<>();
     nkv(tm1, 1, 1, 1, 2, true, "");
     ai = new AggregatingIterator();
     ai.init(new SortedMapIterator(tm1), opts, new DefaultIteratorEnvironment());

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/iterators/FirstEntryInRowIteratorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/iterators/FirstEntryInRowIteratorTest.java b/core/src/test/java/org/apache/accumulo/core/iterators/FirstEntryInRowIteratorTest.java
index 5455aa6..34b01bc 100644
--- a/core/src/test/java/org/apache/accumulo/core/iterators/FirstEntryInRowIteratorTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/iterators/FirstEntryInRowIteratorTest.java
@@ -51,12 +51,12 @@ public class FirstEntryInRowIteratorTest {
 
   @Test
   public void test() throws IOException {
-    TreeMap<Key,Value> sourceMap = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> sourceMap = new TreeMap<>();
     Value emptyValue = new Value("".getBytes());
     sourceMap.put(new Key("r1", "cf", "cq"), emptyValue);
     sourceMap.put(new Key("r2", "cf", "cq"), emptyValue);
     sourceMap.put(new Key("r3", "cf", "cq"), emptyValue);
-    TreeMap<Key,Value> resultMap = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> resultMap = new TreeMap<>();
     long numSourceEntries = sourceMap.size();
     long numNexts = process(sourceMap, resultMap, new Range(), 10);
     assertEquals(numNexts, numSourceEntries);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/iterators/FirstEntryInRowTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/iterators/FirstEntryInRowTest.java b/core/src/test/java/org/apache/accumulo/core/iterators/FirstEntryInRowTest.java
index 8214c2c..9a5174b 100644
--- a/core/src/test/java/org/apache/accumulo/core/iterators/FirstEntryInRowTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/iterators/FirstEntryInRowTest.java
@@ -34,8 +34,8 @@ import org.apache.hadoop.io.Text;
 import org.junit.Test;
 
 public class FirstEntryInRowTest {
-  private static final Map<String,String> EMPTY_MAP = new HashMap<String,String>();
-  private static final Collection<ByteSequence> EMPTY_SET = new HashSet<ByteSequence>();
+  private static final Map<String,String> EMPTY_MAP = new HashMap<>();
+  private static final Collection<ByteSequence> EMPTY_SET = new HashSet<>();
 
   private Key nk(String row, String cf, String cq, long time) {
     return new Key(new Text(row), new Text(cf), new Text(cq), time);
@@ -73,7 +73,7 @@ public class FirstEntryInRowTest {
 
   @Test
   public void test1() throws Exception {
-    TreeMap<Key,Value> tm1 = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm1 = new TreeMap<>();
     put(tm1, "r1", "cf1", "cq1", 5, "v1");
     put(tm1, "r1", "cf1", "cq3", 5, "v2");
     put(tm1, "r2", "cf1", "cq1", 5, "v3");
@@ -94,7 +94,7 @@ public class FirstEntryInRowTest {
 
   @Test
   public void test2() throws Exception {
-    TreeMap<Key,Value> tm1 = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm1 = new TreeMap<>();
 
     for (int r = 0; r < 5; r++) {
       for (int cf = r; cf < 100; cf++) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/iterators/IteratorUtilTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/iterators/IteratorUtilTest.java b/core/src/test/java/org/apache/accumulo/core/iterators/IteratorUtilTest.java
index 4c4303c..c9b9dcf 100644
--- a/core/src/test/java/org/apache/accumulo/core/iterators/IteratorUtilTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/iterators/IteratorUtilTest.java
@@ -45,7 +45,7 @@ import org.junit.Test;
 
 public class IteratorUtilTest {
 
-  private static final Collection<ByteSequence> EMPTY_COL_FAMS = new ArrayList<ByteSequence>();
+  private static final Collection<ByteSequence> EMPTY_COL_FAMS = new ArrayList<>();
 
   static class WrappedIter implements SortedKeyValueIterator<Key,Value> {
 
@@ -131,7 +131,7 @@ public class IteratorUtilTest {
     conf.set(Property.TABLE_ITERATOR_PREFIX + IteratorScope.minc.name() + ".addIter", "1," + AddingIter.class.getName());
     conf.set(Property.TABLE_ITERATOR_PREFIX + IteratorScope.minc.name() + ".sqIter", "2," + SquaringIter.class.getName());
 
-    TreeMap<Key,Value> tm = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm = new TreeMap<>();
 
     MultiIteratorTest.nkv(tm, 1, 0, false, "1");
     MultiIteratorTest.nkv(tm, 2, 0, false, "2");
@@ -163,7 +163,7 @@ public class IteratorUtilTest {
     // try loading for a different scope
     AccumuloConfiguration conf = new ConfigurationCopy();
 
-    TreeMap<Key,Value> tm = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm = new TreeMap<>();
 
     MultiIteratorTest.nkv(tm, 1, 0, false, "1");
     MultiIteratorTest.nkv(tm, 2, 0, false, "2");
@@ -196,7 +196,7 @@ public class IteratorUtilTest {
 
     ConfigurationCopy conf = new ConfigurationCopy();
 
-    TreeMap<Key,Value> tm = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm = new TreeMap<>();
 
     MultiIteratorTest.nkv(tm, 1, 0, false, "1");
     MultiIteratorTest.nkv(tm, 2, 0, false, "2");
@@ -235,7 +235,7 @@ public class IteratorUtilTest {
     conf.set(Property.TABLE_ITERATOR_PREFIX + IteratorScope.minc.name() + ".addIter.opt.amount", "7");
     conf.set(Property.TABLE_ITERATOR_PREFIX + IteratorScope.minc.name() + ".sqIter", "2," + SquaringIter.class.getName());
 
-    TreeMap<Key,Value> tm = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm = new TreeMap<>();
 
     MultiIteratorTest.nkv(tm, 1, 0, false, "1");
     MultiIteratorTest.nkv(tm, 2, 0, false, "2");
@@ -271,7 +271,7 @@ public class IteratorUtilTest {
     conf.set(Property.TABLE_ITERATOR_PREFIX + IteratorScope.minc.name() + ".filter.opt.ttl", "100");
     conf.set(Property.TABLE_ITERATOR_PREFIX + IteratorScope.minc.name() + ".filter.opt.currentTime", "1000");
 
-    TreeMap<Key,Value> tm = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm = new TreeMap<>();
 
     MultiIteratorTest.nkv(tm, 1, 850, false, "1");
     MultiIteratorTest.nkv(tm, 2, 950, false, "2");
@@ -292,7 +292,7 @@ public class IteratorUtilTest {
 
   @Test
   public void onlyReadsRelevantIteratorScopeConfigurations() throws Exception {
-    Map<String,String> data = new HashMap<String,String>();
+    Map<String,String> data = new HashMap<>();
 
     // Make some configuration items, one with a bogus scope
     data.put(Property.TABLE_ITERATOR_SCAN_PREFIX + "foo", "50," + SummingCombiner.class.getName());
@@ -302,8 +302,8 @@ public class IteratorUtilTest {
 
     AccumuloConfiguration conf = new ConfigurationCopy(data);
 
-    List<IterInfo> iterators = new ArrayList<IterInfo>();
-    Map<String,Map<String,String>> options = new HashMap<String,Map<String,String>>();
+    List<IterInfo> iterators = new ArrayList<>();
+    Map<String,Map<String,String>> options = new HashMap<>();
 
     IteratorUtil.parseIterConf(IteratorScope.scan, iterators, options, conf);
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/iterators/system/ColumnFamilySkippingIteratorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/iterators/system/ColumnFamilySkippingIteratorTest.java b/core/src/test/java/org/apache/accumulo/core/iterators/system/ColumnFamilySkippingIteratorTest.java
index fbe7fd5..33c398f 100644
--- a/core/src/test/java/org/apache/accumulo/core/iterators/system/ColumnFamilySkippingIteratorTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/iterators/system/ColumnFamilySkippingIteratorTest.java
@@ -32,7 +32,7 @@ import org.apache.hadoop.io.Text;
 
 public class ColumnFamilySkippingIteratorTest extends TestCase {
 
-  private static final Collection<ByteSequence> EMPTY_SET = new HashSet<ByteSequence>();
+  private static final Collection<ByteSequence> EMPTY_SET = new HashSet<>();
 
   Key nk(String row, String cf, String cq, long time) {
     return new Key(new Text(row), new Text(cf), new Text(cq), time);
@@ -62,7 +62,7 @@ public class ColumnFamilySkippingIteratorTest extends TestCase {
   }
 
   public void test1() throws Exception {
-    TreeMap<Key,Value> tm1 = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm1 = new TreeMap<>();
     put(tm1, "r1", "cf1", "cq1", 5, "v1");
     put(tm1, "r1", "cf1", "cq3", 5, "v2");
     put(tm1, "r2", "cf1", "cq1", 5, "v3");
@@ -77,14 +77,14 @@ public class ColumnFamilySkippingIteratorTest extends TestCase {
 
     cfi.seek(new Range(), EMPTY_SET, false);
     assertTrue(cfi.hasTop());
-    TreeMap<Key,Value> tm2 = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm2 = new TreeMap<>();
     while (cfi.hasTop()) {
       tm2.put(cfi.getTopKey(), cfi.getTopValue());
       cfi.next();
     }
     assertEquals(tm1, tm2);
 
-    HashSet<ByteSequence> colfams = new HashSet<ByteSequence>();
+    HashSet<ByteSequence> colfams = new HashSet<>();
     colfams.add(new ArrayByteSequence("cf2"));
     cfi.seek(new Range(), colfams, true);
     aten(cfi, "r2", "cf2", "cq4", 5, "v4");
@@ -108,7 +108,7 @@ public class ColumnFamilySkippingIteratorTest extends TestCase {
   }
 
   public void test2() throws Exception {
-    TreeMap<Key,Value> tm1 = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm1 = new TreeMap<>();
 
     for (int r = 0; r < 10; r++) {
       for (int cf = 0; cf < 1000; cf++) {
@@ -118,13 +118,13 @@ public class ColumnFamilySkippingIteratorTest extends TestCase {
       }
     }
 
-    HashSet<ByteSequence> allColfams = new HashSet<ByteSequence>();
+    HashSet<ByteSequence> allColfams = new HashSet<>();
     for (int cf = 0; cf < 1000; cf++) {
       allColfams.add(new ArrayByteSequence(String.format("%06d", cf)));
     }
 
     ColumnFamilySkippingIterator cfi = new ColumnFamilySkippingIterator(new SortedMapIterator(tm1));
-    HashSet<ByteSequence> colfams = new HashSet<ByteSequence>();
+    HashSet<ByteSequence> colfams = new HashSet<>();
 
     runTest(cfi, 30000, 0, allColfams, colfams);
 
@@ -162,11 +162,11 @@ public class ColumnFamilySkippingIteratorTest extends TestCase {
   private void runTest(ColumnFamilySkippingIterator cfi, int total, int expected, HashSet<ByteSequence> allColfams, HashSet<ByteSequence> colfams)
       throws Exception {
     cfi.seek(new Range(), colfams, true);
-    HashSet<ByteSequence> excpected1 = new HashSet<ByteSequence>(colfams);
+    HashSet<ByteSequence> excpected1 = new HashSet<>(colfams);
     excpected1.retainAll(allColfams);
     runTest(cfi, expected, excpected1);
 
-    HashSet<ByteSequence> excpected2 = new HashSet<ByteSequence>(allColfams);
+    HashSet<ByteSequence> excpected2 = new HashSet<>(allColfams);
     excpected2.removeAll(colfams);
     cfi.seek(new Range(), colfams, false);
     runTest(cfi, total - expected, excpected2);
@@ -175,7 +175,7 @@ public class ColumnFamilySkippingIteratorTest extends TestCase {
   private void runTest(ColumnFamilySkippingIterator cfi, int expected, HashSet<ByteSequence> colfams) throws Exception {
     int count = 0;
 
-    HashSet<ByteSequence> ocf = new HashSet<ByteSequence>();
+    HashSet<ByteSequence> ocf = new HashSet<>();
 
     while (cfi.hasTop()) {
       count++;
@@ -189,7 +189,7 @@ public class ColumnFamilySkippingIteratorTest extends TestCase {
 
   public void test3() throws Exception {
     // construct test where ColumnFamilySkippingIterator might try to seek past the end of the user supplied range
-    TreeMap<Key,Value> tm1 = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm1 = new TreeMap<>();
 
     for (int r = 0; r < 3; r++) {
       for (int cf = 4; cf < 1000; cf++) {
@@ -201,7 +201,7 @@ public class ColumnFamilySkippingIteratorTest extends TestCase {
 
     CountingIterator ci = new CountingIterator(new SortedMapIterator(tm1));
     ColumnFamilySkippingIterator cfi = new ColumnFamilySkippingIterator(ci);
-    HashSet<ByteSequence> colfams = new HashSet<ByteSequence>();
+    HashSet<ByteSequence> colfams = new HashSet<>();
     colfams.add(new ArrayByteSequence(String.format("%06d", 4)));
 
     Range range = new Range(nk(0, 4, 0, 6), true, nk(0, 400, 0, 6), true);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/iterators/system/ColumnFilterTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/iterators/system/ColumnFilterTest.java b/core/src/test/java/org/apache/accumulo/core/iterators/system/ColumnFilterTest.java
index 3fd66b4..cfed90f 100644
--- a/core/src/test/java/org/apache/accumulo/core/iterators/system/ColumnFilterTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/iterators/system/ColumnFilterTest.java
@@ -40,7 +40,7 @@ public class ColumnFilterTest extends TestCase {
   }
 
   public void test1() {
-    HashSet<Column> columns = new HashSet<Column>();
+    HashSet<Column> columns = new HashSet<>();
 
     columns.add(nc("cf1"));
 
@@ -52,7 +52,7 @@ public class ColumnFilterTest extends TestCase {
   }
 
   public void test2() {
-    HashSet<Column> columns = new HashSet<Column>();
+    HashSet<Column> columns = new HashSet<>();
 
     columns.add(nc("cf1"));
     columns.add(nc("cf2", "cq1"));
@@ -65,7 +65,7 @@ public class ColumnFilterTest extends TestCase {
   }
 
   public void test3() {
-    HashSet<Column> columns = new HashSet<Column>();
+    HashSet<Column> columns = new HashSet<>();
 
     columns.add(nc("cf2", "cq1"));
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/iterators/system/DeletingIteratorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/iterators/system/DeletingIteratorTest.java b/core/src/test/java/org/apache/accumulo/core/iterators/system/DeletingIteratorTest.java
index 4fd48d5..9082a36 100644
--- a/core/src/test/java/org/apache/accumulo/core/iterators/system/DeletingIteratorTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/iterators/system/DeletingIteratorTest.java
@@ -33,7 +33,7 @@ import org.apache.hadoop.io.Text;
 
 public class DeletingIteratorTest extends TestCase {
 
-  private static final Collection<ByteSequence> EMPTY_COL_FAMS = new ArrayList<ByteSequence>();
+  private static final Collection<ByteSequence> EMPTY_COL_FAMS = new ArrayList<>();
 
   public void test1() {
     Text colf = new Text("a");
@@ -42,7 +42,7 @@ public class DeletingIteratorTest extends TestCase {
     Value dvDel = new Value("old".getBytes());
     Value dvNew = new Value("new".getBytes());
 
-    TreeMap<Key,Value> tm = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm = new TreeMap<>();
     Key k;
 
     for (int i = 0; i < 2; i++) {
@@ -67,7 +67,7 @@ public class DeletingIteratorTest extends TestCase {
       DeletingIterator it = new DeletingIterator(new SortedMapIterator(tm), false);
       it.seek(new Range(), EMPTY_COL_FAMS, false);
 
-      TreeMap<Key,Value> tmOut = new TreeMap<Key,Value>();
+      TreeMap<Key,Value> tmOut = new TreeMap<>();
       while (it.hasTop()) {
         tmOut.put(it.getTopKey(), it.getTopValue());
         it.next();
@@ -88,7 +88,7 @@ public class DeletingIteratorTest extends TestCase {
     try {
       DeletingIterator it = new DeletingIterator(new SortedMapIterator(tm), true);
       it.seek(new Range(), EMPTY_COL_FAMS, false);
-      TreeMap<Key,Value> tmOut = new TreeMap<Key,Value>();
+      TreeMap<Key,Value> tmOut = new TreeMap<>();
       while (it.hasTop()) {
         tmOut.put(it.getTopKey(), it.getTopValue());
         it.next();
@@ -115,7 +115,7 @@ public class DeletingIteratorTest extends TestCase {
 
   // seek test
   public void test2() throws IOException {
-    TreeMap<Key,Value> tm = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm = new TreeMap<>();
 
     nkv(tm, "r000", 4, false, "v4");
     nkv(tm, "r000", 3, false, "v3");
@@ -165,7 +165,7 @@ public class DeletingIteratorTest extends TestCase {
 
   // test delete with same timestamp as existing key
   public void test3() throws IOException {
-    TreeMap<Key,Value> tm = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm = new TreeMap<>();
 
     nkv(tm, "r000", 3, false, "v3");
     nkv(tm, "r000", 2, false, "v2");
@@ -190,7 +190,7 @@ public class DeletingIteratorTest extends TestCase {
 
   // test range inclusiveness
   public void test4() throws IOException {
-    TreeMap<Key,Value> tm = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm = new TreeMap<>();
 
     nkv(tm, "r000", 3, false, "v3");
     nkv(tm, "r000", 2, false, "v2");

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/iterators/system/MultiIteratorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/iterators/system/MultiIteratorTest.java b/core/src/test/java/org/apache/accumulo/core/iterators/system/MultiIteratorTest.java
index bbf87e5..8949c92 100644
--- a/core/src/test/java/org/apache/accumulo/core/iterators/system/MultiIteratorTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/iterators/system/MultiIteratorTest.java
@@ -36,7 +36,7 @@ import junit.framework.TestCase;
 
 public class MultiIteratorTest extends TestCase {
 
-  private static final Collection<ByteSequence> EMPTY_COL_FAMS = new ArrayList<ByteSequence>();
+  private static final Collection<ByteSequence> EMPTY_COL_FAMS = new ArrayList<>();
 
   public static Key nk(int row, long ts) {
     return new Key(nr(row), ts);
@@ -57,7 +57,7 @@ public class MultiIteratorTest extends TestCase {
   }
 
   void verify(int start, int end, Key seekKey, Text endRow, Text prevEndRow, boolean init, boolean incrRow, List<TreeMap<Key,Value>> maps) throws IOException {
-    List<SortedKeyValueIterator<Key,Value>> iters = new ArrayList<SortedKeyValueIterator<Key,Value>>(maps.size());
+    List<SortedKeyValueIterator<Key,Value>> iters = new ArrayList<>(maps.size());
 
     for (TreeMap<Key,Value> map : maps) {
       iters.add(new SortedMapIterator(map));
@@ -121,14 +121,14 @@ public class MultiIteratorTest extends TestCase {
   public void test1() throws IOException {
     // TEST non overlapping inputs
 
-    TreeMap<Key,Value> tm1 = new TreeMap<Key,Value>();
-    List<TreeMap<Key,Value>> tmpList = new ArrayList<TreeMap<Key,Value>>(2);
+    TreeMap<Key,Value> tm1 = new TreeMap<>();
+    List<TreeMap<Key,Value>> tmpList = new ArrayList<>(2);
 
     for (int i = 0; i < 4; i++) {
       nkv(tm1, 0, i, false, "v" + i);
     }
     tmpList.add(tm1);
-    tm1 = new TreeMap<Key,Value>();
+    tm1 = new TreeMap<>();
     for (int i = 4; i < 8; i++) {
       nkv(tm1, 0, i, false, "v" + i);
     }
@@ -144,9 +144,9 @@ public class MultiIteratorTest extends TestCase {
   public void test2() throws IOException {
     // TEST overlapping inputs
 
-    TreeMap<Key,Value> tm1 = new TreeMap<Key,Value>();
-    TreeMap<Key,Value> tm2 = new TreeMap<Key,Value>();
-    List<TreeMap<Key,Value>> tmpList = new ArrayList<TreeMap<Key,Value>>(2);
+    TreeMap<Key,Value> tm1 = new TreeMap<>();
+    TreeMap<Key,Value> tm2 = new TreeMap<>();
+    List<TreeMap<Key,Value>> tmpList = new ArrayList<>(2);
 
     for (int i = 0; i < 8; i++) {
       if (i % 2 == 0)
@@ -167,8 +167,8 @@ public class MultiIteratorTest extends TestCase {
   public void test3() throws IOException {
     // TEST single input
 
-    TreeMap<Key,Value> tm1 = new TreeMap<Key,Value>();
-    List<TreeMap<Key,Value>> tmpList = new ArrayList<TreeMap<Key,Value>>(2);
+    TreeMap<Key,Value> tm1 = new TreeMap<>();
+    List<TreeMap<Key,Value>> tmpList = new ArrayList<>(2);
 
     for (int i = 0; i < 8; i++) {
       nkv(tm1, 0, i, false, "v" + i);
@@ -186,9 +186,9 @@ public class MultiIteratorTest extends TestCase {
   public void test4() throws IOException {
     // TEST empty input
 
-    TreeMap<Key,Value> tm1 = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm1 = new TreeMap<>();
 
-    List<SortedKeyValueIterator<Key,Value>> skvil = new ArrayList<SortedKeyValueIterator<Key,Value>>(1);
+    List<SortedKeyValueIterator<Key,Value>> skvil = new ArrayList<>(1);
     skvil.add(new SortedMapIterator(tm1));
     MultiIterator mi = new MultiIterator(skvil, true);
 
@@ -201,9 +201,9 @@ public class MultiIteratorTest extends TestCase {
   public void test5() throws IOException {
     // TEST overlapping inputs AND prevRow AND endRow AND seek
 
-    TreeMap<Key,Value> tm1 = new TreeMap<Key,Value>();
-    TreeMap<Key,Value> tm2 = new TreeMap<Key,Value>();
-    List<TreeMap<Key,Value>> tmpList = new ArrayList<TreeMap<Key,Value>>(2);
+    TreeMap<Key,Value> tm1 = new TreeMap<>();
+    TreeMap<Key,Value> tm2 = new TreeMap<>();
+    List<TreeMap<Key,Value>> tmpList = new ArrayList<>(2);
 
     for (int i = 0; i < 8; i++) {
       if (i % 2 == 0)
@@ -257,12 +257,12 @@ public class MultiIteratorTest extends TestCase {
 
   public void test6() throws IOException {
     // TEst setting an endKey
-    TreeMap<Key,Value> tm1 = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm1 = new TreeMap<>();
     nkv(tm1, 3, 0, false, "1");
     nkv(tm1, 4, 0, false, "2");
     nkv(tm1, 6, 0, false, "3");
 
-    List<SortedKeyValueIterator<Key,Value>> skvil = new ArrayList<SortedKeyValueIterator<Key,Value>>(1);
+    List<SortedKeyValueIterator<Key,Value>> skvil = new ArrayList<>(1);
     skvil.add(new SortedMapIterator(tm1));
     MultiIterator mi = new MultiIterator(skvil, true);
     mi.seek(new Range(null, true, nk(5, 9), false), EMPTY_COL_FAMS, false);
@@ -330,7 +330,7 @@ public class MultiIteratorTest extends TestCase {
 
   public void test7() throws IOException {
     // TEst setting an endKey
-    TreeMap<Key,Value> tm1 = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm1 = new TreeMap<>();
     nkv(tm1, 0, 3, false, "1");
     nkv(tm1, 0, 2, false, "2");
     nkv(tm1, 0, 1, false, "3");
@@ -341,7 +341,7 @@ public class MultiIteratorTest extends TestCase {
     nkv(tm1, 2, 1, false, "8");
     nkv(tm1, 2, 0, false, "9");
 
-    List<SortedKeyValueIterator<Key,Value>> skvil = new ArrayList<SortedKeyValueIterator<Key,Value>>(1);
+    List<SortedKeyValueIterator<Key,Value>> skvil = new ArrayList<>(1);
     skvil.add(new SortedMapIterator(tm1));
 
     KeyExtent extent = new KeyExtent("tablename", nr(1), nr(0));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/iterators/system/SourceSwitchingIteratorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/iterators/system/SourceSwitchingIteratorTest.java b/core/src/test/java/org/apache/accumulo/core/iterators/system/SourceSwitchingIteratorTest.java
index 7567871..1ebf9df 100644
--- a/core/src/test/java/org/apache/accumulo/core/iterators/system/SourceSwitchingIteratorTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/iterators/system/SourceSwitchingIteratorTest.java
@@ -60,7 +60,7 @@ public class SourceSwitchingIteratorTest extends TestCase {
 
     DataSource next;
     SortedKeyValueIterator<Key,Value> iter;
-    List<TestDataSource> copies = new ArrayList<TestDataSource>();
+    List<TestDataSource> copies = new ArrayList<>();
     AtomicBoolean iflag;
 
     TestDataSource(SortedKeyValueIterator<Key,Value> iter) {
@@ -111,7 +111,7 @@ public class SourceSwitchingIteratorTest extends TestCase {
   }
 
   public void test1() throws Exception {
-    TreeMap<Key,Value> tm1 = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm1 = new TreeMap<>();
     put(tm1, "r1", "cf1", "cq1", 5, "v1");
     put(tm1, "r1", "cf1", "cq3", 5, "v2");
     put(tm1, "r2", "cf1", "cq1", 5, "v3");
@@ -128,7 +128,7 @@ public class SourceSwitchingIteratorTest extends TestCase {
   }
 
   public void test2() throws Exception {
-    TreeMap<Key,Value> tm1 = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm1 = new TreeMap<>();
     put(tm1, "r1", "cf1", "cq1", 5, "v1");
     put(tm1, "r1", "cf1", "cq3", 5, "v2");
     put(tm1, "r2", "cf1", "cq1", 5, "v3");
@@ -140,7 +140,7 @@ public class SourceSwitchingIteratorTest extends TestCase {
     ssi.seek(new Range(), new ArrayList<ByteSequence>(), false);
     ane(ssi, "r1", "cf1", "cq1", 5, "v1", true);
 
-    TreeMap<Key,Value> tm2 = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm2 = new TreeMap<>();
     put(tm2, "r1", "cf1", "cq1", 5, "v4");
     put(tm2, "r1", "cf1", "cq3", 5, "v5");
     put(tm2, "r2", "cf1", "cq1", 5, "v6");
@@ -157,7 +157,7 @@ public class SourceSwitchingIteratorTest extends TestCase {
   public void test3() throws Exception {
     // test switching after a row
 
-    TreeMap<Key,Value> tm1 = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm1 = new TreeMap<>();
     put(tm1, "r1", "cf1", "cq1", 5, "v1");
     put(tm1, "r1", "cf1", "cq2", 5, "v2");
     put(tm1, "r1", "cf1", "cq3", 5, "v3");
@@ -172,7 +172,7 @@ public class SourceSwitchingIteratorTest extends TestCase {
     ssi.seek(new Range(), new ArrayList<ByteSequence>(), false);
     ane(ssi, "r1", "cf1", "cq1", 5, "v1", true);
 
-    TreeMap<Key,Value> tm2 = new TreeMap<Key,Value>(tm1);
+    TreeMap<Key,Value> tm2 = new TreeMap<>(tm1);
     put(tm2, "r1", "cf1", "cq5", 5, "v7"); // should not see this because it should not switch until the row is finished
     put(tm2, "r2", "cf1", "cq1", 5, "v8"); // should see this new row after it switches
 
@@ -192,7 +192,7 @@ public class SourceSwitchingIteratorTest extends TestCase {
 
   public void test4() throws Exception {
     // ensure switch is done on initial seek
-    TreeMap<Key,Value> tm1 = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm1 = new TreeMap<>();
     put(tm1, "r1", "cf1", "cq1", 5, "v1");
     put(tm1, "r1", "cf1", "cq2", 5, "v2");
 
@@ -200,7 +200,7 @@ public class SourceSwitchingIteratorTest extends TestCase {
     TestDataSource tds = new TestDataSource(smi);
     SourceSwitchingIterator ssi = new SourceSwitchingIterator(tds, false);
 
-    TreeMap<Key,Value> tm2 = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm2 = new TreeMap<>();
     put(tm2, "r1", "cf1", "cq1", 6, "v3");
     put(tm2, "r1", "cf1", "cq2", 6, "v4");
 
@@ -217,7 +217,7 @@ public class SourceSwitchingIteratorTest extends TestCase {
 
   public void test5() throws Exception {
     // esnure switchNow() works w/ deepCopy()
-    TreeMap<Key,Value> tm1 = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm1 = new TreeMap<>();
     put(tm1, "r1", "cf1", "cq1", 5, "v1");
     put(tm1, "r1", "cf1", "cq2", 5, "v2");
 
@@ -227,7 +227,7 @@ public class SourceSwitchingIteratorTest extends TestCase {
 
     SortedKeyValueIterator<Key,Value> dc1 = ssi.deepCopy(null);
 
-    TreeMap<Key,Value> tm2 = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm2 = new TreeMap<>();
     put(tm2, "r1", "cf1", "cq1", 6, "v3");
     put(tm2, "r2", "cf1", "cq2", 6, "v4");
 
@@ -248,7 +248,7 @@ public class SourceSwitchingIteratorTest extends TestCase {
 
   public void testSetInterrupt() throws Exception {
 
-    TreeMap<Key,Value> tm1 = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm1 = new TreeMap<>();
     put(tm1, "r1", "cf1", "cq1", 5, "v1");
 
     SortedMapIterator smi = new SortedMapIterator(tm1);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/iterators/system/TimeSettingIteratorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/iterators/system/TimeSettingIteratorTest.java b/core/src/test/java/org/apache/accumulo/core/iterators/system/TimeSettingIteratorTest.java
index 3dbe7ca..9a363a1 100644
--- a/core/src/test/java/org/apache/accumulo/core/iterators/system/TimeSettingIteratorTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/iterators/system/TimeSettingIteratorTest.java
@@ -34,7 +34,7 @@ public class TimeSettingIteratorTest {
 
   @Test
   public void test1() throws Exception {
-    TreeMap<Key,Value> tm1 = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm1 = new TreeMap<>();
 
     tm1.put(new Key("r0", "cf1", "cq1", 9l), new Value("v0".getBytes()));
     tm1.put(new Key("r1", "cf1", "cq1", Long.MAX_VALUE), new Value("v1".getBytes()));
@@ -87,7 +87,7 @@ public class TimeSettingIteratorTest {
 
   @Test
   public void testAvoidKeyCopy() throws Exception {
-    TreeMap<Key,Value> tm1 = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm1 = new TreeMap<>();
     final Key k = new Key("r0", "cf1", "cq1", 9l);
 
     tm1.put(k, new Value("v0".getBytes()));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/iterators/system/VisibilityFilterTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/iterators/system/VisibilityFilterTest.java b/core/src/test/java/org/apache/accumulo/core/iterators/system/VisibilityFilterTest.java
index 667aa5f..68323c6 100644
--- a/core/src/test/java/org/apache/accumulo/core/iterators/system/VisibilityFilterTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/iterators/system/VisibilityFilterTest.java
@@ -34,7 +34,7 @@ import org.apache.log4j.Logger;
 public class VisibilityFilterTest extends TestCase {
 
   public void testBadVisibility() throws IOException {
-    TreeMap<Key,Value> tm = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm = new TreeMap<>();
 
     tm.put(new Key("r1", "cf1", "cq1", "A&"), new Value(new byte[0]));
     VisibilityFilter filter = new VisibilityFilter(new SortedMapIterator(tm), new Authorizations("A"), "".getBytes());

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/iterators/user/BigDecimalCombinerTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/iterators/user/BigDecimalCombinerTest.java b/core/src/test/java/org/apache/accumulo/core/iterators/user/BigDecimalCombinerTest.java
index dfcb869..861ce02 100644
--- a/core/src/test/java/org/apache/accumulo/core/iterators/user/BigDecimalCombinerTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/iterators/user/BigDecimalCombinerTest.java
@@ -42,7 +42,7 @@ import org.junit.Test;
 
 public class BigDecimalCombinerTest {
 
-  private static final Collection<ByteSequence> EMPTY_COL_FAMS = new ArrayList<ByteSequence>();
+  private static final Collection<ByteSequence> EMPTY_COL_FAMS = new ArrayList<>();
   private static double delta = 0.00001;
 
   Encoder<BigDecimal> encoder;
@@ -53,7 +53,7 @@ public class BigDecimalCombinerTest {
   @Before
   public void setup() {
     encoder = new BigDecimalCombiner.BigDecimalEncoder();
-    tm1 = new TreeMap<Key,Value>();
+    tm1 = new TreeMap<>();
     columns = Collections.singletonList(new IteratorSetting.Column("cf001"));
 
     // keys that will aggregate

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/iterators/user/ColumnSliceFilterTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/iterators/user/ColumnSliceFilterTest.java b/core/src/test/java/org/apache/accumulo/core/iterators/user/ColumnSliceFilterTest.java
index 11ad192..698d9ec 100644
--- a/core/src/test/java/org/apache/accumulo/core/iterators/user/ColumnSliceFilterTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/iterators/user/ColumnSliceFilterTest.java
@@ -40,9 +40,9 @@ import org.junit.Test;
 
 public class ColumnSliceFilterTest {
 
-  private static final Collection<ByteSequence> EMPTY_COL_FAMS = new ArrayList<ByteSequence>();
+  private static final Collection<ByteSequence> EMPTY_COL_FAMS = new ArrayList<>();
 
-  private static final SortedMap<Key,Value> TEST_DATA = new TreeMap<Key,Value>();
+  private static final SortedMap<Key,Value> TEST_DATA = new TreeMap<>();
   private static final Key KEY_1 = nkv(TEST_DATA, "boo1", "yup", "20080201", "dog");
   private static final Key KEY_2 = nkv(TEST_DATA, "boo1", "yap", "20080202", "cat");
   private static final Key KEY_3 = nkv(TEST_DATA, "boo2", "yap", "20080203", "hamster");

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/iterators/user/CombinerTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/iterators/user/CombinerTest.java b/core/src/test/java/org/apache/accumulo/core/iterators/user/CombinerTest.java
index a442534..6300532 100644
--- a/core/src/test/java/org/apache/accumulo/core/iterators/user/CombinerTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/iterators/user/CombinerTest.java
@@ -58,7 +58,7 @@ import org.junit.Test;
 
 public class CombinerTest {
 
-  private static final Collection<ByteSequence> EMPTY_COL_FAMS = new ArrayList<ByteSequence>();
+  private static final Collection<ByteSequence> EMPTY_COL_FAMS = new ArrayList<>();
 
   static class CombinerIteratorEnvironment extends DefaultIteratorEnvironment {
 
@@ -115,7 +115,7 @@ public class CombinerTest {
   public void test1() throws IOException {
     Encoder<Long> encoder = LongCombiner.VAR_LEN_ENCODER;
 
-    TreeMap<Key,Value> tm1 = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm1 = new TreeMap<>();
 
     // keys that do not aggregate
     nkv(tm1, 1, 1, 1, 1, false, 2l, encoder);
@@ -180,7 +180,7 @@ public class CombinerTest {
   public void test2() throws IOException {
     Encoder<Long> encoder = LongCombiner.VAR_LEN_ENCODER;
 
-    TreeMap<Key,Value> tm1 = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm1 = new TreeMap<>();
 
     // keys that aggregate
     nkv(tm1, 1, 1, 1, 1, false, 2l, encoder);
@@ -242,7 +242,7 @@ public class CombinerTest {
   public void test3() throws IOException {
     Encoder<Long> encoder = LongCombiner.FIXED_LEN_ENCODER;
 
-    TreeMap<Key,Value> tm1 = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm1 = new TreeMap<>();
 
     // keys that aggregate
     nkv(tm1, 1, 1, 1, 1, false, 2l, encoder);
@@ -308,7 +308,7 @@ public class CombinerTest {
   public void testDeepCopy() throws IOException {
     Encoder<Long> encoder = LongCombiner.FIXED_LEN_ENCODER;
 
-    TreeMap<Key,Value> tm1 = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm1 = new TreeMap<>();
 
     // keys that aggregate
     nkv(tm1, 1, 1, 1, 1, false, 2l, encoder);
@@ -376,7 +376,7 @@ public class CombinerTest {
   public void test4() throws IOException {
     Encoder<Long> encoder = LongCombiner.STRING_ENCODER;
 
-    TreeMap<Key,Value> tm1 = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm1 = new TreeMap<>();
 
     // keys that do not aggregate
     nkv(tm1, 0, 0, 1, 1, false, 7l, encoder);
@@ -481,13 +481,13 @@ public class CombinerTest {
     // try aggregating across multiple data sets that contain
     // the exact same keys w/ different values
 
-    TreeMap<Key,Value> tm1 = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm1 = new TreeMap<>();
     nkv(tm1, 1, 1, 1, 1, false, 2l, encoder);
 
-    TreeMap<Key,Value> tm2 = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm2 = new TreeMap<>();
     nkv(tm2, 1, 1, 1, 1, false, 3l, encoder);
 
-    TreeMap<Key,Value> tm3 = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm3 = new TreeMap<>();
     nkv(tm3, 1, 1, 1, 1, false, 4l, encoder);
 
     Combiner ai = new SummingCombiner();
@@ -496,7 +496,7 @@ public class CombinerTest {
     LongCombiner.setEncodingType(is, StringEncoder.class);
     Combiner.setColumns(is, Collections.singletonList(new IteratorSetting.Column("cf001")));
 
-    List<SortedKeyValueIterator<Key,Value>> sources = new ArrayList<SortedKeyValueIterator<Key,Value>>(3);
+    List<SortedKeyValueIterator<Key,Value>> sources = new ArrayList<>(3);
     sources.add(new SortedMapIterator(tm1));
     sources.add(new SortedMapIterator(tm2));
     sources.add(new SortedMapIterator(tm3));
@@ -513,7 +513,7 @@ public class CombinerTest {
   @Test
   public void test6() throws IOException {
     Encoder<Long> encoder = LongCombiner.VAR_LEN_ENCODER;
-    TreeMap<Key,Value> tm1 = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm1 = new TreeMap<>();
 
     // keys that aggregate
     nkv(tm1, 1, 1, 1, 1, false, 2l, encoder);
@@ -542,7 +542,7 @@ public class CombinerTest {
 
     // test that delete is not aggregated
 
-    TreeMap<Key,Value> tm1 = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm1 = new TreeMap<>();
 
     nkv(tm1, 1, 1, 1, 2, true, 0l, encoder);
     nkv(tm1, 1, 1, 1, 3, false, 4l, encoder);
@@ -570,7 +570,7 @@ public class CombinerTest {
     ai.next();
     assertFalse(ai.hasTop());
 
-    tm1 = new TreeMap<Key,Value>();
+    tm1 = new TreeMap<>();
     nkv(tm1, 1, 1, 1, 2, true, 0l, encoder);
     ai = new SummingCombiner();
     ai.init(new SortedMapIterator(tm1), is.getOptions(), SCAN_IE);
@@ -587,7 +587,7 @@ public class CombinerTest {
 
   @Test
   public void valueIteratorTest() throws IOException {
-    TreeMap<Key,Value> tm = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm = new TreeMap<>();
     tm.put(new Key("r", "f", "q", 1), new Value("1".getBytes()));
     tm.put(new Key("r", "f", "q", 2), new Value("2".getBytes()));
     SortedMapIterator smi = new SortedMapIterator(tm);
@@ -600,7 +600,7 @@ public class CombinerTest {
 
   @Test
   public void sumAllColumns() throws IOException {
-    TreeMap<Key,Value> tm = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm = new TreeMap<>();
     tm.put(new Key("r", "count", "a", 1), new Value("1".getBytes()));
     tm.put(new Key("r", "count", "a", 2), new Value("1".getBytes()));
     tm.put(new Key("r", "count", "b", 3), new Value("1".getBytes()));
@@ -636,7 +636,7 @@ public class CombinerTest {
   public void maxMinTest() throws IOException {
     Encoder<Long> encoder = LongCombiner.VAR_LEN_ENCODER;
 
-    TreeMap<Key,Value> tm1 = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm1 = new TreeMap<>();
 
     // keys that aggregate
     nkv(tm1, 1, 1, 1, 1, false, 4l, encoder);
@@ -675,7 +675,7 @@ public class CombinerTest {
   }
 
   public static List<Long> nal(Long... longs) {
-    List<Long> al = new ArrayList<Long>(longs.length);
+    List<Long> al = new ArrayList<>(longs.length);
     for (Long l : longs) {
       al.add(l);
     }
@@ -692,7 +692,7 @@ public class CombinerTest {
       IllegalAccessException {
     Encoder<List<Long>> encoder = encoderClass.newInstance();
 
-    TreeMap<Key,Value> tm1 = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm1 = new TreeMap<>();
 
     // keys that aggregate
     nkv(tm1, 1, 1, 1, 1, false, nal(1l, 2l), encoder);
@@ -773,11 +773,11 @@ public class CombinerTest {
 
     @Override
     public List<Long> decode(byte[] b) {
-      return new ArrayList<Long>();
+      return new ArrayList<>();
     }
 
     public List<Long> decode(byte[] b, int offset, int len) {
-      return new ArrayList<Long>();
+      return new ArrayList<>();
     }
 
   }
@@ -821,7 +821,7 @@ public class CombinerTest {
   }
 
   private TreeMap<Key,Value> readAll(SortedKeyValueIterator<Key,Value> combiner) throws Exception {
-    TreeMap<Key,Value> ret = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> ret = new TreeMap<>();
 
     combiner.seek(new Range(), EMPTY_COL_FAMS, false);
 
@@ -895,7 +895,7 @@ public class CombinerTest {
   public void testDeleteHandling() throws Exception {
     Encoder<Long> encoder = LongCombiner.STRING_ENCODER;
 
-    TreeMap<Key,Value> input = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> input = new TreeMap<>();
 
     IteratorEnvironment paritalMajcIe = new CombinerIteratorEnvironment(IteratorScope.majc, false);
     IteratorEnvironment fullMajcIe = new CombinerIteratorEnvironment(IteratorScope.majc, true);
@@ -906,7 +906,7 @@ public class CombinerTest {
     nkv(input, 1, 1, 1, 3, false, 2l, encoder);
     nkv(input, 1, 1, 1, 4, false, 9l, encoder);
 
-    TreeMap<Key,Value> expected = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> expected = new TreeMap<>();
     nkv(expected, 1, 1, 1, 1, false, 4l, encoder);
     nkv(expected, 1, 1, 1, 2, true, 0l, encoder);
     nkv(expected, 1, 1, 1, 4, false, 11l, encoder);


[31/32] accumulo git commit: Merge branch '1.8'

Posted by ct...@apache.org.
Merge branch '1.8'


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/72d8e745
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/72d8e745
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/72d8e745

Branch: refs/heads/master
Commit: 72d8e745afe998735244a436a89d0549319af0dd
Parents: b69291a b102e76
Author: Christopher Tubbs <ct...@apache.org>
Authored: Thu Jun 30 21:47:24 2016 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Thu Jun 30 21:47:24 2016 -0400

----------------------------------------------------------------------
 .../apache/accumulo/core/cli/ClientOpts.java    |  2 +-
 .../accumulo/core/client/BatchWriterConfig.java |  2 +-
 .../core/client/ClientConfiguration.java        |  6 +-
 .../core/client/ClientSideIteratorScanner.java  |  4 +-
 .../accumulo/core/client/IsolatedScanner.java   |  2 +-
 .../accumulo/core/client/IteratorSetting.java   |  4 +-
 .../core/client/MutationsRejectedException.java |  2 +-
 .../accumulo/core/client/RowIterator.java       |  2 +-
 .../accumulo/core/client/TimedOutException.java |  2 +-
 .../core/client/admin/ActiveCompaction.java     |  4 +-
 .../client/admin/NewTableConfiguration.java     |  4 +-
 .../core/client/impl/ActiveCompactionImpl.java  |  2 +-
 .../core/client/impl/ActiveScanImpl.java        |  4 +-
 .../core/client/impl/CompressedIterators.java   | 10 +--
 .../core/client/impl/ConditionalWriterImpl.java | 40 +++++------
 .../client/impl/InstanceOperationsImpl.java     |  8 +--
 .../client/impl/MultiTableBatchWriterImpl.java  |  2 +-
 .../client/impl/NamespaceOperationsHelper.java  | 14 ++--
 .../client/impl/NamespaceOperationsImpl.java    |  6 +-
 .../accumulo/core/client/impl/Namespaces.java   |  6 +-
 .../core/client/impl/OfflineIterator.java       | 15 ++--
 .../core/client/impl/RootTabletLocator.java     |  2 +-
 .../core/client/impl/ScannerIterator.java       |  2 +-
 .../core/client/impl/ScannerOptions.java        | 20 +++---
 .../accumulo/core/client/impl/ServerClient.java |  4 +-
 .../core/client/impl/TableOperationsHelper.java | 14 ++--
 .../core/client/impl/TableOperationsImpl.java   | 58 +++++++--------
 .../accumulo/core/client/impl/Tables.java       |  8 +--
 .../core/client/impl/TabletLocator.java         | 10 +--
 .../core/client/impl/TabletLocatorImpl.java     | 28 ++++----
 .../client/impl/TabletServerBatchReader.java    |  2 +-
 .../impl/TabletServerBatchReaderIterator.java   | 52 +++++++-------
 .../client/impl/TabletServerBatchWriter.java    | 34 ++++-----
 .../core/client/impl/ThriftScanner.java         |  6 +-
 .../core/client/impl/ThriftTransportPool.java   | 24 +++----
 .../accumulo/core/client/impl/Translator.java   |  6 +-
 .../client/lexicoder/BigIntegerLexicoder.java   | 10 +--
 .../core/client/lexicoder/BytesLexicoder.java   |  2 +-
 .../core/client/lexicoder/DateLexicoder.java    |  6 +-
 .../core/client/lexicoder/DoubleLexicoder.java  |  2 +-
 .../core/client/lexicoder/IntegerLexicoder.java |  2 +-
 .../core/client/lexicoder/ListLexicoder.java    |  4 +-
 .../core/client/lexicoder/PairLexicoder.java    | 11 ++-
 .../core/client/lexicoder/ReverseLexicoder.java |  6 +-
 .../core/client/lexicoder/StringLexicoder.java  |  6 +-
 .../core/client/lexicoder/TextLexicoder.java    |  2 +-
 .../client/lexicoder/UIntegerLexicoder.java     |  2 +-
 .../core/client/lexicoder/ULongLexicoder.java   |  2 +-
 .../core/client/lexicoder/UUIDLexicoder.java    |  2 +-
 .../core/client/lexicoder/impl/ByteUtils.java   |  2 +-
 .../core/client/mapred/AbstractInputFormat.java | 14 ++--
 .../client/mapred/AccumuloOutputFormat.java     |  6 +-
 .../client/mapred/AccumuloRowInputFormat.java   |  2 +-
 .../client/mapreduce/AbstractInputFormat.java   | 14 ++--
 .../client/mapreduce/AccumuloOutputFormat.java  |  6 +-
 .../mapreduce/AccumuloRowInputFormat.java       |  2 +-
 .../core/client/mapreduce/InputTableConfig.java |  8 +--
 .../core/client/mapreduce/RangeInputSplit.java  |  6 +-
 .../client/mapreduce/impl/BatchInputSplit.java  |  2 +-
 .../mapreduce/lib/impl/InputConfigurator.java   | 22 +++---
 .../lib/partition/RangePartitioner.java         |  2 +-
 .../core/client/rfile/RFileScannerBuilder.java  |  2 +-
 .../accumulo/core/client/rfile/RFileWriter.java |  6 +-
 .../core/client/rfile/RFileWriterBuilder.java   |  2 +-
 .../security/tokens/AuthenticationToken.java    |  2 +-
 .../tokens/CredentialProviderToken.java         |  2 +-
 .../client/security/tokens/PasswordToken.java   |  2 +-
 .../core/conf/AccumuloConfiguration.java        |  4 +-
 .../accumulo/core/conf/ConfigurationDocGen.java |  4 +-
 .../conf/CredentialProviderFactoryShim.java     |  4 +-
 .../core/conf/DefaultConfiguration.java         |  2 +-
 .../core/conf/ObservableConfiguration.java      |  2 +-
 .../org/apache/accumulo/core/conf/Property.java |  8 +--
 .../apache/accumulo/core/conf/PropertyType.java |  2 +-
 .../constraints/DefaultKeySizeConstraint.java   |  4 +-
 .../accumulo/core/constraints/Violations.java   |  4 +-
 .../core/constraints/VisibilityConstraint.java  |  2 +-
 .../apache/accumulo/core/data/Condition.java    |  4 +-
 .../accumulo/core/data/ConditionalMutation.java |  4 +-
 .../org/apache/accumulo/core/data/Mutation.java |  8 +--
 .../org/apache/accumulo/core/data/Range.java    |  4 +-
 .../accumulo/core/data/impl/KeyExtent.java      | 10 +--
 .../accumulo/core/file/BloomFilterLayer.java    |  6 +-
 .../accumulo/core/file/FileOperations.java      |  2 +-
 .../core/file/blockfile/cache/CachedBlock.java  |  2 +-
 .../file/blockfile/cache/CachedBlockQueue.java  |  6 +-
 .../file/blockfile/impl/CachableBlockFile.java  |  6 +-
 .../accumulo/core/file/rfile/BlockIndex.java    |  2 +-
 .../accumulo/core/file/rfile/CreateEmpty.java   |  2 +-
 .../core/file/rfile/MultiLevelIndex.java        |  8 +--
 .../accumulo/core/file/rfile/PrintInfo.java     |  2 +-
 .../apache/accumulo/core/file/rfile/RFile.java  | 32 ++++-----
 .../accumulo/core/file/rfile/SplitLarge.java    |  2 +-
 .../accumulo/core/file/rfile/bcfile/BCFile.java | 10 +--
 .../core/file/rfile/bcfile/Compression.java     |  2 +-
 .../core/iterators/FirstEntryInRowIterator.java |  2 +-
 .../accumulo/core/iterators/IteratorUtil.java   | 22 +++---
 .../accumulo/core/iterators/LongCombiner.java   |  6 +-
 .../core/iterators/OptionDescriber.java         | 12 ++--
 .../accumulo/core/iterators/OrIterator.java     |  6 +-
 .../core/iterators/TypedValueCombiner.java      |  2 +-
 .../accumulo/core/iterators/conf/ColumnSet.java |  8 +--
 .../iterators/conf/ColumnToClassMapping.java    |  4 +-
 .../system/ColumnFamilySkippingIterator.java    |  4 +-
 .../iterators/system/ColumnQualifierFilter.java |  6 +-
 .../core/iterators/system/HeapIterator.java     |  2 +-
 .../iterators/system/LocalityGroupIterator.java |  2 +-
 .../core/iterators/system/MultiIterator.java    |  2 +-
 .../system/SourceSwitchingIterator.java         |  2 +-
 .../iterators/system/SynchronizedIterator.java  |  2 +-
 .../core/iterators/user/BigDecimalCombiner.java |  3 +-
 .../core/iterators/user/CfCqSliceFilter.java    |  9 ++-
 .../core/iterators/user/CfCqSliceOpts.java      |  2 +-
 .../core/iterators/user/LargeRowFilter.java     |  8 +--
 .../iterators/user/RowDeletingIterator.java     |  4 +-
 .../iterators/user/RowEncodingIterator.java     |  6 +-
 .../iterators/user/SummingArrayCombiner.java    | 10 +--
 .../iterators/user/TransformingIterator.java    |  8 +--
 .../core/iterators/user/VisibilityFilter.java   |  3 +-
 .../user/WholeColumnFamilyIterator.java         |  6 +-
 .../core/iterators/user/WholeRowIterator.java   |  2 +-
 .../core/metadata/MetadataLocationObtainer.java | 20 +++---
 .../apache/accumulo/core/rpc/ThriftUtil.java    |  2 +-
 .../sample/impl/SamplerConfigurationImpl.java   |  6 +-
 .../accumulo/core/security/Authorizations.java  | 10 +--
 .../core/security/ColumnVisibility.java         |  4 +-
 .../core/security/NamespacePermission.java      |  2 +-
 .../core/security/SystemPermission.java         |  4 +-
 .../accumulo/core/security/TablePermission.java |  2 +-
 .../core/security/VisibilityEvaluator.java      |  2 +-
 .../CachingHDFSSecretKeyEncryptionStrategy.java |  2 +-
 .../security/crypto/CryptoModuleFactory.java    |  4 +-
 .../security/crypto/DefaultCryptoModule.java    |  2 +-
 .../accumulo/core/trace/DistributedTrace.java   |  2 +-
 .../accumulo/core/trace/wrappers/TraceWrap.java |  4 +-
 .../apache/accumulo/core/util/ByteArraySet.java |  2 +-
 .../accumulo/core/util/ByteBufferUtil.java      |  4 +-
 .../accumulo/core/util/LocalityGroupUtil.java   | 12 ++--
 .../apache/accumulo/core/util/MapCounter.java   |  4 +-
 .../org/apache/accumulo/core/util/Merge.java    |  4 +-
 .../org/apache/accumulo/core/util/Pair.java     |  4 +-
 .../accumulo/core/util/ServerServices.java      |  2 +-
 .../apache/accumulo/core/util/StopWatch.java    |  4 +-
 .../ShardedTableDistributionFormatter.java      |  2 +-
 .../util/format/StatisticsDisplayFormatter.java | 12 ++--
 .../core/util/interpret/HexScanInterpreter.java |  2 +-
 .../core/client/IteratorSettingTest.java        |  2 +-
 .../accumulo/core/client/RowIteratorTest.java   |  6 +-
 .../core/client/ZooKeeperInstanceTest.java      |  2 +-
 .../client/impl/TableOperationsHelperTest.java  |  6 +-
 .../core/client/impl/TabletLocatorImplTest.java | 58 +++++++--------
 .../core/client/lexicoder/LexicoderTest.java    |  6 +-
 .../client/lexicoder/ListLexicoderTest.java     | 28 ++++----
 .../client/lexicoder/PairLexicoderTest.java     | 17 +++--
 .../client/lexicoder/ReverseLexicoderTest.java  | 16 ++---
 .../client/lexicoder/UUIDLexicoderTest.java     |  2 +-
 .../AccumuloMultiTableInputFormatTest.java      |  6 +-
 .../core/client/mapred/RangeInputSplitTest.java |  8 +--
 .../mapreduce/AccumuloInputFormatTest.java      | 10 +--
 .../AccumuloMultiTableInputFormatTest.java      |  4 +-
 .../client/mapreduce/InputTableConfigTest.java  |  8 +--
 .../client/mapreduce/RangeInputSplitTest.java   |  8 +--
 .../mapreduce/impl/BatchInputSplitTest.java     |  8 +--
 .../client/security/SecurityErrorCodeTest.java  |  4 +-
 .../core/conf/ConfigSanityCheckTest.java        |  2 +-
 .../conf/CredentialProviderFactoryShimTest.java |  8 +--
 .../apache/accumulo/core/conf/PropertyTest.java | 12 ++--
 .../accumulo/core/data/KeyExtentTest.java       | 20 +++---
 .../org/apache/accumulo/core/data/KeyTest.java  |  2 +-
 .../apache/accumulo/core/data/OldMutation.java  |  4 +-
 .../apache/accumulo/core/data/RangeTest.java    |  4 +-
 .../core/file/BloomFilterLayerLookupTest.java   |  4 +-
 .../core/file/rfile/CreateCompatTestFile.java   |  2 +-
 .../accumulo/core/file/rfile/RFileTest.java     | 38 +++++-----
 .../core/file/rfile/RelativeKeyTest.java        |  6 +-
 .../iterators/FirstEntryInRowIteratorTest.java  |  4 +-
 .../core/iterators/FirstEntryInRowTest.java     |  8 +--
 .../core/iterators/IteratorUtilTest.java        | 18 ++---
 .../ColumnFamilySkippingIteratorTest.java       | 24 +++----
 .../core/iterators/system/ColumnFilterTest.java |  6 +-
 .../iterators/system/DeletingIteratorTest.java  | 14 ++--
 .../iterators/system/MultiIteratorTest.java     | 38 +++++-----
 .../system/SourceSwitchingIteratorTest.java     | 22 +++---
 .../system/TimeSettingIteratorTest.java         |  4 +-
 .../iterators/system/VisibilityFilterTest.java  |  2 +-
 .../iterators/user/BigDecimalCombinerTest.java  |  4 +-
 .../iterators/user/ColumnSliceFilterTest.java   |  4 +-
 .../core/iterators/user/CombinerTest.java       | 46 ++++++------
 .../core/iterators/user/FilterTest.java         | 34 ++++-----
 .../core/iterators/user/GrepIteratorTest.java   |  6 +-
 .../iterators/user/IndexedDocIteratorTest.java  | 14 ++--
 .../user/IntersectingIteratorTest.java          |  8 +--
 .../core/iterators/user/LargeRowFilterTest.java | 34 ++++-----
 .../core/iterators/user/RegExFilterTest.java    |  6 +-
 .../iterators/user/RowDeletingIteratorTest.java | 10 +--
 .../iterators/user/RowEncodingIteratorTest.java | 22 +++---
 .../core/iterators/user/RowFilterTest.java      | 24 +++----
 .../core/iterators/user/TestCfCqSlice.java      | 12 ++--
 .../user/TransformingIteratorTest.java          | 26 +++----
 .../iterators/user/VersioningIteratorTest.java  | 16 ++---
 .../iterators/user/VisibilityFilterTest.java    |  8 +--
 .../user/WholeColumnFamilyIteratorTest.java     | 22 +++---
 .../iterators/user/WholeRowIteratorTest.java    | 22 +++---
 .../core/util/LocalityGroupUtilTest.java        |  4 +-
 .../apache/accumulo/core/util/MergeTest.java    |  6 +-
 .../org/apache/accumulo/core/util/PairTest.java | 20 +++---
 .../accumulo/core/util/PartitionerTest.java     |  2 +-
 .../core/util/format/DefaultFormatterTest.java  |  2 +-
 .../core/util/format/HexFormatterTest.java      |  2 +-
 .../ShardedTableDistributionFormatterTest.java  |  2 +-
 .../format/StatisticsDisplayFormatterTest.java  |  2 +-
 .../simple/client/RandomBatchScanner.java       |  4 +-
 .../simple/client/RandomBatchWriter.java        |  6 +-
 .../simple/client/ReadWriteExample.java         |  2 +-
 .../constraints/AlphaNumKeyConstraint.java      |  2 +-
 .../examples/simple/dirlist/Ingest.java         |  2 +-
 .../examples/simple/dirlist/QueryUtil.java      |  4 +-
 .../simple/filedata/ChunkInputFormat.java       |  4 +-
 .../simple/filedata/ChunkInputStream.java       |  2 +-
 .../simple/filedata/FileDataIngest.java         |  2 +-
 .../examples/simple/filedata/FileDataQuery.java |  4 +-
 .../examples/simple/filedata/KeyUtil.java       |  2 +-
 .../simple/filedata/VisibilityCombiner.java     |  2 +-
 .../simple/isolation/InterferenceTest.java      |  2 +-
 .../examples/simple/mapreduce/NGramIngest.java  |  2 +-
 .../examples/simple/mapreduce/RowHash.java      |  2 +-
 .../examples/simple/mapreduce/TableToFile.java  |  6 +-
 .../simple/mapreduce/TeraSortIngest.java        |  2 +-
 .../simple/mapreduce/bulk/SetupTable.java       |  4 +-
 .../examples/simple/reservations/ARS.java       |  4 +-
 .../examples/simple/shard/ContinuousQuery.java  |  4 +-
 .../accumulo/examples/simple/shard/Index.java   |  4 +-
 .../accumulo/examples/simple/shard/Query.java   |  4 +-
 .../examples/simple/shell/DebugCommand.java     |  2 +-
 .../simple/filedata/ChunkCombinerTest.java      | 30 ++++----
 .../simple/filedata/ChunkInputStreamTest.java   | 28 ++++----
 .../org/apache/accumulo/fate/AdminUtil.java     |  8 +--
 .../org/apache/accumulo/fate/AgeOffStore.java   |  4 +-
 .../org/apache/accumulo/fate/ReadOnlyStore.java |  2 +-
 .../java/org/apache/accumulo/fate/ZooStore.java | 12 ++--
 .../zookeeper/DistributedReadWriteLock.java     |  2 +-
 .../fate/zookeeper/TransactionWatcher.java      |  2 +-
 .../accumulo/fate/zookeeper/ZooCache.java       |  6 +-
 .../fate/zookeeper/ZooCacheFactory.java         |  2 +-
 .../apache/accumulo/fate/zookeeper/ZooLock.java |  6 +-
 .../accumulo/fate/zookeeper/ZooQueueLock.java   |  2 +-
 .../accumulo/fate/zookeeper/ZooSession.java     |  2 +-
 .../apache/accumulo/fate/zookeeper/ZooUtil.java |  6 +-
 .../apache/accumulo/fate/AgeOffStoreTest.java   | 42 +++++------
 .../apache/accumulo/fate/ReadOnlyStoreTest.java |  2 +-
 .../org/apache/accumulo/fate/SimpleStore.java   |  6 +-
 .../zookeeper/DistributedReadWriteLockTest.java |  4 +-
 .../fate/zookeeper/TransactionWatcherTest.java  | 10 +--
 .../maven/plugin/AbstractAccumuloMojo.java      |  2 +-
 .../standalone/StandaloneClusterControl.java    |  2 +-
 .../minicluster/MiniAccumuloRunner.java         |  2 +-
 .../impl/MiniAccumuloClusterControl.java        |  2 +-
 .../impl/MiniAccumuloClusterImpl.java           | 22 +++---
 .../impl/MiniAccumuloConfigImpl.java            | 22 +++---
 .../minicluster/MiniAccumuloClusterTest.java    |  4 +-
 .../java/org/apache/accumulo/proxy/Proxy.java   |  2 +-
 .../org/apache/accumulo/proxy/ProxyServer.java  | 50 ++++++-------
 .../apache/accumulo/proxy/ProxyServerTest.java  |  4 +-
 .../org/apache/accumulo/server/Accumulo.java    |  6 +-
 .../server/GarbageCollectionLogger.java         |  2 +-
 .../apache/accumulo/server/ServerConstants.java |  8 +--
 .../accumulo/server/client/BulkImporter.java    | 46 ++++++------
 .../server/client/ClientServiceHandler.java     |  8 +--
 .../server/conf/NamespaceConfiguration.java     |  2 +-
 .../server/conf/ServerConfigurationFactory.java |  6 +-
 .../server/conf/TableConfiguration.java         |  2 +-
 .../server/conf/ZooConfigurationFactory.java    |  2 +-
 .../server/constraints/MetadataConstraints.java | 10 +--
 .../server/fs/PerTableVolumeChooser.java        |  2 +-
 .../server/fs/PreferredVolumeChooser.java       |  8 +--
 .../accumulo/server/fs/VolumeManagerImpl.java   |  4 +-
 .../apache/accumulo/server/fs/VolumeUtil.java   | 16 ++---
 .../apache/accumulo/server/init/Initialize.java | 13 ++--
 .../iterators/MetadataBulkLoadFilter.java       |  2 +-
 .../accumulo/server/master/LiveTServerSet.java  | 20 +++---
 .../master/balancer/ChaoticLoadBalancer.java    |  8 +--
 .../master/balancer/DefaultLoadBalancer.java    | 12 ++--
 .../server/master/balancer/GroupBalancer.java   | 10 +--
 .../balancer/HostRegexTableLoadBalancer.java    | 14 ++--
 .../master/balancer/TableLoadBalancer.java      | 10 +--
 .../server/master/balancer/TabletBalancer.java  |  2 +-
 .../server/master/state/DeadServerList.java     |  2 +-
 .../master/state/MetaDataTableScanner.java      |  2 +-
 .../server/master/state/TabletServerState.java  |  4 +-
 .../master/state/TabletStateChangeIterator.java | 12 ++--
 .../master/state/ZooTabletStateStore.java       |  2 +-
 .../master/tableOps/UserCompactionConfig.java   |  2 +-
 .../server/metrics/AbstractMetricsImpl.java     |  2 +-
 .../accumulo/server/monitor/LogService.java     |  2 +-
 .../server/problems/ProblemReports.java         |  4 +-
 .../server/replication/StatusCombiner.java      |  2 +-
 .../apache/accumulo/server/rpc/RpcWrapper.java  |  2 +-
 .../server/rpc/TCredentialsUpdatingWrapper.java |  2 +-
 .../accumulo/server/rpc/TServerUtils.java       |  4 +-
 .../server/rpc/UGIAssumingProcessor.java        |  4 +-
 .../security/AuditedSecurityOperation.java      |  4 +-
 .../AuthenticationTokenSecretManager.java       |  4 +-
 .../security/handler/InsecureAuthenticator.java |  2 +-
 .../security/handler/ZKAuthenticator.java       |  4 +-
 .../server/security/handler/ZKAuthorizor.java   |  4 +-
 .../server/security/handler/ZKPermHandler.java  | 12 ++--
 .../server/security/handler/ZKSecurityTool.java |  6 +-
 .../tabletserver/LargestFirstMemoryManager.java |  8 +--
 .../org/apache/accumulo/server/util/Admin.java  | 14 ++--
 .../accumulo/server/util/ChangeSecret.java      |  4 +-
 .../server/util/CheckForMetadataProblems.java   |  4 +-
 .../accumulo/server/util/DeleteZooInstance.java |  4 +-
 .../accumulo/server/util/FileSystemMonitor.java |  6 +-
 .../apache/accumulo/server/util/FileUtil.java   | 20 +++---
 .../accumulo/server/util/ListInstances.java     |  4 +-
 .../accumulo/server/util/ListVolumesUsed.java   |  6 +-
 .../accumulo/server/util/LocalityCheck.java     |  6 +-
 .../accumulo/server/util/LoginProperties.java   |  2 +-
 .../server/util/MasterMetadataUtil.java         |  8 +--
 .../accumulo/server/util/MetadataTableUtil.java | 26 +++----
 .../util/RemoveEntriesForMissingFiles.java      |  4 +-
 .../server/util/ReplicationTableUtil.java       |  2 +-
 .../accumulo/server/util/RestoreZookeeper.java  |  2 +-
 .../accumulo/server/util/TableDiskUsage.java    | 32 ++++-----
 .../accumulo/server/util/TableInfoUtil.java     |  2 +-
 .../accumulo/server/util/TabletIterator.java    |  2 +-
 .../server/util/VerifyTabletAssignments.java    | 10 +--
 .../server/zookeeper/DistributedWorkQueue.java  |  2 +-
 .../accumulo/server/ServerConstantsTest.java    |  2 +-
 .../server/client/BulkImporterTest.java         |  2 +-
 .../server/conf/NamespaceConfigurationTest.java |  2 +-
 .../server/conf/TableConfigurationTest.java     |  2 +-
 .../conf/ZooCachePropertyAccessorTest.java      | 12 ++--
 .../apache/accumulo/server/fs/FileRefTest.java  |  2 +-
 .../accumulo/server/fs/VolumeUtilTest.java      | 48 ++++++-------
 .../iterators/MetadataBulkLoadFilterTest.java   |  6 +-
 .../balancer/ChaoticLoadBalancerTest.java       | 18 ++---
 .../balancer/DefaultLoadBalancerTest.java       | 28 ++++----
 ...gexTableLoadBalancerReconfigurationTest.java |  4 +-
 .../HostRegexTableLoadBalancerTest.java         |  6 +-
 .../master/balancer/TableLoadBalancerTest.java  | 10 +--
 .../master/state/TabletLocationStateTest.java   | 12 ++--
 .../problems/ProblemReportingIteratorTest.java  |  2 +-
 .../accumulo/server/rpc/RpcWrapperTest.java     | 11 ++-
 ...redentialsUpdatingInvocationHandlerTest.java | 14 ++--
 .../security/handler/ZKAuthenticatorTest.java   |  4 +-
 .../server/tablets/LogicalTimeTest.java         |  4 +-
 .../accumulo/server/tablets/MillisTimeTest.java |  4 +-
 .../accumulo/server/util/DefaultMapTest.java    |  2 +-
 .../server/util/FileSystemMonitorTest.java      |  2 +-
 .../accumulo/server/util/FileUtilTest.java      | 10 +--
 .../server/util/ReplicationTableUtilTest.java   |  2 +-
 .../accumulo/server/util/TServerUtilsTest.java  |  2 +-
 .../accumulo/gc/GarbageCollectionAlgorithm.java |  8 +--
 .../accumulo/gc/SimpleGarbageCollector.java     |  4 +-
 .../gc/GarbageCollectWriteAheadLogsTest.java    |  6 +-
 .../accumulo/gc/GarbageCollectionTest.java      | 18 ++---
 .../accumulo/master/FateServiceHandler.java     | 36 +++++-----
 .../java/org/apache/accumulo/master/Master.java | 44 ++++++------
 .../master/MasterClientServiceHandler.java      |  6 +-
 .../accumulo/master/TabletGroupWatcher.java     | 24 +++----
 .../master/recovery/RecoveryManager.java        |  6 +-
 .../accumulo/master/state/TableStats.java       |  4 +-
 .../master/tableOps/CompactionDriver.java       |  2 +-
 .../accumulo/master/tableOps/CopyFailed.java    |  8 +--
 .../accumulo/master/tableOps/LoadFiles.java     |  8 +--
 .../master/tableOps/PopulateMetadataTable.java  |  2 +-
 .../accumulo/master/tableOps/TraceRepo.java     |  2 +-
 .../master/tableOps/WriteExportFiles.java       |  2 +-
 .../apache/accumulo/master/DefaultMapTest.java  |  2 +-
 .../master/state/RootTabletStateStoreTest.java  | 10 +--
 .../org/apache/accumulo/monitor/Monitor.java    | 56 +++++++--------
 .../accumulo/monitor/ZooKeeperStatus.java       |  4 +-
 .../monitor/servlets/GcStatusServlet.java       |  2 +-
 .../accumulo/monitor/servlets/JSONServlet.java  | 10 +--
 .../monitor/servlets/MasterServlet.java         |  8 +--
 .../monitor/servlets/ProblemServlet.java        |  2 +-
 .../monitor/servlets/ReplicationServlet.java    |  2 +-
 .../accumulo/monitor/servlets/ShellServlet.java |  2 +-
 .../monitor/servlets/TServersServlet.java       |  8 +--
 .../monitor/servlets/TablesServlet.java         |  8 +--
 .../accumulo/monitor/servlets/VisServlet.java   |  2 +-
 .../accumulo/monitor/servlets/XMLServlet.java   |  2 +-
 .../accumulo/monitor/servlets/trace/Basic.java  |  2 +-
 .../monitor/servlets/trace/Summary.java         |  2 +-
 .../org/apache/accumulo/monitor/util/Table.java |  8 +--
 .../apache/accumulo/monitor/util/TableRow.java  |  4 +-
 .../accumulo/monitor/ShowTraceLinkTypeTest.java |  2 +-
 .../accumulo/monitor/ZooKeeperStatusTest.java   |  4 +-
 .../accumulo/tracer/AsyncSpanReceiver.java      |  6 +-
 .../org/apache/accumulo/tracer/SpanTree.java    |  8 +--
 .../org/apache/accumulo/tracer/TraceDump.java   |  4 +-
 .../org/apache/accumulo/tracer/TraceServer.java |  2 +-
 .../apache/accumulo/tracer/ZooTraceClient.java  |  4 +-
 .../org/apache/accumulo/tracer/TracerTest.java  |  2 +-
 .../accumulo/tserver/CompactionQueue.java       |  2 +-
 .../tserver/ConditionalMutationSet.java         |  4 +-
 .../apache/accumulo/tserver/FileManager.java    | 34 ++++-----
 .../apache/accumulo/tserver/InMemoryMap.java    |  8 +--
 .../org/apache/accumulo/tserver/NativeMap.java  | 10 +--
 .../org/apache/accumulo/tserver/RowLocks.java   | 10 +--
 .../tserver/TabletIteratorEnvironment.java      |  4 +-
 .../apache/accumulo/tserver/TabletServer.java   | 75 ++++++++++----------
 .../tserver/TabletServerResourceManager.java    |  8 +--
 .../apache/accumulo/tserver/WriteTracker.java   |  4 +-
 .../tserver/compaction/CompactionPlan.java      |  8 +--
 .../compaction/DefaultCompactionStrategy.java   | 10 +--
 .../compaction/SizeLimitCompactionStrategy.java |  2 +-
 .../tserver/constraints/ConstraintChecker.java  |  2 +-
 .../apache/accumulo/tserver/log/DfsLogger.java  | 14 ++--
 .../apache/accumulo/tserver/log/LogSorter.java  |  6 +-
 .../accumulo/tserver/log/SortedLogRecovery.java |  4 +-
 .../tserver/log/TabletServerLogger.java         |  6 +-
 .../accumulo/tserver/logger/LogFileValue.java   |  2 +-
 .../accumulo/tserver/logger/LogReader.java      |  4 +-
 .../replication/AccumuloReplicaSystem.java      |  2 +-
 .../accumulo/tserver/scan/LookupTask.java       | 10 +--
 .../apache/accumulo/tserver/scan/ScanTask.java  |  4 +-
 .../tserver/session/MultiScanSession.java       |  2 +-
 .../tserver/session/SessionManager.java         | 16 ++---
 .../accumulo/tserver/session/UpdateSession.java |  8 +--
 .../accumulo/tserver/tablet/CompactionInfo.java |  6 +-
 .../tserver/tablet/CompactionWatcher.java       |  6 +-
 .../accumulo/tserver/tablet/Compactor.java      |  8 +--
 .../tserver/tablet/CountingIterator.java        |  2 +-
 .../tserver/tablet/DatafileManager.java         | 26 +++----
 .../accumulo/tserver/tablet/RootFiles.java      |  2 +-
 .../accumulo/tserver/tablet/ScanDataSource.java |  2 +-
 .../apache/accumulo/tserver/tablet/Tablet.java  | 70 +++++++++---------
 .../accumulo/tserver/tablet/TabletMemory.java   |  2 +-
 .../accumulo/tserver/AssignmentWatcherTest.java |  2 +-
 .../tserver/CheckTabletMetadataTest.java        | 10 +--
 .../accumulo/tserver/CountingIteratorTest.java  |  2 +-
 .../accumulo/tserver/InMemoryMapTest.java       |  4 +-
 .../DefaultCompactionStrategyTest.java          | 10 +--
 .../SizeLimitCompactionStrategyTest.java        |  6 +-
 .../constraints/ConstraintCheckerTest.java      |  2 +-
 .../accumulo/tserver/log/DfsLoggerTest.java     |  2 +-
 .../tserver/log/SortedLogRecoveryTest.java      | 44 ++++++------
 .../accumulo/tserver/tablet/RootFilesTest.java  | 10 +--
 .../java/org/apache/accumulo/shell/Shell.java   | 22 +++---
 .../apache/accumulo/shell/ShellOptionsJC.java   |  6 +-
 .../java/org/apache/accumulo/shell/Token.java   |  8 +--
 .../commands/ActiveCompactionIterator.java      |  8 +--
 .../shell/commands/ActiveScanIterator.java      |  2 +-
 .../shell/commands/AddSplitsCommand.java        |  2 +-
 .../shell/commands/CloneTableCommand.java       |  4 +-
 .../accumulo/shell/commands/ConfigCommand.java  | 12 ++--
 .../shell/commands/CreateTableCommand.java      |  4 +-
 .../accumulo/shell/commands/DUCommand.java      |  2 +-
 .../shell/commands/DeleteAuthsCommand.java      |  2 +-
 .../shell/commands/ExtensionCommand.java        |  6 +-
 .../accumulo/shell/commands/FateCommand.java    |  6 +-
 .../shell/commands/GetAuthsCommand.java         |  2 +-
 .../accumulo/shell/commands/HelpCommand.java    |  2 +-
 .../accumulo/shell/commands/InsertCommand.java  |  2 +-
 .../shell/commands/ListBulkCommand.java         |  2 +-
 .../shell/commands/ListCompactionsCommand.java  |  2 +-
 .../shell/commands/ListIterCommand.java         |  4 +-
 .../shell/commands/ListScansCommand.java        |  2 +-
 .../shell/commands/NamespacesCommand.java       |  2 +-
 .../accumulo/shell/commands/PingCommand.java    |  2 +-
 .../shell/commands/QuotedStringTokenizer.java   |  2 +-
 .../accumulo/shell/commands/ScriptCommand.java  |  4 +-
 .../shell/commands/SetGroupsCommand.java        |  4 +-
 .../accumulo/shell/commands/SetIterCommand.java |  6 +-
 .../shell/commands/SetShellIterCommand.java     |  4 +-
 .../accumulo/shell/commands/TableOperation.java |  2 +-
 .../accumulo/shell/commands/TablesCommand.java  |  2 +-
 .../accumulo/shell/ShellSetInstanceTest.java    |  2 +-
 .../shell/commands/DeleteTableCommandTest.java  |  4 +-
 .../shell/format/DeleterFormatterTest.java      |  9 +--
 .../start/classloader/AccumuloClassLoader.java  |  6 +-
 .../vfs/AccumuloReloadingVFSClassLoader.java    |  4 +-
 .../classloader/vfs/AccumuloVFSClassLoader.java |  6 +-
 .../start/classloader/vfs/ContextManager.java   |  4 +-
 .../AccumuloClusterPropertyConfiguration.java   |  2 +-
 .../accumulo/test/AssignmentThreadsIT.java      |  2 +-
 .../apache/accumulo/test/AuditMessageIT.java    |  4 +-
 .../test/BadDeleteMarkersCreatedIT.java         |  2 +-
 .../apache/accumulo/test/BalanceFasterIT.java   |  4 +-
 .../org/apache/accumulo/test/BalanceIT.java     |  2 +-
 .../test/BalanceWithOfflineTableIT.java         |  2 +-
 .../accumulo/test/BatchWriterIterator.java      |  2 +-
 .../accumulo/test/BulkImportDirectory.java      |  2 +-
 .../accumulo/test/BulkImportMonitoringIT.java   |  2 +-
 .../accumulo/test/ClientSideIteratorIT.java     |  6 +-
 .../java/org/apache/accumulo/test/CloneIT.java  | 10 +--
 .../accumulo/test/ConditionalWriterIT.java      | 36 +++++-----
 .../test/ConfigurableMajorCompactionIT.java     |  2 +-
 .../test/CreateTableWithNewTableConfigIT.java   |  2 +-
 .../apache/accumulo/test/FairVolumeChooser.java |  2 +-
 .../accumulo/test/FaultyConditionalWriter.java  |  4 +-
 .../org/apache/accumulo/test/FindMaxIT.java     |  2 +-
 .../apache/accumulo/test/GetFileInfoBulkIT.java |  2 +-
 .../apache/accumulo/test/IMMLGBenchmark.java    |  8 +--
 .../org/apache/accumulo/test/InMemoryMapIT.java |  8 +--
 .../accumulo/test/InterruptibleScannersIT.java  |  2 +-
 .../apache/accumulo/test/LargeSplitRowIT.java   |  4 +-
 .../org/apache/accumulo/test/LocatorIT.java     |  2 +-
 .../org/apache/accumulo/test/ManySplitIT.java   |  2 +-
 .../test/MasterRepairsDualAssignmentIT.java     |  6 +-
 .../org/apache/accumulo/test/MetaSplitIT.java   |  8 +--
 .../accumulo/test/MultiTableBatchWriterIT.java  | 16 ++---
 .../accumulo/test/NativeMapPerformanceTest.java |  2 +-
 .../accumulo/test/NativeMapStressTest.java      |  8 +--
 .../accumulo/test/QueryMetadataTable.java       |  4 +-
 .../test/RewriteTabletDirectoriesIT.java        |  2 +-
 .../java/org/apache/accumulo/test/SampleIT.java |  6 +-
 .../org/apache/accumulo/test/ShellServerIT.java |  6 +-
 .../accumulo/test/SplitCancelsMajCIT.java       |  4 +-
 .../test/TableConfigurationUpdateIT.java        |  2 +-
 .../apache/accumulo/test/TableOperationsIT.java |  4 +-
 .../apache/accumulo/test/TestBinaryRows.java    |  2 +-
 .../org/apache/accumulo/test/TestIngest.java    |  2 +-
 .../accumulo/test/TestMultiTableIngest.java     |  2 +-
 .../apache/accumulo/test/TestRandomDeletes.java |  4 +-
 .../accumulo/test/TextMemoryUsageTest.java      |  2 +-
 .../accumulo/test/TransportCachingIT.java       |  2 +-
 .../accumulo/test/UserCompactionStrategyIT.java |  4 +-
 .../accumulo/test/VerifySerialRecoveryIT.java   |  2 +-
 .../apache/accumulo/test/VolumeChooserIT.java   |  6 +-
 .../java/org/apache/accumulo/test/VolumeIT.java | 14 ++--
 .../apache/accumulo/test/WaitForBalanceIT.java  |  4 +-
 .../test/continuous/ContinuousBatchWalker.java  | 12 ++--
 .../test/continuous/ContinuousIngest.java       |  2 +-
 .../continuous/ContinuousStatsCollector.java    |  2 +-
 .../test/continuous/ContinuousVerify.java       |  2 +-
 .../test/continuous/ContinuousWalk.java         |  4 +-
 .../accumulo/test/continuous/Histogram.java     | 12 ++--
 .../test/continuous/PrintScanTimeHistogram.java |  4 +-
 .../accumulo/test/continuous/TimeBinner.java    | 10 +--
 .../test/continuous/UndefinedAnalyzer.java      | 14 ++--
 .../test/examples/simple/dirlist/CountIT.java   | 10 +--
 .../simple/filedata/ChunkInputFormatIT.java     |  4 +-
 .../simple/filedata/ChunkInputStreamIT.java     |  8 +--
 .../accumulo/test/functional/AddSplitIT.java    |  6 +-
 .../functional/BalanceAfterCommsFailureIT.java  |  6 +-
 .../BalanceInPresenceOfOfflineTableIT.java      |  2 +-
 .../test/functional/BatchScanSplitIT.java       |  6 +-
 .../test/functional/BatchWriterFlushIT.java     |  2 +-
 .../accumulo/test/functional/BinaryIT.java      |  2 +-
 .../accumulo/test/functional/BloomFilterIT.java |  4 +-
 .../accumulo/test/functional/BulkFileIT.java    |  2 +-
 .../test/functional/CacheTestReader.java        |  2 +-
 .../test/functional/CacheTestWriter.java        |  4 +-
 .../test/functional/ChaoticBalancerIT.java      |  2 +-
 .../accumulo/test/functional/CloneTestIT.java   | 20 +++---
 .../functional/ConfigurableCompactionIT.java    |  2 +-
 .../accumulo/test/functional/ConstraintIT.java  |  2 +-
 .../test/functional/CreateAndUseIT.java         |  4 +-
 .../accumulo/test/functional/DeleteRowsIT.java  |  4 +-
 .../test/functional/DeleteRowsSplitIT.java      |  6 +-
 .../functional/DeleteTableDuringSplitIT.java    |  6 +-
 .../accumulo/test/functional/DurabilityIT.java  |  2 +-
 .../test/functional/FateStarvationIT.java       |  2 +-
 .../test/functional/FunctionalTestUtils.java    |  4 +-
 .../test/functional/HalfDeadTServerIT.java      |  2 +-
 .../accumulo/test/functional/LargeRowIT.java    |  2 +-
 .../accumulo/test/functional/LogicalTimeIT.java |  2 +-
 .../accumulo/test/functional/MaxOpenIT.java     |  2 +-
 .../accumulo/test/functional/MergeIT.java       | 12 ++--
 .../accumulo/test/functional/MetadataIT.java    |  8 +--
 .../test/functional/MetadataMaxFilesIT.java     |  2 +-
 .../accumulo/test/functional/NativeMapIT.java   |  6 +-
 .../accumulo/test/functional/PermissionsIT.java | 10 +--
 .../accumulo/test/functional/ReadWriteIT.java   |  6 +-
 .../accumulo/test/functional/RowDeleteIT.java   |  2 +-
 .../accumulo/test/functional/ScanIdIT.java      |  6 +-
 .../test/functional/ScanIteratorIT.java         |  6 +-
 .../accumulo/test/functional/ScanRangeIT.java   |  2 +-
 .../test/functional/SessionBlockVerifyIT.java   |  2 +-
 .../accumulo/test/functional/ShutdownIT.java    |  2 +-
 .../functional/SimpleBalancerFairnessIT.java    |  2 +-
 .../test/functional/SplitRecoveryIT.java        | 12 ++--
 .../accumulo/test/functional/TabletIT.java      |  2 +-
 .../functional/TabletStateChangeIteratorIT.java |  4 +-
 .../accumulo/test/functional/VisibilityIT.java  | 18 ++---
 .../accumulo/test/functional/WALSunnyDayIT.java |  2 +-
 .../accumulo/test/functional/WriteLotsIT.java   |  2 +-
 .../accumulo/test/functional/ZombieTServer.java |  5 +-
 .../accumulo/test/functional/ZooCacheIT.java    |  4 +-
 .../test/functional/ZookeeperRestartIT.java     |  2 +-
 .../test/mapred/AccumuloInputFormatIT.java      |  2 +-
 .../mapred/AccumuloMultiTableInputFormatIT.java |  2 +-
 .../test/mapred/AccumuloRowInputFormatIT.java   |  6 +-
 .../test/mapreduce/AccumuloInputFormatIT.java   | 10 +--
 .../AccumuloMultiTableInputFormatIT.java        |  2 +-
 .../mapreduce/AccumuloRowInputFormatIT.java     |  6 +-
 .../test/performance/RollWALPerformanceIT.java  |  2 +-
 .../metadata/MetadataBatchScanTest.java         |  8 +--
 .../performance/scan/CollectTabletStats.java    | 24 +++----
 .../test/performance/thrift/NullTserver.java    |  6 +-
 .../accumulo/test/proxy/ProxyDurabilityIT.java  |  4 +-
 .../accumulo/test/proxy/SimpleProxyBase.java    | 28 ++++----
 .../accumulo/test/proxy/TestProxyClient.java    |  4 +-
 .../accumulo/test/proxy/TestProxyReadWrite.java | 20 +++---
 .../test/proxy/TestProxySecurityOperations.java |  4 +-
 .../test/proxy/TestProxyTableOperations.java    | 12 ++--
 .../accumulo/test/randomwalk/Framework.java     |  2 +-
 .../apache/accumulo/test/randomwalk/Module.java | 18 ++---
 .../apache/accumulo/test/randomwalk/State.java  |  2 +-
 .../test/randomwalk/bulk/BulkPlusOne.java       |  8 +--
 .../accumulo/test/randomwalk/bulk/Split.java    |  2 +-
 .../test/randomwalk/concurrent/AddSplits.java   |  4 +-
 .../test/randomwalk/concurrent/BatchScan.java   |  2 +-
 .../test/randomwalk/concurrent/BulkImport.java  |  2 +-
 .../concurrent/ChangeAuthorizations.java        |  2 +-
 .../concurrent/ChangePermissions.java           | 12 ++--
 .../concurrent/ConcurrentFixture.java           |  2 +-
 .../test/randomwalk/concurrent/DeleteRange.java |  2 +-
 .../randomwalk/concurrent/IsolatedScan.java     |  2 +-
 .../test/randomwalk/concurrent/Merge.java       |  2 +-
 .../test/randomwalk/concurrent/Setup.java       |  6 +-
 .../randomwalk/concurrent/StopTabletServer.java |  4 +-
 .../test/randomwalk/conditional/Init.java       |  4 +-
 .../test/randomwalk/conditional/Split.java      |  2 +-
 .../test/randomwalk/image/ImageFixture.java     |  8 +--
 .../test/randomwalk/image/ScanMeta.java         |  6 +-
 .../accumulo/test/randomwalk/image/TableOp.java |  2 +-
 .../test/randomwalk/multitable/CopyTable.java   |  2 +-
 .../test/randomwalk/multitable/CreateTable.java |  2 +-
 .../test/randomwalk/security/TableOp.java       |  2 +-
 .../randomwalk/security/WalkingSecurity.java    |  4 +-
 .../test/randomwalk/sequential/BatchVerify.java |  4 +-
 .../test/randomwalk/shard/CompactFilter.java    |  6 +-
 .../test/randomwalk/shard/DeleteSomeDocs.java   |  2 +-
 .../test/randomwalk/shard/DeleteWord.java       |  2 +-
 .../test/randomwalk/shard/ExportIndex.java      |  8 +--
 .../accumulo/test/randomwalk/shard/Grep.java    |  4 +-
 .../accumulo/test/randomwalk/shard/Insert.java  |  2 +-
 .../accumulo/test/randomwalk/shard/Merge.java   |  2 +-
 .../accumulo/test/randomwalk/shard/Search.java  |  2 +-
 .../test/randomwalk/shard/ShardFixture.java     |  2 +-
 .../test/replication/CyclicReplicationIT.java   |  2 +-
 ...bageCollectorCommunicatesWithTServersIT.java |  6 +-
 .../replication/MultiInstanceReplicationIT.java |  2 +-
 .../test/replication/StatusCombinerMacIT.java   |  2 +-
 .../UnorderedWorkAssignerReplicationIT.java     |  2 +-
 .../test/replication/merkle/MerkleTree.java     |  6 +-
 .../test/replication/merkle/MerkleTreeNode.java |  2 +-
 .../replication/merkle/cli/ComputeRootHash.java |  2 +-
 .../replication/merkle/cli/GenerateHashes.java  |  4 +-
 .../accumulo/test/scalability/ScaleTest.java    |  2 +-
 .../apache/accumulo/test/util/CertUtils.java    |  2 +-
 .../accumulo/test/iterator/RegExTest.java       |  2 +-
 646 files changed, 2313 insertions(+), 2322 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/core/src/main/java/org/apache/accumulo/core/client/ClientSideIteratorScanner.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/core/src/main/java/org/apache/accumulo/core/client/IsolatedScanner.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/core/src/main/java/org/apache/accumulo/core/client/MutationsRejectedException.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/core/src/main/java/org/apache/accumulo/core/client/admin/ActiveCompaction.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/core/src/main/java/org/apache/accumulo/core/client/impl/ActiveCompactionImpl.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/core/src/main/java/org/apache/accumulo/core/client/impl/ActiveScanImpl.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/core/src/main/java/org/apache/accumulo/core/client/impl/Namespaces.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/core/src/main/java/org/apache/accumulo/core/client/impl/ScannerIterator.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/core/src/main/java/org/apache/accumulo/core/client/impl/ThriftScanner.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/core/src/main/java/org/apache/accumulo/core/client/mapred/AbstractInputFormat.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/core/src/main/java/org/apache/accumulo/core/client/mapreduce/RangeInputSplit.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/accumulo/core/client/mapreduce/RangeInputSplit.java
index 63691f4,1e89500..081054d
--- a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/RangeInputSplit.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/RangeInputSplit.java
@@@ -154,8 -155,12 +154,8 @@@ public class RangeInputSplit extends In
      }
  
      if (in.readBoolean()) {
 -      mockInstance = in.readBoolean();
 -    }
 -
 -    if (in.readBoolean()) {
        int numColumns = in.readInt();
-       List<String> columns = new ArrayList<String>(numColumns);
+       List<String> columns = new ArrayList<>(numColumns);
        for (int i = 0; i < numColumns; i++) {
          columns.add(in.readUTF());
        }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/impl/InputConfigurator.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/impl/InputConfigurator.java
index e07ba32,986e071..92ae7a4
--- a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/impl/InputConfigurator.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/impl/InputConfigurator.java
@@@ -235,9 -238,9 +235,9 @@@ public class InputConfigurator extends 
    public static List<Range> getRanges(Class<?> implementingClass, Configuration conf) throws IOException {
  
      Collection<String> encodedRanges = conf.getStringCollection(enumToConfKey(implementingClass, ScanOpts.RANGES));
-     List<Range> ranges = new ArrayList<Range>();
+     List<Range> ranges = new ArrayList<>();
      for (String rangeString : encodedRanges) {
 -      ByteArrayInputStream bais = new ByteArrayInputStream(Base64.decodeBase64(rangeString.getBytes(UTF_8)));
 +      ByteArrayInputStream bais = new ByteArrayInputStream(Base64.getDecoder().decode(rangeString));
        Range range = new Range();
        range.readFields(new DataInputStream(bais));
        ranges.add(range);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/partition/RangePartitioner.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/core/src/main/java/org/apache/accumulo/core/conf/AccumuloConfiguration.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/core/src/main/java/org/apache/accumulo/core/conf/Property.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/core/src/main/java/org/apache/accumulo/core/conf/PropertyType.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/core/src/main/java/org/apache/accumulo/core/data/impl/KeyExtent.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/core/src/main/java/org/apache/accumulo/core/file/rfile/MultiLevelIndex.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/core/src/main/java/org/apache/accumulo/core/iterators/IteratorUtil.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/core/src/main/java/org/apache/accumulo/core/security/Authorizations.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/core/src/main/java/org/apache/accumulo/core/security/crypto/CachingHDFSSecretKeyEncryptionStrategy.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/core/src/main/java/org/apache/accumulo/core/trace/DistributedTrace.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/accumulo/core/trace/DistributedTrace.java
index f2a6941,f833b11..bb8a683
--- a/core/src/main/java/org/apache/accumulo/core/trace/DistributedTrace.java
+++ b/core/src/main/java/org/apache/accumulo/core/trace/DistributedTrace.java
@@@ -49,9 -52,17 +49,9 @@@ public class DistributedTrace 
    public static final String TRACER_ZK_TIMEOUT = "tracer.zookeeper.timeout";
    public static final String TRACER_ZK_PATH = "tracer.zookeeper.path";
  
-   private static final HashSet<SpanReceiver> receivers = new HashSet<SpanReceiver>();
+   private static final HashSet<SpanReceiver> receivers = new HashSet<>();
  
    /**
 -   * @deprecated since 1.7, use {@link DistributedTrace#enable(String, String, org.apache.accumulo.core.client.ClientConfiguration)} instead
 -   */
 -  @Deprecated
 -  public static void enable(Instance instance, ZooReader zoo, String application, String address) throws IOException, KeeperException, InterruptedException {
 -    enable(address, application);
 -  }
 -
 -  /**
     * Enable tracing by setting up SpanReceivers for the current process.
     */
    public static void enable() {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/core/src/test/java/org/apache/accumulo/core/client/impl/TableOperationsHelperTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/core/src/test/java/org/apache/accumulo/core/client/impl/TabletLocatorImplTest.java
----------------------------------------------------------------------
diff --cc core/src/test/java/org/apache/accumulo/core/client/impl/TabletLocatorImplTest.java
index fbeb69b,bab52f6..d7988ff
--- a/core/src/test/java/org/apache/accumulo/core/client/impl/TabletLocatorImplTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/client/impl/TabletLocatorImplTest.java
@@@ -83,9 -85,10 +83,9 @@@ public class TabletLocatorImplTest 
      return objs;
    }
  
 -  @SuppressWarnings("unchecked")
    static Map<String,Map<KeyExtent,List<Range>>> createExpectedBinnings(Object... data) {
  
-     Map<String,Map<KeyExtent,List<Range>>> expBinnedRanges = new HashMap<String,Map<KeyExtent,List<Range>>>();
+     Map<String,Map<KeyExtent,List<Range>>> expBinnedRanges = new HashMap<>();
  
      for (int i = 0; i < data.length; i += 2) {
        String loc = (String) data[i];

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/core/src/test/java/org/apache/accumulo/core/client/mapred/RangeInputSplitTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormatTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/core/src/test/java/org/apache/accumulo/core/client/mapreduce/RangeInputSplitTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/core/src/test/java/org/apache/accumulo/core/client/mapreduce/impl/BatchInputSplitTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/core/src/test/java/org/apache/accumulo/core/data/KeyExtentTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/RowHash.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/server/base/src/main/java/org/apache/accumulo/server/conf/NamespaceConfiguration.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/server/base/src/main/java/org/apache/accumulo/server/conf/TableConfiguration.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/server/base/src/main/java/org/apache/accumulo/server/fs/PreferredVolumeChooser.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeManagerImpl.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeUtil.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/server/base/src/main/java/org/apache/accumulo/server/master/balancer/GroupBalancer.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/server/base/src/main/java/org/apache/accumulo/server/master/state/TabletStateChangeIterator.java
----------------------------------------------------------------------
diff --cc server/base/src/main/java/org/apache/accumulo/server/master/state/TabletStateChangeIterator.java
index fbaa1d9,973bbd2..a807660
--- a/server/base/src/main/java/org/apache/accumulo/server/master/state/TabletStateChangeIterator.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/master/state/TabletStateChangeIterator.java
@@@ -88,9 -90,9 +88,9 @@@ public class TabletStateChangeIterator 
      if (migrations == null)
        return Collections.emptySet();
      try {
-       Set<KeyExtent> result = new HashSet<KeyExtent>();
+       Set<KeyExtent> result = new HashSet<>();
        DataInputBuffer buffer = new DataInputBuffer();
 -      byte[] data = Base64.decodeBase64(migrations.getBytes(UTF_8));
 +      byte[] data = Base64.getDecoder().decode(migrations);
        buffer.reset(data, data.length);
        while (buffer.available() > 0) {
          KeyExtent extent = new KeyExtent();
@@@ -134,9 -136,9 +134,9 @@@
      if (merges == null)
        return null;
      try {
-       Map<String,MergeInfo> result = new HashMap<String,MergeInfo>();
+       Map<String,MergeInfo> result = new HashMap<>();
        DataInputBuffer buffer = new DataInputBuffer();
 -      byte[] data = Base64.decodeBase64(merges.getBytes(UTF_8));
 +      byte[] data = Base64.getDecoder().decode(merges);
        buffer.reset(data, data.length);
        while (buffer.available() > 0) {
          MergeInfo mergeInfo = new MergeInfo();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/server/base/src/main/java/org/apache/accumulo/server/util/FileUtil.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/server/base/src/main/java/org/apache/accumulo/server/util/RestoreZookeeper.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/server/base/src/test/java/org/apache/accumulo/server/conf/NamespaceConfigurationTest.java
----------------------------------------------------------------------
diff --cc server/base/src/test/java/org/apache/accumulo/server/conf/NamespaceConfigurationTest.java
index e9ebb45,071e9c0..40753ff
--- a/server/base/src/test/java/org/apache/accumulo/server/conf/NamespaceConfigurationTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/conf/NamespaceConfigurationTest.java
@@@ -115,11 -117,11 +115,11 @@@ public class NamespaceConfigurationTes
  
    @Test
    public void testGetProperties() {
 -    Predicate<String> all = Predicates.alwaysTrue();
 -    Map<String,String> props = new java.util.HashMap<>();
 +    Predicate<String> all = x -> true;
 +    Map<String,String> props = new java.util.HashMap<String,String>();
      parent.getProperties(props, all);
      replay(parent);
-     List<String> children = new java.util.ArrayList<String>();
+     List<String> children = new java.util.ArrayList<>();
      children.add("foo");
      children.add("ding");
      expect(zc.getChildren(ZooUtil.getRoot(iid) + Constants.ZNAMESPACES + "/" + NSID + Constants.ZNAMESPACE_CONF)).andReturn(children);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/server/base/src/test/java/org/apache/accumulo/server/conf/TableConfigurationTest.java
----------------------------------------------------------------------
diff --cc server/base/src/test/java/org/apache/accumulo/server/conf/TableConfigurationTest.java
index 8366c3d,34d6905..c67dae9
--- a/server/base/src/test/java/org/apache/accumulo/server/conf/TableConfigurationTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/conf/TableConfigurationTest.java
@@@ -99,11 -101,11 +99,11 @@@ public class TableConfigurationTest 
  
    @Test
    public void testGetProperties() {
 -    Predicate<String> all = Predicates.alwaysTrue();
 -    Map<String,String> props = new java.util.HashMap<>();
 +    Predicate<String> all = x -> true;
 +    Map<String,String> props = new java.util.HashMap<String,String>();
      parent.getProperties(props, all);
      replay(parent);
-     List<String> children = new java.util.ArrayList<String>();
+     List<String> children = new java.util.ArrayList<>();
      children.add("foo");
      children.add("ding");
      expect(zc.getChildren(ZooUtil.getRoot(iid) + Constants.ZTABLES + "/" + TID + Constants.ZTABLE_CONF)).andReturn(children);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/server/base/src/test/java/org/apache/accumulo/server/conf/ZooCachePropertyAccessorTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/server/base/src/test/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancerTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/server/base/src/test/java/org/apache/accumulo/server/rpc/TCredentialsUpdatingInvocationHandlerTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/server/base/src/test/java/org/apache/accumulo/server/util/FileUtilTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/server/base/src/test/java/org/apache/accumulo/server/util/TServerUtilsTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/server/master/src/main/java/org/apache/accumulo/master/FateServiceHandler.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/server/master/src/main/java/org/apache/accumulo/master/Master.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/server/master/src/main/java/org/apache/accumulo/master/TabletGroupWatcher.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/server/master/src/main/java/org/apache/accumulo/master/tableOps/PopulateMetadataTable.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/ShellServlet.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/TServersServlet.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/server/tracer/src/test/java/org/apache/accumulo/tracer/TracerTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/server/tserver/src/main/java/org/apache/accumulo/tserver/InMemoryMap.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/server/tserver/src/test/java/org/apache/accumulo/tserver/log/SortedLogRecoveryTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/server/tserver/src/test/java/org/apache/accumulo/tserver/tablet/RootFilesTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/shell/src/main/java/org/apache/accumulo/shell/Shell.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/shell/src/main/java/org/apache/accumulo/shell/ShellOptionsJC.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/shell/src/main/java/org/apache/accumulo/shell/commands/FateCommand.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/shell/src/main/java/org/apache/accumulo/shell/commands/NamespacesCommand.java
----------------------------------------------------------------------
diff --cc shell/src/main/java/org/apache/accumulo/shell/commands/NamespacesCommand.java
index 825153c,cb37505..a7ae6a7
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/NamespacesCommand.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/NamespacesCommand.java
@@@ -39,17 -41,20 +39,17 @@@ public class NamespacesCommand extends 
  
    @Override
    public int execute(final String fullCommand, final CommandLine cl, final Shell shellState) throws AccumuloException, AccumuloSecurityException, IOException {
-     Map<String,String> namespaces = new TreeMap<String,String>(shellState.getConnector().namespaceOperations().namespaceIdMap());
+     Map<String,String> namespaces = new TreeMap<>(shellState.getConnector().namespaceOperations().namespaceIdMap());
  
 -    Iterator<String> it = Iterators.transform(namespaces.entrySet().iterator(), new Function<Entry<String,String>,String>() {
 -      @Override
 -      public String apply(Map.Entry<String,String> entry) {
 -        String name = entry.getKey();
 -        if (Namespaces.DEFAULT_NAMESPACE.equals(name))
 -          name = DEFAULT_NAMESPACE_DISPLAY_NAME;
 -        String id = entry.getValue();
 -        if (cl.hasOption(namespaceIdOption.getOpt()))
 -          return String.format(TablesCommand.NAME_AND_ID_FORMAT, name, id);
 -        else
 -          return name;
 -      }
 +    Iterator<String> it = Iterators.transform(namespaces.entrySet().iterator(), entry -> {
 +      String name = entry.getKey();
 +      if (Namespaces.DEFAULT_NAMESPACE.equals(name))
 +        name = DEFAULT_NAMESPACE_DISPLAY_NAME;
 +      String id = entry.getValue();
 +      if (cl.hasOption(namespaceIdOption.getOpt()))
 +        return String.format(TablesCommand.NAME_AND_ID_FORMAT, name, id);
 +      else
 +        return name;
      });
  
      shellState.printLines(it, !cl.hasOption(disablePaginationOpt.getOpt()));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/shell/src/main/java/org/apache/accumulo/shell/commands/SetIterCommand.java
----------------------------------------------------------------------
diff --cc shell/src/main/java/org/apache/accumulo/shell/commands/SetIterCommand.java
index 59c03e0,fffdf21..6e89298
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/SetIterCommand.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/SetIterCommand.java
@@@ -64,9 -64,14 +64,9 @@@ public class SetIterCommand extends Com
  
      final int priority = Integer.parseInt(cl.getOptionValue(priorityOpt.getOpt()));
  
-     final Map<String,String> options = new HashMap<String,String>();
+     final Map<String,String> options = new HashMap<>();
      String classname = cl.getOptionValue(classnameTypeOpt.getOpt());
 -    if (cl.hasOption(aggTypeOpt.getOpt())) {
 -      Shell.log.warn("aggregators are deprecated");
 -      @SuppressWarnings("deprecation")
 -      String deprecatedClassName = org.apache.accumulo.core.iterators.AggregatingIterator.class.getName();
 -      classname = deprecatedClassName;
 -    } else if (cl.hasOption(regexTypeOpt.getOpt())) {
 +    if (cl.hasOption(regexTypeOpt.getOpt())) {
        classname = RegExFilter.class.getName();
      } else if (cl.hasOption(ageoffTypeOpt.getOpt())) {
        classname = AgeOffFilter.class.getName();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/shell/src/main/java/org/apache/accumulo/shell/commands/TablesCommand.java
----------------------------------------------------------------------
diff --cc shell/src/main/java/org/apache/accumulo/shell/commands/TablesCommand.java
index 8bf96e7,397b450..0390c4e
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/TablesCommand.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/TablesCommand.java
@@@ -51,20 -54,28 +51,20 @@@ public class TablesCommand extends Comm
      Map<String,String> tables = shellState.getConnector().tableOperations().tableIdMap();
  
      // filter only specified namespace
 -    tables = Maps.filterKeys(tables, new Predicate<String>() {
 -      @Override
 -      public boolean apply(String tableName) {
 -        return namespace == null || Tables.qualify(tableName).getFirst().equals(namespace);
 -      }
 -    });
 +    tables = Maps.filterKeys(tables, tableName -> namespace == null || Tables.qualify(tableName).getFirst().equals(namespace));
  
      final boolean sortByTableId = cl.hasOption(sortByTableIdOption.getOpt());
-     tables = new TreeMap<String,String>((sortByTableId ? MapUtils.invertMap(tables) : tables));
+     tables = new TreeMap<>((sortByTableId ? MapUtils.invertMap(tables) : tables));
  
 -    Iterator<String> it = Iterators.transform(tables.entrySet().iterator(), new Function<Entry<String,String>,String>() {
 -      @Override
 -      public String apply(Map.Entry<String,String> entry) {
 -        String tableName = String.valueOf(sortByTableId ? entry.getValue() : entry.getKey());
 -        String tableId = String.valueOf(sortByTableId ? entry.getKey() : entry.getValue());
 -        if (namespace != null)
 -          tableName = Tables.qualify(tableName).getSecond();
 -        if (cl.hasOption(tableIdOption.getOpt()))
 -          return String.format(NAME_AND_ID_FORMAT, tableName, tableId);
 -        else
 -          return tableName;
 -      }
 +    Iterator<String> it = Iterators.transform(tables.entrySet().iterator(), entry -> {
 +      String tableName = String.valueOf(sortByTableId ? entry.getValue() : entry.getKey());
 +      String tableId = String.valueOf(sortByTableId ? entry.getKey() : entry.getValue());
 +      if (namespace != null)
 +        tableName = Tables.qualify(tableName).getSecond();
 +      if (cl.hasOption(tableIdOption.getOpt()))
 +        return String.format(NAME_AND_ID_FORMAT, tableName, tableId);
 +      else
 +        return tableName;
      });
  
      shellState.printLines(it, !cl.hasOption(disablePaginationOpt.getOpt()));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/shell/src/test/java/org/apache/accumulo/shell/ShellSetInstanceTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/test/src/main/java/org/apache/accumulo/test/BulkImportDirectory.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/test/src/main/java/org/apache/accumulo/test/CreateTableWithNewTableConfigIT.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/test/src/main/java/org/apache/accumulo/test/ShellServerIT.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/test/src/main/java/org/apache/accumulo/test/VolumeIT.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/test/src/main/java/org/apache/accumulo/test/functional/TabletStateChangeIteratorIT.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d8e745/test/src/main/java/org/apache/accumulo/test/util/CertUtils.java
----------------------------------------------------------------------


[25/32] accumulo git commit: ACCUMULO-4357 Remove unneeded code for readability

Posted by ct...@apache.org.
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/iterators/user/FilterTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/iterators/user/FilterTest.java b/core/src/test/java/org/apache/accumulo/core/iterators/user/FilterTest.java
index 0c4ffa2..61d98e6 100644
--- a/core/src/test/java/org/apache/accumulo/core/iterators/user/FilterTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/iterators/user/FilterTest.java
@@ -48,8 +48,8 @@ import org.junit.Test;
 
 public class FilterTest {
 
-  private static final Collection<ByteSequence> EMPTY_COL_FAMS = new ArrayList<ByteSequence>();
-  private static final Map<String,String> EMPTY_OPTS = new HashMap<String,String>();
+  private static final Collection<ByteSequence> EMPTY_COL_FAMS = new ArrayList<>();
+  private static final Map<String,String> EMPTY_OPTS = new HashMap<>();
 
   public static class SimpleFilter extends Filter {
     @Override
@@ -85,7 +85,7 @@ public class FilterTest {
     Text colf = new Text("a");
     Text colq = new Text("b");
     Value dv = new Value();
-    TreeMap<Key,Value> tm = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm = new TreeMap<>();
 
     for (int i = 0; i < 1000; i++) {
       Key k = new Key(new Text(String.format("%03d", i)), colf, colq);
@@ -120,7 +120,7 @@ public class FilterTest {
     Text colf = new Text("a");
     Text colq = new Text("b");
     Value dv = new Value();
-    TreeMap<Key,Value> tm = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm = new TreeMap<>();
 
     for (int i = 0; i < 1000; i++) {
       Key k = new Key(new Text(String.format("%03d", i)), colf, colq);
@@ -157,7 +157,7 @@ public class FilterTest {
     Text colf = new Text("a");
     Text colq = new Text("b");
     Value dv = new Value();
-    TreeMap<Key,Value> tm = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm = new TreeMap<>();
 
     for (int i = 0; i < 1000; i++) {
       Key k = new Key(new Text(String.format("%03d", i)), colf, colq);
@@ -185,7 +185,7 @@ public class FilterTest {
     Text colf = new Text("a");
     Text colq = new Text("b");
     Value dv = new Value();
-    TreeMap<Key,Value> tm = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm = new TreeMap<>();
 
     for (int i = 0; i < 1000; i++) {
       Key k = new Key(new Text(String.format("%03d", i)), colf, colq);
@@ -218,7 +218,7 @@ public class FilterTest {
     Text colf = new Text("a");
     Text colq = new Text("b");
     Value dv = new Value();
-    TreeMap<Key,Value> tm = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm = new TreeMap<>();
     IteratorSetting is = new IteratorSetting(1, ColumnAgeOffFilter.class);
     ColumnAgeOffFilter.addTTL(is, new IteratorSetting.Column("a"), 901l);
     long ts = System.currentTimeMillis();
@@ -253,8 +253,8 @@ public class FilterTest {
   @Test
   public void test3() throws IOException {
     Value dv = new Value();
-    TreeMap<Key,Value> tm = new TreeMap<Key,Value>();
-    HashSet<Column> hsc = new HashSet<Column>();
+    TreeMap<Key,Value> tm = new TreeMap<>();
+    HashSet<Column> hsc = new HashSet<>();
     hsc.add(new Column("c".getBytes(), null, null));
 
     Text colf1 = new Text("a");
@@ -281,14 +281,14 @@ public class FilterTest {
     a.seek(new Range(), EMPTY_COL_FAMS, false);
     assertEquals(size(a), 1000);
 
-    hsc = new HashSet<Column>();
+    hsc = new HashSet<>();
     hsc.add(new Column("a".getBytes(), "b".getBytes(), null));
     a = new ColumnQualifierFilter(new SortedMapIterator(tm), hsc);
     a.seek(new Range(), EMPTY_COL_FAMS, false);
     int size = size(a);
     assertTrue("size was " + size, size == 500);
 
-    hsc = new HashSet<Column>();
+    hsc = new HashSet<>();
     a = new ColumnQualifierFilter(new SortedMapIterator(tm), hsc);
     a.seek(new Range(), EMPTY_COL_FAMS, false);
     size = size(a);
@@ -298,7 +298,7 @@ public class FilterTest {
   @Test
   public void test4() throws IOException {
     Value dv = new Value();
-    TreeMap<Key,Value> tm = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm = new TreeMap<>();
 
     ColumnVisibility le1 = new ColumnVisibility("L1");
     ColumnVisibility le2 = new ColumnVisibility("L0&OFFICIAL");
@@ -320,7 +320,7 @@ public class FilterTest {
   }
 
   private ColumnQualifierFilter ncqf(TreeMap<Key,Value> tm, Column... columns) throws IOException {
-    HashSet<Column> hsc = new HashSet<Column>();
+    HashSet<Column> hsc = new HashSet<>();
 
     for (Column column : columns) {
       hsc.add(column);
@@ -334,7 +334,7 @@ public class FilterTest {
   @Test
   public void test5() throws IOException {
     Value dv = new Value();
-    TreeMap<Key,Value> tm = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm = new TreeMap<>();
 
     tm.put(new Key(new Text(String.format("%03d", 1)), new Text("a"), new Text("x")), dv);
     tm.put(new Key(new Text(String.format("%03d", 2)), new Text("a"), new Text("y")), dv);
@@ -365,7 +365,7 @@ public class FilterTest {
 
   @Test
   public void testNoVisFilter() throws IOException {
-    TreeMap<Key,Value> tm = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm = new TreeMap<>();
     Value v = new Value();
     for (int i = 0; i < 1000; i++) {
       Key k = new Key(String.format("%03d", i), "a", "b", i % 10 == 0 ? "vis" : "");
@@ -385,7 +385,7 @@ public class FilterTest {
     Text colf = new Text("a");
     Text colq = new Text("b");
     Value dv = new Value();
-    TreeMap<Key,Value> tm = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm = new TreeMap<>();
 
     for (int i = 0; i < 100; i++) {
       Key k = new Key(new Text(String.format("%02d", i)), colf, colq);
@@ -482,7 +482,7 @@ public class FilterTest {
     Text colf = new Text("a");
     Text colq = new Text("b");
     Value dv = new Value();
-    TreeMap<Key,Value> tm = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm = new TreeMap<>();
 
     Key k = new Key(new Text("0"), colf, colq);
     tm.put(k, dv);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/iterators/user/GrepIteratorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/iterators/user/GrepIteratorTest.java b/core/src/test/java/org/apache/accumulo/core/iterators/user/GrepIteratorTest.java
index 23af994..3a47f5a 100644
--- a/core/src/test/java/org/apache/accumulo/core/iterators/user/GrepIteratorTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/iterators/user/GrepIteratorTest.java
@@ -38,14 +38,14 @@ import org.junit.Before;
 import org.junit.Test;
 
 public class GrepIteratorTest {
-  private static final Collection<ByteSequence> EMPTY_COL_FAMS = new ArrayList<ByteSequence>();
+  private static final Collection<ByteSequence> EMPTY_COL_FAMS = new ArrayList<>();
   SortedMap<Key,Value> input;
   SortedMap<Key,Value> output;
 
   @Before
   public void init() {
-    input = new TreeMap<Key,Value>();
-    output = new TreeMap<Key,Value>();
+    input = new TreeMap<>();
+    output = new TreeMap<>();
     input.put(new Key("abcdef", "xyz", "xyz", 0), new Value("xyz".getBytes()));
     output.put(new Key("abcdef", "xyz", "xyz", 0), new Value("xyz".getBytes()));
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/iterators/user/IndexedDocIteratorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/iterators/user/IndexedDocIteratorTest.java b/core/src/test/java/org/apache/accumulo/core/iterators/user/IndexedDocIteratorTest.java
index 117fcac..cb6d3f7 100644
--- a/core/src/test/java/org/apache/accumulo/core/iterators/user/IndexedDocIteratorTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/iterators/user/IndexedDocIteratorTest.java
@@ -46,7 +46,7 @@ public class IndexedDocIteratorTest extends TestCase {
 
   private static final Logger log = Logger.getLogger(IndexedDocIteratorTest.class);
 
-  private static final Collection<ByteSequence> EMPTY_COL_FAMS = new ArrayList<ByteSequence>();
+  private static final Collection<ByteSequence> EMPTY_COL_FAMS = new ArrayList<>();
   private static final byte[] nullByte = {0};
 
   private static IteratorEnvironment env = new DefaultIteratorEnvironment();
@@ -71,7 +71,7 @@ public class IndexedDocIteratorTest extends TestCase {
     StringBuilder sb = new StringBuilder();
     Random r = new Random();
     Value v = new Value(new byte[0]);
-    TreeMap<Key,Value> map = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> map = new TreeMap<>();
     boolean[] negateMask = new boolean[columnFamilies.length];
 
     for (int i = 0; i < columnFamilies.length; i++) {
@@ -189,7 +189,7 @@ public class IndexedDocIteratorTest extends TestCase {
     otherColumnFamilies[3] = new Text("F");
 
     float hitRatio = 0.5f;
-    HashSet<Text> docs = new HashSet<Text>();
+    HashSet<Text> docs = new HashSet<>();
     SortedKeyValueIterator<Key,Value> source = createIteratorStack(hitRatio, NUM_ROWS, NUM_DOCIDS, columnFamilies, otherColumnFamilies, docs);
     IteratorSetting is = new IteratorSetting(1, IndexedDocIterator.class);
     IndexedDocIterator.setColumnFamilies(is, columnFamilies);
@@ -227,7 +227,7 @@ public class IndexedDocIteratorTest extends TestCase {
     otherColumnFamilies[3] = new Text("F");
 
     float hitRatio = 0.5f;
-    HashSet<Text> docs = new HashSet<Text>();
+    HashSet<Text> docs = new HashSet<>();
     SortedKeyValueIterator<Key,Value> source = createIteratorStack(hitRatio, NUM_ROWS, NUM_DOCIDS, columnFamilies, otherColumnFamilies, docs);
     IteratorSetting is = new IteratorSetting(1, IndexedDocIterator.class);
     IndexedDocIterator.setColumnFamilies(is, columnFamilies);
@@ -264,10 +264,10 @@ public class IndexedDocIteratorTest extends TestCase {
     otherColumnFamilies[3] = new Text("F");
 
     float hitRatio = 0.5f;
-    HashSet<Text> docs = new HashSet<Text>();
+    HashSet<Text> docs = new HashSet<>();
     SortedKeyValueIterator<Key,Value> source = createIteratorStack(hitRatio, NUM_ROWS, NUM_DOCIDS, columnFamilies, otherColumnFamilies, docs);
     SortedKeyValueIterator<Key,Value> source2 = createIteratorStack(hitRatio, NUM_ROWS, NUM_DOCIDS, columnFamilies, otherColumnFamilies, docs);
-    ArrayList<SortedKeyValueIterator<Key,Value>> sourceIters = new ArrayList<SortedKeyValueIterator<Key,Value>>();
+    ArrayList<SortedKeyValueIterator<Key,Value>> sourceIters = new ArrayList<>();
     sourceIters.add(source);
     sourceIters.add(source2);
     MultiIterator mi = new MultiIterator(sourceIters, false);
@@ -310,7 +310,7 @@ public class IndexedDocIteratorTest extends TestCase {
     otherColumnFamilies[3] = new Text("F");
 
     float hitRatio = 0.5f;
-    HashSet<Text> docs = new HashSet<Text>();
+    HashSet<Text> docs = new HashSet<>();
     SortedKeyValueIterator<Key,Value> source = createIteratorStack(hitRatio, NUM_ROWS, NUM_DOCIDS, columnFamilies, otherColumnFamilies, docs, negatedColumns);
     IteratorSetting is = new IteratorSetting(1, IndexedDocIterator.class);
     IndexedDocIterator.setColumnFamilies(is, columnFamilies, notFlags);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/iterators/user/IntersectingIteratorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/iterators/user/IntersectingIteratorTest.java b/core/src/test/java/org/apache/accumulo/core/iterators/user/IntersectingIteratorTest.java
index 700f93b..aad2e54 100644
--- a/core/src/test/java/org/apache/accumulo/core/iterators/user/IntersectingIteratorTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/iterators/user/IntersectingIteratorTest.java
@@ -42,11 +42,11 @@ import org.junit.rules.TestName;
 
 public class IntersectingIteratorTest {
 
-  private static final Collection<ByteSequence> EMPTY_COL_FAMS = new ArrayList<ByteSequence>();
+  private static final Collection<ByteSequence> EMPTY_COL_FAMS = new ArrayList<>();
   private static IteratorEnvironment env = new DefaultIteratorEnvironment();
 
   TreeMap<Key,Value> map;
-  HashSet<Text> docs = new HashSet<Text>();
+  HashSet<Text> docs = new HashSet<>();
   Text[] columnFamilies;
   Text[] negatedColumns;
   Text[] otherColumnFamilies;
@@ -59,7 +59,7 @@ public class IntersectingIteratorTest {
       HashSet<Text> docs, Text[] negatedColumns) {
     Random r = new Random();
     Value v = new Value(new byte[0]);
-    TreeMap<Key,Value> map = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> map = new TreeMap<>();
     boolean[] negateMask = new boolean[columnFamilies.length];
 
     for (int i = 0; i < columnFamilies.length; i++) {
@@ -198,7 +198,7 @@ public class IntersectingIteratorTest {
     float hitRatio = 0.5f;
     SortedKeyValueIterator<Key,Value> source = createIteratorStack(hitRatio, NUM_ROWS, NUM_DOCIDS, columnFamilies, otherColumnFamilies, docs);
     SortedKeyValueIterator<Key,Value> source2 = createIteratorStack(hitRatio, NUM_ROWS, NUM_DOCIDS, columnFamilies, otherColumnFamilies, docs);
-    ArrayList<SortedKeyValueIterator<Key,Value>> sourceIters = new ArrayList<SortedKeyValueIterator<Key,Value>>();
+    ArrayList<SortedKeyValueIterator<Key,Value>> sourceIters = new ArrayList<>();
     sourceIters.add(source);
     sourceIters.add(source2);
     MultiIterator mi = new MultiIterator(sourceIters, false);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/iterators/user/LargeRowFilterTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/iterators/user/LargeRowFilterTest.java b/core/src/test/java/org/apache/accumulo/core/iterators/user/LargeRowFilterTest.java
index af610ca..1d5a108 100644
--- a/core/src/test/java/org/apache/accumulo/core/iterators/user/LargeRowFilterTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/iterators/user/LargeRowFilterTest.java
@@ -66,18 +66,18 @@ public class LargeRowFilterTest extends TestCase {
   }
 
   public void testBasic() throws Exception {
-    TreeMap<Key,Value> testData = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> testData = new TreeMap<>();
 
     genTestData(testData, 20);
 
     for (int i = 1; i <= 20; i++) {
-      TreeMap<Key,Value> expectedData = new TreeMap<Key,Value>();
+      TreeMap<Key,Value> expectedData = new TreeMap<>();
       genTestData(expectedData, i);
 
       LargeRowFilter lrfi = setupIterator(testData, i, IteratorScope.scan);
       lrfi.seek(new Range(), LocalityGroupUtil.EMPTY_CF_SET, false);
 
-      TreeMap<Key,Value> filteredData = new TreeMap<Key,Value>();
+      TreeMap<Key,Value> filteredData = new TreeMap<>();
 
       while (lrfi.hasTop()) {
         filteredData.put(lrfi.getTopKey(), lrfi.getTopValue());
@@ -89,17 +89,17 @@ public class LargeRowFilterTest extends TestCase {
   }
 
   public void testSeek() throws Exception {
-    TreeMap<Key,Value> testData = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> testData = new TreeMap<>();
 
     genTestData(testData, 20);
 
     for (int i = 1; i <= 20; i++) {
-      TreeMap<Key,Value> expectedData = new TreeMap<Key,Value>();
+      TreeMap<Key,Value> expectedData = new TreeMap<>();
       genTestData(expectedData, i);
 
       LargeRowFilter lrfi = setupIterator(testData, i, IteratorScope.scan);
 
-      TreeMap<Key,Value> filteredData = new TreeMap<Key,Value>();
+      TreeMap<Key,Value> filteredData = new TreeMap<>();
 
       // seek to each row... rows that exceed max columns should be filtered
       for (int j = 1; j <= i; j++) {
@@ -117,7 +117,7 @@ public class LargeRowFilterTest extends TestCase {
   }
 
   public void testSeek2() throws Exception {
-    TreeMap<Key,Value> testData = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> testData = new TreeMap<>();
 
     genTestData(testData, 20);
 
@@ -130,10 +130,10 @@ public class LargeRowFilterTest extends TestCase {
 
     lrfi.seek(new Range(new Key(genRow(10), "cf001", genCQ(4), 5), true, new Key(genRow(10)).followingKey(PartialKey.ROW), false),
         LocalityGroupUtil.EMPTY_CF_SET, false);
-    TreeMap<Key,Value> expectedData = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> expectedData = new TreeMap<>();
     genRow(expectedData, 10, 4, 10);
 
-    TreeMap<Key,Value> filteredData = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> filteredData = new TreeMap<>();
     while (lrfi.hasTop()) {
       filteredData.put(lrfi.getTopKey(), lrfi.getTopValue());
       lrfi.next();
@@ -143,14 +143,14 @@ public class LargeRowFilterTest extends TestCase {
   }
 
   public void testCompaction() throws Exception {
-    TreeMap<Key,Value> testData = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> testData = new TreeMap<>();
 
     genTestData(testData, 20);
 
     LargeRowFilter lrfi = setupIterator(testData, 13, IteratorScope.majc);
     lrfi.seek(new Range(), LocalityGroupUtil.EMPTY_CF_SET, false);
 
-    TreeMap<Key,Value> compactedData = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> compactedData = new TreeMap<>();
     while (lrfi.hasTop()) {
       compactedData.put(lrfi.getTopKey(), lrfi.getTopValue());
       lrfi.next();
@@ -167,10 +167,10 @@ public class LargeRowFilterTest extends TestCase {
     lrfi.seek(new Range(), LocalityGroupUtil.EMPTY_CF_SET, false);
 
     // only expect to see 13 rows
-    TreeMap<Key,Value> expectedData = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> expectedData = new TreeMap<>();
     genTestData(expectedData, 13);
 
-    TreeMap<Key,Value> filteredData = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> filteredData = new TreeMap<>();
     while (lrfi.hasTop()) {
       filteredData.put(lrfi.getTopKey(), lrfi.getTopValue());
       lrfi.next();
@@ -185,7 +185,7 @@ public class LargeRowFilterTest extends TestCase {
     assertFalse(lrfi.hasTop());
 
     // test seeking w/ column families
-    HashSet<ByteSequence> colfams = new HashSet<ByteSequence>();
+    HashSet<ByteSequence> colfams = new HashSet<>();
     colfams.add(new ArrayByteSequence("cf001"));
     lrfi.seek(new Range(new Key(genRow(15), "cf001", genCQ(4), 5), true, new Key(genRow(15)).followingKey(PartialKey.ROW), false), colfams, true);
     assertFalse(lrfi.hasTop());
@@ -194,20 +194,20 @@ public class LargeRowFilterTest extends TestCase {
   // in other test data is generated in such a way that once a row
   // is suppressed, all subsequent rows are suppressed
   public void testSuppressInner() throws Exception {
-    TreeMap<Key,Value> testData = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> testData = new TreeMap<>();
     genRow(testData, 1, 0, 2);
     genRow(testData, 2, 0, 50);
     genRow(testData, 3, 0, 15);
     genRow(testData, 4, 0, 5);
 
-    TreeMap<Key,Value> expectedData = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> expectedData = new TreeMap<>();
     genRow(expectedData, 1, 0, 2);
     genRow(expectedData, 4, 0, 5);
 
     LargeRowFilter lrfi = setupIterator(testData, 13, IteratorScope.scan);
     lrfi.seek(new Range(), LocalityGroupUtil.EMPTY_CF_SET, false);
 
-    TreeMap<Key,Value> filteredData = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> filteredData = new TreeMap<>();
     while (lrfi.hasTop()) {
       filteredData.put(lrfi.getTopKey(), lrfi.getTopValue());
       lrfi.next();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/iterators/user/RegExFilterTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/iterators/user/RegExFilterTest.java b/core/src/test/java/org/apache/accumulo/core/iterators/user/RegExFilterTest.java
index 61acc09..f31514a 100644
--- a/core/src/test/java/org/apache/accumulo/core/iterators/user/RegExFilterTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/iterators/user/RegExFilterTest.java
@@ -37,7 +37,7 @@ import org.junit.Test;
 
 public class RegExFilterTest {
 
-  private static final Collection<ByteSequence> EMPTY_COL_FAMS = new ArrayList<ByteSequence>();
+  private static final Collection<ByteSequence> EMPTY_COL_FAMS = new ArrayList<>();
 
   private Key nkv(TreeMap<Key,Value> tm, String row, String cf, String cq, String val) {
     Key k = nk(row, cf, cq);
@@ -51,7 +51,7 @@ public class RegExFilterTest {
 
   @Test
   public void test1() throws IOException {
-    TreeMap<Key,Value> tm = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm = new TreeMap<>();
 
     Key k1 = nkv(tm, "boo1", "yup", "20080201", "dog");
     Key k2 = nkv(tm, "boo1", "yap", "20080202", "cat");
@@ -242,7 +242,7 @@ public class RegExFilterTest {
 
   @Test
   public void testNullByteInKey() throws IOException {
-    TreeMap<Key,Value> tm = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm = new TreeMap<>();
 
     String s1 = "first", s2 = "second";
     byte[] b1 = s1.getBytes(), b2 = s2.getBytes(), ball;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/iterators/user/RowDeletingIteratorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/iterators/user/RowDeletingIteratorTest.java b/core/src/test/java/org/apache/accumulo/core/iterators/user/RowDeletingIteratorTest.java
index bdaf112..4ec0269 100644
--- a/core/src/test/java/org/apache/accumulo/core/iterators/user/RowDeletingIteratorTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/iterators/user/RowDeletingIteratorTest.java
@@ -76,7 +76,7 @@ public class RowDeletingIteratorTest extends TestCase {
 
   public void test1() throws Exception {
 
-    TreeMap<Key,Value> tm1 = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm1 = new TreeMap<>();
     put(tm1, "r1", "", "", 10, RowDeletingIterator.DELETE_ROW_VALUE);
     put(tm1, "r1", "cf1", "cq1", 5, "v1");
     put(tm1, "r1", "cf1", "cq3", 5, "v1");
@@ -115,7 +115,7 @@ public class RowDeletingIteratorTest extends TestCase {
 
   public void test2() throws Exception {
 
-    TreeMap<Key,Value> tm1 = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm1 = new TreeMap<>();
     put(tm1, "r1", "", "", 10, RowDeletingIterator.DELETE_ROW_VALUE);
     put(tm1, "r1", "cf1", "cq1", 5, "v1");
     put(tm1, "r1", "cf1", "cq3", 15, "v1");
@@ -156,7 +156,7 @@ public class RowDeletingIteratorTest extends TestCase {
 
   public void test3() throws Exception {
 
-    TreeMap<Key,Value> tm1 = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm1 = new TreeMap<>();
     put(tm1, "r1", "", "", 10, RowDeletingIterator.DELETE_ROW_VALUE);
     put(tm1, "r1", "", "cq1", 5, "v1");
     put(tm1, "r1", "cf1", "cq1", 5, "v1");
@@ -166,7 +166,7 @@ public class RowDeletingIteratorTest extends TestCase {
     RowDeletingIterator rdi = new RowDeletingIterator();
     rdi.init(new ColumnFamilySkippingIterator(new SortedMapIterator(tm1)), null, new TestIE(IteratorScope.scan, false));
 
-    HashSet<ByteSequence> cols = new HashSet<ByteSequence>();
+    HashSet<ByteSequence> cols = new HashSet<>();
     cols.add(new ArrayByteSequence("cf1".getBytes()));
 
     rdi.seek(new Range(), cols, true);
@@ -186,7 +186,7 @@ public class RowDeletingIteratorTest extends TestCase {
 
   public void test4() throws Exception {
 
-    TreeMap<Key,Value> tm1 = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm1 = new TreeMap<>();
     put(tm1, "r1", "", "", 10, RowDeletingIterator.DELETE_ROW_VALUE);
     put(tm1, "r1", "cf1", "cq1", 5, "v1");
     put(tm1, "r1", "cf1", "cq3", 15, "v1");

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/iterators/user/RowEncodingIteratorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/iterators/user/RowEncodingIteratorTest.java b/core/src/test/java/org/apache/accumulo/core/iterators/user/RowEncodingIteratorTest.java
index d9aa174..d531517 100644
--- a/core/src/test/java/org/apache/accumulo/core/iterators/user/RowEncodingIteratorTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/iterators/user/RowEncodingIteratorTest.java
@@ -62,9 +62,9 @@ public class RowEncodingIteratorTest {
     public static SortedMap<Key,Value> decodeRow(Key rowKey, Value rowValue) throws IOException {
       DataInputStream dis = new DataInputStream(new ByteArrayInputStream(rowValue.get()));
       int numKeys = dis.readInt();
-      List<Key> decodedKeys = new ArrayList<Key>();
-      List<Value> decodedValues = new ArrayList<Value>();
-      SortedMap<Key,Value> out = new TreeMap<Key,Value>();
+      List<Key> decodedKeys = new ArrayList<>();
+      List<Value> decodedValues = new ArrayList<>();
+      SortedMap<Key,Value> out = new TreeMap<>();
       for (int i = 0; i < numKeys; i++) {
         Key k = new Key();
         k.readFields(dis);
@@ -115,26 +115,26 @@ public class RowEncodingIteratorTest {
   public void testEncodeAll() throws IOException {
     byte[] kbVal = new byte[1024];
     // This code is shamelessly borrowed from the WholeRowIteratorTest.
-    SortedMap<Key,Value> map1 = new TreeMap<Key,Value>();
+    SortedMap<Key,Value> map1 = new TreeMap<>();
     pkv(map1, "row1", "cf1", "cq1", "cv1", 5, kbVal);
     pkv(map1, "row1", "cf1", "cq2", "cv1", 6, kbVal);
 
-    SortedMap<Key,Value> map2 = new TreeMap<Key,Value>();
+    SortedMap<Key,Value> map2 = new TreeMap<>();
     pkv(map2, "row2", "cf1", "cq1", "cv1", 5, kbVal);
     pkv(map2, "row2", "cf1", "cq2", "cv1", 6, kbVal);
 
-    SortedMap<Key,Value> map3 = new TreeMap<Key,Value>();
+    SortedMap<Key,Value> map3 = new TreeMap<>();
     pkv(map3, "row3", "cf1", "cq1", "cv1", 5, kbVal);
     pkv(map3, "row3", "cf1", "cq2", "cv1", 6, kbVal);
 
-    SortedMap<Key,Value> map = new TreeMap<Key,Value>();
+    SortedMap<Key,Value> map = new TreeMap<>();
     map.putAll(map1);
     map.putAll(map2);
     map.putAll(map3);
     SortedMapIterator src = new SortedMapIterator(map);
     Range range = new Range(new Text("row1"), true, new Text("row2"), true);
     RowEncodingIteratorImpl iter = new RowEncodingIteratorImpl();
-    Map<String,String> bigBufferOpts = new HashMap<String,String>();
+    Map<String,String> bigBufferOpts = new HashMap<>();
     bigBufferOpts.put(RowEncodingIterator.MAX_BUFFER_SIZE_OPT, "3K");
     iter.init(src, bigBufferOpts, new DummyIteratorEnv());
     iter.seek(range, new ArrayList<ByteSequence>(), false);
@@ -159,16 +159,16 @@ public class RowEncodingIteratorTest {
   public void testEncodeSome() throws IOException {
     byte[] kbVal = new byte[1024];
     // This code is shamelessly borrowed from the WholeRowIteratorTest.
-    SortedMap<Key,Value> map1 = new TreeMap<Key,Value>();
+    SortedMap<Key,Value> map1 = new TreeMap<>();
     pkv(map1, "row1", "cf1", "cq1", "cv1", 5, kbVal);
     pkv(map1, "row1", "cf1", "cq2", "cv1", 6, kbVal);
 
-    SortedMap<Key,Value> map = new TreeMap<Key,Value>();
+    SortedMap<Key,Value> map = new TreeMap<>();
     map.putAll(map1);
     SortedMapIterator src = new SortedMapIterator(map);
     Range range = new Range(new Text("row1"), true, new Text("row2"), true);
     RowEncodingIteratorImpl iter = new RowEncodingIteratorImpl();
-    Map<String,String> bigBufferOpts = new HashMap<String,String>();
+    Map<String,String> bigBufferOpts = new HashMap<>();
     bigBufferOpts.put(RowEncodingIterator.MAX_BUFFER_SIZE_OPT, "1K");
     iter.init(src, bigBufferOpts, new DummyIteratorEnv());
     iter.seek(range, new ArrayList<ByteSequence>(), false);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/iterators/user/RowFilterTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/iterators/user/RowFilterTest.java b/core/src/test/java/org/apache/accumulo/core/iterators/user/RowFilterTest.java
index f0892b2..4294eb3 100644
--- a/core/src/test/java/org/apache/accumulo/core/iterators/user/RowFilterTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/iterators/user/RowFilterTest.java
@@ -83,7 +83,7 @@ public class RowFilterTest {
   }
 
   public static class RowZeroOrOneFilter extends RowFilter {
-    private static final Set<String> passRows = new HashSet<String>(Arrays.asList("0", "1"));
+    private static final Set<String> passRows = new HashSet<>(Arrays.asList("0", "1"));
 
     @Override
     public boolean acceptRow(SortedKeyValueIterator<Key,Value> rowIterator) throws IOException {
@@ -92,7 +92,7 @@ public class RowFilterTest {
   }
 
   public static class RowOneOrTwoFilter extends RowFilter {
-    private static final Set<String> passRows = new HashSet<String>(Arrays.asList("1", "2"));
+    private static final Set<String> passRows = new HashSet<>(Arrays.asList("1", "2"));
 
     @Override
     public boolean acceptRow(SortedKeyValueIterator<Key,Value> rowIterator) throws IOException {
@@ -108,7 +108,7 @@ public class RowFilterTest {
   }
 
   public List<Mutation> createMutations() {
-    List<Mutation> mutations = new LinkedList<Mutation>();
+    List<Mutation> mutations = new LinkedList<>();
     Mutation m = new Mutation("0");
     m.put("cf1", "cq1", "1");
     m.put("cf1", "cq2", "1");
@@ -157,7 +157,7 @@ public class RowFilterTest {
 
   public TreeMap<Key,Value> createKeyValues() {
     List<Mutation> mutations = createMutations();
-    TreeMap<Key,Value> keyValues = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> keyValues = new TreeMap<>();
 
     final Text cf = new Text(), cq = new Text();
     for (Mutation m : mutations) {
@@ -185,24 +185,24 @@ public class RowFilterTest {
 
     filter.seek(new Range(), Collections.<ByteSequence> emptySet(), false);
 
-    assertEquals(new HashSet<String>(Arrays.asList("2", "3")), getRows(filter));
+    assertEquals(new HashSet<>(Arrays.asList("2", "3")), getRows(filter));
 
     ByteSequence cf = new ArrayByteSequence("cf2");
 
     filter.seek(new Range(), ImmutableSet.of(cf), true);
-    assertEquals(new HashSet<String>(Arrays.asList("1", "3", "0", "4")), getRows(filter));
+    assertEquals(new HashSet<>(Arrays.asList("1", "3", "0", "4")), getRows(filter));
 
     filter.seek(new Range("0", "4"), Collections.<ByteSequence> emptySet(), false);
-    assertEquals(new HashSet<String>(Arrays.asList("2", "3")), getRows(filter));
+    assertEquals(new HashSet<>(Arrays.asList("2", "3")), getRows(filter));
 
     filter.seek(new Range("2"), Collections.<ByteSequence> emptySet(), false);
-    assertEquals(new HashSet<String>(Arrays.asList("2")), getRows(filter));
+    assertEquals(new HashSet<>(Arrays.asList("2")), getRows(filter));
 
     filter.seek(new Range("4"), Collections.<ByteSequence> emptySet(), false);
     assertEquals(new HashSet<String>(), getRows(filter));
 
     filter.seek(new Range("4"), ImmutableSet.of(cf), true);
-    assertEquals(new HashSet<String>(Arrays.asList("4")), getRows(filter));
+    assertEquals(new HashSet<>(Arrays.asList("4")), getRows(filter));
 
   }
 
@@ -218,7 +218,7 @@ public class RowFilterTest {
 
     filter.seek(new Range(), Collections.<ByteSequence> emptySet(), false);
 
-    assertEquals(new HashSet<String>(Arrays.asList("0", "1", "2", "3", "4")), getRows(filter));
+    assertEquals(new HashSet<>(Arrays.asList("0", "1", "2", "3", "4")), getRows(filter));
   }
 
   @Test
@@ -234,7 +234,7 @@ public class RowFilterTest {
 
     filter.seek(new Range(), Collections.<ByteSequence> emptySet(), false);
 
-    assertEquals(new HashSet<String>(Arrays.asList("1")), getRows(filter));
+    assertEquals(new HashSet<>(Arrays.asList("1")), getRows(filter));
   }
 
   @Test
@@ -284,7 +284,7 @@ public class RowFilterTest {
   }
 
   private HashSet<String> getRows(RowFilter filter) throws IOException {
-    HashSet<String> rows = new HashSet<String>();
+    HashSet<String> rows = new HashSet<>();
     while (filter.hasTop()) {
       rows.add(filter.getTopKey().getRowData().toString());
       filter.next();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/iterators/user/TestCfCqSlice.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/iterators/user/TestCfCqSlice.java b/core/src/test/java/org/apache/accumulo/core/iterators/user/TestCfCqSlice.java
index d379778..20d9bcb 100644
--- a/core/src/test/java/org/apache/accumulo/core/iterators/user/TestCfCqSlice.java
+++ b/core/src/test/java/org/apache/accumulo/core/iterators/user/TestCfCqSlice.java
@@ -109,7 +109,7 @@ public abstract class TestCfCqSlice {
     assertTrue("slice param must be less than LR_DIM", sliceMinCq < LR_DIM);
     assertTrue("slice param must be less than LR_DIM", sliceMaxCf < LR_DIM);
     assertTrue("slice param must be less than LR_DIM", sliceMaxCq < LR_DIM);
-    Map<String,String> opts = new HashMap<String,String>();
+    Map<String,String> opts = new HashMap<>();
     opts.put(CfCqSliceOpts.OPT_MIN_CF, new String(LONG_LEX.encode(sliceMinCf), UTF_8));
     opts.put(CfCqSliceOpts.OPT_MIN_CQ, new String(LONG_LEX.encode(sliceMinCq), UTF_8));
     opts.put(CfCqSliceOpts.OPT_MAX_CF, new String(LONG_LEX.encode(sliceMaxCf), UTF_8));
@@ -135,7 +135,7 @@ public abstract class TestCfCqSlice {
     long sliceMinCq = 20;
     long sliceMaxCf = 20;
     long sliceMaxCq = 20;
-    Map<String,String> opts = new HashMap<String,String>();
+    Map<String,String> opts = new HashMap<>();
     opts.put(CfCqSliceOpts.OPT_MIN_CF, new String(LONG_LEX.encode(sliceMinCf), UTF_8));
     opts.put(CfCqSliceOpts.OPT_MIN_CQ, new String(LONG_LEX.encode(sliceMinCq), UTF_8));
     opts.put(CfCqSliceOpts.OPT_MAX_CF, new String(LONG_LEX.encode(sliceMaxCf), UTF_8));
@@ -161,7 +161,7 @@ public abstract class TestCfCqSlice {
     long sliceMinCq = 20;
     long sliceMaxCf = 22;
     long sliceMaxCq = 22;
-    Map<String,String> opts = new HashMap<String,String>();
+    Map<String,String> opts = new HashMap<>();
     opts.put(CfCqSliceOpts.OPT_MIN_CF, new String(LONG_LEX.encode(sliceMinCf), UTF_8));
     opts.put(CfCqSliceOpts.OPT_MIN_CQ, new String(LONG_LEX.encode(sliceMinCq), UTF_8));
     opts.put(CfCqSliceOpts.OPT_MAX_CF, new String(LONG_LEX.encode(sliceMaxCf), UTF_8));
@@ -187,7 +187,7 @@ public abstract class TestCfCqSlice {
     boolean[][][] foundKvs = new boolean[LR_DIM][LR_DIM][LR_DIM];
     long sliceMinCq = 10;
     long sliceMaxCq = 30;
-    Map<String,String> opts = new HashMap<String,String>();
+    Map<String,String> opts = new HashMap<>();
     opts.put(CfCqSliceOpts.OPT_MIN_CQ, new String(LONG_LEX.encode(sliceMinCq), UTF_8));
     opts.put(CfCqSliceOpts.OPT_MAX_CQ, new String(LONG_LEX.encode(sliceMaxCq), UTF_8));
     loadKvs(foundKvs, opts, INFINITY);
@@ -209,7 +209,7 @@ public abstract class TestCfCqSlice {
     boolean[][][] foundKvs = new boolean[LR_DIM][LR_DIM][LR_DIM];
     long sliceMinCf = 10;
     long sliceMaxCf = 30;
-    Map<String,String> opts = new HashMap<String,String>();
+    Map<String,String> opts = new HashMap<>();
     opts.put(CfCqSliceOpts.OPT_MIN_CF, new String(LONG_LEX.encode(sliceMinCf), UTF_8));
     opts.put(CfCqSliceOpts.OPT_MAX_CF, new String(LONG_LEX.encode(sliceMaxCf), UTF_8));
     loadKvs(foundKvs, opts, INFINITY);
@@ -233,7 +233,7 @@ public abstract class TestCfCqSlice {
     long sliceMinCq = LR_DIM + 1;
     long sliceMaxCf = LR_DIM + 1;
     long sliceMaxCq = LR_DIM + 1;
-    Map<String,String> opts = new HashMap<String,String>();
+    Map<String,String> opts = new HashMap<>();
     opts.put(CfCqSliceOpts.OPT_MIN_CF, new String(LONG_LEX.encode(sliceMinCf), UTF_8));
     opts.put(CfCqSliceOpts.OPT_MIN_CQ, new String(LONG_LEX.encode(sliceMinCq), UTF_8));
     opts.put(CfCqSliceOpts.OPT_MAX_CF, new String(LONG_LEX.encode(sliceMaxCf), UTF_8));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/iterators/user/TransformingIteratorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/iterators/user/TransformingIteratorTest.java b/core/src/test/java/org/apache/accumulo/core/iterators/user/TransformingIteratorTest.java
index 97ebe5c..d02b7f2 100644
--- a/core/src/test/java/org/apache/accumulo/core/iterators/user/TransformingIteratorTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/iterators/user/TransformingIteratorTest.java
@@ -64,7 +64,7 @@ public class TransformingIteratorTest {
   private static final Map<String,String> EMPTY_OPTS = ImmutableMap.of();
   private TransformingIterator titer;
 
-  private TreeMap<Key,Value> data = new TreeMap<Key,Value>();
+  private TreeMap<Key,Value> data = new TreeMap<>();
 
   @Before
   public void createData() throws Exception {
@@ -113,7 +113,7 @@ public class TransformingIteratorTest {
     // the same key/value pair for every getTopKey/getTopValue call. The code
     // will always return the final key/value if we didn't copy the original key
     // in the iterator.
-    TreeMap<Key,Value> expected = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> expected = new TreeMap<>();
     for (int row = 1; row <= 3; ++row) {
       for (int cf = 1; cf <= 3; ++cf) {
         for (int cq = 1; cq <= 3; ++cq) {
@@ -129,7 +129,7 @@ public class TransformingIteratorTest {
 
   @Test
   public void testNoRangeScan() throws Exception {
-    List<Class<? extends ReversingKeyTransformingIterator>> classes = new ArrayList<Class<? extends ReversingKeyTransformingIterator>>();
+    List<Class<? extends ReversingKeyTransformingIterator>> classes = new ArrayList<>();
     classes.add(ColFamReversingKeyTransformingIterator.class);
     classes.add(ColQualReversingKeyTransformingIterator.class);
     classes.add(ColVisReversingKeyTransformingIterator.class);
@@ -140,7 +140,7 @@ public class TransformingIteratorTest {
 
       // All rows with visibilities reversed
       TransformingIterator iter = clazz.newInstance();
-      TreeMap<Key,Value> expected = new TreeMap<Key,Value>();
+      TreeMap<Key,Value> expected = new TreeMap<>();
       for (int row = 1; row <= 3; ++row) {
         for (int cf = 1; cf <= 3; ++cf) {
           for (int cq = 1; cq <= 3; ++cq) {
@@ -166,7 +166,7 @@ public class TransformingIteratorTest {
     // Make sure it shows up in the output with the default test auths which include
     // vis0.
     setUpTransformIterator(ColVisReversingKeyTransformingIterator.class);
-    TreeMap<Key,Value> expected = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> expected = new TreeMap<>();
     for (int row = 1; row <= 3; ++row) {
       for (int cf = 1; cf <= 3; ++cf) {
         for (int cq = 1; cq <= 3; ++cq) {
@@ -194,7 +194,7 @@ public class TransformingIteratorTest {
   public void testRangeStart() throws Exception {
     setUpTransformIterator(ColVisReversingKeyTransformingIterator.class);
 
-    TreeMap<Key,Value> expected = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> expected = new TreeMap<>();
     putExpected(expected, 1, 2, 2, 1, PartialKey.ROW_COLFAM_COLQUAL); // before the range start, but transforms in the range
     putExpected(expected, 1, 2, 2, 2, PartialKey.ROW_COLFAM_COLQUAL);
 
@@ -205,7 +205,7 @@ public class TransformingIteratorTest {
   public void testRangeEnd() throws Exception {
     setUpTransformIterator(ColVisReversingKeyTransformingIterator.class);
 
-    TreeMap<Key,Value> expected = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> expected = new TreeMap<>();
     // putExpected(expected, 1, 2, 2, 1, part); // transforms vis outside range end
     putExpected(expected, 1, 2, 2, 2, PartialKey.ROW_COLFAM_COLQUAL);
     putExpected(expected, 1, 2, 2, 3, PartialKey.ROW_COLFAM_COLQUAL);
@@ -220,7 +220,7 @@ public class TransformingIteratorTest {
     // the data with untransformed col fam cf3 will transform to cf0 and
     // be inside the range.
 
-    TreeMap<Key,Value> expected = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> expected = new TreeMap<>();
     for (int cq = 1; cq <= 3; ++cq)
       for (int cv = 1; cv <= 3; ++cv)
         putExpected(expected, 1, 3, cq, cv, PartialKey.ROW);
@@ -266,7 +266,7 @@ public class TransformingIteratorTest {
     int expectedCF = 1;
     setUpTransformIterator(ColFamReversingKeyTransformingIterator.class);
 
-    TreeMap<Key,Value> expected = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> expected = new TreeMap<>();
     for (int row = 1; row <= 3; ++row)
       for (int cq = 1; cq <= 3; ++cq)
         for (int cv = 1; cv <= 3; ++cv)
@@ -317,7 +317,7 @@ public class TransformingIteratorTest {
     int expectedCF = 1;
     setUpTransformIterator(ColFamReversingCompactionKeyTransformingIterator.class);
 
-    TreeMap<Key,Value> expected = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> expected = new TreeMap<>();
     for (int row = 1; row <= 3; ++row)
       for (int cq = 1; cq <= 3; ++cq)
         for (int cv = 1; cv <= 3; ++cv)
@@ -332,7 +332,7 @@ public class TransformingIteratorTest {
     // should still show up.
     setUpTransformIterator(BadVisCompactionKeyTransformingIterator.class);
 
-    TreeMap<Key,Value> expected = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> expected = new TreeMap<>();
     for (int rowID = 1; rowID <= 3; ++rowID) {
       for (int cfID = 1; cfID <= 3; ++cfID) {
         for (int cqID = 1; cqID <= 3; ++cqID) {
@@ -391,7 +391,7 @@ public class TransformingIteratorTest {
     TransformingIterator.setMaxBufferSize(is, 10000000);
     Assert.assertTrue(ti.validateOptions(is.getOptions()));
 
-    Map<String,String> opts = new HashMap<String,String>();
+    Map<String,String> opts = new HashMap<>();
 
     opts.put(TransformingIterator.MAX_BUFFER_SIZE_OPT, "10M");
     Assert.assertTrue(ti.validateOptions(is.getOptions()));
@@ -583,7 +583,7 @@ public class TransformingIteratorTest {
 
     @Override
     protected Collection<ByteSequence> untransformColumnFamilies(Collection<ByteSequence> columnFamilies) {
-      HashSet<ByteSequence> untransformed = new HashSet<ByteSequence>();
+      HashSet<ByteSequence> untransformed = new HashSet<>();
       for (ByteSequence cf : columnFamilies)
         untransformed.add(untransformColumnFamily(cf));
       return untransformed;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/iterators/user/VersioningIteratorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/iterators/user/VersioningIteratorTest.java b/core/src/test/java/org/apache/accumulo/core/iterators/user/VersioningIteratorTest.java
index fa42998..cdd0074 100644
--- a/core/src/test/java/org/apache/accumulo/core/iterators/user/VersioningIteratorTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/iterators/user/VersioningIteratorTest.java
@@ -40,7 +40,7 @@ import org.slf4j.LoggerFactory;
 
 public class VersioningIteratorTest {
   // add test for seek function
-  private static final Collection<ByteSequence> EMPTY_COL_FAMS = new ArrayList<ByteSequence>();
+  private static final Collection<ByteSequence> EMPTY_COL_FAMS = new ArrayList<>();
   private static final Encoder<Long> encoder = LongCombiner.FIXED_LEN_ENCODER;
   private static final Logger log = LoggerFactory.getLogger(VersioningIteratorTest.class);
 
@@ -56,7 +56,7 @@ public class VersioningIteratorTest {
   }
 
   TreeMap<Key,Value> iteratorOverTestData(VersioningIterator it) throws IOException {
-    TreeMap<Key,Value> tmOut = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tmOut = new TreeMap<>();
     while (it.hasTop()) {
       tmOut.put(it.getTopKey(), it.getTopValue());
       it.next();
@@ -70,7 +70,7 @@ public class VersioningIteratorTest {
     Text colf = new Text("a");
     Text colq = new Text("b");
 
-    TreeMap<Key,Value> tm = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm = new TreeMap<>();
 
     createTestData(tm, colf, colq);
 
@@ -101,7 +101,7 @@ public class VersioningIteratorTest {
     Text colf = new Text("a");
     Text colq = new Text("b");
 
-    TreeMap<Key,Value> tm = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm = new TreeMap<>();
 
     createTestData(tm, colf, colq);
 
@@ -137,7 +137,7 @@ public class VersioningIteratorTest {
     Text colf = new Text("a");
     Text colq = new Text("b");
 
-    TreeMap<Key,Value> tm = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm = new TreeMap<>();
 
     createTestData(tm, colf, colq);
 
@@ -186,7 +186,7 @@ public class VersioningIteratorTest {
     Text colf = new Text("a");
     Text colq = new Text("b");
 
-    TreeMap<Key,Value> tm = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm = new TreeMap<>();
 
     createTestData(tm, colf, colq);
 
@@ -215,7 +215,7 @@ public class VersioningIteratorTest {
     Text colf = new Text("a");
     Text colq = new Text("b");
 
-    TreeMap<Key,Value> tm = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm = new TreeMap<>();
 
     createTestData(tm, colf, colq);
 
@@ -237,7 +237,7 @@ public class VersioningIteratorTest {
     Text colf = new Text("a");
     Text colq = new Text("b");
 
-    TreeMap<Key,Value> tm = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm = new TreeMap<>();
 
     createTestData(tm, colf, colq);
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/iterators/user/VisibilityFilterTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/iterators/user/VisibilityFilterTest.java b/core/src/test/java/org/apache/accumulo/core/iterators/user/VisibilityFilterTest.java
index 810c355..8de1472 100644
--- a/core/src/test/java/org/apache/accumulo/core/iterators/user/VisibilityFilterTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/iterators/user/VisibilityFilterTest.java
@@ -39,7 +39,7 @@ import org.junit.Test;
 
 public class VisibilityFilterTest {
 
-  private static final Collection<ByteSequence> EMPTY_COL_FAMS = new ArrayList<ByteSequence>();
+  private static final Collection<ByteSequence> EMPTY_COL_FAMS = new ArrayList<>();
 
   private static final Text BAD = new Text("bad");
   private static final Text GOOD = new Text("good");
@@ -50,7 +50,7 @@ public class VisibilityFilterTest {
   private static final Value EMPTY_VALUE = new Value(new byte[0]);
 
   private TreeMap<Key,Value> createUnprotectedSource(int numPublic, int numHidden) {
-    TreeMap<Key,Value> source = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> source = new TreeMap<>();
     for (int i = 0; i < numPublic; i++)
       source.put(new Key(new Text(String.format("%03d", i)), GOOD, GOOD, EMPTY_VIS), EMPTY_VALUE);
     for (int i = 0; i < numHidden; i++)
@@ -59,7 +59,7 @@ public class VisibilityFilterTest {
   }
 
   private TreeMap<Key,Value> createPollutedSource(int numGood, int numBad) {
-    TreeMap<Key,Value> source = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> source = new TreeMap<>();
     for (int i = 0; i < numGood; i++)
       source.put(new Key(new Text(String.format("%03d", i)), GOOD, GOOD, GOOD_VIS), EMPTY_VALUE);
     for (int i = 0; i < numBad; i++)
@@ -68,7 +68,7 @@ public class VisibilityFilterTest {
   }
 
   private TreeMap<Key,Value> createSourceWithHiddenData(int numViewable, int numHidden) {
-    TreeMap<Key,Value> source = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> source = new TreeMap<>();
     for (int i = 0; i < numViewable; i++)
       source.put(new Key(new Text(String.format("%03d", i)), GOOD, GOOD, GOOD_VIS), EMPTY_VALUE);
     for (int i = 0; i < numHidden; i++)

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/iterators/user/WholeColumnFamilyIteratorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/iterators/user/WholeColumnFamilyIteratorTest.java b/core/src/test/java/org/apache/accumulo/core/iterators/user/WholeColumnFamilyIteratorTest.java
index f5440cd..882c82a 100644
--- a/core/src/test/java/org/apache/accumulo/core/iterators/user/WholeColumnFamilyIteratorTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/iterators/user/WholeColumnFamilyIteratorTest.java
@@ -56,9 +56,9 @@ import org.junit.Assert;
 public class WholeColumnFamilyIteratorTest extends TestCase {
 
   public void testEmptyStuff() throws IOException {
-    SortedMap<Key,Value> map = new TreeMap<Key,Value>();
-    SortedMap<Key,Value> map2 = new TreeMap<Key,Value>();
-    final Map<Text,Boolean> toInclude = new HashMap<Text,Boolean>();
+    SortedMap<Key,Value> map = new TreeMap<>();
+    SortedMap<Key,Value> map2 = new TreeMap<>();
+    final Map<Text,Boolean> toInclude = new HashMap<>();
     map.put(new Key(new Text("r1"), new Text("cf1"), new Text("cq1"), new Text("cv1"), 1l), new Value("val1".getBytes()));
     map.put(new Key(new Text("r1"), new Text("cf1"), new Text("cq2"), new Text("cv1"), 2l), new Value("val2".getBytes()));
     map.put(new Key(new Text("r2"), new Text("cf1"), new Text("cq1"), new Text("cv1"), 3l), new Value("val3".getBytes()));
@@ -88,7 +88,7 @@ public class WholeColumnFamilyIteratorTest extends TestCase {
     }
     SortedMapIterator source = new SortedMapIterator(map);
     WholeColumnFamilyIterator iter = new WholeColumnFamilyIterator(source);
-    SortedMap<Key,Value> resultMap = new TreeMap<Key,Value>();
+    SortedMap<Key,Value> resultMap = new TreeMap<>();
     iter.seek(new Range(), new ArrayList<ByteSequence>(), false);
     int numRows = 0;
     while (iter.hasTop()) {
@@ -129,19 +129,19 @@ public class WholeColumnFamilyIteratorTest extends TestCase {
   }
 
   public void testContinue() throws Exception {
-    SortedMap<Key,Value> map1 = new TreeMap<Key,Value>();
+    SortedMap<Key,Value> map1 = new TreeMap<>();
     pkv(map1, "row1", "cf1", "cq1", "cv1", 5, "foo");
     pkv(map1, "row1", "cf1", "cq2", "cv1", 6, "bar");
 
-    SortedMap<Key,Value> map2 = new TreeMap<Key,Value>();
+    SortedMap<Key,Value> map2 = new TreeMap<>();
     pkv(map2, "row2", "cf1", "cq1", "cv1", 5, "foo");
     pkv(map2, "row2", "cf1", "cq2", "cv1", 6, "bar");
 
-    SortedMap<Key,Value> map3 = new TreeMap<Key,Value>();
+    SortedMap<Key,Value> map3 = new TreeMap<>();
     pkv(map3, "row3", "cf1", "cq1", "cv1", 5, "foo");
     pkv(map3, "row3", "cf1", "cq2", "cv1", 6, "bar");
 
-    SortedMap<Key,Value> map = new TreeMap<Key,Value>();
+    SortedMap<Key,Value> map = new TreeMap<>();
     map.putAll(map1);
     map.putAll(map2);
     map.putAll(map3);
@@ -170,14 +170,14 @@ public class WholeColumnFamilyIteratorTest extends TestCase {
   }
 
   public void testBug1() throws Exception {
-    SortedMap<Key,Value> map1 = new TreeMap<Key,Value>();
+    SortedMap<Key,Value> map1 = new TreeMap<>();
     pkv(map1, "row1", "cf1", "cq1", "cv1", 5, "foo");
     pkv(map1, "row1", "cf1", "cq2", "cv1", 6, "bar");
 
-    SortedMap<Key,Value> map2 = new TreeMap<Key,Value>();
+    SortedMap<Key,Value> map2 = new TreeMap<>();
     pkv(map2, "row2", "cf1", "cq1", "cv1", 5, "foo");
 
-    SortedMap<Key,Value> map = new TreeMap<Key,Value>();
+    SortedMap<Key,Value> map = new TreeMap<>();
     map.putAll(map1);
     map.putAll(map2);
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/iterators/user/WholeRowIteratorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/iterators/user/WholeRowIteratorTest.java b/core/src/test/java/org/apache/accumulo/core/iterators/user/WholeRowIteratorTest.java
index b47ef3e..8d37d6c 100644
--- a/core/src/test/java/org/apache/accumulo/core/iterators/user/WholeRowIteratorTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/iterators/user/WholeRowIteratorTest.java
@@ -55,9 +55,9 @@ public class WholeRowIteratorTest {
 
   @Test
   public void testEmptyStuff() throws IOException {
-    SortedMap<Key,Value> map = new TreeMap<Key,Value>();
-    SortedMap<Key,Value> map2 = new TreeMap<Key,Value>();
-    final Map<Text,Boolean> toInclude = new HashMap<Text,Boolean>();
+    SortedMap<Key,Value> map = new TreeMap<>();
+    SortedMap<Key,Value> map2 = new TreeMap<>();
+    final Map<Text,Boolean> toInclude = new HashMap<>();
     map.put(new Key(new Text("r1"), new Text("cf1"), new Text("cq1"), new Text("cv1"), 1l), new Value("val1".getBytes()));
     map.put(new Key(new Text("r1"), new Text("cf1"), new Text("cq2"), new Text("cv1"), 2l), new Value("val2".getBytes()));
     map.put(new Key(new Text("r2"), new Text("cf1"), new Text("cq1"), new Text("cv1"), 3l), new Value("val3".getBytes()));
@@ -87,7 +87,7 @@ public class WholeRowIteratorTest {
     }
     SortedMapIterator source = new SortedMapIterator(map);
     WholeRowIterator iter = new WholeRowIterator(source);
-    SortedMap<Key,Value> resultMap = new TreeMap<Key,Value>();
+    SortedMap<Key,Value> resultMap = new TreeMap<>();
     iter.seek(new Range(), new ArrayList<ByteSequence>(), false);
     int numRows = 0;
     while (iter.hasTop()) {
@@ -126,19 +126,19 @@ public class WholeRowIteratorTest {
 
   @Test
   public void testContinue() throws Exception {
-    SortedMap<Key,Value> map1 = new TreeMap<Key,Value>();
+    SortedMap<Key,Value> map1 = new TreeMap<>();
     pkv(map1, "row1", "cf1", "cq1", "cv1", 5, "foo");
     pkv(map1, "row1", "cf1", "cq2", "cv1", 6, "bar");
 
-    SortedMap<Key,Value> map2 = new TreeMap<Key,Value>();
+    SortedMap<Key,Value> map2 = new TreeMap<>();
     pkv(map2, "row2", "cf1", "cq1", "cv1", 5, "foo");
     pkv(map2, "row2", "cf1", "cq2", "cv1", 6, "bar");
 
-    SortedMap<Key,Value> map3 = new TreeMap<Key,Value>();
+    SortedMap<Key,Value> map3 = new TreeMap<>();
     pkv(map3, "row3", "cf1", "cq1", "cv1", 5, "foo");
     pkv(map3, "row3", "cf1", "cq2", "cv1", 6, "bar");
 
-    SortedMap<Key,Value> map = new TreeMap<Key,Value>();
+    SortedMap<Key,Value> map = new TreeMap<>();
     map.putAll(map1);
     map.putAll(map2);
     map.putAll(map3);
@@ -168,14 +168,14 @@ public class WholeRowIteratorTest {
 
   @Test
   public void testBug1() throws Exception {
-    SortedMap<Key,Value> map1 = new TreeMap<Key,Value>();
+    SortedMap<Key,Value> map1 = new TreeMap<>();
     pkv(map1, "row1", "cf1", "cq1", "cv1", 5, "foo");
     pkv(map1, "row1", "cf1", "cq2", "cv1", 6, "bar");
 
-    SortedMap<Key,Value> map2 = new TreeMap<Key,Value>();
+    SortedMap<Key,Value> map2 = new TreeMap<>();
     pkv(map2, "row2", "cf1", "cq1", "cv1", 5, "foo");
 
-    SortedMap<Key,Value> map = new TreeMap<Key,Value>();
+    SortedMap<Key,Value> map = new TreeMap<>();
     map.putAll(map1);
     map.putAll(map2);
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/util/LocalityGroupUtilTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/util/LocalityGroupUtilTest.java b/core/src/test/java/org/apache/accumulo/core/util/LocalityGroupUtilTest.java
index 60464a6..c4c46cb 100644
--- a/core/src/test/java/org/apache/accumulo/core/util/LocalityGroupUtilTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/util/LocalityGroupUtilTest.java
@@ -80,8 +80,8 @@ public class LocalityGroupUtilTest {
     assertEquals(ecf, LocalityGroupUtil.encodeColumnFamily(bs2));
 
     // test encoding multiple column fams containing binary data
-    HashSet<Text> in = new HashSet<Text>();
-    HashSet<ByteSequence> in2 = new HashSet<ByteSequence>();
+    HashSet<Text> in = new HashSet<>();
+    HashSet<ByteSequence> in2 = new HashSet<>();
     in.add(new Text(test1));
     in2.add(new ArrayByteSequence(test1));
     in.add(new Text(test2));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/util/MergeTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/util/MergeTest.java b/core/src/test/java/org/apache/accumulo/core/util/MergeTest.java
index 6fe240a..b7804f6 100644
--- a/core/src/test/java/org/apache/accumulo/core/util/MergeTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/util/MergeTest.java
@@ -32,8 +32,8 @@ import org.junit.Test;
 public class MergeTest {
 
   static class MergeTester extends Merge {
-    public List<List<Size>> merges = new ArrayList<List<Size>>();
-    public List<Size> tablets = new ArrayList<Size>();
+    public List<List<Size>> merges = new ArrayList<>();
+    public List<Size> tablets = new ArrayList<>();
 
     MergeTester(Integer... sizes) {
       Text start = null;
@@ -95,7 +95,7 @@ public class MergeTest {
 
     @Override
     protected void merge(Connector conn, String table, List<Size> sizes, int numToMerge) throws MergeException {
-      List<Size> merge = new ArrayList<Size>();
+      List<Size> merge = new ArrayList<>();
       for (int i = 0; i < numToMerge; i++) {
         merge.add(sizes.get(i));
       }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/util/PairTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/util/PairTest.java b/core/src/test/java/org/apache/accumulo/core/util/PairTest.java
index 60af90e..6effc9e 100644
--- a/core/src/test/java/org/apache/accumulo/core/util/PairTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/util/PairTest.java
@@ -30,8 +30,8 @@ public class PairTest {
    */
   @Test
   public void testEqualsObject() {
-    Pair<Integer,String> pair = new Pair<Integer,String>(25, "twenty-five");
-    Pair<Integer,String> pair2 = new Pair<Integer,String>(25, "twenty-five");
+    Pair<Integer,String> pair = new Pair<>(25, "twenty-five");
+    Pair<Integer,String> pair2 = new Pair<>(25, "twenty-five");
     assertEquals(pair, pair2);
   }
 
@@ -40,7 +40,7 @@ public class PairTest {
    */
   @Test
   public void testGetFirst() {
-    Pair<Integer,String> pair = new Pair<Integer,String>(25, "twenty-five");
+    Pair<Integer,String> pair = new Pair<>(25, "twenty-five");
     assertEquals((Integer) 25, pair.getFirst());
   }
 
@@ -49,7 +49,7 @@ public class PairTest {
    */
   @Test
   public void testGetSecond() {
-    Pair<Integer,String> pair = new Pair<Integer,String>(25, "twenty-five");
+    Pair<Integer,String> pair = new Pair<>(25, "twenty-five");
     assertEquals("twenty-five", pair.getSecond());
   }
 
@@ -58,7 +58,7 @@ public class PairTest {
    */
   @Test
   public void testToString() {
-    Pair<Integer,String> pair = new Pair<Integer,String>(25, "twenty-five");
+    Pair<Integer,String> pair = new Pair<>(25, "twenty-five");
     assertEquals("(25,twenty-five)", pair.toString());
   }
 
@@ -67,7 +67,7 @@ public class PairTest {
    */
   @Test
   public void testToStringStringStringString() {
-    Pair<Integer,String> pair = new Pair<Integer,String>(25, "twenty-five");
+    Pair<Integer,String> pair = new Pair<>(25, "twenty-five");
     assertEquals("---25~~~twenty-five+++", pair.toString("---", "~~~", "+++"));
   }
 
@@ -76,7 +76,7 @@ public class PairTest {
    */
   @Test
   public void testToMapEntry() {
-    Pair<Integer,String> pair = new Pair<Integer,String>(10, "IO");
+    Pair<Integer,String> pair = new Pair<>(10, "IO");
 
     Entry<Integer,String> entry = pair.toMapEntry();
     assertEquals(pair.getFirst(), entry.getKey());
@@ -88,9 +88,9 @@ public class PairTest {
    */
   @Test
   public void testSwap() {
-    Pair<Integer,String> pair = new Pair<Integer,String>(25, "twenty-five");
+    Pair<Integer,String> pair = new Pair<>(25, "twenty-five");
     assertEquals(pair, pair.swap().swap());
-    Pair<String,Integer> pair2 = new Pair<String,Integer>("twenty-five", 25);
+    Pair<String,Integer> pair2 = new Pair<>("twenty-five", 25);
     assertEquals(pair, pair2.swap());
     assertEquals(pair2, pair.swap());
   }
@@ -100,7 +100,7 @@ public class PairTest {
    */
   @Test
   public void testFromEntry() {
-    Entry<Integer,String> entry = new SimpleImmutableEntry<Integer,String>(10, "IO");
+    Entry<Integer,String> entry = new SimpleImmutableEntry<>(10, "IO");
 
     Pair<Integer,String> pair0 = Pair.fromEntry(entry);
     assertEquals(entry.getKey(), pair0.getFirst());

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/util/PartitionerTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/util/PartitionerTest.java b/core/src/test/java/org/apache/accumulo/core/util/PartitionerTest.java
index 8ab2beb..7568aba 100644
--- a/core/src/test/java/org/apache/accumulo/core/util/PartitionerTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/util/PartitionerTest.java
@@ -112,7 +112,7 @@ public class PartitionerTest {
   }
 
   private Set<Key> toKeySet(Mutation... expected) {
-    HashSet<Key> ret = new HashSet<Key>();
+    HashSet<Key> ret = new HashSet<>();
     for (Mutation mutation : expected)
       for (ColumnUpdate cu : mutation.getUpdates())
         ret.add(new Key(mutation.getRow(), cu.getColumnFamily(), cu.getColumnQualifier(), cu.getColumnVisibility(), cu.getTimestamp()));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/util/format/DateStringFormatterTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/util/format/DateStringFormatterTest.java b/core/src/test/java/org/apache/accumulo/core/util/format/DateStringFormatterTest.java
index 505c198..22af5b0 100644
--- a/core/src/test/java/org/apache/accumulo/core/util/format/DateStringFormatterTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/util/format/DateStringFormatterTest.java
@@ -36,7 +36,7 @@ public class DateStringFormatterTest {
   @Before
   public void setUp() {
     formatter = new DateStringFormatter();
-    data = new TreeMap<Key,Value>();
+    data = new TreeMap<>();
     data.put(new Key("", "", "", 0), new Value());
   }
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/util/format/DefaultFormatterTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/util/format/DefaultFormatterTest.java b/core/src/test/java/org/apache/accumulo/core/util/format/DefaultFormatterTest.java
index eed455c..9c688db 100644
--- a/core/src/test/java/org/apache/accumulo/core/util/format/DefaultFormatterTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/util/format/DefaultFormatterTest.java
@@ -68,7 +68,7 @@ public class DefaultFormatterTest {
   @Test
   public void testFormatEntry() {
     final long timestamp = 0;
-    Map<Key,Value> map = new TreeMap<Key,Value>();
+    Map<Key,Value> map = new TreeMap<>();
     map.put(new Key("a", "ab", "abc", timestamp), new Value("abcd".getBytes()));
 
     FormatterConfig config;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/util/format/HexFormatterTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/util/format/HexFormatterTest.java b/core/src/test/java/org/apache/accumulo/core/util/format/HexFormatterTest.java
index 7f20dfc..c267fbe 100644
--- a/core/src/test/java/org/apache/accumulo/core/util/format/HexFormatterTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/util/format/HexFormatterTest.java
@@ -35,7 +35,7 @@ public class HexFormatterTest {
 
   @Before
   public void setUp() {
-    data = new TreeMap<Key,Value>();
+    data = new TreeMap<>();
     formatter = new HexFormatter();
   }
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/util/format/ShardedTableDistributionFormatterTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/util/format/ShardedTableDistributionFormatterTest.java b/core/src/test/java/org/apache/accumulo/core/util/format/ShardedTableDistributionFormatterTest.java
index d6afe99..ce733fe 100644
--- a/core/src/test/java/org/apache/accumulo/core/util/format/ShardedTableDistributionFormatterTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/util/format/ShardedTableDistributionFormatterTest.java
@@ -39,7 +39,7 @@ public class ShardedTableDistributionFormatterTest {
 
   @Before
   public void setUp() {
-    data = new TreeMap<Key,Value>();
+    data = new TreeMap<>();
     formatter = new ShardedTableDistributionFormatter();
   }
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/util/format/StatisticsDisplayFormatterTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/util/format/StatisticsDisplayFormatterTest.java b/core/src/test/java/org/apache/accumulo/core/util/format/StatisticsDisplayFormatterTest.java
index 69342d7..d559d73 100644
--- a/core/src/test/java/org/apache/accumulo/core/util/format/StatisticsDisplayFormatterTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/util/format/StatisticsDisplayFormatterTest.java
@@ -35,7 +35,7 @@ public class StatisticsDisplayFormatterTest {
 
   @Before
   public void setUp() {
-    data = new TreeMap<Key,Value>();
+    data = new TreeMap<>();
     formatter = new StatisticsDisplayFormatter();
   }
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchScanner.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchScanner.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchScanner.java
index 4bd1e61..e762e7d 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchScanner.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchScanner.java
@@ -116,8 +116,8 @@ public class RandomBatchScanner {
    */
   static boolean doRandomQueries(int num, long min, long max, int evs, Random r, BatchScanner tsbr) {
 
-    HashSet<Range> ranges = new HashSet<Range>(num);
-    HashMap<Text,Boolean> expectedRows = new java.util.HashMap<Text,Boolean>();
+    HashSet<Range> ranges = new HashSet<>(num);
+    HashMap<Text,Boolean> expectedRows = new java.util.HashMap<>();
 
     generateRandomQueries(num, min, max, r, ranges, expectedRows);
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchWriter.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchWriter.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchWriter.java
index 610eb5c..51aee8f 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchWriter.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchWriter.java
@@ -143,7 +143,7 @@ public class RandomBatchWriter {
     ColumnVisibility cv = opts.visiblity;
 
     // Generate num unique row ids in the given range
-    HashSet<Long> rowids = new HashSet<Long>(opts.num);
+    HashSet<Long> rowids = new HashSet<>(opts.num);
     while (rowids.size() < opts.num) {
       rowids.add((abs(r.nextLong()) % (opts.max - opts.min)) + opts.min);
     }
@@ -156,12 +156,12 @@ public class RandomBatchWriter {
       bw.close();
     } catch (MutationsRejectedException e) {
       if (e.getSecurityErrorCodes().size() > 0) {
-        HashMap<String,Set<SecurityErrorCode>> tables = new HashMap<String,Set<SecurityErrorCode>>();
+        HashMap<String,Set<SecurityErrorCode>> tables = new HashMap<>();
         for (Entry<TabletId,Set<SecurityErrorCode>> ke : e.getSecurityErrorCodes().entrySet()) {
           String tableId = ke.getKey().getTableId().toString();
           Set<SecurityErrorCode> secCodes = tables.get(tableId);
           if (secCodes == null) {
-            secCodes = new HashSet<SecurityErrorCode>();
+            secCodes = new HashSet<>();
             tables.put(tableId, secCodes);
           }
           secCodes.addAll(ke.getValue());

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/ReadWriteExample.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/ReadWriteExample.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/ReadWriteExample.java
index 70effb1..44d4b6f 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/ReadWriteExample.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/ReadWriteExample.java
@@ -88,7 +88,7 @@ public class ReadWriteExample {
 
     // create table
     if (opts.createtable) {
-      SortedSet<Text> partitionKeys = new TreeSet<Text>();
+      SortedSet<Text> partitionKeys = new TreeSet<>();
       for (int i = Byte.MIN_VALUE; i < Byte.MAX_VALUE; i++)
         partitionKeys.add(new Text(new byte[] {(byte) i}));
       conn.tableOperations().create(opts.getTableName());

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/examples/simple/src/main/java/org/apache/accumulo/examples/simple/constraints/AlphaNumKeyConstraint.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/constraints/AlphaNumKeyConstraint.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/constraints/AlphaNumKeyConstraint.java
index f265e18..14e3c8e 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/constraints/AlphaNumKeyConstraint.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/constraints/AlphaNumKeyConstraint.java
@@ -55,7 +55,7 @@ public class AlphaNumKeyConstraint implements Constraint {
 
   private Set<Short> addViolation(Set<Short> violations, short violation) {
     if (violations == null) {
-      violations = new LinkedHashSet<Short>();
+      violations = new LinkedHashSet<>();
       violations.add(violation);
     } else if (!violations.contains(violation)) {
       violations.add(violation);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/examples/simple/src/main/java/org/apache/accumulo/examples/simple/dirlist/Ingest.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/dirlist/Ingest.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/dirlist/Ingest.java
index 17c9ee8..c0808fe 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/dirlist/Ingest.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/dirlist/Ingest.java
@@ -132,7 +132,7 @@ public class Ingest {
     @Parameter(names = "--chunkSize", description = "the size of chunks when breaking down files")
     int chunkSize = 100000;
     @Parameter(description = "<dir> { <dir> ... }")
-    List<String> directories = new ArrayList<String>();
+    List<String> directories = new ArrayList<>();
   }
 
   public static void main(String[] args) throws Exception {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/examples/simple/src/main/java/org/apache/accumulo/examples/simple/dirlist/QueryUtil.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/dirlist/QueryUtil.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/dirlist/QueryUtil.java
index a79b9d2..2c76264 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/dirlist/QueryUtil.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/dirlist/QueryUtil.java
@@ -143,7 +143,7 @@ public class QueryUtil {
       path = path.substring(0, path.length() - 1);
     Scanner scanner = conn.createScanner(tableName, auths);
     scanner.setRange(new Range(getRow(path)));
-    Map<String,String> data = new TreeMap<String,String>();
+    Map<String,String> data = new TreeMap<>();
     for (Entry<Key,Value> e : scanner) {
       String type = getType(e.getKey().getColumnFamily());
       data.put("fullname", e.getKey().getRow().toString().substring(3));
@@ -161,7 +161,7 @@ public class QueryUtil {
   public Map<String,Map<String,String>> getDirList(String path) throws TableNotFoundException {
     if (!path.endsWith("/"))
       path = path + "/";
-    Map<String,Map<String,String>> fim = new TreeMap<String,Map<String,String>>();
+    Map<String,Map<String,String>> fim = new TreeMap<>();
     Scanner scanner = conn.createScanner(tableName, auths);
     scanner.setRange(Range.prefix(getRow(path)));
     for (Entry<Key,Value> e : scanner) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/ChunkInputFormat.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/ChunkInputFormat.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/ChunkInputFormat.java
index f5da4e5..bb7715b 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/ChunkInputFormat.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/ChunkInputFormat.java
@@ -45,8 +45,8 @@ public class ChunkInputFormat extends InputFormatBase<List<Entry<Key,Value>>,Inp
       @Override
       public void initialize(InputSplit inSplit, TaskAttemptContext attempt) throws IOException {
         super.initialize(inSplit, attempt);
-        peekingScannerIterator = new PeekingIterator<Entry<Key,Value>>(scannerIterator);
-        currentK = new ArrayList<Entry<Key,Value>>();
+        peekingScannerIterator = new PeekingIterator<>(scannerIterator);
+        currentK = new ArrayList<>();
         currentV = new ChunkInputStream();
       }
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/ChunkInputStream.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/ChunkInputStream.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/ChunkInputStream.java
index 0e6e319..1774227 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/ChunkInputStream.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/ChunkInputStream.java
@@ -59,7 +59,7 @@ public class ChunkInputStream extends InputStream {
     if (source != null)
       throw new IOException("setting new source without closing old one");
     this.source = in;
-    currentVis = new TreeSet<Text>();
+    currentVis = new TreeSet<>();
     count = pos = 0;
     if (!source.hasNext()) {
       log.debug("source has no next");

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/FileDataIngest.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/FileDataIngest.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/FileDataIngest.java
index e899ff5..1a0ec5d 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/FileDataIngest.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/FileDataIngest.java
@@ -178,7 +178,7 @@ public class FileDataIngest {
     int chunkSize = 64 * 1024;
 
     @Parameter(description = "<file> { <file> ... }")
-    List<String> files = new ArrayList<String>();
+    List<String> files = new ArrayList<>();
   }
 
   public static void main(String[] args) throws Exception {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/FileDataQuery.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/FileDataQuery.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/FileDataQuery.java
index 75e32ae..48746d0 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/FileDataQuery.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/FileDataQuery.java
@@ -49,7 +49,7 @@ public class FileDataQuery {
       throws AccumuloException, AccumuloSecurityException, TableNotFoundException {
     ZooKeeperInstance instance = new ZooKeeperInstance(ClientConfiguration.loadDefault().withInstance(instanceName).withZkHosts(zooKeepers));
     conn = instance.getConnector(user, token);
-    lastRefs = new ArrayList<Entry<Key,Value>>();
+    lastRefs = new ArrayList<>();
     cis = new ChunkInputStream();
     scanner = conn.createScanner(tableName, auths);
   }
@@ -62,7 +62,7 @@ public class FileDataQuery {
     scanner.setRange(new Range(hash));
     scanner.setBatchSize(1);
     lastRefs.clear();
-    PeekingIterator<Entry<Key,Value>> pi = new PeekingIterator<Entry<Key,Value>>(scanner.iterator());
+    PeekingIterator<Entry<Key,Value>> pi = new PeekingIterator<>(scanner.iterator());
     if (pi.hasNext()) {
       while (!pi.peek().getKey().getColumnFamily().equals(FileDataIngest.CHUNK_CF)) {
         lastRefs.add(pi.peek());

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/KeyUtil.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/KeyUtil.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/KeyUtil.java
index 2f09785..f9c52ba 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/KeyUtil.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/KeyUtil.java
@@ -50,7 +50,7 @@ public class KeyUtil {
    * @return an array of strings
    */
   public static String[] splitNullSepText(Text t) {
-    ArrayList<String> s = new ArrayList<String>();
+    ArrayList<String> s = new ArrayList<>();
     byte[] b = t.getBytes();
     int lastindex = 0;
     for (int i = 0; i < t.getLength(); i++) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/VisibilityCombiner.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/VisibilityCombiner.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/VisibilityCombiner.java
index ab2e7fc..b205ec1 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/VisibilityCombiner.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/VisibilityCombiner.java
@@ -25,7 +25,7 @@ import org.apache.accumulo.core.data.ByteSequence;
  */
 public class VisibilityCombiner {
 
-  private TreeSet<String> visibilities = new TreeSet<String>();
+  private TreeSet<String> visibilities = new TreeSet<>();
 
   void add(ByteSequence cv) {
     if (cv.length() == 0)

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/examples/simple/src/main/java/org/apache/accumulo/examples/simple/isolation/InterferenceTest.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/isolation/InterferenceTest.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/isolation/InterferenceTest.java
index 9fe6857..a2afcdf 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/isolation/InterferenceTest.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/isolation/InterferenceTest.java
@@ -108,7 +108,7 @@ public class InterferenceTest {
 
         // all columns in a row should have the same value,
         // use this hash set to track that
-        HashSet<String> values = new HashSet<String>();
+        HashSet<String> values = new HashSet<>();
 
         for (Entry<Key,Value> entry : scanner) {
           if (row == null)

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/NGramIngest.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/NGramIngest.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/NGramIngest.java
index 441f6ad..3355454 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/NGramIngest.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/NGramIngest.java
@@ -87,7 +87,7 @@ public class NGramIngest extends Configured implements Tool {
     if (!opts.getConnector().tableOperations().exists(opts.getTableName())) {
       log.info("Creating table " + opts.getTableName());
       opts.getConnector().tableOperations().create(opts.getTableName());
-      SortedSet<Text> splits = new TreeSet<Text>();
+      SortedSet<Text> splits = new TreeSet<>();
       String numbers[] = "1 2 3 4 5 6 7 8 9".split("\\s");
       String lower[] = "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("\\s");
       String upper[] = "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("\\s");

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/RowHash.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/RowHash.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/RowHash.java
index 9af2563..d27758e 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/RowHash.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/RowHash.java
@@ -75,7 +75,7 @@ public class RowHash extends Configured implements Tool {
     Text cf = new Text(idx < 0 ? col : col.substring(0, idx));
     Text cq = idx < 0 ? null : new Text(col.substring(idx + 1));
     if (cf.getLength() > 0)
-      AccumuloInputFormat.fetchColumns(job, Collections.singleton(new Pair<Text,Text>(cf, cq)));
+      AccumuloInputFormat.fetchColumns(job, Collections.singleton(new Pair<>(cf, cq)));
 
     job.setMapperClass(HashDataMapper.class);
     job.setMapOutputKeyClass(Text.class);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TableToFile.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TableToFile.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TableToFile.java
index 7eb6b42..96603ad 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TableToFile.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TableToFile.java
@@ -60,7 +60,7 @@ public class TableToFile extends Configured implements Tool {
   public static class TTFMapper extends Mapper<Key,Value,NullWritable,Text> {
     @Override
     public void map(Key row, Value data, Context context) throws IOException, InterruptedException {
-      Map.Entry<Key,Value> entry = new SimpleImmutableEntry<Key,Value>(row, data);
+      Map.Entry<Key,Value> entry = new SimpleImmutableEntry<>(row, data);
       context.write(NullWritable.get(), new Text(DefaultFormatter.formatEntry(entry, false)));
       context.setStatus("Outputed Value");
     }
@@ -77,13 +77,13 @@ public class TableToFile extends Configured implements Tool {
     job.setInputFormatClass(AccumuloInputFormat.class);
     opts.setAccumuloConfigs(job);
 
-    HashSet<Pair<Text,Text>> columnsToFetch = new HashSet<Pair<Text,Text>>();
+    HashSet<Pair<Text,Text>> columnsToFetch = new HashSet<>();
     for (String col : opts.columns.split(",")) {
       int idx = col.indexOf(":");
       Text cf = new Text(idx < 0 ? col : col.substring(0, idx));
       Text cq = idx < 0 ? null : new Text(col.substring(idx + 1));
       if (cf.getLength() > 0)
-        columnsToFetch.add(new Pair<Text,Text>(cf, cq));
+        columnsToFetch.add(new Pair<>(cf, cq));
     }
     if (!columnsToFetch.isEmpty())
       AccumuloInputFormat.fetchColumns(job, columnsToFetch);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TeraSortIngest.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TeraSortIngest.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TeraSortIngest.java
index 1005df4..b0b5177 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TeraSortIngest.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TeraSortIngest.java
@@ -167,7 +167,7 @@ public class TeraSortIngest extends Configured implements Tool {
       int numSplits = job.getConfiguration().getInt(NUMSPLITS, 1);
       long rowsPerSplit = totalRows / numSplits;
       System.out.println("Generating " + totalRows + " using " + numSplits + " maps with step of " + rowsPerSplit);
-      ArrayList<InputSplit> splits = new ArrayList<InputSplit>(numSplits);
+      ArrayList<InputSplit> splits = new ArrayList<>(numSplits);
       long currentRow = 0;
       for (int split = 0; split < numSplits - 1; ++split) {
         splits.add(new RangeInputSplit(currentRow, rowsPerSplit));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/bulk/SetupTable.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/bulk/SetupTable.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/bulk/SetupTable.java
index 8651c39..0fc3110 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/bulk/SetupTable.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/bulk/SetupTable.java
@@ -30,7 +30,7 @@ public class SetupTable {
 
   static class Opts extends ClientOnRequiredTable {
     @Parameter(description = "<split> { <split> ... } ")
-    List<String> splits = new ArrayList<String>();
+    List<String> splits = new ArrayList<>();
   }
 
   public static void main(String[] args) throws Exception {
@@ -40,7 +40,7 @@ public class SetupTable {
     conn.tableOperations().create(opts.getTableName());
     if (!opts.splits.isEmpty()) {
       // create a table with initial partitions
-      TreeSet<Text> intialPartitions = new TreeSet<Text>();
+      TreeSet<Text> intialPartitions = new TreeSet<>();
       for (String split : opts.splits) {
         intialPartitions.add(new Text(split));
       }


[13/32] accumulo git commit: ACCUMULO-4357 Remove unneeded code for readability

Posted by ct...@apache.org.
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/impl/InputConfigurator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/impl/InputConfigurator.java b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/impl/InputConfigurator.java
index 448b45e..986e071 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/impl/InputConfigurator.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/impl/InputConfigurator.java
@@ -209,7 +209,7 @@ public class InputConfigurator extends ConfiguratorBase {
   public static void setRanges(Class<?> implementingClass, Configuration conf, Collection<Range> ranges) {
     checkArgument(ranges != null, "ranges is null");
 
-    ArrayList<String> rangeStrings = new ArrayList<String>(ranges.size());
+    ArrayList<String> rangeStrings = new ArrayList<>(ranges.size());
     try {
       for (Range r : ranges) {
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -238,7 +238,7 @@ public class InputConfigurator extends ConfiguratorBase {
   public static List<Range> getRanges(Class<?> implementingClass, Configuration conf) throws IOException {
 
     Collection<String> encodedRanges = conf.getStringCollection(enumToConfKey(implementingClass, ScanOpts.RANGES));
-    List<Range> ranges = new ArrayList<Range>();
+    List<Range> ranges = new ArrayList<>();
     for (String rangeString : encodedRanges) {
       ByteArrayInputStream bais = new ByteArrayInputStream(Base64.decodeBase64(rangeString.getBytes(UTF_8)));
       Range range = new Range();
@@ -264,11 +264,11 @@ public class InputConfigurator extends ConfiguratorBase {
 
     // If no iterators are present, return an empty list
     if (iterators == null || iterators.isEmpty())
-      return new ArrayList<IteratorSetting>();
+      return new ArrayList<>();
 
     // Compose the set of iterators encoded in the job configuration
     StringTokenizer tokens = new StringTokenizer(iterators, StringUtils.COMMA_STR);
-    List<IteratorSetting> list = new ArrayList<IteratorSetting>();
+    List<IteratorSetting> list = new ArrayList<>();
     try {
       while (tokens.hasMoreTokens()) {
         String itstring = tokens.nextToken();
@@ -304,7 +304,7 @@ public class InputConfigurator extends ConfiguratorBase {
 
   public static String[] serializeColumns(Collection<Pair<Text,Text>> columnFamilyColumnQualifierPairs) {
     checkArgument(columnFamilyColumnQualifierPairs != null, "columnFamilyColumnQualifierPairs is null");
-    ArrayList<String> columnStrings = new ArrayList<String>(columnFamilyColumnQualifierPairs.size());
+    ArrayList<String> columnStrings = new ArrayList<>(columnFamilyColumnQualifierPairs.size());
     for (Pair<Text,Text> column : columnFamilyColumnQualifierPairs) {
 
       if (column.getFirst() == null)
@@ -333,7 +333,7 @@ public class InputConfigurator extends ConfiguratorBase {
   public static Set<Pair<Text,Text>> getFetchedColumns(Class<?> implementingClass, Configuration conf) {
     checkArgument(conf != null, "conf is null");
     String confValue = conf.get(enumToConfKey(implementingClass, ScanOpts.COLUMNS));
-    List<String> serialized = new ArrayList<String>();
+    List<String> serialized = new ArrayList<>();
     if (confValue != null) {
       // Split and include any trailing empty strings to allow empty column families
       for (String val : confValue.split(",", -1)) {
@@ -344,7 +344,7 @@ public class InputConfigurator extends ConfiguratorBase {
   }
 
   public static Set<Pair<Text,Text>> deserializeFetchedColumns(Collection<String> serialized) {
-    Set<Pair<Text,Text>> columns = new HashSet<Pair<Text,Text>>();
+    Set<Pair<Text,Text>> columns = new HashSet<>();
 
     if (null == serialized) {
       return columns;
@@ -354,7 +354,7 @@ public class InputConfigurator extends ConfiguratorBase {
       int idx = col.indexOf(":");
       Text cf = new Text(idx < 0 ? Base64.decodeBase64(col.getBytes(UTF_8)) : Base64.decodeBase64(col.substring(0, idx).getBytes(UTF_8)));
       Text cq = idx < 0 ? null : new Text(Base64.decodeBase64(col.substring(idx + 1).getBytes(UTF_8)));
-      columns.add(new Pair<Text,Text>(cf, cq));
+      columns.add(new Pair<>(cf, cq));
     }
     return columns;
   }
@@ -621,7 +621,7 @@ public class InputConfigurator extends ConfiguratorBase {
    * @since 1.6.0
    */
   public static Map<String,InputTableConfig> getInputTableConfigs(Class<?> implementingClass, Configuration conf) {
-    Map<String,InputTableConfig> configs = new HashMap<String,InputTableConfig>();
+    Map<String,InputTableConfig> configs = new HashMap<>();
     Map.Entry<String,InputTableConfig> defaultConfig = getDefaultInputTableConfig(implementingClass, conf);
     if (defaultConfig != null)
       configs.put(defaultConfig.getKey(), defaultConfig.getValue());
@@ -851,7 +851,7 @@ public class InputConfigurator extends ConfiguratorBase {
 
   public static Map<String,Map<KeyExtent,List<Range>>> binOffline(String tableId, List<Range> ranges, Instance instance, Connector conn)
       throws AccumuloException, TableNotFoundException {
-    Map<String,Map<KeyExtent,List<Range>>> binnedRanges = new HashMap<String,Map<KeyExtent,List<Range>>>();
+    Map<String,Map<KeyExtent,List<Range>>> binnedRanges = new HashMap<>();
 
     if (Tables.getTableState(instance, tableId) != TableState.OFFLINE) {
       Tables.clearCache(instance);
@@ -916,13 +916,13 @@ public class InputConfigurator extends ConfiguratorBase {
 
         Map<KeyExtent,List<Range>> tabletRanges = binnedRanges.get(last);
         if (tabletRanges == null) {
-          tabletRanges = new HashMap<KeyExtent,List<Range>>();
+          tabletRanges = new HashMap<>();
           binnedRanges.put(last, tabletRanges);
         }
 
         List<Range> rangeList = tabletRanges.get(extent);
         if (rangeList == null) {
-          rangeList = new ArrayList<Range>();
+          rangeList = new ArrayList<>();
           tabletRanges.put(extent, rangeList);
         }
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/partition/RangePartitioner.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/partition/RangePartitioner.java b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/partition/RangePartitioner.java
index c0c0097..fa80831 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/partition/RangePartitioner.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/partition/RangePartitioner.java
@@ -89,7 +89,7 @@ public class RangePartitioner extends Partitioner<Text,Writable> implements Conf
       if (cf != null) {
         for (Path path : cf) {
           if (path.toUri().getPath().endsWith(cutFileName.substring(cutFileName.lastIndexOf('/')))) {
-            TreeSet<Text> cutPoints = new TreeSet<Text>();
+            TreeSet<Text> cutPoints = new TreeSet<>();
             Scanner in = new Scanner(new BufferedReader(new InputStreamReader(new FileInputStream(path.toString()), UTF_8)));
             try {
               while (in.hasNextLine())

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/mock/MockAccumulo.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/mock/MockAccumulo.java b/core/src/main/java/org/apache/accumulo/core/client/mock/MockAccumulo.java
index 18dac55..f362add 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/mock/MockAccumulo.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/mock/MockAccumulo.java
@@ -45,10 +45,10 @@ import org.apache.hadoop.io.Text;
  */
 @Deprecated
 public class MockAccumulo {
-  final Map<String,MockTable> tables = new HashMap<String,MockTable>();
-  final Map<String,MockNamespace> namespaces = new HashMap<String,MockNamespace>();
-  final Map<String,String> systemProperties = new HashMap<String,String>();
-  Map<String,MockUser> users = new HashMap<String,MockUser>();
+  final Map<String,MockTable> tables = new HashMap<>();
+  final Map<String,MockNamespace> namespaces = new HashMap<>();
+  final Map<String,String> systemProperties = new HashMap<>();
+  Map<String,MockUser> users = new HashMap<>();
   final FileSystem fs;
   final AtomicInteger tableIdCounter = new AtomicInteger(0);
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/mock/MockBatchScanner.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/mock/MockBatchScanner.java b/core/src/main/java/org/apache/accumulo/core/client/mock/MockBatchScanner.java
index 0622f33..1ea27b5 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/mock/MockBatchScanner.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/mock/MockBatchScanner.java
@@ -50,7 +50,7 @@ public class MockBatchScanner extends MockScannerBase implements BatchScanner {
       throw new IllegalArgumentException("ranges must be non null and contain at least 1 range");
     }
 
-    this.ranges = new ArrayList<Range>(ranges);
+    this.ranges = new ArrayList<>(ranges);
   }
 
   @SuppressWarnings("unchecked")

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/mock/MockInstance.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/mock/MockInstance.java b/core/src/main/java/org/apache/accumulo/core/client/mock/MockInstance.java
index a37706a..50d212f 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/mock/MockInstance.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/mock/MockInstance.java
@@ -55,7 +55,7 @@ import org.apache.hadoop.io.Text;
 public class MockInstance implements Instance {
 
   static final String genericAddress = "localhost:1234";
-  static final Map<String,MockAccumulo> instances = new HashMap<String,MockAccumulo>();
+  static final Map<String,MockAccumulo> instances = new HashMap<>();
   MockAccumulo acu;
   String instanceName;
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/mock/MockInstanceOperations.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/mock/MockInstanceOperations.java b/core/src/main/java/org/apache/accumulo/core/client/mock/MockInstanceOperations.java
index b7e8e68..e264104 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/mock/MockInstanceOperations.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/mock/MockInstanceOperations.java
@@ -63,12 +63,12 @@ class MockInstanceOperations implements InstanceOperations {
 
   @Override
   public List<String> getTabletServers() {
-    return new ArrayList<String>();
+    return new ArrayList<>();
   }
 
   @Override
   public List<ActiveScan> getActiveScans(String tserver) throws AccumuloException, AccumuloSecurityException {
-    return new ArrayList<ActiveScan>();
+    return new ArrayList<>();
   }
 
   @Override
@@ -84,7 +84,7 @@ class MockInstanceOperations implements InstanceOperations {
 
   @Override
   public List<ActiveCompaction> getActiveCompactions(String tserver) throws AccumuloException, AccumuloSecurityException {
-    return new ArrayList<ActiveCompaction>();
+    return new ArrayList<>();
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/mock/MockMultiTableBatchWriter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/mock/MockMultiTableBatchWriter.java b/core/src/main/java/org/apache/accumulo/core/client/mock/MockMultiTableBatchWriter.java
index cfacccb..5b9bc2b 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/mock/MockMultiTableBatchWriter.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/mock/MockMultiTableBatchWriter.java
@@ -36,7 +36,7 @@ public class MockMultiTableBatchWriter implements MultiTableBatchWriter {
 
   public MockMultiTableBatchWriter(MockAccumulo acu) {
     this.acu = acu;
-    bws = new HashMap<String,MockBatchWriter>();
+    bws = new HashMap<>();
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/mock/MockNamespace.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/mock/MockNamespace.java b/core/src/main/java/org/apache/accumulo/core/client/mock/MockNamespace.java
index da118c3..456580b 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/mock/MockNamespace.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/mock/MockNamespace.java
@@ -34,10 +34,10 @@ import org.apache.accumulo.core.security.NamespacePermission;
 public class MockNamespace {
 
   final HashMap<String,String> settings;
-  Map<String,EnumSet<NamespacePermission>> userPermissions = new HashMap<String,EnumSet<NamespacePermission>>();
+  Map<String,EnumSet<NamespacePermission>> userPermissions = new HashMap<>();
 
   public MockNamespace() {
-    settings = new HashMap<String,String>();
+    settings = new HashMap<>();
     for (Entry<String,String> entry : AccumuloConfiguration.getDefaultConfiguration()) {
       String key = entry.getKey();
       if (key.startsWith(Property.TABLE_PREFIX.getKey())) {
@@ -47,7 +47,7 @@ public class MockNamespace {
   }
 
   public List<String> getTables(MockAccumulo acu) {
-    List<String> l = new LinkedList<String>();
+    List<String> l = new LinkedList<>();
     for (String t : acu.tables.keySet()) {
       if (acu.tables.get(t).getNamespace().equals(this)) {
         l.add(t);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/mock/MockNamespaceOperations.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/mock/MockNamespaceOperations.java b/core/src/main/java/org/apache/accumulo/core/client/mock/MockNamespaceOperations.java
index 0c657a9..b1cb980 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/mock/MockNamespaceOperations.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/mock/MockNamespaceOperations.java
@@ -52,7 +52,7 @@ class MockNamespaceOperations extends NamespaceOperationsHelper {
 
   @Override
   public SortedSet<String> list() {
-    return new TreeSet<String>(acu.namespaces.keySet());
+    return new TreeSet<>(acu.namespaces.keySet());
   }
 
   @Override
@@ -116,7 +116,7 @@ class MockNamespaceOperations extends NamespaceOperationsHelper {
 
   @Override
   public Map<String,String> namespaceIdMap() {
-    Map<String,String> result = new HashMap<String,String>();
+    Map<String,String> result = new HashMap<>();
     for (String table : acu.tables.keySet()) {
       result.put(table, table);
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/mock/MockScannerBase.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/mock/MockScannerBase.java b/core/src/main/java/org/apache/accumulo/core/client/mock/MockScannerBase.java
index a79255c..ad79ec0 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/mock/MockScannerBase.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/mock/MockScannerBase.java
@@ -23,7 +23,6 @@ import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Map.Entry;
 
-import org.apache.accumulo.core.client.ScannerBase;
 import org.apache.accumulo.core.client.impl.ScannerOptions;
 import org.apache.accumulo.core.client.sample.SamplerConfiguration;
 import org.apache.accumulo.core.conf.AccumuloConfiguration;
@@ -48,7 +47,7 @@ import org.apache.commons.lang.NotImplementedException;
  * @deprecated since 1.8.0; use MiniAccumuloCluster or a standard mock framework instead.
  */
 @Deprecated
-public class MockScannerBase extends ScannerOptions implements ScannerBase {
+public class MockScannerBase extends ScannerOptions {
 
   protected final MockTable table;
   protected final Authorizations auths;
@@ -59,7 +58,7 @@ public class MockScannerBase extends ScannerOptions implements ScannerBase {
   }
 
   static HashSet<ByteSequence> createColumnBSS(Collection<Column> columns) {
-    HashSet<ByteSequence> columnSet = new HashSet<ByteSequence>();
+    HashSet<ByteSequence> columnSet = new HashSet<>();
     for (Column c : columns) {
       columnSet.add(new ArrayByteSequence(c.getColumnFamily()));
     }
@@ -94,7 +93,7 @@ public class MockScannerBase extends ScannerOptions implements ScannerBase {
       return false;
     }
 
-    private ArrayList<SortedKeyValueIterator<Key,Value>> topLevelIterators = new ArrayList<SortedKeyValueIterator<Key,Value>>();
+    private ArrayList<SortedKeyValueIterator<Key,Value>> topLevelIterators = new ArrayList<>();
 
     @Override
     public void registerSideChannel(SortedKeyValueIterator<Key,Value> iter) {
@@ -109,7 +108,7 @@ public class MockScannerBase extends ScannerOptions implements ScannerBase {
     SortedKeyValueIterator<Key,Value> getTopLevelIterator(SortedKeyValueIterator<Key,Value> iter) {
       if (topLevelIterators.isEmpty())
         return iter;
-      ArrayList<SortedKeyValueIterator<Key,Value>> allIters = new ArrayList<SortedKeyValueIterator<Key,Value>>(topLevelIterators);
+      ArrayList<SortedKeyValueIterator<Key,Value>> allIters = new ArrayList<>(topLevelIterators);
       allIters.add(iter);
       return new MultiIterator(allIters, false);
     }
@@ -133,7 +132,7 @@ public class MockScannerBase extends ScannerOptions implements ScannerBase {
   public SortedKeyValueIterator<Key,Value> createFilter(SortedKeyValueIterator<Key,Value> inner) throws IOException {
     byte[] defaultLabels = {};
     inner = new ColumnFamilySkippingIterator(new DeletingIterator(inner, false));
-    ColumnQualifierFilter cqf = new ColumnQualifierFilter(inner, new HashSet<Column>(fetchedColumns));
+    ColumnQualifierFilter cqf = new ColumnQualifierFilter(inner, new HashSet<>(fetchedColumns));
     VisibilityFilter vf = new VisibilityFilter(cqf, auths, defaultLabels);
     AccumuloConfiguration conf = new MockConfiguration(table.settings);
     MockIteratorEnvironment iterEnv = new MockIteratorEnvironment(auths);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/mock/MockTable.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/mock/MockTable.java b/core/src/main/java/org/apache/accumulo/core/client/mock/MockTable.java
index fa0fbcd..1445650 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/mock/MockTable.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/mock/MockTable.java
@@ -85,15 +85,15 @@ public class MockTable {
       }
       return 0;
     }
-  };
+  }
 
-  final SortedMap<Key,Value> table = new ConcurrentSkipListMap<Key,Value>();
+  final SortedMap<Key,Value> table = new ConcurrentSkipListMap<>();
   int mutationCount = 0;
   final Map<String,String> settings;
-  Map<String,EnumSet<TablePermission>> userPermissions = new HashMap<String,EnumSet<TablePermission>>();
+  Map<String,EnumSet<TablePermission>> userPermissions = new HashMap<>();
   private TimeType timeType;
-  SortedSet<Text> splits = new ConcurrentSkipListSet<Text>();
-  Map<String,Set<Text>> localityGroups = new TreeMap<String,Set<Text>>();
+  SortedSet<Text> splits = new ConcurrentSkipListSet<>();
+  Map<String,Set<Text>> localityGroups = new TreeMap<>();
   private MockNamespace namespace;
   private String namespaceName;
   private String tableId;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/mock/MockTableOperations.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/mock/MockTableOperations.java b/core/src/main/java/org/apache/accumulo/core/client/mock/MockTableOperations.java
index 2072e00..de89137 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/mock/MockTableOperations.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/mock/MockTableOperations.java
@@ -84,7 +84,7 @@ class MockTableOperations extends TableOperationsHelper {
 
   @Override
   public SortedSet<String> list() {
-    return new TreeSet<String>(acu.tables.keySet());
+    return new TreeSet<>(acu.tables.keySet());
   }
 
   @Override
@@ -209,7 +209,7 @@ class MockTableOperations extends TableOperationsHelper {
       throw new TableNotFoundException(null, tableName, null);
     }
 
-    Set<Entry<String,String>> props = new HashSet<Entry<String,String>>(acu.namespaces.get(namespace).settings.entrySet());
+    Set<Entry<String,String>> props = new HashSet<>(acu.namespaces.get(namespace).settings.entrySet());
 
     Set<Entry<String,String>> tableProps = acu.tables.get(tableName).settings.entrySet();
     for (Entry<String,String> e : tableProps) {
@@ -359,7 +359,7 @@ class MockTableOperations extends TableOperationsHelper {
 
   @Override
   public Map<String,String> tableIdMap() {
-    Map<String,String> result = new HashMap<String,String>();
+    Map<String,String> result = new HashMap<>();
     for (Entry<String,MockTable> entry : acu.tables.entrySet()) {
       String table = entry.getKey();
       if (RootTable.NAME.equals(table))
@@ -375,8 +375,8 @@ class MockTableOperations extends TableOperationsHelper {
   @Override
   public List<DiskUsage> getDiskUsage(Set<String> tables) throws AccumuloException, AccumuloSecurityException {
 
-    List<DiskUsage> diskUsages = new ArrayList<DiskUsage>();
-    diskUsages.add(new DiskUsage(new TreeSet<String>(tables), 0l));
+    List<DiskUsage> diskUsages = new ArrayList<>();
+    diskUsages.add(new DiskUsage(new TreeSet<>(tables), 0l));
 
     return diskUsages;
   }
@@ -401,7 +401,7 @@ class MockTableOperations extends TableOperationsHelper {
     Text endText = end != null ? new Text(end) : new Text(t.table.lastKey().getRow().getBytes());
     startText.append(ZERO, 0, 1);
     endText.append(ZERO, 0, 1);
-    Set<Key> keep = new TreeSet<Key>(t.table.subMap(new Key(startText), new Key(endText)).keySet());
+    Set<Key> keep = new TreeSet<>(t.table.subMap(new Key(startText), new Key(endText)).keySet());
     t.table.keySet().removeAll(keep);
   }
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/mock/impl/MockTabletLocator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/mock/impl/MockTabletLocator.java b/core/src/main/java/org/apache/accumulo/core/client/mock/impl/MockTabletLocator.java
index 1046a8d..a52af79 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/mock/impl/MockTabletLocator.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/mock/impl/MockTabletLocator.java
@@ -48,7 +48,7 @@ public class MockTabletLocator extends TabletLocator {
   @Override
   public <T extends Mutation> void binMutations(ClientContext context, List<T> mutations, Map<String,TabletServerMutations<T>> binnedMutations, List<T> failures)
       throws AccumuloException, AccumuloSecurityException, TableNotFoundException {
-    TabletServerMutations<T> tsm = new TabletServerMutations<T>("5");
+    TabletServerMutations<T> tsm = new TabletServerMutations<>("5");
     for (T m : mutations)
       tsm.addMutation(new KeyExtent(), m);
     binnedMutations.put("", tsm);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/rfile/RFileScannerBuilder.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/rfile/RFileScannerBuilder.java b/core/src/main/java/org/apache/accumulo/core/client/rfile/RFileScannerBuilder.java
index 92e07b4..3a55172 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/rfile/RFileScannerBuilder.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/rfile/RFileScannerBuilder.java
@@ -34,7 +34,7 @@ import org.apache.hadoop.fs.Path;
 
 import com.google.common.base.Preconditions;
 
-class RFileScannerBuilder implements RFile.InputArguments, RFile.ScannerFSOptions, RFile.ScannerOptions {
+class RFileScannerBuilder implements RFile.InputArguments, RFile.ScannerFSOptions {
 
   static class InputArgs extends FSConfArgs {
     private Path[] paths;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/rfile/RFileWriter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/rfile/RFileWriter.java b/core/src/main/java/org/apache/accumulo/core/client/rfile/RFileWriter.java
index 0c4d682..1de3661 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/rfile/RFileWriter.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/rfile/RFileWriter.java
@@ -116,7 +116,7 @@ public class RFileWriter implements AutoCloseable {
    *           When default locality group already started.
    */
   public void startNewLocalityGroup(String name, List<byte[]> families) throws IOException {
-    HashSet<ByteSequence> fams = new HashSet<ByteSequence>();
+    HashSet<ByteSequence> fams = new HashSet<>();
     for (byte[] family : families) {
       fams.add(new ArrayByteSequence(family));
     }
@@ -143,7 +143,7 @@ public class RFileWriter implements AutoCloseable {
    *           When default locality group already started.
    */
   public void startNewLocalityGroup(String name, Set<String> families) throws IOException {
-    HashSet<ByteSequence> fams = new HashSet<ByteSequence>();
+    HashSet<ByteSequence> fams = new HashSet<>();
     for (String family : families) {
       fams.add(new ArrayByteSequence(family));
     }
@@ -160,7 +160,7 @@ public class RFileWriter implements AutoCloseable {
    *           When default locality group already started.
    */
   public void startNewLocalityGroup(String name, String... families) throws IOException {
-    HashSet<ByteSequence> fams = new HashSet<ByteSequence>();
+    HashSet<ByteSequence> fams = new HashSet<>();
     for (String family : families) {
       fams.add(new ArrayByteSequence(family));
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/rfile/RFileWriterBuilder.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/rfile/RFileWriterBuilder.java b/core/src/main/java/org/apache/accumulo/core/client/rfile/RFileWriterBuilder.java
index e4a141c..667cbef 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/rfile/RFileWriterBuilder.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/rfile/RFileWriterBuilder.java
@@ -39,7 +39,7 @@ import org.apache.hadoop.fs.Path;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Iterables;
 
-class RFileWriterBuilder implements RFile.OutputArguments, RFile.WriterFSOptions, RFile.WriterOptions {
+class RFileWriterBuilder implements RFile.OutputArguments, RFile.WriterFSOptions {
 
   private static class OutputArgs extends FSConfArgs {
     private Path path;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/security/tokens/AuthenticationToken.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/security/tokens/AuthenticationToken.java b/core/src/main/java/org/apache/accumulo/core/client/security/tokens/AuthenticationToken.java
index 5c20555..a623e0d 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/security/tokens/AuthenticationToken.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/security/tokens/AuthenticationToken.java
@@ -129,7 +129,7 @@ public interface AuthenticationToken extends Writable, Destroyable, Cloneable {
   class Properties implements Destroyable, Map<String,char[]> {
 
     private boolean destroyed = false;
-    private HashMap<String,char[]> map = new HashMap<String,char[]>();
+    private HashMap<String,char[]> map = new HashMap<>();
 
     private void checkDestroyed() {
       if (destroyed)

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/security/tokens/CredentialProviderToken.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/security/tokens/CredentialProviderToken.java b/core/src/main/java/org/apache/accumulo/core/client/security/tokens/CredentialProviderToken.java
index a34aadf..5ac6f02 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/security/tokens/CredentialProviderToken.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/security/tokens/CredentialProviderToken.java
@@ -75,7 +75,7 @@ public class CredentialProviderToken extends PasswordToken {
 
   @Override
   public Set<TokenProperty> getProperties() {
-    LinkedHashSet<TokenProperty> properties = new LinkedHashSet<TokenProperty>();
+    LinkedHashSet<TokenProperty> properties = new LinkedHashSet<>();
     // Neither name or CPs are sensitive
     properties.add(new TokenProperty(NAME_PROPERTY, "Alias to extract from CredentialProvider", false));
     properties.add(new TokenProperty(CREDENTIAL_PROVIDERS_PROPERTY, "Comma separated list of URLs defining CredentialProvider(s)", false));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/security/tokens/PasswordToken.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/security/tokens/PasswordToken.java b/core/src/main/java/org/apache/accumulo/core/client/security/tokens/PasswordToken.java
index 9cbf914..f4ea78e 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/security/tokens/PasswordToken.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/security/tokens/PasswordToken.java
@@ -150,7 +150,7 @@ public class PasswordToken implements AuthenticationToken {
 
   @Override
   public Set<TokenProperty> getProperties() {
-    Set<TokenProperty> internal = new LinkedHashSet<TokenProperty>();
+    Set<TokenProperty> internal = new LinkedHashSet<>();
     internal.add(new TokenProperty("password", "the password for the principal", true));
     return internal;
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/conf/AccumuloConfiguration.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/conf/AccumuloConfiguration.java b/core/src/main/java/org/apache/accumulo/core/conf/AccumuloConfiguration.java
index 2e1d9bc..23ad278 100644
--- a/core/src/main/java/org/apache/accumulo/core/conf/AccumuloConfiguration.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/AccumuloConfiguration.java
@@ -119,7 +119,7 @@ public abstract class AccumuloConfiguration implements Iterable<Entry<String,Str
    * @return property value
    */
   public String get(String property) {
-    Map<String,String> propMap = new HashMap<String,String>(1);
+    Map<String,String> propMap = new HashMap<>(1);
     getProperties(propMap, new MatchFilter(property));
     return propMap.get(property);
   }
@@ -152,7 +152,7 @@ public abstract class AccumuloConfiguration implements Iterable<Entry<String,Str
   @Override
   public Iterator<Entry<String,String>> iterator() {
     Predicate<String> all = Predicates.alwaysTrue();
-    TreeMap<String,String> entries = new TreeMap<String,String>();
+    TreeMap<String,String> entries = new TreeMap<>();
     getProperties(entries, all);
     return entries.entrySet().iterator();
   }
@@ -178,7 +178,7 @@ public abstract class AccumuloConfiguration implements Iterable<Entry<String,Str
   public Map<String,String> getAllPropertiesWithPrefix(Property property) {
     checkType(property, PropertyType.PREFIX);
 
-    Map<String,String> propMap = new HashMap<String,String>();
+    Map<String,String> propMap = new HashMap<>();
     getProperties(propMap, new PrefixFilter(property.getKey()));
     return propMap;
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/conf/ConfigurationDocGen.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/conf/ConfigurationDocGen.java b/core/src/main/java/org/apache/accumulo/core/conf/ConfigurationDocGen.java
index 7357a9b..1c34b99 100644
--- a/core/src/main/java/org/apache/accumulo/core/conf/ConfigurationDocGen.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/ConfigurationDocGen.java
@@ -305,8 +305,8 @@ class ConfigurationDocGen {
 
   ConfigurationDocGen(PrintStream doc) {
     this.doc = doc;
-    this.prefixes = new ArrayList<Property>();
-    this.sortedProps = new TreeMap<String,Property>();
+    this.prefixes = new ArrayList<>();
+    this.sortedProps = new TreeMap<>();
 
     for (Property prop : Property.values()) {
       if (prop.isExperimental())

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/conf/CredentialProviderFactoryShim.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/conf/CredentialProviderFactoryShim.java b/core/src/main/java/org/apache/accumulo/core/conf/CredentialProviderFactoryShim.java
index 977097e..eb1920d 100644
--- a/core/src/main/java/org/apache/accumulo/core/conf/CredentialProviderFactoryShim.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/CredentialProviderFactoryShim.java
@@ -64,7 +64,7 @@ public class CredentialProviderFactoryShim {
   private static Boolean hadoopClassesAvailable = null;
 
   // access to cachedProviders should be synchronized when necessary (for example see getCredentialProviders)
-  private static final ConcurrentHashMap<String,List<Object>> cachedProviders = new ConcurrentHashMap<String,List<Object>>();
+  private static final ConcurrentHashMap<String,List<Object>> cachedProviders = new ConcurrentHashMap<>();
 
   /**
    * Determine if we can load the necessary CredentialProvider classes. Only loaded the first time, so subsequent invocations of this method should return fast.
@@ -291,7 +291,7 @@ public class CredentialProviderFactoryShim {
       return Collections.emptyList();
     }
 
-    ArrayList<String> aliases = new ArrayList<String>();
+    ArrayList<String> aliases = new ArrayList<>();
     for (Object providerObj : providerObjList) {
       if (null != providerObj) {
         Object aliasesObj;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java b/core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java
index 34d7fd2..e1ff7e1 100644
--- a/core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java
@@ -29,7 +29,7 @@ import com.google.common.base.Predicate;
 public class DefaultConfiguration extends AccumuloConfiguration {
   private final static Map<String,String> resolvedProps;
   static {
-    Map<String,String> m = new HashMap<String,String>();
+    Map<String,String> m = new HashMap<>();
     for (Property prop : Property.values()) {
       if (!prop.getType().equals(PropertyType.PREFIX)) {
         m.put(prop.getKey(), prop.getDefaultValue());

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/conf/ObservableConfiguration.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/conf/ObservableConfiguration.java b/core/src/main/java/org/apache/accumulo/core/conf/ObservableConfiguration.java
index 4c3f932..a1cd4ad 100644
--- a/core/src/main/java/org/apache/accumulo/core/conf/ObservableConfiguration.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/ObservableConfiguration.java
@@ -69,7 +69,7 @@ public abstract class ObservableConfiguration extends AccumuloConfiguration {
   }
 
   private static Collection<ConfigurationObserver> snapshot(Collection<ConfigurationObserver> observers) {
-    Collection<ConfigurationObserver> c = new java.util.ArrayList<ConfigurationObserver>();
+    Collection<ConfigurationObserver> c = new java.util.ArrayList<>();
     synchronized (observers) {
       c.addAll(observers);
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/conf/Property.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/conf/Property.java b/core/src/main/java/org/apache/accumulo/core/conf/Property.java
index bc1e60e..600f712 100644
--- a/core/src/main/java/org/apache/accumulo/core/conf/Property.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/Property.java
@@ -773,8 +773,8 @@ public enum Property {
    */
   public synchronized static boolean isValidPropertyKey(String key) {
     if (validProperties == null) {
-      validProperties = new HashSet<String>();
-      validPrefixes = new HashSet<String>();
+      validProperties = new HashSet<>();
+      validPrefixes = new HashSet<>();
 
       for (Property p : Property.values()) {
         if (p.getType().equals(PropertyType.PREFIX)) {
@@ -799,7 +799,7 @@ public enum Property {
    */
   public synchronized static boolean isValidTablePropertyKey(String key) {
     if (validTableProperties == null) {
-      validTableProperties = new HashSet<String>();
+      validTableProperties = new HashSet<>();
       for (Property p : Property.values()) {
         if (!p.getType().equals(PropertyType.PREFIX) && p.getKey().startsWith(Property.TABLE_PREFIX.getKey())) {
           validTableProperties.add(p.getKey());
@@ -947,7 +947,7 @@ public enum Property {
    */
   public static Map<String,String> getCompactionStrategyOptions(AccumuloConfiguration tableConf) {
     Map<String,String> longNames = tableConf.getAllPropertiesWithPrefix(Property.TABLE_COMPACTION_STRATEGY_PREFIX);
-    Map<String,String> result = new HashMap<String,String>();
+    Map<String,String> result = new HashMap<>();
     for (Entry<String,String> entry : longNames.entrySet()) {
       result.put(entry.getKey().substring(Property.TABLE_COMPACTION_STRATEGY_PREFIX.getKey().length()), entry.getValue());
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/conf/PropertyType.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/conf/PropertyType.java b/core/src/main/java/org/apache/accumulo/core/conf/PropertyType.java
index 22fcb8b..1120b87 100644
--- a/core/src/main/java/org/apache/accumulo/core/conf/PropertyType.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/PropertyType.java
@@ -296,7 +296,7 @@ public enum PropertyType {
         if (!VALID_RANGE.containsInteger(low) || !VALID_RANGE.containsInteger(high) || !(low <= high)) {
           throw new IllegalArgumentException("Invalid port range specified, only 1024 to 65535 supported.");
         }
-        return new Pair<Integer,Integer>(low, high);
+        return new Pair<>(low, high);
       }
       throw new IllegalArgumentException("Invalid port range specification, must use M-N notation.");
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/constraints/DefaultKeySizeConstraint.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/constraints/DefaultKeySizeConstraint.java b/core/src/main/java/org/apache/accumulo/core/constraints/DefaultKeySizeConstraint.java
index 7cc42c1..a2cc337 100644
--- a/core/src/main/java/org/apache/accumulo/core/constraints/DefaultKeySizeConstraint.java
+++ b/core/src/main/java/org/apache/accumulo/core/constraints/DefaultKeySizeConstraint.java
@@ -41,7 +41,7 @@ public class DefaultKeySizeConstraint implements Constraint {
     return null;
   }
 
-  final static List<Short> NO_VIOLATIONS = new ArrayList<Short>();
+  final static List<Short> NO_VIOLATIONS = new ArrayList<>();
 
   @Override
   public List<Short> check(Environment env, Mutation mutation) {
@@ -50,7 +50,7 @@ public class DefaultKeySizeConstraint implements Constraint {
     if (mutation.numBytes() < maxSize)
       return NO_VIOLATIONS;
 
-    List<Short> violations = new ArrayList<Short>();
+    List<Short> violations = new ArrayList<>();
 
     for (ColumnUpdate cu : mutation.getUpdates()) {
       int size = mutation.getRow().length;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/constraints/Violations.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/constraints/Violations.java b/core/src/main/java/org/apache/accumulo/core/constraints/Violations.java
index 1db13cd..65c372f 100644
--- a/core/src/main/java/org/apache/accumulo/core/constraints/Violations.java
+++ b/core/src/main/java/org/apache/accumulo/core/constraints/Violations.java
@@ -61,7 +61,7 @@ public class Violations {
    * Creates a new empty object.
    */
   public Violations() {
-    cvsmap = new HashMap<CVSKey,ConstraintViolationSummary>();
+    cvsmap = new HashMap<>();
   }
 
   /**
@@ -128,7 +128,7 @@ public class Violations {
    * @return list of violation summaries
    */
   public List<ConstraintViolationSummary> asList() {
-    return new ArrayList<ConstraintViolationSummary>(cvsmap.values());
+    return new ArrayList<>(cvsmap.values());
   }
 
 }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/constraints/VisibilityConstraint.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/constraints/VisibilityConstraint.java b/core/src/main/java/org/apache/accumulo/core/constraints/VisibilityConstraint.java
index d03f66e..6a962c2 100644
--- a/core/src/main/java/org/apache/accumulo/core/constraints/VisibilityConstraint.java
+++ b/core/src/main/java/org/apache/accumulo/core/constraints/VisibilityConstraint.java
@@ -56,7 +56,7 @@ public class VisibilityConstraint implements Constraint {
 
     HashSet<String> ok = null;
     if (updates.size() > 1)
-      ok = new HashSet<String>();
+      ok = new HashSet<>();
 
     VisibilityEvaluator ve = null;
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/data/Condition.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/data/Condition.java b/core/src/main/java/org/apache/accumulo/core/data/Condition.java
index 2dc2a0f..1ca5d06 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/Condition.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/Condition.java
@@ -265,8 +265,8 @@ public class Condition {
     checkArgument(iterators != null, "iterators is null");
 
     if (iterators.length > 1) {
-      HashSet<String> names = new HashSet<String>();
-      HashSet<Integer> prios = new HashSet<Integer>();
+      HashSet<String> names = new HashSet<>();
+      HashSet<Integer> prios = new HashSet<>();
 
       for (IteratorSetting iteratorSetting : iterators) {
         if (!names.add(iteratorSetting.getName()))

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/data/ConditionalMutation.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/data/ConditionalMutation.java b/core/src/main/java/org/apache/accumulo/core/data/ConditionalMutation.java
index ccec325..a10f9b7 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/ConditionalMutation.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/ConditionalMutation.java
@@ -34,7 +34,7 @@ import org.apache.hadoop.io.Text;
  */
 public class ConditionalMutation extends Mutation {
 
-  private List<Condition> conditions = new ArrayList<Condition>();
+  private List<Condition> conditions = new ArrayList<>();
 
   public ConditionalMutation(byte[] row, Condition... conditions) {
     super(row);
@@ -64,7 +64,7 @@ public class ConditionalMutation extends Mutation {
 
   public ConditionalMutation(ConditionalMutation cm) {
     super(cm);
-    this.conditions = new ArrayList<Condition>(cm.conditions);
+    this.conditions = new ArrayList<>(cm.conditions);
   }
 
   private void init(Condition... conditions) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/data/Mutation.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/data/Mutation.java b/core/src/main/java/org/apache/accumulo/core/data/Mutation.java
index 8deb2ed..ebc72f5 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/Mutation.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/Mutation.java
@@ -71,7 +71,7 @@ public class Mutation implements Writable {
    */
   public static enum SERIALIZED_FORMAT {
     VERSION1, VERSION2
-  };
+  }
 
   private boolean useOldDeserialize = false;
   private byte[] row;
@@ -319,7 +319,7 @@ public class Mutation implements Writable {
       put(val, valLength);
     } else {
       if (values == null) {
-        values = new ArrayList<byte[]>();
+        values = new ArrayList<>();
       }
       byte copy[] = new byte[valLength];
       System.arraycopy(val, 0, copy, 0, valLength);
@@ -969,7 +969,7 @@ public class Mutation implements Writable {
     if (!valuesPresent) {
       values = null;
     } else {
-      values = new ArrayList<byte[]>();
+      values = new ArrayList<>();
       int numValues = WritableUtils.readVInt(in);
       for (int i = 0; i < numValues; i++) {
         len = WritableUtils.readVInt(in);
@@ -1009,7 +1009,7 @@ public class Mutation implements Writable {
     if (!valuesPresent) {
       localValues = null;
     } else {
-      localValues = new ArrayList<byte[]>();
+      localValues = new ArrayList<>();
       int numValues = in.readInt();
       for (int i = 0; i < numValues; i++) {
         len = in.readInt();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/data/Range.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/data/Range.java b/core/src/main/java/org/apache/accumulo/core/data/Range.java
index c114e2b..306ee2d 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/Range.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/Range.java
@@ -427,10 +427,10 @@ public class Range implements WritableComparable<Range> {
     if (ranges.size() == 1)
       return Collections.singletonList(ranges.iterator().next());
 
-    List<Range> ral = new ArrayList<Range>(ranges);
+    List<Range> ral = new ArrayList<>(ranges);
     Collections.sort(ral);
 
-    ArrayList<Range> ret = new ArrayList<Range>(ranges.size());
+    ArrayList<Range> ret = new ArrayList<>(ranges.size());
 
     Range currentRange = ral.get(0);
     boolean currentStartKeyInclusive = ral.get(0).startKeyInclusive;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/data/impl/KeyExtent.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/data/impl/KeyExtent.java b/core/src/main/java/org/apache/accumulo/core/data/impl/KeyExtent.java
index 6cfacb3..dcb8eb7 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/impl/KeyExtent.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/impl/KeyExtent.java
@@ -309,7 +309,7 @@ public class KeyExtent implements WritableComparable<KeyExtent> {
       startRow = new Text();
     if (endRow == null)
       endRow = new Text();
-    Collection<KeyExtent> keys = new ArrayList<KeyExtent>();
+    Collection<KeyExtent> keys = new ArrayList<>();
     for (KeyExtent ckes : kes) {
       if (ckes.getPrevEndRow() == null) {
         if (ckes.getEndRow() == null) {
@@ -611,7 +611,7 @@ public class KeyExtent implements WritableComparable<KeyExtent> {
 
       if (ke.getPrevEndRow() == tabletKe.getPrevEndRow() || ke.getPrevEndRow() != null && tabletKe.getPrevEndRow() != null
           && tabletKe.getPrevEndRow().compareTo(ke.getPrevEndRow()) == 0) {
-        children = new TreeSet<KeyExtent>();
+        children = new TreeSet<>();
       }
 
       if (children != null) {
@@ -624,7 +624,7 @@ public class KeyExtent implements WritableComparable<KeyExtent> {
       }
     }
 
-    return new TreeSet<KeyExtent>();
+    return new TreeSet<>();
   }
 
   public static KeyExtent findContainingExtent(KeyExtent extent, SortedSet<KeyExtent> extents) {
@@ -690,7 +690,7 @@ public class KeyExtent implements WritableComparable<KeyExtent> {
       start = extents.tailSet(lookupKey);
     }
 
-    TreeSet<KeyExtent> result = new TreeSet<KeyExtent>();
+    TreeSet<KeyExtent> result = new TreeSet<>();
     for (KeyExtent ke : start) {
       if (startsAfter(nke, ke)) {
         break;
@@ -701,7 +701,7 @@ public class KeyExtent implements WritableComparable<KeyExtent> {
   }
 
   public boolean overlaps(KeyExtent other) {
-    SortedSet<KeyExtent> set = new TreeSet<KeyExtent>();
+    SortedSet<KeyExtent> set = new TreeSet<>();
     set.add(other);
     return !findOverlapping(this, set).isEmpty();
   }
@@ -722,7 +722,7 @@ public class KeyExtent implements WritableComparable<KeyExtent> {
       start = extents.tailMap(lookupKey);
     }
 
-    TreeSet<KeyExtent> result = new TreeSet<KeyExtent>();
+    TreeSet<KeyExtent> result = new TreeSet<>();
     for (Entry<KeyExtent,?> entry : start.entrySet()) {
       KeyExtent ke = entry.getKey();
       if (startsAfter(nke, ke)) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/file/BloomFilterLayer.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/file/BloomFilterLayer.java b/core/src/main/java/org/apache/accumulo/core/file/BloomFilterLayer.java
index c9ac8b6..6e5728a 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/BloomFilterLayer.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/BloomFilterLayer.java
@@ -80,7 +80,7 @@ public class BloomFilterLayer {
     }
 
     if (maxLoadThreads > 0) {
-      BlockingQueue<Runnable> q = new LinkedBlockingQueue<Runnable>();
+      BlockingQueue<Runnable> q = new LinkedBlockingQueue<>();
       loadThreadPool = new ThreadPoolExecutor(0, maxLoadThreads, 60, TimeUnit.SECONDS, q, new NamingThreadFactory("bloom-loader"));
     }
 
@@ -437,13 +437,13 @@ public class BloomFilterLayer {
 
     Random r = new Random();
 
-    HashSet<Integer> valsSet = new HashSet<Integer>();
+    HashSet<Integer> valsSet = new HashSet<>();
 
     for (int i = 0; i < 100000; i++) {
       valsSet.add(r.nextInt(Integer.MAX_VALUE));
     }
 
-    ArrayList<Integer> vals = new ArrayList<Integer>(valsSet);
+    ArrayList<Integer> vals = new ArrayList<>(valsSet);
     Collections.sort(vals);
 
     ConfigurationCopy acuconf = new ConfigurationCopy(AccumuloConfiguration.getDefaultConfiguration());

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/file/FileOperations.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/file/FileOperations.java b/core/src/main/java/org/apache/accumulo/core/file/FileOperations.java
index 4724bbe..10bb784 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/FileOperations.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/FileOperations.java
@@ -36,7 +36,7 @@ import org.apache.hadoop.fs.FileSystem;
 
 public abstract class FileOperations {
 
-  private static final HashSet<String> validExtensions = new HashSet<String>(Arrays.asList(Constants.MAPFILE_EXTENSION, RFile.EXTENSION));
+  private static final HashSet<String> validExtensions = new HashSet<>(Arrays.asList(Constants.MAPFILE_EXTENSION, RFile.EXTENSION));
 
   public static Set<String> getValidExtensions() {
     return validExtensions;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/CachedBlock.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/CachedBlock.java b/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/CachedBlock.java
index 19612d0..c67b4c7 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/CachedBlock.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/CachedBlock.java
@@ -44,7 +44,7 @@ public class CachedBlock implements HeapSize, Comparable<CachedBlock>, CacheEntr
      * Block from in-memory store
      */
     MEMORY
-  };
+  }
 
   private final String blockName;
   private final byte buf[];

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/CachedBlockQueue.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/CachedBlockQueue.java b/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/CachedBlockQueue.java
index 329ba71..248634d 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/CachedBlockQueue.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/CachedBlockQueue.java
@@ -48,7 +48,7 @@ public class CachedBlockQueue implements HeapSize {
     int initialSize = (int) Math.ceil(maxSize / (double) blockSize);
     if (initialSize == 0)
       initialSize++;
-    queue = new PriorityQueue<CachedBlock>(initialSize);
+    queue = new PriorityQueue<>(initialSize);
     heapSize = 0;
     this.maxSize = maxSize;
   }
@@ -88,7 +88,7 @@ public class CachedBlockQueue implements HeapSize {
    * @return list of cached elements in descending order
    */
   public CachedBlock[] get() {
-    LinkedList<CachedBlock> blocks = new LinkedList<CachedBlock>();
+    LinkedList<CachedBlock> blocks = new LinkedList<>();
     while (!queue.isEmpty()) {
       blocks.addFirst(queue.poll());
     }
@@ -101,7 +101,7 @@ public class CachedBlockQueue implements HeapSize {
    * @return list of cached elements in descending order
    */
   public LinkedList<CachedBlock> getList() {
-    LinkedList<CachedBlock> blocks = new LinkedList<CachedBlock>();
+    LinkedList<CachedBlock> blocks = new LinkedList<>();
     while (!queue.isEmpty()) {
       blocks.addFirst(queue.poll());
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/file/blockfile/impl/CachableBlockFile.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/file/blockfile/impl/CachableBlockFile.java b/core/src/main/java/org/apache/accumulo/core/file/blockfile/impl/CachableBlockFile.java
index 6a170e8..82454db 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/blockfile/impl/CachableBlockFile.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/blockfile/impl/CachableBlockFile.java
@@ -34,10 +34,10 @@ import org.apache.accumulo.core.file.blockfile.cache.CacheEntry;
 import org.apache.accumulo.core.file.rfile.bcfile.BCFile;
 import org.apache.accumulo.core.file.rfile.bcfile.BCFile.Reader.BlockReader;
 import org.apache.accumulo.core.file.rfile.bcfile.BCFile.Writer.BlockAppender;
-import org.apache.accumulo.core.util.ratelimit.RateLimiter;
 import org.apache.accumulo.core.file.streams.PositionedOutput;
 import org.apache.accumulo.core.file.streams.RateLimitedInputStream;
 import org.apache.accumulo.core.file.streams.RateLimitedOutputStream;
+import org.apache.accumulo.core.util.ratelimit.RateLimiter;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
@@ -52,7 +52,7 @@ import org.slf4j.LoggerFactory;
 
 public class CachableBlockFile {
 
-  private CachableBlockFile() {};
+  private CachableBlockFile() {}
 
   private static final Logger log = LoggerFactory.getLogger(CachableBlockFile.class);
 
@@ -482,7 +482,7 @@ public class CachableBlockFile {
           } catch (Exception e) {
             throw new RuntimeException(e);
           }
-          cb.setIndex(new SoftReference<T>(bi));
+          cb.setIndex(new SoftReference<>(bi));
         }
       }
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/file/rfile/BlockIndex.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/file/rfile/BlockIndex.java b/core/src/main/java/org/apache/accumulo/core/file/rfile/BlockIndex.java
index 1ed9aca..652515e 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/rfile/BlockIndex.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/rfile/BlockIndex.java
@@ -162,7 +162,7 @@ public class BlockIndex {
 
     int count = 0;
 
-    ArrayList<BlockIndexEntry> index = new ArrayList<BlockIndexEntry>(indexEntries - 1);
+    ArrayList<BlockIndexEntry> index = new ArrayList<>(indexEntries - 1);
 
     while (count < (indexEntry.getNumEntries() - interval + 1)) {
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/file/rfile/CreateEmpty.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/file/rfile/CreateEmpty.java b/core/src/main/java/org/apache/accumulo/core/file/rfile/CreateEmpty.java
index 46708a6..3a41e95 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/rfile/CreateEmpty.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/rfile/CreateEmpty.java
@@ -65,7 +65,7 @@ public class CreateEmpty {
     @Parameter(description = " <path> { <path> ... } Each path given is a URL. "
         + "Relative paths are resolved according to the default filesystem defined in your Hadoop configuration, which is usually an HDFS instance.",
         required = true, validateWith = NamedLikeRFile.class)
-    List<String> files = new ArrayList<String>();
+    List<String> files = new ArrayList<>();
   }
 
   public static void main(String[] args) throws Exception {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/file/rfile/MultiLevelIndex.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/file/rfile/MultiLevelIndex.java b/core/src/main/java/org/apache/accumulo/core/file/rfile/MultiLevelIndex.java
index a883f04..f99560e 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/rfile/MultiLevelIndex.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/rfile/MultiLevelIndex.java
@@ -132,7 +132,7 @@ public class MultiLevelIndex {
     }
   }
 
-  private static abstract class SerializedIndexBase<T> extends AbstractList<T> implements List<T>, RandomAccess {
+  private static abstract class SerializedIndexBase<T> extends AbstractList<T> implements RandomAccess {
     protected int[] offsets;
     protected byte[] data;
 
@@ -276,7 +276,7 @@ public class MultiLevelIndex {
 
       indexBytes = new ByteArrayOutputStream();
       indexOut = new DataOutputStream(indexBytes);
-      offsets = new ArrayList<Integer>();
+      offsets = new ArrayList<>();
     }
 
     public IndexBlock() {}
@@ -352,7 +352,7 @@ public class MultiLevelIndex {
 
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
         DataOutputStream dos = new DataOutputStream(baos);
-        ArrayList<Integer> oal = new ArrayList<Integer>();
+        ArrayList<Integer> oal = new ArrayList<>();
 
         for (int i = 0; i < size; i++) {
           IndexEntry ie = new IndexEntry(false);
@@ -501,7 +501,7 @@ public class MultiLevelIndex {
     Writer(BlockFileWriter blockFileWriter, int maxBlockSize) {
       this.blockFileWriter = blockFileWriter;
       this.threshold = maxBlockSize;
-      levels = new ArrayList<IndexBlock>();
+      levels = new ArrayList<>();
     }
 
     private void add(int level, Key key, int data, long offset, long compressedSize, long rawSize) throws IOException {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/file/rfile/PrintInfo.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/file/rfile/PrintInfo.java b/core/src/main/java/org/apache/accumulo/core/file/rfile/PrintInfo.java
index 1d4e055..cf0d046 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/rfile/PrintInfo.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/rfile/PrintInfo.java
@@ -61,7 +61,7 @@ public class PrintInfo implements KeywordExecutable {
     @Parameter(names = {"--keyStats"}, description = "print key length statistics for index and all data")
     boolean keyStats = false;
     @Parameter(description = " <file> { <file> ... }")
-    List<String> files = new ArrayList<String>();
+    List<String> files = new ArrayList<>();
     @Parameter(names = {"-c", "--config"}, variableArity = true, description = "Comma-separated Hadoop configuration files")
     List<String> configFiles = new ArrayList<>();
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/file/rfile/RFile.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/file/rfile/RFile.java b/core/src/main/java/org/apache/accumulo/core/file/rfile/RFile.java
index ac5cde7..b11cf1a 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/rfile/RFile.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/rfile/RFile.java
@@ -134,14 +134,14 @@ public class RFile {
     private int version;
 
     public LocalityGroupMetadata(int version, BlockFileReader br) {
-      columnFamilies = new HashMap<ByteSequence,MutableLong>();
+      columnFamilies = new HashMap<>();
       indexReader = new MultiLevelIndex.Reader(br, version);
       this.version = version;
     }
 
     public LocalityGroupMetadata(Set<ByteSequence> pcf, int indexBlockSize, BlockFileWriter bfw) {
       isDefaultLG = true;
-      columnFamilies = new HashMap<ByteSequence,MutableLong>();
+      columnFamilies = new HashMap<>();
       previousColumnFamilies = pcf;
 
       indexWriter = new MultiLevelIndex.BufferedWriter(new MultiLevelIndex.Writer(bfw, indexBlockSize));
@@ -150,7 +150,7 @@ public class RFile {
     public LocalityGroupMetadata(String name, Set<ByteSequence> cfset, int indexBlockSize, BlockFileWriter bfw) {
       this.name = name;
       isDefaultLG = false;
-      columnFamilies = new HashMap<ByteSequence,MutableLong>();
+      columnFamilies = new HashMap<>();
       for (ByteSequence cf : cfset) {
         columnFamilies.put(cf, new MutableLong(0));
       }
@@ -230,7 +230,7 @@ public class RFile {
         columnFamilies = null;
       } else {
         if (columnFamilies == null)
-          columnFamilies = new HashMap<ByteSequence,MutableLong>();
+          columnFamilies = new HashMap<>();
         else
           columnFamilies.clear();
 
@@ -289,8 +289,8 @@ public class RFile {
         out.printf("\t%-22s : %d\n", "Start block", startBlock);
       }
       out.printf("\t%-22s : %,d\n", "Num   blocks", indexReader.size());
-      TreeMap<Integer,Long> sizesByLevel = new TreeMap<Integer,Long>();
-      TreeMap<Integer,Long> countsByLevel = new TreeMap<Integer,Long>();
+      TreeMap<Integer,Long> sizesByLevel = new TreeMap<>();
+      TreeMap<Integer,Long> countsByLevel = new TreeMap<>();
       indexReader.getIndexInfo(sizesByLevel, countsByLevel);
       for (Entry<Integer,Long> entry : sizesByLevel.descendingMap().entrySet()) {
         out.printf("\t%-22s : %,d bytes  %,d blocks\n", "Index level " + entry.getKey(), entry.getValue(), countsByLevel.get(entry.getKey()));
@@ -498,8 +498,8 @@ public class RFile {
     private final long maxBlockSize;
     private final int indexBlockSize;
 
-    private ArrayList<LocalityGroupMetadata> localityGroups = new ArrayList<LocalityGroupMetadata>();
-    private ArrayList<LocalityGroupMetadata> sampleGroups = new ArrayList<LocalityGroupMetadata>();
+    private ArrayList<LocalityGroupMetadata> localityGroups = new ArrayList<>();
+    private ArrayList<LocalityGroupMetadata> sampleGroups = new ArrayList<>();
     private LocalityGroupMetadata currentLocalityGroup = null;
     private LocalityGroupMetadata sampleLocalityGroup = null;
 
@@ -524,7 +524,7 @@ public class RFile {
       this.maxBlockSize = (long) (blockSize * MAX_BLOCK_MULTIPLIER);
       this.indexBlockSize = indexBlockSize;
       this.fileWriter = bfw;
-      previousColumnFamilies = new HashSet<ByteSequence>();
+      previousColumnFamilies = new HashSet<>();
       this.samplerConfig = samplerConfig;
       this.sampler = sampler;
     }
@@ -627,7 +627,7 @@ public class RFile {
         sampleLocalityGroup = new LocalityGroupMetadata(previousColumnFamilies, indexBlockSize, fileWriter);
       } else {
         if (!Collections.disjoint(columnFamilies, previousColumnFamilies)) {
-          HashSet<ByteSequence> overlap = new HashSet<ByteSequence>(columnFamilies);
+          HashSet<ByteSequence> overlap = new HashSet<>(columnFamilies);
           overlap.retainAll(previousColumnFamilies);
           throw new IllegalArgumentException("Column families over lap with previous locality group : " + overlap);
         }
@@ -1043,8 +1043,8 @@ public class RFile {
 
     private BlockFileReader reader;
 
-    private ArrayList<LocalityGroupMetadata> localityGroups = new ArrayList<LocalityGroupMetadata>();
-    private ArrayList<LocalityGroupMetadata> sampleGroups = new ArrayList<LocalityGroupMetadata>();
+    private ArrayList<LocalityGroupMetadata> localityGroups = new ArrayList<>();
+    private ArrayList<LocalityGroupMetadata> sampleGroups = new ArrayList<>();
 
     private LocalityGroupReader currentReaders[];
     private LocalityGroupReader readers[];
@@ -1078,7 +1078,7 @@ public class RFile {
         int size = mb.readInt();
         currentReaders = new LocalityGroupReader[size];
 
-        deepCopies = new LinkedList<Reader>();
+        deepCopies = new LinkedList<>();
 
         for (int i = 0; i < size; i++) {
           LocalityGroupMetadata lgm = new LocalityGroupMetadata(ver, rdr);
@@ -1111,7 +1111,7 @@ public class RFile {
         mb.close();
       }
 
-      nonDefaultColumnFamilies = new HashSet<ByteSequence>();
+      nonDefaultColumnFamilies = new HashSet<>();
       for (LocalityGroupMetadata lgm : localityGroups) {
         if (!lgm.isDefaultLG)
           nonDefaultColumnFamilies.addAll(lgm.columnFamilies.keySet());
@@ -1295,7 +1295,7 @@ public class RFile {
       Map<String,ArrayList<ByteSequence>> cf = new HashMap<>();
 
       for (LocalityGroupMetadata lcg : localityGroups) {
-        ArrayList<ByteSequence> setCF = new ArrayList<ByteSequence>();
+        ArrayList<ByteSequence> setCF = new ArrayList<>();
 
         for (Entry<ByteSequence,MutableLong> entry : lcg.columnFamilies.entrySet()) {
           setCF.add(entry.getKey());
@@ -1340,7 +1340,7 @@ public class RFile {
 
     public FileSKVIterator getIndex() throws IOException {
 
-      ArrayList<Iterator<IndexEntry>> indexes = new ArrayList<Iterator<IndexEntry>>();
+      ArrayList<Iterator<IndexEntry>> indexes = new ArrayList<>();
 
       for (LocalityGroupReader lgr : currentReaders) {
         indexes.add(lgr.getIndex());

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/file/rfile/SplitLarge.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/file/rfile/SplitLarge.java b/core/src/main/java/org/apache/accumulo/core/file/rfile/SplitLarge.java
index 6c3aab3..a3a4193 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/rfile/SplitLarge.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/rfile/SplitLarge.java
@@ -47,7 +47,7 @@ public class SplitLarge {
     @Parameter(names = "-m", description = "the maximum size of the key/value pair to shunt to the small file")
     long maxSize = 10 * 1024 * 1024;
     @Parameter(description = "<file.rf> { <file.rf> ... }")
-    List<String> files = new ArrayList<String>();
+    List<String> files = new ArrayList<>();
   }
 
   public static void main(String[] args) throws Exception {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/BCFile.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/BCFile.java b/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/BCFile.java
index d7632f3..77de47e 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/BCFile.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/BCFile.java
@@ -569,7 +569,7 @@ public final class BCFile {
 
     public void read(DataInput in) throws IOException {
 
-      Map<String,String> optionsFromFile = new HashMap<String,String>();
+      Map<String,String> optionsFromFile = new HashMap<>();
 
       int numContextEntries = in.readInt();
       for (int i = 0; i < numContextEntries; i++) {
@@ -1077,13 +1077,13 @@ public final class BCFile {
 
     // for write
     public MetaIndex() {
-      index = new TreeMap<String,MetaIndexEntry>();
+      index = new TreeMap<>();
     }
 
     // for read, construct the map from the file
     public MetaIndex(DataInput in) throws IOException {
       int count = Utils.readVInt(in);
-      index = new TreeMap<String,MetaIndexEntry>();
+      index = new TreeMap<>();
 
       for (int nx = 0; nx < count; nx++) {
         MetaIndexEntry indexEntry = new MetaIndexEntry(in);
@@ -1175,7 +1175,7 @@ public final class BCFile {
       defaultCompressionAlgorithm = Compression.getCompressionAlgorithmByName(Utils.readString(in));
 
       int n = Utils.readVInt(in);
-      listRegions = new ArrayList<BlockRegion>(n);
+      listRegions = new ArrayList<>(n);
 
       for (int i = 0; i < n; i++) {
         BlockRegion region = new BlockRegion(in);
@@ -1187,7 +1187,7 @@ public final class BCFile {
     public DataIndex(String defaultCompressionAlgorithmName, boolean trackBlocks) {
       this.trackBlocks = trackBlocks;
       this.defaultCompressionAlgorithm = Compression.getCompressionAlgorithmByName(defaultCompressionAlgorithmName);
-      listRegions = new ArrayList<BlockRegion>();
+      listRegions = new ArrayList<>();
     }
 
     public Algorithm getDefaultCompressionAlgorithm() {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/Compression.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/Compression.java b/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/Compression.java
index 48a9acc..e9c137b 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/Compression.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/Compression.java
@@ -382,7 +382,7 @@ public final class Compression {
   public static String[] getSupportedAlgorithms() {
     Algorithm[] algos = Algorithm.class.getEnumConstants();
 
-    ArrayList<String> ret = new ArrayList<String>();
+    ArrayList<String> ret = new ArrayList<>();
     for (Algorithm a : algos) {
       if (a.isSupported()) {
         ret.add(a.getName());

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/iterators/AggregatingIterator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/AggregatingIterator.java b/core/src/main/java/org/apache/accumulo/core/iterators/AggregatingIterator.java
index 3292cc2..979eaeb 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/AggregatingIterator.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/AggregatingIterator.java
@@ -173,8 +173,7 @@ public class AggregatingIterator implements SortedKeyValueIterator<Key,Value>, O
       String context = null;
       if (null != env)
         context = env.getConfig().get(Property.TABLE_CLASSPATH);
-      this.aggregators = new ColumnToClassMapping<org.apache.accumulo.core.iterators.aggregation.Aggregator>(options,
-          org.apache.accumulo.core.iterators.aggregation.Aggregator.class, context);
+      this.aggregators = new ColumnToClassMapping<>(options, org.apache.accumulo.core.iterators.aggregation.Aggregator.class, context);
     } catch (ClassNotFoundException e) {
       log.error(e.toString());
       throw new IllegalArgumentException(e);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/iterators/FirstEntryInRowIterator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/FirstEntryInRowIterator.java b/core/src/main/java/org/apache/accumulo/core/iterators/FirstEntryInRowIterator.java
index fcca805..32e6464 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/FirstEntryInRowIterator.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/FirstEntryInRowIterator.java
@@ -132,7 +132,7 @@ public class FirstEntryInRowIterator extends SkippingIterator implements OptionD
   public IteratorOptions describeOptions() {
     String name = "firstEntry";
     String desc = "Only allows iteration over the first entry per row";
-    HashMap<String,String> namedOptions = new HashMap<String,String>();
+    HashMap<String,String> namedOptions = new HashMap<>();
     namedOptions.put(NUM_SCANS_STRING_NAME, "Number of scans to try before seeking [10]");
     return new IteratorOptions(name, desc, namedOptions, null);
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/iterators/IteratorUtil.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/IteratorUtil.java b/core/src/main/java/org/apache/accumulo/core/iterators/IteratorUtil.java
index 8188ba3..981404c 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/IteratorUtil.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/IteratorUtil.java
@@ -118,7 +118,7 @@ public class IteratorUtil {
    * @return A map of Table properties
    */
   public static Map<String,String> generateInitialTableProperties(boolean limitVersion) {
-    TreeMap<String,String> props = new TreeMap<String,String>();
+    TreeMap<String,String> props = new TreeMap<>();
 
     if (limitVersion) {
       for (IteratorScope iterScope : IteratorScope.values()) {
@@ -170,7 +170,7 @@ public class IteratorUtil {
 
         Map<String,String> options = allOptions.get(iterName);
         if (options == null) {
-          options = new HashMap<String,String>();
+          options = new HashMap<>();
           allOptions.put(iterName, options);
         }
 
@@ -195,8 +195,8 @@ public class IteratorUtil {
       SortedKeyValueIterator<K,V> source, KeyExtent extent, AccumuloConfiguration conf, List<IteratorSetting> iterators, IteratorEnvironment env)
       throws IOException {
 
-    List<IterInfo> ssiList = new ArrayList<IterInfo>();
-    Map<String,Map<String,String>> ssio = new HashMap<String,Map<String,String>>();
+    List<IterInfo> ssiList = new ArrayList<>();
+    Map<String,Map<String,String>> ssio = new HashMap<>();
 
     for (IteratorSetting is : iterators) {
       ssiList.add(new IterInfo(is.getPriority(), is.getIteratorClass(), is.getName()));
@@ -235,8 +235,8 @@ public class IteratorUtil {
   public static <K extends WritableComparable<?>,V extends Writable> SortedKeyValueIterator<K,V> loadIterators(IteratorScope scope,
       SortedKeyValueIterator<K,V> source, KeyExtent extent, AccumuloConfiguration conf, List<IterInfo> ssiList, Map<String,Map<String,String>> ssio,
       IteratorEnvironment env, boolean useAccumuloClassLoader) throws IOException {
-    List<IterInfo> iters = new ArrayList<IterInfo>(ssiList);
-    Map<String,Map<String,String>> allOptions = new HashMap<String,Map<String,String>>();
+    List<IterInfo> iters = new ArrayList<>(ssiList);
+    Map<String,Map<String,String>> allOptions = new HashMap<>();
     parseIteratorConfiguration(scope, iters, ssio, allOptions, conf);
     return loadIterators(source, iters, allOptions, env, useAccumuloClassLoader, conf.get(Property.TABLE_CLASSPATH));
   }
@@ -244,8 +244,8 @@ public class IteratorUtil {
   public static <K extends WritableComparable<?>,V extends Writable> SortedKeyValueIterator<K,V> loadIterators(IteratorScope scope,
       SortedKeyValueIterator<K,V> source, KeyExtent extent, AccumuloConfiguration conf, List<IterInfo> ssiList, Map<String,Map<String,String>> ssio,
       IteratorEnvironment env, boolean useAccumuloClassLoader, String classLoaderContext) throws IOException {
-    List<IterInfo> iters = new ArrayList<IterInfo>(ssiList);
-    Map<String,Map<String,String>> allOptions = new HashMap<String,Map<String,String>>();
+    List<IterInfo> iters = new ArrayList<>(ssiList);
+    Map<String,Map<String,String>> allOptions = new HashMap<>();
     parseIteratorConfiguration(scope, iters, ssio, allOptions, conf);
     return loadIterators(source, iters, allOptions, env, useAccumuloClassLoader, classLoaderContext);
   }
@@ -260,7 +260,7 @@ public class IteratorUtil {
       Collection<IterInfo> iters, Map<String,Map<String,String>> iterOpts, IteratorEnvironment env, boolean useAccumuloClassLoader, String context,
       Map<String,Class<? extends SortedKeyValueIterator<K,V>>> classCache) throws IOException {
     // wrap the source in a SynchronizedIterator in case any of the additional configured iterators want to use threading
-    SortedKeyValueIterator<K,V> prev = new SynchronizedIterator<K,V>(source);
+    SortedKeyValueIterator<K,V> prev = new SynchronizedIterator<>(source);
 
     try {
       for (IterInfo iterInfo : iters) {
@@ -349,7 +349,7 @@ public class IteratorUtil {
   }
 
   public static IteratorConfig toIteratorConfig(List<IteratorSetting> iterators) {
-    ArrayList<TIteratorSetting> tisList = new ArrayList<TIteratorSetting>();
+    ArrayList<TIteratorSetting> tisList = new ArrayList<>();
 
     for (IteratorSetting iteratorSetting : iterators) {
       tisList.add(toTIteratorSetting(iteratorSetting));
@@ -359,7 +359,7 @@ public class IteratorUtil {
   }
 
   public static List<IteratorSetting> toIteratorSettings(IteratorConfig ic) {
-    List<IteratorSetting> ret = new ArrayList<IteratorSetting>();
+    List<IteratorSetting> ret = new ArrayList<>();
     for (TIteratorSetting tIteratorSetting : ic.getIterators()) {
       ret.add(toIteratorSetting(tIteratorSetting));
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/iterators/LongCombiner.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/LongCombiner.java b/core/src/main/java/org/apache/accumulo/core/iterators/LongCombiner.java
index 35ceb6e..6cddea0 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/LongCombiner.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/LongCombiner.java
@@ -118,7 +118,7 @@ public abstract class LongCombiner extends TypedValueCombiner<Long> {
   /**
    * An Encoder that uses a variable-length encoding for Longs. It uses WritableUtils.writeVLong and WritableUtils.readVLong for encoding and decoding.
    */
-  public static class VarLenEncoder extends AbstractLexicoder<Long> implements Encoder<Long> {
+  public static class VarLenEncoder extends AbstractLexicoder<Long> {
     @Override
     public byte[] encode(Long v) {
       ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -153,7 +153,7 @@ public abstract class LongCombiner extends TypedValueCombiner<Long> {
   /**
    * An Encoder that uses an 8-byte encoding for Longs.
    */
-  public static class FixedLenEncoder extends AbstractLexicoder<Long> implements Encoder<Long> {
+  public static class FixedLenEncoder extends AbstractLexicoder<Long> {
     @Override
     public byte[] encode(Long l) {
       byte[] b = new byte[8];
@@ -198,7 +198,7 @@ public abstract class LongCombiner extends TypedValueCombiner<Long> {
   /**
    * An Encoder that uses a String representation of Longs. It uses Long.toString and Long.parseLong for encoding and decoding.
    */
-  public static class StringEncoder extends AbstractLexicoder<Long> implements Encoder<Long> {
+  public static class StringEncoder extends AbstractLexicoder<Long> {
     @Override
     public byte[] encode(Long v) {
       return Long.toString(v).getBytes(UTF_8);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/iterators/OptionDescriber.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/OptionDescriber.java b/core/src/main/java/org/apache/accumulo/core/iterators/OptionDescriber.java
index 756edd1..73dfd61 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/OptionDescriber.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/OptionDescriber.java
@@ -57,10 +57,10 @@ public interface OptionDescriber {
       this.name = name;
       this.namedOptions = null;
       if (namedOptions != null)
-        this.namedOptions = new LinkedHashMap<String,String>(namedOptions);
+        this.namedOptions = new LinkedHashMap<>(namedOptions);
       this.unnamedOptionDescriptions = null;
       if (unnamedOptionDescriptions != null)
-        this.unnamedOptionDescriptions = new ArrayList<String>(unnamedOptionDescriptions);
+        this.unnamedOptionDescriptions = new ArrayList<>(unnamedOptionDescriptions);
       this.description = description;
     }
 
@@ -81,11 +81,11 @@ public interface OptionDescriber {
     }
 
     public void setNamedOptions(Map<String,String> namedOptions) {
-      this.namedOptions = new LinkedHashMap<String,String>(namedOptions);
+      this.namedOptions = new LinkedHashMap<>(namedOptions);
     }
 
     public void setUnnamedOptionDescriptions(List<String> unnamedOptionDescriptions) {
-      this.unnamedOptionDescriptions = new ArrayList<String>(unnamedOptionDescriptions);
+      this.unnamedOptionDescriptions = new ArrayList<>(unnamedOptionDescriptions);
     }
 
     public void setName(String name) {
@@ -98,13 +98,13 @@ public interface OptionDescriber {
 
     public void addNamedOption(String name, String description) {
       if (namedOptions == null)
-        namedOptions = new LinkedHashMap<String,String>();
+        namedOptions = new LinkedHashMap<>();
       namedOptions.put(name, description);
     }
 
     public void addUnnamedOption(String description) {
       if (unnamedOptionDescriptions == null)
-        unnamedOptionDescriptions = new ArrayList<String>();
+        unnamedOptionDescriptions = new ArrayList<>();
       unnamedOptionDescriptions.add(description);
     }
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/iterators/OrIterator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/OrIterator.java b/core/src/main/java/org/apache/accumulo/core/iterators/OrIterator.java
index 3769eae..43ed5ed 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/OrIterator.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/OrIterator.java
@@ -40,7 +40,7 @@ public class OrIterator implements SortedKeyValueIterator<Key,Value> {
 
   private TermSource currentTerm;
   private ArrayList<TermSource> sources;
-  private PriorityQueue<TermSource> sorted = new PriorityQueue<TermSource>(5);
+  private PriorityQueue<TermSource> sorted = new PriorityQueue<>(5);
   private static final Text nullText = new Text();
   private static final Key nullKey = new Key();
 
@@ -83,11 +83,11 @@ public class OrIterator implements SortedKeyValueIterator<Key,Value> {
   }
 
   public OrIterator() {
-    this.sources = new ArrayList<TermSource>();
+    this.sources = new ArrayList<>();
   }
 
   private OrIterator(OrIterator other, IteratorEnvironment env) {
-    this.sources = new ArrayList<TermSource>();
+    this.sources = new ArrayList<>();
 
     for (TermSource TS : other.sources)
       this.sources.add(new TermSource(TS.iter.deepCopy(env), TS.term));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/iterators/TypedValueCombiner.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/TypedValueCombiner.java b/core/src/main/java/org/apache/accumulo/core/iterators/TypedValueCombiner.java
index 7e7fa64..03e4d88 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/TypedValueCombiner.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/TypedValueCombiner.java
@@ -179,7 +179,7 @@ public abstract class TypedValueCombiner<V> extends Combiner {
 
   @Override
   public Value reduce(Key key, Iterator<Value> iter) {
-    return new Value(encoder.encode(typedReduce(key, new VIterator<V>(iter, encoder, lossy))));
+    return new Value(encoder.encode(typedReduce(key, new VIterator<>(iter, encoder, lossy))));
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/iterators/conf/ColumnSet.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/conf/ColumnSet.java b/core/src/main/java/org/apache/accumulo/core/iterators/conf/ColumnSet.java
index c1edf5d..7c74ad6 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/conf/ColumnSet.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/conf/ColumnSet.java
@@ -36,8 +36,8 @@ public class ColumnSet {
   private ColFamHashKey lookupCF = new ColFamHashKey();
 
   public ColumnSet() {
-    objectsCF = new HashSet<ColFamHashKey>();
-    objectsCol = new HashSet<ColHashKey>();
+    objectsCF = new HashSet<>();
+    objectsCol = new HashSet<>();
   }
 
   public ColumnSet(Collection<String> objectStrings) {
@@ -126,9 +126,9 @@ public class ColumnSet {
     String[] cols = columns.split(":");
 
     if (cols.length == 1) {
-      return new Pair<Text,Text>(decode(cols[0]), null);
+      return new Pair<>(decode(cols[0]), null);
     } else if (cols.length == 2) {
-      return new Pair<Text,Text>(decode(cols[0]), decode(cols[1]));
+      return new Pair<>(decode(cols[0]), decode(cols[1]));
     } else {
       throw new IllegalArgumentException(columns);
     }


[21/32] accumulo git commit: ACCUMULO-4357 Remove unneeded code for readability

Posted by ct...@apache.org.
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/gc/src/test/java/org/apache/accumulo/gc/GarbageCollectionTest.java
----------------------------------------------------------------------
diff --git a/server/gc/src/test/java/org/apache/accumulo/gc/GarbageCollectionTest.java b/server/gc/src/test/java/org/apache/accumulo/gc/GarbageCollectionTest.java
index 14933fb..d61fb9e 100644
--- a/server/gc/src/test/java/org/apache/accumulo/gc/GarbageCollectionTest.java
+++ b/server/gc/src/test/java/org/apache/accumulo/gc/GarbageCollectionTest.java
@@ -46,14 +46,14 @@ import org.junit.Test;
  */
 public class GarbageCollectionTest {
   static class TestGCE implements GarbageCollectionEnvironment {
-    TreeSet<String> candidates = new TreeSet<String>();
-    ArrayList<String> blips = new ArrayList<String>();
-    Map<Key,Value> references = new TreeMap<Key,Value>();
-    HashSet<String> tableIds = new HashSet<String>();
+    TreeSet<String> candidates = new TreeSet<>();
+    ArrayList<String> blips = new ArrayList<>();
+    Map<Key,Value> references = new TreeMap<>();
+    HashSet<String> tableIds = new HashSet<>();
 
-    ArrayList<String> deletes = new ArrayList<String>();
-    ArrayList<String> tablesDirsToDelete = new ArrayList<String>();
-    TreeMap<String,Status> filesToReplicate = new TreeMap<String,Status>();
+    ArrayList<String> deletes = new ArrayList<>();
+    ArrayList<String> tablesDirsToDelete = new ArrayList<>();
+    TreeMap<String,Status> filesToReplicate = new TreeMap<>();
 
     @Override
     public boolean getCandidates(String continuePoint, List<String> ret) {
@@ -208,7 +208,7 @@ public class GarbageCollectionTest {
     gca.collect(gce);
     assertRemoved(gce);
 
-    List<String[]> refsToRemove = new ArrayList<String[]>();
+    List<String[]> refsToRemove = new ArrayList<>();
     refsToRemove.add(new String[] {"4", "/t0/F000.rf"});
     refsToRemove.add(new String[] {"5", "../4/t0/F000.rf"});
     refsToRemove.add(new String[] {"6", "hdfs://foo.com:6000/accumulo/tables/4/t0/F000.rf"});
@@ -545,7 +545,7 @@ public class GarbageCollectionTest {
 
     gca.collect(gce);
 
-    HashSet<String> tids = new HashSet<String>();
+    HashSet<String> tids = new HashSet<>();
     tids.add("5");
     tids.add("6");
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/master/src/main/java/org/apache/accumulo/master/FateServiceHandler.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/FateServiceHandler.java b/server/master/src/main/java/org/apache/accumulo/master/FateServiceHandler.java
index cda9548..efea076 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/FateServiceHandler.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/FateServiceHandler.java
@@ -106,7 +106,7 @@ class FateServiceHandler implements FateService.Iface {
         if (!master.security.canCreateNamespace(c, namespace))
           throw new ThriftSecurityException(c.getPrincipal(), SecurityErrorCode.PERMISSION_DENIED);
 
-        master.fate.seedTransaction(opid, new TraceRepo<Master>(new CreateNamespace(c.getPrincipal(), namespace, options)), autoCleanup);
+        master.fate.seedTransaction(opid, new TraceRepo<>(new CreateNamespace(c.getPrincipal(), namespace, options)), autoCleanup);
         break;
       }
       case NAMESPACE_RENAME: {
@@ -118,7 +118,7 @@ class FateServiceHandler implements FateService.Iface {
         if (!master.security.canRenameNamespace(c, namespaceId, oldName, newName))
           throw new ThriftSecurityException(c.getPrincipal(), SecurityErrorCode.PERMISSION_DENIED);
 
-        master.fate.seedTransaction(opid, new TraceRepo<Master>(new RenameNamespace(namespaceId, oldName, newName)), autoCleanup);
+        master.fate.seedTransaction(opid, new TraceRepo<>(new RenameNamespace(namespaceId, oldName, newName)), autoCleanup);
         break;
       }
       case NAMESPACE_DELETE: {
@@ -129,7 +129,7 @@ class FateServiceHandler implements FateService.Iface {
         if (!master.security.canDeleteNamespace(c, namespaceId))
           throw new ThriftSecurityException(c.getPrincipal(), SecurityErrorCode.PERMISSION_DENIED);
 
-        master.fate.seedTransaction(opid, new TraceRepo<Master>(new DeleteNamespace(namespaceId)), autoCleanup);
+        master.fate.seedTransaction(opid, new TraceRepo<>(new DeleteNamespace(namespaceId)), autoCleanup);
         break;
       }
       case TABLE_CREATE: {
@@ -148,7 +148,7 @@ class FateServiceHandler implements FateService.Iface {
         if (!master.security.canCreateTable(c, tableName, namespaceId))
           throw new ThriftSecurityException(c.getPrincipal(), SecurityErrorCode.PERMISSION_DENIED);
 
-        master.fate.seedTransaction(opid, new TraceRepo<Master>(new CreateTable(c.getPrincipal(), tableName, timeType, options, namespaceId)), autoCleanup);
+        master.fate.seedTransaction(opid, new TraceRepo<>(new CreateTable(c.getPrincipal(), tableName, timeType, options, namespaceId)), autoCleanup);
 
         break;
       }
@@ -186,7 +186,7 @@ class FateServiceHandler implements FateService.Iface {
           throw new ThriftSecurityException(c.getPrincipal(), SecurityErrorCode.PERMISSION_DENIED);
 
         try {
-          master.fate.seedTransaction(opid, new TraceRepo<Master>(new RenameTable(tableId, oldTableName, newTableName)), autoCleanup);
+          master.fate.seedTransaction(opid, new TraceRepo<>(new RenameTable(tableId, oldTableName, newTableName)), autoCleanup);
         } catch (NamespaceNotFoundException e) {
           throw new ThriftTableOperationException(null, oldTableName, tableOp, TableOperationExceptionType.NAMESPACE_NOTFOUND, "");
         }
@@ -216,8 +216,8 @@ class FateServiceHandler implements FateService.Iface {
         if (!canCloneTable)
           throw new ThriftSecurityException(c.getPrincipal(), SecurityErrorCode.PERMISSION_DENIED);
 
-        Map<String,String> propertiesToSet = new HashMap<String,String>();
-        Set<String> propertiesToExclude = new HashSet<String>();
+        Map<String,String> propertiesToSet = new HashMap<>();
+        Set<String> propertiesToExclude = new HashSet<>();
 
         for (Entry<String,String> entry : options.entrySet()) {
           if (entry.getKey().startsWith(TableOperationsImpl.CLONE_EXCLUDE_PREFIX)) {
@@ -233,7 +233,7 @@ class FateServiceHandler implements FateService.Iface {
           propertiesToSet.put(entry.getKey(), entry.getValue());
         }
 
-        master.fate.seedTransaction(opid, new TraceRepo<Master>(new CloneTable(c.getPrincipal(), srcTableId, tableName, propertiesToSet, propertiesToExclude)),
+        master.fate.seedTransaction(opid, new TraceRepo<>(new CloneTable(c.getPrincipal(), srcTableId, tableName, propertiesToSet, propertiesToExclude)),
             autoCleanup);
 
         break;
@@ -255,7 +255,7 @@ class FateServiceHandler implements FateService.Iface {
 
         if (!canDeleteTable)
           throw new ThriftSecurityException(c.getPrincipal(), SecurityErrorCode.PERMISSION_DENIED);
-        master.fate.seedTransaction(opid, new TraceRepo<Master>(new DeleteTable(tableId)), autoCleanup);
+        master.fate.seedTransaction(opid, new TraceRepo<>(new DeleteTable(tableId)), autoCleanup);
         break;
       }
       case TABLE_ONLINE: {
@@ -274,7 +274,7 @@ class FateServiceHandler implements FateService.Iface {
         if (!canOnlineOfflineTable)
           throw new ThriftSecurityException(c.getPrincipal(), SecurityErrorCode.PERMISSION_DENIED);
 
-        master.fate.seedTransaction(opid, new TraceRepo<Master>(new ChangeTableState(tableId, tableOp)), autoCleanup);
+        master.fate.seedTransaction(opid, new TraceRepo<>(new ChangeTableState(tableId, tableOp)), autoCleanup);
         break;
       }
       case TABLE_OFFLINE: {
@@ -293,7 +293,7 @@ class FateServiceHandler implements FateService.Iface {
         if (!canOnlineOfflineTable)
           throw new ThriftSecurityException(c.getPrincipal(), SecurityErrorCode.PERMISSION_DENIED);
 
-        master.fate.seedTransaction(opid, new TraceRepo<Master>(new ChangeTableState(tableId, tableOp)), autoCleanup);
+        master.fate.seedTransaction(opid, new TraceRepo<>(new ChangeTableState(tableId, tableOp)), autoCleanup);
         break;
       }
       case TABLE_MERGE: {
@@ -317,7 +317,7 @@ class FateServiceHandler implements FateService.Iface {
           throw new ThriftSecurityException(c.getPrincipal(), SecurityErrorCode.PERMISSION_DENIED);
 
         Master.log.debug("Creating merge op: " + tableId + " " + startRow + " " + endRow);
-        master.fate.seedTransaction(opid, new TraceRepo<Master>(new TableRangeOp(MergeInfo.Operation.MERGE, tableId, startRow, endRow)), autoCleanup);
+        master.fate.seedTransaction(opid, new TraceRepo<>(new TableRangeOp(MergeInfo.Operation.MERGE, tableId, startRow, endRow)), autoCleanup);
         break;
       }
       case TABLE_DELETE_RANGE: {
@@ -340,7 +340,7 @@ class FateServiceHandler implements FateService.Iface {
         if (!canDeleteRange)
           throw new ThriftSecurityException(c.getPrincipal(), SecurityErrorCode.PERMISSION_DENIED);
 
-        master.fate.seedTransaction(opid, new TraceRepo<Master>(new TableRangeOp(MergeInfo.Operation.DELETE, tableId, startRow, endRow)), autoCleanup);
+        master.fate.seedTransaction(opid, new TraceRepo<>(new TableRangeOp(MergeInfo.Operation.DELETE, tableId, startRow, endRow)), autoCleanup);
         break;
       }
       case TABLE_BULK_IMPORT: {
@@ -365,7 +365,7 @@ class FateServiceHandler implements FateService.Iface {
           throw new ThriftSecurityException(c.getPrincipal(), SecurityErrorCode.PERMISSION_DENIED);
 
         master.updateBulkImportStatus(dir, BulkImportState.INITIAL);
-        master.fate.seedTransaction(opid, new TraceRepo<Master>(new BulkImport(tableId, dir, failDir, setTime)), autoCleanup);
+        master.fate.seedTransaction(opid, new TraceRepo<>(new BulkImport(tableId, dir, failDir, setTime)), autoCleanup);
         break;
       }
       case TABLE_COMPACT: {
@@ -388,7 +388,7 @@ class FateServiceHandler implements FateService.Iface {
         if (!canCompact)
           throw new ThriftSecurityException(c.getPrincipal(), SecurityErrorCode.PERMISSION_DENIED);
 
-        master.fate.seedTransaction(opid, new TraceRepo<Master>(new CompactRange(tableId, startRow, endRow, iterators, compactionStrategy)), autoCleanup);
+        master.fate.seedTransaction(opid, new TraceRepo<>(new CompactRange(tableId, startRow, endRow, iterators, compactionStrategy)), autoCleanup);
         break;
       }
       case TABLE_CANCEL_COMPACT: {
@@ -407,7 +407,7 @@ class FateServiceHandler implements FateService.Iface {
         if (!canCancelCompact)
           throw new ThriftSecurityException(c.getPrincipal(), SecurityErrorCode.PERMISSION_DENIED);
 
-        master.fate.seedTransaction(opid, new TraceRepo<Master>(new CancelCompactions(tableId)), autoCleanup);
+        master.fate.seedTransaction(opid, new TraceRepo<>(new CancelCompactions(tableId)), autoCleanup);
         break;
       }
       case TABLE_IMPORT: {
@@ -432,7 +432,7 @@ class FateServiceHandler implements FateService.Iface {
         if (!canImport)
           throw new ThriftSecurityException(c.getPrincipal(), SecurityErrorCode.PERMISSION_DENIED);
 
-        master.fate.seedTransaction(opid, new TraceRepo<Master>(new ImportTable(c.getPrincipal(), tableName, exportDir, namespaceId)), autoCleanup);
+        master.fate.seedTransaction(opid, new TraceRepo<>(new ImportTable(c.getPrincipal(), tableName, exportDir, namespaceId)), autoCleanup);
         break;
       }
       case TABLE_EXPORT: {
@@ -454,7 +454,7 @@ class FateServiceHandler implements FateService.Iface {
         if (!canExport)
           throw new ThriftSecurityException(c.getPrincipal(), SecurityErrorCode.PERMISSION_DENIED);
 
-        master.fate.seedTransaction(opid, new TraceRepo<Master>(new ExportTable(tableName, tableId, exportDir)), autoCleanup);
+        master.fate.seedTransaction(opid, new TraceRepo<>(new ExportTable(tableName, tableId, exportDir)), autoCleanup);
         break;
       }
       default:

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/master/src/main/java/org/apache/accumulo/master/Master.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/Master.java b/server/master/src/main/java/org/apache/accumulo/master/Master.java
index f320214..10d9152 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/Master.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/Master.java
@@ -186,7 +186,7 @@ public class Master extends AccumuloServerContext implements LiveTServerSet.List
   final private String hostname;
   final private Object balancedNotifier = new Object();
   final LiveTServerSet tserverSet;
-  final private List<TabletGroupWatcher> watchers = new ArrayList<TabletGroupWatcher>();
+  final private List<TabletGroupWatcher> watchers = new ArrayList<>();
   final SecurityOperation security;
   final Map<TServerInstance,AtomicInteger> badServers = Collections.synchronizedMap(new DefaultMap<TServerInstance,AtomicInteger>(new AtomicInteger()));
   final Set<TServerInstance> serversToShutdown = Collections.synchronizedSet(new HashSet<TServerInstance>());
@@ -380,8 +380,8 @@ public class Master extends AccumuloServerContext implements LiveTServerSet.List
         String namespaces = ZooUtil.getRoot(getInstance()) + Constants.ZNAMESPACES;
         zoo.putPersistentData(namespaces, new byte[0], NodeExistsPolicy.SKIP);
         for (Pair<String,String> namespace : Iterables.concat(
-            Collections.singleton(new Pair<String,String>(Namespaces.ACCUMULO_NAMESPACE, Namespaces.ACCUMULO_NAMESPACE_ID)),
-            Collections.singleton(new Pair<String,String>(Namespaces.DEFAULT_NAMESPACE, Namespaces.DEFAULT_NAMESPACE_ID)))) {
+            Collections.singleton(new Pair<>(Namespaces.ACCUMULO_NAMESPACE, Namespaces.ACCUMULO_NAMESPACE_ID)),
+            Collections.singleton(new Pair<>(Namespaces.DEFAULT_NAMESPACE, Namespaces.DEFAULT_NAMESPACE_ID)))) {
           String ns = namespace.getFirst();
           String id = namespace.getSecond();
           log.debug("Upgrade creating namespace \"" + ns + "\" (ID: " + id + ")");
@@ -727,7 +727,7 @@ public class Master extends AccumuloServerContext implements LiveTServerSet.List
 
   static enum TabletGoalState {
     HOSTED, UNASSIGNED, DELETED
-  };
+  }
 
   TabletGoalState getSystemGoalState(TabletLocationState tls) {
     switch (getMasterState()) {
@@ -841,7 +841,7 @@ public class Master extends AccumuloServerContext implements LiveTServerSet.List
     private void cleanupNonexistentMigrations(final Connector connector) throws AccumuloException, AccumuloSecurityException, TableNotFoundException {
       Scanner scanner = connector.createScanner(MetadataTable.NAME, Authorizations.EMPTY);
       TabletsSection.TabletColumnFamily.PREV_ROW_COLUMN.fetch(scanner);
-      Set<KeyExtent> found = new HashSet<KeyExtent>();
+      Set<KeyExtent> found = new HashSet<>();
       for (Entry<Key,Value> entry : scanner) {
         KeyExtent extent = new KeyExtent(entry.getKey().getRow(), entry.getValue());
         if (migrations.containsKey(extent)) {
@@ -1019,7 +1019,7 @@ public class Master extends AccumuloServerContext implements LiveTServerSet.List
     }
 
     private long balanceTablets() {
-      List<TabletMigration> migrationsOut = new ArrayList<TabletMigration>();
+      List<TabletMigration> migrationsOut = new ArrayList<>();
       long wait = tabletBalancer.balance(Collections.unmodifiableSortedMap(tserverStatus), migrationsSnapshot(), migrationsOut);
 
       for (TabletMigration m : TabletBalancer.checkMigrationSanity(tserverStatus.keySet(), migrationsOut)) {
@@ -1046,7 +1046,7 @@ public class Master extends AccumuloServerContext implements LiveTServerSet.List
     long start = System.currentTimeMillis();
     int threads = Math.max(getConfiguration().getCount(Property.MASTER_STATUS_THREAD_POOL_SIZE), 1);
     ExecutorService tp = Executors.newFixedThreadPool(threads);
-    final SortedMap<TServerInstance,TabletServerStatus> result = new TreeMap<TServerInstance,TabletServerStatus>();
+    final SortedMap<TServerInstance,TabletServerStatus> result = new TreeMap<>();
     Set<TServerInstance> currentServers = tserverSet.getCurrentServers();
     for (TServerInstance serverInstance : currentServers) {
       final TServerInstance server = serverInstance;
@@ -1144,12 +1144,12 @@ public class Master extends AccumuloServerContext implements LiveTServerSet.List
     waitForMetadataUpgrade.await();
 
     try {
-      final AgeOffStore<Master> store = new AgeOffStore<Master>(new org.apache.accumulo.fate.ZooStore<Master>(ZooUtil.getRoot(getInstance()) + Constants.ZFATE,
+      final AgeOffStore<Master> store = new AgeOffStore<>(new org.apache.accumulo.fate.ZooStore<Master>(ZooUtil.getRoot(getInstance()) + Constants.ZFATE,
           ZooReaderWriter.getInstance()), 1000 * 60 * 60 * 8);
 
       int threads = getConfiguration().getCount(Property.MASTER_FATE_THREADPOOL_SIZE);
 
-      fate = new Fate<Master>(this, store);
+      fate = new Fate<>(this, store);
       fate.startTransactionRunners(threads);
 
       SimpleTimer.getInstance(getConfiguration()).schedule(new Runnable() {
@@ -1191,9 +1191,9 @@ public class Master extends AccumuloServerContext implements LiveTServerSet.List
     final Processor<Iface> processor;
     if (ThriftServerType.SASL == getThriftServerType()) {
       Iface tcredsProxy = TCredentialsUpdatingWrapper.service(rpcProxy, clientHandler.getClass(), getConfiguration());
-      processor = new Processor<Iface>(tcredsProxy);
+      processor = new Processor<>(tcredsProxy);
     } else {
-      processor = new Processor<Iface>(rpcProxy);
+      processor = new Processor<>(rpcProxy);
     }
     ServerAddress sa = TServerUtils.startServer(this, hostname, Property.MASTER_CLIENTPORT, processor, "Master", "Master Client Service Handler", null,
         Property.MASTER_MINTHREADS, Property.MASTER_THREADCHECK, Property.GENERAL_MAX_MESSAGE_SIZE);
@@ -1221,8 +1221,8 @@ public class Master extends AccumuloServerContext implements LiveTServerSet.List
 
     // Start the replication coordinator which assigns tservers to service replication requests
     MasterReplicationCoordinator impl = new MasterReplicationCoordinator(this);
-    ReplicationCoordinator.Processor<ReplicationCoordinator.Iface> replicationCoordinatorProcessor = new ReplicationCoordinator.Processor<ReplicationCoordinator.Iface>(
-        RpcWrapper.service(impl, new ReplicationCoordinator.Processor<ReplicationCoordinator.Iface>(impl)));
+    ReplicationCoordinator.Processor<ReplicationCoordinator.Iface> replicationCoordinatorProcessor = new ReplicationCoordinator.Processor<>(RpcWrapper.service(
+        impl, new ReplicationCoordinator.Processor<ReplicationCoordinator.Iface>(impl)));
     ServerAddress replAddress = TServerUtils.startServer(this, hostname, Property.MASTER_REPLICATION_COORDINATOR_PORT, replicationCoordinatorProcessor,
         "Master Replication Coordinator", "Replication Coordinator", null, Property.MASTER_REPLICATION_COORDINATOR_MINTHREADS,
         Property.MASTER_REPLICATION_COORDINATOR_THREADCHECK, Property.GENERAL_MAX_MESSAGE_SIZE);
@@ -1404,7 +1404,7 @@ public class Master extends AccumuloServerContext implements LiveTServerSet.List
         obit.post(dead.hostPort(), cause);
     }
 
-    Set<TServerInstance> unexpected = new HashSet<TServerInstance>(deleted);
+    Set<TServerInstance> unexpected = new HashSet<>(deleted);
     unexpected.removeAll(this.serversToShutdown);
     if (unexpected.size() > 0) {
       if (stillMaster() && !getMasterGoalState().equals(MasterGoalState.CLEAN_STOP)) {
@@ -1469,7 +1469,7 @@ public class Master extends AccumuloServerContext implements LiveTServerSet.List
 
   @Override
   public Set<String> onlineTables() {
-    Set<String> result = new HashSet<String>();
+    Set<String> result = new HashSet<>();
     if (getMasterState() != MasterState.NORMAL) {
       if (getMasterState() != MasterState.UNLOAD_METADATA_TABLETS)
         result.add(MetadataTable.ID);
@@ -1496,7 +1496,7 @@ public class Master extends AccumuloServerContext implements LiveTServerSet.List
 
   @Override
   public Collection<MergeInfo> merges() {
-    List<MergeInfo> result = new ArrayList<MergeInfo>();
+    List<MergeInfo> result = new ArrayList<>();
     for (String tableId : Tables.getIdToNameMap(getInstance()).keySet()) {
       result.add(getMergeInfo(tableId));
     }
@@ -1552,8 +1552,8 @@ public class Master extends AccumuloServerContext implements LiveTServerSet.List
   public MasterMonitorInfo getMasterMonitorInfo() {
     final MasterMonitorInfo result = new MasterMonitorInfo();
 
-    result.tServerInfo = new ArrayList<TabletServerStatus>();
-    result.tableMap = new DefaultMap<String,TableInfo>(new TableInfo());
+    result.tServerInfo = new ArrayList<>();
+    result.tableMap = new DefaultMap<>(new TableInfo());
     for (Entry<TServerInstance,TabletServerStatus> serverEntry : tserverStatus.entrySet()) {
       final TabletServerStatus status = serverEntry.getValue();
       result.tServerInfo.add(status);
@@ -1561,7 +1561,7 @@ public class Master extends AccumuloServerContext implements LiveTServerSet.List
         TableInfoUtil.add(result.tableMap.get(entry.getKey()), entry.getValue());
       }
     }
-    result.badTServers = new HashMap<String,Byte>();
+    result.badTServers = new HashMap<>();
     synchronized (badServers) {
       for (TServerInstance bad : badServers.keySet()) {
         result.badTServers.put(bad.hostPort(), TabletServerState.UNRESPONSIVE.getId());
@@ -1570,7 +1570,7 @@ public class Master extends AccumuloServerContext implements LiveTServerSet.List
     result.state = getMasterState();
     result.goalState = getMasterGoalState();
     result.unassignedTablets = displayUnassigned();
-    result.serversShuttingDown = new HashSet<String>();
+    result.serversShuttingDown = new HashSet<>();
     synchronized (serversToShutdown) {
       for (TServerInstance server : serversToShutdown)
         result.serversShuttingDown.add(server.hostPort());
@@ -1590,7 +1590,7 @@ public class Master extends AccumuloServerContext implements LiveTServerSet.List
 
   @Override
   public Set<KeyExtent> migrationsSnapshot() {
-    Set<KeyExtent> migrationKeys = new HashSet<KeyExtent>();
+    Set<KeyExtent> migrationKeys = new HashSet<>();
     synchronized (migrations) {
       migrationKeys.addAll(migrations.keySet());
     }
@@ -1600,7 +1600,7 @@ public class Master extends AccumuloServerContext implements LiveTServerSet.List
   @Override
   public Set<TServerInstance> shutdownServers() {
     synchronized (serversToShutdown) {
-      return new HashSet<TServerInstance>(serversToShutdown);
+      return new HashSet<>(serversToShutdown);
     }
   }
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/master/src/main/java/org/apache/accumulo/master/MasterClientServiceHandler.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/MasterClientServiceHandler.java b/server/master/src/main/java/org/apache/accumulo/master/MasterClientServiceHandler.java
index 590f483..bbbdbed 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/MasterClientServiceHandler.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/MasterClientServiceHandler.java
@@ -148,7 +148,7 @@ public class MasterClientServiceHandler extends FateServiceHandler implements Ma
     if (endRow != null && startRow != null && ByteBufferUtil.toText(startRow).compareTo(ByteBufferUtil.toText(endRow)) >= 0)
       throw new ThriftTableOperationException(tableId, null, TableOperation.FLUSH, TableOperationExceptionType.BAD_RANGE, "start row must be less than end row");
 
-    Set<TServerInstance> serversToFlush = new HashSet<TServerInstance>(master.tserverSet.getCurrentServers());
+    Set<TServerInstance> serversToFlush = new HashSet<>(master.tserverSet.getCurrentServers());
 
     for (long l = 0; l < maxLoops; l++) {
 
@@ -303,7 +303,7 @@ public class MasterClientServiceHandler extends FateServiceHandler implements Ma
 
     log.debug("Seeding FATE op to shutdown " + tabletServer + " with tid " + tid);
 
-    master.fate.seedTransaction(tid, new TraceRepo<Master>(new ShutdownTServer(doomed, force)), false);
+    master.fate.seedTransaction(tid, new TraceRepo<>(new ShutdownTServer(doomed, force)), false);
     master.fate.waitForCompletion(tid);
     master.fate.delete(tid);
 
@@ -469,7 +469,7 @@ public class MasterClientServiceHandler extends FateServiceHandler implements Ma
   @Override
   public List<String> getActiveTservers(TInfo tinfo, TCredentials credentials) throws TException {
     Set<TServerInstance> tserverInstances = master.onlineTabletServers();
-    List<String> servers = new ArrayList<String>();
+    List<String> servers = new ArrayList<>();
     for (TServerInstance tserverInstance : tserverInstances) {
       servers.add(tserverInstance.getLocation().toString());
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/master/src/main/java/org/apache/accumulo/master/TabletGroupWatcher.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/TabletGroupWatcher.java b/server/master/src/main/java/org/apache/accumulo/master/TabletGroupWatcher.java
index e8df759..e20335b 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/TabletGroupWatcher.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/TabletGroupWatcher.java
@@ -142,8 +142,8 @@ class TabletGroupWatcher extends Daemon {
       int unloaded = 0;
       ClosableIterator<TabletLocationState> iter = null;
       try {
-        Map<String,MergeStats> mergeStatsCache = new HashMap<String,MergeStats>();
-        Map<String,MergeStats> currentMerges = new HashMap<String,MergeStats>();
+        Map<String,MergeStats> mergeStatsCache = new HashMap<>();
+        Map<String,MergeStats> currentMerges = new HashMap<>();
         for (MergeInfo merge : master.merges()) {
           if (merge.getExtent() != null) {
             currentMerges.put(merge.getExtent().getTableId(), new MergeStats(merge));
@@ -151,7 +151,7 @@ class TabletGroupWatcher extends Daemon {
         }
 
         // Get the current status for the current list of tservers
-        SortedMap<TServerInstance,TabletServerStatus> currentTServers = new TreeMap<TServerInstance,TabletServerStatus>();
+        SortedMap<TServerInstance,TabletServerStatus> currentTServers = new TreeMap<>();
         for (TServerInstance entry : this.master.tserverSet.getCurrentServers()) {
           currentTServers.put(entry, this.master.tserverStatus.get(entry));
         }
@@ -162,13 +162,13 @@ class TabletGroupWatcher extends Daemon {
         }
 
         // Don't move tablets to servers that are shutting down
-        SortedMap<TServerInstance,TabletServerStatus> destinations = new TreeMap<TServerInstance,TabletServerStatus>(currentTServers);
+        SortedMap<TServerInstance,TabletServerStatus> destinations = new TreeMap<>(currentTServers);
         destinations.keySet().removeAll(this.master.serversToShutdown);
 
-        List<Assignment> assignments = new ArrayList<Assignment>();
-        List<Assignment> assigned = new ArrayList<Assignment>();
-        List<TabletLocationState> assignedToDeadServers = new ArrayList<TabletLocationState>();
-        Map<KeyExtent,TServerInstance> unassigned = new HashMap<KeyExtent,TServerInstance>();
+        List<Assignment> assignments = new ArrayList<>();
+        List<Assignment> assigned = new ArrayList<>();
+        List<TabletLocationState> assignedToDeadServers = new ArrayList<>();
+        Map<KeyExtent,TServerInstance> unassigned = new HashMap<>();
         Map<TServerInstance,List<Path>> logsForDeadServers = new TreeMap<>();
 
         MasterState masterState = master.getMasterState();
@@ -356,8 +356,8 @@ class TabletGroupWatcher extends Daemon {
     // ACCUMULO-2261 if a dying tserver writes a location before its lock information propagates, it may cause duplicate assignment.
     // Attempt to find the dead server entry and remove it.
     try {
-      Map<Key,Value> future = new HashMap<Key,Value>();
-      Map<Key,Value> assigned = new HashMap<Key,Value>();
+      Map<Key,Value> future = new HashMap<>();
+      Map<Key,Value> assigned = new HashMap<>();
       KeyExtent extent = new KeyExtent(row, new Value(new byte[] {0}));
       String table = MetadataTable.NAME;
       if (extent.isMeta())
@@ -536,7 +536,7 @@ class TabletGroupWatcher extends Daemon {
       TabletsSection.ServerColumnFamily.TIME_COLUMN.fetch(scanner);
       scanner.fetchColumnFamily(DataFileColumnFamily.NAME);
       scanner.fetchColumnFamily(TabletsSection.CurrentLocationColumnFamily.NAME);
-      Set<FileRef> datafiles = new TreeSet<FileRef>();
+      Set<FileRef> datafiles = new TreeSet<>();
       for (Entry<Key,Value> entry : scanner) {
         Key key = entry.getKey();
         if (key.compareColumnFamily(DataFileColumnFamily.NAME) == 0) {
@@ -761,7 +761,7 @@ class TabletGroupWatcher extends Daemon {
     }
 
     if (!currentTServers.isEmpty()) {
-      Map<KeyExtent,TServerInstance> assignedOut = new HashMap<KeyExtent,TServerInstance>();
+      Map<KeyExtent,TServerInstance> assignedOut = new HashMap<>();
       final StringBuilder builder = new StringBuilder(64);
       this.master.tabletBalancer.getAssignments(Collections.unmodifiableSortedMap(currentTServers), Collections.unmodifiableMap(unassigned), assignedOut);
       for (Entry<KeyExtent,TServerInstance> assignment : assignedOut.entrySet()) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/master/src/main/java/org/apache/accumulo/master/recovery/RecoveryManager.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/recovery/RecoveryManager.java b/server/master/src/main/java/org/apache/accumulo/master/recovery/RecoveryManager.java
index c1c1713..bd49a7d 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/recovery/RecoveryManager.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/recovery/RecoveryManager.java
@@ -55,9 +55,9 @@ public class RecoveryManager {
 
   private static final Logger log = LoggerFactory.getLogger(RecoveryManager.class);
 
-  private Map<String,Long> recoveryDelay = new HashMap<String,Long>();
-  private Set<String> closeTasksQueued = new HashSet<String>();
-  private Set<String> sortsQueued = new HashSet<String>();
+  private Map<String,Long> recoveryDelay = new HashMap<>();
+  private Set<String> closeTasksQueued = new HashSet<>();
+  private Set<String> sortsQueued = new HashSet<>();
   private ScheduledExecutorService executor;
   private Master master;
   private ZooCache zooCache;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/master/src/main/java/org/apache/accumulo/master/state/TableStats.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/state/TableStats.java b/server/master/src/main/java/org/apache/accumulo/master/state/TableStats.java
index 1fe72a3..931df12 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/state/TableStats.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/state/TableStats.java
@@ -23,14 +23,14 @@ import org.apache.accumulo.core.master.thrift.MasterState;
 import org.apache.accumulo.server.master.state.TabletState;
 
 public class TableStats {
-  private Map<String,TableCounts> last = new HashMap<String,TableCounts>();
+  private Map<String,TableCounts> last = new HashMap<>();
   private Map<String,TableCounts> next;
   private long startScan = 0;
   private long endScan = 0;
   private MasterState state;
 
   public synchronized void begin() {
-    next = new HashMap<String,TableCounts>();
+    next = new HashMap<>();
     startScan = System.currentTimeMillis();
   }
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/master/src/main/java/org/apache/accumulo/master/tableOps/CompactionDriver.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/CompactionDriver.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/CompactionDriver.java
index 2346ecc..4653472 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/CompactionDriver.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/CompactionDriver.java
@@ -80,7 +80,7 @@ class CompactionDriver extends MasterRepo {
       throw new AcceptableThriftTableOperationException(tableId, null, TableOperation.COMPACT, TableOperationExceptionType.OTHER, "Compaction canceled");
     }
 
-    MapCounter<TServerInstance> serversToFlush = new MapCounter<TServerInstance>();
+    MapCounter<TServerInstance> serversToFlush = new MapCounter<>();
     Connector conn = master.getConnector();
 
     Scanner scanner;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/master/src/main/java/org/apache/accumulo/master/tableOps/CopyFailed.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/CopyFailed.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/CopyFailed.java
index 5fbf3a0..2f71907 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/CopyFailed.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/CopyFailed.java
@@ -67,7 +67,7 @@ class CopyFailed extends MasterRepo {
 
   @Override
   public long isReady(long tid, Master master) throws Exception {
-    Set<TServerInstance> finished = new HashSet<TServerInstance>();
+    Set<TServerInstance> finished = new HashSet<>();
     Set<TServerInstance> running = master.onlineTabletServers();
     for (TServerInstance server : running) {
       try {
@@ -92,8 +92,8 @@ class CopyFailed extends MasterRepo {
     if (!fs.exists(new Path(error, BulkImport.FAILURES_TXT)))
       return new CleanUpBulkImport(tableId, source, bulk, error);
 
-    HashMap<FileRef,String> failures = new HashMap<FileRef,String>();
-    HashMap<FileRef,String> loadedFailures = new HashMap<FileRef,String>();
+    HashMap<FileRef,String> failures = new HashMap<>();
+    HashMap<FileRef,String> loadedFailures = new HashMap<>();
 
     try (BufferedReader in = new BufferedReader(new InputStreamReader(fs.open(new Path(error, BulkImport.FAILURES_TXT)), UTF_8))) {
       String line = null;
@@ -138,7 +138,7 @@ class CopyFailed extends MasterRepo {
       DistributedWorkQueue bifCopyQueue = new DistributedWorkQueue(Constants.ZROOT + "/" + master.getInstance().getInstanceID() + Constants.ZBULK_FAILED_COPYQ,
           master.getConfiguration());
 
-      HashSet<String> workIds = new HashSet<String>();
+      HashSet<String> workIds = new HashSet<>();
 
       for (String failure : loadedFailures.values()) {
         Path orig = new Path(failure);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/master/src/main/java/org/apache/accumulo/master/tableOps/LoadFiles.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/LoadFiles.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/LoadFiles.java
index 40cac38..ff285fa 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/LoadFiles.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/LoadFiles.java
@@ -101,7 +101,7 @@ class LoadFiles extends MasterRepo {
     ExecutorService executor = getThreadPool(master);
     final AccumuloConfiguration conf = master.getConfiguration();
     VolumeManager fs = master.getFileSystem();
-    List<FileStatus> files = new ArrayList<FileStatus>();
+    List<FileStatus> files = new ArrayList<>();
     for (FileStatus entry : fs.listStatus(new Path(bulk))) {
       files.add(entry);
     }
@@ -123,7 +123,7 @@ class LoadFiles extends MasterRepo {
 
     final int RETRIES = Math.max(1, conf.getCount(Property.MASTER_BULK_RETRIES));
     for (int attempt = 0; attempt < RETRIES && filesToLoad.size() > 0; attempt++) {
-      List<Future<List<String>>> results = new ArrayList<Future<List<String>>>();
+      List<Future<List<String>>> results = new ArrayList<>();
 
       if (master.onlineTabletServers().size() == 0)
         log.warn("There are no tablet server to process bulk import, waiting (tid = " + tid + ")");
@@ -140,7 +140,7 @@ class LoadFiles extends MasterRepo {
         results.add(executor.submit(new Callable<List<String>>() {
           @Override
           public List<String> call() {
-            List<String> failures = new ArrayList<String>();
+            List<String> failures = new ArrayList<>();
             ClientService.Client client = null;
             HostAndPort server = null;
             try {
@@ -168,7 +168,7 @@ class LoadFiles extends MasterRepo {
           }
         }));
       }
-      Set<String> failures = new HashSet<String>();
+      Set<String> failures = new HashSet<>();
       for (Future<List<String>> f : results)
         failures.addAll(f.get());
       filesToLoad.removeAll(loaded);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/master/src/main/java/org/apache/accumulo/master/tableOps/PopulateMetadataTable.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/PopulateMetadataTable.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/PopulateMetadataTable.java
index 9e596f8..81e28b6 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/PopulateMetadataTable.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/PopulateMetadataTable.java
@@ -69,7 +69,7 @@ class PopulateMetadataTable extends MasterRepo {
     BufferedReader in = new BufferedReader(new InputStreamReader(fs.open(new Path(tableInfo.importDir, "mappings.txt")), UTF_8));
 
     try {
-      Map<String,String> map = new HashMap<String,String>();
+      Map<String,String> map = new HashMap<>();
 
       String line = null;
       while ((line = in.readLine()) != null) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/master/src/main/java/org/apache/accumulo/master/tableOps/TraceRepo.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/TraceRepo.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/TraceRepo.java
index 9388b7b..4bbb12b 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/TraceRepo.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/TraceRepo.java
@@ -57,7 +57,7 @@ public class TraceRepo<T> implements Repo<T> {
       Repo<T> result = repo.call(tid, environment);
       if (result == null)
         return null;
-      return new TraceRepo<T>(result);
+      return new TraceRepo<>(result);
     } finally {
       span.stop();
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/master/src/main/java/org/apache/accumulo/master/tableOps/WriteExportFiles.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/WriteExportFiles.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/WriteExportFiles.java
index 3ea2767..d0cbe36 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/WriteExportFiles.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/WriteExportFiles.java
@@ -202,7 +202,7 @@ class WriteExportFiles extends MasterRepo {
       DataOutputStream dataOut) throws IOException, TableNotFoundException, AccumuloException, AccumuloSecurityException {
     zipOut.putNextEntry(new ZipEntry(Constants.EXPORT_METADATA_FILE));
 
-    Map<String,String> uniqueFiles = new HashMap<String,String>();
+    Map<String,String> uniqueFiles = new HashMap<>();
 
     Scanner metaScanner = context.getConnector().createScanner(MetadataTable.NAME, Authorizations.EMPTY);
     metaScanner.fetchColumnFamily(DataFileColumnFamily.NAME);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/master/src/main/java/org/apache/accumulo/master/util/FateAdmin.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/util/FateAdmin.java b/server/master/src/main/java/org/apache/accumulo/master/util/FateAdmin.java
index 953d630..a1dd303 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/util/FateAdmin.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/util/FateAdmin.java
@@ -44,7 +44,7 @@ public class FateAdmin {
 
   static class TxOpts {
     @Parameter(description = "<txid>...", required = true)
-    List<String> txids = new ArrayList<String>();
+    List<String> txids = new ArrayList<>();
   }
 
   @Parameters(commandDescription = "Stop an existing FATE by transaction id")
@@ -60,7 +60,7 @@ public class FateAdmin {
     Help opts = new Help();
     JCommander jc = new JCommander(opts);
     jc.setProgramName(FateAdmin.class.getName());
-    LinkedHashMap<String,TxOpts> txOpts = new LinkedHashMap<String,TxOpts>(2);
+    LinkedHashMap<String,TxOpts> txOpts = new LinkedHashMap<>(2);
     txOpts.put("fail", new FailOpts());
     txOpts.put("delete", new DeleteOpts());
     for (Entry<String,TxOpts> entry : txOpts.entrySet()) {
@@ -76,13 +76,13 @@ public class FateAdmin {
     System.err
         .printf("This tool has been deprecated%nFATE administration now available within 'accumulo shell'%n$ fate fail <txid>... | delete <txid>... | print [<txid>...]%n%n");
 
-    AdminUtil<Master> admin = new AdminUtil<Master>();
+    AdminUtil<Master> admin = new AdminUtil<>();
 
     Instance instance = HdfsZooInstance.getInstance();
     String path = ZooUtil.getRoot(instance) + Constants.ZFATE;
     String masterPath = ZooUtil.getRoot(instance) + Constants.ZMASTER_LOCK;
     IZooReaderWriter zk = ZooReaderWriter.getInstance();
-    ZooStore<Master> zs = new ZooStore<Master>(path, zk);
+    ZooStore<Master> zs = new ZooStore<>(path, zk);
 
     if (jc.getParsedCommand().equals("fail")) {
       for (String txid : txOpts.get(jc.getParsedCommand()).txids) {
@@ -98,7 +98,7 @@ public class FateAdmin {
         admin.deleteLocks(zs, zk, ZooUtil.getRoot(instance) + Constants.ZTABLE_LOCKS, txid);
       }
     } else if (jc.getParsedCommand().equals("print")) {
-      admin.print(new ReadOnlyStore<Master>(zs), zk, ZooUtil.getRoot(instance) + Constants.ZTABLE_LOCKS);
+      admin.print(new ReadOnlyStore<>(zs), zk, ZooUtil.getRoot(instance) + Constants.ZTABLE_LOCKS);
     }
   }
 }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/master/src/test/java/org/apache/accumulo/master/DefaultMapTest.java
----------------------------------------------------------------------
diff --git a/server/master/src/test/java/org/apache/accumulo/master/DefaultMapTest.java b/server/master/src/test/java/org/apache/accumulo/master/DefaultMapTest.java
index c0e9a4a..8d139ac 100644
--- a/server/master/src/test/java/org/apache/accumulo/master/DefaultMapTest.java
+++ b/server/master/src/test/java/org/apache/accumulo/master/DefaultMapTest.java
@@ -26,7 +26,7 @@ public class DefaultMapTest {
 
   @Test
   public void testDefaultMap() {
-    DefaultMap<String,String> map = new DefaultMap<String,String>("");
+    DefaultMap<String,String> map = new DefaultMap<>("");
     map.put("key", "value");
     String empty = map.get("otherKey");
     assertEquals(map.get("key"), "value");

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/master/src/test/java/org/apache/accumulo/master/state/RootTabletStateStoreTest.java
----------------------------------------------------------------------
diff --git a/server/master/src/test/java/org/apache/accumulo/master/state/RootTabletStateStoreTest.java b/server/master/src/test/java/org/apache/accumulo/master/state/RootTabletStateStoreTest.java
index 0a78d59..0bc989e 100644
--- a/server/master/src/test/java/org/apache/accumulo/master/state/RootTabletStateStoreTest.java
+++ b/server/master/src/test/java/org/apache/accumulo/master/state/RootTabletStateStoreTest.java
@@ -48,7 +48,7 @@ public class RootTabletStateStoreTest {
       this.name = name;
     }
 
-    List<Node> children = new ArrayList<Node>();
+    List<Node> children = new ArrayList<>();
     String name;
     byte[] value = new byte[] {};
 
@@ -58,7 +58,7 @@ public class RootTabletStateStoreTest {
           return node;
       return null;
     }
-  };
+  }
 
   static class FakeZooStore implements DistributedStore {
 
@@ -83,7 +83,7 @@ public class RootTabletStateStoreTest {
       Node node = navigate(path);
       if (node == null)
         return Collections.emptyList();
-      List<String> children = new ArrayList<String>(node.children.size());
+      List<String> children = new ArrayList<>(node.children.size());
       for (Node child : node.children)
         children.add(child.name);
       return children;
@@ -143,10 +143,10 @@ public class RootTabletStateStoreTest {
     assertArrayEquals(store.get("/a/b"), "ab".getBytes());
     store.put("/a/b/b", "abb".getBytes());
     List<String> children = store.getChildren("/a/b");
-    assertEquals(new HashSet<String>(children), new HashSet<String>(Arrays.asList("b", "c")));
+    assertEquals(new HashSet<>(children), new HashSet<>(Arrays.asList("b", "c")));
     store.remove("/a/b/c");
     children = store.getChildren("/a/b");
-    assertEquals(new HashSet<String>(children), new HashSet<String>(Arrays.asList("b")));
+    assertEquals(new HashSet<>(children), new HashSet<>(Arrays.asList("b")));
   }
 
   @Test

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
index 9dc4cef..63fb32c 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
@@ -173,20 +173,20 @@ public class Monitor {
   private ZooLock monitorLock;
 
   private static final String DEFAULT_INSTANCE_NAME = "(Unavailable)";
-  public static final AtomicReference<String> cachedInstanceName = new AtomicReference<String>(DEFAULT_INSTANCE_NAME);
+  public static final AtomicReference<String> cachedInstanceName = new AtomicReference<>(DEFAULT_INSTANCE_NAME);
 
   private static class EventCounter {
 
-    Map<String,Pair<Long,Long>> prevSamples = new HashMap<String,Pair<Long,Long>>();
-    Map<String,Pair<Long,Long>> samples = new HashMap<String,Pair<Long,Long>>();
-    Set<String> serversUpdated = new HashSet<String>();
+    Map<String,Pair<Long,Long>> prevSamples = new HashMap<>();
+    Map<String,Pair<Long,Long>> samples = new HashMap<>();
+    Set<String> serversUpdated = new HashSet<>();
 
     void startingUpdates() {
       serversUpdated.clear();
     }
 
     void updateTabletServer(String name, long sampleTime, long numEvents) {
-      Pair<Long,Long> newSample = new Pair<Long,Long>(sampleTime, numEvents);
+      Pair<Long,Long> newSample = new Pair<>(sampleTime, numEvents);
       Pair<Long,Long> lastSample = samples.get(name);
 
       if (lastSample == null || !lastSample.equals(newSample)) {
@@ -347,25 +347,25 @@ public class Monitor {
         Monitor.totalHoldTime = totalHoldTime;
         Monitor.totalLookups = totalLookups;
 
-        ingestRateOverTime.add(new Pair<Long,Double>(currentTime, totalIngestRate));
-        ingestByteRateOverTime.add(new Pair<Long,Double>(currentTime, totalIngestByteRate));
+        ingestRateOverTime.add(new Pair<>(currentTime, totalIngestRate));
+        ingestByteRateOverTime.add(new Pair<>(currentTime, totalIngestByteRate));
 
         double totalLoad = 0.;
         for (TabletServerStatus status : mmi.tServerInfo) {
           if (status != null)
             totalLoad += status.osLoad;
         }
-        loadOverTime.add(new Pair<Long,Double>(currentTime, totalLoad));
+        loadOverTime.add(new Pair<>(currentTime, totalLoad));
 
-        minorCompactionsOverTime.add(new Pair<Long,Integer>(currentTime, minorCompactions));
-        majorCompactionsOverTime.add(new Pair<Long,Integer>(currentTime, majorCompactions));
+        minorCompactionsOverTime.add(new Pair<>(currentTime, minorCompactions));
+        majorCompactionsOverTime.add(new Pair<>(currentTime, majorCompactions));
 
-        lookupsOverTime.add(new Pair<Long,Double>(currentTime, lookupRateTracker.calculateRate()));
+        lookupsOverTime.add(new Pair<>(currentTime, lookupRateTracker.calculateRate()));
 
-        queryRateOverTime.add(new Pair<Long,Integer>(currentTime, (int) totalQueryRate));
-        queryByteRateOverTime.add(new Pair<Long,Double>(currentTime, totalQueryByteRate));
+        queryRateOverTime.add(new Pair<>(currentTime, (int) totalQueryRate));
+        queryByteRateOverTime.add(new Pair<>(currentTime, totalQueryByteRate));
 
-        scanRateOverTime.add(new Pair<Long,Integer>(currentTime, (int) totalScanRate));
+        scanRateOverTime.add(new Pair<>(currentTime, (int) totalScanRate));
 
         calcCacheHitRate(indexCacheHitRateOverTime, currentTime, indexCacheHitTracker, indexCacheRequestTracker);
         calcCacheHitRate(dataCacheHitRateOverTime, currentTime, dataCacheHitTracker, dataCacheRequestTracker);
@@ -390,7 +390,7 @@ public class Monitor {
   private static void calcCacheHitRate(List<Pair<Long,Double>> hitRate, long currentTime, EventCounter cacheHits, EventCounter cacheReq) {
     long req = cacheReq.calculateCount();
     if (req > 0)
-      hitRate.add(new Pair<Long,Double>(currentTime, cacheHits.calculateCount() / (double) cacheReq.calculateCount()));
+      hitRate.add(new Pair<>(currentTime, cacheHits.calculateCount() / (double) cacheReq.calculateCount()));
     else
       hitRate.add(new Pair<Long,Double>(currentTime, null));
   }
@@ -558,11 +558,11 @@ public class Monitor {
     }
   }
 
-  static final Map<HostAndPort,ScanStats> allScans = new HashMap<HostAndPort,ScanStats>();
+  static final Map<HostAndPort,ScanStats> allScans = new HashMap<>();
 
   public static Map<HostAndPort,ScanStats> getScans() {
     synchronized (allScans) {
-      return new HashMap<HostAndPort,ScanStats>(allScans);
+      return new HashMap<>(allScans);
     }
   }
 
@@ -762,37 +762,37 @@ public class Monitor {
 
   public static List<Pair<Long,Double>> getLoadOverTime() {
     synchronized (loadOverTime) {
-      return new ArrayList<Pair<Long,Double>>(loadOverTime);
+      return new ArrayList<>(loadOverTime);
     }
   }
 
   public static List<Pair<Long,Double>> getIngestRateOverTime() {
     synchronized (ingestRateOverTime) {
-      return new ArrayList<Pair<Long,Double>>(ingestRateOverTime);
+      return new ArrayList<>(ingestRateOverTime);
     }
   }
 
   public static List<Pair<Long,Double>> getIngestByteRateOverTime() {
     synchronized (ingestByteRateOverTime) {
-      return new ArrayList<Pair<Long,Double>>(ingestByteRateOverTime);
+      return new ArrayList<>(ingestByteRateOverTime);
     }
   }
 
   public static List<Pair<Long,Integer>> getMinorCompactionsOverTime() {
     synchronized (minorCompactionsOverTime) {
-      return new ArrayList<Pair<Long,Integer>>(minorCompactionsOverTime);
+      return new ArrayList<>(minorCompactionsOverTime);
     }
   }
 
   public static List<Pair<Long,Integer>> getMajorCompactionsOverTime() {
     synchronized (majorCompactionsOverTime) {
-      return new ArrayList<Pair<Long,Integer>>(majorCompactionsOverTime);
+      return new ArrayList<>(majorCompactionsOverTime);
     }
   }
 
   public static List<Pair<Long,Double>> getLookupsOverTime() {
     synchronized (lookupsOverTime) {
-      return new ArrayList<Pair<Long,Double>>(lookupsOverTime);
+      return new ArrayList<>(lookupsOverTime);
     }
   }
 
@@ -802,31 +802,31 @@ public class Monitor {
 
   public static List<Pair<Long,Integer>> getQueryRateOverTime() {
     synchronized (queryRateOverTime) {
-      return new ArrayList<Pair<Long,Integer>>(queryRateOverTime);
+      return new ArrayList<>(queryRateOverTime);
     }
   }
 
   public static List<Pair<Long,Integer>> getScanRateOverTime() {
     synchronized (scanRateOverTime) {
-      return new ArrayList<Pair<Long,Integer>>(scanRateOverTime);
+      return new ArrayList<>(scanRateOverTime);
     }
   }
 
   public static List<Pair<Long,Double>> getQueryByteRateOverTime() {
     synchronized (queryByteRateOverTime) {
-      return new ArrayList<Pair<Long,Double>>(queryByteRateOverTime);
+      return new ArrayList<>(queryByteRateOverTime);
     }
   }
 
   public static List<Pair<Long,Double>> getIndexCacheHitRateOverTime() {
     synchronized (indexCacheHitRateOverTime) {
-      return new ArrayList<Pair<Long,Double>>(indexCacheHitRateOverTime);
+      return new ArrayList<>(indexCacheHitRateOverTime);
     }
   }
 
   public static List<Pair<Long,Double>> getDataCacheHitRateOverTime() {
     synchronized (dataCacheHitRateOverTime) {
-      return new ArrayList<Pair<Long,Double>>(dataCacheHitRateOverTime);
+      return new ArrayList<>(dataCacheHitRateOverTime);
     }
   }
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/monitor/src/main/java/org/apache/accumulo/monitor/ZooKeeperStatus.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/ZooKeeperStatus.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/ZooKeeperStatus.java
index 7e992e0..f2a295d 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/ZooKeeperStatus.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/ZooKeeperStatus.java
@@ -82,7 +82,7 @@ public class ZooKeeperStatus implements Runnable {
     }
   }
 
-  private static SortedSet<ZooKeeperState> status = new TreeSet<ZooKeeperState>();
+  private static SortedSet<ZooKeeperState> status = new TreeSet<>();
 
   public static Collection<ZooKeeperState> getZooKeeperStatus() {
     return status;
@@ -93,7 +93,7 @@ public class ZooKeeperStatus implements Runnable {
 
     while (!stop) {
 
-      TreeSet<ZooKeeperState> update = new TreeSet<ZooKeeperState>();
+      TreeSet<ZooKeeperState> update = new TreeSet<>();
 
       String zookeepers[] = SiteConfiguration.getInstance().get(Property.INSTANCE_ZK_HOST).split(",");
       for (String keeper : zookeepers) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/GcStatusServlet.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/GcStatusServlet.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/GcStatusServlet.java
index 926eedc..74fc21c 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/GcStatusServlet.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/GcStatusServlet.java
@@ -48,7 +48,7 @@ public class GcStatusServlet extends BasicServlet {
       gcActivity.addSortableColumn("Candidates", new NumberType<Long>(), null);
       gcActivity.addSortableColumn("Deleted", new NumberType<Long>(), null);
       gcActivity.addSortableColumn("In&nbsp;Use", new NumberType<Long>(), null);
-      gcActivity.addSortableColumn("Errors", new NumberType<Long>(0l, 1l), null);
+      gcActivity.addSortableColumn("Errors", new NumberType<>(0l, 1l), null);
       gcActivity.addSortableColumn("Duration", new DurationType(), null);
 
       if (status.last.finished > 0)

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/JSONServlet.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/JSONServlet.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/JSONServlet.java
index dc75537..745fd96 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/JSONServlet.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/JSONServlet.java
@@ -49,7 +49,7 @@ public class JSONServlet extends BasicServlet {
 
   private static Map<String,Object> addServer(String ip, String hostname, double osload, double ingest, double query, double ingestMB, double queryMB,
       int scans, double scansessions, long holdtime) {
-    Map<String,Object> map = new HashMap<String,Object>();
+    Map<String,Object> map = new HashMap<>();
     map.put("ip", ip);
     map.put("hostname", hostname);
     map.put("osload", osload);
@@ -69,8 +69,8 @@ public class JSONServlet extends BasicServlet {
       return;
     }
 
-    Map<String,Object> results = new HashMap<String,Object>();
-    List<Map<String,Object>> servers = new ArrayList<Map<String,Object>>();
+    Map<String,Object> results = new HashMap<>();
+    List<Map<String,Object>> servers = new ArrayList<>();
 
     for (TabletServerStatus status : Monitor.getMmi().tServerInfo) {
       TableInfo summary = TableInfoUtil.summarizeTableStats(status);
@@ -80,14 +80,14 @@ public class JSONServlet extends BasicServlet {
     }
 
     for (Entry<String,Byte> entry : Monitor.getMmi().badTServers.entrySet()) {
-      Map<String,Object> badServer = new HashMap<String,Object>();
+      Map<String,Object> badServer = new HashMap<>();
       badServer.put("ip", entry.getKey());
       badServer.put("bad", true);
       servers.add(badServer);
     }
 
     for (DeadServer dead : Monitor.getMmi().deadTabletServers) {
-      Map<String,Object> deadServer = new HashMap<String,Object>();
+      Map<String,Object> deadServer = new HashMap<>();
       deadServer.put("ip", dead.server);
       deadServer.put("dead", true);
       servers.add(deadServer);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/MasterServlet.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/MasterServlet.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/MasterServlet.java
index 64b8648..42d771c 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/MasterServlet.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/MasterServlet.java
@@ -122,7 +122,7 @@ public class MasterServlet extends BasicServlet {
       }
 
       int guessHighLoad = ManagementFactory.getOperatingSystemMXBean().getAvailableProcessors();
-      List<String> slaves = new ArrayList<String>();
+      List<String> slaves = new ArrayList<>();
       for (TabletServerStatus up : Monitor.getMmi().tServerInfo) {
         slaves.add(up.name);
       }
@@ -137,8 +137,8 @@ public class MasterServlet extends BasicServlet {
           (int) (slaves.size() * 0.6 + 1.0), slaves.size()), "Number of tablet servers currently available");
       masterStatus.addSortableColumn("#&nbsp;Total<br />Tablet&nbsp;Servers", new PreciseNumberType(), "The total number of tablet servers configured");
       masterStatus.addSortableColumn("Last&nbsp;GC", null, "The last time files were cleaned-up from HDFS.");
-      masterStatus.addSortableColumn("#&nbsp;Tablets", new NumberType<Integer>(0, Integer.MAX_VALUE, 2, Integer.MAX_VALUE), null);
-      masterStatus.addSortableColumn("#&nbsp;Unassigned<br />Tablets", new NumberType<Integer>(0, 0), null);
+      masterStatus.addSortableColumn("#&nbsp;Tablets", new NumberType<>(0, Integer.MAX_VALUE, 2, Integer.MAX_VALUE), null);
+      masterStatus.addSortableColumn("#&nbsp;Unassigned<br />Tablets", new NumberType<>(0, 0), null);
       masterStatus.addSortableColumn("Entries", new NumberType<Long>(), "The total number of key/value pairs in Accumulo");
       masterStatus.addSortableColumn("Ingest", new NumberType<Long>(), "The number of Key/Value pairs inserted, per second. "
           + " Note that deleted records are \"inserted\" and will make the ingest " + "rate increase in the near-term.");
@@ -147,7 +147,7 @@ public class MasterServlet extends BasicServlet {
       masterStatus.addSortableColumn("Entries<br />Returned", new NumberType<Long>(), "The total number of Key/Value pairs returned as a result of scans.");
       masterStatus.addSortableColumn("Hold&nbsp;Time", new DurationType(0l, 0l), "The maximum amount of time that ingest has been held "
           + "across all servers due to a lack of memory to store the records");
-      masterStatus.addSortableColumn("OS&nbsp;Load", new NumberType<Double>(0., guessHighLoad * 1., 0., guessHighLoad * 3.),
+      masterStatus.addSortableColumn("OS&nbsp;Load", new NumberType<>(0., guessHighLoad * 1., 0., guessHighLoad * 3.),
           "The one-minute load average on the computer that runs the monitor web server.");
       TableRow row = masterStatus.prepareRow();
       row.add(masters.size() == 0 ? "<div class='error'>Down</div>" : AddressUtil.parseAddress(masters.get(0), false).getHostText());

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/ProblemServlet.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/ProblemServlet.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/ProblemServlet.java
index e78c26a..29ab6c6 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/ProblemServlet.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/ProblemServlet.java
@@ -93,7 +93,7 @@ public class ProblemServlet extends BasicServlet {
     if (Monitor.getProblemException() != null)
       return;
 
-    ArrayList<ProblemReport> problemReports = new ArrayList<ProblemReport>();
+    ArrayList<ProblemReport> problemReports = new ArrayList<>();
     Iterator<ProblemReport> iter = tableId == null ? ProblemReports.getInstance(Monitor.getContext()).iterator() : ProblemReports.getInstance(
         Monitor.getContext()).iterator(tableId);
     while (iter.hasNext())

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/ReplicationServlet.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/ReplicationServlet.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/ReplicationServlet.java
index bf582c7..abc9ec4 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/ReplicationServlet.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/ReplicationServlet.java
@@ -122,7 +122,7 @@ public class ReplicationServlet extends BasicServlet {
 
     // Up to 2x the number of slots for replication available, WARN
     // More than 2x the number of slots for replication available, ERROR
-    NumberType<Long> filesPendingFormat = new NumberType<Long>(Long.valueOf(0), Long.valueOf(2 * totalWorkQueueSize), Long.valueOf(0),
+    NumberType<Long> filesPendingFormat = new NumberType<>(Long.valueOf(0), Long.valueOf(2 * totalWorkQueueSize), Long.valueOf(0),
         Long.valueOf(4 * totalWorkQueueSize));
 
     String utilization = filesPendingFormat.format(filesPendingOverAllTargets);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/ShellServlet.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/ShellServlet.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/ShellServlet.java
index 1f0e137..31bea15 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/ShellServlet.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/ShellServlet.java
@@ -41,7 +41,7 @@ public class ShellServlet extends BasicServlet {
 
   private synchronized Map<String,ShellExecutionThread> userShells() {
     if (userShells == null) {
-      userShells = new HashMap<String,ShellExecutionThread>();
+      userShells = new HashMap<>();
     }
     return userShells;
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/TServersServlet.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/TServersServlet.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/TServersServlet.java
index c01a6a9..858192b 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/TServersServlet.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/TServersServlet.java
@@ -99,7 +99,7 @@ public class TServersServlet extends BasicServlet {
 
       doDeadTserverList(req, sb);
 
-      ArrayList<TabletServerStatus> tservers = new ArrayList<TabletServerStatus>();
+      ArrayList<TabletServerStatus> tservers = new ArrayList<>();
       if (Monitor.getMmi() != null)
         tservers.addAll(Monitor.getMmi().tServerInfo);
 
@@ -124,7 +124,7 @@ public class TServersServlet extends BasicServlet {
 
     HostAndPort address = HostAndPort.fromString(tserverAddress);
     TabletStats historical = new TabletStats(null, new ActionStats(), new ActionStats(), new ActionStats(), 0, 0, 0, 0);
-    List<TabletStats> tsStats = new ArrayList<TabletStats>();
+    List<TabletStats> tsStats = new ArrayList<>();
     try {
       ClientContext context = Monitor.getContext();
       TabletClientService.Client client = ThriftUtil.getClient(new TabletClientService.Client.Factory(), address, context);
@@ -319,7 +319,7 @@ public class TServersServlet extends BasicServlet {
     }
     final long MINUTES = 3 * 60 * 1000;
     tServerList.addSortableColumn("Server", new TServerLinkType(), null);
-    tServerList.addSortableColumn("Hosted&nbsp;Tablets", new NumberType<Integer>(0, Integer.MAX_VALUE), null);
+    tServerList.addSortableColumn("Hosted&nbsp;Tablets", new NumberType<>(0, Integer.MAX_VALUE), null);
     tServerList.addSortableColumn("Last&nbsp;Contact", new DurationType(0l, (long) Math.min(avgLastContact * 4, MINUTES)), null);
     tServerList.addSortableColumn("Entries", new NumberType<Long>(), "The number of key/value pairs.");
     tServerList.addSortableColumn("Ingest", new NumberType<Long>(), "The number of key/value pairs inserted. (Note that deletes are also 'inserted')");
@@ -336,7 +336,7 @@ public class TServersServlet extends BasicServlet {
             + "Major compactions are the operations where many smaller files are grouped into a larger file, eliminating duplicates and cleaning up deletes.");
     tServerList.addSortableColumn("Index Cache<br />Hit Rate", new PercentageType(), "The recent index cache hit rate.");
     tServerList.addSortableColumn("Data Cache<br />Hit Rate", new PercentageType(), "The recent data cache hit rate.");
-    tServerList.addSortableColumn("OS&nbsp;Load", new NumberType<Double>(0., guessHighLoad * 1., 0., guessHighLoad * 3.),
+    tServerList.addSortableColumn("OS&nbsp;Load", new NumberType<>(0., guessHighLoad * 1., 0., guessHighLoad * 3.),
         "The Unix one minute load average. The average number of processes in the run queue over a one minute interval.");
 
     log.debug("tableId: " + tableId);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/TablesServlet.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/TablesServlet.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/TablesServlet.java
index 1431698..c1751d8 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/TablesServlet.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/TablesServlet.java
@@ -84,7 +84,7 @@ public class TablesServlet extends BasicServlet {
     tableList.addSortableColumn("Table&nbsp;Name", new TableLinkType(), null);
     tableList.addSortableColumn("State", new TableStateType(), null);
     tableList.addSortableColumn("#&nbsp;Tablets", new NumberType<Integer>(), "Tables are broken down into ranges of rows called tablets.");
-    tableList.addSortableColumn("#&nbsp;Offline<br />Tablets", new NumberType<Integer>(0, 0), "Tablets unavailable for query or ingest.  "
+    tableList.addSortableColumn("#&nbsp;Offline<br />Tablets", new NumberType<>(0, 0), "Tablets unavailable for query or ingest.  "
         + "May be a transient condition when tablets are moved for balancing.");
     tableList.addSortableColumn("Entries", new NumberType<Long>(), "Key/value pairs over each instance, table or tablet.");
     tableList.addSortableColumn("Entries<br />In&nbsp;Memory", new NumberType<Long>(),
@@ -106,7 +106,7 @@ public class TablesServlet extends BasicServlet {
         "Gathering up many small files and rewriting them as one larger file is called a 'Major Compaction'. "
             + "Major Compactions are performed as a consequence of new files created from Minor Compactions and Bulk Load operations.  "
             + "They reduce the number of files used during queries.");
-    SortedMap<String,TableInfo> tableStats = new TreeMap<String,TableInfo>();
+    SortedMap<String,TableInfo> tableStats = new TreeMap<>();
 
     if (Monitor.getMmi() != null && Monitor.getMmi().tableMap != null)
       for (Entry<String,TableInfo> te : Monitor.getMmi().tableMap.entrySet())
@@ -145,7 +145,7 @@ public class TablesServlet extends BasicServlet {
   private void doTableDetails(HttpServletRequest req, StringBuilder sb, Map<String,String> tidToNameMap, String tableId) {
     String displayName = Tables.getPrintableTableNameFromId(tidToNameMap, tableId);
     Instance instance = Monitor.getContext().getInstance();
-    TreeSet<String> locs = new TreeSet<String>();
+    TreeSet<String> locs = new TreeSet<>();
     if (RootTable.ID.equals(tableId)) {
       locs.add(instance.getRootTabletLocation());
     } else {
@@ -168,7 +168,7 @@ public class TablesServlet extends BasicServlet {
 
     log.debug("Locs: " + locs);
 
-    List<TabletServerStatus> tservers = new ArrayList<TabletServerStatus>();
+    List<TabletServerStatus> tservers = new ArrayList<>();
     if (Monitor.getMmi() != null) {
       for (TabletServerStatus tss : Monitor.getMmi().tServerInfo) {
         try {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/VisServlet.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/VisServlet.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/VisServlet.java
index eedf598..298dcdf 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/VisServlet.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/VisServlet.java
@@ -150,7 +150,7 @@ public class VisServlet extends BasicServlet {
         cfg.spacing = 80;
     }
 
-    ArrayList<TabletServerStatus> tservers = new ArrayList<TabletServerStatus>();
+    ArrayList<TabletServerStatus> tservers = new ArrayList<>();
     if (Monitor.getMmi() != null)
       tservers.addAll(Monitor.getMmi().tServerInfo);
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/XMLServlet.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/XMLServlet.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/XMLServlet.java
index 1662069..ea0ee59 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/XMLServlet.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/XMLServlet.java
@@ -63,7 +63,7 @@ public class XMLServlet extends BasicServlet {
       sb.append("</servers>\n");
       return;
     }
-    SortedMap<String,TableInfo> tableStats = new TreeMap<String,TableInfo>(Monitor.getMmi().tableMap);
+    SortedMap<String,TableInfo> tableStats = new TreeMap<>(Monitor.getMmi().tableMap);
 
     for (TabletServerStatus status : Monitor.getMmi().tServerInfo) {
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/Basic.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/Basic.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/Basic.java
index 2143766..af68a98 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/Basic.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/Basic.java
@@ -141,7 +141,7 @@ abstract class Basic extends BasicServlet {
       scanner = getScanner(table, principal, at, sb);
     }
 
-    return new AbstractMap.SimpleEntry<Scanner,UserGroupInformation>(scanner, traceUgi);
+    return new AbstractMap.SimpleEntry<>(scanner, traceUgi);
   }
 
   private Scanner getScanner(String table, String principal, AuthenticationToken at, StringBuilder sb) throws AccumuloException, AccumuloSecurityException {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/Summary.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/Summary.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/Summary.java
index 5c58375..56da108 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/Summary.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/Summary.java
@@ -168,7 +168,7 @@ public class Summary extends Basic {
     }
     Range range = getRangeForTrace(minutes);
     scanner.setRange(range);
-    final Map<String,Stats> summary = new TreeMap<String,Stats>();
+    final Map<String,Stats> summary = new TreeMap<>();
     if (null != pair.getValue()) {
       pair.getValue().doAs(new PrivilegedAction<Void>() {
         @Override

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/monitor/src/main/java/org/apache/accumulo/monitor/util/Table.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/util/Table.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/util/Table.java
index caf70a1..e7bc30b 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/util/Table.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/util/Table.java
@@ -43,8 +43,8 @@ public class Table {
     this.caption = caption;
     this.captionclass = captionClass;
     this.subcaption = null;
-    this.columns = new ArrayList<TableColumn<?>>();
-    this.rows = new ArrayList<TableRow>();
+    this.columns = new ArrayList<>();
+    this.rows = new ArrayList<>();
   }
 
   public synchronized void setSubCaption(String subcaption) {
@@ -59,9 +59,9 @@ public class Table {
 
   private synchronized <T> void addColumn(String title, CellType<T> type, String legend, boolean sortable) {
     if (type == null)
-      type = new StringType<T>();
+      type = new StringType<>();
     type.setSortable(sortable);
-    addColumn(new TableColumn<T>(title, type, legend));
+    addColumn(new TableColumn<>(title, type, legend));
   }
 
   public synchronized <T> void addUnsortableColumn(String title, CellType<T> type, String legend) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/monitor/src/main/java/org/apache/accumulo/monitor/util/TableRow.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/util/TableRow.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/util/TableRow.java
index c1ce1c5..42853f4 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/util/TableRow.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/util/TableRow.java
@@ -25,7 +25,7 @@ public class TableRow {
 
   TableRow(int size) {
     this.size = size;
-    this.row = new ArrayList<Object>(size);
+    this.row = new ArrayList<>(size);
   }
 
   public boolean add(Object obj) {
@@ -47,7 +47,7 @@ public class TableRow {
   }
 
   public static <T> Comparator<TableRow> getComparator(int index, Comparator<T> comp) {
-    return new TableRowComparator<T>(index, comp);
+    return new TableRowComparator<>(index, comp);
   }
 
   private static class TableRowComparator<T> implements Comparator<TableRow> {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/monitor/src/test/java/org/apache/accumulo/monitor/ShowTraceLinkTypeTest.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/test/java/org/apache/accumulo/monitor/ShowTraceLinkTypeTest.java b/server/monitor/src/test/java/org/apache/accumulo/monitor/ShowTraceLinkTypeTest.java
index 786e8e3..1201d92 100644
--- a/server/monitor/src/test/java/org/apache/accumulo/monitor/ShowTraceLinkTypeTest.java
+++ b/server/monitor/src/test/java/org/apache/accumulo/monitor/ShowTraceLinkTypeTest.java
@@ -31,7 +31,7 @@ public class ShowTraceLinkTypeTest {
 
   @Test
   public void testTraceSortingForMonitor() {
-    ArrayList<RemoteSpan> spans = new ArrayList<RemoteSpan>(10), expectedOrdering = new ArrayList<RemoteSpan>(10);
+    ArrayList<RemoteSpan> spans = new ArrayList<>(10), expectedOrdering = new ArrayList<>(10);
 
     // "Random" ordering
     spans.add(rs(55l, 75l, "desc5"));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/monitor/src/test/java/org/apache/accumulo/monitor/ZooKeeperStatusTest.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/test/java/org/apache/accumulo/monitor/ZooKeeperStatusTest.java b/server/monitor/src/test/java/org/apache/accumulo/monitor/ZooKeeperStatusTest.java
index 7f56931..88a0c5a 100644
--- a/server/monitor/src/test/java/org/apache/accumulo/monitor/ZooKeeperStatusTest.java
+++ b/server/monitor/src/test/java/org/apache/accumulo/monitor/ZooKeeperStatusTest.java
@@ -32,13 +32,13 @@ public class ZooKeeperStatusTest {
     List<String> expectedHosts = Arrays.asList("rack1node1", "rack2node1", "rack4node1", "rack4node4");
 
     // Add the states in a not correctly sorted order
-    TreeSet<ZooKeeperState> states = new TreeSet<ZooKeeperState>();
+    TreeSet<ZooKeeperState> states = new TreeSet<>();
     states.add(new ZooKeeperState("rack4node4", "leader", 10));
     states.add(new ZooKeeperState("rack4node1", "follower", 10));
     states.add(new ZooKeeperState("rack1node1", "follower", 10));
     states.add(new ZooKeeperState("rack2node1", "follower", 10));
 
-    List<String> actualHosts = new ArrayList<String>(4);
+    List<String> actualHosts = new ArrayList<>(4);
     for (ZooKeeperState state : states) {
       actualHosts.add(state.keeper);
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/tracer/src/main/java/org/apache/accumulo/tracer/AsyncSpanReceiver.java
----------------------------------------------------------------------
diff --git a/server/tracer/src/main/java/org/apache/accumulo/tracer/AsyncSpanReceiver.java b/server/tracer/src/main/java/org/apache/accumulo/tracer/AsyncSpanReceiver.java
index a35734d..be924ba 100644
--- a/server/tracer/src/main/java/org/apache/accumulo/tracer/AsyncSpanReceiver.java
+++ b/server/tracer/src/main/java/org/apache/accumulo/tracer/AsyncSpanReceiver.java
@@ -57,7 +57,7 @@ public abstract class AsyncSpanReceiver<SpanKey,Destination> implements SpanRece
   public static final String QUEUE_SIZE = "tracer.queue.size";
   public static final String SPAN_MIN_MS = "tracer.span.min.ms";
 
-  private final Map<SpanKey,Destination> clients = new HashMap<SpanKey,Destination>();
+  private final Map<SpanKey,Destination> clients = new HashMap<>();
 
   protected String host = null;
   protected String service = null;
@@ -69,7 +69,7 @@ public abstract class AsyncSpanReceiver<SpanKey,Destination> implements SpanRece
   protected abstract SpanKey getSpanKey(Map<String,String> data);
 
   Timer timer = new Timer("SpanSender", true);
-  protected final AbstractQueue<RemoteSpan> sendQueue = new ConcurrentLinkedQueue<RemoteSpan>();
+  protected final AbstractQueue<RemoteSpan> sendQueue = new ConcurrentLinkedQueue<>();
   protected final AtomicInteger sendQueueSize = new AtomicInteger(0);
   int maxQueueSize = 5000;
   long lastNotificationOfDroppedSpans = 0;
@@ -150,7 +150,7 @@ public abstract class AsyncSpanReceiver<SpanKey,Destination> implements SpanRece
   public static List<Annotation> convertToAnnotations(List<TimelineAnnotation> annotations) {
     if (annotations == null)
       return null;
-    List<Annotation> result = new ArrayList<Annotation>();
+    List<Annotation> result = new ArrayList<>();
     for (TimelineAnnotation annotation : annotations) {
       result.add(new Annotation(annotation.getTime(), annotation.getMessage()));
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/tracer/src/main/java/org/apache/accumulo/tracer/SpanTree.java
----------------------------------------------------------------------
diff --git a/server/tracer/src/main/java/org/apache/accumulo/tracer/SpanTree.java b/server/tracer/src/main/java/org/apache/accumulo/tracer/SpanTree.java
index c7682c1..05c3212 100644
--- a/server/tracer/src/main/java/org/apache/accumulo/tracer/SpanTree.java
+++ b/server/tracer/src/main/java/org/apache/accumulo/tracer/SpanTree.java
@@ -27,8 +27,8 @@ import org.apache.accumulo.tracer.thrift.RemoteSpan;
 import org.apache.htrace.Span;
 
 public class SpanTree {
-  final Map<Long,List<Long>> parentChildren = new HashMap<Long,List<Long>>();
-  public final Map<Long,RemoteSpan> nodes = new HashMap<Long,RemoteSpan>();
+  final Map<Long,List<Long>> parentChildren = new HashMap<>();
+  public final Map<Long,RemoteSpan> nodes = new HashMap<>();
 
   public SpanTree() {}
 
@@ -40,7 +40,7 @@ public class SpanTree {
   }
 
   public Set<Long> visit(SpanTreeVisitor visitor) {
-    Set<Long> visited = new HashSet<Long>();
+    Set<Long> visited = new HashSet<>();
     List<Long> root = parentChildren.get(Long.valueOf(Span.ROOT_SPAN_ID));
     if (root == null || root.isEmpty())
       return visited;
@@ -57,7 +57,7 @@ public class SpanTree {
     if (visited.contains(node.spanId))
       return;
     visited.add(node.spanId);
-    List<RemoteSpan> children = new ArrayList<RemoteSpan>();
+    List<RemoteSpan> children = new ArrayList<>();
     List<Long> childrenIds = parentChildren.get(node.spanId);
     if (childrenIds != null) {
       for (Long childId : childrenIds) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceDump.java
----------------------------------------------------------------------
diff --git a/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceDump.java b/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceDump.java
index 0a87469..b5c00ed 100644
--- a/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceDump.java
+++ b/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceDump.java
@@ -52,7 +52,7 @@ public class TraceDump {
     @Parameter(names = {"-d", "--dump"}, description = "Dump all traces")
     boolean dump = false;
     @Parameter(description = " <trace id> { <trace id> ... }")
-    List<String> traceIds = new ArrayList<String>();
+    List<String> traceIds = new ArrayList<>();
 
     Opts() {
       super("trace");
@@ -74,7 +74,7 @@ public class TraceDump {
   }
 
   public static List<RemoteSpan> sortByStart(Collection<RemoteSpan> spans) {
-    List<RemoteSpan> spanList = new ArrayList<RemoteSpan>(spans);
+    List<RemoteSpan> spanList = new ArrayList<>(spans);
     Collections.sort(spanList, new Comparator<RemoteSpan>() {
       @Override
       public int compare(RemoteSpan o1, RemoteSpan o2) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java
----------------------------------------------------------------------
diff --git a/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java b/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java
index e74aef5..45b6669 100644
--- a/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java
+++ b/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java
@@ -253,7 +253,7 @@ public class TraceServer implements Watcher {
     options.processor(new Processor<Iface>(new Receiver()));
     server = new TThreadPoolServer(options);
     registerInZooKeeper(sock.getInetAddress().getHostAddress() + ":" + sock.getLocalPort(), conf.get(Property.TRACE_ZK_PATH));
-    writer = new AtomicReference<BatchWriter>(this.connector.createBatchWriter(tableName,
+    writer = new AtomicReference<>(this.connector.createBatchWriter(tableName,
         new BatchWriterConfig().setMaxLatency(BATCH_WRITER_MAX_LATENCY, TimeUnit.SECONDS)));
   }
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/tracer/src/main/java/org/apache/accumulo/tracer/ZooTraceClient.java
----------------------------------------------------------------------
diff --git a/server/tracer/src/main/java/org/apache/accumulo/tracer/ZooTraceClient.java b/server/tracer/src/main/java/org/apache/accumulo/tracer/ZooTraceClient.java
index aa5a9ee..6954983 100644
--- a/server/tracer/src/main/java/org/apache/accumulo/tracer/ZooTraceClient.java
+++ b/server/tracer/src/main/java/org/apache/accumulo/tracer/ZooTraceClient.java
@@ -51,7 +51,7 @@ public class ZooTraceClient extends SendSpansViaThrift implements Watcher {
   String path;
   boolean pathExists = false;
   final Random random = new Random();
-  final List<String> hosts = new ArrayList<String>();
+  final List<String> hosts = new ArrayList<>();
   long retryPause = 5000l;
 
   // Visible for testing
@@ -144,7 +144,7 @@ public class ZooTraceClient extends SendSpansViaThrift implements Watcher {
   synchronized private void updateHosts(String path, List<String> children) {
     log.debug("Scanning trace hosts in zookeeper: " + path);
     try {
-      List<String> hosts = new ArrayList<String>();
+      List<String> hosts = new ArrayList<>();
       for (String child : children) {
         byte[] data = zoo.getData(path + "/" + child, null);
         hosts.add(new String(data, UTF_8));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/tracer/src/test/java/org/apache/accumulo/tracer/TracerTest.java
----------------------------------------------------------------------
diff --git a/server/tracer/src/test/java/org/apache/accumulo/tracer/TracerTest.java b/server/tracer/src/test/java/org/apache/accumulo/tracer/TracerTest.java
index 703670f..6dcf7a4 100644
--- a/server/tracer/src/test/java/org/apache/accumulo/tracer/TracerTest.java
+++ b/server/tracer/src/test/java/org/apache/accumulo/tracer/TracerTest.java
@@ -79,7 +79,7 @@ public class TracerTest {
   }
 
   static class TestReceiver implements SpanReceiver {
-    public Map<Long,List<SpanStruct>> traces = new HashMap<Long,List<SpanStruct>>();
+    public Map<Long,List<SpanStruct>> traces = new HashMap<>();
 
     public TestReceiver() {}
 


[05/32] accumulo git commit: ACCUMULO-4357 Remove unneeded code for readability

Posted by ct...@apache.org.
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/tserver/src/main/java/org/apache/accumulo/tserver/CompactionQueue.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/CompactionQueue.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/CompactionQueue.java
index f87131e..3d820dd 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/CompactionQueue.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/CompactionQueue.java
@@ -33,7 +33,7 @@ import org.apache.htrace.wrappers.TraceRunnable;
  */
 class CompactionQueue extends AbstractQueue<TraceRunnable> implements BlockingQueue<TraceRunnable> {
 
-  private List<TraceRunnable> task = new LinkedList<TraceRunnable>();
+  private List<TraceRunnable> task = new LinkedList<>();
 
   private static final Comparator<TraceRunnable> comparator = new Comparator<TraceRunnable>() {
     @SuppressWarnings("unchecked")

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/tserver/src/main/java/org/apache/accumulo/tserver/ConditionalMutationSet.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/ConditionalMutationSet.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/ConditionalMutationSet.java
index 82e5057..e1a8de8 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/ConditionalMutationSet.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/ConditionalMutationSet.java
@@ -54,8 +54,8 @@ public class ConditionalMutationSet {
   static void defer(Map<KeyExtent,List<ServerConditionalMutation>> updates, Map<KeyExtent,List<ServerConditionalMutation>> deferredMutations, DeferFilter filter) {
     for (Entry<KeyExtent,List<ServerConditionalMutation>> entry : updates.entrySet()) {
       List<ServerConditionalMutation> scml = entry.getValue();
-      List<ServerConditionalMutation> okMutations = new ArrayList<ServerConditionalMutation>(scml.size());
-      List<ServerConditionalMutation> deferred = new ArrayList<ServerConditionalMutation>();
+      List<ServerConditionalMutation> okMutations = new ArrayList<>(scml.size());
+      List<ServerConditionalMutation> deferred = new ArrayList<>();
       filter.defer(scml, okMutations, deferred);
 
       if (deferred.size() > 0) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/tserver/src/main/java/org/apache/accumulo/tserver/FileManager.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/FileManager.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/FileManager.java
index 699b5a7..8bc0fed 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/FileManager.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/FileManager.java
@@ -125,7 +125,7 @@ public class FileManager {
 
       long curTime = System.currentTimeMillis();
 
-      ArrayList<FileSKVIterator> filesToClose = new ArrayList<FileSKVIterator>();
+      ArrayList<FileSKVIterator> filesToClose = new ArrayList<>();
 
       // determine which files to close in a sync block, and then close the
       // files outside of the sync block
@@ -176,8 +176,8 @@ public class FileManager {
     this.maxOpen = maxOpen;
     this.fs = fs;
 
-    this.openFiles = new HashMap<String,List<OpenReader>>();
-    this.reservedReaders = new HashMap<FileSKVIterator,String>();
+    this.openFiles = new HashMap<>();
+    this.reservedReaders = new HashMap<>();
 
     this.maxIdleTime = context.getConfiguration().getTimeInMillis(Property.TSERV_MAX_IDLE);
     SimpleTimer.getInstance(context.getConfiguration()).schedule(new IdleFileCloser(), maxIdleTime, maxIdleTime / 2);
@@ -196,7 +196,7 @@ public class FileManager {
 
   private List<FileSKVIterator> takeLRUOpenFiles(int numToTake) {
 
-    ArrayList<OpenReader> openReaders = new ArrayList<OpenReader>();
+    ArrayList<OpenReader> openReaders = new ArrayList<>();
 
     for (Entry<String,List<OpenReader>> entry : openFiles.entrySet()) {
       openReaders.addAll(entry.getValue());
@@ -204,7 +204,7 @@ public class FileManager {
 
     Collections.sort(openReaders);
 
-    ArrayList<FileSKVIterator> ret = new ArrayList<FileSKVIterator>();
+    ArrayList<FileSKVIterator> ret = new ArrayList<>();
 
     for (int i = 0; i < numToTake && i < openReaders.size(); i++) {
       OpenReader or = openReaders.get(i);
@@ -227,7 +227,7 @@ public class FileManager {
   private static <T> List<T> getFileList(String file, Map<String,List<T>> files) {
     List<T> ofl = files.get(file);
     if (ofl == null) {
-      ofl = new ArrayList<T>();
+      ofl = new ArrayList<>();
       files.put(file, ofl);
     }
 
@@ -245,7 +245,7 @@ public class FileManager {
   }
 
   private List<String> takeOpenFiles(Collection<String> files, List<FileSKVIterator> reservedFiles, Map<FileSKVIterator,String> readersReserved) {
-    List<String> filesToOpen = new LinkedList<String>(files);
+    List<String> filesToOpen = new LinkedList<>(files);
     for (Iterator<String> iterator = filesToOpen.iterator(); iterator.hasNext();) {
       String file = iterator.next();
 
@@ -280,8 +280,8 @@ public class FileManager {
 
     List<String> filesToOpen = null;
     List<FileSKVIterator> filesToClose = Collections.emptyList();
-    List<FileSKVIterator> reservedFiles = new ArrayList<FileSKVIterator>();
-    Map<FileSKVIterator,String> readersReserved = new HashMap<FileSKVIterator,String>();
+    List<FileSKVIterator> reservedFiles = new ArrayList<>();
+    Map<FileSKVIterator,String> readersReserved = new HashMap<>();
 
     if (!tablet.isMeta()) {
       filePermits.acquireUninterruptibly(files.size());
@@ -401,7 +401,7 @@ public class FileManager {
     FileDataSource(String file, SortedKeyValueIterator<Key,Value> iter) {
       this.file = file;
       this.iter = iter;
-      this.deepCopies = new ArrayList<FileManager.FileDataSource>();
+      this.deepCopies = new ArrayList<>();
     }
 
     public FileDataSource(IteratorEnvironment env, SortedKeyValueIterator<Key,Value> deepCopy, ArrayList<FileDataSource> deepCopies) {
@@ -470,8 +470,8 @@ public class FileManager {
     private boolean continueOnFailure;
 
     ScanFileManager(KeyExtent tablet) {
-      tabletReservedReaders = new ArrayList<FileSKVIterator>();
-      dataSources = new ArrayList<FileDataSource>();
+      tabletReservedReaders = new ArrayList<>();
+      dataSources = new ArrayList<>();
       this.tablet = tablet;
 
       continueOnFailure = context.getServerConfigurationFactory().getTableConfiguration(tablet).getBoolean(Property.TABLE_FAILURES_IGNORE);
@@ -482,7 +482,7 @@ public class FileManager {
     }
 
     private List<FileSKVIterator> openFileRefs(Collection<FileRef> files) throws TooManyFilesException, IOException {
-      List<String> strings = new ArrayList<String>(files.size());
+      List<String> strings = new ArrayList<>(files.size());
       for (FileRef ref : files)
         strings.add(ref.path().toString());
       return openFiles(strings);
@@ -508,7 +508,7 @@ public class FileManager {
 
       List<FileSKVIterator> newlyReservedReaders = openFileRefs(files.keySet());
 
-      ArrayList<InterruptibleIterator> iters = new ArrayList<InterruptibleIterator>();
+      ArrayList<InterruptibleIterator> iters = new ArrayList<>();
 
       for (FileSKVIterator reader : newlyReservedReaders) {
         String filename = getReservedReadeFilename(reader);
@@ -554,17 +554,17 @@ public class FileManager {
       if (tabletReservedReaders.size() != 0)
         throw new IllegalStateException();
 
-      Collection<String> files = new ArrayList<String>();
+      Collection<String> files = new ArrayList<>();
       for (FileDataSource fds : dataSources)
         files.add(fds.file);
 
       List<FileSKVIterator> newlyReservedReaders = openFiles(files);
-      Map<String,List<FileSKVIterator>> map = new HashMap<String,List<FileSKVIterator>>();
+      Map<String,List<FileSKVIterator>> map = new HashMap<>();
       for (FileSKVIterator reader : newlyReservedReaders) {
         String fileName = getReservedReadeFilename(reader);
         List<FileSKVIterator> list = map.get(fileName);
         if (list == null) {
-          list = new LinkedList<FileSKVIterator>();
+          list = new LinkedList<>();
           map.put(fileName, list);
         }
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/tserver/src/main/java/org/apache/accumulo/tserver/InMemoryMap.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/InMemoryMap.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/InMemoryMap.java
index a87586b..c1ae9e6 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/InMemoryMap.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/InMemoryMap.java
@@ -297,7 +297,7 @@ public class InMemoryMap {
       this.groupFams = new PreAllocatedArray<>(groups.size());
       this.maps = new SimpleMap[groups.size() + 1];
       this.partitioned = new PreAllocatedArray<>(groups.size() + 1);
-      this.nonDefaultColumnFamilies = new HashSet<ByteSequence>();
+      this.nonDefaultColumnFamilies = new HashSet<>();
 
       for (int i = 0; i < maps.length; i++) {
         maps[i] = newMap(useNativeMap);
@@ -305,7 +305,7 @@ public class InMemoryMap {
 
       int count = 0;
       for (Set<ByteSequence> cfset : groups.values()) {
-        HashMap<ByteSequence,MutableLong> map = new HashMap<ByteSequence,MutableLong>();
+        HashMap<ByteSequence,MutableLong> map = new HashMap<>();
         for (ByteSequence bs : cfset)
           map.put(bs, new MutableLong(1));
         this.groupFams.set(count++, map);
@@ -394,7 +394,7 @@ public class InMemoryMap {
   }
 
   private static class DefaultMap implements SimpleMap {
-    private ConcurrentSkipListMap<Key,Value> map = new ConcurrentSkipListMap<Key,Value>(new MemKeyComparator());
+    private ConcurrentSkipListMap<Key,Value> map = new ConcurrentSkipListMap<>(new MemKeyComparator());
     private AtomicLong bytesInMemory = new AtomicLong();
     private AtomicInteger size = new AtomicInteger();
 
@@ -809,7 +809,7 @@ public class InMemoryMap {
 
         InterruptibleIterator iter = map.skvIterator(null);
 
-        HashSet<ByteSequence> allfams = new HashSet<ByteSequence>();
+        HashSet<ByteSequence> allfams = new HashSet<>();
 
         for (Entry<String,Set<ByteSequence>> entry : lggroups.entrySet()) {
           allfams.addAll(entry.getValue());

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/tserver/src/main/java/org/apache/accumulo/tserver/NativeMap.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/NativeMap.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/NativeMap.java
index 3c00b67..00f6ba8 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/NativeMap.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/NativeMap.java
@@ -69,7 +69,7 @@ public class NativeMap implements Iterable<Map.Entry<Key,Value>> {
   // Load native library
   static {
     // Check standard directories
-    List<File> directories = new ArrayList<File>(Arrays.asList(new File[] {new File("/usr/lib64"), new File("/usr/lib")}));
+    List<File> directories = new ArrayList<>(Arrays.asList(new File[] {new File("/usr/lib64"), new File("/usr/lib")}));
     // Check in ACCUMULO_HOME location, too
     String envAccumuloHome = System.getenv("ACCUMULO_HOME");
     if (envAccumuloHome != null) {
@@ -106,7 +106,7 @@ public class NativeMap implements Iterable<Map.Entry<Key,Value>> {
   public static void loadNativeLib(List<File> searchPath) {
     if (!isLoaded()) {
       List<String> names = getValidLibraryNames();
-      List<File> tryList = new ArrayList<File>(searchPath.size() * names.size());
+      List<File> tryList = new ArrayList<>(searchPath.size() * names.size());
 
       for (File p : searchPath)
         if (p.exists() && p.isDirectory())
@@ -131,7 +131,7 @@ public class NativeMap implements Iterable<Map.Entry<Key,Value>> {
   }
 
   private static List<String> getValidLibraryNames() {
-    ArrayList<String> names = new ArrayList<String>(3);
+    ArrayList<String> names = new ArrayList<>(3);
 
     String libname = System.mapLibraryName("accumulo");
     names.add(libname);
@@ -199,7 +199,7 @@ public class NativeMap implements Iterable<Map.Entry<Key,Value>> {
   private static synchronized long createNativeMap() {
 
     if (!init) {
-      allocatedNativeMaps = new HashSet<Long>();
+      allocatedNativeMaps = new HashSet<>();
 
       Runnable r = new Runnable() {
         @Override
@@ -452,7 +452,7 @@ public class NativeMap implements Iterable<Map.Entry<Key,Value>> {
 
       hasNext = nmiNext(nmiPointer, fieldsLens);
 
-      return new SimpleImmutableEntry<Key,Value>(k, v);
+      return new SimpleImmutableEntry<>(k, v);
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/tserver/src/main/java/org/apache/accumulo/tserver/RowLocks.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/RowLocks.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/RowLocks.java
index 03707d1..62f321e 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/RowLocks.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/RowLocks.java
@@ -34,7 +34,7 @@ import org.apache.accumulo.tserver.data.ServerConditionalMutation;
  */
 class RowLocks {
 
-  private Map<ByteSequence,RowLock> rowLocks = new HashMap<ByteSequence,RowLock>();
+  private Map<ByteSequence,RowLock> rowLocks = new HashMap<>();
 
   static class RowLock {
     ReentrantLock rlock;
@@ -82,7 +82,7 @@ class RowLocks {
   }
 
   List<RowLock> acquireRowlocks(Map<KeyExtent,List<ServerConditionalMutation>> updates, Map<KeyExtent,List<ServerConditionalMutation>> deferred) {
-    ArrayList<RowLock> locks = new ArrayList<RowLock>();
+    ArrayList<RowLock> locks = new ArrayList<>();
 
     // assume that mutations are in sorted order to avoid deadlock
     synchronized (rowLocks) {
@@ -100,7 +100,7 @@ class RowLocks {
       for (RowLock rowLock : locks) {
         if (!rowLock.tryLock()) {
           if (rowsNotLocked == null)
-            rowsNotLocked = new HashSet<ByteSequence>();
+            rowsNotLocked = new HashSet<>();
           rowsNotLocked.add(rowLock.rowSeq);
         }
       }
@@ -126,8 +126,8 @@ class RowLocks {
         }
       });
 
-      ArrayList<RowLock> filteredLocks = new ArrayList<RowLock>();
-      ArrayList<RowLock> locksToReturn = new ArrayList<RowLock>();
+      ArrayList<RowLock> filteredLocks = new ArrayList<>();
+      ArrayList<RowLock> locksToReturn = new ArrayList<>();
       for (RowLock rowLock : locks) {
         if (rowsNotLocked.contains(rowLock.rowSeq)) {
           locksToReturn.add(rowLock);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletIteratorEnvironment.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletIteratorEnvironment.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletIteratorEnvironment.java
index f9081b4..445391e 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletIteratorEnvironment.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletIteratorEnvironment.java
@@ -97,7 +97,7 @@ public class TabletIteratorEnvironment implements IteratorEnvironment {
     this.config = config;
     this.fullMajorCompaction = fullMajC;
     this.authorizations = Authorizations.EMPTY;
-    this.topLevelIterators = new ArrayList<SortedKeyValueIterator<Key,Value>>();
+    this.topLevelIterators = new ArrayList<>();
   }
 
   @Override
@@ -138,7 +138,7 @@ public class TabletIteratorEnvironment implements IteratorEnvironment {
   public SortedKeyValueIterator<Key,Value> getTopLevelIterator(SortedKeyValueIterator<Key,Value> iter) {
     if (topLevelIterators.isEmpty())
       return iter;
-    ArrayList<SortedKeyValueIterator<Key,Value>> allIters = new ArrayList<SortedKeyValueIterator<Key,Value>>(topLevelIterators);
+    ArrayList<SortedKeyValueIterator<Key,Value>> allIters = new ArrayList<>(topLevelIterators);
     allIters.add(iter);
     return new MultiIterator(allIters, false);
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
index 5626f12..94e2ed9 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
@@ -301,7 +301,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
   private final TabletServerResourceManager resourceManager;
   private final SecurityOperation security;
 
-  private final BlockingDeque<MasterMessage> masterMessages = new LinkedBlockingDeque<MasterMessage>();
+  private final BlockingDeque<MasterMessage> masterMessages = new LinkedBlockingDeque<>();
 
   private Thread majorCompactorThread;
 
@@ -430,12 +430,12 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
       if (!security.canPerformSystemActions(credentials))
         throw new ThriftSecurityException(credentials.getPrincipal(), SecurityErrorCode.PERMISSION_DENIED);
 
-      List<TKeyExtent> failures = new ArrayList<TKeyExtent>();
+      List<TKeyExtent> failures = new ArrayList<>();
 
       for (Entry<TKeyExtent,Map<String,MapFileInfo>> entry : files.entrySet()) {
         TKeyExtent tke = entry.getKey();
         Map<String,MapFileInfo> fileMap = entry.getValue();
-        Map<FileRef,MapFileInfo> fileRefMap = new HashMap<FileRef,MapFileInfo>();
+        Map<FileRef,MapFileInfo> fileRefMap = new HashMap<>();
         for (Entry<String,MapFileInfo> mapping : fileMap.entrySet()) {
           Path path = new Path(mapping.getKey());
           FileSystem ns = fs.getVolumeByPath(path).getFileSystem();
@@ -491,7 +491,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
       if (tablet == null)
         throw new NotServingTabletException(textent);
 
-      Set<Column> columnSet = new HashSet<Column>();
+      Set<Column> columnSet = new HashSet<>();
       for (TColumn tcolumn : columns) {
         columnSet.add(new Column(tcolumn));
       }
@@ -616,7 +616,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
         List<IterInfo> ssiList, Map<String,Map<String,String>> ssio, List<ByteBuffer> authorizations, boolean waitForWrites,
         TSamplerConfiguration tSamplerConfig, long batchTimeOut, String context) throws ThriftSecurityException, TSampleNotPresentException {
       // find all of the tables that need to be scanned
-      final HashSet<String> tables = new HashSet<String>();
+      final HashSet<String> tables = new HashSet<>();
       for (TKeyExtent keyExtent : tbatch.keySet()) {
         tables.add(new String(keyExtent.getTable(), UTF_8));
       }
@@ -636,8 +636,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
         log.error("{} is not authorized", credentials.getPrincipal(), tse);
         throw tse;
       }
-      Map<KeyExtent,List<Range>> batch = Translator.translate(tbatch, new TKeyExtentTranslator(), new Translator.ListTranslator<TRange,Range>(
-          new TRangeTranslator()));
+      Map<KeyExtent,List<Range>> batch = Translator.translate(tbatch, new TKeyExtentTranslator(), new Translator.ListTranslator<>(new TRangeTranslator()));
 
       // This is used to determine which thread pool to use
       KeyExtent threadPoolExtent = batch.keySet().iterator().next();
@@ -839,7 +838,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
     private void flush(UpdateSession us) {
 
       int mutationCount = 0;
-      Map<CommitSession,Mutations> sendables = new HashMap<CommitSession,Mutations>();
+      Map<CommitSession,Mutations> sendables = new HashMap<>();
       Throwable error = null;
 
       long pt1 = System.currentTimeMillis();
@@ -1117,7 +1116,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
             results.add(new TCMResult(scm.getID(), TCMStatus.IGNORED));
           iter.remove();
         } else {
-          final List<ServerConditionalMutation> okMutations = new ArrayList<ServerConditionalMutation>(entry.getValue().size());
+          final List<ServerConditionalMutation> okMutations = new ArrayList<>(entry.getValue().size());
           final List<TCMResult> resultsSubList = results.subList(results.size(), results.size());
 
           ConditionChecker checker = checkerContext.newChecker(entry.getValue(), okMutations, resultsSubList);
@@ -1145,7 +1144,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
     private void writeConditionalMutations(Map<KeyExtent,List<ServerConditionalMutation>> updates, ArrayList<TCMResult> results, ConditionalSession sess) {
       Set<Entry<KeyExtent,List<ServerConditionalMutation>>> es = updates.entrySet();
 
-      Map<CommitSession,Mutations> sendables = new HashMap<CommitSession,Mutations>();
+      Map<CommitSession,Mutations> sendables = new HashMap<>();
 
       boolean sessionCanceled = sess.interruptFlag.get();
 
@@ -1239,7 +1238,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
       // sort each list of mutations, this is done to avoid deadlock and doing seeks in order is more efficient and detect duplicate rows.
       ConditionalMutationSet.sortConditionalMutations(updates);
 
-      Map<KeyExtent,List<ServerConditionalMutation>> deferred = new HashMap<KeyExtent,List<ServerConditionalMutation>>();
+      Map<KeyExtent,List<ServerConditionalMutation>> deferred = new HashMap<>();
 
       // can not process two mutations for the same row, because one will not see what the other writes
       ConditionalMutationSet.deferDuplicatesRows(updates, deferred);
@@ -1309,14 +1308,14 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
       long opid = writeTracker.startWrite(TabletType.type(new KeyExtent(tid, null, null)));
 
       try {
-        Map<KeyExtent,List<ServerConditionalMutation>> updates = Translator.translate(mutations, Translators.TKET,
-            new Translator.ListTranslator<TConditionalMutation,ServerConditionalMutation>(ServerConditionalMutation.TCMT));
+        Map<KeyExtent,List<ServerConditionalMutation>> updates = Translator.translate(mutations, Translators.TKET, new Translator.ListTranslator<>(
+            ServerConditionalMutation.TCMT));
 
         for (KeyExtent ke : updates.keySet())
           if (!ke.getTableId().equals(tid))
             throw new IllegalArgumentException("Unexpected table id " + tid + " != " + ke.getTableId());
 
-        ArrayList<TCMResult> results = new ArrayList<TCMResult>();
+        ArrayList<TCMResult> results = new ArrayList<>();
 
         Map<KeyExtent,List<ServerConditionalMutation>> deferred = conditionalUpdate(cs, updates, results, symbols);
 
@@ -1396,9 +1395,9 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
     public List<TabletStats> getTabletStats(TInfo tinfo, TCredentials credentials, String tableId) throws ThriftSecurityException, TException {
       TreeMap<KeyExtent,Tablet> onlineTabletsCopy;
       synchronized (onlineTablets) {
-        onlineTabletsCopy = new TreeMap<KeyExtent,Tablet>(onlineTablets);
+        onlineTabletsCopy = new TreeMap<>(onlineTablets);
       }
-      List<TabletStats> result = new ArrayList<TabletStats>();
+      List<TabletStats> result = new ArrayList<>();
       String text = tableId;
       KeyExtent start = new KeyExtent(text, new Text(), null);
       for (Entry<KeyExtent,Tablet> entry : onlineTabletsCopy.tailMap(start).entrySet()) {
@@ -1490,7 +1489,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
             Set<KeyExtent> openingOverlapping = KeyExtent.findOverlapping(extent, openingTablets);
             Set<KeyExtent> onlineOverlapping = KeyExtent.findOverlapping(extent, onlineTablets);
 
-            Set<KeyExtent> all = new HashSet<KeyExtent>();
+            Set<KeyExtent> all = new HashSet<>();
             all.addAll(unopenedOverlapping);
             all.addAll(openingOverlapping);
             all.addAll(onlineOverlapping);
@@ -1572,7 +1571,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
         throw new RuntimeException(e);
       }
 
-      ArrayList<Tablet> tabletsToFlush = new ArrayList<Tablet>();
+      ArrayList<Tablet> tabletsToFlush = new ArrayList<>();
 
       KeyExtent ke = new KeyExtent(tableId, ByteBufferUtil.toText(endRow), ByteBufferUtil.toText(startRow));
 
@@ -1694,7 +1693,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
 
       KeyExtent ke = new KeyExtent(tableId, ByteBufferUtil.toText(endRow), ByteBufferUtil.toText(startRow));
 
-      ArrayList<Tablet> tabletsToCompact = new ArrayList<Tablet>();
+      ArrayList<Tablet> tabletsToCompact = new ArrayList<>();
       synchronized (onlineTablets) {
         for (Tablet tablet : onlineTablets.values())
           if (ke.overlaps(tablet.getExtent()))
@@ -1728,7 +1727,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
       }
 
       List<CompactionInfo> compactions = Compactor.getRunningCompactions();
-      List<ActiveCompaction> ret = new ArrayList<ActiveCompaction>(compactions.size());
+      List<ActiveCompaction> ret = new ArrayList<>(compactions.size());
 
       for (CompactionInfo compactionInfo : compactions) {
         ret.add(compactionInfo.toThrift());
@@ -1805,7 +1804,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
         try {
           sleepUninterruptibly(getConfiguration().getTimeInMillis(Property.TSERV_MAJC_DELAY), TimeUnit.MILLISECONDS);
 
-          TreeMap<KeyExtent,Tablet> copyOnlineTablets = new TreeMap<KeyExtent,Tablet>();
+          TreeMap<KeyExtent,Tablet> copyOnlineTablets = new TreeMap<>();
 
           synchronized (onlineTablets) {
             copyOnlineTablets.putAll(onlineTablets); // avoid
@@ -2078,7 +2077,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
 
       // check Metadata table before accepting assignment
       Text locationToOpen = null;
-      SortedMap<Key,Value> tabletsKeyValues = new TreeMap<Key,Value>();
+      SortedMap<Key,Value> tabletsKeyValues = new TreeMap<>();
       try {
         Pair<Text,KeyExtent> pair = verifyTabletInformation(TabletServer.this, extent, TabletServer.this.getTabletSession(), tabletsKeyValues,
             getClientAddressString(), getLock());
@@ -2089,7 +2088,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
               openingTablets.remove(extent);
               openingTablets.notifyAll();
               // it expected that the new extent will overlap the old one... if it does not, it should not be added to unopenedTablets
-              if (!KeyExtent.findOverlapping(extent, new TreeSet<KeyExtent>(Arrays.asList(pair.getSecond()))).contains(pair.getSecond())) {
+              if (!KeyExtent.findOverlapping(extent, new TreeSet<>(Arrays.asList(pair.getSecond()))).contains(pair.getSecond())) {
                 throw new IllegalStateException("Fixed split does not overlap " + extent + " " + pair.getSecond());
               }
               unopenedTablets.add(pair.getSecond());
@@ -2264,9 +2263,9 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
     final Processor<Iface> processor;
     if (ThriftServerType.SASL == getThriftServerType()) {
       Iface tcredProxy = TCredentialsUpdatingWrapper.service(rpcProxy, ThriftClientHandler.class, getConfiguration());
-      processor = new Processor<Iface>(tcredProxy);
+      processor = new Processor<>(tcredProxy);
     } else {
-      processor = new Processor<Iface>(rpcProxy);
+      processor = new Processor<>(rpcProxy);
     }
     HostAndPort address = startServer(getServerConfigurationFactory().getConfiguration(), clientAddress.getHostText(), Property.TSERV_CLIENTPORT, processor,
         "Thrift Client Server");
@@ -2278,7 +2277,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
     final ReplicationServicerHandler handler = new ReplicationServicerHandler(this);
     ReplicationServicer.Iface rpcProxy = RpcWrapper.service(handler, new ReplicationServicer.Processor<ReplicationServicer.Iface>(handler));
     ReplicationServicer.Iface repl = TCredentialsUpdatingWrapper.service(rpcProxy, handler.getClass(), getConfiguration());
-    ReplicationServicer.Processor<ReplicationServicer.Iface> processor = new ReplicationServicer.Processor<ReplicationServicer.Iface>(repl);
+    ReplicationServicer.Processor<ReplicationServicer.Iface> processor = new ReplicationServicer.Processor<>(repl);
     AccumuloConfiguration conf = getServerConfigurationFactory().getConfiguration();
     Property maxMessageSizeProperty = (conf.get(Property.TSERV_MAX_MESSAGE_SIZE) != null ? Property.TSERV_MAX_MESSAGE_SIZE : Property.GENERAL_MAX_MESSAGE_SIZE);
     ServerAddress sp = TServerUtils.startServer(this, clientAddress.getHostText(), Property.REPLICATION_RECEIPT_SERVICE_PORT, processor,
@@ -2574,7 +2573,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
     }
 
     try {
-      return new Pair<Text,KeyExtent>(new Text(MetadataTableUtil.getRootTabletDir()), null);
+      return new Pair<>(new Text(MetadataTableUtil.getRootTabletDir()), null);
     } catch (IOException e) {
       throw new AccumuloException(e);
     }
@@ -2595,7 +2594,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
         TabletsSection.TabletColumnFamily.PREV_ROW_COLUMN, TabletsSection.TabletColumnFamily.SPLIT_RATIO_COLUMN,
         TabletsSection.TabletColumnFamily.OLD_PREV_ROW_COLUMN, TabletsSection.ServerColumnFamily.TIME_COLUMN});
 
-    TreeMap<Key,Value> tkv = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tkv = new TreeMap<>();
     try (ScannerImpl scanner = new ScannerImpl(context, tableToVerify, Authorizations.EMPTY)) {
       scanner.setRange(extent.toMetadataRange());
       for (Entry<Key,Value> entry : scanner)
@@ -2636,7 +2635,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
       }
 
       if (!fke.equals(extent)) {
-        return new Pair<Text,KeyExtent>(null, fke);
+        return new Pair<>(null, fke);
       }
 
       // reread and reverify metadata entries now that metadata entries were fixed
@@ -2644,7 +2643,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
       return verifyTabletInformation(context, fke, instance, tabletsKeyValues, clientAddress, lock);
     }
 
-    return new Pair<Text,KeyExtent>(new Text(dir.get()), null);
+    return new Pair<>(new Text(dir.get()), null);
   }
 
   static Value checkTabletMetadata(KeyExtent extent, TServerInstance instance, SortedMap<Key,Value> tabletsKeyValues, Text metadataEntry)
@@ -2759,7 +2758,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
       public void run() {
         Set<String> contextProperties = getServerConfigurationFactory().getConfiguration().getAllPropertiesWithPrefix(Property.VFS_CONTEXT_CLASSPATH_PROPERTY)
             .keySet();
-        Set<String> configuredContexts = new HashSet<String>();
+        Set<String> configuredContexts = new HashSet<>();
         for (String prop : contextProperties) {
           configuredContexts.add(prop.substring(Property.VFS_CONTEXT_CLASSPATH_PROPERTY.name().length()));
         }
@@ -2793,7 +2792,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
         ArrayList<Tablet> tablets;
 
         synchronized (onlineTablets) {
-          tablets = new ArrayList<Tablet>(onlineTablets.values());
+          tablets = new ArrayList<>(onlineTablets.values());
         }
 
         for (Tablet tablet : tablets) {
@@ -2810,9 +2809,9 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
 
     Map<KeyExtent,Tablet> onlineTabletsCopy;
     synchronized (this.onlineTablets) {
-      onlineTabletsCopy = new HashMap<KeyExtent,Tablet>(this.onlineTablets);
+      onlineTabletsCopy = new HashMap<>(this.onlineTablets);
     }
-    Map<String,TableInfo> tables = new HashMap<String,TableInfo>();
+    Map<String,TableInfo> tables = new HashMap<>();
 
     for (Entry<KeyExtent,Tablet> entry : onlineTabletsCopy.entrySet()) {
       String tableId = entry.getKey().getTableId();
@@ -2859,7 +2858,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
       table.scans.running += entry.getValue().get(ScanRunState.RUNNING);
     }
 
-    ArrayList<KeyExtent> offlineTabletsCopy = new ArrayList<KeyExtent>();
+    ArrayList<KeyExtent> offlineTabletsCopy = new ArrayList<>();
     synchronized (this.unopenedTablets) {
       synchronized (this.openingTablets) {
         offlineTabletsCopy.addAll(this.unopenedTablets);
@@ -2955,8 +2954,8 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
 
   public void recover(VolumeManager fs, KeyExtent extent, TableConfiguration tconf, List<LogEntry> logEntries, Set<String> tabletFiles,
       MutationReceiver mutationReceiver) throws IOException {
-    List<Path> recoveryLogs = new ArrayList<Path>();
-    List<LogEntry> sorted = new ArrayList<LogEntry>(logEntries);
+    List<Path> recoveryLogs = new ArrayList<>();
+    List<LogEntry> sorted = new ArrayList<>(logEntries);
     Collections.sort(sorted, new Comparator<LogEntry>() {
       @Override
       public int compare(LogEntry e1, LogEntry e2) {
@@ -3007,7 +3006,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
 
   public Collection<Tablet> getOnlineTablets() {
     synchronized (onlineTablets) {
-      return new ArrayList<Tablet>(onlineTablets.values());
+      return new ArrayList<>(onlineTablets.values());
     }
   }
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServerResourceManager.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServerResourceManager.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServerResourceManager.java
index b3b02ea..97606ea 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServerResourceManager.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServerResourceManager.java
@@ -84,7 +84,7 @@ public class TabletServerResourceManager {
   private final ExecutorService assignMetaDataPool;
   private final ExecutorService readAheadThreadPool;
   private final ExecutorService defaultReadAheadThreadPool;
-  private final Map<String,ExecutorService> threadPools = new TreeMap<String,ExecutorService>();
+  private final Map<String,ExecutorService> threadPools = new TreeMap<>();
 
   private final ConcurrentHashMap<KeyExtent,RunnableStartedAt> activeAssignments;
 
@@ -207,7 +207,7 @@ public class TabletServerResourceManager {
 
     assignMetaDataPool = createEs(0, 1, 60, "metadata tablet assignment");
 
-    activeAssignments = new ConcurrentHashMap<KeyExtent,RunnableStartedAt>();
+    activeAssignments = new ConcurrentHashMap<>();
 
     readAheadThreadPool = createEs(Property.TSERV_READ_AHEAD_MAXCONCURRENT, "tablet read ahead");
     defaultReadAheadThreadPool = createEs(Property.TSERV_METADATA_READ_AHEAD_MAXCONCURRENT, "metadata tablets read ahead");
@@ -332,7 +332,7 @@ public class TabletServerResourceManager {
 
     MemoryManagementFramework() {
       tabletReports = Collections.synchronizedMap(new HashMap<KeyExtent,TabletStateImpl>());
-      memUsageReports = new LinkedBlockingQueue<TabletStateImpl>();
+      memUsageReports = new LinkedBlockingQueue<>();
       maxMem = conf.getConfiguration().getMemoryInBytes(Property.TSERV_MAXMEM);
 
       Runnable r1 = new Runnable() {
@@ -408,7 +408,7 @@ public class TabletServerResourceManager {
         Map<KeyExtent,TabletStateImpl> tabletReportsCopy = null;
         try {
           synchronized (tabletReports) {
-            tabletReportsCopy = new HashMap<KeyExtent,TabletStateImpl>(tabletReports);
+            tabletReportsCopy = new HashMap<>(tabletReports);
           }
           ArrayList<TabletState> tabletStates = new ArrayList<TabletState>(tabletReportsCopy.values());
           mma = memoryManager.getMemoryManagementActions(tabletStates);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/tserver/src/main/java/org/apache/accumulo/tserver/WriteTracker.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/WriteTracker.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/WriteTracker.java
index db02526..c999c09 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/WriteTracker.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/WriteTracker.java
@@ -39,7 +39,7 @@ class WriteTracker {
   private static final Logger log = LoggerFactory.getLogger(WriteTracker.class);
 
   private static final AtomicLong operationCounter = new AtomicLong(1);
-  private final Map<TabletType,TreeSet<Long>> inProgressWrites = new EnumMap<TabletType,TreeSet<Long>>(TabletType.class);
+  private final Map<TabletType,TreeSet<Long>> inProgressWrites = new EnumMap<>(TabletType.class);
 
   WriteTracker() {
     for (TabletType ttype : TabletType.values()) {
@@ -87,7 +87,7 @@ class WriteTracker {
     if (keySet.size() == 0)
       return -1;
 
-    List<KeyExtent> extents = new ArrayList<KeyExtent>(keySet.size());
+    List<KeyExtent> extents = new ArrayList<>(keySet.size());
 
     for (Tablet tablet : keySet)
       extents.add(tablet.getExtent());

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/CompactionPlan.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/CompactionPlan.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/CompactionPlan.java
index 8f98761..845d779 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/CompactionPlan.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/CompactionPlan.java
@@ -31,8 +31,8 @@ import com.google.common.collect.Sets;
  * create the resulting output file.
  */
 public class CompactionPlan {
-  public final List<FileRef> inputFiles = new ArrayList<FileRef>();
-  public final List<FileRef> deleteFiles = new ArrayList<FileRef>();
+  public final List<FileRef> inputFiles = new ArrayList<>();
+  public final List<FileRef> deleteFiles = new ArrayList<>();
   public WriteParameters writeParameters = null;
 
   @Override
@@ -67,8 +67,8 @@ public class CompactionPlan {
    *           thrown when validation fails.
    */
   public final void validate(Set<FileRef> allFiles) {
-    Set<FileRef> inputSet = new HashSet<FileRef>(inputFiles);
-    Set<FileRef> deleteSet = new HashSet<FileRef>(deleteFiles);
+    Set<FileRef> inputSet = new HashSet<>(inputFiles);
+    Set<FileRef> deleteSet = new HashSet<>(deleteFiles);
 
     if (!allFiles.containsAll(inputSet)) {
       inputSet.removeAll(allFiles);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/DefaultCompactionStrategy.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/DefaultCompactionStrategy.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/DefaultCompactionStrategy.java
index 1f0dc3a..faf9534 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/DefaultCompactionStrategy.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/DefaultCompactionStrategy.java
@@ -60,16 +60,16 @@ public class DefaultCompactionStrategy extends CompactionStrategy {
   private List<FileRef> findMapFilesToCompact(MajorCompactionRequest request) {
     MajorCompactionReason reason = request.getReason();
     if (reason == MajorCompactionReason.USER) {
-      return new ArrayList<FileRef>(request.getFiles().keySet());
+      return new ArrayList<>(request.getFiles().keySet());
     }
     if (reason == MajorCompactionReason.CHOP) {
       // should not happen, but this is safe
-      return new ArrayList<FileRef>(request.getFiles().keySet());
+      return new ArrayList<>(request.getFiles().keySet());
     }
 
     if (request.getFiles().size() <= 1)
       return null;
-    TreeSet<CompactionFile> candidateFiles = new TreeSet<CompactionFile>(new Comparator<CompactionFile>() {
+    TreeSet<CompactionFile> candidateFiles = new TreeSet<>(new Comparator<CompactionFile>() {
       @Override
       public int compare(CompactionFile o1, CompactionFile o2) {
         if (o1 == o2)
@@ -95,7 +95,7 @@ public class DefaultCompactionStrategy extends CompactionStrategy {
       totalSize += mfi.size;
     }
 
-    List<FileRef> files = new ArrayList<FileRef>();
+    List<FileRef> files = new ArrayList<>();
 
     while (candidateFiles.size() > 1) {
       CompactionFile max = candidateFiles.last();
@@ -121,7 +121,7 @@ public class DefaultCompactionStrategy extends CompactionStrategy {
 
     if (files.size() < totalFilesToCompact) {
 
-      TreeMap<FileRef,Long> tfc = new TreeMap<FileRef,Long>();
+      TreeMap<FileRef,Long> tfc = new TreeMap<>();
       for (Entry<FileRef,DataFileValue> entry : request.getFiles().entrySet()) {
         tfc.put(entry.getKey(), entry.getValue().getSize());
       }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/SizeLimitCompactionStrategy.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/SizeLimitCompactionStrategy.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/SizeLimitCompactionStrategy.java
index 6cc9025..69e3269 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/SizeLimitCompactionStrategy.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/SizeLimitCompactionStrategy.java
@@ -39,7 +39,7 @@ public class SizeLimitCompactionStrategy extends DefaultCompactionStrategy {
   }
 
   private MajorCompactionRequest filterFiles(MajorCompactionRequest mcr) {
-    Map<FileRef,DataFileValue> filteredFiles = new HashMap<FileRef,DataFileValue>();
+    Map<FileRef,DataFileValue> filteredFiles = new HashMap<>();
     for (Entry<FileRef,DataFileValue> entry : mcr.getFiles().entrySet()) {
       if (entry.getValue().getSize() <= limit) {
         filteredFiles.put(entry.getKey(), entry.getValue());

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/tserver/src/main/java/org/apache/accumulo/tserver/constraints/ConstraintChecker.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/constraints/ConstraintChecker.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/constraints/ConstraintChecker.java
index 13e7c4f..9d065c7 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/constraints/ConstraintChecker.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/constraints/ConstraintChecker.java
@@ -47,7 +47,7 @@ public class ConstraintChecker {
   private AtomicLong lastCheck = new AtomicLong(0);
 
   public ConstraintChecker(TableConfiguration conf) {
-    constrains = new ArrayList<Constraint>();
+    constrains = new ArrayList<>();
 
     this.conf = conf;
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
index d8a4dc6..5280d41 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
@@ -134,7 +134,7 @@ public class DfsLogger implements Comparable<DfsLogger> {
     VolumeManager getFileSystem();
   }
 
-  private final LinkedBlockingQueue<DfsLogger.LogWork> workQueue = new LinkedBlockingQueue<DfsLogger.LogWork>();
+  private final LinkedBlockingQueue<DfsLogger.LogWork> workQueue = new LinkedBlockingQueue<>();
 
   private final Object closeLock = new Object();
 
@@ -149,7 +149,7 @@ public class DfsLogger implements Comparable<DfsLogger> {
 
     @Override
     public void run() {
-      ArrayList<DfsLogger.LogWork> work = new ArrayList<DfsLogger.LogWork>();
+      ArrayList<DfsLogger.LogWork> work = new ArrayList<>();
       boolean sawClosedMarker = false;
       while (!sawClosedMarker) {
         work.clear();
@@ -375,7 +375,7 @@ public class DfsLogger implements Comparable<DfsLogger> {
 
           // If it's null, we won't have any parameters whatsoever. First, let's attempt to read
           // parameters
-          Map<String,String> opts = new HashMap<String,String>();
+          Map<String,String> opts = new HashMap<>();
           int count = input.readInt();
           for (int i = 0; i < count; i++) {
             String key = input.readUTF();
@@ -628,7 +628,7 @@ public class DfsLogger implements Comparable<DfsLogger> {
 
   public LoggerOperation logManyTablets(List<TabletMutations> mutations) throws IOException {
     Durability durability = Durability.NONE;
-    List<Pair<LogFileKey,LogFileValue>> data = new ArrayList<Pair<LogFileKey,LogFileValue>>();
+    List<Pair<LogFileKey,LogFileValue>> data = new ArrayList<>();
     for (TabletMutations tabletMutations : mutations) {
       LogFileKey key = new LogFileKey();
       key.event = MANY_MUTATIONS;
@@ -636,7 +636,7 @@ public class DfsLogger implements Comparable<DfsLogger> {
       key.tid = tabletMutations.getTid();
       LogFileValue value = new LogFileValue();
       value.mutations = tabletMutations.getMutations();
-      data.add(new Pair<LogFileKey,LogFileValue>(key, value));
+      data.add(new Pair<>(key, value));
       if (tabletMutations.getDurability().ordinal() > durability.ordinal()) {
         durability = tabletMutations.getDurability();
       }
@@ -659,7 +659,7 @@ public class DfsLogger implements Comparable<DfsLogger> {
     key.event = COMPACTION_FINISH;
     key.seq = seq;
     key.tid = tid;
-    return logFileData(Collections.singletonList(new Pair<LogFileKey,LogFileValue>(key, EMPTY)), durability);
+    return logFileData(Collections.singletonList(new Pair<>(key, EMPTY)), durability);
   }
 
   public LoggerOperation minorCompactionStarted(int seq, int tid, String fqfn, Durability durability) throws IOException {
@@ -668,7 +668,7 @@ public class DfsLogger implements Comparable<DfsLogger> {
     key.seq = seq;
     key.tid = tid;
     key.filename = fqfn;
-    return logFileData(Collections.singletonList(new Pair<LogFileKey,LogFileValue>(key, EMPTY)), durability);
+    return logFileData(Collections.singletonList(new Pair<>(key, EMPTY)), durability);
   }
 
   public String getLogger() {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/tserver/src/main/java/org/apache/accumulo/tserver/log/LogSorter.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/LogSorter.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/LogSorter.java
index f152f9c..11097ce 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/LogSorter.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/LogSorter.java
@@ -132,7 +132,7 @@ public class LogSorter {
         final long bufferSize = conf.getMemoryInBytes(Property.TSERV_SORT_BUFFER_SIZE);
         Thread.currentThread().setName("Sorting " + name + " for recovery");
         while (true) {
-          final ArrayList<Pair<LogFileKey,LogFileValue>> buffer = new ArrayList<Pair<LogFileKey,LogFileValue>>();
+          final ArrayList<Pair<LogFileKey,LogFileValue>> buffer = new ArrayList<>();
           try {
             long start = input.getPos();
             while (input.getPos() - start < bufferSize) {
@@ -140,7 +140,7 @@ public class LogSorter {
               LogFileValue value = new LogFileValue();
               key.readFields(decryptingInput);
               value.readFields(decryptingInput);
-              buffer.add(new Pair<LogFileKey,LogFileValue>(key, value));
+              buffer.add(new Pair<>(key, value));
             }
             writeBuffer(destPath, buffer, part++);
             buffer.clear();
@@ -236,7 +236,7 @@ public class LogSorter {
   }
 
   public List<RecoveryStatus> getLogSorts() {
-    List<RecoveryStatus> result = new ArrayList<RecoveryStatus>();
+    List<RecoveryStatus> result = new ArrayList<>();
     synchronized (currentWork) {
       for (Entry<String,LogProcessor> entries : currentWork.entrySet()) {
         RecoveryStatus status = new RecoveryStatus();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/tserver/src/main/java/org/apache/accumulo/tserver/log/SortedLogRecovery.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/SortedLogRecovery.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/SortedLogRecovery.java
index ab3dea2..3d403e0 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/SortedLogRecovery.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/SortedLogRecovery.java
@@ -69,7 +69,7 @@ public class SortedLogRecovery {
 
   private enum Status {
     INITIAL, LOOKING_FOR_FINISH, COMPLETE
-  };
+  }
 
   private static class LastStartToFinish {
     long lastStart = -1;
@@ -152,7 +152,7 @@ public class SortedLogRecovery {
   int findLastStartToFinish(MultiReader reader, int fileno, KeyExtent extent, Set<String> tabletFiles, LastStartToFinish lastStartToFinish) throws IOException,
       EmptyMapFileException, UnusedException {
 
-    HashSet<String> suffixes = new HashSet<String>();
+    HashSet<String> suffixes = new HashSet<>();
     for (String path : tabletFiles)
       suffixes.add(getPathSuffix(path));
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java
index 3b0f9d7..a4cd6b0 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java
@@ -159,7 +159,7 @@ public class TabletServerLogger {
   }
 
   private DfsLogger initializeLoggers(final AtomicInteger logIdOut) throws IOException {
-    final AtomicReference<DfsLogger> result = new AtomicReference<DfsLogger>();
+    final AtomicReference<DfsLogger> result = new AtomicReference<>();
     testLockAndRun(logIdLock, new TestCallWithWriteLock() {
       @Override
       boolean test() {
@@ -490,7 +490,7 @@ public class TabletServerLogger {
 
   public int logManyTablets(Map<CommitSession,Mutations> mutations) throws IOException {
 
-    final Map<CommitSession,Mutations> loggables = new HashMap<CommitSession,Mutations>(mutations);
+    final Map<CommitSession,Mutations> loggables = new HashMap<>(mutations);
     for (Entry<CommitSession,Mutations> entry : mutations.entrySet()) {
       if (entry.getValue().getDurability() == Durability.NONE) {
         loggables.remove(entry.getKey());
@@ -502,7 +502,7 @@ public class TabletServerLogger {
     int seq = write(loggables.keySet(), false, new Writer() {
       @Override
       public LoggerOperation write(DfsLogger logger, int ignored) throws Exception {
-        List<TabletMutations> copy = new ArrayList<TabletMutations>(loggables.size());
+        List<TabletMutations> copy = new ArrayList<>(loggables.size());
         for (Entry<CommitSession,Mutations> entry : loggables.entrySet()) {
           CommitSession cs = entry.getKey();
           Durability durability = entry.getValue().getDurability();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/tserver/src/main/java/org/apache/accumulo/tserver/logger/LogFileValue.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/logger/LogFileValue.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/logger/LogFileValue.java
index 87e17b3..f49eb71 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/logger/LogFileValue.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/logger/LogFileValue.java
@@ -39,7 +39,7 @@ public class LogFileValue implements Writable {
   @Override
   public void readFields(DataInput in) throws IOException {
     int count = in.readInt();
-    mutations = new ArrayList<Mutation>(count);
+    mutations = new ArrayList<>(count);
     for (int i = 0; i < count; i++) {
       ServerMutation mutation = new ServerMutation();
       mutation.readFields(in);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/tserver/src/main/java/org/apache/accumulo/tserver/logger/LogReader.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/logger/LogReader.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/logger/LogReader.java
index 01db8aa..d5a4db9 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/logger/LogReader.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/logger/LogReader.java
@@ -59,7 +59,7 @@ public class LogReader {
     @Parameter(names = "-p", description = "search for a row that matches the given regex")
     String regexp;
     @Parameter(description = "<logfile> { <logfile> ... }")
-    List<String> files = new ArrayList<String>();
+    List<String> files = new ArrayList<>();
   }
 
   /**
@@ -91,7 +91,7 @@ public class LogReader {
       rowMatcher = pattern.matcher("");
     }
 
-    Set<Integer> tabletIds = new HashSet<Integer>();
+    Set<Integer> tabletIds = new HashSet<>();
 
     for (String file : opts.files) {
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/AccumuloReplicaSystem.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/AccumuloReplicaSystem.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/AccumuloReplicaSystem.java
index 589f07f..5808f2e 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/AccumuloReplicaSystem.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/AccumuloReplicaSystem.java
@@ -691,7 +691,7 @@ public class AccumuloReplicaSystem implements ReplicaSystem {
   protected WalReplication getWalEdits(ReplicationTarget target, DataInputStream wal, Path p, Status status, long sizeLimit, Set<Integer> desiredTids)
       throws IOException {
     WalEdits edits = new WalEdits();
-    edits.edits = new ArrayList<ByteBuffer>();
+    edits.edits = new ArrayList<>();
     long size = 0l;
     long entriesConsumed = 0l;
     long numUpdates = 0l;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/tserver/src/main/java/org/apache/accumulo/tserver/scan/LookupTask.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/scan/LookupTask.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/scan/LookupTask.java
index 378e98d..139512f 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/scan/LookupTask.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/scan/LookupTask.java
@@ -78,9 +78,9 @@ public class LookupTask extends ScanTask<MultiScanResult> {
 
       long startTime = System.currentTimeMillis();
 
-      List<KVEntry> results = new ArrayList<KVEntry>();
-      Map<KeyExtent,List<Range>> failures = new HashMap<KeyExtent,List<Range>>();
-      List<KeyExtent> fullScans = new ArrayList<KeyExtent>();
+      List<KVEntry> results = new ArrayList<>();
+      Map<KeyExtent,List<Range>> failures = new HashMap<>();
+      List<KeyExtent> fullScans = new ArrayList<>();
       KeyExtent partScan = null;
       Key partNextKey = null;
       boolean partNextKeyInclusive = false;
@@ -146,10 +146,10 @@ public class LookupTask extends ScanTask<MultiScanResult> {
       session.numEntries += results.size();
 
       // convert everything to thrift before adding result
-      List<TKeyValue> retResults = new ArrayList<TKeyValue>();
+      List<TKeyValue> retResults = new ArrayList<>();
       for (KVEntry entry : results)
         retResults.add(new TKeyValue(entry.getKey().toThrift(), ByteBuffer.wrap(entry.getValue().get())));
-      Map<TKeyExtent,List<TRange>> retFailures = Translator.translate(failures, Translators.KET, new Translator.ListTranslator<Range,TRange>(Translators.RT));
+      Map<TKeyExtent,List<TRange>> retFailures = Translator.translate(failures, Translators.KET, new Translator.ListTranslator<>(Translators.RT));
       List<TKeyExtent> retFullScans = Translator.translate(fullScans, Translators.KET);
       TKeyExtent retPartScan = null;
       TKey retPartNextKey = null;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/tserver/src/main/java/org/apache/accumulo/tserver/scan/ScanTask.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/scan/ScanTask.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/scan/ScanTask.java
index 6d5adce..cd99ba2 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/scan/ScanTask.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/scan/ScanTask.java
@@ -43,9 +43,9 @@ public abstract class ScanTask<T> implements RunnableFuture<T> {
   ScanTask(TabletServer server) {
     this.server = server;
     interruptFlag = new AtomicBoolean(false);
-    runState = new AtomicReference<ScanRunState>(ScanRunState.QUEUED);
+    runState = new AtomicReference<>(ScanRunState.QUEUED);
     state = new AtomicInteger(INITIAL);
-    resultQueue = new ArrayBlockingQueue<Object>(1);
+    resultQueue = new ArrayBlockingQueue<>(1);
   }
 
   protected void addResult(Object o) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/tserver/src/main/java/org/apache/accumulo/tserver/session/MultiScanSession.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/session/MultiScanSession.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/session/MultiScanSession.java
index bb84085..d698a1f 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/session/MultiScanSession.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/session/MultiScanSession.java
@@ -32,7 +32,7 @@ import org.apache.accumulo.tserver.scan.ScanTask;
 
 public class MultiScanSession extends Session {
   public final KeyExtent threadPoolExtent;
-  public final HashSet<Column> columnSet = new HashSet<Column>();
+  public final HashSet<Column> columnSet = new HashSet<>();
   public final Map<KeyExtent,List<Range>> queries;
   public final List<IterInfo> ssiList;
   public final Map<String,Map<String,String>> ssio;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/tserver/src/main/java/org/apache/accumulo/tserver/session/SessionManager.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/session/SessionManager.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/session/SessionManager.java
index 1d9c2f7..bf37855 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/session/SessionManager.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/session/SessionManager.java
@@ -50,10 +50,10 @@ public class SessionManager {
   private static final Logger log = LoggerFactory.getLogger(SessionManager.class);
 
   private final SecureRandom random = new SecureRandom();
-  private final Map<Long,Session> sessions = new HashMap<Long,Session>();
+  private final Map<Long,Session> sessions = new HashMap<>();
   private final long maxIdle;
   private final long maxUpdateIdle;
-  private final List<Session> idleSessions = new ArrayList<Session>();
+  private final List<Session> idleSessions = new ArrayList<>();
   private final Long expiredSessionMarker = Long.valueOf(-1);
   private final AccumuloConfiguration aconf;
 
@@ -169,7 +169,7 @@ public class SessionManager {
   }
 
   private void sweep(final long maxIdle, final long maxUpdateIdle) {
-    List<Session> sessionsToCleanup = new ArrayList<Session>();
+    List<Session> sessionsToCleanup = new ArrayList<>();
     synchronized (this) {
       Iterator<Session> iter = sessions.values().iterator();
       while (iter.hasNext()) {
@@ -231,8 +231,8 @@ public class SessionManager {
   }
 
   public synchronized Map<String,MapCounter<ScanRunState>> getActiveScansPerTable() {
-    Map<String,MapCounter<ScanRunState>> counts = new HashMap<String,MapCounter<ScanRunState>>();
-    Set<Entry<Long,Session>> copiedIdleSessions = new HashSet<Entry<Long,Session>>();
+    Map<String,MapCounter<ScanRunState>> counts = new HashMap<>();
+    Set<Entry<Long,Session>> copiedIdleSessions = new HashSet<>();
 
     synchronized (idleSessions) {
       /**
@@ -270,7 +270,7 @@ public class SessionManager {
 
       MapCounter<ScanRunState> stateCounts = counts.get(tableID);
       if (stateCounts == null) {
-        stateCounts = new MapCounter<ScanRunState>();
+        stateCounts = new MapCounter<>();
         counts.put(tableID, stateCounts);
       }
 
@@ -282,9 +282,9 @@ public class SessionManager {
 
   public synchronized List<ActiveScan> getActiveScans() {
 
-    final List<ActiveScan> activeScans = new ArrayList<ActiveScan>();
+    final List<ActiveScan> activeScans = new ArrayList<>();
     final long ct = System.currentTimeMillis();
-    final Set<Entry<Long,Session>> copiedIdleSessions = new HashSet<Entry<Long,Session>>();
+    final Set<Entry<Long,Session>> copiedIdleSessions = new HashSet<>();
 
     synchronized (idleSessions) {
       /**

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/tserver/src/main/java/org/apache/accumulo/tserver/session/UpdateSession.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/session/UpdateSession.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/session/UpdateSession.java
index 4a9b265..c53f560 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/session/UpdateSession.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/session/UpdateSession.java
@@ -33,14 +33,14 @@ import org.apache.accumulo.tserver.tablet.Tablet;
 
 public class UpdateSession extends Session {
   public final TservConstraintEnv cenv;
-  public final MapCounter<Tablet> successfulCommits = new MapCounter<Tablet>();
-  public final Map<KeyExtent,Long> failures = new HashMap<KeyExtent,Long>();
-  public final HashMap<KeyExtent,SecurityErrorCode> authFailures = new HashMap<KeyExtent,SecurityErrorCode>();
+  public final MapCounter<Tablet> successfulCommits = new MapCounter<>();
+  public final Map<KeyExtent,Long> failures = new HashMap<>();
+  public final HashMap<KeyExtent,SecurityErrorCode> authFailures = new HashMap<>();
   public final Stat prepareTimes = new Stat();
   public final Stat walogTimes = new Stat();
   public final Stat commitTimes = new Stat();
   public final Stat authTimes = new Stat();
-  public final Map<Tablet,List<Mutation>> queuedMutations = new HashMap<Tablet,List<Mutation>>();
+  public final Map<Tablet,List<Mutation>> queuedMutations = new HashMap<>();
   public final Violations violations;
 
   public Tablet currentTablet = null;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/CompactionInfo.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/CompactionInfo.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/CompactionInfo.java
index c7ca29d..5c4f7c4 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/CompactionInfo.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/CompactionInfo.java
@@ -114,14 +114,14 @@ public class CompactionInfo {
       }
     }
 
-    List<IterInfo> iiList = new ArrayList<IterInfo>();
-    Map<String,Map<String,String>> iterOptions = new HashMap<String,Map<String,String>>();
+    List<IterInfo> iiList = new ArrayList<>();
+    Map<String,Map<String,String>> iterOptions = new HashMap<>();
 
     for (IteratorSetting iterSetting : compactor.getIterators()) {
       iiList.add(new IterInfo(iterSetting.getPriority(), iterSetting.getIteratorClass(), iterSetting.getName()));
       iterOptions.put(iterSetting.getName(), iterSetting.getOptions());
     }
-    List<String> filesToCompact = new ArrayList<String>();
+    List<String> filesToCompact = new ArrayList<>();
     for (FileRef ref : compactor.getFilesToCompact())
       filesToCompact.add(ref.toString());
     return new ActiveCompaction(compactor.extent.toThrift(), System.currentTimeMillis() - compactor.getStartTime(), filesToCompact, compactor.getOutputFile(),

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/CompactionWatcher.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/CompactionWatcher.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/CompactionWatcher.java
index 6ca4407..64345c2 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/CompactionWatcher.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/CompactionWatcher.java
@@ -32,7 +32,7 @@ import org.slf4j.LoggerFactory;
  *
  */
 public class CompactionWatcher implements Runnable {
-  private final Map<List<Long>,ObservedCompactionInfo> observedCompactions = new HashMap<List<Long>,ObservedCompactionInfo>();
+  private final Map<List<Long>,ObservedCompactionInfo> observedCompactions = new HashMap<>();
   private final AccumuloConfiguration config;
   private static boolean watching = false;
 
@@ -55,7 +55,7 @@ public class CompactionWatcher implements Runnable {
   public void run() {
     List<CompactionInfo> runningCompactions = Compactor.getRunningCompactions();
 
-    Set<List<Long>> newKeys = new HashSet<List<Long>>();
+    Set<List<Long>> newKeys = new HashSet<>();
 
     long time = System.currentTimeMillis();
 
@@ -69,7 +69,7 @@ public class CompactionWatcher implements Runnable {
     }
 
     // look for compactions that finished or made progress and logged a warning
-    HashMap<List<Long>,ObservedCompactionInfo> copy = new HashMap<List<Long>,ObservedCompactionInfo>(observedCompactions);
+    HashMap<List<Long>,ObservedCompactionInfo> copy = new HashMap<>(observedCompactions);
     copy.keySet().removeAll(newKeys);
 
     for (ObservedCompactionInfo oci : copy.values()) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Compactor.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Compactor.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Compactor.java
index 79d22ea..6c83f19 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Compactor.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Compactor.java
@@ -133,7 +133,7 @@ public class Compactor implements Callable<CompactionStats> {
   protected static final Set<Compactor> runningCompactions = Collections.synchronizedSet(new HashSet<Compactor>());
 
   public static List<CompactionInfo> getRunningCompactions() {
-    ArrayList<CompactionInfo> compactions = new ArrayList<CompactionInfo>();
+    ArrayList<CompactionInfo> compactions = new ArrayList<>();
 
     synchronized (runningCompactions) {
       for (Compactor compactor : runningCompactions) {
@@ -209,7 +209,7 @@ public class Compactor implements Callable<CompactionStats> {
 
       long t1 = System.currentTimeMillis();
 
-      HashSet<ByteSequence> allColumnFamilies = new HashSet<ByteSequence>();
+      HashSet<ByteSequence> allColumnFamilies = new HashSet<>();
 
       if (mfw.supportsLocalityGroups()) {
         for (Entry<String,Set<ByteSequence>> entry : lGroups.entrySet()) {
@@ -277,7 +277,7 @@ public class Compactor implements Callable<CompactionStats> {
 
   private List<SortedKeyValueIterator<Key,Value>> openMapDataFiles(String lgName, ArrayList<FileSKVIterator> readers) throws IOException {
 
-    List<SortedKeyValueIterator<Key,Value>> iters = new ArrayList<SortedKeyValueIterator<Key,Value>>(filesToCompact.size());
+    List<SortedKeyValueIterator<Key,Value>> iters = new ArrayList<>(filesToCompact.size());
 
     for (FileRef mapFile : filesToCompact.keySet()) {
       try {
@@ -326,7 +326,7 @@ public class Compactor implements Callable<CompactionStats> {
 
   private void compactLocalityGroup(String lgName, Set<ByteSequence> columnFamilies, boolean inclusive, FileSKVWriter mfw, CompactionStats majCStats)
       throws IOException, CompactionCanceledException {
-    ArrayList<FileSKVIterator> readers = new ArrayList<FileSKVIterator>(filesToCompact.size());
+    ArrayList<FileSKVIterator> readers = new ArrayList<>(filesToCompact.size());
     Span span = Trace.start("compact");
     try {
       long entriesCompacted = 0;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/CountingIterator.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/CountingIterator.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/CountingIterator.java
index 8716695..be22778 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/CountingIterator.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/CountingIterator.java
@@ -47,7 +47,7 @@ public class CountingIterator extends WrappingIterator {
   }
 
   public CountingIterator(SortedKeyValueIterator<Key,Value> source, AtomicLong entriesRead) {
-    deepCopies = new ArrayList<CountingIterator>();
+    deepCopies = new ArrayList<>();
     this.setSource(source);
     count = 0;
     this.entriesRead = entriesRead;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/DatafileManager.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/DatafileManager.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/DatafileManager.java
index fd1ea33..b488e13 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/DatafileManager.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/DatafileManager.java
@@ -70,13 +70,13 @@ class DatafileManager {
   }
 
   private FileRef mergingMinorCompactionFile = null;
-  private final Set<FileRef> filesToDeleteAfterScan = new HashSet<FileRef>();
-  private final Map<Long,Set<FileRef>> scanFileReservations = new HashMap<Long,Set<FileRef>>();
-  private final MapCounter<FileRef> fileScanReferenceCounts = new MapCounter<FileRef>();
+  private final Set<FileRef> filesToDeleteAfterScan = new HashSet<>();
+  private final Map<Long,Set<FileRef>> scanFileReservations = new HashMap<>();
+  private final MapCounter<FileRef> fileScanReferenceCounts = new MapCounter<>();
   private long nextScanReservationId = 0;
   private boolean reservationsBlocked = false;
 
-  private final Set<FileRef> majorCompactingFiles = new HashSet<FileRef>();
+  private final Set<FileRef> majorCompactingFiles = new HashSet<>();
 
   static void rename(VolumeManager fs, Path src, Path dst) throws IOException {
     if (!fs.rename(src, dst)) {
@@ -95,26 +95,26 @@ class DatafileManager {
         }
       }
 
-      Set<FileRef> absFilePaths = new HashSet<FileRef>(datafileSizes.keySet());
+      Set<FileRef> absFilePaths = new HashSet<>(datafileSizes.keySet());
 
       long rid = nextScanReservationId++;
 
       scanFileReservations.put(rid, absFilePaths);
 
-      Map<FileRef,DataFileValue> ret = new HashMap<FileRef,DataFileValue>();
+      Map<FileRef,DataFileValue> ret = new HashMap<>();
 
       for (FileRef path : absFilePaths) {
         fileScanReferenceCounts.increment(path, 1);
         ret.put(path, datafileSizes.get(path));
       }
 
-      return new Pair<Long,Map<FileRef,DataFileValue>>(rid, ret);
+      return new Pair<>(rid, ret);
     }
   }
 
   void returnFilesForScan(Long reservationId) {
 
-    final Set<FileRef> filesToDelete = new HashSet<FileRef>();
+    final Set<FileRef> filesToDelete = new HashSet<>();
 
     synchronized (tablet) {
       Set<FileRef> absFilePaths = scanFileReservations.remove(reservationId);
@@ -147,7 +147,7 @@ class DatafileManager {
     if (scanFiles.size() == 0)
       return;
 
-    Set<FileRef> filesToDelete = new HashSet<FileRef>();
+    Set<FileRef> filesToDelete = new HashSet<>();
 
     synchronized (tablet) {
       for (FileRef path : scanFiles) {
@@ -166,7 +166,7 @@ class DatafileManager {
 
   private TreeSet<FileRef> waitForScansToFinish(Set<FileRef> pathsToWaitFor, boolean blockNewScans, long maxWaitTime) {
     long startTime = System.currentTimeMillis();
-    TreeSet<FileRef> inUse = new TreeSet<FileRef>();
+    TreeSet<FileRef> inUse = new TreeSet<>();
 
     Span waitForScans = Trace.start("waitForScans");
     try {
@@ -209,7 +209,7 @@ class DatafileManager {
 
     String bulkDir = null;
 
-    Map<FileRef,DataFileValue> paths = new HashMap<FileRef,DataFileValue>();
+    Map<FileRef,DataFileValue> paths = new HashMap<>();
     for (Entry<FileRef,DataFileValue> entry : pathsString.entrySet())
       paths.put(entry.getKey(), entry.getValue());
 
@@ -575,14 +575,14 @@ class DatafileManager {
 
   public SortedMap<FileRef,DataFileValue> getDatafileSizes() {
     synchronized (tablet) {
-      TreeMap<FileRef,DataFileValue> copy = new TreeMap<FileRef,DataFileValue>(datafileSizes);
+      TreeMap<FileRef,DataFileValue> copy = new TreeMap<>(datafileSizes);
       return Collections.unmodifiableSortedMap(copy);
     }
   }
 
   public Set<FileRef> getFiles() {
     synchronized (tablet) {
-      HashSet<FileRef> files = new HashSet<FileRef>(datafileSizes.keySet());
+      HashSet<FileRef> files = new HashSet<>(datafileSizes.keySet());
       return Collections.unmodifiableSet(files);
     }
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/RootFiles.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/RootFiles.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/RootFiles.java
index 9ba8e38..56dbec9 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/RootFiles.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/RootFiles.java
@@ -80,7 +80,7 @@ public class RootFiles {
     /*
      * called in constructor and before major compactions
      */
-    Collection<String> goodFiles = new ArrayList<String>(files.length);
+    Collection<String> goodFiles = new ArrayList<>(files.length);
 
     for (FileStatus file : files) {
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/ScanDataSource.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/ScanDataSource.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/ScanDataSource.java
index 28cbdc9..e48d91e 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/ScanDataSource.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/ScanDataSource.java
@@ -169,7 +169,7 @@ class ScanDataSource implements DataSource {
     for (SortedKeyValueIterator<Key,Value> skvi : Iterables.concat(mapfiles, memIters))
       ((InterruptibleIterator) skvi).setInterruptFlag(interruptFlag);
 
-    List<SortedKeyValueIterator<Key,Value>> iters = new ArrayList<SortedKeyValueIterator<Key,Value>>(mapfiles.size() + memIters.size());
+    List<SortedKeyValueIterator<Key,Value>> iters = new ArrayList<>(mapfiles.size() + memIters.size());
 
     iters.addAll(mapfiles);
     iters.addAll(memIters);


[28/32] accumulo git commit: ACCUMULO-4357 Remove unneeded code for readability

Posted by ct...@apache.org.
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/impl/InputConfigurator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/impl/InputConfigurator.java b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/impl/InputConfigurator.java
index 448b45e..986e071 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/impl/InputConfigurator.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/impl/InputConfigurator.java
@@ -209,7 +209,7 @@ public class InputConfigurator extends ConfiguratorBase {
   public static void setRanges(Class<?> implementingClass, Configuration conf, Collection<Range> ranges) {
     checkArgument(ranges != null, "ranges is null");
 
-    ArrayList<String> rangeStrings = new ArrayList<String>(ranges.size());
+    ArrayList<String> rangeStrings = new ArrayList<>(ranges.size());
     try {
       for (Range r : ranges) {
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -238,7 +238,7 @@ public class InputConfigurator extends ConfiguratorBase {
   public static List<Range> getRanges(Class<?> implementingClass, Configuration conf) throws IOException {
 
     Collection<String> encodedRanges = conf.getStringCollection(enumToConfKey(implementingClass, ScanOpts.RANGES));
-    List<Range> ranges = new ArrayList<Range>();
+    List<Range> ranges = new ArrayList<>();
     for (String rangeString : encodedRanges) {
       ByteArrayInputStream bais = new ByteArrayInputStream(Base64.decodeBase64(rangeString.getBytes(UTF_8)));
       Range range = new Range();
@@ -264,11 +264,11 @@ public class InputConfigurator extends ConfiguratorBase {
 
     // If no iterators are present, return an empty list
     if (iterators == null || iterators.isEmpty())
-      return new ArrayList<IteratorSetting>();
+      return new ArrayList<>();
 
     // Compose the set of iterators encoded in the job configuration
     StringTokenizer tokens = new StringTokenizer(iterators, StringUtils.COMMA_STR);
-    List<IteratorSetting> list = new ArrayList<IteratorSetting>();
+    List<IteratorSetting> list = new ArrayList<>();
     try {
       while (tokens.hasMoreTokens()) {
         String itstring = tokens.nextToken();
@@ -304,7 +304,7 @@ public class InputConfigurator extends ConfiguratorBase {
 
   public static String[] serializeColumns(Collection<Pair<Text,Text>> columnFamilyColumnQualifierPairs) {
     checkArgument(columnFamilyColumnQualifierPairs != null, "columnFamilyColumnQualifierPairs is null");
-    ArrayList<String> columnStrings = new ArrayList<String>(columnFamilyColumnQualifierPairs.size());
+    ArrayList<String> columnStrings = new ArrayList<>(columnFamilyColumnQualifierPairs.size());
     for (Pair<Text,Text> column : columnFamilyColumnQualifierPairs) {
 
       if (column.getFirst() == null)
@@ -333,7 +333,7 @@ public class InputConfigurator extends ConfiguratorBase {
   public static Set<Pair<Text,Text>> getFetchedColumns(Class<?> implementingClass, Configuration conf) {
     checkArgument(conf != null, "conf is null");
     String confValue = conf.get(enumToConfKey(implementingClass, ScanOpts.COLUMNS));
-    List<String> serialized = new ArrayList<String>();
+    List<String> serialized = new ArrayList<>();
     if (confValue != null) {
       // Split and include any trailing empty strings to allow empty column families
       for (String val : confValue.split(",", -1)) {
@@ -344,7 +344,7 @@ public class InputConfigurator extends ConfiguratorBase {
   }
 
   public static Set<Pair<Text,Text>> deserializeFetchedColumns(Collection<String> serialized) {
-    Set<Pair<Text,Text>> columns = new HashSet<Pair<Text,Text>>();
+    Set<Pair<Text,Text>> columns = new HashSet<>();
 
     if (null == serialized) {
       return columns;
@@ -354,7 +354,7 @@ public class InputConfigurator extends ConfiguratorBase {
       int idx = col.indexOf(":");
       Text cf = new Text(idx < 0 ? Base64.decodeBase64(col.getBytes(UTF_8)) : Base64.decodeBase64(col.substring(0, idx).getBytes(UTF_8)));
       Text cq = idx < 0 ? null : new Text(Base64.decodeBase64(col.substring(idx + 1).getBytes(UTF_8)));
-      columns.add(new Pair<Text,Text>(cf, cq));
+      columns.add(new Pair<>(cf, cq));
     }
     return columns;
   }
@@ -621,7 +621,7 @@ public class InputConfigurator extends ConfiguratorBase {
    * @since 1.6.0
    */
   public static Map<String,InputTableConfig> getInputTableConfigs(Class<?> implementingClass, Configuration conf) {
-    Map<String,InputTableConfig> configs = new HashMap<String,InputTableConfig>();
+    Map<String,InputTableConfig> configs = new HashMap<>();
     Map.Entry<String,InputTableConfig> defaultConfig = getDefaultInputTableConfig(implementingClass, conf);
     if (defaultConfig != null)
       configs.put(defaultConfig.getKey(), defaultConfig.getValue());
@@ -851,7 +851,7 @@ public class InputConfigurator extends ConfiguratorBase {
 
   public static Map<String,Map<KeyExtent,List<Range>>> binOffline(String tableId, List<Range> ranges, Instance instance, Connector conn)
       throws AccumuloException, TableNotFoundException {
-    Map<String,Map<KeyExtent,List<Range>>> binnedRanges = new HashMap<String,Map<KeyExtent,List<Range>>>();
+    Map<String,Map<KeyExtent,List<Range>>> binnedRanges = new HashMap<>();
 
     if (Tables.getTableState(instance, tableId) != TableState.OFFLINE) {
       Tables.clearCache(instance);
@@ -916,13 +916,13 @@ public class InputConfigurator extends ConfiguratorBase {
 
         Map<KeyExtent,List<Range>> tabletRanges = binnedRanges.get(last);
         if (tabletRanges == null) {
-          tabletRanges = new HashMap<KeyExtent,List<Range>>();
+          tabletRanges = new HashMap<>();
           binnedRanges.put(last, tabletRanges);
         }
 
         List<Range> rangeList = tabletRanges.get(extent);
         if (rangeList == null) {
-          rangeList = new ArrayList<Range>();
+          rangeList = new ArrayList<>();
           tabletRanges.put(extent, rangeList);
         }
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/partition/RangePartitioner.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/partition/RangePartitioner.java b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/partition/RangePartitioner.java
index c0c0097..fa80831 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/partition/RangePartitioner.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/partition/RangePartitioner.java
@@ -89,7 +89,7 @@ public class RangePartitioner extends Partitioner<Text,Writable> implements Conf
       if (cf != null) {
         for (Path path : cf) {
           if (path.toUri().getPath().endsWith(cutFileName.substring(cutFileName.lastIndexOf('/')))) {
-            TreeSet<Text> cutPoints = new TreeSet<Text>();
+            TreeSet<Text> cutPoints = new TreeSet<>();
             Scanner in = new Scanner(new BufferedReader(new InputStreamReader(new FileInputStream(path.toString()), UTF_8)));
             try {
               while (in.hasNextLine())

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/mock/MockAccumulo.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/mock/MockAccumulo.java b/core/src/main/java/org/apache/accumulo/core/client/mock/MockAccumulo.java
index 18dac55..f362add 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/mock/MockAccumulo.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/mock/MockAccumulo.java
@@ -45,10 +45,10 @@ import org.apache.hadoop.io.Text;
  */
 @Deprecated
 public class MockAccumulo {
-  final Map<String,MockTable> tables = new HashMap<String,MockTable>();
-  final Map<String,MockNamespace> namespaces = new HashMap<String,MockNamespace>();
-  final Map<String,String> systemProperties = new HashMap<String,String>();
-  Map<String,MockUser> users = new HashMap<String,MockUser>();
+  final Map<String,MockTable> tables = new HashMap<>();
+  final Map<String,MockNamespace> namespaces = new HashMap<>();
+  final Map<String,String> systemProperties = new HashMap<>();
+  Map<String,MockUser> users = new HashMap<>();
   final FileSystem fs;
   final AtomicInteger tableIdCounter = new AtomicInteger(0);
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/mock/MockBatchScanner.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/mock/MockBatchScanner.java b/core/src/main/java/org/apache/accumulo/core/client/mock/MockBatchScanner.java
index 0622f33..1ea27b5 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/mock/MockBatchScanner.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/mock/MockBatchScanner.java
@@ -50,7 +50,7 @@ public class MockBatchScanner extends MockScannerBase implements BatchScanner {
       throw new IllegalArgumentException("ranges must be non null and contain at least 1 range");
     }
 
-    this.ranges = new ArrayList<Range>(ranges);
+    this.ranges = new ArrayList<>(ranges);
   }
 
   @SuppressWarnings("unchecked")

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/mock/MockInstance.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/mock/MockInstance.java b/core/src/main/java/org/apache/accumulo/core/client/mock/MockInstance.java
index a37706a..50d212f 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/mock/MockInstance.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/mock/MockInstance.java
@@ -55,7 +55,7 @@ import org.apache.hadoop.io.Text;
 public class MockInstance implements Instance {
 
   static final String genericAddress = "localhost:1234";
-  static final Map<String,MockAccumulo> instances = new HashMap<String,MockAccumulo>();
+  static final Map<String,MockAccumulo> instances = new HashMap<>();
   MockAccumulo acu;
   String instanceName;
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/mock/MockInstanceOperations.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/mock/MockInstanceOperations.java b/core/src/main/java/org/apache/accumulo/core/client/mock/MockInstanceOperations.java
index b7e8e68..e264104 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/mock/MockInstanceOperations.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/mock/MockInstanceOperations.java
@@ -63,12 +63,12 @@ class MockInstanceOperations implements InstanceOperations {
 
   @Override
   public List<String> getTabletServers() {
-    return new ArrayList<String>();
+    return new ArrayList<>();
   }
 
   @Override
   public List<ActiveScan> getActiveScans(String tserver) throws AccumuloException, AccumuloSecurityException {
-    return new ArrayList<ActiveScan>();
+    return new ArrayList<>();
   }
 
   @Override
@@ -84,7 +84,7 @@ class MockInstanceOperations implements InstanceOperations {
 
   @Override
   public List<ActiveCompaction> getActiveCompactions(String tserver) throws AccumuloException, AccumuloSecurityException {
-    return new ArrayList<ActiveCompaction>();
+    return new ArrayList<>();
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/mock/MockMultiTableBatchWriter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/mock/MockMultiTableBatchWriter.java b/core/src/main/java/org/apache/accumulo/core/client/mock/MockMultiTableBatchWriter.java
index cfacccb..5b9bc2b 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/mock/MockMultiTableBatchWriter.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/mock/MockMultiTableBatchWriter.java
@@ -36,7 +36,7 @@ public class MockMultiTableBatchWriter implements MultiTableBatchWriter {
 
   public MockMultiTableBatchWriter(MockAccumulo acu) {
     this.acu = acu;
-    bws = new HashMap<String,MockBatchWriter>();
+    bws = new HashMap<>();
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/mock/MockNamespace.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/mock/MockNamespace.java b/core/src/main/java/org/apache/accumulo/core/client/mock/MockNamespace.java
index da118c3..456580b 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/mock/MockNamespace.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/mock/MockNamespace.java
@@ -34,10 +34,10 @@ import org.apache.accumulo.core.security.NamespacePermission;
 public class MockNamespace {
 
   final HashMap<String,String> settings;
-  Map<String,EnumSet<NamespacePermission>> userPermissions = new HashMap<String,EnumSet<NamespacePermission>>();
+  Map<String,EnumSet<NamespacePermission>> userPermissions = new HashMap<>();
 
   public MockNamespace() {
-    settings = new HashMap<String,String>();
+    settings = new HashMap<>();
     for (Entry<String,String> entry : AccumuloConfiguration.getDefaultConfiguration()) {
       String key = entry.getKey();
       if (key.startsWith(Property.TABLE_PREFIX.getKey())) {
@@ -47,7 +47,7 @@ public class MockNamespace {
   }
 
   public List<String> getTables(MockAccumulo acu) {
-    List<String> l = new LinkedList<String>();
+    List<String> l = new LinkedList<>();
     for (String t : acu.tables.keySet()) {
       if (acu.tables.get(t).getNamespace().equals(this)) {
         l.add(t);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/mock/MockNamespaceOperations.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/mock/MockNamespaceOperations.java b/core/src/main/java/org/apache/accumulo/core/client/mock/MockNamespaceOperations.java
index 0c657a9..b1cb980 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/mock/MockNamespaceOperations.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/mock/MockNamespaceOperations.java
@@ -52,7 +52,7 @@ class MockNamespaceOperations extends NamespaceOperationsHelper {
 
   @Override
   public SortedSet<String> list() {
-    return new TreeSet<String>(acu.namespaces.keySet());
+    return new TreeSet<>(acu.namespaces.keySet());
   }
 
   @Override
@@ -116,7 +116,7 @@ class MockNamespaceOperations extends NamespaceOperationsHelper {
 
   @Override
   public Map<String,String> namespaceIdMap() {
-    Map<String,String> result = new HashMap<String,String>();
+    Map<String,String> result = new HashMap<>();
     for (String table : acu.tables.keySet()) {
       result.put(table, table);
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/mock/MockScannerBase.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/mock/MockScannerBase.java b/core/src/main/java/org/apache/accumulo/core/client/mock/MockScannerBase.java
index a79255c..ad79ec0 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/mock/MockScannerBase.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/mock/MockScannerBase.java
@@ -23,7 +23,6 @@ import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Map.Entry;
 
-import org.apache.accumulo.core.client.ScannerBase;
 import org.apache.accumulo.core.client.impl.ScannerOptions;
 import org.apache.accumulo.core.client.sample.SamplerConfiguration;
 import org.apache.accumulo.core.conf.AccumuloConfiguration;
@@ -48,7 +47,7 @@ import org.apache.commons.lang.NotImplementedException;
  * @deprecated since 1.8.0; use MiniAccumuloCluster or a standard mock framework instead.
  */
 @Deprecated
-public class MockScannerBase extends ScannerOptions implements ScannerBase {
+public class MockScannerBase extends ScannerOptions {
 
   protected final MockTable table;
   protected final Authorizations auths;
@@ -59,7 +58,7 @@ public class MockScannerBase extends ScannerOptions implements ScannerBase {
   }
 
   static HashSet<ByteSequence> createColumnBSS(Collection<Column> columns) {
-    HashSet<ByteSequence> columnSet = new HashSet<ByteSequence>();
+    HashSet<ByteSequence> columnSet = new HashSet<>();
     for (Column c : columns) {
       columnSet.add(new ArrayByteSequence(c.getColumnFamily()));
     }
@@ -94,7 +93,7 @@ public class MockScannerBase extends ScannerOptions implements ScannerBase {
       return false;
     }
 
-    private ArrayList<SortedKeyValueIterator<Key,Value>> topLevelIterators = new ArrayList<SortedKeyValueIterator<Key,Value>>();
+    private ArrayList<SortedKeyValueIterator<Key,Value>> topLevelIterators = new ArrayList<>();
 
     @Override
     public void registerSideChannel(SortedKeyValueIterator<Key,Value> iter) {
@@ -109,7 +108,7 @@ public class MockScannerBase extends ScannerOptions implements ScannerBase {
     SortedKeyValueIterator<Key,Value> getTopLevelIterator(SortedKeyValueIterator<Key,Value> iter) {
       if (topLevelIterators.isEmpty())
         return iter;
-      ArrayList<SortedKeyValueIterator<Key,Value>> allIters = new ArrayList<SortedKeyValueIterator<Key,Value>>(topLevelIterators);
+      ArrayList<SortedKeyValueIterator<Key,Value>> allIters = new ArrayList<>(topLevelIterators);
       allIters.add(iter);
       return new MultiIterator(allIters, false);
     }
@@ -133,7 +132,7 @@ public class MockScannerBase extends ScannerOptions implements ScannerBase {
   public SortedKeyValueIterator<Key,Value> createFilter(SortedKeyValueIterator<Key,Value> inner) throws IOException {
     byte[] defaultLabels = {};
     inner = new ColumnFamilySkippingIterator(new DeletingIterator(inner, false));
-    ColumnQualifierFilter cqf = new ColumnQualifierFilter(inner, new HashSet<Column>(fetchedColumns));
+    ColumnQualifierFilter cqf = new ColumnQualifierFilter(inner, new HashSet<>(fetchedColumns));
     VisibilityFilter vf = new VisibilityFilter(cqf, auths, defaultLabels);
     AccumuloConfiguration conf = new MockConfiguration(table.settings);
     MockIteratorEnvironment iterEnv = new MockIteratorEnvironment(auths);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/mock/MockTable.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/mock/MockTable.java b/core/src/main/java/org/apache/accumulo/core/client/mock/MockTable.java
index fa0fbcd..1445650 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/mock/MockTable.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/mock/MockTable.java
@@ -85,15 +85,15 @@ public class MockTable {
       }
       return 0;
     }
-  };
+  }
 
-  final SortedMap<Key,Value> table = new ConcurrentSkipListMap<Key,Value>();
+  final SortedMap<Key,Value> table = new ConcurrentSkipListMap<>();
   int mutationCount = 0;
   final Map<String,String> settings;
-  Map<String,EnumSet<TablePermission>> userPermissions = new HashMap<String,EnumSet<TablePermission>>();
+  Map<String,EnumSet<TablePermission>> userPermissions = new HashMap<>();
   private TimeType timeType;
-  SortedSet<Text> splits = new ConcurrentSkipListSet<Text>();
-  Map<String,Set<Text>> localityGroups = new TreeMap<String,Set<Text>>();
+  SortedSet<Text> splits = new ConcurrentSkipListSet<>();
+  Map<String,Set<Text>> localityGroups = new TreeMap<>();
   private MockNamespace namespace;
   private String namespaceName;
   private String tableId;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/mock/MockTableOperations.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/mock/MockTableOperations.java b/core/src/main/java/org/apache/accumulo/core/client/mock/MockTableOperations.java
index 2072e00..de89137 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/mock/MockTableOperations.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/mock/MockTableOperations.java
@@ -84,7 +84,7 @@ class MockTableOperations extends TableOperationsHelper {
 
   @Override
   public SortedSet<String> list() {
-    return new TreeSet<String>(acu.tables.keySet());
+    return new TreeSet<>(acu.tables.keySet());
   }
 
   @Override
@@ -209,7 +209,7 @@ class MockTableOperations extends TableOperationsHelper {
       throw new TableNotFoundException(null, tableName, null);
     }
 
-    Set<Entry<String,String>> props = new HashSet<Entry<String,String>>(acu.namespaces.get(namespace).settings.entrySet());
+    Set<Entry<String,String>> props = new HashSet<>(acu.namespaces.get(namespace).settings.entrySet());
 
     Set<Entry<String,String>> tableProps = acu.tables.get(tableName).settings.entrySet();
     for (Entry<String,String> e : tableProps) {
@@ -359,7 +359,7 @@ class MockTableOperations extends TableOperationsHelper {
 
   @Override
   public Map<String,String> tableIdMap() {
-    Map<String,String> result = new HashMap<String,String>();
+    Map<String,String> result = new HashMap<>();
     for (Entry<String,MockTable> entry : acu.tables.entrySet()) {
       String table = entry.getKey();
       if (RootTable.NAME.equals(table))
@@ -375,8 +375,8 @@ class MockTableOperations extends TableOperationsHelper {
   @Override
   public List<DiskUsage> getDiskUsage(Set<String> tables) throws AccumuloException, AccumuloSecurityException {
 
-    List<DiskUsage> diskUsages = new ArrayList<DiskUsage>();
-    diskUsages.add(new DiskUsage(new TreeSet<String>(tables), 0l));
+    List<DiskUsage> diskUsages = new ArrayList<>();
+    diskUsages.add(new DiskUsage(new TreeSet<>(tables), 0l));
 
     return diskUsages;
   }
@@ -401,7 +401,7 @@ class MockTableOperations extends TableOperationsHelper {
     Text endText = end != null ? new Text(end) : new Text(t.table.lastKey().getRow().getBytes());
     startText.append(ZERO, 0, 1);
     endText.append(ZERO, 0, 1);
-    Set<Key> keep = new TreeSet<Key>(t.table.subMap(new Key(startText), new Key(endText)).keySet());
+    Set<Key> keep = new TreeSet<>(t.table.subMap(new Key(startText), new Key(endText)).keySet());
     t.table.keySet().removeAll(keep);
   }
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/mock/impl/MockTabletLocator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/mock/impl/MockTabletLocator.java b/core/src/main/java/org/apache/accumulo/core/client/mock/impl/MockTabletLocator.java
index 1046a8d..a52af79 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/mock/impl/MockTabletLocator.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/mock/impl/MockTabletLocator.java
@@ -48,7 +48,7 @@ public class MockTabletLocator extends TabletLocator {
   @Override
   public <T extends Mutation> void binMutations(ClientContext context, List<T> mutations, Map<String,TabletServerMutations<T>> binnedMutations, List<T> failures)
       throws AccumuloException, AccumuloSecurityException, TableNotFoundException {
-    TabletServerMutations<T> tsm = new TabletServerMutations<T>("5");
+    TabletServerMutations<T> tsm = new TabletServerMutations<>("5");
     for (T m : mutations)
       tsm.addMutation(new KeyExtent(), m);
     binnedMutations.put("", tsm);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/rfile/RFileScannerBuilder.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/rfile/RFileScannerBuilder.java b/core/src/main/java/org/apache/accumulo/core/client/rfile/RFileScannerBuilder.java
index 92e07b4..3a55172 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/rfile/RFileScannerBuilder.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/rfile/RFileScannerBuilder.java
@@ -34,7 +34,7 @@ import org.apache.hadoop.fs.Path;
 
 import com.google.common.base.Preconditions;
 
-class RFileScannerBuilder implements RFile.InputArguments, RFile.ScannerFSOptions, RFile.ScannerOptions {
+class RFileScannerBuilder implements RFile.InputArguments, RFile.ScannerFSOptions {
 
   static class InputArgs extends FSConfArgs {
     private Path[] paths;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/rfile/RFileWriter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/rfile/RFileWriter.java b/core/src/main/java/org/apache/accumulo/core/client/rfile/RFileWriter.java
index 0c4d682..1de3661 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/rfile/RFileWriter.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/rfile/RFileWriter.java
@@ -116,7 +116,7 @@ public class RFileWriter implements AutoCloseable {
    *           When default locality group already started.
    */
   public void startNewLocalityGroup(String name, List<byte[]> families) throws IOException {
-    HashSet<ByteSequence> fams = new HashSet<ByteSequence>();
+    HashSet<ByteSequence> fams = new HashSet<>();
     for (byte[] family : families) {
       fams.add(new ArrayByteSequence(family));
     }
@@ -143,7 +143,7 @@ public class RFileWriter implements AutoCloseable {
    *           When default locality group already started.
    */
   public void startNewLocalityGroup(String name, Set<String> families) throws IOException {
-    HashSet<ByteSequence> fams = new HashSet<ByteSequence>();
+    HashSet<ByteSequence> fams = new HashSet<>();
     for (String family : families) {
       fams.add(new ArrayByteSequence(family));
     }
@@ -160,7 +160,7 @@ public class RFileWriter implements AutoCloseable {
    *           When default locality group already started.
    */
   public void startNewLocalityGroup(String name, String... families) throws IOException {
-    HashSet<ByteSequence> fams = new HashSet<ByteSequence>();
+    HashSet<ByteSequence> fams = new HashSet<>();
     for (String family : families) {
       fams.add(new ArrayByteSequence(family));
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/rfile/RFileWriterBuilder.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/rfile/RFileWriterBuilder.java b/core/src/main/java/org/apache/accumulo/core/client/rfile/RFileWriterBuilder.java
index e4a141c..667cbef 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/rfile/RFileWriterBuilder.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/rfile/RFileWriterBuilder.java
@@ -39,7 +39,7 @@ import org.apache.hadoop.fs.Path;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Iterables;
 
-class RFileWriterBuilder implements RFile.OutputArguments, RFile.WriterFSOptions, RFile.WriterOptions {
+class RFileWriterBuilder implements RFile.OutputArguments, RFile.WriterFSOptions {
 
   private static class OutputArgs extends FSConfArgs {
     private Path path;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/security/tokens/AuthenticationToken.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/security/tokens/AuthenticationToken.java b/core/src/main/java/org/apache/accumulo/core/client/security/tokens/AuthenticationToken.java
index 5c20555..a623e0d 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/security/tokens/AuthenticationToken.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/security/tokens/AuthenticationToken.java
@@ -129,7 +129,7 @@ public interface AuthenticationToken extends Writable, Destroyable, Cloneable {
   class Properties implements Destroyable, Map<String,char[]> {
 
     private boolean destroyed = false;
-    private HashMap<String,char[]> map = new HashMap<String,char[]>();
+    private HashMap<String,char[]> map = new HashMap<>();
 
     private void checkDestroyed() {
       if (destroyed)

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/security/tokens/CredentialProviderToken.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/security/tokens/CredentialProviderToken.java b/core/src/main/java/org/apache/accumulo/core/client/security/tokens/CredentialProviderToken.java
index a34aadf..5ac6f02 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/security/tokens/CredentialProviderToken.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/security/tokens/CredentialProviderToken.java
@@ -75,7 +75,7 @@ public class CredentialProviderToken extends PasswordToken {
 
   @Override
   public Set<TokenProperty> getProperties() {
-    LinkedHashSet<TokenProperty> properties = new LinkedHashSet<TokenProperty>();
+    LinkedHashSet<TokenProperty> properties = new LinkedHashSet<>();
     // Neither name or CPs are sensitive
     properties.add(new TokenProperty(NAME_PROPERTY, "Alias to extract from CredentialProvider", false));
     properties.add(new TokenProperty(CREDENTIAL_PROVIDERS_PROPERTY, "Comma separated list of URLs defining CredentialProvider(s)", false));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/security/tokens/PasswordToken.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/security/tokens/PasswordToken.java b/core/src/main/java/org/apache/accumulo/core/client/security/tokens/PasswordToken.java
index 9cbf914..f4ea78e 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/security/tokens/PasswordToken.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/security/tokens/PasswordToken.java
@@ -150,7 +150,7 @@ public class PasswordToken implements AuthenticationToken {
 
   @Override
   public Set<TokenProperty> getProperties() {
-    Set<TokenProperty> internal = new LinkedHashSet<TokenProperty>();
+    Set<TokenProperty> internal = new LinkedHashSet<>();
     internal.add(new TokenProperty("password", "the password for the principal", true));
     return internal;
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/conf/AccumuloConfiguration.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/conf/AccumuloConfiguration.java b/core/src/main/java/org/apache/accumulo/core/conf/AccumuloConfiguration.java
index 2e1d9bc..23ad278 100644
--- a/core/src/main/java/org/apache/accumulo/core/conf/AccumuloConfiguration.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/AccumuloConfiguration.java
@@ -119,7 +119,7 @@ public abstract class AccumuloConfiguration implements Iterable<Entry<String,Str
    * @return property value
    */
   public String get(String property) {
-    Map<String,String> propMap = new HashMap<String,String>(1);
+    Map<String,String> propMap = new HashMap<>(1);
     getProperties(propMap, new MatchFilter(property));
     return propMap.get(property);
   }
@@ -152,7 +152,7 @@ public abstract class AccumuloConfiguration implements Iterable<Entry<String,Str
   @Override
   public Iterator<Entry<String,String>> iterator() {
     Predicate<String> all = Predicates.alwaysTrue();
-    TreeMap<String,String> entries = new TreeMap<String,String>();
+    TreeMap<String,String> entries = new TreeMap<>();
     getProperties(entries, all);
     return entries.entrySet().iterator();
   }
@@ -178,7 +178,7 @@ public abstract class AccumuloConfiguration implements Iterable<Entry<String,Str
   public Map<String,String> getAllPropertiesWithPrefix(Property property) {
     checkType(property, PropertyType.PREFIX);
 
-    Map<String,String> propMap = new HashMap<String,String>();
+    Map<String,String> propMap = new HashMap<>();
     getProperties(propMap, new PrefixFilter(property.getKey()));
     return propMap;
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/conf/ConfigurationDocGen.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/conf/ConfigurationDocGen.java b/core/src/main/java/org/apache/accumulo/core/conf/ConfigurationDocGen.java
index 7357a9b..1c34b99 100644
--- a/core/src/main/java/org/apache/accumulo/core/conf/ConfigurationDocGen.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/ConfigurationDocGen.java
@@ -305,8 +305,8 @@ class ConfigurationDocGen {
 
   ConfigurationDocGen(PrintStream doc) {
     this.doc = doc;
-    this.prefixes = new ArrayList<Property>();
-    this.sortedProps = new TreeMap<String,Property>();
+    this.prefixes = new ArrayList<>();
+    this.sortedProps = new TreeMap<>();
 
     for (Property prop : Property.values()) {
       if (prop.isExperimental())

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/conf/CredentialProviderFactoryShim.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/conf/CredentialProviderFactoryShim.java b/core/src/main/java/org/apache/accumulo/core/conf/CredentialProviderFactoryShim.java
index 977097e..eb1920d 100644
--- a/core/src/main/java/org/apache/accumulo/core/conf/CredentialProviderFactoryShim.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/CredentialProviderFactoryShim.java
@@ -64,7 +64,7 @@ public class CredentialProviderFactoryShim {
   private static Boolean hadoopClassesAvailable = null;
 
   // access to cachedProviders should be synchronized when necessary (for example see getCredentialProviders)
-  private static final ConcurrentHashMap<String,List<Object>> cachedProviders = new ConcurrentHashMap<String,List<Object>>();
+  private static final ConcurrentHashMap<String,List<Object>> cachedProviders = new ConcurrentHashMap<>();
 
   /**
    * Determine if we can load the necessary CredentialProvider classes. Only loaded the first time, so subsequent invocations of this method should return fast.
@@ -291,7 +291,7 @@ public class CredentialProviderFactoryShim {
       return Collections.emptyList();
     }
 
-    ArrayList<String> aliases = new ArrayList<String>();
+    ArrayList<String> aliases = new ArrayList<>();
     for (Object providerObj : providerObjList) {
       if (null != providerObj) {
         Object aliasesObj;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java b/core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java
index 34d7fd2..e1ff7e1 100644
--- a/core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java
@@ -29,7 +29,7 @@ import com.google.common.base.Predicate;
 public class DefaultConfiguration extends AccumuloConfiguration {
   private final static Map<String,String> resolvedProps;
   static {
-    Map<String,String> m = new HashMap<String,String>();
+    Map<String,String> m = new HashMap<>();
     for (Property prop : Property.values()) {
       if (!prop.getType().equals(PropertyType.PREFIX)) {
         m.put(prop.getKey(), prop.getDefaultValue());

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/conf/ObservableConfiguration.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/conf/ObservableConfiguration.java b/core/src/main/java/org/apache/accumulo/core/conf/ObservableConfiguration.java
index 4c3f932..a1cd4ad 100644
--- a/core/src/main/java/org/apache/accumulo/core/conf/ObservableConfiguration.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/ObservableConfiguration.java
@@ -69,7 +69,7 @@ public abstract class ObservableConfiguration extends AccumuloConfiguration {
   }
 
   private static Collection<ConfigurationObserver> snapshot(Collection<ConfigurationObserver> observers) {
-    Collection<ConfigurationObserver> c = new java.util.ArrayList<ConfigurationObserver>();
+    Collection<ConfigurationObserver> c = new java.util.ArrayList<>();
     synchronized (observers) {
       c.addAll(observers);
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/conf/Property.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/conf/Property.java b/core/src/main/java/org/apache/accumulo/core/conf/Property.java
index bc1e60e..600f712 100644
--- a/core/src/main/java/org/apache/accumulo/core/conf/Property.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/Property.java
@@ -773,8 +773,8 @@ public enum Property {
    */
   public synchronized static boolean isValidPropertyKey(String key) {
     if (validProperties == null) {
-      validProperties = new HashSet<String>();
-      validPrefixes = new HashSet<String>();
+      validProperties = new HashSet<>();
+      validPrefixes = new HashSet<>();
 
       for (Property p : Property.values()) {
         if (p.getType().equals(PropertyType.PREFIX)) {
@@ -799,7 +799,7 @@ public enum Property {
    */
   public synchronized static boolean isValidTablePropertyKey(String key) {
     if (validTableProperties == null) {
-      validTableProperties = new HashSet<String>();
+      validTableProperties = new HashSet<>();
       for (Property p : Property.values()) {
         if (!p.getType().equals(PropertyType.PREFIX) && p.getKey().startsWith(Property.TABLE_PREFIX.getKey())) {
           validTableProperties.add(p.getKey());
@@ -947,7 +947,7 @@ public enum Property {
    */
   public static Map<String,String> getCompactionStrategyOptions(AccumuloConfiguration tableConf) {
     Map<String,String> longNames = tableConf.getAllPropertiesWithPrefix(Property.TABLE_COMPACTION_STRATEGY_PREFIX);
-    Map<String,String> result = new HashMap<String,String>();
+    Map<String,String> result = new HashMap<>();
     for (Entry<String,String> entry : longNames.entrySet()) {
       result.put(entry.getKey().substring(Property.TABLE_COMPACTION_STRATEGY_PREFIX.getKey().length()), entry.getValue());
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/conf/PropertyType.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/conf/PropertyType.java b/core/src/main/java/org/apache/accumulo/core/conf/PropertyType.java
index 22fcb8b..1120b87 100644
--- a/core/src/main/java/org/apache/accumulo/core/conf/PropertyType.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/PropertyType.java
@@ -296,7 +296,7 @@ public enum PropertyType {
         if (!VALID_RANGE.containsInteger(low) || !VALID_RANGE.containsInteger(high) || !(low <= high)) {
           throw new IllegalArgumentException("Invalid port range specified, only 1024 to 65535 supported.");
         }
-        return new Pair<Integer,Integer>(low, high);
+        return new Pair<>(low, high);
       }
       throw new IllegalArgumentException("Invalid port range specification, must use M-N notation.");
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/constraints/DefaultKeySizeConstraint.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/constraints/DefaultKeySizeConstraint.java b/core/src/main/java/org/apache/accumulo/core/constraints/DefaultKeySizeConstraint.java
index 7cc42c1..a2cc337 100644
--- a/core/src/main/java/org/apache/accumulo/core/constraints/DefaultKeySizeConstraint.java
+++ b/core/src/main/java/org/apache/accumulo/core/constraints/DefaultKeySizeConstraint.java
@@ -41,7 +41,7 @@ public class DefaultKeySizeConstraint implements Constraint {
     return null;
   }
 
-  final static List<Short> NO_VIOLATIONS = new ArrayList<Short>();
+  final static List<Short> NO_VIOLATIONS = new ArrayList<>();
 
   @Override
   public List<Short> check(Environment env, Mutation mutation) {
@@ -50,7 +50,7 @@ public class DefaultKeySizeConstraint implements Constraint {
     if (mutation.numBytes() < maxSize)
       return NO_VIOLATIONS;
 
-    List<Short> violations = new ArrayList<Short>();
+    List<Short> violations = new ArrayList<>();
 
     for (ColumnUpdate cu : mutation.getUpdates()) {
       int size = mutation.getRow().length;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/constraints/Violations.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/constraints/Violations.java b/core/src/main/java/org/apache/accumulo/core/constraints/Violations.java
index 1db13cd..65c372f 100644
--- a/core/src/main/java/org/apache/accumulo/core/constraints/Violations.java
+++ b/core/src/main/java/org/apache/accumulo/core/constraints/Violations.java
@@ -61,7 +61,7 @@ public class Violations {
    * Creates a new empty object.
    */
   public Violations() {
-    cvsmap = new HashMap<CVSKey,ConstraintViolationSummary>();
+    cvsmap = new HashMap<>();
   }
 
   /**
@@ -128,7 +128,7 @@ public class Violations {
    * @return list of violation summaries
    */
   public List<ConstraintViolationSummary> asList() {
-    return new ArrayList<ConstraintViolationSummary>(cvsmap.values());
+    return new ArrayList<>(cvsmap.values());
   }
 
 }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/constraints/VisibilityConstraint.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/constraints/VisibilityConstraint.java b/core/src/main/java/org/apache/accumulo/core/constraints/VisibilityConstraint.java
index d03f66e..6a962c2 100644
--- a/core/src/main/java/org/apache/accumulo/core/constraints/VisibilityConstraint.java
+++ b/core/src/main/java/org/apache/accumulo/core/constraints/VisibilityConstraint.java
@@ -56,7 +56,7 @@ public class VisibilityConstraint implements Constraint {
 
     HashSet<String> ok = null;
     if (updates.size() > 1)
-      ok = new HashSet<String>();
+      ok = new HashSet<>();
 
     VisibilityEvaluator ve = null;
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/data/Condition.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/data/Condition.java b/core/src/main/java/org/apache/accumulo/core/data/Condition.java
index 2dc2a0f..1ca5d06 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/Condition.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/Condition.java
@@ -265,8 +265,8 @@ public class Condition {
     checkArgument(iterators != null, "iterators is null");
 
     if (iterators.length > 1) {
-      HashSet<String> names = new HashSet<String>();
-      HashSet<Integer> prios = new HashSet<Integer>();
+      HashSet<String> names = new HashSet<>();
+      HashSet<Integer> prios = new HashSet<>();
 
       for (IteratorSetting iteratorSetting : iterators) {
         if (!names.add(iteratorSetting.getName()))

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/data/ConditionalMutation.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/data/ConditionalMutation.java b/core/src/main/java/org/apache/accumulo/core/data/ConditionalMutation.java
index ccec325..a10f9b7 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/ConditionalMutation.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/ConditionalMutation.java
@@ -34,7 +34,7 @@ import org.apache.hadoop.io.Text;
  */
 public class ConditionalMutation extends Mutation {
 
-  private List<Condition> conditions = new ArrayList<Condition>();
+  private List<Condition> conditions = new ArrayList<>();
 
   public ConditionalMutation(byte[] row, Condition... conditions) {
     super(row);
@@ -64,7 +64,7 @@ public class ConditionalMutation extends Mutation {
 
   public ConditionalMutation(ConditionalMutation cm) {
     super(cm);
-    this.conditions = new ArrayList<Condition>(cm.conditions);
+    this.conditions = new ArrayList<>(cm.conditions);
   }
 
   private void init(Condition... conditions) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/data/Mutation.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/data/Mutation.java b/core/src/main/java/org/apache/accumulo/core/data/Mutation.java
index 8deb2ed..ebc72f5 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/Mutation.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/Mutation.java
@@ -71,7 +71,7 @@ public class Mutation implements Writable {
    */
   public static enum SERIALIZED_FORMAT {
     VERSION1, VERSION2
-  };
+  }
 
   private boolean useOldDeserialize = false;
   private byte[] row;
@@ -319,7 +319,7 @@ public class Mutation implements Writable {
       put(val, valLength);
     } else {
       if (values == null) {
-        values = new ArrayList<byte[]>();
+        values = new ArrayList<>();
       }
       byte copy[] = new byte[valLength];
       System.arraycopy(val, 0, copy, 0, valLength);
@@ -969,7 +969,7 @@ public class Mutation implements Writable {
     if (!valuesPresent) {
       values = null;
     } else {
-      values = new ArrayList<byte[]>();
+      values = new ArrayList<>();
       int numValues = WritableUtils.readVInt(in);
       for (int i = 0; i < numValues; i++) {
         len = WritableUtils.readVInt(in);
@@ -1009,7 +1009,7 @@ public class Mutation implements Writable {
     if (!valuesPresent) {
       localValues = null;
     } else {
-      localValues = new ArrayList<byte[]>();
+      localValues = new ArrayList<>();
       int numValues = in.readInt();
       for (int i = 0; i < numValues; i++) {
         len = in.readInt();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/data/Range.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/data/Range.java b/core/src/main/java/org/apache/accumulo/core/data/Range.java
index c114e2b..306ee2d 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/Range.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/Range.java
@@ -427,10 +427,10 @@ public class Range implements WritableComparable<Range> {
     if (ranges.size() == 1)
       return Collections.singletonList(ranges.iterator().next());
 
-    List<Range> ral = new ArrayList<Range>(ranges);
+    List<Range> ral = new ArrayList<>(ranges);
     Collections.sort(ral);
 
-    ArrayList<Range> ret = new ArrayList<Range>(ranges.size());
+    ArrayList<Range> ret = new ArrayList<>(ranges.size());
 
     Range currentRange = ral.get(0);
     boolean currentStartKeyInclusive = ral.get(0).startKeyInclusive;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/data/impl/KeyExtent.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/data/impl/KeyExtent.java b/core/src/main/java/org/apache/accumulo/core/data/impl/KeyExtent.java
index 6cfacb3..dcb8eb7 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/impl/KeyExtent.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/impl/KeyExtent.java
@@ -309,7 +309,7 @@ public class KeyExtent implements WritableComparable<KeyExtent> {
       startRow = new Text();
     if (endRow == null)
       endRow = new Text();
-    Collection<KeyExtent> keys = new ArrayList<KeyExtent>();
+    Collection<KeyExtent> keys = new ArrayList<>();
     for (KeyExtent ckes : kes) {
       if (ckes.getPrevEndRow() == null) {
         if (ckes.getEndRow() == null) {
@@ -611,7 +611,7 @@ public class KeyExtent implements WritableComparable<KeyExtent> {
 
       if (ke.getPrevEndRow() == tabletKe.getPrevEndRow() || ke.getPrevEndRow() != null && tabletKe.getPrevEndRow() != null
           && tabletKe.getPrevEndRow().compareTo(ke.getPrevEndRow()) == 0) {
-        children = new TreeSet<KeyExtent>();
+        children = new TreeSet<>();
       }
 
       if (children != null) {
@@ -624,7 +624,7 @@ public class KeyExtent implements WritableComparable<KeyExtent> {
       }
     }
 
-    return new TreeSet<KeyExtent>();
+    return new TreeSet<>();
   }
 
   public static KeyExtent findContainingExtent(KeyExtent extent, SortedSet<KeyExtent> extents) {
@@ -690,7 +690,7 @@ public class KeyExtent implements WritableComparable<KeyExtent> {
       start = extents.tailSet(lookupKey);
     }
 
-    TreeSet<KeyExtent> result = new TreeSet<KeyExtent>();
+    TreeSet<KeyExtent> result = new TreeSet<>();
     for (KeyExtent ke : start) {
       if (startsAfter(nke, ke)) {
         break;
@@ -701,7 +701,7 @@ public class KeyExtent implements WritableComparable<KeyExtent> {
   }
 
   public boolean overlaps(KeyExtent other) {
-    SortedSet<KeyExtent> set = new TreeSet<KeyExtent>();
+    SortedSet<KeyExtent> set = new TreeSet<>();
     set.add(other);
     return !findOverlapping(this, set).isEmpty();
   }
@@ -722,7 +722,7 @@ public class KeyExtent implements WritableComparable<KeyExtent> {
       start = extents.tailMap(lookupKey);
     }
 
-    TreeSet<KeyExtent> result = new TreeSet<KeyExtent>();
+    TreeSet<KeyExtent> result = new TreeSet<>();
     for (Entry<KeyExtent,?> entry : start.entrySet()) {
       KeyExtent ke = entry.getKey();
       if (startsAfter(nke, ke)) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/file/BloomFilterLayer.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/file/BloomFilterLayer.java b/core/src/main/java/org/apache/accumulo/core/file/BloomFilterLayer.java
index c9ac8b6..6e5728a 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/BloomFilterLayer.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/BloomFilterLayer.java
@@ -80,7 +80,7 @@ public class BloomFilterLayer {
     }
 
     if (maxLoadThreads > 0) {
-      BlockingQueue<Runnable> q = new LinkedBlockingQueue<Runnable>();
+      BlockingQueue<Runnable> q = new LinkedBlockingQueue<>();
       loadThreadPool = new ThreadPoolExecutor(0, maxLoadThreads, 60, TimeUnit.SECONDS, q, new NamingThreadFactory("bloom-loader"));
     }
 
@@ -437,13 +437,13 @@ public class BloomFilterLayer {
 
     Random r = new Random();
 
-    HashSet<Integer> valsSet = new HashSet<Integer>();
+    HashSet<Integer> valsSet = new HashSet<>();
 
     for (int i = 0; i < 100000; i++) {
       valsSet.add(r.nextInt(Integer.MAX_VALUE));
     }
 
-    ArrayList<Integer> vals = new ArrayList<Integer>(valsSet);
+    ArrayList<Integer> vals = new ArrayList<>(valsSet);
     Collections.sort(vals);
 
     ConfigurationCopy acuconf = new ConfigurationCopy(AccumuloConfiguration.getDefaultConfiguration());

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/file/FileOperations.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/file/FileOperations.java b/core/src/main/java/org/apache/accumulo/core/file/FileOperations.java
index 4724bbe..10bb784 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/FileOperations.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/FileOperations.java
@@ -36,7 +36,7 @@ import org.apache.hadoop.fs.FileSystem;
 
 public abstract class FileOperations {
 
-  private static final HashSet<String> validExtensions = new HashSet<String>(Arrays.asList(Constants.MAPFILE_EXTENSION, RFile.EXTENSION));
+  private static final HashSet<String> validExtensions = new HashSet<>(Arrays.asList(Constants.MAPFILE_EXTENSION, RFile.EXTENSION));
 
   public static Set<String> getValidExtensions() {
     return validExtensions;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/CachedBlock.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/CachedBlock.java b/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/CachedBlock.java
index 19612d0..c67b4c7 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/CachedBlock.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/CachedBlock.java
@@ -44,7 +44,7 @@ public class CachedBlock implements HeapSize, Comparable<CachedBlock>, CacheEntr
      * Block from in-memory store
      */
     MEMORY
-  };
+  }
 
   private final String blockName;
   private final byte buf[];

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/CachedBlockQueue.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/CachedBlockQueue.java b/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/CachedBlockQueue.java
index 329ba71..248634d 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/CachedBlockQueue.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/CachedBlockQueue.java
@@ -48,7 +48,7 @@ public class CachedBlockQueue implements HeapSize {
     int initialSize = (int) Math.ceil(maxSize / (double) blockSize);
     if (initialSize == 0)
       initialSize++;
-    queue = new PriorityQueue<CachedBlock>(initialSize);
+    queue = new PriorityQueue<>(initialSize);
     heapSize = 0;
     this.maxSize = maxSize;
   }
@@ -88,7 +88,7 @@ public class CachedBlockQueue implements HeapSize {
    * @return list of cached elements in descending order
    */
   public CachedBlock[] get() {
-    LinkedList<CachedBlock> blocks = new LinkedList<CachedBlock>();
+    LinkedList<CachedBlock> blocks = new LinkedList<>();
     while (!queue.isEmpty()) {
       blocks.addFirst(queue.poll());
     }
@@ -101,7 +101,7 @@ public class CachedBlockQueue implements HeapSize {
    * @return list of cached elements in descending order
    */
   public LinkedList<CachedBlock> getList() {
-    LinkedList<CachedBlock> blocks = new LinkedList<CachedBlock>();
+    LinkedList<CachedBlock> blocks = new LinkedList<>();
     while (!queue.isEmpty()) {
       blocks.addFirst(queue.poll());
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/file/blockfile/impl/CachableBlockFile.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/file/blockfile/impl/CachableBlockFile.java b/core/src/main/java/org/apache/accumulo/core/file/blockfile/impl/CachableBlockFile.java
index 6a170e8..82454db 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/blockfile/impl/CachableBlockFile.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/blockfile/impl/CachableBlockFile.java
@@ -34,10 +34,10 @@ import org.apache.accumulo.core.file.blockfile.cache.CacheEntry;
 import org.apache.accumulo.core.file.rfile.bcfile.BCFile;
 import org.apache.accumulo.core.file.rfile.bcfile.BCFile.Reader.BlockReader;
 import org.apache.accumulo.core.file.rfile.bcfile.BCFile.Writer.BlockAppender;
-import org.apache.accumulo.core.util.ratelimit.RateLimiter;
 import org.apache.accumulo.core.file.streams.PositionedOutput;
 import org.apache.accumulo.core.file.streams.RateLimitedInputStream;
 import org.apache.accumulo.core.file.streams.RateLimitedOutputStream;
+import org.apache.accumulo.core.util.ratelimit.RateLimiter;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
@@ -52,7 +52,7 @@ import org.slf4j.LoggerFactory;
 
 public class CachableBlockFile {
 
-  private CachableBlockFile() {};
+  private CachableBlockFile() {}
 
   private static final Logger log = LoggerFactory.getLogger(CachableBlockFile.class);
 
@@ -482,7 +482,7 @@ public class CachableBlockFile {
           } catch (Exception e) {
             throw new RuntimeException(e);
           }
-          cb.setIndex(new SoftReference<T>(bi));
+          cb.setIndex(new SoftReference<>(bi));
         }
       }
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/file/rfile/BlockIndex.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/file/rfile/BlockIndex.java b/core/src/main/java/org/apache/accumulo/core/file/rfile/BlockIndex.java
index 1ed9aca..652515e 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/rfile/BlockIndex.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/rfile/BlockIndex.java
@@ -162,7 +162,7 @@ public class BlockIndex {
 
     int count = 0;
 
-    ArrayList<BlockIndexEntry> index = new ArrayList<BlockIndexEntry>(indexEntries - 1);
+    ArrayList<BlockIndexEntry> index = new ArrayList<>(indexEntries - 1);
 
     while (count < (indexEntry.getNumEntries() - interval + 1)) {
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/file/rfile/CreateEmpty.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/file/rfile/CreateEmpty.java b/core/src/main/java/org/apache/accumulo/core/file/rfile/CreateEmpty.java
index 46708a6..3a41e95 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/rfile/CreateEmpty.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/rfile/CreateEmpty.java
@@ -65,7 +65,7 @@ public class CreateEmpty {
     @Parameter(description = " <path> { <path> ... } Each path given is a URL. "
         + "Relative paths are resolved according to the default filesystem defined in your Hadoop configuration, which is usually an HDFS instance.",
         required = true, validateWith = NamedLikeRFile.class)
-    List<String> files = new ArrayList<String>();
+    List<String> files = new ArrayList<>();
   }
 
   public static void main(String[] args) throws Exception {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/file/rfile/MultiLevelIndex.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/file/rfile/MultiLevelIndex.java b/core/src/main/java/org/apache/accumulo/core/file/rfile/MultiLevelIndex.java
index a883f04..f99560e 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/rfile/MultiLevelIndex.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/rfile/MultiLevelIndex.java
@@ -132,7 +132,7 @@ public class MultiLevelIndex {
     }
   }
 
-  private static abstract class SerializedIndexBase<T> extends AbstractList<T> implements List<T>, RandomAccess {
+  private static abstract class SerializedIndexBase<T> extends AbstractList<T> implements RandomAccess {
     protected int[] offsets;
     protected byte[] data;
 
@@ -276,7 +276,7 @@ public class MultiLevelIndex {
 
       indexBytes = new ByteArrayOutputStream();
       indexOut = new DataOutputStream(indexBytes);
-      offsets = new ArrayList<Integer>();
+      offsets = new ArrayList<>();
     }
 
     public IndexBlock() {}
@@ -352,7 +352,7 @@ public class MultiLevelIndex {
 
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
         DataOutputStream dos = new DataOutputStream(baos);
-        ArrayList<Integer> oal = new ArrayList<Integer>();
+        ArrayList<Integer> oal = new ArrayList<>();
 
         for (int i = 0; i < size; i++) {
           IndexEntry ie = new IndexEntry(false);
@@ -501,7 +501,7 @@ public class MultiLevelIndex {
     Writer(BlockFileWriter blockFileWriter, int maxBlockSize) {
       this.blockFileWriter = blockFileWriter;
       this.threshold = maxBlockSize;
-      levels = new ArrayList<IndexBlock>();
+      levels = new ArrayList<>();
     }
 
     private void add(int level, Key key, int data, long offset, long compressedSize, long rawSize) throws IOException {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/file/rfile/PrintInfo.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/file/rfile/PrintInfo.java b/core/src/main/java/org/apache/accumulo/core/file/rfile/PrintInfo.java
index 1d4e055..cf0d046 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/rfile/PrintInfo.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/rfile/PrintInfo.java
@@ -61,7 +61,7 @@ public class PrintInfo implements KeywordExecutable {
     @Parameter(names = {"--keyStats"}, description = "print key length statistics for index and all data")
     boolean keyStats = false;
     @Parameter(description = " <file> { <file> ... }")
-    List<String> files = new ArrayList<String>();
+    List<String> files = new ArrayList<>();
     @Parameter(names = {"-c", "--config"}, variableArity = true, description = "Comma-separated Hadoop configuration files")
     List<String> configFiles = new ArrayList<>();
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/file/rfile/RFile.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/file/rfile/RFile.java b/core/src/main/java/org/apache/accumulo/core/file/rfile/RFile.java
index ac5cde7..b11cf1a 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/rfile/RFile.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/rfile/RFile.java
@@ -134,14 +134,14 @@ public class RFile {
     private int version;
 
     public LocalityGroupMetadata(int version, BlockFileReader br) {
-      columnFamilies = new HashMap<ByteSequence,MutableLong>();
+      columnFamilies = new HashMap<>();
       indexReader = new MultiLevelIndex.Reader(br, version);
       this.version = version;
     }
 
     public LocalityGroupMetadata(Set<ByteSequence> pcf, int indexBlockSize, BlockFileWriter bfw) {
       isDefaultLG = true;
-      columnFamilies = new HashMap<ByteSequence,MutableLong>();
+      columnFamilies = new HashMap<>();
       previousColumnFamilies = pcf;
 
       indexWriter = new MultiLevelIndex.BufferedWriter(new MultiLevelIndex.Writer(bfw, indexBlockSize));
@@ -150,7 +150,7 @@ public class RFile {
     public LocalityGroupMetadata(String name, Set<ByteSequence> cfset, int indexBlockSize, BlockFileWriter bfw) {
       this.name = name;
       isDefaultLG = false;
-      columnFamilies = new HashMap<ByteSequence,MutableLong>();
+      columnFamilies = new HashMap<>();
       for (ByteSequence cf : cfset) {
         columnFamilies.put(cf, new MutableLong(0));
       }
@@ -230,7 +230,7 @@ public class RFile {
         columnFamilies = null;
       } else {
         if (columnFamilies == null)
-          columnFamilies = new HashMap<ByteSequence,MutableLong>();
+          columnFamilies = new HashMap<>();
         else
           columnFamilies.clear();
 
@@ -289,8 +289,8 @@ public class RFile {
         out.printf("\t%-22s : %d\n", "Start block", startBlock);
       }
       out.printf("\t%-22s : %,d\n", "Num   blocks", indexReader.size());
-      TreeMap<Integer,Long> sizesByLevel = new TreeMap<Integer,Long>();
-      TreeMap<Integer,Long> countsByLevel = new TreeMap<Integer,Long>();
+      TreeMap<Integer,Long> sizesByLevel = new TreeMap<>();
+      TreeMap<Integer,Long> countsByLevel = new TreeMap<>();
       indexReader.getIndexInfo(sizesByLevel, countsByLevel);
       for (Entry<Integer,Long> entry : sizesByLevel.descendingMap().entrySet()) {
         out.printf("\t%-22s : %,d bytes  %,d blocks\n", "Index level " + entry.getKey(), entry.getValue(), countsByLevel.get(entry.getKey()));
@@ -498,8 +498,8 @@ public class RFile {
     private final long maxBlockSize;
     private final int indexBlockSize;
 
-    private ArrayList<LocalityGroupMetadata> localityGroups = new ArrayList<LocalityGroupMetadata>();
-    private ArrayList<LocalityGroupMetadata> sampleGroups = new ArrayList<LocalityGroupMetadata>();
+    private ArrayList<LocalityGroupMetadata> localityGroups = new ArrayList<>();
+    private ArrayList<LocalityGroupMetadata> sampleGroups = new ArrayList<>();
     private LocalityGroupMetadata currentLocalityGroup = null;
     private LocalityGroupMetadata sampleLocalityGroup = null;
 
@@ -524,7 +524,7 @@ public class RFile {
       this.maxBlockSize = (long) (blockSize * MAX_BLOCK_MULTIPLIER);
       this.indexBlockSize = indexBlockSize;
       this.fileWriter = bfw;
-      previousColumnFamilies = new HashSet<ByteSequence>();
+      previousColumnFamilies = new HashSet<>();
       this.samplerConfig = samplerConfig;
       this.sampler = sampler;
     }
@@ -627,7 +627,7 @@ public class RFile {
         sampleLocalityGroup = new LocalityGroupMetadata(previousColumnFamilies, indexBlockSize, fileWriter);
       } else {
         if (!Collections.disjoint(columnFamilies, previousColumnFamilies)) {
-          HashSet<ByteSequence> overlap = new HashSet<ByteSequence>(columnFamilies);
+          HashSet<ByteSequence> overlap = new HashSet<>(columnFamilies);
           overlap.retainAll(previousColumnFamilies);
           throw new IllegalArgumentException("Column families over lap with previous locality group : " + overlap);
         }
@@ -1043,8 +1043,8 @@ public class RFile {
 
     private BlockFileReader reader;
 
-    private ArrayList<LocalityGroupMetadata> localityGroups = new ArrayList<LocalityGroupMetadata>();
-    private ArrayList<LocalityGroupMetadata> sampleGroups = new ArrayList<LocalityGroupMetadata>();
+    private ArrayList<LocalityGroupMetadata> localityGroups = new ArrayList<>();
+    private ArrayList<LocalityGroupMetadata> sampleGroups = new ArrayList<>();
 
     private LocalityGroupReader currentReaders[];
     private LocalityGroupReader readers[];
@@ -1078,7 +1078,7 @@ public class RFile {
         int size = mb.readInt();
         currentReaders = new LocalityGroupReader[size];
 
-        deepCopies = new LinkedList<Reader>();
+        deepCopies = new LinkedList<>();
 
         for (int i = 0; i < size; i++) {
           LocalityGroupMetadata lgm = new LocalityGroupMetadata(ver, rdr);
@@ -1111,7 +1111,7 @@ public class RFile {
         mb.close();
       }
 
-      nonDefaultColumnFamilies = new HashSet<ByteSequence>();
+      nonDefaultColumnFamilies = new HashSet<>();
       for (LocalityGroupMetadata lgm : localityGroups) {
         if (!lgm.isDefaultLG)
           nonDefaultColumnFamilies.addAll(lgm.columnFamilies.keySet());
@@ -1295,7 +1295,7 @@ public class RFile {
       Map<String,ArrayList<ByteSequence>> cf = new HashMap<>();
 
       for (LocalityGroupMetadata lcg : localityGroups) {
-        ArrayList<ByteSequence> setCF = new ArrayList<ByteSequence>();
+        ArrayList<ByteSequence> setCF = new ArrayList<>();
 
         for (Entry<ByteSequence,MutableLong> entry : lcg.columnFamilies.entrySet()) {
           setCF.add(entry.getKey());
@@ -1340,7 +1340,7 @@ public class RFile {
 
     public FileSKVIterator getIndex() throws IOException {
 
-      ArrayList<Iterator<IndexEntry>> indexes = new ArrayList<Iterator<IndexEntry>>();
+      ArrayList<Iterator<IndexEntry>> indexes = new ArrayList<>();
 
       for (LocalityGroupReader lgr : currentReaders) {
         indexes.add(lgr.getIndex());

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/file/rfile/SplitLarge.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/file/rfile/SplitLarge.java b/core/src/main/java/org/apache/accumulo/core/file/rfile/SplitLarge.java
index 6c3aab3..a3a4193 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/rfile/SplitLarge.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/rfile/SplitLarge.java
@@ -47,7 +47,7 @@ public class SplitLarge {
     @Parameter(names = "-m", description = "the maximum size of the key/value pair to shunt to the small file")
     long maxSize = 10 * 1024 * 1024;
     @Parameter(description = "<file.rf> { <file.rf> ... }")
-    List<String> files = new ArrayList<String>();
+    List<String> files = new ArrayList<>();
   }
 
   public static void main(String[] args) throws Exception {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/BCFile.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/BCFile.java b/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/BCFile.java
index d7632f3..77de47e 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/BCFile.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/BCFile.java
@@ -569,7 +569,7 @@ public final class BCFile {
 
     public void read(DataInput in) throws IOException {
 
-      Map<String,String> optionsFromFile = new HashMap<String,String>();
+      Map<String,String> optionsFromFile = new HashMap<>();
 
       int numContextEntries = in.readInt();
       for (int i = 0; i < numContextEntries; i++) {
@@ -1077,13 +1077,13 @@ public final class BCFile {
 
     // for write
     public MetaIndex() {
-      index = new TreeMap<String,MetaIndexEntry>();
+      index = new TreeMap<>();
     }
 
     // for read, construct the map from the file
     public MetaIndex(DataInput in) throws IOException {
       int count = Utils.readVInt(in);
-      index = new TreeMap<String,MetaIndexEntry>();
+      index = new TreeMap<>();
 
       for (int nx = 0; nx < count; nx++) {
         MetaIndexEntry indexEntry = new MetaIndexEntry(in);
@@ -1175,7 +1175,7 @@ public final class BCFile {
       defaultCompressionAlgorithm = Compression.getCompressionAlgorithmByName(Utils.readString(in));
 
       int n = Utils.readVInt(in);
-      listRegions = new ArrayList<BlockRegion>(n);
+      listRegions = new ArrayList<>(n);
 
       for (int i = 0; i < n; i++) {
         BlockRegion region = new BlockRegion(in);
@@ -1187,7 +1187,7 @@ public final class BCFile {
     public DataIndex(String defaultCompressionAlgorithmName, boolean trackBlocks) {
       this.trackBlocks = trackBlocks;
       this.defaultCompressionAlgorithm = Compression.getCompressionAlgorithmByName(defaultCompressionAlgorithmName);
-      listRegions = new ArrayList<BlockRegion>();
+      listRegions = new ArrayList<>();
     }
 
     public Algorithm getDefaultCompressionAlgorithm() {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/Compression.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/Compression.java b/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/Compression.java
index 48a9acc..e9c137b 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/Compression.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/Compression.java
@@ -382,7 +382,7 @@ public final class Compression {
   public static String[] getSupportedAlgorithms() {
     Algorithm[] algos = Algorithm.class.getEnumConstants();
 
-    ArrayList<String> ret = new ArrayList<String>();
+    ArrayList<String> ret = new ArrayList<>();
     for (Algorithm a : algos) {
       if (a.isSupported()) {
         ret.add(a.getName());

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/iterators/AggregatingIterator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/AggregatingIterator.java b/core/src/main/java/org/apache/accumulo/core/iterators/AggregatingIterator.java
index 3292cc2..979eaeb 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/AggregatingIterator.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/AggregatingIterator.java
@@ -173,8 +173,7 @@ public class AggregatingIterator implements SortedKeyValueIterator<Key,Value>, O
       String context = null;
       if (null != env)
         context = env.getConfig().get(Property.TABLE_CLASSPATH);
-      this.aggregators = new ColumnToClassMapping<org.apache.accumulo.core.iterators.aggregation.Aggregator>(options,
-          org.apache.accumulo.core.iterators.aggregation.Aggregator.class, context);
+      this.aggregators = new ColumnToClassMapping<>(options, org.apache.accumulo.core.iterators.aggregation.Aggregator.class, context);
     } catch (ClassNotFoundException e) {
       log.error(e.toString());
       throw new IllegalArgumentException(e);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/iterators/FirstEntryInRowIterator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/FirstEntryInRowIterator.java b/core/src/main/java/org/apache/accumulo/core/iterators/FirstEntryInRowIterator.java
index fcca805..32e6464 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/FirstEntryInRowIterator.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/FirstEntryInRowIterator.java
@@ -132,7 +132,7 @@ public class FirstEntryInRowIterator extends SkippingIterator implements OptionD
   public IteratorOptions describeOptions() {
     String name = "firstEntry";
     String desc = "Only allows iteration over the first entry per row";
-    HashMap<String,String> namedOptions = new HashMap<String,String>();
+    HashMap<String,String> namedOptions = new HashMap<>();
     namedOptions.put(NUM_SCANS_STRING_NAME, "Number of scans to try before seeking [10]");
     return new IteratorOptions(name, desc, namedOptions, null);
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/iterators/IteratorUtil.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/IteratorUtil.java b/core/src/main/java/org/apache/accumulo/core/iterators/IteratorUtil.java
index 8188ba3..981404c 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/IteratorUtil.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/IteratorUtil.java
@@ -118,7 +118,7 @@ public class IteratorUtil {
    * @return A map of Table properties
    */
   public static Map<String,String> generateInitialTableProperties(boolean limitVersion) {
-    TreeMap<String,String> props = new TreeMap<String,String>();
+    TreeMap<String,String> props = new TreeMap<>();
 
     if (limitVersion) {
       for (IteratorScope iterScope : IteratorScope.values()) {
@@ -170,7 +170,7 @@ public class IteratorUtil {
 
         Map<String,String> options = allOptions.get(iterName);
         if (options == null) {
-          options = new HashMap<String,String>();
+          options = new HashMap<>();
           allOptions.put(iterName, options);
         }
 
@@ -195,8 +195,8 @@ public class IteratorUtil {
       SortedKeyValueIterator<K,V> source, KeyExtent extent, AccumuloConfiguration conf, List<IteratorSetting> iterators, IteratorEnvironment env)
       throws IOException {
 
-    List<IterInfo> ssiList = new ArrayList<IterInfo>();
-    Map<String,Map<String,String>> ssio = new HashMap<String,Map<String,String>>();
+    List<IterInfo> ssiList = new ArrayList<>();
+    Map<String,Map<String,String>> ssio = new HashMap<>();
 
     for (IteratorSetting is : iterators) {
       ssiList.add(new IterInfo(is.getPriority(), is.getIteratorClass(), is.getName()));
@@ -235,8 +235,8 @@ public class IteratorUtil {
   public static <K extends WritableComparable<?>,V extends Writable> SortedKeyValueIterator<K,V> loadIterators(IteratorScope scope,
       SortedKeyValueIterator<K,V> source, KeyExtent extent, AccumuloConfiguration conf, List<IterInfo> ssiList, Map<String,Map<String,String>> ssio,
       IteratorEnvironment env, boolean useAccumuloClassLoader) throws IOException {
-    List<IterInfo> iters = new ArrayList<IterInfo>(ssiList);
-    Map<String,Map<String,String>> allOptions = new HashMap<String,Map<String,String>>();
+    List<IterInfo> iters = new ArrayList<>(ssiList);
+    Map<String,Map<String,String>> allOptions = new HashMap<>();
     parseIteratorConfiguration(scope, iters, ssio, allOptions, conf);
     return loadIterators(source, iters, allOptions, env, useAccumuloClassLoader, conf.get(Property.TABLE_CLASSPATH));
   }
@@ -244,8 +244,8 @@ public class IteratorUtil {
   public static <K extends WritableComparable<?>,V extends Writable> SortedKeyValueIterator<K,V> loadIterators(IteratorScope scope,
       SortedKeyValueIterator<K,V> source, KeyExtent extent, AccumuloConfiguration conf, List<IterInfo> ssiList, Map<String,Map<String,String>> ssio,
       IteratorEnvironment env, boolean useAccumuloClassLoader, String classLoaderContext) throws IOException {
-    List<IterInfo> iters = new ArrayList<IterInfo>(ssiList);
-    Map<String,Map<String,String>> allOptions = new HashMap<String,Map<String,String>>();
+    List<IterInfo> iters = new ArrayList<>(ssiList);
+    Map<String,Map<String,String>> allOptions = new HashMap<>();
     parseIteratorConfiguration(scope, iters, ssio, allOptions, conf);
     return loadIterators(source, iters, allOptions, env, useAccumuloClassLoader, classLoaderContext);
   }
@@ -260,7 +260,7 @@ public class IteratorUtil {
       Collection<IterInfo> iters, Map<String,Map<String,String>> iterOpts, IteratorEnvironment env, boolean useAccumuloClassLoader, String context,
       Map<String,Class<? extends SortedKeyValueIterator<K,V>>> classCache) throws IOException {
     // wrap the source in a SynchronizedIterator in case any of the additional configured iterators want to use threading
-    SortedKeyValueIterator<K,V> prev = new SynchronizedIterator<K,V>(source);
+    SortedKeyValueIterator<K,V> prev = new SynchronizedIterator<>(source);
 
     try {
       for (IterInfo iterInfo : iters) {
@@ -349,7 +349,7 @@ public class IteratorUtil {
   }
 
   public static IteratorConfig toIteratorConfig(List<IteratorSetting> iterators) {
-    ArrayList<TIteratorSetting> tisList = new ArrayList<TIteratorSetting>();
+    ArrayList<TIteratorSetting> tisList = new ArrayList<>();
 
     for (IteratorSetting iteratorSetting : iterators) {
       tisList.add(toTIteratorSetting(iteratorSetting));
@@ -359,7 +359,7 @@ public class IteratorUtil {
   }
 
   public static List<IteratorSetting> toIteratorSettings(IteratorConfig ic) {
-    List<IteratorSetting> ret = new ArrayList<IteratorSetting>();
+    List<IteratorSetting> ret = new ArrayList<>();
     for (TIteratorSetting tIteratorSetting : ic.getIterators()) {
       ret.add(toIteratorSetting(tIteratorSetting));
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/iterators/LongCombiner.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/LongCombiner.java b/core/src/main/java/org/apache/accumulo/core/iterators/LongCombiner.java
index 35ceb6e..6cddea0 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/LongCombiner.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/LongCombiner.java
@@ -118,7 +118,7 @@ public abstract class LongCombiner extends TypedValueCombiner<Long> {
   /**
    * An Encoder that uses a variable-length encoding for Longs. It uses WritableUtils.writeVLong and WritableUtils.readVLong for encoding and decoding.
    */
-  public static class VarLenEncoder extends AbstractLexicoder<Long> implements Encoder<Long> {
+  public static class VarLenEncoder extends AbstractLexicoder<Long> {
     @Override
     public byte[] encode(Long v) {
       ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -153,7 +153,7 @@ public abstract class LongCombiner extends TypedValueCombiner<Long> {
   /**
    * An Encoder that uses an 8-byte encoding for Longs.
    */
-  public static class FixedLenEncoder extends AbstractLexicoder<Long> implements Encoder<Long> {
+  public static class FixedLenEncoder extends AbstractLexicoder<Long> {
     @Override
     public byte[] encode(Long l) {
       byte[] b = new byte[8];
@@ -198,7 +198,7 @@ public abstract class LongCombiner extends TypedValueCombiner<Long> {
   /**
    * An Encoder that uses a String representation of Longs. It uses Long.toString and Long.parseLong for encoding and decoding.
    */
-  public static class StringEncoder extends AbstractLexicoder<Long> implements Encoder<Long> {
+  public static class StringEncoder extends AbstractLexicoder<Long> {
     @Override
     public byte[] encode(Long v) {
       return Long.toString(v).getBytes(UTF_8);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/iterators/OptionDescriber.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/OptionDescriber.java b/core/src/main/java/org/apache/accumulo/core/iterators/OptionDescriber.java
index 756edd1..73dfd61 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/OptionDescriber.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/OptionDescriber.java
@@ -57,10 +57,10 @@ public interface OptionDescriber {
       this.name = name;
       this.namedOptions = null;
       if (namedOptions != null)
-        this.namedOptions = new LinkedHashMap<String,String>(namedOptions);
+        this.namedOptions = new LinkedHashMap<>(namedOptions);
       this.unnamedOptionDescriptions = null;
       if (unnamedOptionDescriptions != null)
-        this.unnamedOptionDescriptions = new ArrayList<String>(unnamedOptionDescriptions);
+        this.unnamedOptionDescriptions = new ArrayList<>(unnamedOptionDescriptions);
       this.description = description;
     }
 
@@ -81,11 +81,11 @@ public interface OptionDescriber {
     }
 
     public void setNamedOptions(Map<String,String> namedOptions) {
-      this.namedOptions = new LinkedHashMap<String,String>(namedOptions);
+      this.namedOptions = new LinkedHashMap<>(namedOptions);
     }
 
     public void setUnnamedOptionDescriptions(List<String> unnamedOptionDescriptions) {
-      this.unnamedOptionDescriptions = new ArrayList<String>(unnamedOptionDescriptions);
+      this.unnamedOptionDescriptions = new ArrayList<>(unnamedOptionDescriptions);
     }
 
     public void setName(String name) {
@@ -98,13 +98,13 @@ public interface OptionDescriber {
 
     public void addNamedOption(String name, String description) {
       if (namedOptions == null)
-        namedOptions = new LinkedHashMap<String,String>();
+        namedOptions = new LinkedHashMap<>();
       namedOptions.put(name, description);
     }
 
     public void addUnnamedOption(String description) {
       if (unnamedOptionDescriptions == null)
-        unnamedOptionDescriptions = new ArrayList<String>();
+        unnamedOptionDescriptions = new ArrayList<>();
       unnamedOptionDescriptions.add(description);
     }
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/iterators/OrIterator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/OrIterator.java b/core/src/main/java/org/apache/accumulo/core/iterators/OrIterator.java
index 3769eae..43ed5ed 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/OrIterator.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/OrIterator.java
@@ -40,7 +40,7 @@ public class OrIterator implements SortedKeyValueIterator<Key,Value> {
 
   private TermSource currentTerm;
   private ArrayList<TermSource> sources;
-  private PriorityQueue<TermSource> sorted = new PriorityQueue<TermSource>(5);
+  private PriorityQueue<TermSource> sorted = new PriorityQueue<>(5);
   private static final Text nullText = new Text();
   private static final Key nullKey = new Key();
 
@@ -83,11 +83,11 @@ public class OrIterator implements SortedKeyValueIterator<Key,Value> {
   }
 
   public OrIterator() {
-    this.sources = new ArrayList<TermSource>();
+    this.sources = new ArrayList<>();
   }
 
   private OrIterator(OrIterator other, IteratorEnvironment env) {
-    this.sources = new ArrayList<TermSource>();
+    this.sources = new ArrayList<>();
 
     for (TermSource TS : other.sources)
       this.sources.add(new TermSource(TS.iter.deepCopy(env), TS.term));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/iterators/TypedValueCombiner.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/TypedValueCombiner.java b/core/src/main/java/org/apache/accumulo/core/iterators/TypedValueCombiner.java
index 7e7fa64..03e4d88 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/TypedValueCombiner.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/TypedValueCombiner.java
@@ -179,7 +179,7 @@ public abstract class TypedValueCombiner<V> extends Combiner {
 
   @Override
   public Value reduce(Key key, Iterator<Value> iter) {
-    return new Value(encoder.encode(typedReduce(key, new VIterator<V>(iter, encoder, lossy))));
+    return new Value(encoder.encode(typedReduce(key, new VIterator<>(iter, encoder, lossy))));
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/iterators/conf/ColumnSet.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/conf/ColumnSet.java b/core/src/main/java/org/apache/accumulo/core/iterators/conf/ColumnSet.java
index c1edf5d..7c74ad6 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/conf/ColumnSet.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/conf/ColumnSet.java
@@ -36,8 +36,8 @@ public class ColumnSet {
   private ColFamHashKey lookupCF = new ColFamHashKey();
 
   public ColumnSet() {
-    objectsCF = new HashSet<ColFamHashKey>();
-    objectsCol = new HashSet<ColHashKey>();
+    objectsCF = new HashSet<>();
+    objectsCol = new HashSet<>();
   }
 
   public ColumnSet(Collection<String> objectStrings) {
@@ -126,9 +126,9 @@ public class ColumnSet {
     String[] cols = columns.split(":");
 
     if (cols.length == 1) {
-      return new Pair<Text,Text>(decode(cols[0]), null);
+      return new Pair<>(decode(cols[0]), null);
     } else if (cols.length == 2) {
-      return new Pair<Text,Text>(decode(cols[0]), decode(cols[1]));
+      return new Pair<>(decode(cols[0]), decode(cols[1]));
     } else {
       throw new IllegalArgumentException(columns);
     }


[20/32] accumulo git commit: ACCUMULO-4357 Remove unneeded code for readability

Posted by ct...@apache.org.
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/tserver/src/main/java/org/apache/accumulo/tserver/CompactionQueue.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/CompactionQueue.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/CompactionQueue.java
index f87131e..3d820dd 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/CompactionQueue.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/CompactionQueue.java
@@ -33,7 +33,7 @@ import org.apache.htrace.wrappers.TraceRunnable;
  */
 class CompactionQueue extends AbstractQueue<TraceRunnable> implements BlockingQueue<TraceRunnable> {
 
-  private List<TraceRunnable> task = new LinkedList<TraceRunnable>();
+  private List<TraceRunnable> task = new LinkedList<>();
 
   private static final Comparator<TraceRunnable> comparator = new Comparator<TraceRunnable>() {
     @SuppressWarnings("unchecked")

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/tserver/src/main/java/org/apache/accumulo/tserver/ConditionalMutationSet.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/ConditionalMutationSet.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/ConditionalMutationSet.java
index 82e5057..e1a8de8 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/ConditionalMutationSet.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/ConditionalMutationSet.java
@@ -54,8 +54,8 @@ public class ConditionalMutationSet {
   static void defer(Map<KeyExtent,List<ServerConditionalMutation>> updates, Map<KeyExtent,List<ServerConditionalMutation>> deferredMutations, DeferFilter filter) {
     for (Entry<KeyExtent,List<ServerConditionalMutation>> entry : updates.entrySet()) {
       List<ServerConditionalMutation> scml = entry.getValue();
-      List<ServerConditionalMutation> okMutations = new ArrayList<ServerConditionalMutation>(scml.size());
-      List<ServerConditionalMutation> deferred = new ArrayList<ServerConditionalMutation>();
+      List<ServerConditionalMutation> okMutations = new ArrayList<>(scml.size());
+      List<ServerConditionalMutation> deferred = new ArrayList<>();
       filter.defer(scml, okMutations, deferred);
 
       if (deferred.size() > 0) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/tserver/src/main/java/org/apache/accumulo/tserver/FileManager.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/FileManager.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/FileManager.java
index 699b5a7..8bc0fed 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/FileManager.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/FileManager.java
@@ -125,7 +125,7 @@ public class FileManager {
 
       long curTime = System.currentTimeMillis();
 
-      ArrayList<FileSKVIterator> filesToClose = new ArrayList<FileSKVIterator>();
+      ArrayList<FileSKVIterator> filesToClose = new ArrayList<>();
 
       // determine which files to close in a sync block, and then close the
       // files outside of the sync block
@@ -176,8 +176,8 @@ public class FileManager {
     this.maxOpen = maxOpen;
     this.fs = fs;
 
-    this.openFiles = new HashMap<String,List<OpenReader>>();
-    this.reservedReaders = new HashMap<FileSKVIterator,String>();
+    this.openFiles = new HashMap<>();
+    this.reservedReaders = new HashMap<>();
 
     this.maxIdleTime = context.getConfiguration().getTimeInMillis(Property.TSERV_MAX_IDLE);
     SimpleTimer.getInstance(context.getConfiguration()).schedule(new IdleFileCloser(), maxIdleTime, maxIdleTime / 2);
@@ -196,7 +196,7 @@ public class FileManager {
 
   private List<FileSKVIterator> takeLRUOpenFiles(int numToTake) {
 
-    ArrayList<OpenReader> openReaders = new ArrayList<OpenReader>();
+    ArrayList<OpenReader> openReaders = new ArrayList<>();
 
     for (Entry<String,List<OpenReader>> entry : openFiles.entrySet()) {
       openReaders.addAll(entry.getValue());
@@ -204,7 +204,7 @@ public class FileManager {
 
     Collections.sort(openReaders);
 
-    ArrayList<FileSKVIterator> ret = new ArrayList<FileSKVIterator>();
+    ArrayList<FileSKVIterator> ret = new ArrayList<>();
 
     for (int i = 0; i < numToTake && i < openReaders.size(); i++) {
       OpenReader or = openReaders.get(i);
@@ -227,7 +227,7 @@ public class FileManager {
   private static <T> List<T> getFileList(String file, Map<String,List<T>> files) {
     List<T> ofl = files.get(file);
     if (ofl == null) {
-      ofl = new ArrayList<T>();
+      ofl = new ArrayList<>();
       files.put(file, ofl);
     }
 
@@ -245,7 +245,7 @@ public class FileManager {
   }
 
   private List<String> takeOpenFiles(Collection<String> files, List<FileSKVIterator> reservedFiles, Map<FileSKVIterator,String> readersReserved) {
-    List<String> filesToOpen = new LinkedList<String>(files);
+    List<String> filesToOpen = new LinkedList<>(files);
     for (Iterator<String> iterator = filesToOpen.iterator(); iterator.hasNext();) {
       String file = iterator.next();
 
@@ -280,8 +280,8 @@ public class FileManager {
 
     List<String> filesToOpen = null;
     List<FileSKVIterator> filesToClose = Collections.emptyList();
-    List<FileSKVIterator> reservedFiles = new ArrayList<FileSKVIterator>();
-    Map<FileSKVIterator,String> readersReserved = new HashMap<FileSKVIterator,String>();
+    List<FileSKVIterator> reservedFiles = new ArrayList<>();
+    Map<FileSKVIterator,String> readersReserved = new HashMap<>();
 
     if (!tablet.isMeta()) {
       filePermits.acquireUninterruptibly(files.size());
@@ -401,7 +401,7 @@ public class FileManager {
     FileDataSource(String file, SortedKeyValueIterator<Key,Value> iter) {
       this.file = file;
       this.iter = iter;
-      this.deepCopies = new ArrayList<FileManager.FileDataSource>();
+      this.deepCopies = new ArrayList<>();
     }
 
     public FileDataSource(IteratorEnvironment env, SortedKeyValueIterator<Key,Value> deepCopy, ArrayList<FileDataSource> deepCopies) {
@@ -470,8 +470,8 @@ public class FileManager {
     private boolean continueOnFailure;
 
     ScanFileManager(KeyExtent tablet) {
-      tabletReservedReaders = new ArrayList<FileSKVIterator>();
-      dataSources = new ArrayList<FileDataSource>();
+      tabletReservedReaders = new ArrayList<>();
+      dataSources = new ArrayList<>();
       this.tablet = tablet;
 
       continueOnFailure = context.getServerConfigurationFactory().getTableConfiguration(tablet).getBoolean(Property.TABLE_FAILURES_IGNORE);
@@ -482,7 +482,7 @@ public class FileManager {
     }
 
     private List<FileSKVIterator> openFileRefs(Collection<FileRef> files) throws TooManyFilesException, IOException {
-      List<String> strings = new ArrayList<String>(files.size());
+      List<String> strings = new ArrayList<>(files.size());
       for (FileRef ref : files)
         strings.add(ref.path().toString());
       return openFiles(strings);
@@ -508,7 +508,7 @@ public class FileManager {
 
       List<FileSKVIterator> newlyReservedReaders = openFileRefs(files.keySet());
 
-      ArrayList<InterruptibleIterator> iters = new ArrayList<InterruptibleIterator>();
+      ArrayList<InterruptibleIterator> iters = new ArrayList<>();
 
       for (FileSKVIterator reader : newlyReservedReaders) {
         String filename = getReservedReadeFilename(reader);
@@ -554,17 +554,17 @@ public class FileManager {
       if (tabletReservedReaders.size() != 0)
         throw new IllegalStateException();
 
-      Collection<String> files = new ArrayList<String>();
+      Collection<String> files = new ArrayList<>();
       for (FileDataSource fds : dataSources)
         files.add(fds.file);
 
       List<FileSKVIterator> newlyReservedReaders = openFiles(files);
-      Map<String,List<FileSKVIterator>> map = new HashMap<String,List<FileSKVIterator>>();
+      Map<String,List<FileSKVIterator>> map = new HashMap<>();
       for (FileSKVIterator reader : newlyReservedReaders) {
         String fileName = getReservedReadeFilename(reader);
         List<FileSKVIterator> list = map.get(fileName);
         if (list == null) {
-          list = new LinkedList<FileSKVIterator>();
+          list = new LinkedList<>();
           map.put(fileName, list);
         }
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/tserver/src/main/java/org/apache/accumulo/tserver/InMemoryMap.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/InMemoryMap.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/InMemoryMap.java
index a87586b..c1ae9e6 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/InMemoryMap.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/InMemoryMap.java
@@ -297,7 +297,7 @@ public class InMemoryMap {
       this.groupFams = new PreAllocatedArray<>(groups.size());
       this.maps = new SimpleMap[groups.size() + 1];
       this.partitioned = new PreAllocatedArray<>(groups.size() + 1);
-      this.nonDefaultColumnFamilies = new HashSet<ByteSequence>();
+      this.nonDefaultColumnFamilies = new HashSet<>();
 
       for (int i = 0; i < maps.length; i++) {
         maps[i] = newMap(useNativeMap);
@@ -305,7 +305,7 @@ public class InMemoryMap {
 
       int count = 0;
       for (Set<ByteSequence> cfset : groups.values()) {
-        HashMap<ByteSequence,MutableLong> map = new HashMap<ByteSequence,MutableLong>();
+        HashMap<ByteSequence,MutableLong> map = new HashMap<>();
         for (ByteSequence bs : cfset)
           map.put(bs, new MutableLong(1));
         this.groupFams.set(count++, map);
@@ -394,7 +394,7 @@ public class InMemoryMap {
   }
 
   private static class DefaultMap implements SimpleMap {
-    private ConcurrentSkipListMap<Key,Value> map = new ConcurrentSkipListMap<Key,Value>(new MemKeyComparator());
+    private ConcurrentSkipListMap<Key,Value> map = new ConcurrentSkipListMap<>(new MemKeyComparator());
     private AtomicLong bytesInMemory = new AtomicLong();
     private AtomicInteger size = new AtomicInteger();
 
@@ -809,7 +809,7 @@ public class InMemoryMap {
 
         InterruptibleIterator iter = map.skvIterator(null);
 
-        HashSet<ByteSequence> allfams = new HashSet<ByteSequence>();
+        HashSet<ByteSequence> allfams = new HashSet<>();
 
         for (Entry<String,Set<ByteSequence>> entry : lggroups.entrySet()) {
           allfams.addAll(entry.getValue());

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/tserver/src/main/java/org/apache/accumulo/tserver/NativeMap.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/NativeMap.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/NativeMap.java
index 3c00b67..00f6ba8 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/NativeMap.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/NativeMap.java
@@ -69,7 +69,7 @@ public class NativeMap implements Iterable<Map.Entry<Key,Value>> {
   // Load native library
   static {
     // Check standard directories
-    List<File> directories = new ArrayList<File>(Arrays.asList(new File[] {new File("/usr/lib64"), new File("/usr/lib")}));
+    List<File> directories = new ArrayList<>(Arrays.asList(new File[] {new File("/usr/lib64"), new File("/usr/lib")}));
     // Check in ACCUMULO_HOME location, too
     String envAccumuloHome = System.getenv("ACCUMULO_HOME");
     if (envAccumuloHome != null) {
@@ -106,7 +106,7 @@ public class NativeMap implements Iterable<Map.Entry<Key,Value>> {
   public static void loadNativeLib(List<File> searchPath) {
     if (!isLoaded()) {
       List<String> names = getValidLibraryNames();
-      List<File> tryList = new ArrayList<File>(searchPath.size() * names.size());
+      List<File> tryList = new ArrayList<>(searchPath.size() * names.size());
 
       for (File p : searchPath)
         if (p.exists() && p.isDirectory())
@@ -131,7 +131,7 @@ public class NativeMap implements Iterable<Map.Entry<Key,Value>> {
   }
 
   private static List<String> getValidLibraryNames() {
-    ArrayList<String> names = new ArrayList<String>(3);
+    ArrayList<String> names = new ArrayList<>(3);
 
     String libname = System.mapLibraryName("accumulo");
     names.add(libname);
@@ -199,7 +199,7 @@ public class NativeMap implements Iterable<Map.Entry<Key,Value>> {
   private static synchronized long createNativeMap() {
 
     if (!init) {
-      allocatedNativeMaps = new HashSet<Long>();
+      allocatedNativeMaps = new HashSet<>();
 
       Runnable r = new Runnable() {
         @Override
@@ -452,7 +452,7 @@ public class NativeMap implements Iterable<Map.Entry<Key,Value>> {
 
       hasNext = nmiNext(nmiPointer, fieldsLens);
 
-      return new SimpleImmutableEntry<Key,Value>(k, v);
+      return new SimpleImmutableEntry<>(k, v);
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/tserver/src/main/java/org/apache/accumulo/tserver/RowLocks.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/RowLocks.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/RowLocks.java
index 03707d1..62f321e 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/RowLocks.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/RowLocks.java
@@ -34,7 +34,7 @@ import org.apache.accumulo.tserver.data.ServerConditionalMutation;
  */
 class RowLocks {
 
-  private Map<ByteSequence,RowLock> rowLocks = new HashMap<ByteSequence,RowLock>();
+  private Map<ByteSequence,RowLock> rowLocks = new HashMap<>();
 
   static class RowLock {
     ReentrantLock rlock;
@@ -82,7 +82,7 @@ class RowLocks {
   }
 
   List<RowLock> acquireRowlocks(Map<KeyExtent,List<ServerConditionalMutation>> updates, Map<KeyExtent,List<ServerConditionalMutation>> deferred) {
-    ArrayList<RowLock> locks = new ArrayList<RowLock>();
+    ArrayList<RowLock> locks = new ArrayList<>();
 
     // assume that mutations are in sorted order to avoid deadlock
     synchronized (rowLocks) {
@@ -100,7 +100,7 @@ class RowLocks {
       for (RowLock rowLock : locks) {
         if (!rowLock.tryLock()) {
           if (rowsNotLocked == null)
-            rowsNotLocked = new HashSet<ByteSequence>();
+            rowsNotLocked = new HashSet<>();
           rowsNotLocked.add(rowLock.rowSeq);
         }
       }
@@ -126,8 +126,8 @@ class RowLocks {
         }
       });
 
-      ArrayList<RowLock> filteredLocks = new ArrayList<RowLock>();
-      ArrayList<RowLock> locksToReturn = new ArrayList<RowLock>();
+      ArrayList<RowLock> filteredLocks = new ArrayList<>();
+      ArrayList<RowLock> locksToReturn = new ArrayList<>();
       for (RowLock rowLock : locks) {
         if (rowsNotLocked.contains(rowLock.rowSeq)) {
           locksToReturn.add(rowLock);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletIteratorEnvironment.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletIteratorEnvironment.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletIteratorEnvironment.java
index f9081b4..445391e 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletIteratorEnvironment.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletIteratorEnvironment.java
@@ -97,7 +97,7 @@ public class TabletIteratorEnvironment implements IteratorEnvironment {
     this.config = config;
     this.fullMajorCompaction = fullMajC;
     this.authorizations = Authorizations.EMPTY;
-    this.topLevelIterators = new ArrayList<SortedKeyValueIterator<Key,Value>>();
+    this.topLevelIterators = new ArrayList<>();
   }
 
   @Override
@@ -138,7 +138,7 @@ public class TabletIteratorEnvironment implements IteratorEnvironment {
   public SortedKeyValueIterator<Key,Value> getTopLevelIterator(SortedKeyValueIterator<Key,Value> iter) {
     if (topLevelIterators.isEmpty())
       return iter;
-    ArrayList<SortedKeyValueIterator<Key,Value>> allIters = new ArrayList<SortedKeyValueIterator<Key,Value>>(topLevelIterators);
+    ArrayList<SortedKeyValueIterator<Key,Value>> allIters = new ArrayList<>(topLevelIterators);
     allIters.add(iter);
     return new MultiIterator(allIters, false);
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
index 5626f12..94e2ed9 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
@@ -301,7 +301,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
   private final TabletServerResourceManager resourceManager;
   private final SecurityOperation security;
 
-  private final BlockingDeque<MasterMessage> masterMessages = new LinkedBlockingDeque<MasterMessage>();
+  private final BlockingDeque<MasterMessage> masterMessages = new LinkedBlockingDeque<>();
 
   private Thread majorCompactorThread;
 
@@ -430,12 +430,12 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
       if (!security.canPerformSystemActions(credentials))
         throw new ThriftSecurityException(credentials.getPrincipal(), SecurityErrorCode.PERMISSION_DENIED);
 
-      List<TKeyExtent> failures = new ArrayList<TKeyExtent>();
+      List<TKeyExtent> failures = new ArrayList<>();
 
       for (Entry<TKeyExtent,Map<String,MapFileInfo>> entry : files.entrySet()) {
         TKeyExtent tke = entry.getKey();
         Map<String,MapFileInfo> fileMap = entry.getValue();
-        Map<FileRef,MapFileInfo> fileRefMap = new HashMap<FileRef,MapFileInfo>();
+        Map<FileRef,MapFileInfo> fileRefMap = new HashMap<>();
         for (Entry<String,MapFileInfo> mapping : fileMap.entrySet()) {
           Path path = new Path(mapping.getKey());
           FileSystem ns = fs.getVolumeByPath(path).getFileSystem();
@@ -491,7 +491,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
       if (tablet == null)
         throw new NotServingTabletException(textent);
 
-      Set<Column> columnSet = new HashSet<Column>();
+      Set<Column> columnSet = new HashSet<>();
       for (TColumn tcolumn : columns) {
         columnSet.add(new Column(tcolumn));
       }
@@ -616,7 +616,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
         List<IterInfo> ssiList, Map<String,Map<String,String>> ssio, List<ByteBuffer> authorizations, boolean waitForWrites,
         TSamplerConfiguration tSamplerConfig, long batchTimeOut, String context) throws ThriftSecurityException, TSampleNotPresentException {
       // find all of the tables that need to be scanned
-      final HashSet<String> tables = new HashSet<String>();
+      final HashSet<String> tables = new HashSet<>();
       for (TKeyExtent keyExtent : tbatch.keySet()) {
         tables.add(new String(keyExtent.getTable(), UTF_8));
       }
@@ -636,8 +636,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
         log.error("{} is not authorized", credentials.getPrincipal(), tse);
         throw tse;
       }
-      Map<KeyExtent,List<Range>> batch = Translator.translate(tbatch, new TKeyExtentTranslator(), new Translator.ListTranslator<TRange,Range>(
-          new TRangeTranslator()));
+      Map<KeyExtent,List<Range>> batch = Translator.translate(tbatch, new TKeyExtentTranslator(), new Translator.ListTranslator<>(new TRangeTranslator()));
 
       // This is used to determine which thread pool to use
       KeyExtent threadPoolExtent = batch.keySet().iterator().next();
@@ -839,7 +838,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
     private void flush(UpdateSession us) {
 
       int mutationCount = 0;
-      Map<CommitSession,Mutations> sendables = new HashMap<CommitSession,Mutations>();
+      Map<CommitSession,Mutations> sendables = new HashMap<>();
       Throwable error = null;
 
       long pt1 = System.currentTimeMillis();
@@ -1117,7 +1116,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
             results.add(new TCMResult(scm.getID(), TCMStatus.IGNORED));
           iter.remove();
         } else {
-          final List<ServerConditionalMutation> okMutations = new ArrayList<ServerConditionalMutation>(entry.getValue().size());
+          final List<ServerConditionalMutation> okMutations = new ArrayList<>(entry.getValue().size());
           final List<TCMResult> resultsSubList = results.subList(results.size(), results.size());
 
           ConditionChecker checker = checkerContext.newChecker(entry.getValue(), okMutations, resultsSubList);
@@ -1145,7 +1144,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
     private void writeConditionalMutations(Map<KeyExtent,List<ServerConditionalMutation>> updates, ArrayList<TCMResult> results, ConditionalSession sess) {
       Set<Entry<KeyExtent,List<ServerConditionalMutation>>> es = updates.entrySet();
 
-      Map<CommitSession,Mutations> sendables = new HashMap<CommitSession,Mutations>();
+      Map<CommitSession,Mutations> sendables = new HashMap<>();
 
       boolean sessionCanceled = sess.interruptFlag.get();
 
@@ -1239,7 +1238,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
       // sort each list of mutations, this is done to avoid deadlock and doing seeks in order is more efficient and detect duplicate rows.
       ConditionalMutationSet.sortConditionalMutations(updates);
 
-      Map<KeyExtent,List<ServerConditionalMutation>> deferred = new HashMap<KeyExtent,List<ServerConditionalMutation>>();
+      Map<KeyExtent,List<ServerConditionalMutation>> deferred = new HashMap<>();
 
       // can not process two mutations for the same row, because one will not see what the other writes
       ConditionalMutationSet.deferDuplicatesRows(updates, deferred);
@@ -1309,14 +1308,14 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
       long opid = writeTracker.startWrite(TabletType.type(new KeyExtent(tid, null, null)));
 
       try {
-        Map<KeyExtent,List<ServerConditionalMutation>> updates = Translator.translate(mutations, Translators.TKET,
-            new Translator.ListTranslator<TConditionalMutation,ServerConditionalMutation>(ServerConditionalMutation.TCMT));
+        Map<KeyExtent,List<ServerConditionalMutation>> updates = Translator.translate(mutations, Translators.TKET, new Translator.ListTranslator<>(
+            ServerConditionalMutation.TCMT));
 
         for (KeyExtent ke : updates.keySet())
           if (!ke.getTableId().equals(tid))
             throw new IllegalArgumentException("Unexpected table id " + tid + " != " + ke.getTableId());
 
-        ArrayList<TCMResult> results = new ArrayList<TCMResult>();
+        ArrayList<TCMResult> results = new ArrayList<>();
 
         Map<KeyExtent,List<ServerConditionalMutation>> deferred = conditionalUpdate(cs, updates, results, symbols);
 
@@ -1396,9 +1395,9 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
     public List<TabletStats> getTabletStats(TInfo tinfo, TCredentials credentials, String tableId) throws ThriftSecurityException, TException {
       TreeMap<KeyExtent,Tablet> onlineTabletsCopy;
       synchronized (onlineTablets) {
-        onlineTabletsCopy = new TreeMap<KeyExtent,Tablet>(onlineTablets);
+        onlineTabletsCopy = new TreeMap<>(onlineTablets);
       }
-      List<TabletStats> result = new ArrayList<TabletStats>();
+      List<TabletStats> result = new ArrayList<>();
       String text = tableId;
       KeyExtent start = new KeyExtent(text, new Text(), null);
       for (Entry<KeyExtent,Tablet> entry : onlineTabletsCopy.tailMap(start).entrySet()) {
@@ -1490,7 +1489,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
             Set<KeyExtent> openingOverlapping = KeyExtent.findOverlapping(extent, openingTablets);
             Set<KeyExtent> onlineOverlapping = KeyExtent.findOverlapping(extent, onlineTablets);
 
-            Set<KeyExtent> all = new HashSet<KeyExtent>();
+            Set<KeyExtent> all = new HashSet<>();
             all.addAll(unopenedOverlapping);
             all.addAll(openingOverlapping);
             all.addAll(onlineOverlapping);
@@ -1572,7 +1571,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
         throw new RuntimeException(e);
       }
 
-      ArrayList<Tablet> tabletsToFlush = new ArrayList<Tablet>();
+      ArrayList<Tablet> tabletsToFlush = new ArrayList<>();
 
       KeyExtent ke = new KeyExtent(tableId, ByteBufferUtil.toText(endRow), ByteBufferUtil.toText(startRow));
 
@@ -1694,7 +1693,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
 
       KeyExtent ke = new KeyExtent(tableId, ByteBufferUtil.toText(endRow), ByteBufferUtil.toText(startRow));
 
-      ArrayList<Tablet> tabletsToCompact = new ArrayList<Tablet>();
+      ArrayList<Tablet> tabletsToCompact = new ArrayList<>();
       synchronized (onlineTablets) {
         for (Tablet tablet : onlineTablets.values())
           if (ke.overlaps(tablet.getExtent()))
@@ -1728,7 +1727,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
       }
 
       List<CompactionInfo> compactions = Compactor.getRunningCompactions();
-      List<ActiveCompaction> ret = new ArrayList<ActiveCompaction>(compactions.size());
+      List<ActiveCompaction> ret = new ArrayList<>(compactions.size());
 
       for (CompactionInfo compactionInfo : compactions) {
         ret.add(compactionInfo.toThrift());
@@ -1805,7 +1804,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
         try {
           sleepUninterruptibly(getConfiguration().getTimeInMillis(Property.TSERV_MAJC_DELAY), TimeUnit.MILLISECONDS);
 
-          TreeMap<KeyExtent,Tablet> copyOnlineTablets = new TreeMap<KeyExtent,Tablet>();
+          TreeMap<KeyExtent,Tablet> copyOnlineTablets = new TreeMap<>();
 
           synchronized (onlineTablets) {
             copyOnlineTablets.putAll(onlineTablets); // avoid
@@ -2078,7 +2077,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
 
       // check Metadata table before accepting assignment
       Text locationToOpen = null;
-      SortedMap<Key,Value> tabletsKeyValues = new TreeMap<Key,Value>();
+      SortedMap<Key,Value> tabletsKeyValues = new TreeMap<>();
       try {
         Pair<Text,KeyExtent> pair = verifyTabletInformation(TabletServer.this, extent, TabletServer.this.getTabletSession(), tabletsKeyValues,
             getClientAddressString(), getLock());
@@ -2089,7 +2088,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
               openingTablets.remove(extent);
               openingTablets.notifyAll();
               // it expected that the new extent will overlap the old one... if it does not, it should not be added to unopenedTablets
-              if (!KeyExtent.findOverlapping(extent, new TreeSet<KeyExtent>(Arrays.asList(pair.getSecond()))).contains(pair.getSecond())) {
+              if (!KeyExtent.findOverlapping(extent, new TreeSet<>(Arrays.asList(pair.getSecond()))).contains(pair.getSecond())) {
                 throw new IllegalStateException("Fixed split does not overlap " + extent + " " + pair.getSecond());
               }
               unopenedTablets.add(pair.getSecond());
@@ -2264,9 +2263,9 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
     final Processor<Iface> processor;
     if (ThriftServerType.SASL == getThriftServerType()) {
       Iface tcredProxy = TCredentialsUpdatingWrapper.service(rpcProxy, ThriftClientHandler.class, getConfiguration());
-      processor = new Processor<Iface>(tcredProxy);
+      processor = new Processor<>(tcredProxy);
     } else {
-      processor = new Processor<Iface>(rpcProxy);
+      processor = new Processor<>(rpcProxy);
     }
     HostAndPort address = startServer(getServerConfigurationFactory().getConfiguration(), clientAddress.getHostText(), Property.TSERV_CLIENTPORT, processor,
         "Thrift Client Server");
@@ -2278,7 +2277,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
     final ReplicationServicerHandler handler = new ReplicationServicerHandler(this);
     ReplicationServicer.Iface rpcProxy = RpcWrapper.service(handler, new ReplicationServicer.Processor<ReplicationServicer.Iface>(handler));
     ReplicationServicer.Iface repl = TCredentialsUpdatingWrapper.service(rpcProxy, handler.getClass(), getConfiguration());
-    ReplicationServicer.Processor<ReplicationServicer.Iface> processor = new ReplicationServicer.Processor<ReplicationServicer.Iface>(repl);
+    ReplicationServicer.Processor<ReplicationServicer.Iface> processor = new ReplicationServicer.Processor<>(repl);
     AccumuloConfiguration conf = getServerConfigurationFactory().getConfiguration();
     Property maxMessageSizeProperty = (conf.get(Property.TSERV_MAX_MESSAGE_SIZE) != null ? Property.TSERV_MAX_MESSAGE_SIZE : Property.GENERAL_MAX_MESSAGE_SIZE);
     ServerAddress sp = TServerUtils.startServer(this, clientAddress.getHostText(), Property.REPLICATION_RECEIPT_SERVICE_PORT, processor,
@@ -2574,7 +2573,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
     }
 
     try {
-      return new Pair<Text,KeyExtent>(new Text(MetadataTableUtil.getRootTabletDir()), null);
+      return new Pair<>(new Text(MetadataTableUtil.getRootTabletDir()), null);
     } catch (IOException e) {
       throw new AccumuloException(e);
     }
@@ -2595,7 +2594,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
         TabletsSection.TabletColumnFamily.PREV_ROW_COLUMN, TabletsSection.TabletColumnFamily.SPLIT_RATIO_COLUMN,
         TabletsSection.TabletColumnFamily.OLD_PREV_ROW_COLUMN, TabletsSection.ServerColumnFamily.TIME_COLUMN});
 
-    TreeMap<Key,Value> tkv = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tkv = new TreeMap<>();
     try (ScannerImpl scanner = new ScannerImpl(context, tableToVerify, Authorizations.EMPTY)) {
       scanner.setRange(extent.toMetadataRange());
       for (Entry<Key,Value> entry : scanner)
@@ -2636,7 +2635,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
       }
 
       if (!fke.equals(extent)) {
-        return new Pair<Text,KeyExtent>(null, fke);
+        return new Pair<>(null, fke);
       }
 
       // reread and reverify metadata entries now that metadata entries were fixed
@@ -2644,7 +2643,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
       return verifyTabletInformation(context, fke, instance, tabletsKeyValues, clientAddress, lock);
     }
 
-    return new Pair<Text,KeyExtent>(new Text(dir.get()), null);
+    return new Pair<>(new Text(dir.get()), null);
   }
 
   static Value checkTabletMetadata(KeyExtent extent, TServerInstance instance, SortedMap<Key,Value> tabletsKeyValues, Text metadataEntry)
@@ -2759,7 +2758,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
       public void run() {
         Set<String> contextProperties = getServerConfigurationFactory().getConfiguration().getAllPropertiesWithPrefix(Property.VFS_CONTEXT_CLASSPATH_PROPERTY)
             .keySet();
-        Set<String> configuredContexts = new HashSet<String>();
+        Set<String> configuredContexts = new HashSet<>();
         for (String prop : contextProperties) {
           configuredContexts.add(prop.substring(Property.VFS_CONTEXT_CLASSPATH_PROPERTY.name().length()));
         }
@@ -2793,7 +2792,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
         ArrayList<Tablet> tablets;
 
         synchronized (onlineTablets) {
-          tablets = new ArrayList<Tablet>(onlineTablets.values());
+          tablets = new ArrayList<>(onlineTablets.values());
         }
 
         for (Tablet tablet : tablets) {
@@ -2810,9 +2809,9 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
 
     Map<KeyExtent,Tablet> onlineTabletsCopy;
     synchronized (this.onlineTablets) {
-      onlineTabletsCopy = new HashMap<KeyExtent,Tablet>(this.onlineTablets);
+      onlineTabletsCopy = new HashMap<>(this.onlineTablets);
     }
-    Map<String,TableInfo> tables = new HashMap<String,TableInfo>();
+    Map<String,TableInfo> tables = new HashMap<>();
 
     for (Entry<KeyExtent,Tablet> entry : onlineTabletsCopy.entrySet()) {
       String tableId = entry.getKey().getTableId();
@@ -2859,7 +2858,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
       table.scans.running += entry.getValue().get(ScanRunState.RUNNING);
     }
 
-    ArrayList<KeyExtent> offlineTabletsCopy = new ArrayList<KeyExtent>();
+    ArrayList<KeyExtent> offlineTabletsCopy = new ArrayList<>();
     synchronized (this.unopenedTablets) {
       synchronized (this.openingTablets) {
         offlineTabletsCopy.addAll(this.unopenedTablets);
@@ -2955,8 +2954,8 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
 
   public void recover(VolumeManager fs, KeyExtent extent, TableConfiguration tconf, List<LogEntry> logEntries, Set<String> tabletFiles,
       MutationReceiver mutationReceiver) throws IOException {
-    List<Path> recoveryLogs = new ArrayList<Path>();
-    List<LogEntry> sorted = new ArrayList<LogEntry>(logEntries);
+    List<Path> recoveryLogs = new ArrayList<>();
+    List<LogEntry> sorted = new ArrayList<>(logEntries);
     Collections.sort(sorted, new Comparator<LogEntry>() {
       @Override
       public int compare(LogEntry e1, LogEntry e2) {
@@ -3007,7 +3006,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
 
   public Collection<Tablet> getOnlineTablets() {
     synchronized (onlineTablets) {
-      return new ArrayList<Tablet>(onlineTablets.values());
+      return new ArrayList<>(onlineTablets.values());
     }
   }
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServerResourceManager.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServerResourceManager.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServerResourceManager.java
index b3b02ea..97606ea 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServerResourceManager.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServerResourceManager.java
@@ -84,7 +84,7 @@ public class TabletServerResourceManager {
   private final ExecutorService assignMetaDataPool;
   private final ExecutorService readAheadThreadPool;
   private final ExecutorService defaultReadAheadThreadPool;
-  private final Map<String,ExecutorService> threadPools = new TreeMap<String,ExecutorService>();
+  private final Map<String,ExecutorService> threadPools = new TreeMap<>();
 
   private final ConcurrentHashMap<KeyExtent,RunnableStartedAt> activeAssignments;
 
@@ -207,7 +207,7 @@ public class TabletServerResourceManager {
 
     assignMetaDataPool = createEs(0, 1, 60, "metadata tablet assignment");
 
-    activeAssignments = new ConcurrentHashMap<KeyExtent,RunnableStartedAt>();
+    activeAssignments = new ConcurrentHashMap<>();
 
     readAheadThreadPool = createEs(Property.TSERV_READ_AHEAD_MAXCONCURRENT, "tablet read ahead");
     defaultReadAheadThreadPool = createEs(Property.TSERV_METADATA_READ_AHEAD_MAXCONCURRENT, "metadata tablets read ahead");
@@ -332,7 +332,7 @@ public class TabletServerResourceManager {
 
     MemoryManagementFramework() {
       tabletReports = Collections.synchronizedMap(new HashMap<KeyExtent,TabletStateImpl>());
-      memUsageReports = new LinkedBlockingQueue<TabletStateImpl>();
+      memUsageReports = new LinkedBlockingQueue<>();
       maxMem = conf.getConfiguration().getMemoryInBytes(Property.TSERV_MAXMEM);
 
       Runnable r1 = new Runnable() {
@@ -408,7 +408,7 @@ public class TabletServerResourceManager {
         Map<KeyExtent,TabletStateImpl> tabletReportsCopy = null;
         try {
           synchronized (tabletReports) {
-            tabletReportsCopy = new HashMap<KeyExtent,TabletStateImpl>(tabletReports);
+            tabletReportsCopy = new HashMap<>(tabletReports);
           }
           ArrayList<TabletState> tabletStates = new ArrayList<TabletState>(tabletReportsCopy.values());
           mma = memoryManager.getMemoryManagementActions(tabletStates);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/tserver/src/main/java/org/apache/accumulo/tserver/WriteTracker.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/WriteTracker.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/WriteTracker.java
index db02526..c999c09 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/WriteTracker.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/WriteTracker.java
@@ -39,7 +39,7 @@ class WriteTracker {
   private static final Logger log = LoggerFactory.getLogger(WriteTracker.class);
 
   private static final AtomicLong operationCounter = new AtomicLong(1);
-  private final Map<TabletType,TreeSet<Long>> inProgressWrites = new EnumMap<TabletType,TreeSet<Long>>(TabletType.class);
+  private final Map<TabletType,TreeSet<Long>> inProgressWrites = new EnumMap<>(TabletType.class);
 
   WriteTracker() {
     for (TabletType ttype : TabletType.values()) {
@@ -87,7 +87,7 @@ class WriteTracker {
     if (keySet.size() == 0)
       return -1;
 
-    List<KeyExtent> extents = new ArrayList<KeyExtent>(keySet.size());
+    List<KeyExtent> extents = new ArrayList<>(keySet.size());
 
     for (Tablet tablet : keySet)
       extents.add(tablet.getExtent());

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/CompactionPlan.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/CompactionPlan.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/CompactionPlan.java
index 8f98761..845d779 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/CompactionPlan.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/CompactionPlan.java
@@ -31,8 +31,8 @@ import com.google.common.collect.Sets;
  * create the resulting output file.
  */
 public class CompactionPlan {
-  public final List<FileRef> inputFiles = new ArrayList<FileRef>();
-  public final List<FileRef> deleteFiles = new ArrayList<FileRef>();
+  public final List<FileRef> inputFiles = new ArrayList<>();
+  public final List<FileRef> deleteFiles = new ArrayList<>();
   public WriteParameters writeParameters = null;
 
   @Override
@@ -67,8 +67,8 @@ public class CompactionPlan {
    *           thrown when validation fails.
    */
   public final void validate(Set<FileRef> allFiles) {
-    Set<FileRef> inputSet = new HashSet<FileRef>(inputFiles);
-    Set<FileRef> deleteSet = new HashSet<FileRef>(deleteFiles);
+    Set<FileRef> inputSet = new HashSet<>(inputFiles);
+    Set<FileRef> deleteSet = new HashSet<>(deleteFiles);
 
     if (!allFiles.containsAll(inputSet)) {
       inputSet.removeAll(allFiles);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/DefaultCompactionStrategy.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/DefaultCompactionStrategy.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/DefaultCompactionStrategy.java
index 1f0dc3a..faf9534 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/DefaultCompactionStrategy.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/DefaultCompactionStrategy.java
@@ -60,16 +60,16 @@ public class DefaultCompactionStrategy extends CompactionStrategy {
   private List<FileRef> findMapFilesToCompact(MajorCompactionRequest request) {
     MajorCompactionReason reason = request.getReason();
     if (reason == MajorCompactionReason.USER) {
-      return new ArrayList<FileRef>(request.getFiles().keySet());
+      return new ArrayList<>(request.getFiles().keySet());
     }
     if (reason == MajorCompactionReason.CHOP) {
       // should not happen, but this is safe
-      return new ArrayList<FileRef>(request.getFiles().keySet());
+      return new ArrayList<>(request.getFiles().keySet());
     }
 
     if (request.getFiles().size() <= 1)
       return null;
-    TreeSet<CompactionFile> candidateFiles = new TreeSet<CompactionFile>(new Comparator<CompactionFile>() {
+    TreeSet<CompactionFile> candidateFiles = new TreeSet<>(new Comparator<CompactionFile>() {
       @Override
       public int compare(CompactionFile o1, CompactionFile o2) {
         if (o1 == o2)
@@ -95,7 +95,7 @@ public class DefaultCompactionStrategy extends CompactionStrategy {
       totalSize += mfi.size;
     }
 
-    List<FileRef> files = new ArrayList<FileRef>();
+    List<FileRef> files = new ArrayList<>();
 
     while (candidateFiles.size() > 1) {
       CompactionFile max = candidateFiles.last();
@@ -121,7 +121,7 @@ public class DefaultCompactionStrategy extends CompactionStrategy {
 
     if (files.size() < totalFilesToCompact) {
 
-      TreeMap<FileRef,Long> tfc = new TreeMap<FileRef,Long>();
+      TreeMap<FileRef,Long> tfc = new TreeMap<>();
       for (Entry<FileRef,DataFileValue> entry : request.getFiles().entrySet()) {
         tfc.put(entry.getKey(), entry.getValue().getSize());
       }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/SizeLimitCompactionStrategy.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/SizeLimitCompactionStrategy.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/SizeLimitCompactionStrategy.java
index 6cc9025..69e3269 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/SizeLimitCompactionStrategy.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/SizeLimitCompactionStrategy.java
@@ -39,7 +39,7 @@ public class SizeLimitCompactionStrategy extends DefaultCompactionStrategy {
   }
 
   private MajorCompactionRequest filterFiles(MajorCompactionRequest mcr) {
-    Map<FileRef,DataFileValue> filteredFiles = new HashMap<FileRef,DataFileValue>();
+    Map<FileRef,DataFileValue> filteredFiles = new HashMap<>();
     for (Entry<FileRef,DataFileValue> entry : mcr.getFiles().entrySet()) {
       if (entry.getValue().getSize() <= limit) {
         filteredFiles.put(entry.getKey(), entry.getValue());

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/tserver/src/main/java/org/apache/accumulo/tserver/constraints/ConstraintChecker.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/constraints/ConstraintChecker.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/constraints/ConstraintChecker.java
index 13e7c4f..9d065c7 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/constraints/ConstraintChecker.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/constraints/ConstraintChecker.java
@@ -47,7 +47,7 @@ public class ConstraintChecker {
   private AtomicLong lastCheck = new AtomicLong(0);
 
   public ConstraintChecker(TableConfiguration conf) {
-    constrains = new ArrayList<Constraint>();
+    constrains = new ArrayList<>();
 
     this.conf = conf;
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
index d8a4dc6..5280d41 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
@@ -134,7 +134,7 @@ public class DfsLogger implements Comparable<DfsLogger> {
     VolumeManager getFileSystem();
   }
 
-  private final LinkedBlockingQueue<DfsLogger.LogWork> workQueue = new LinkedBlockingQueue<DfsLogger.LogWork>();
+  private final LinkedBlockingQueue<DfsLogger.LogWork> workQueue = new LinkedBlockingQueue<>();
 
   private final Object closeLock = new Object();
 
@@ -149,7 +149,7 @@ public class DfsLogger implements Comparable<DfsLogger> {
 
     @Override
     public void run() {
-      ArrayList<DfsLogger.LogWork> work = new ArrayList<DfsLogger.LogWork>();
+      ArrayList<DfsLogger.LogWork> work = new ArrayList<>();
       boolean sawClosedMarker = false;
       while (!sawClosedMarker) {
         work.clear();
@@ -375,7 +375,7 @@ public class DfsLogger implements Comparable<DfsLogger> {
 
           // If it's null, we won't have any parameters whatsoever. First, let's attempt to read
           // parameters
-          Map<String,String> opts = new HashMap<String,String>();
+          Map<String,String> opts = new HashMap<>();
           int count = input.readInt();
           for (int i = 0; i < count; i++) {
             String key = input.readUTF();
@@ -628,7 +628,7 @@ public class DfsLogger implements Comparable<DfsLogger> {
 
   public LoggerOperation logManyTablets(List<TabletMutations> mutations) throws IOException {
     Durability durability = Durability.NONE;
-    List<Pair<LogFileKey,LogFileValue>> data = new ArrayList<Pair<LogFileKey,LogFileValue>>();
+    List<Pair<LogFileKey,LogFileValue>> data = new ArrayList<>();
     for (TabletMutations tabletMutations : mutations) {
       LogFileKey key = new LogFileKey();
       key.event = MANY_MUTATIONS;
@@ -636,7 +636,7 @@ public class DfsLogger implements Comparable<DfsLogger> {
       key.tid = tabletMutations.getTid();
       LogFileValue value = new LogFileValue();
       value.mutations = tabletMutations.getMutations();
-      data.add(new Pair<LogFileKey,LogFileValue>(key, value));
+      data.add(new Pair<>(key, value));
       if (tabletMutations.getDurability().ordinal() > durability.ordinal()) {
         durability = tabletMutations.getDurability();
       }
@@ -659,7 +659,7 @@ public class DfsLogger implements Comparable<DfsLogger> {
     key.event = COMPACTION_FINISH;
     key.seq = seq;
     key.tid = tid;
-    return logFileData(Collections.singletonList(new Pair<LogFileKey,LogFileValue>(key, EMPTY)), durability);
+    return logFileData(Collections.singletonList(new Pair<>(key, EMPTY)), durability);
   }
 
   public LoggerOperation minorCompactionStarted(int seq, int tid, String fqfn, Durability durability) throws IOException {
@@ -668,7 +668,7 @@ public class DfsLogger implements Comparable<DfsLogger> {
     key.seq = seq;
     key.tid = tid;
     key.filename = fqfn;
-    return logFileData(Collections.singletonList(new Pair<LogFileKey,LogFileValue>(key, EMPTY)), durability);
+    return logFileData(Collections.singletonList(new Pair<>(key, EMPTY)), durability);
   }
 
   public String getLogger() {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/tserver/src/main/java/org/apache/accumulo/tserver/log/LogSorter.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/LogSorter.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/LogSorter.java
index f152f9c..11097ce 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/LogSorter.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/LogSorter.java
@@ -132,7 +132,7 @@ public class LogSorter {
         final long bufferSize = conf.getMemoryInBytes(Property.TSERV_SORT_BUFFER_SIZE);
         Thread.currentThread().setName("Sorting " + name + " for recovery");
         while (true) {
-          final ArrayList<Pair<LogFileKey,LogFileValue>> buffer = new ArrayList<Pair<LogFileKey,LogFileValue>>();
+          final ArrayList<Pair<LogFileKey,LogFileValue>> buffer = new ArrayList<>();
           try {
             long start = input.getPos();
             while (input.getPos() - start < bufferSize) {
@@ -140,7 +140,7 @@ public class LogSorter {
               LogFileValue value = new LogFileValue();
               key.readFields(decryptingInput);
               value.readFields(decryptingInput);
-              buffer.add(new Pair<LogFileKey,LogFileValue>(key, value));
+              buffer.add(new Pair<>(key, value));
             }
             writeBuffer(destPath, buffer, part++);
             buffer.clear();
@@ -236,7 +236,7 @@ public class LogSorter {
   }
 
   public List<RecoveryStatus> getLogSorts() {
-    List<RecoveryStatus> result = new ArrayList<RecoveryStatus>();
+    List<RecoveryStatus> result = new ArrayList<>();
     synchronized (currentWork) {
       for (Entry<String,LogProcessor> entries : currentWork.entrySet()) {
         RecoveryStatus status = new RecoveryStatus();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/tserver/src/main/java/org/apache/accumulo/tserver/log/SortedLogRecovery.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/SortedLogRecovery.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/SortedLogRecovery.java
index ab3dea2..3d403e0 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/SortedLogRecovery.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/SortedLogRecovery.java
@@ -69,7 +69,7 @@ public class SortedLogRecovery {
 
   private enum Status {
     INITIAL, LOOKING_FOR_FINISH, COMPLETE
-  };
+  }
 
   private static class LastStartToFinish {
     long lastStart = -1;
@@ -152,7 +152,7 @@ public class SortedLogRecovery {
   int findLastStartToFinish(MultiReader reader, int fileno, KeyExtent extent, Set<String> tabletFiles, LastStartToFinish lastStartToFinish) throws IOException,
       EmptyMapFileException, UnusedException {
 
-    HashSet<String> suffixes = new HashSet<String>();
+    HashSet<String> suffixes = new HashSet<>();
     for (String path : tabletFiles)
       suffixes.add(getPathSuffix(path));
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java
index 3b0f9d7..a4cd6b0 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java
@@ -159,7 +159,7 @@ public class TabletServerLogger {
   }
 
   private DfsLogger initializeLoggers(final AtomicInteger logIdOut) throws IOException {
-    final AtomicReference<DfsLogger> result = new AtomicReference<DfsLogger>();
+    final AtomicReference<DfsLogger> result = new AtomicReference<>();
     testLockAndRun(logIdLock, new TestCallWithWriteLock() {
       @Override
       boolean test() {
@@ -490,7 +490,7 @@ public class TabletServerLogger {
 
   public int logManyTablets(Map<CommitSession,Mutations> mutations) throws IOException {
 
-    final Map<CommitSession,Mutations> loggables = new HashMap<CommitSession,Mutations>(mutations);
+    final Map<CommitSession,Mutations> loggables = new HashMap<>(mutations);
     for (Entry<CommitSession,Mutations> entry : mutations.entrySet()) {
       if (entry.getValue().getDurability() == Durability.NONE) {
         loggables.remove(entry.getKey());
@@ -502,7 +502,7 @@ public class TabletServerLogger {
     int seq = write(loggables.keySet(), false, new Writer() {
       @Override
       public LoggerOperation write(DfsLogger logger, int ignored) throws Exception {
-        List<TabletMutations> copy = new ArrayList<TabletMutations>(loggables.size());
+        List<TabletMutations> copy = new ArrayList<>(loggables.size());
         for (Entry<CommitSession,Mutations> entry : loggables.entrySet()) {
           CommitSession cs = entry.getKey();
           Durability durability = entry.getValue().getDurability();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/tserver/src/main/java/org/apache/accumulo/tserver/logger/LogFileValue.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/logger/LogFileValue.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/logger/LogFileValue.java
index 87e17b3..f49eb71 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/logger/LogFileValue.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/logger/LogFileValue.java
@@ -39,7 +39,7 @@ public class LogFileValue implements Writable {
   @Override
   public void readFields(DataInput in) throws IOException {
     int count = in.readInt();
-    mutations = new ArrayList<Mutation>(count);
+    mutations = new ArrayList<>(count);
     for (int i = 0; i < count; i++) {
       ServerMutation mutation = new ServerMutation();
       mutation.readFields(in);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/tserver/src/main/java/org/apache/accumulo/tserver/logger/LogReader.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/logger/LogReader.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/logger/LogReader.java
index 01db8aa..d5a4db9 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/logger/LogReader.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/logger/LogReader.java
@@ -59,7 +59,7 @@ public class LogReader {
     @Parameter(names = "-p", description = "search for a row that matches the given regex")
     String regexp;
     @Parameter(description = "<logfile> { <logfile> ... }")
-    List<String> files = new ArrayList<String>();
+    List<String> files = new ArrayList<>();
   }
 
   /**
@@ -91,7 +91,7 @@ public class LogReader {
       rowMatcher = pattern.matcher("");
     }
 
-    Set<Integer> tabletIds = new HashSet<Integer>();
+    Set<Integer> tabletIds = new HashSet<>();
 
     for (String file : opts.files) {
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/AccumuloReplicaSystem.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/AccumuloReplicaSystem.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/AccumuloReplicaSystem.java
index 589f07f..5808f2e 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/AccumuloReplicaSystem.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/AccumuloReplicaSystem.java
@@ -691,7 +691,7 @@ public class AccumuloReplicaSystem implements ReplicaSystem {
   protected WalReplication getWalEdits(ReplicationTarget target, DataInputStream wal, Path p, Status status, long sizeLimit, Set<Integer> desiredTids)
       throws IOException {
     WalEdits edits = new WalEdits();
-    edits.edits = new ArrayList<ByteBuffer>();
+    edits.edits = new ArrayList<>();
     long size = 0l;
     long entriesConsumed = 0l;
     long numUpdates = 0l;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/tserver/src/main/java/org/apache/accumulo/tserver/scan/LookupTask.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/scan/LookupTask.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/scan/LookupTask.java
index 378e98d..139512f 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/scan/LookupTask.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/scan/LookupTask.java
@@ -78,9 +78,9 @@ public class LookupTask extends ScanTask<MultiScanResult> {
 
       long startTime = System.currentTimeMillis();
 
-      List<KVEntry> results = new ArrayList<KVEntry>();
-      Map<KeyExtent,List<Range>> failures = new HashMap<KeyExtent,List<Range>>();
-      List<KeyExtent> fullScans = new ArrayList<KeyExtent>();
+      List<KVEntry> results = new ArrayList<>();
+      Map<KeyExtent,List<Range>> failures = new HashMap<>();
+      List<KeyExtent> fullScans = new ArrayList<>();
       KeyExtent partScan = null;
       Key partNextKey = null;
       boolean partNextKeyInclusive = false;
@@ -146,10 +146,10 @@ public class LookupTask extends ScanTask<MultiScanResult> {
       session.numEntries += results.size();
 
       // convert everything to thrift before adding result
-      List<TKeyValue> retResults = new ArrayList<TKeyValue>();
+      List<TKeyValue> retResults = new ArrayList<>();
       for (KVEntry entry : results)
         retResults.add(new TKeyValue(entry.getKey().toThrift(), ByteBuffer.wrap(entry.getValue().get())));
-      Map<TKeyExtent,List<TRange>> retFailures = Translator.translate(failures, Translators.KET, new Translator.ListTranslator<Range,TRange>(Translators.RT));
+      Map<TKeyExtent,List<TRange>> retFailures = Translator.translate(failures, Translators.KET, new Translator.ListTranslator<>(Translators.RT));
       List<TKeyExtent> retFullScans = Translator.translate(fullScans, Translators.KET);
       TKeyExtent retPartScan = null;
       TKey retPartNextKey = null;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/tserver/src/main/java/org/apache/accumulo/tserver/scan/ScanTask.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/scan/ScanTask.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/scan/ScanTask.java
index 6d5adce..cd99ba2 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/scan/ScanTask.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/scan/ScanTask.java
@@ -43,9 +43,9 @@ public abstract class ScanTask<T> implements RunnableFuture<T> {
   ScanTask(TabletServer server) {
     this.server = server;
     interruptFlag = new AtomicBoolean(false);
-    runState = new AtomicReference<ScanRunState>(ScanRunState.QUEUED);
+    runState = new AtomicReference<>(ScanRunState.QUEUED);
     state = new AtomicInteger(INITIAL);
-    resultQueue = new ArrayBlockingQueue<Object>(1);
+    resultQueue = new ArrayBlockingQueue<>(1);
   }
 
   protected void addResult(Object o) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/tserver/src/main/java/org/apache/accumulo/tserver/session/MultiScanSession.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/session/MultiScanSession.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/session/MultiScanSession.java
index bb84085..d698a1f 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/session/MultiScanSession.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/session/MultiScanSession.java
@@ -32,7 +32,7 @@ import org.apache.accumulo.tserver.scan.ScanTask;
 
 public class MultiScanSession extends Session {
   public final KeyExtent threadPoolExtent;
-  public final HashSet<Column> columnSet = new HashSet<Column>();
+  public final HashSet<Column> columnSet = new HashSet<>();
   public final Map<KeyExtent,List<Range>> queries;
   public final List<IterInfo> ssiList;
   public final Map<String,Map<String,String>> ssio;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/tserver/src/main/java/org/apache/accumulo/tserver/session/SessionManager.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/session/SessionManager.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/session/SessionManager.java
index 1d9c2f7..bf37855 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/session/SessionManager.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/session/SessionManager.java
@@ -50,10 +50,10 @@ public class SessionManager {
   private static final Logger log = LoggerFactory.getLogger(SessionManager.class);
 
   private final SecureRandom random = new SecureRandom();
-  private final Map<Long,Session> sessions = new HashMap<Long,Session>();
+  private final Map<Long,Session> sessions = new HashMap<>();
   private final long maxIdle;
   private final long maxUpdateIdle;
-  private final List<Session> idleSessions = new ArrayList<Session>();
+  private final List<Session> idleSessions = new ArrayList<>();
   private final Long expiredSessionMarker = Long.valueOf(-1);
   private final AccumuloConfiguration aconf;
 
@@ -169,7 +169,7 @@ public class SessionManager {
   }
 
   private void sweep(final long maxIdle, final long maxUpdateIdle) {
-    List<Session> sessionsToCleanup = new ArrayList<Session>();
+    List<Session> sessionsToCleanup = new ArrayList<>();
     synchronized (this) {
       Iterator<Session> iter = sessions.values().iterator();
       while (iter.hasNext()) {
@@ -231,8 +231,8 @@ public class SessionManager {
   }
 
   public synchronized Map<String,MapCounter<ScanRunState>> getActiveScansPerTable() {
-    Map<String,MapCounter<ScanRunState>> counts = new HashMap<String,MapCounter<ScanRunState>>();
-    Set<Entry<Long,Session>> copiedIdleSessions = new HashSet<Entry<Long,Session>>();
+    Map<String,MapCounter<ScanRunState>> counts = new HashMap<>();
+    Set<Entry<Long,Session>> copiedIdleSessions = new HashSet<>();
 
     synchronized (idleSessions) {
       /**
@@ -270,7 +270,7 @@ public class SessionManager {
 
       MapCounter<ScanRunState> stateCounts = counts.get(tableID);
       if (stateCounts == null) {
-        stateCounts = new MapCounter<ScanRunState>();
+        stateCounts = new MapCounter<>();
         counts.put(tableID, stateCounts);
       }
 
@@ -282,9 +282,9 @@ public class SessionManager {
 
   public synchronized List<ActiveScan> getActiveScans() {
 
-    final List<ActiveScan> activeScans = new ArrayList<ActiveScan>();
+    final List<ActiveScan> activeScans = new ArrayList<>();
     final long ct = System.currentTimeMillis();
-    final Set<Entry<Long,Session>> copiedIdleSessions = new HashSet<Entry<Long,Session>>();
+    final Set<Entry<Long,Session>> copiedIdleSessions = new HashSet<>();
 
     synchronized (idleSessions) {
       /**

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/tserver/src/main/java/org/apache/accumulo/tserver/session/UpdateSession.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/session/UpdateSession.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/session/UpdateSession.java
index 4a9b265..c53f560 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/session/UpdateSession.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/session/UpdateSession.java
@@ -33,14 +33,14 @@ import org.apache.accumulo.tserver.tablet.Tablet;
 
 public class UpdateSession extends Session {
   public final TservConstraintEnv cenv;
-  public final MapCounter<Tablet> successfulCommits = new MapCounter<Tablet>();
-  public final Map<KeyExtent,Long> failures = new HashMap<KeyExtent,Long>();
-  public final HashMap<KeyExtent,SecurityErrorCode> authFailures = new HashMap<KeyExtent,SecurityErrorCode>();
+  public final MapCounter<Tablet> successfulCommits = new MapCounter<>();
+  public final Map<KeyExtent,Long> failures = new HashMap<>();
+  public final HashMap<KeyExtent,SecurityErrorCode> authFailures = new HashMap<>();
   public final Stat prepareTimes = new Stat();
   public final Stat walogTimes = new Stat();
   public final Stat commitTimes = new Stat();
   public final Stat authTimes = new Stat();
-  public final Map<Tablet,List<Mutation>> queuedMutations = new HashMap<Tablet,List<Mutation>>();
+  public final Map<Tablet,List<Mutation>> queuedMutations = new HashMap<>();
   public final Violations violations;
 
   public Tablet currentTablet = null;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/CompactionInfo.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/CompactionInfo.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/CompactionInfo.java
index c7ca29d..5c4f7c4 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/CompactionInfo.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/CompactionInfo.java
@@ -114,14 +114,14 @@ public class CompactionInfo {
       }
     }
 
-    List<IterInfo> iiList = new ArrayList<IterInfo>();
-    Map<String,Map<String,String>> iterOptions = new HashMap<String,Map<String,String>>();
+    List<IterInfo> iiList = new ArrayList<>();
+    Map<String,Map<String,String>> iterOptions = new HashMap<>();
 
     for (IteratorSetting iterSetting : compactor.getIterators()) {
       iiList.add(new IterInfo(iterSetting.getPriority(), iterSetting.getIteratorClass(), iterSetting.getName()));
       iterOptions.put(iterSetting.getName(), iterSetting.getOptions());
     }
-    List<String> filesToCompact = new ArrayList<String>();
+    List<String> filesToCompact = new ArrayList<>();
     for (FileRef ref : compactor.getFilesToCompact())
       filesToCompact.add(ref.toString());
     return new ActiveCompaction(compactor.extent.toThrift(), System.currentTimeMillis() - compactor.getStartTime(), filesToCompact, compactor.getOutputFile(),

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/CompactionWatcher.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/CompactionWatcher.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/CompactionWatcher.java
index 6ca4407..64345c2 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/CompactionWatcher.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/CompactionWatcher.java
@@ -32,7 +32,7 @@ import org.slf4j.LoggerFactory;
  *
  */
 public class CompactionWatcher implements Runnable {
-  private final Map<List<Long>,ObservedCompactionInfo> observedCompactions = new HashMap<List<Long>,ObservedCompactionInfo>();
+  private final Map<List<Long>,ObservedCompactionInfo> observedCompactions = new HashMap<>();
   private final AccumuloConfiguration config;
   private static boolean watching = false;
 
@@ -55,7 +55,7 @@ public class CompactionWatcher implements Runnable {
   public void run() {
     List<CompactionInfo> runningCompactions = Compactor.getRunningCompactions();
 
-    Set<List<Long>> newKeys = new HashSet<List<Long>>();
+    Set<List<Long>> newKeys = new HashSet<>();
 
     long time = System.currentTimeMillis();
 
@@ -69,7 +69,7 @@ public class CompactionWatcher implements Runnable {
     }
 
     // look for compactions that finished or made progress and logged a warning
-    HashMap<List<Long>,ObservedCompactionInfo> copy = new HashMap<List<Long>,ObservedCompactionInfo>(observedCompactions);
+    HashMap<List<Long>,ObservedCompactionInfo> copy = new HashMap<>(observedCompactions);
     copy.keySet().removeAll(newKeys);
 
     for (ObservedCompactionInfo oci : copy.values()) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Compactor.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Compactor.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Compactor.java
index 79d22ea..6c83f19 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Compactor.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Compactor.java
@@ -133,7 +133,7 @@ public class Compactor implements Callable<CompactionStats> {
   protected static final Set<Compactor> runningCompactions = Collections.synchronizedSet(new HashSet<Compactor>());
 
   public static List<CompactionInfo> getRunningCompactions() {
-    ArrayList<CompactionInfo> compactions = new ArrayList<CompactionInfo>();
+    ArrayList<CompactionInfo> compactions = new ArrayList<>();
 
     synchronized (runningCompactions) {
       for (Compactor compactor : runningCompactions) {
@@ -209,7 +209,7 @@ public class Compactor implements Callable<CompactionStats> {
 
       long t1 = System.currentTimeMillis();
 
-      HashSet<ByteSequence> allColumnFamilies = new HashSet<ByteSequence>();
+      HashSet<ByteSequence> allColumnFamilies = new HashSet<>();
 
       if (mfw.supportsLocalityGroups()) {
         for (Entry<String,Set<ByteSequence>> entry : lGroups.entrySet()) {
@@ -277,7 +277,7 @@ public class Compactor implements Callable<CompactionStats> {
 
   private List<SortedKeyValueIterator<Key,Value>> openMapDataFiles(String lgName, ArrayList<FileSKVIterator> readers) throws IOException {
 
-    List<SortedKeyValueIterator<Key,Value>> iters = new ArrayList<SortedKeyValueIterator<Key,Value>>(filesToCompact.size());
+    List<SortedKeyValueIterator<Key,Value>> iters = new ArrayList<>(filesToCompact.size());
 
     for (FileRef mapFile : filesToCompact.keySet()) {
       try {
@@ -326,7 +326,7 @@ public class Compactor implements Callable<CompactionStats> {
 
   private void compactLocalityGroup(String lgName, Set<ByteSequence> columnFamilies, boolean inclusive, FileSKVWriter mfw, CompactionStats majCStats)
       throws IOException, CompactionCanceledException {
-    ArrayList<FileSKVIterator> readers = new ArrayList<FileSKVIterator>(filesToCompact.size());
+    ArrayList<FileSKVIterator> readers = new ArrayList<>(filesToCompact.size());
     Span span = Trace.start("compact");
     try {
       long entriesCompacted = 0;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/CountingIterator.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/CountingIterator.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/CountingIterator.java
index 8716695..be22778 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/CountingIterator.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/CountingIterator.java
@@ -47,7 +47,7 @@ public class CountingIterator extends WrappingIterator {
   }
 
   public CountingIterator(SortedKeyValueIterator<Key,Value> source, AtomicLong entriesRead) {
-    deepCopies = new ArrayList<CountingIterator>();
+    deepCopies = new ArrayList<>();
     this.setSource(source);
     count = 0;
     this.entriesRead = entriesRead;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/DatafileManager.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/DatafileManager.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/DatafileManager.java
index fd1ea33..b488e13 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/DatafileManager.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/DatafileManager.java
@@ -70,13 +70,13 @@ class DatafileManager {
   }
 
   private FileRef mergingMinorCompactionFile = null;
-  private final Set<FileRef> filesToDeleteAfterScan = new HashSet<FileRef>();
-  private final Map<Long,Set<FileRef>> scanFileReservations = new HashMap<Long,Set<FileRef>>();
-  private final MapCounter<FileRef> fileScanReferenceCounts = new MapCounter<FileRef>();
+  private final Set<FileRef> filesToDeleteAfterScan = new HashSet<>();
+  private final Map<Long,Set<FileRef>> scanFileReservations = new HashMap<>();
+  private final MapCounter<FileRef> fileScanReferenceCounts = new MapCounter<>();
   private long nextScanReservationId = 0;
   private boolean reservationsBlocked = false;
 
-  private final Set<FileRef> majorCompactingFiles = new HashSet<FileRef>();
+  private final Set<FileRef> majorCompactingFiles = new HashSet<>();
 
   static void rename(VolumeManager fs, Path src, Path dst) throws IOException {
     if (!fs.rename(src, dst)) {
@@ -95,26 +95,26 @@ class DatafileManager {
         }
       }
 
-      Set<FileRef> absFilePaths = new HashSet<FileRef>(datafileSizes.keySet());
+      Set<FileRef> absFilePaths = new HashSet<>(datafileSizes.keySet());
 
       long rid = nextScanReservationId++;
 
       scanFileReservations.put(rid, absFilePaths);
 
-      Map<FileRef,DataFileValue> ret = new HashMap<FileRef,DataFileValue>();
+      Map<FileRef,DataFileValue> ret = new HashMap<>();
 
       for (FileRef path : absFilePaths) {
         fileScanReferenceCounts.increment(path, 1);
         ret.put(path, datafileSizes.get(path));
       }
 
-      return new Pair<Long,Map<FileRef,DataFileValue>>(rid, ret);
+      return new Pair<>(rid, ret);
     }
   }
 
   void returnFilesForScan(Long reservationId) {
 
-    final Set<FileRef> filesToDelete = new HashSet<FileRef>();
+    final Set<FileRef> filesToDelete = new HashSet<>();
 
     synchronized (tablet) {
       Set<FileRef> absFilePaths = scanFileReservations.remove(reservationId);
@@ -147,7 +147,7 @@ class DatafileManager {
     if (scanFiles.size() == 0)
       return;
 
-    Set<FileRef> filesToDelete = new HashSet<FileRef>();
+    Set<FileRef> filesToDelete = new HashSet<>();
 
     synchronized (tablet) {
       for (FileRef path : scanFiles) {
@@ -166,7 +166,7 @@ class DatafileManager {
 
   private TreeSet<FileRef> waitForScansToFinish(Set<FileRef> pathsToWaitFor, boolean blockNewScans, long maxWaitTime) {
     long startTime = System.currentTimeMillis();
-    TreeSet<FileRef> inUse = new TreeSet<FileRef>();
+    TreeSet<FileRef> inUse = new TreeSet<>();
 
     Span waitForScans = Trace.start("waitForScans");
     try {
@@ -209,7 +209,7 @@ class DatafileManager {
 
     String bulkDir = null;
 
-    Map<FileRef,DataFileValue> paths = new HashMap<FileRef,DataFileValue>();
+    Map<FileRef,DataFileValue> paths = new HashMap<>();
     for (Entry<FileRef,DataFileValue> entry : pathsString.entrySet())
       paths.put(entry.getKey(), entry.getValue());
 
@@ -575,14 +575,14 @@ class DatafileManager {
 
   public SortedMap<FileRef,DataFileValue> getDatafileSizes() {
     synchronized (tablet) {
-      TreeMap<FileRef,DataFileValue> copy = new TreeMap<FileRef,DataFileValue>(datafileSizes);
+      TreeMap<FileRef,DataFileValue> copy = new TreeMap<>(datafileSizes);
       return Collections.unmodifiableSortedMap(copy);
     }
   }
 
   public Set<FileRef> getFiles() {
     synchronized (tablet) {
-      HashSet<FileRef> files = new HashSet<FileRef>(datafileSizes.keySet());
+      HashSet<FileRef> files = new HashSet<>(datafileSizes.keySet());
       return Collections.unmodifiableSet(files);
     }
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/RootFiles.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/RootFiles.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/RootFiles.java
index 9ba8e38..56dbec9 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/RootFiles.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/RootFiles.java
@@ -80,7 +80,7 @@ public class RootFiles {
     /*
      * called in constructor and before major compactions
      */
-    Collection<String> goodFiles = new ArrayList<String>(files.length);
+    Collection<String> goodFiles = new ArrayList<>(files.length);
 
     for (FileStatus file : files) {
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/ScanDataSource.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/ScanDataSource.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/ScanDataSource.java
index 28cbdc9..e48d91e 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/ScanDataSource.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/ScanDataSource.java
@@ -169,7 +169,7 @@ class ScanDataSource implements DataSource {
     for (SortedKeyValueIterator<Key,Value> skvi : Iterables.concat(mapfiles, memIters))
       ((InterruptibleIterator) skvi).setInterruptFlag(interruptFlag);
 
-    List<SortedKeyValueIterator<Key,Value>> iters = new ArrayList<SortedKeyValueIterator<Key,Value>>(mapfiles.size() + memIters.size());
+    List<SortedKeyValueIterator<Key,Value>> iters = new ArrayList<>(mapfiles.size() + memIters.size());
 
     iters.addAll(mapfiles);
     iters.addAll(memIters);


[06/32] accumulo git commit: ACCUMULO-4357 Remove unneeded code for readability

Posted by ct...@apache.org.
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/gc/src/test/java/org/apache/accumulo/gc/GarbageCollectionTest.java
----------------------------------------------------------------------
diff --git a/server/gc/src/test/java/org/apache/accumulo/gc/GarbageCollectionTest.java b/server/gc/src/test/java/org/apache/accumulo/gc/GarbageCollectionTest.java
index 14933fb..d61fb9e 100644
--- a/server/gc/src/test/java/org/apache/accumulo/gc/GarbageCollectionTest.java
+++ b/server/gc/src/test/java/org/apache/accumulo/gc/GarbageCollectionTest.java
@@ -46,14 +46,14 @@ import org.junit.Test;
  */
 public class GarbageCollectionTest {
   static class TestGCE implements GarbageCollectionEnvironment {
-    TreeSet<String> candidates = new TreeSet<String>();
-    ArrayList<String> blips = new ArrayList<String>();
-    Map<Key,Value> references = new TreeMap<Key,Value>();
-    HashSet<String> tableIds = new HashSet<String>();
+    TreeSet<String> candidates = new TreeSet<>();
+    ArrayList<String> blips = new ArrayList<>();
+    Map<Key,Value> references = new TreeMap<>();
+    HashSet<String> tableIds = new HashSet<>();
 
-    ArrayList<String> deletes = new ArrayList<String>();
-    ArrayList<String> tablesDirsToDelete = new ArrayList<String>();
-    TreeMap<String,Status> filesToReplicate = new TreeMap<String,Status>();
+    ArrayList<String> deletes = new ArrayList<>();
+    ArrayList<String> tablesDirsToDelete = new ArrayList<>();
+    TreeMap<String,Status> filesToReplicate = new TreeMap<>();
 
     @Override
     public boolean getCandidates(String continuePoint, List<String> ret) {
@@ -208,7 +208,7 @@ public class GarbageCollectionTest {
     gca.collect(gce);
     assertRemoved(gce);
 
-    List<String[]> refsToRemove = new ArrayList<String[]>();
+    List<String[]> refsToRemove = new ArrayList<>();
     refsToRemove.add(new String[] {"4", "/t0/F000.rf"});
     refsToRemove.add(new String[] {"5", "../4/t0/F000.rf"});
     refsToRemove.add(new String[] {"6", "hdfs://foo.com:6000/accumulo/tables/4/t0/F000.rf"});
@@ -545,7 +545,7 @@ public class GarbageCollectionTest {
 
     gca.collect(gce);
 
-    HashSet<String> tids = new HashSet<String>();
+    HashSet<String> tids = new HashSet<>();
     tids.add("5");
     tids.add("6");
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/master/src/main/java/org/apache/accumulo/master/FateServiceHandler.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/FateServiceHandler.java b/server/master/src/main/java/org/apache/accumulo/master/FateServiceHandler.java
index cda9548..efea076 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/FateServiceHandler.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/FateServiceHandler.java
@@ -106,7 +106,7 @@ class FateServiceHandler implements FateService.Iface {
         if (!master.security.canCreateNamespace(c, namespace))
           throw new ThriftSecurityException(c.getPrincipal(), SecurityErrorCode.PERMISSION_DENIED);
 
-        master.fate.seedTransaction(opid, new TraceRepo<Master>(new CreateNamespace(c.getPrincipal(), namespace, options)), autoCleanup);
+        master.fate.seedTransaction(opid, new TraceRepo<>(new CreateNamespace(c.getPrincipal(), namespace, options)), autoCleanup);
         break;
       }
       case NAMESPACE_RENAME: {
@@ -118,7 +118,7 @@ class FateServiceHandler implements FateService.Iface {
         if (!master.security.canRenameNamespace(c, namespaceId, oldName, newName))
           throw new ThriftSecurityException(c.getPrincipal(), SecurityErrorCode.PERMISSION_DENIED);
 
-        master.fate.seedTransaction(opid, new TraceRepo<Master>(new RenameNamespace(namespaceId, oldName, newName)), autoCleanup);
+        master.fate.seedTransaction(opid, new TraceRepo<>(new RenameNamespace(namespaceId, oldName, newName)), autoCleanup);
         break;
       }
       case NAMESPACE_DELETE: {
@@ -129,7 +129,7 @@ class FateServiceHandler implements FateService.Iface {
         if (!master.security.canDeleteNamespace(c, namespaceId))
           throw new ThriftSecurityException(c.getPrincipal(), SecurityErrorCode.PERMISSION_DENIED);
 
-        master.fate.seedTransaction(opid, new TraceRepo<Master>(new DeleteNamespace(namespaceId)), autoCleanup);
+        master.fate.seedTransaction(opid, new TraceRepo<>(new DeleteNamespace(namespaceId)), autoCleanup);
         break;
       }
       case TABLE_CREATE: {
@@ -148,7 +148,7 @@ class FateServiceHandler implements FateService.Iface {
         if (!master.security.canCreateTable(c, tableName, namespaceId))
           throw new ThriftSecurityException(c.getPrincipal(), SecurityErrorCode.PERMISSION_DENIED);
 
-        master.fate.seedTransaction(opid, new TraceRepo<Master>(new CreateTable(c.getPrincipal(), tableName, timeType, options, namespaceId)), autoCleanup);
+        master.fate.seedTransaction(opid, new TraceRepo<>(new CreateTable(c.getPrincipal(), tableName, timeType, options, namespaceId)), autoCleanup);
 
         break;
       }
@@ -186,7 +186,7 @@ class FateServiceHandler implements FateService.Iface {
           throw new ThriftSecurityException(c.getPrincipal(), SecurityErrorCode.PERMISSION_DENIED);
 
         try {
-          master.fate.seedTransaction(opid, new TraceRepo<Master>(new RenameTable(tableId, oldTableName, newTableName)), autoCleanup);
+          master.fate.seedTransaction(opid, new TraceRepo<>(new RenameTable(tableId, oldTableName, newTableName)), autoCleanup);
         } catch (NamespaceNotFoundException e) {
           throw new ThriftTableOperationException(null, oldTableName, tableOp, TableOperationExceptionType.NAMESPACE_NOTFOUND, "");
         }
@@ -216,8 +216,8 @@ class FateServiceHandler implements FateService.Iface {
         if (!canCloneTable)
           throw new ThriftSecurityException(c.getPrincipal(), SecurityErrorCode.PERMISSION_DENIED);
 
-        Map<String,String> propertiesToSet = new HashMap<String,String>();
-        Set<String> propertiesToExclude = new HashSet<String>();
+        Map<String,String> propertiesToSet = new HashMap<>();
+        Set<String> propertiesToExclude = new HashSet<>();
 
         for (Entry<String,String> entry : options.entrySet()) {
           if (entry.getKey().startsWith(TableOperationsImpl.CLONE_EXCLUDE_PREFIX)) {
@@ -233,7 +233,7 @@ class FateServiceHandler implements FateService.Iface {
           propertiesToSet.put(entry.getKey(), entry.getValue());
         }
 
-        master.fate.seedTransaction(opid, new TraceRepo<Master>(new CloneTable(c.getPrincipal(), srcTableId, tableName, propertiesToSet, propertiesToExclude)),
+        master.fate.seedTransaction(opid, new TraceRepo<>(new CloneTable(c.getPrincipal(), srcTableId, tableName, propertiesToSet, propertiesToExclude)),
             autoCleanup);
 
         break;
@@ -255,7 +255,7 @@ class FateServiceHandler implements FateService.Iface {
 
         if (!canDeleteTable)
           throw new ThriftSecurityException(c.getPrincipal(), SecurityErrorCode.PERMISSION_DENIED);
-        master.fate.seedTransaction(opid, new TraceRepo<Master>(new DeleteTable(tableId)), autoCleanup);
+        master.fate.seedTransaction(opid, new TraceRepo<>(new DeleteTable(tableId)), autoCleanup);
         break;
       }
       case TABLE_ONLINE: {
@@ -274,7 +274,7 @@ class FateServiceHandler implements FateService.Iface {
         if (!canOnlineOfflineTable)
           throw new ThriftSecurityException(c.getPrincipal(), SecurityErrorCode.PERMISSION_DENIED);
 
-        master.fate.seedTransaction(opid, new TraceRepo<Master>(new ChangeTableState(tableId, tableOp)), autoCleanup);
+        master.fate.seedTransaction(opid, new TraceRepo<>(new ChangeTableState(tableId, tableOp)), autoCleanup);
         break;
       }
       case TABLE_OFFLINE: {
@@ -293,7 +293,7 @@ class FateServiceHandler implements FateService.Iface {
         if (!canOnlineOfflineTable)
           throw new ThriftSecurityException(c.getPrincipal(), SecurityErrorCode.PERMISSION_DENIED);
 
-        master.fate.seedTransaction(opid, new TraceRepo<Master>(new ChangeTableState(tableId, tableOp)), autoCleanup);
+        master.fate.seedTransaction(opid, new TraceRepo<>(new ChangeTableState(tableId, tableOp)), autoCleanup);
         break;
       }
       case TABLE_MERGE: {
@@ -317,7 +317,7 @@ class FateServiceHandler implements FateService.Iface {
           throw new ThriftSecurityException(c.getPrincipal(), SecurityErrorCode.PERMISSION_DENIED);
 
         Master.log.debug("Creating merge op: " + tableId + " " + startRow + " " + endRow);
-        master.fate.seedTransaction(opid, new TraceRepo<Master>(new TableRangeOp(MergeInfo.Operation.MERGE, tableId, startRow, endRow)), autoCleanup);
+        master.fate.seedTransaction(opid, new TraceRepo<>(new TableRangeOp(MergeInfo.Operation.MERGE, tableId, startRow, endRow)), autoCleanup);
         break;
       }
       case TABLE_DELETE_RANGE: {
@@ -340,7 +340,7 @@ class FateServiceHandler implements FateService.Iface {
         if (!canDeleteRange)
           throw new ThriftSecurityException(c.getPrincipal(), SecurityErrorCode.PERMISSION_DENIED);
 
-        master.fate.seedTransaction(opid, new TraceRepo<Master>(new TableRangeOp(MergeInfo.Operation.DELETE, tableId, startRow, endRow)), autoCleanup);
+        master.fate.seedTransaction(opid, new TraceRepo<>(new TableRangeOp(MergeInfo.Operation.DELETE, tableId, startRow, endRow)), autoCleanup);
         break;
       }
       case TABLE_BULK_IMPORT: {
@@ -365,7 +365,7 @@ class FateServiceHandler implements FateService.Iface {
           throw new ThriftSecurityException(c.getPrincipal(), SecurityErrorCode.PERMISSION_DENIED);
 
         master.updateBulkImportStatus(dir, BulkImportState.INITIAL);
-        master.fate.seedTransaction(opid, new TraceRepo<Master>(new BulkImport(tableId, dir, failDir, setTime)), autoCleanup);
+        master.fate.seedTransaction(opid, new TraceRepo<>(new BulkImport(tableId, dir, failDir, setTime)), autoCleanup);
         break;
       }
       case TABLE_COMPACT: {
@@ -388,7 +388,7 @@ class FateServiceHandler implements FateService.Iface {
         if (!canCompact)
           throw new ThriftSecurityException(c.getPrincipal(), SecurityErrorCode.PERMISSION_DENIED);
 
-        master.fate.seedTransaction(opid, new TraceRepo<Master>(new CompactRange(tableId, startRow, endRow, iterators, compactionStrategy)), autoCleanup);
+        master.fate.seedTransaction(opid, new TraceRepo<>(new CompactRange(tableId, startRow, endRow, iterators, compactionStrategy)), autoCleanup);
         break;
       }
       case TABLE_CANCEL_COMPACT: {
@@ -407,7 +407,7 @@ class FateServiceHandler implements FateService.Iface {
         if (!canCancelCompact)
           throw new ThriftSecurityException(c.getPrincipal(), SecurityErrorCode.PERMISSION_DENIED);
 
-        master.fate.seedTransaction(opid, new TraceRepo<Master>(new CancelCompactions(tableId)), autoCleanup);
+        master.fate.seedTransaction(opid, new TraceRepo<>(new CancelCompactions(tableId)), autoCleanup);
         break;
       }
       case TABLE_IMPORT: {
@@ -432,7 +432,7 @@ class FateServiceHandler implements FateService.Iface {
         if (!canImport)
           throw new ThriftSecurityException(c.getPrincipal(), SecurityErrorCode.PERMISSION_DENIED);
 
-        master.fate.seedTransaction(opid, new TraceRepo<Master>(new ImportTable(c.getPrincipal(), tableName, exportDir, namespaceId)), autoCleanup);
+        master.fate.seedTransaction(opid, new TraceRepo<>(new ImportTable(c.getPrincipal(), tableName, exportDir, namespaceId)), autoCleanup);
         break;
       }
       case TABLE_EXPORT: {
@@ -454,7 +454,7 @@ class FateServiceHandler implements FateService.Iface {
         if (!canExport)
           throw new ThriftSecurityException(c.getPrincipal(), SecurityErrorCode.PERMISSION_DENIED);
 
-        master.fate.seedTransaction(opid, new TraceRepo<Master>(new ExportTable(tableName, tableId, exportDir)), autoCleanup);
+        master.fate.seedTransaction(opid, new TraceRepo<>(new ExportTable(tableName, tableId, exportDir)), autoCleanup);
         break;
       }
       default:

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/master/src/main/java/org/apache/accumulo/master/Master.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/Master.java b/server/master/src/main/java/org/apache/accumulo/master/Master.java
index f320214..10d9152 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/Master.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/Master.java
@@ -186,7 +186,7 @@ public class Master extends AccumuloServerContext implements LiveTServerSet.List
   final private String hostname;
   final private Object balancedNotifier = new Object();
   final LiveTServerSet tserverSet;
-  final private List<TabletGroupWatcher> watchers = new ArrayList<TabletGroupWatcher>();
+  final private List<TabletGroupWatcher> watchers = new ArrayList<>();
   final SecurityOperation security;
   final Map<TServerInstance,AtomicInteger> badServers = Collections.synchronizedMap(new DefaultMap<TServerInstance,AtomicInteger>(new AtomicInteger()));
   final Set<TServerInstance> serversToShutdown = Collections.synchronizedSet(new HashSet<TServerInstance>());
@@ -380,8 +380,8 @@ public class Master extends AccumuloServerContext implements LiveTServerSet.List
         String namespaces = ZooUtil.getRoot(getInstance()) + Constants.ZNAMESPACES;
         zoo.putPersistentData(namespaces, new byte[0], NodeExistsPolicy.SKIP);
         for (Pair<String,String> namespace : Iterables.concat(
-            Collections.singleton(new Pair<String,String>(Namespaces.ACCUMULO_NAMESPACE, Namespaces.ACCUMULO_NAMESPACE_ID)),
-            Collections.singleton(new Pair<String,String>(Namespaces.DEFAULT_NAMESPACE, Namespaces.DEFAULT_NAMESPACE_ID)))) {
+            Collections.singleton(new Pair<>(Namespaces.ACCUMULO_NAMESPACE, Namespaces.ACCUMULO_NAMESPACE_ID)),
+            Collections.singleton(new Pair<>(Namespaces.DEFAULT_NAMESPACE, Namespaces.DEFAULT_NAMESPACE_ID)))) {
           String ns = namespace.getFirst();
           String id = namespace.getSecond();
           log.debug("Upgrade creating namespace \"" + ns + "\" (ID: " + id + ")");
@@ -727,7 +727,7 @@ public class Master extends AccumuloServerContext implements LiveTServerSet.List
 
   static enum TabletGoalState {
     HOSTED, UNASSIGNED, DELETED
-  };
+  }
 
   TabletGoalState getSystemGoalState(TabletLocationState tls) {
     switch (getMasterState()) {
@@ -841,7 +841,7 @@ public class Master extends AccumuloServerContext implements LiveTServerSet.List
     private void cleanupNonexistentMigrations(final Connector connector) throws AccumuloException, AccumuloSecurityException, TableNotFoundException {
       Scanner scanner = connector.createScanner(MetadataTable.NAME, Authorizations.EMPTY);
       TabletsSection.TabletColumnFamily.PREV_ROW_COLUMN.fetch(scanner);
-      Set<KeyExtent> found = new HashSet<KeyExtent>();
+      Set<KeyExtent> found = new HashSet<>();
       for (Entry<Key,Value> entry : scanner) {
         KeyExtent extent = new KeyExtent(entry.getKey().getRow(), entry.getValue());
         if (migrations.containsKey(extent)) {
@@ -1019,7 +1019,7 @@ public class Master extends AccumuloServerContext implements LiveTServerSet.List
     }
 
     private long balanceTablets() {
-      List<TabletMigration> migrationsOut = new ArrayList<TabletMigration>();
+      List<TabletMigration> migrationsOut = new ArrayList<>();
       long wait = tabletBalancer.balance(Collections.unmodifiableSortedMap(tserverStatus), migrationsSnapshot(), migrationsOut);
 
       for (TabletMigration m : TabletBalancer.checkMigrationSanity(tserverStatus.keySet(), migrationsOut)) {
@@ -1046,7 +1046,7 @@ public class Master extends AccumuloServerContext implements LiveTServerSet.List
     long start = System.currentTimeMillis();
     int threads = Math.max(getConfiguration().getCount(Property.MASTER_STATUS_THREAD_POOL_SIZE), 1);
     ExecutorService tp = Executors.newFixedThreadPool(threads);
-    final SortedMap<TServerInstance,TabletServerStatus> result = new TreeMap<TServerInstance,TabletServerStatus>();
+    final SortedMap<TServerInstance,TabletServerStatus> result = new TreeMap<>();
     Set<TServerInstance> currentServers = tserverSet.getCurrentServers();
     for (TServerInstance serverInstance : currentServers) {
       final TServerInstance server = serverInstance;
@@ -1144,12 +1144,12 @@ public class Master extends AccumuloServerContext implements LiveTServerSet.List
     waitForMetadataUpgrade.await();
 
     try {
-      final AgeOffStore<Master> store = new AgeOffStore<Master>(new org.apache.accumulo.fate.ZooStore<Master>(ZooUtil.getRoot(getInstance()) + Constants.ZFATE,
+      final AgeOffStore<Master> store = new AgeOffStore<>(new org.apache.accumulo.fate.ZooStore<Master>(ZooUtil.getRoot(getInstance()) + Constants.ZFATE,
           ZooReaderWriter.getInstance()), 1000 * 60 * 60 * 8);
 
       int threads = getConfiguration().getCount(Property.MASTER_FATE_THREADPOOL_SIZE);
 
-      fate = new Fate<Master>(this, store);
+      fate = new Fate<>(this, store);
       fate.startTransactionRunners(threads);
 
       SimpleTimer.getInstance(getConfiguration()).schedule(new Runnable() {
@@ -1191,9 +1191,9 @@ public class Master extends AccumuloServerContext implements LiveTServerSet.List
     final Processor<Iface> processor;
     if (ThriftServerType.SASL == getThriftServerType()) {
       Iface tcredsProxy = TCredentialsUpdatingWrapper.service(rpcProxy, clientHandler.getClass(), getConfiguration());
-      processor = new Processor<Iface>(tcredsProxy);
+      processor = new Processor<>(tcredsProxy);
     } else {
-      processor = new Processor<Iface>(rpcProxy);
+      processor = new Processor<>(rpcProxy);
     }
     ServerAddress sa = TServerUtils.startServer(this, hostname, Property.MASTER_CLIENTPORT, processor, "Master", "Master Client Service Handler", null,
         Property.MASTER_MINTHREADS, Property.MASTER_THREADCHECK, Property.GENERAL_MAX_MESSAGE_SIZE);
@@ -1221,8 +1221,8 @@ public class Master extends AccumuloServerContext implements LiveTServerSet.List
 
     // Start the replication coordinator which assigns tservers to service replication requests
     MasterReplicationCoordinator impl = new MasterReplicationCoordinator(this);
-    ReplicationCoordinator.Processor<ReplicationCoordinator.Iface> replicationCoordinatorProcessor = new ReplicationCoordinator.Processor<ReplicationCoordinator.Iface>(
-        RpcWrapper.service(impl, new ReplicationCoordinator.Processor<ReplicationCoordinator.Iface>(impl)));
+    ReplicationCoordinator.Processor<ReplicationCoordinator.Iface> replicationCoordinatorProcessor = new ReplicationCoordinator.Processor<>(RpcWrapper.service(
+        impl, new ReplicationCoordinator.Processor<ReplicationCoordinator.Iface>(impl)));
     ServerAddress replAddress = TServerUtils.startServer(this, hostname, Property.MASTER_REPLICATION_COORDINATOR_PORT, replicationCoordinatorProcessor,
         "Master Replication Coordinator", "Replication Coordinator", null, Property.MASTER_REPLICATION_COORDINATOR_MINTHREADS,
         Property.MASTER_REPLICATION_COORDINATOR_THREADCHECK, Property.GENERAL_MAX_MESSAGE_SIZE);
@@ -1404,7 +1404,7 @@ public class Master extends AccumuloServerContext implements LiveTServerSet.List
         obit.post(dead.hostPort(), cause);
     }
 
-    Set<TServerInstance> unexpected = new HashSet<TServerInstance>(deleted);
+    Set<TServerInstance> unexpected = new HashSet<>(deleted);
     unexpected.removeAll(this.serversToShutdown);
     if (unexpected.size() > 0) {
       if (stillMaster() && !getMasterGoalState().equals(MasterGoalState.CLEAN_STOP)) {
@@ -1469,7 +1469,7 @@ public class Master extends AccumuloServerContext implements LiveTServerSet.List
 
   @Override
   public Set<String> onlineTables() {
-    Set<String> result = new HashSet<String>();
+    Set<String> result = new HashSet<>();
     if (getMasterState() != MasterState.NORMAL) {
       if (getMasterState() != MasterState.UNLOAD_METADATA_TABLETS)
         result.add(MetadataTable.ID);
@@ -1496,7 +1496,7 @@ public class Master extends AccumuloServerContext implements LiveTServerSet.List
 
   @Override
   public Collection<MergeInfo> merges() {
-    List<MergeInfo> result = new ArrayList<MergeInfo>();
+    List<MergeInfo> result = new ArrayList<>();
     for (String tableId : Tables.getIdToNameMap(getInstance()).keySet()) {
       result.add(getMergeInfo(tableId));
     }
@@ -1552,8 +1552,8 @@ public class Master extends AccumuloServerContext implements LiveTServerSet.List
   public MasterMonitorInfo getMasterMonitorInfo() {
     final MasterMonitorInfo result = new MasterMonitorInfo();
 
-    result.tServerInfo = new ArrayList<TabletServerStatus>();
-    result.tableMap = new DefaultMap<String,TableInfo>(new TableInfo());
+    result.tServerInfo = new ArrayList<>();
+    result.tableMap = new DefaultMap<>(new TableInfo());
     for (Entry<TServerInstance,TabletServerStatus> serverEntry : tserverStatus.entrySet()) {
       final TabletServerStatus status = serverEntry.getValue();
       result.tServerInfo.add(status);
@@ -1561,7 +1561,7 @@ public class Master extends AccumuloServerContext implements LiveTServerSet.List
         TableInfoUtil.add(result.tableMap.get(entry.getKey()), entry.getValue());
       }
     }
-    result.badTServers = new HashMap<String,Byte>();
+    result.badTServers = new HashMap<>();
     synchronized (badServers) {
       for (TServerInstance bad : badServers.keySet()) {
         result.badTServers.put(bad.hostPort(), TabletServerState.UNRESPONSIVE.getId());
@@ -1570,7 +1570,7 @@ public class Master extends AccumuloServerContext implements LiveTServerSet.List
     result.state = getMasterState();
     result.goalState = getMasterGoalState();
     result.unassignedTablets = displayUnassigned();
-    result.serversShuttingDown = new HashSet<String>();
+    result.serversShuttingDown = new HashSet<>();
     synchronized (serversToShutdown) {
       for (TServerInstance server : serversToShutdown)
         result.serversShuttingDown.add(server.hostPort());
@@ -1590,7 +1590,7 @@ public class Master extends AccumuloServerContext implements LiveTServerSet.List
 
   @Override
   public Set<KeyExtent> migrationsSnapshot() {
-    Set<KeyExtent> migrationKeys = new HashSet<KeyExtent>();
+    Set<KeyExtent> migrationKeys = new HashSet<>();
     synchronized (migrations) {
       migrationKeys.addAll(migrations.keySet());
     }
@@ -1600,7 +1600,7 @@ public class Master extends AccumuloServerContext implements LiveTServerSet.List
   @Override
   public Set<TServerInstance> shutdownServers() {
     synchronized (serversToShutdown) {
-      return new HashSet<TServerInstance>(serversToShutdown);
+      return new HashSet<>(serversToShutdown);
     }
   }
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/master/src/main/java/org/apache/accumulo/master/MasterClientServiceHandler.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/MasterClientServiceHandler.java b/server/master/src/main/java/org/apache/accumulo/master/MasterClientServiceHandler.java
index 590f483..bbbdbed 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/MasterClientServiceHandler.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/MasterClientServiceHandler.java
@@ -148,7 +148,7 @@ public class MasterClientServiceHandler extends FateServiceHandler implements Ma
     if (endRow != null && startRow != null && ByteBufferUtil.toText(startRow).compareTo(ByteBufferUtil.toText(endRow)) >= 0)
       throw new ThriftTableOperationException(tableId, null, TableOperation.FLUSH, TableOperationExceptionType.BAD_RANGE, "start row must be less than end row");
 
-    Set<TServerInstance> serversToFlush = new HashSet<TServerInstance>(master.tserverSet.getCurrentServers());
+    Set<TServerInstance> serversToFlush = new HashSet<>(master.tserverSet.getCurrentServers());
 
     for (long l = 0; l < maxLoops; l++) {
 
@@ -303,7 +303,7 @@ public class MasterClientServiceHandler extends FateServiceHandler implements Ma
 
     log.debug("Seeding FATE op to shutdown " + tabletServer + " with tid " + tid);
 
-    master.fate.seedTransaction(tid, new TraceRepo<Master>(new ShutdownTServer(doomed, force)), false);
+    master.fate.seedTransaction(tid, new TraceRepo<>(new ShutdownTServer(doomed, force)), false);
     master.fate.waitForCompletion(tid);
     master.fate.delete(tid);
 
@@ -469,7 +469,7 @@ public class MasterClientServiceHandler extends FateServiceHandler implements Ma
   @Override
   public List<String> getActiveTservers(TInfo tinfo, TCredentials credentials) throws TException {
     Set<TServerInstance> tserverInstances = master.onlineTabletServers();
-    List<String> servers = new ArrayList<String>();
+    List<String> servers = new ArrayList<>();
     for (TServerInstance tserverInstance : tserverInstances) {
       servers.add(tserverInstance.getLocation().toString());
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/master/src/main/java/org/apache/accumulo/master/TabletGroupWatcher.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/TabletGroupWatcher.java b/server/master/src/main/java/org/apache/accumulo/master/TabletGroupWatcher.java
index e8df759..e20335b 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/TabletGroupWatcher.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/TabletGroupWatcher.java
@@ -142,8 +142,8 @@ class TabletGroupWatcher extends Daemon {
       int unloaded = 0;
       ClosableIterator<TabletLocationState> iter = null;
       try {
-        Map<String,MergeStats> mergeStatsCache = new HashMap<String,MergeStats>();
-        Map<String,MergeStats> currentMerges = new HashMap<String,MergeStats>();
+        Map<String,MergeStats> mergeStatsCache = new HashMap<>();
+        Map<String,MergeStats> currentMerges = new HashMap<>();
         for (MergeInfo merge : master.merges()) {
           if (merge.getExtent() != null) {
             currentMerges.put(merge.getExtent().getTableId(), new MergeStats(merge));
@@ -151,7 +151,7 @@ class TabletGroupWatcher extends Daemon {
         }
 
         // Get the current status for the current list of tservers
-        SortedMap<TServerInstance,TabletServerStatus> currentTServers = new TreeMap<TServerInstance,TabletServerStatus>();
+        SortedMap<TServerInstance,TabletServerStatus> currentTServers = new TreeMap<>();
         for (TServerInstance entry : this.master.tserverSet.getCurrentServers()) {
           currentTServers.put(entry, this.master.tserverStatus.get(entry));
         }
@@ -162,13 +162,13 @@ class TabletGroupWatcher extends Daemon {
         }
 
         // Don't move tablets to servers that are shutting down
-        SortedMap<TServerInstance,TabletServerStatus> destinations = new TreeMap<TServerInstance,TabletServerStatus>(currentTServers);
+        SortedMap<TServerInstance,TabletServerStatus> destinations = new TreeMap<>(currentTServers);
         destinations.keySet().removeAll(this.master.serversToShutdown);
 
-        List<Assignment> assignments = new ArrayList<Assignment>();
-        List<Assignment> assigned = new ArrayList<Assignment>();
-        List<TabletLocationState> assignedToDeadServers = new ArrayList<TabletLocationState>();
-        Map<KeyExtent,TServerInstance> unassigned = new HashMap<KeyExtent,TServerInstance>();
+        List<Assignment> assignments = new ArrayList<>();
+        List<Assignment> assigned = new ArrayList<>();
+        List<TabletLocationState> assignedToDeadServers = new ArrayList<>();
+        Map<KeyExtent,TServerInstance> unassigned = new HashMap<>();
         Map<TServerInstance,List<Path>> logsForDeadServers = new TreeMap<>();
 
         MasterState masterState = master.getMasterState();
@@ -356,8 +356,8 @@ class TabletGroupWatcher extends Daemon {
     // ACCUMULO-2261 if a dying tserver writes a location before its lock information propagates, it may cause duplicate assignment.
     // Attempt to find the dead server entry and remove it.
     try {
-      Map<Key,Value> future = new HashMap<Key,Value>();
-      Map<Key,Value> assigned = new HashMap<Key,Value>();
+      Map<Key,Value> future = new HashMap<>();
+      Map<Key,Value> assigned = new HashMap<>();
       KeyExtent extent = new KeyExtent(row, new Value(new byte[] {0}));
       String table = MetadataTable.NAME;
       if (extent.isMeta())
@@ -536,7 +536,7 @@ class TabletGroupWatcher extends Daemon {
       TabletsSection.ServerColumnFamily.TIME_COLUMN.fetch(scanner);
       scanner.fetchColumnFamily(DataFileColumnFamily.NAME);
       scanner.fetchColumnFamily(TabletsSection.CurrentLocationColumnFamily.NAME);
-      Set<FileRef> datafiles = new TreeSet<FileRef>();
+      Set<FileRef> datafiles = new TreeSet<>();
       for (Entry<Key,Value> entry : scanner) {
         Key key = entry.getKey();
         if (key.compareColumnFamily(DataFileColumnFamily.NAME) == 0) {
@@ -761,7 +761,7 @@ class TabletGroupWatcher extends Daemon {
     }
 
     if (!currentTServers.isEmpty()) {
-      Map<KeyExtent,TServerInstance> assignedOut = new HashMap<KeyExtent,TServerInstance>();
+      Map<KeyExtent,TServerInstance> assignedOut = new HashMap<>();
       final StringBuilder builder = new StringBuilder(64);
       this.master.tabletBalancer.getAssignments(Collections.unmodifiableSortedMap(currentTServers), Collections.unmodifiableMap(unassigned), assignedOut);
       for (Entry<KeyExtent,TServerInstance> assignment : assignedOut.entrySet()) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/master/src/main/java/org/apache/accumulo/master/recovery/RecoveryManager.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/recovery/RecoveryManager.java b/server/master/src/main/java/org/apache/accumulo/master/recovery/RecoveryManager.java
index c1c1713..bd49a7d 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/recovery/RecoveryManager.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/recovery/RecoveryManager.java
@@ -55,9 +55,9 @@ public class RecoveryManager {
 
   private static final Logger log = LoggerFactory.getLogger(RecoveryManager.class);
 
-  private Map<String,Long> recoveryDelay = new HashMap<String,Long>();
-  private Set<String> closeTasksQueued = new HashSet<String>();
-  private Set<String> sortsQueued = new HashSet<String>();
+  private Map<String,Long> recoveryDelay = new HashMap<>();
+  private Set<String> closeTasksQueued = new HashSet<>();
+  private Set<String> sortsQueued = new HashSet<>();
   private ScheduledExecutorService executor;
   private Master master;
   private ZooCache zooCache;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/master/src/main/java/org/apache/accumulo/master/state/TableStats.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/state/TableStats.java b/server/master/src/main/java/org/apache/accumulo/master/state/TableStats.java
index 1fe72a3..931df12 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/state/TableStats.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/state/TableStats.java
@@ -23,14 +23,14 @@ import org.apache.accumulo.core.master.thrift.MasterState;
 import org.apache.accumulo.server.master.state.TabletState;
 
 public class TableStats {
-  private Map<String,TableCounts> last = new HashMap<String,TableCounts>();
+  private Map<String,TableCounts> last = new HashMap<>();
   private Map<String,TableCounts> next;
   private long startScan = 0;
   private long endScan = 0;
   private MasterState state;
 
   public synchronized void begin() {
-    next = new HashMap<String,TableCounts>();
+    next = new HashMap<>();
     startScan = System.currentTimeMillis();
   }
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/master/src/main/java/org/apache/accumulo/master/tableOps/CompactionDriver.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/CompactionDriver.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/CompactionDriver.java
index 2346ecc..4653472 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/CompactionDriver.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/CompactionDriver.java
@@ -80,7 +80,7 @@ class CompactionDriver extends MasterRepo {
       throw new AcceptableThriftTableOperationException(tableId, null, TableOperation.COMPACT, TableOperationExceptionType.OTHER, "Compaction canceled");
     }
 
-    MapCounter<TServerInstance> serversToFlush = new MapCounter<TServerInstance>();
+    MapCounter<TServerInstance> serversToFlush = new MapCounter<>();
     Connector conn = master.getConnector();
 
     Scanner scanner;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/master/src/main/java/org/apache/accumulo/master/tableOps/CopyFailed.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/CopyFailed.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/CopyFailed.java
index 5fbf3a0..2f71907 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/CopyFailed.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/CopyFailed.java
@@ -67,7 +67,7 @@ class CopyFailed extends MasterRepo {
 
   @Override
   public long isReady(long tid, Master master) throws Exception {
-    Set<TServerInstance> finished = new HashSet<TServerInstance>();
+    Set<TServerInstance> finished = new HashSet<>();
     Set<TServerInstance> running = master.onlineTabletServers();
     for (TServerInstance server : running) {
       try {
@@ -92,8 +92,8 @@ class CopyFailed extends MasterRepo {
     if (!fs.exists(new Path(error, BulkImport.FAILURES_TXT)))
       return new CleanUpBulkImport(tableId, source, bulk, error);
 
-    HashMap<FileRef,String> failures = new HashMap<FileRef,String>();
-    HashMap<FileRef,String> loadedFailures = new HashMap<FileRef,String>();
+    HashMap<FileRef,String> failures = new HashMap<>();
+    HashMap<FileRef,String> loadedFailures = new HashMap<>();
 
     try (BufferedReader in = new BufferedReader(new InputStreamReader(fs.open(new Path(error, BulkImport.FAILURES_TXT)), UTF_8))) {
       String line = null;
@@ -138,7 +138,7 @@ class CopyFailed extends MasterRepo {
       DistributedWorkQueue bifCopyQueue = new DistributedWorkQueue(Constants.ZROOT + "/" + master.getInstance().getInstanceID() + Constants.ZBULK_FAILED_COPYQ,
           master.getConfiguration());
 
-      HashSet<String> workIds = new HashSet<String>();
+      HashSet<String> workIds = new HashSet<>();
 
       for (String failure : loadedFailures.values()) {
         Path orig = new Path(failure);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/master/src/main/java/org/apache/accumulo/master/tableOps/LoadFiles.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/LoadFiles.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/LoadFiles.java
index 40cac38..ff285fa 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/LoadFiles.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/LoadFiles.java
@@ -101,7 +101,7 @@ class LoadFiles extends MasterRepo {
     ExecutorService executor = getThreadPool(master);
     final AccumuloConfiguration conf = master.getConfiguration();
     VolumeManager fs = master.getFileSystem();
-    List<FileStatus> files = new ArrayList<FileStatus>();
+    List<FileStatus> files = new ArrayList<>();
     for (FileStatus entry : fs.listStatus(new Path(bulk))) {
       files.add(entry);
     }
@@ -123,7 +123,7 @@ class LoadFiles extends MasterRepo {
 
     final int RETRIES = Math.max(1, conf.getCount(Property.MASTER_BULK_RETRIES));
     for (int attempt = 0; attempt < RETRIES && filesToLoad.size() > 0; attempt++) {
-      List<Future<List<String>>> results = new ArrayList<Future<List<String>>>();
+      List<Future<List<String>>> results = new ArrayList<>();
 
       if (master.onlineTabletServers().size() == 0)
         log.warn("There are no tablet server to process bulk import, waiting (tid = " + tid + ")");
@@ -140,7 +140,7 @@ class LoadFiles extends MasterRepo {
         results.add(executor.submit(new Callable<List<String>>() {
           @Override
           public List<String> call() {
-            List<String> failures = new ArrayList<String>();
+            List<String> failures = new ArrayList<>();
             ClientService.Client client = null;
             HostAndPort server = null;
             try {
@@ -168,7 +168,7 @@ class LoadFiles extends MasterRepo {
           }
         }));
       }
-      Set<String> failures = new HashSet<String>();
+      Set<String> failures = new HashSet<>();
       for (Future<List<String>> f : results)
         failures.addAll(f.get());
       filesToLoad.removeAll(loaded);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/master/src/main/java/org/apache/accumulo/master/tableOps/PopulateMetadataTable.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/PopulateMetadataTable.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/PopulateMetadataTable.java
index 9e596f8..81e28b6 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/PopulateMetadataTable.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/PopulateMetadataTable.java
@@ -69,7 +69,7 @@ class PopulateMetadataTable extends MasterRepo {
     BufferedReader in = new BufferedReader(new InputStreamReader(fs.open(new Path(tableInfo.importDir, "mappings.txt")), UTF_8));
 
     try {
-      Map<String,String> map = new HashMap<String,String>();
+      Map<String,String> map = new HashMap<>();
 
       String line = null;
       while ((line = in.readLine()) != null) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/master/src/main/java/org/apache/accumulo/master/tableOps/TraceRepo.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/TraceRepo.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/TraceRepo.java
index 9388b7b..4bbb12b 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/TraceRepo.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/TraceRepo.java
@@ -57,7 +57,7 @@ public class TraceRepo<T> implements Repo<T> {
       Repo<T> result = repo.call(tid, environment);
       if (result == null)
         return null;
-      return new TraceRepo<T>(result);
+      return new TraceRepo<>(result);
     } finally {
       span.stop();
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/master/src/main/java/org/apache/accumulo/master/tableOps/WriteExportFiles.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/WriteExportFiles.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/WriteExportFiles.java
index 3ea2767..d0cbe36 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/WriteExportFiles.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/WriteExportFiles.java
@@ -202,7 +202,7 @@ class WriteExportFiles extends MasterRepo {
       DataOutputStream dataOut) throws IOException, TableNotFoundException, AccumuloException, AccumuloSecurityException {
     zipOut.putNextEntry(new ZipEntry(Constants.EXPORT_METADATA_FILE));
 
-    Map<String,String> uniqueFiles = new HashMap<String,String>();
+    Map<String,String> uniqueFiles = new HashMap<>();
 
     Scanner metaScanner = context.getConnector().createScanner(MetadataTable.NAME, Authorizations.EMPTY);
     metaScanner.fetchColumnFamily(DataFileColumnFamily.NAME);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/master/src/main/java/org/apache/accumulo/master/util/FateAdmin.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/util/FateAdmin.java b/server/master/src/main/java/org/apache/accumulo/master/util/FateAdmin.java
index 953d630..a1dd303 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/util/FateAdmin.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/util/FateAdmin.java
@@ -44,7 +44,7 @@ public class FateAdmin {
 
   static class TxOpts {
     @Parameter(description = "<txid>...", required = true)
-    List<String> txids = new ArrayList<String>();
+    List<String> txids = new ArrayList<>();
   }
 
   @Parameters(commandDescription = "Stop an existing FATE by transaction id")
@@ -60,7 +60,7 @@ public class FateAdmin {
     Help opts = new Help();
     JCommander jc = new JCommander(opts);
     jc.setProgramName(FateAdmin.class.getName());
-    LinkedHashMap<String,TxOpts> txOpts = new LinkedHashMap<String,TxOpts>(2);
+    LinkedHashMap<String,TxOpts> txOpts = new LinkedHashMap<>(2);
     txOpts.put("fail", new FailOpts());
     txOpts.put("delete", new DeleteOpts());
     for (Entry<String,TxOpts> entry : txOpts.entrySet()) {
@@ -76,13 +76,13 @@ public class FateAdmin {
     System.err
         .printf("This tool has been deprecated%nFATE administration now available within 'accumulo shell'%n$ fate fail <txid>... | delete <txid>... | print [<txid>...]%n%n");
 
-    AdminUtil<Master> admin = new AdminUtil<Master>();
+    AdminUtil<Master> admin = new AdminUtil<>();
 
     Instance instance = HdfsZooInstance.getInstance();
     String path = ZooUtil.getRoot(instance) + Constants.ZFATE;
     String masterPath = ZooUtil.getRoot(instance) + Constants.ZMASTER_LOCK;
     IZooReaderWriter zk = ZooReaderWriter.getInstance();
-    ZooStore<Master> zs = new ZooStore<Master>(path, zk);
+    ZooStore<Master> zs = new ZooStore<>(path, zk);
 
     if (jc.getParsedCommand().equals("fail")) {
       for (String txid : txOpts.get(jc.getParsedCommand()).txids) {
@@ -98,7 +98,7 @@ public class FateAdmin {
         admin.deleteLocks(zs, zk, ZooUtil.getRoot(instance) + Constants.ZTABLE_LOCKS, txid);
       }
     } else if (jc.getParsedCommand().equals("print")) {
-      admin.print(new ReadOnlyStore<Master>(zs), zk, ZooUtil.getRoot(instance) + Constants.ZTABLE_LOCKS);
+      admin.print(new ReadOnlyStore<>(zs), zk, ZooUtil.getRoot(instance) + Constants.ZTABLE_LOCKS);
     }
   }
 }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/master/src/test/java/org/apache/accumulo/master/DefaultMapTest.java
----------------------------------------------------------------------
diff --git a/server/master/src/test/java/org/apache/accumulo/master/DefaultMapTest.java b/server/master/src/test/java/org/apache/accumulo/master/DefaultMapTest.java
index c0e9a4a..8d139ac 100644
--- a/server/master/src/test/java/org/apache/accumulo/master/DefaultMapTest.java
+++ b/server/master/src/test/java/org/apache/accumulo/master/DefaultMapTest.java
@@ -26,7 +26,7 @@ public class DefaultMapTest {
 
   @Test
   public void testDefaultMap() {
-    DefaultMap<String,String> map = new DefaultMap<String,String>("");
+    DefaultMap<String,String> map = new DefaultMap<>("");
     map.put("key", "value");
     String empty = map.get("otherKey");
     assertEquals(map.get("key"), "value");

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/master/src/test/java/org/apache/accumulo/master/state/RootTabletStateStoreTest.java
----------------------------------------------------------------------
diff --git a/server/master/src/test/java/org/apache/accumulo/master/state/RootTabletStateStoreTest.java b/server/master/src/test/java/org/apache/accumulo/master/state/RootTabletStateStoreTest.java
index 0a78d59..0bc989e 100644
--- a/server/master/src/test/java/org/apache/accumulo/master/state/RootTabletStateStoreTest.java
+++ b/server/master/src/test/java/org/apache/accumulo/master/state/RootTabletStateStoreTest.java
@@ -48,7 +48,7 @@ public class RootTabletStateStoreTest {
       this.name = name;
     }
 
-    List<Node> children = new ArrayList<Node>();
+    List<Node> children = new ArrayList<>();
     String name;
     byte[] value = new byte[] {};
 
@@ -58,7 +58,7 @@ public class RootTabletStateStoreTest {
           return node;
       return null;
     }
-  };
+  }
 
   static class FakeZooStore implements DistributedStore {
 
@@ -83,7 +83,7 @@ public class RootTabletStateStoreTest {
       Node node = navigate(path);
       if (node == null)
         return Collections.emptyList();
-      List<String> children = new ArrayList<String>(node.children.size());
+      List<String> children = new ArrayList<>(node.children.size());
       for (Node child : node.children)
         children.add(child.name);
       return children;
@@ -143,10 +143,10 @@ public class RootTabletStateStoreTest {
     assertArrayEquals(store.get("/a/b"), "ab".getBytes());
     store.put("/a/b/b", "abb".getBytes());
     List<String> children = store.getChildren("/a/b");
-    assertEquals(new HashSet<String>(children), new HashSet<String>(Arrays.asList("b", "c")));
+    assertEquals(new HashSet<>(children), new HashSet<>(Arrays.asList("b", "c")));
     store.remove("/a/b/c");
     children = store.getChildren("/a/b");
-    assertEquals(new HashSet<String>(children), new HashSet<String>(Arrays.asList("b")));
+    assertEquals(new HashSet<>(children), new HashSet<>(Arrays.asList("b")));
   }
 
   @Test

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
index 9dc4cef..63fb32c 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
@@ -173,20 +173,20 @@ public class Monitor {
   private ZooLock monitorLock;
 
   private static final String DEFAULT_INSTANCE_NAME = "(Unavailable)";
-  public static final AtomicReference<String> cachedInstanceName = new AtomicReference<String>(DEFAULT_INSTANCE_NAME);
+  public static final AtomicReference<String> cachedInstanceName = new AtomicReference<>(DEFAULT_INSTANCE_NAME);
 
   private static class EventCounter {
 
-    Map<String,Pair<Long,Long>> prevSamples = new HashMap<String,Pair<Long,Long>>();
-    Map<String,Pair<Long,Long>> samples = new HashMap<String,Pair<Long,Long>>();
-    Set<String> serversUpdated = new HashSet<String>();
+    Map<String,Pair<Long,Long>> prevSamples = new HashMap<>();
+    Map<String,Pair<Long,Long>> samples = new HashMap<>();
+    Set<String> serversUpdated = new HashSet<>();
 
     void startingUpdates() {
       serversUpdated.clear();
     }
 
     void updateTabletServer(String name, long sampleTime, long numEvents) {
-      Pair<Long,Long> newSample = new Pair<Long,Long>(sampleTime, numEvents);
+      Pair<Long,Long> newSample = new Pair<>(sampleTime, numEvents);
       Pair<Long,Long> lastSample = samples.get(name);
 
       if (lastSample == null || !lastSample.equals(newSample)) {
@@ -347,25 +347,25 @@ public class Monitor {
         Monitor.totalHoldTime = totalHoldTime;
         Monitor.totalLookups = totalLookups;
 
-        ingestRateOverTime.add(new Pair<Long,Double>(currentTime, totalIngestRate));
-        ingestByteRateOverTime.add(new Pair<Long,Double>(currentTime, totalIngestByteRate));
+        ingestRateOverTime.add(new Pair<>(currentTime, totalIngestRate));
+        ingestByteRateOverTime.add(new Pair<>(currentTime, totalIngestByteRate));
 
         double totalLoad = 0.;
         for (TabletServerStatus status : mmi.tServerInfo) {
           if (status != null)
             totalLoad += status.osLoad;
         }
-        loadOverTime.add(new Pair<Long,Double>(currentTime, totalLoad));
+        loadOverTime.add(new Pair<>(currentTime, totalLoad));
 
-        minorCompactionsOverTime.add(new Pair<Long,Integer>(currentTime, minorCompactions));
-        majorCompactionsOverTime.add(new Pair<Long,Integer>(currentTime, majorCompactions));
+        minorCompactionsOverTime.add(new Pair<>(currentTime, minorCompactions));
+        majorCompactionsOverTime.add(new Pair<>(currentTime, majorCompactions));
 
-        lookupsOverTime.add(new Pair<Long,Double>(currentTime, lookupRateTracker.calculateRate()));
+        lookupsOverTime.add(new Pair<>(currentTime, lookupRateTracker.calculateRate()));
 
-        queryRateOverTime.add(new Pair<Long,Integer>(currentTime, (int) totalQueryRate));
-        queryByteRateOverTime.add(new Pair<Long,Double>(currentTime, totalQueryByteRate));
+        queryRateOverTime.add(new Pair<>(currentTime, (int) totalQueryRate));
+        queryByteRateOverTime.add(new Pair<>(currentTime, totalQueryByteRate));
 
-        scanRateOverTime.add(new Pair<Long,Integer>(currentTime, (int) totalScanRate));
+        scanRateOverTime.add(new Pair<>(currentTime, (int) totalScanRate));
 
         calcCacheHitRate(indexCacheHitRateOverTime, currentTime, indexCacheHitTracker, indexCacheRequestTracker);
         calcCacheHitRate(dataCacheHitRateOverTime, currentTime, dataCacheHitTracker, dataCacheRequestTracker);
@@ -390,7 +390,7 @@ public class Monitor {
   private static void calcCacheHitRate(List<Pair<Long,Double>> hitRate, long currentTime, EventCounter cacheHits, EventCounter cacheReq) {
     long req = cacheReq.calculateCount();
     if (req > 0)
-      hitRate.add(new Pair<Long,Double>(currentTime, cacheHits.calculateCount() / (double) cacheReq.calculateCount()));
+      hitRate.add(new Pair<>(currentTime, cacheHits.calculateCount() / (double) cacheReq.calculateCount()));
     else
       hitRate.add(new Pair<Long,Double>(currentTime, null));
   }
@@ -558,11 +558,11 @@ public class Monitor {
     }
   }
 
-  static final Map<HostAndPort,ScanStats> allScans = new HashMap<HostAndPort,ScanStats>();
+  static final Map<HostAndPort,ScanStats> allScans = new HashMap<>();
 
   public static Map<HostAndPort,ScanStats> getScans() {
     synchronized (allScans) {
-      return new HashMap<HostAndPort,ScanStats>(allScans);
+      return new HashMap<>(allScans);
     }
   }
 
@@ -762,37 +762,37 @@ public class Monitor {
 
   public static List<Pair<Long,Double>> getLoadOverTime() {
     synchronized (loadOverTime) {
-      return new ArrayList<Pair<Long,Double>>(loadOverTime);
+      return new ArrayList<>(loadOverTime);
     }
   }
 
   public static List<Pair<Long,Double>> getIngestRateOverTime() {
     synchronized (ingestRateOverTime) {
-      return new ArrayList<Pair<Long,Double>>(ingestRateOverTime);
+      return new ArrayList<>(ingestRateOverTime);
     }
   }
 
   public static List<Pair<Long,Double>> getIngestByteRateOverTime() {
     synchronized (ingestByteRateOverTime) {
-      return new ArrayList<Pair<Long,Double>>(ingestByteRateOverTime);
+      return new ArrayList<>(ingestByteRateOverTime);
     }
   }
 
   public static List<Pair<Long,Integer>> getMinorCompactionsOverTime() {
     synchronized (minorCompactionsOverTime) {
-      return new ArrayList<Pair<Long,Integer>>(minorCompactionsOverTime);
+      return new ArrayList<>(minorCompactionsOverTime);
     }
   }
 
   public static List<Pair<Long,Integer>> getMajorCompactionsOverTime() {
     synchronized (majorCompactionsOverTime) {
-      return new ArrayList<Pair<Long,Integer>>(majorCompactionsOverTime);
+      return new ArrayList<>(majorCompactionsOverTime);
     }
   }
 
   public static List<Pair<Long,Double>> getLookupsOverTime() {
     synchronized (lookupsOverTime) {
-      return new ArrayList<Pair<Long,Double>>(lookupsOverTime);
+      return new ArrayList<>(lookupsOverTime);
     }
   }
 
@@ -802,31 +802,31 @@ public class Monitor {
 
   public static List<Pair<Long,Integer>> getQueryRateOverTime() {
     synchronized (queryRateOverTime) {
-      return new ArrayList<Pair<Long,Integer>>(queryRateOverTime);
+      return new ArrayList<>(queryRateOverTime);
     }
   }
 
   public static List<Pair<Long,Integer>> getScanRateOverTime() {
     synchronized (scanRateOverTime) {
-      return new ArrayList<Pair<Long,Integer>>(scanRateOverTime);
+      return new ArrayList<>(scanRateOverTime);
     }
   }
 
   public static List<Pair<Long,Double>> getQueryByteRateOverTime() {
     synchronized (queryByteRateOverTime) {
-      return new ArrayList<Pair<Long,Double>>(queryByteRateOverTime);
+      return new ArrayList<>(queryByteRateOverTime);
     }
   }
 
   public static List<Pair<Long,Double>> getIndexCacheHitRateOverTime() {
     synchronized (indexCacheHitRateOverTime) {
-      return new ArrayList<Pair<Long,Double>>(indexCacheHitRateOverTime);
+      return new ArrayList<>(indexCacheHitRateOverTime);
     }
   }
 
   public static List<Pair<Long,Double>> getDataCacheHitRateOverTime() {
     synchronized (dataCacheHitRateOverTime) {
-      return new ArrayList<Pair<Long,Double>>(dataCacheHitRateOverTime);
+      return new ArrayList<>(dataCacheHitRateOverTime);
     }
   }
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/monitor/src/main/java/org/apache/accumulo/monitor/ZooKeeperStatus.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/ZooKeeperStatus.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/ZooKeeperStatus.java
index 7e992e0..f2a295d 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/ZooKeeperStatus.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/ZooKeeperStatus.java
@@ -82,7 +82,7 @@ public class ZooKeeperStatus implements Runnable {
     }
   }
 
-  private static SortedSet<ZooKeeperState> status = new TreeSet<ZooKeeperState>();
+  private static SortedSet<ZooKeeperState> status = new TreeSet<>();
 
   public static Collection<ZooKeeperState> getZooKeeperStatus() {
     return status;
@@ -93,7 +93,7 @@ public class ZooKeeperStatus implements Runnable {
 
     while (!stop) {
 
-      TreeSet<ZooKeeperState> update = new TreeSet<ZooKeeperState>();
+      TreeSet<ZooKeeperState> update = new TreeSet<>();
 
       String zookeepers[] = SiteConfiguration.getInstance().get(Property.INSTANCE_ZK_HOST).split(",");
       for (String keeper : zookeepers) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/GcStatusServlet.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/GcStatusServlet.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/GcStatusServlet.java
index 926eedc..74fc21c 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/GcStatusServlet.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/GcStatusServlet.java
@@ -48,7 +48,7 @@ public class GcStatusServlet extends BasicServlet {
       gcActivity.addSortableColumn("Candidates", new NumberType<Long>(), null);
       gcActivity.addSortableColumn("Deleted", new NumberType<Long>(), null);
       gcActivity.addSortableColumn("In&nbsp;Use", new NumberType<Long>(), null);
-      gcActivity.addSortableColumn("Errors", new NumberType<Long>(0l, 1l), null);
+      gcActivity.addSortableColumn("Errors", new NumberType<>(0l, 1l), null);
       gcActivity.addSortableColumn("Duration", new DurationType(), null);
 
       if (status.last.finished > 0)

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/JSONServlet.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/JSONServlet.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/JSONServlet.java
index dc75537..745fd96 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/JSONServlet.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/JSONServlet.java
@@ -49,7 +49,7 @@ public class JSONServlet extends BasicServlet {
 
   private static Map<String,Object> addServer(String ip, String hostname, double osload, double ingest, double query, double ingestMB, double queryMB,
       int scans, double scansessions, long holdtime) {
-    Map<String,Object> map = new HashMap<String,Object>();
+    Map<String,Object> map = new HashMap<>();
     map.put("ip", ip);
     map.put("hostname", hostname);
     map.put("osload", osload);
@@ -69,8 +69,8 @@ public class JSONServlet extends BasicServlet {
       return;
     }
 
-    Map<String,Object> results = new HashMap<String,Object>();
-    List<Map<String,Object>> servers = new ArrayList<Map<String,Object>>();
+    Map<String,Object> results = new HashMap<>();
+    List<Map<String,Object>> servers = new ArrayList<>();
 
     for (TabletServerStatus status : Monitor.getMmi().tServerInfo) {
       TableInfo summary = TableInfoUtil.summarizeTableStats(status);
@@ -80,14 +80,14 @@ public class JSONServlet extends BasicServlet {
     }
 
     for (Entry<String,Byte> entry : Monitor.getMmi().badTServers.entrySet()) {
-      Map<String,Object> badServer = new HashMap<String,Object>();
+      Map<String,Object> badServer = new HashMap<>();
       badServer.put("ip", entry.getKey());
       badServer.put("bad", true);
       servers.add(badServer);
     }
 
     for (DeadServer dead : Monitor.getMmi().deadTabletServers) {
-      Map<String,Object> deadServer = new HashMap<String,Object>();
+      Map<String,Object> deadServer = new HashMap<>();
       deadServer.put("ip", dead.server);
       deadServer.put("dead", true);
       servers.add(deadServer);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/MasterServlet.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/MasterServlet.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/MasterServlet.java
index 64b8648..42d771c 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/MasterServlet.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/MasterServlet.java
@@ -122,7 +122,7 @@ public class MasterServlet extends BasicServlet {
       }
 
       int guessHighLoad = ManagementFactory.getOperatingSystemMXBean().getAvailableProcessors();
-      List<String> slaves = new ArrayList<String>();
+      List<String> slaves = new ArrayList<>();
       for (TabletServerStatus up : Monitor.getMmi().tServerInfo) {
         slaves.add(up.name);
       }
@@ -137,8 +137,8 @@ public class MasterServlet extends BasicServlet {
           (int) (slaves.size() * 0.6 + 1.0), slaves.size()), "Number of tablet servers currently available");
       masterStatus.addSortableColumn("#&nbsp;Total<br />Tablet&nbsp;Servers", new PreciseNumberType(), "The total number of tablet servers configured");
       masterStatus.addSortableColumn("Last&nbsp;GC", null, "The last time files were cleaned-up from HDFS.");
-      masterStatus.addSortableColumn("#&nbsp;Tablets", new NumberType<Integer>(0, Integer.MAX_VALUE, 2, Integer.MAX_VALUE), null);
-      masterStatus.addSortableColumn("#&nbsp;Unassigned<br />Tablets", new NumberType<Integer>(0, 0), null);
+      masterStatus.addSortableColumn("#&nbsp;Tablets", new NumberType<>(0, Integer.MAX_VALUE, 2, Integer.MAX_VALUE), null);
+      masterStatus.addSortableColumn("#&nbsp;Unassigned<br />Tablets", new NumberType<>(0, 0), null);
       masterStatus.addSortableColumn("Entries", new NumberType<Long>(), "The total number of key/value pairs in Accumulo");
       masterStatus.addSortableColumn("Ingest", new NumberType<Long>(), "The number of Key/Value pairs inserted, per second. "
           + " Note that deleted records are \"inserted\" and will make the ingest " + "rate increase in the near-term.");
@@ -147,7 +147,7 @@ public class MasterServlet extends BasicServlet {
       masterStatus.addSortableColumn("Entries<br />Returned", new NumberType<Long>(), "The total number of Key/Value pairs returned as a result of scans.");
       masterStatus.addSortableColumn("Hold&nbsp;Time", new DurationType(0l, 0l), "The maximum amount of time that ingest has been held "
           + "across all servers due to a lack of memory to store the records");
-      masterStatus.addSortableColumn("OS&nbsp;Load", new NumberType<Double>(0., guessHighLoad * 1., 0., guessHighLoad * 3.),
+      masterStatus.addSortableColumn("OS&nbsp;Load", new NumberType<>(0., guessHighLoad * 1., 0., guessHighLoad * 3.),
           "The one-minute load average on the computer that runs the monitor web server.");
       TableRow row = masterStatus.prepareRow();
       row.add(masters.size() == 0 ? "<div class='error'>Down</div>" : AddressUtil.parseAddress(masters.get(0), false).getHostText());

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/ProblemServlet.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/ProblemServlet.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/ProblemServlet.java
index e78c26a..29ab6c6 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/ProblemServlet.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/ProblemServlet.java
@@ -93,7 +93,7 @@ public class ProblemServlet extends BasicServlet {
     if (Monitor.getProblemException() != null)
       return;
 
-    ArrayList<ProblemReport> problemReports = new ArrayList<ProblemReport>();
+    ArrayList<ProblemReport> problemReports = new ArrayList<>();
     Iterator<ProblemReport> iter = tableId == null ? ProblemReports.getInstance(Monitor.getContext()).iterator() : ProblemReports.getInstance(
         Monitor.getContext()).iterator(tableId);
     while (iter.hasNext())

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/ReplicationServlet.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/ReplicationServlet.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/ReplicationServlet.java
index bf582c7..abc9ec4 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/ReplicationServlet.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/ReplicationServlet.java
@@ -122,7 +122,7 @@ public class ReplicationServlet extends BasicServlet {
 
     // Up to 2x the number of slots for replication available, WARN
     // More than 2x the number of slots for replication available, ERROR
-    NumberType<Long> filesPendingFormat = new NumberType<Long>(Long.valueOf(0), Long.valueOf(2 * totalWorkQueueSize), Long.valueOf(0),
+    NumberType<Long> filesPendingFormat = new NumberType<>(Long.valueOf(0), Long.valueOf(2 * totalWorkQueueSize), Long.valueOf(0),
         Long.valueOf(4 * totalWorkQueueSize));
 
     String utilization = filesPendingFormat.format(filesPendingOverAllTargets);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/ShellServlet.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/ShellServlet.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/ShellServlet.java
index 1f0e137..31bea15 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/ShellServlet.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/ShellServlet.java
@@ -41,7 +41,7 @@ public class ShellServlet extends BasicServlet {
 
   private synchronized Map<String,ShellExecutionThread> userShells() {
     if (userShells == null) {
-      userShells = new HashMap<String,ShellExecutionThread>();
+      userShells = new HashMap<>();
     }
     return userShells;
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/TServersServlet.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/TServersServlet.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/TServersServlet.java
index c01a6a9..858192b 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/TServersServlet.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/TServersServlet.java
@@ -99,7 +99,7 @@ public class TServersServlet extends BasicServlet {
 
       doDeadTserverList(req, sb);
 
-      ArrayList<TabletServerStatus> tservers = new ArrayList<TabletServerStatus>();
+      ArrayList<TabletServerStatus> tservers = new ArrayList<>();
       if (Monitor.getMmi() != null)
         tservers.addAll(Monitor.getMmi().tServerInfo);
 
@@ -124,7 +124,7 @@ public class TServersServlet extends BasicServlet {
 
     HostAndPort address = HostAndPort.fromString(tserverAddress);
     TabletStats historical = new TabletStats(null, new ActionStats(), new ActionStats(), new ActionStats(), 0, 0, 0, 0);
-    List<TabletStats> tsStats = new ArrayList<TabletStats>();
+    List<TabletStats> tsStats = new ArrayList<>();
     try {
       ClientContext context = Monitor.getContext();
       TabletClientService.Client client = ThriftUtil.getClient(new TabletClientService.Client.Factory(), address, context);
@@ -319,7 +319,7 @@ public class TServersServlet extends BasicServlet {
     }
     final long MINUTES = 3 * 60 * 1000;
     tServerList.addSortableColumn("Server", new TServerLinkType(), null);
-    tServerList.addSortableColumn("Hosted&nbsp;Tablets", new NumberType<Integer>(0, Integer.MAX_VALUE), null);
+    tServerList.addSortableColumn("Hosted&nbsp;Tablets", new NumberType<>(0, Integer.MAX_VALUE), null);
     tServerList.addSortableColumn("Last&nbsp;Contact", new DurationType(0l, (long) Math.min(avgLastContact * 4, MINUTES)), null);
     tServerList.addSortableColumn("Entries", new NumberType<Long>(), "The number of key/value pairs.");
     tServerList.addSortableColumn("Ingest", new NumberType<Long>(), "The number of key/value pairs inserted. (Note that deletes are also 'inserted')");
@@ -336,7 +336,7 @@ public class TServersServlet extends BasicServlet {
             + "Major compactions are the operations where many smaller files are grouped into a larger file, eliminating duplicates and cleaning up deletes.");
     tServerList.addSortableColumn("Index Cache<br />Hit Rate", new PercentageType(), "The recent index cache hit rate.");
     tServerList.addSortableColumn("Data Cache<br />Hit Rate", new PercentageType(), "The recent data cache hit rate.");
-    tServerList.addSortableColumn("OS&nbsp;Load", new NumberType<Double>(0., guessHighLoad * 1., 0., guessHighLoad * 3.),
+    tServerList.addSortableColumn("OS&nbsp;Load", new NumberType<>(0., guessHighLoad * 1., 0., guessHighLoad * 3.),
         "The Unix one minute load average. The average number of processes in the run queue over a one minute interval.");
 
     log.debug("tableId: " + tableId);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/TablesServlet.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/TablesServlet.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/TablesServlet.java
index 1431698..c1751d8 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/TablesServlet.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/TablesServlet.java
@@ -84,7 +84,7 @@ public class TablesServlet extends BasicServlet {
     tableList.addSortableColumn("Table&nbsp;Name", new TableLinkType(), null);
     tableList.addSortableColumn("State", new TableStateType(), null);
     tableList.addSortableColumn("#&nbsp;Tablets", new NumberType<Integer>(), "Tables are broken down into ranges of rows called tablets.");
-    tableList.addSortableColumn("#&nbsp;Offline<br />Tablets", new NumberType<Integer>(0, 0), "Tablets unavailable for query or ingest.  "
+    tableList.addSortableColumn("#&nbsp;Offline<br />Tablets", new NumberType<>(0, 0), "Tablets unavailable for query or ingest.  "
         + "May be a transient condition when tablets are moved for balancing.");
     tableList.addSortableColumn("Entries", new NumberType<Long>(), "Key/value pairs over each instance, table or tablet.");
     tableList.addSortableColumn("Entries<br />In&nbsp;Memory", new NumberType<Long>(),
@@ -106,7 +106,7 @@ public class TablesServlet extends BasicServlet {
         "Gathering up many small files and rewriting them as one larger file is called a 'Major Compaction'. "
             + "Major Compactions are performed as a consequence of new files created from Minor Compactions and Bulk Load operations.  "
             + "They reduce the number of files used during queries.");
-    SortedMap<String,TableInfo> tableStats = new TreeMap<String,TableInfo>();
+    SortedMap<String,TableInfo> tableStats = new TreeMap<>();
 
     if (Monitor.getMmi() != null && Monitor.getMmi().tableMap != null)
       for (Entry<String,TableInfo> te : Monitor.getMmi().tableMap.entrySet())
@@ -145,7 +145,7 @@ public class TablesServlet extends BasicServlet {
   private void doTableDetails(HttpServletRequest req, StringBuilder sb, Map<String,String> tidToNameMap, String tableId) {
     String displayName = Tables.getPrintableTableNameFromId(tidToNameMap, tableId);
     Instance instance = Monitor.getContext().getInstance();
-    TreeSet<String> locs = new TreeSet<String>();
+    TreeSet<String> locs = new TreeSet<>();
     if (RootTable.ID.equals(tableId)) {
       locs.add(instance.getRootTabletLocation());
     } else {
@@ -168,7 +168,7 @@ public class TablesServlet extends BasicServlet {
 
     log.debug("Locs: " + locs);
 
-    List<TabletServerStatus> tservers = new ArrayList<TabletServerStatus>();
+    List<TabletServerStatus> tservers = new ArrayList<>();
     if (Monitor.getMmi() != null) {
       for (TabletServerStatus tss : Monitor.getMmi().tServerInfo) {
         try {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/VisServlet.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/VisServlet.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/VisServlet.java
index eedf598..298dcdf 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/VisServlet.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/VisServlet.java
@@ -150,7 +150,7 @@ public class VisServlet extends BasicServlet {
         cfg.spacing = 80;
     }
 
-    ArrayList<TabletServerStatus> tservers = new ArrayList<TabletServerStatus>();
+    ArrayList<TabletServerStatus> tservers = new ArrayList<>();
     if (Monitor.getMmi() != null)
       tservers.addAll(Monitor.getMmi().tServerInfo);
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/XMLServlet.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/XMLServlet.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/XMLServlet.java
index 1662069..ea0ee59 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/XMLServlet.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/XMLServlet.java
@@ -63,7 +63,7 @@ public class XMLServlet extends BasicServlet {
       sb.append("</servers>\n");
       return;
     }
-    SortedMap<String,TableInfo> tableStats = new TreeMap<String,TableInfo>(Monitor.getMmi().tableMap);
+    SortedMap<String,TableInfo> tableStats = new TreeMap<>(Monitor.getMmi().tableMap);
 
     for (TabletServerStatus status : Monitor.getMmi().tServerInfo) {
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/Basic.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/Basic.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/Basic.java
index 2143766..af68a98 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/Basic.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/Basic.java
@@ -141,7 +141,7 @@ abstract class Basic extends BasicServlet {
       scanner = getScanner(table, principal, at, sb);
     }
 
-    return new AbstractMap.SimpleEntry<Scanner,UserGroupInformation>(scanner, traceUgi);
+    return new AbstractMap.SimpleEntry<>(scanner, traceUgi);
   }
 
   private Scanner getScanner(String table, String principal, AuthenticationToken at, StringBuilder sb) throws AccumuloException, AccumuloSecurityException {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/Summary.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/Summary.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/Summary.java
index 5c58375..56da108 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/Summary.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/Summary.java
@@ -168,7 +168,7 @@ public class Summary extends Basic {
     }
     Range range = getRangeForTrace(minutes);
     scanner.setRange(range);
-    final Map<String,Stats> summary = new TreeMap<String,Stats>();
+    final Map<String,Stats> summary = new TreeMap<>();
     if (null != pair.getValue()) {
       pair.getValue().doAs(new PrivilegedAction<Void>() {
         @Override

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/monitor/src/main/java/org/apache/accumulo/monitor/util/Table.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/util/Table.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/util/Table.java
index caf70a1..e7bc30b 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/util/Table.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/util/Table.java
@@ -43,8 +43,8 @@ public class Table {
     this.caption = caption;
     this.captionclass = captionClass;
     this.subcaption = null;
-    this.columns = new ArrayList<TableColumn<?>>();
-    this.rows = new ArrayList<TableRow>();
+    this.columns = new ArrayList<>();
+    this.rows = new ArrayList<>();
   }
 
   public synchronized void setSubCaption(String subcaption) {
@@ -59,9 +59,9 @@ public class Table {
 
   private synchronized <T> void addColumn(String title, CellType<T> type, String legend, boolean sortable) {
     if (type == null)
-      type = new StringType<T>();
+      type = new StringType<>();
     type.setSortable(sortable);
-    addColumn(new TableColumn<T>(title, type, legend));
+    addColumn(new TableColumn<>(title, type, legend));
   }
 
   public synchronized <T> void addUnsortableColumn(String title, CellType<T> type, String legend) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/monitor/src/main/java/org/apache/accumulo/monitor/util/TableRow.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/util/TableRow.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/util/TableRow.java
index c1ce1c5..42853f4 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/util/TableRow.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/util/TableRow.java
@@ -25,7 +25,7 @@ public class TableRow {
 
   TableRow(int size) {
     this.size = size;
-    this.row = new ArrayList<Object>(size);
+    this.row = new ArrayList<>(size);
   }
 
   public boolean add(Object obj) {
@@ -47,7 +47,7 @@ public class TableRow {
   }
 
   public static <T> Comparator<TableRow> getComparator(int index, Comparator<T> comp) {
-    return new TableRowComparator<T>(index, comp);
+    return new TableRowComparator<>(index, comp);
   }
 
   private static class TableRowComparator<T> implements Comparator<TableRow> {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/monitor/src/test/java/org/apache/accumulo/monitor/ShowTraceLinkTypeTest.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/test/java/org/apache/accumulo/monitor/ShowTraceLinkTypeTest.java b/server/monitor/src/test/java/org/apache/accumulo/monitor/ShowTraceLinkTypeTest.java
index 786e8e3..1201d92 100644
--- a/server/monitor/src/test/java/org/apache/accumulo/monitor/ShowTraceLinkTypeTest.java
+++ b/server/monitor/src/test/java/org/apache/accumulo/monitor/ShowTraceLinkTypeTest.java
@@ -31,7 +31,7 @@ public class ShowTraceLinkTypeTest {
 
   @Test
   public void testTraceSortingForMonitor() {
-    ArrayList<RemoteSpan> spans = new ArrayList<RemoteSpan>(10), expectedOrdering = new ArrayList<RemoteSpan>(10);
+    ArrayList<RemoteSpan> spans = new ArrayList<>(10), expectedOrdering = new ArrayList<>(10);
 
     // "Random" ordering
     spans.add(rs(55l, 75l, "desc5"));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/monitor/src/test/java/org/apache/accumulo/monitor/ZooKeeperStatusTest.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/test/java/org/apache/accumulo/monitor/ZooKeeperStatusTest.java b/server/monitor/src/test/java/org/apache/accumulo/monitor/ZooKeeperStatusTest.java
index 7f56931..88a0c5a 100644
--- a/server/monitor/src/test/java/org/apache/accumulo/monitor/ZooKeeperStatusTest.java
+++ b/server/monitor/src/test/java/org/apache/accumulo/monitor/ZooKeeperStatusTest.java
@@ -32,13 +32,13 @@ public class ZooKeeperStatusTest {
     List<String> expectedHosts = Arrays.asList("rack1node1", "rack2node1", "rack4node1", "rack4node4");
 
     // Add the states in a not correctly sorted order
-    TreeSet<ZooKeeperState> states = new TreeSet<ZooKeeperState>();
+    TreeSet<ZooKeeperState> states = new TreeSet<>();
     states.add(new ZooKeeperState("rack4node4", "leader", 10));
     states.add(new ZooKeeperState("rack4node1", "follower", 10));
     states.add(new ZooKeeperState("rack1node1", "follower", 10));
     states.add(new ZooKeeperState("rack2node1", "follower", 10));
 
-    List<String> actualHosts = new ArrayList<String>(4);
+    List<String> actualHosts = new ArrayList<>(4);
     for (ZooKeeperState state : states) {
       actualHosts.add(state.keeper);
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/tracer/src/main/java/org/apache/accumulo/tracer/AsyncSpanReceiver.java
----------------------------------------------------------------------
diff --git a/server/tracer/src/main/java/org/apache/accumulo/tracer/AsyncSpanReceiver.java b/server/tracer/src/main/java/org/apache/accumulo/tracer/AsyncSpanReceiver.java
index a35734d..be924ba 100644
--- a/server/tracer/src/main/java/org/apache/accumulo/tracer/AsyncSpanReceiver.java
+++ b/server/tracer/src/main/java/org/apache/accumulo/tracer/AsyncSpanReceiver.java
@@ -57,7 +57,7 @@ public abstract class AsyncSpanReceiver<SpanKey,Destination> implements SpanRece
   public static final String QUEUE_SIZE = "tracer.queue.size";
   public static final String SPAN_MIN_MS = "tracer.span.min.ms";
 
-  private final Map<SpanKey,Destination> clients = new HashMap<SpanKey,Destination>();
+  private final Map<SpanKey,Destination> clients = new HashMap<>();
 
   protected String host = null;
   protected String service = null;
@@ -69,7 +69,7 @@ public abstract class AsyncSpanReceiver<SpanKey,Destination> implements SpanRece
   protected abstract SpanKey getSpanKey(Map<String,String> data);
 
   Timer timer = new Timer("SpanSender", true);
-  protected final AbstractQueue<RemoteSpan> sendQueue = new ConcurrentLinkedQueue<RemoteSpan>();
+  protected final AbstractQueue<RemoteSpan> sendQueue = new ConcurrentLinkedQueue<>();
   protected final AtomicInteger sendQueueSize = new AtomicInteger(0);
   int maxQueueSize = 5000;
   long lastNotificationOfDroppedSpans = 0;
@@ -150,7 +150,7 @@ public abstract class AsyncSpanReceiver<SpanKey,Destination> implements SpanRece
   public static List<Annotation> convertToAnnotations(List<TimelineAnnotation> annotations) {
     if (annotations == null)
       return null;
-    List<Annotation> result = new ArrayList<Annotation>();
+    List<Annotation> result = new ArrayList<>();
     for (TimelineAnnotation annotation : annotations) {
       result.add(new Annotation(annotation.getTime(), annotation.getMessage()));
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/tracer/src/main/java/org/apache/accumulo/tracer/SpanTree.java
----------------------------------------------------------------------
diff --git a/server/tracer/src/main/java/org/apache/accumulo/tracer/SpanTree.java b/server/tracer/src/main/java/org/apache/accumulo/tracer/SpanTree.java
index c7682c1..05c3212 100644
--- a/server/tracer/src/main/java/org/apache/accumulo/tracer/SpanTree.java
+++ b/server/tracer/src/main/java/org/apache/accumulo/tracer/SpanTree.java
@@ -27,8 +27,8 @@ import org.apache.accumulo.tracer.thrift.RemoteSpan;
 import org.apache.htrace.Span;
 
 public class SpanTree {
-  final Map<Long,List<Long>> parentChildren = new HashMap<Long,List<Long>>();
-  public final Map<Long,RemoteSpan> nodes = new HashMap<Long,RemoteSpan>();
+  final Map<Long,List<Long>> parentChildren = new HashMap<>();
+  public final Map<Long,RemoteSpan> nodes = new HashMap<>();
 
   public SpanTree() {}
 
@@ -40,7 +40,7 @@ public class SpanTree {
   }
 
   public Set<Long> visit(SpanTreeVisitor visitor) {
-    Set<Long> visited = new HashSet<Long>();
+    Set<Long> visited = new HashSet<>();
     List<Long> root = parentChildren.get(Long.valueOf(Span.ROOT_SPAN_ID));
     if (root == null || root.isEmpty())
       return visited;
@@ -57,7 +57,7 @@ public class SpanTree {
     if (visited.contains(node.spanId))
       return;
     visited.add(node.spanId);
-    List<RemoteSpan> children = new ArrayList<RemoteSpan>();
+    List<RemoteSpan> children = new ArrayList<>();
     List<Long> childrenIds = parentChildren.get(node.spanId);
     if (childrenIds != null) {
       for (Long childId : childrenIds) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceDump.java
----------------------------------------------------------------------
diff --git a/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceDump.java b/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceDump.java
index 0a87469..b5c00ed 100644
--- a/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceDump.java
+++ b/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceDump.java
@@ -52,7 +52,7 @@ public class TraceDump {
     @Parameter(names = {"-d", "--dump"}, description = "Dump all traces")
     boolean dump = false;
     @Parameter(description = " <trace id> { <trace id> ... }")
-    List<String> traceIds = new ArrayList<String>();
+    List<String> traceIds = new ArrayList<>();
 
     Opts() {
       super("trace");
@@ -74,7 +74,7 @@ public class TraceDump {
   }
 
   public static List<RemoteSpan> sortByStart(Collection<RemoteSpan> spans) {
-    List<RemoteSpan> spanList = new ArrayList<RemoteSpan>(spans);
+    List<RemoteSpan> spanList = new ArrayList<>(spans);
     Collections.sort(spanList, new Comparator<RemoteSpan>() {
       @Override
       public int compare(RemoteSpan o1, RemoteSpan o2) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java
----------------------------------------------------------------------
diff --git a/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java b/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java
index e74aef5..45b6669 100644
--- a/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java
+++ b/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java
@@ -253,7 +253,7 @@ public class TraceServer implements Watcher {
     options.processor(new Processor<Iface>(new Receiver()));
     server = new TThreadPoolServer(options);
     registerInZooKeeper(sock.getInetAddress().getHostAddress() + ":" + sock.getLocalPort(), conf.get(Property.TRACE_ZK_PATH));
-    writer = new AtomicReference<BatchWriter>(this.connector.createBatchWriter(tableName,
+    writer = new AtomicReference<>(this.connector.createBatchWriter(tableName,
         new BatchWriterConfig().setMaxLatency(BATCH_WRITER_MAX_LATENCY, TimeUnit.SECONDS)));
   }
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/tracer/src/main/java/org/apache/accumulo/tracer/ZooTraceClient.java
----------------------------------------------------------------------
diff --git a/server/tracer/src/main/java/org/apache/accumulo/tracer/ZooTraceClient.java b/server/tracer/src/main/java/org/apache/accumulo/tracer/ZooTraceClient.java
index aa5a9ee..6954983 100644
--- a/server/tracer/src/main/java/org/apache/accumulo/tracer/ZooTraceClient.java
+++ b/server/tracer/src/main/java/org/apache/accumulo/tracer/ZooTraceClient.java
@@ -51,7 +51,7 @@ public class ZooTraceClient extends SendSpansViaThrift implements Watcher {
   String path;
   boolean pathExists = false;
   final Random random = new Random();
-  final List<String> hosts = new ArrayList<String>();
+  final List<String> hosts = new ArrayList<>();
   long retryPause = 5000l;
 
   // Visible for testing
@@ -144,7 +144,7 @@ public class ZooTraceClient extends SendSpansViaThrift implements Watcher {
   synchronized private void updateHosts(String path, List<String> children) {
     log.debug("Scanning trace hosts in zookeeper: " + path);
     try {
-      List<String> hosts = new ArrayList<String>();
+      List<String> hosts = new ArrayList<>();
       for (String child : children) {
         byte[] data = zoo.getData(path + "/" + child, null);
         hosts.add(new String(data, UTF_8));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/tracer/src/test/java/org/apache/accumulo/tracer/TracerTest.java
----------------------------------------------------------------------
diff --git a/server/tracer/src/test/java/org/apache/accumulo/tracer/TracerTest.java b/server/tracer/src/test/java/org/apache/accumulo/tracer/TracerTest.java
index 703670f..6dcf7a4 100644
--- a/server/tracer/src/test/java/org/apache/accumulo/tracer/TracerTest.java
+++ b/server/tracer/src/test/java/org/apache/accumulo/tracer/TracerTest.java
@@ -79,7 +79,7 @@ public class TracerTest {
   }
 
   static class TestReceiver implements SpanReceiver {
-    public Map<Long,List<SpanStruct>> traces = new HashMap<Long,List<SpanStruct>>();
+    public Map<Long,List<SpanStruct>> traces = new HashMap<>();
 
     public TestReceiver() {}
 


[27/32] accumulo git commit: ACCUMULO-4357 Remove unneeded code for readability

Posted by ct...@apache.org.
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/iterators/conf/ColumnToClassMapping.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/conf/ColumnToClassMapping.java b/core/src/main/java/org/apache/accumulo/core/iterators/conf/ColumnToClassMapping.java
index 84a6996..11d5222 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/conf/ColumnToClassMapping.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/conf/ColumnToClassMapping.java
@@ -37,8 +37,8 @@ public class ColumnToClassMapping<K> {
   private ColFamHashKey lookupCF = new ColFamHashKey();
 
   public ColumnToClassMapping() {
-    objectsCF = new HashMap<ColFamHashKey,K>();
-    objectsCol = new HashMap<ColHashKey,K>();
+    objectsCF = new HashMap<>();
+    objectsCol = new HashMap<>();
   }
 
   public ColumnToClassMapping(Map<String,String> objectStrings, Class<? extends K> c) throws InstantiationException, IllegalAccessException,

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/iterators/system/ColumnFamilySkippingIterator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/system/ColumnFamilySkippingIterator.java b/core/src/main/java/org/apache/accumulo/core/iterators/system/ColumnFamilySkippingIterator.java
index 350c4cd..53f3643 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/system/ColumnFamilySkippingIterator.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/system/ColumnFamilySkippingIterator.java
@@ -108,12 +108,12 @@ public class ColumnFamilySkippingIterator extends SkippingIterator implements In
     if (columnFamilies instanceof Set<?>) {
       colFamSet = (Set<ByteSequence>) columnFamilies;
     } else {
-      colFamSet = new HashSet<ByteSequence>();
+      colFamSet = new HashSet<>();
       colFamSet.addAll(columnFamilies);
     }
 
     if (inclusive) {
-      sortedColFams = new TreeSet<ByteSequence>(colFamSet);
+      sortedColFams = new TreeSet<>(colFamSet);
     } else {
       sortedColFams = null;
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/iterators/system/ColumnQualifierFilter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/system/ColumnQualifierFilter.java b/core/src/main/java/org/apache/accumulo/core/iterators/system/ColumnQualifierFilter.java
index aa6426d..866f04f 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/system/ColumnQualifierFilter.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/system/ColumnQualifierFilter.java
@@ -66,8 +66,8 @@ public class ColumnQualifierFilter extends Filter {
   }
 
   public void init(Set<Column> columns) {
-    this.columnFamilies = new HashSet<ByteSequence>();
-    this.columnsQualifiers = new HashMap<ByteSequence,HashSet<ByteSequence>>();
+    this.columnFamilies = new HashSet<>();
+    this.columnsQualifiers = new HashMap<>();
 
     for (Iterator<Column> iter = columns.iterator(); iter.hasNext();) {
       Column col = iter.next();
@@ -75,7 +75,7 @@ public class ColumnQualifierFilter extends Filter {
         ArrayByteSequence cq = new ArrayByteSequence(col.columnQualifier);
         HashSet<ByteSequence> cfset = this.columnsQualifiers.get(cq);
         if (cfset == null) {
-          cfset = new HashSet<ByteSequence>();
+          cfset = new HashSet<>();
           this.columnsQualifiers.put(cq, cfset);
         }
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/iterators/system/HeapIterator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/system/HeapIterator.java b/core/src/main/java/org/apache/accumulo/core/iterators/system/HeapIterator.java
index 8f2f66c..6ed2d3e 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/system/HeapIterator.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/system/HeapIterator.java
@@ -53,7 +53,7 @@ public abstract class HeapIterator implements SortedKeyValueIterator<Key,Value>
     if (heap != null)
       throw new IllegalStateException("heap already exist");
 
-    heap = new PriorityQueue<SortedKeyValueIterator<Key,Value>>(maxSize == 0 ? 1 : maxSize, new SKVIComparator());
+    heap = new PriorityQueue<>(maxSize == 0 ? 1 : maxSize, new SKVIComparator());
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/iterators/system/LocalityGroupIterator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/system/LocalityGroupIterator.java b/core/src/main/java/org/apache/accumulo/core/iterators/system/LocalityGroupIterator.java
index b2fae6d..ac8355b 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/system/LocalityGroupIterator.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/system/LocalityGroupIterator.java
@@ -91,7 +91,7 @@ public class LocalityGroupIterator extends HeapIterator implements Interruptible
       if (columnFamilies instanceof Set<?>) {
         cfSet = (Set<ByteSequence>) columnFamilies;
       } else {
-        cfSet = new HashSet<ByteSequence>();
+        cfSet = new HashSet<>();
         cfSet.addAll(columnFamilies);
       }
     else

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/iterators/system/MultiIterator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/system/MultiIterator.java b/core/src/main/java/org/apache/accumulo/core/iterators/system/MultiIterator.java
index aef6aeb..7ff07e6 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/system/MultiIterator.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/system/MultiIterator.java
@@ -50,7 +50,7 @@ public class MultiIterator extends HeapIterator {
 
   private MultiIterator(MultiIterator other, IteratorEnvironment env) {
     super(other.iters.size());
-    this.iters = new ArrayList<SortedKeyValueIterator<Key,Value>>();
+    this.iters = new ArrayList<>();
     this.fence = other.fence;
     for (SortedKeyValueIterator<Key,Value> iter : other.iters) {
       iters.add(iter.deepCopy(env));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/iterators/system/SourceSwitchingIterator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/system/SourceSwitchingIterator.java b/core/src/main/java/org/apache/accumulo/core/iterators/system/SourceSwitchingIterator.java
index 1f06a71..098aa63 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/system/SourceSwitchingIterator.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/system/SourceSwitchingIterator.java
@@ -36,7 +36,7 @@ import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
  * (InMemoryMap that was minor compacted to a file). Clients reading from a table that has data in memory should not see interruption in their scan when that
  * data is minor compacted. This iterator is designed to manage this behind the scene.
  */
-public class SourceSwitchingIterator implements SortedKeyValueIterator<Key,Value>, InterruptibleIterator {
+public class SourceSwitchingIterator implements InterruptibleIterator {
 
   public interface DataSource {
     boolean isCurrent();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/iterators/system/SynchronizedIterator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/system/SynchronizedIterator.java b/core/src/main/java/org/apache/accumulo/core/iterators/system/SynchronizedIterator.java
index a095106..43da54d 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/system/SynchronizedIterator.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/system/SynchronizedIterator.java
@@ -68,7 +68,7 @@ public class SynchronizedIterator<K extends WritableComparable<?>,V extends Writ
 
   @Override
   public synchronized SortedKeyValueIterator<K,V> deepCopy(IteratorEnvironment env) {
-    return new SynchronizedIterator<K,V>(source.deepCopy(env));
+    return new SynchronizedIterator<>(source.deepCopy(env));
   }
 
   public SynchronizedIterator() {}

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/iterators/user/BigDecimalCombiner.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/user/BigDecimalCombiner.java b/core/src/main/java/org/apache/accumulo/core/iterators/user/BigDecimalCombiner.java
index d9e6cdd..77f33d9 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/user/BigDecimalCombiner.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/user/BigDecimalCombiner.java
@@ -101,8 +101,7 @@ public abstract class BigDecimalCombiner extends TypedValueCombiner<BigDecimal>
    * Provides the ability to encode scientific notation.
    *
    */
-  public static class BigDecimalEncoder extends AbstractLexicoder<BigDecimal> implements
-      org.apache.accumulo.core.iterators.TypedValueCombiner.Encoder<BigDecimal> {
+  public static class BigDecimalEncoder extends AbstractLexicoder<BigDecimal> {
     @Override
     public byte[] encode(BigDecimal v) {
       return v.toString().getBytes(UTF_8);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/iterators/user/CfCqSliceFilter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/user/CfCqSliceFilter.java b/core/src/main/java/org/apache/accumulo/core/iterators/user/CfCqSliceFilter.java
index a323028..d4630b0 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/user/CfCqSliceFilter.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/user/CfCqSliceFilter.java
@@ -16,17 +16,16 @@
  */
 package org.apache.accumulo.core.iterators.user;
 
+import java.io.IOException;
+import java.util.Map;
+
 import org.apache.accumulo.core.data.Key;
 import org.apache.accumulo.core.data.PartialKey;
 import org.apache.accumulo.core.data.Value;
 import org.apache.accumulo.core.iterators.Filter;
 import org.apache.accumulo.core.iterators.IteratorEnvironment;
-import org.apache.accumulo.core.iterators.OptionDescriber;
 import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
 
-import java.io.IOException;
-import java.util.Map;
-
 /**
  * Filters key/value pairs for a range of column families and a range of column qualifiers. Only keys which fall in both ranges will be passed by the filter.
  * Note that if you have a small, well-defined set of column families it will be much more efficient to configure locality groups to isolate that data instead
@@ -34,7 +33,7 @@ import java.util.Map;
  *
  * @see org.apache.accumulo.core.iterators.user.CfCqSliceOpts for a description of this iterator's options.
  */
-public class CfCqSliceFilter extends Filter implements OptionDescriber {
+public class CfCqSliceFilter extends Filter {
 
   private CfCqSliceOpts cso;
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/iterators/user/CfCqSliceOpts.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/user/CfCqSliceOpts.java b/core/src/main/java/org/apache/accumulo/core/iterators/user/CfCqSliceOpts.java
index c70e4bd..53cbfb0 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/user/CfCqSliceOpts.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/user/CfCqSliceOpts.java
@@ -95,7 +95,7 @@ public class CfCqSliceOpts {
   static class Describer implements OptionDescriber {
     @Override
     public OptionDescriber.IteratorOptions describeOptions() {
-      Map<String,String> options = new HashMap<String,String>();
+      Map<String,String> options = new HashMap<>();
       options.put(OPT_MIN_CF, OPT_MIN_CF_DESC);
       options.put(OPT_MIN_CQ, OPT_MIN_CQ_DESC);
       options.put(OPT_MAX_CF, OPT_MAX_CF_DESC);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/iterators/user/LargeRowFilter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/user/LargeRowFilter.java b/core/src/main/java/org/apache/accumulo/core/iterators/user/LargeRowFilter.java
index 59a5dec..9fd40b6 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/user/LargeRowFilter.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/user/LargeRowFilter.java
@@ -56,8 +56,8 @@ public class LargeRowFilter implements SortedKeyValueIterator<Key,Value>, Option
   private SortedKeyValueIterator<Key,Value> source;
 
   // a cache of keys
-  private ArrayList<Key> keys = new ArrayList<Key>();
-  private ArrayList<Value> values = new ArrayList<Value>();
+  private ArrayList<Key> keys = new ArrayList<>();
+  private ArrayList<Value> values = new ArrayList<>();
 
   private int currentPosition;
 
@@ -195,11 +195,11 @@ public class LargeRowFilter implements SortedKeyValueIterator<Key,Value>, Option
   public void seek(Range range, Collection<ByteSequence> columnFamilies, boolean inclusive) throws IOException {
 
     if (inclusive && !columnFamilies.contains(EMPTY)) {
-      columnFamilies = new HashSet<ByteSequence>(columnFamilies);
+      columnFamilies = new HashSet<>(columnFamilies);
       columnFamilies.add(EMPTY);
       dropEmptyColFams = true;
     } else if (!inclusive && columnFamilies.contains(EMPTY)) {
-      columnFamilies = new HashSet<ByteSequence>(columnFamilies);
+      columnFamilies = new HashSet<>(columnFamilies);
       columnFamilies.remove(EMPTY);
       dropEmptyColFams = true;
     } else {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/iterators/user/RowDeletingIterator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/user/RowDeletingIterator.java b/core/src/main/java/org/apache/accumulo/core/iterators/user/RowDeletingIterator.java
index 60870d8..3f704db 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/user/RowDeletingIterator.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/user/RowDeletingIterator.java
@@ -144,11 +144,11 @@ public class RowDeletingIterator implements SortedKeyValueIterator<Key,Value> {
   public void seek(Range range, Collection<ByteSequence> columnFamilies, boolean inclusive) throws IOException {
 
     if (inclusive && !columnFamilies.contains(EMPTY)) {
-      columnFamilies = new HashSet<ByteSequence>(columnFamilies);
+      columnFamilies = new HashSet<>(columnFamilies);
       columnFamilies.add(EMPTY);
       dropEmptyColFams = true;
     } else if (!inclusive && columnFamilies.contains(EMPTY)) {
-      columnFamilies = new HashSet<ByteSequence>(columnFamilies);
+      columnFamilies = new HashSet<>(columnFamilies);
       columnFamilies.remove(EMPTY);
       dropEmptyColFams = true;
     } else {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/iterators/user/RowEncodingIterator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/user/RowEncodingIterator.java b/core/src/main/java/org/apache/accumulo/core/iterators/user/RowEncodingIterator.java
index 320301d..e0fd64e 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/user/RowEncodingIterator.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/user/RowEncodingIterator.java
@@ -91,8 +91,8 @@ public abstract class RowEncodingIterator implements SortedKeyValueIterator<Key,
     return newInstance;
   }
 
-  List<Key> keys = new ArrayList<Key>();
-  List<Value> values = new ArrayList<Value>();
+  List<Key> keys = new ArrayList<>();
+  List<Value> values = new ArrayList<>();
 
   private void prepKeys() throws IOException {
     long kvBufSize = 0;
@@ -163,7 +163,7 @@ public abstract class RowEncodingIterator implements SortedKeyValueIterator<Key,
   public IteratorOptions describeOptions() {
     String desc = "This iterator encapsulates an entire row of Key/Value pairs into a single Key/Value pair.";
     String bufferDesc = "Maximum buffer size (in accumulo memory spec) to use for buffering keys before throwing a BufferOverflowException.";
-    HashMap<String,String> namedOptions = new HashMap<String,String>();
+    HashMap<String,String> namedOptions = new HashMap<>();
     namedOptions.put(MAX_BUFFER_SIZE_OPT, bufferDesc);
     return new IteratorOptions(getClass().getSimpleName(), desc, namedOptions, null);
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/iterators/user/SummingArrayCombiner.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/user/SummingArrayCombiner.java b/core/src/main/java/org/apache/accumulo/core/iterators/user/SummingArrayCombiner.java
index 260fa36..2e59b2c 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/user/SummingArrayCombiner.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/user/SummingArrayCombiner.java
@@ -69,7 +69,7 @@ public class SummingArrayCombiner extends TypedValueCombiner<List<Long>> {
 
   @Override
   public List<Long> typedReduce(Key key, Iterator<List<Long>> iter) {
-    List<Long> sum = new ArrayList<Long>();
+    List<Long> sum = new ArrayList<>();
     while (iter.hasNext()) {
       sum = arrayAdd(sum, iter.next());
     }
@@ -142,7 +142,7 @@ public class SummingArrayCombiner extends TypedValueCombiner<List<Long>> {
     return true;
   }
 
-  public abstract static class DOSArrayEncoder<V> extends AbstractLexicoder<List<V>> implements Encoder<List<V>> {
+  public abstract static class DOSArrayEncoder<V> extends AbstractLexicoder<List<V>> {
     public abstract void write(DataOutputStream dos, V v) throws IOException;
 
     public abstract V read(DataInputStream dis) throws IOException;
@@ -173,7 +173,7 @@ public class SummingArrayCombiner extends TypedValueCombiner<List<Long>> {
       DataInputStream dis = new DataInputStream(new ByteArrayInputStream(b, offset, origLen));
       try {
         int len = WritableUtils.readVInt(dis);
-        List<V> vl = new ArrayList<V>(len);
+        List<V> vl = new ArrayList<>(len);
         for (int i = 0; i < len; i++) {
           vl.add(read(dis));
         }
@@ -208,7 +208,7 @@ public class SummingArrayCombiner extends TypedValueCombiner<List<Long>> {
     }
   }
 
-  public static class StringArrayEncoder extends AbstractEncoder<List<Long>> implements Encoder<List<Long>> {
+  public static class StringArrayEncoder extends AbstractEncoder<List<Long>> {
     @Override
     public byte[] encode(List<Long> la) {
       if (la.size() == 0)
@@ -230,7 +230,7 @@ public class SummingArrayCombiner extends TypedValueCombiner<List<Long>> {
     @Override
     protected List<Long> decodeUnchecked(byte[] b, int offset, int len) {
       String[] longstrs = new String(b, offset, len, UTF_8).split(",");
-      List<Long> la = new ArrayList<Long>(longstrs.length);
+      List<Long> la = new ArrayList<>(longstrs.length);
       for (String s : longstrs) {
         if (s.length() == 0)
           la.add(0l);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/iterators/user/TransformingIterator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/user/TransformingIterator.java b/core/src/main/java/org/apache/accumulo/core/iterators/user/TransformingIterator.java
index 66de3d6..1c99f7a 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/user/TransformingIterator.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/user/TransformingIterator.java
@@ -86,7 +86,7 @@ abstract public class TransformingIterator extends WrappingIterator implements O
 
   protected Logger log = LoggerFactory.getLogger(getClass());
 
-  protected ArrayList<Pair<Key,Value>> keys = new ArrayList<Pair<Key,Value>>();
+  protected ArrayList<Pair<Key,Value>> keys = new ArrayList<>();
   protected int keyPos = -1;
   protected boolean scanning;
   protected Range seekRange;
@@ -136,7 +136,7 @@ abstract public class TransformingIterator extends WrappingIterator implements O
     String bufferDesc = "Maximum buffer size (in accumulo memory spec) to use for buffering keys before throwing a BufferOverflowException.  "
         + "Users should keep this limit in mind when deciding what to transform.  That is, if transforming the column family for example, then all "
         + "keys sharing the same row and column family must fit within this limit (along with their associated values)";
-    HashMap<String,String> namedOptions = new HashMap<String,String>();
+    HashMap<String,String> namedOptions = new HashMap<>();
     namedOptions.put(AUTH_OPT, authDesc);
     namedOptions.put(MAX_BUFFER_SIZE_OPT, bufferDesc);
     return new IteratorOptions(getClass().getSimpleName(), desc, namedOptions, null);
@@ -176,7 +176,7 @@ abstract public class TransformingIterator extends WrappingIterator implements O
     copy.keyPos = keyPos;
     copy.keys.addAll(keys);
     copy.seekRange = (seekRange == null) ? null : new Range(seekRange);
-    copy.seekColumnFamilies = (seekColumnFamilies == null) ? null : new HashSet<ByteSequence>(seekColumnFamilies);
+    copy.seekColumnFamilies = (seekColumnFamilies == null) ? null : new HashSet<>(seekColumnFamilies);
     copy.seekColumnFamiliesInclusive = seekColumnFamiliesInclusive;
 
     copy.ve = ve;
@@ -334,7 +334,7 @@ abstract public class TransformingIterator extends WrappingIterator implements O
 
           if (getSource().hasTop() && key == getSource().getTopKey())
             key = new Key(key);
-          keys.add(new Pair<Key,Value>(key, new Value(val)));
+          keys.add(new Pair<>(key, new Value(val)));
           appened += (key.getSize() + val.getSize() + 128);
         }
       }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/iterators/user/VisibilityFilter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/user/VisibilityFilter.java b/core/src/main/java/org/apache/accumulo/core/iterators/user/VisibilityFilter.java
index 6e55aec..f7007a1 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/user/VisibilityFilter.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/user/VisibilityFilter.java
@@ -25,7 +25,6 @@ import org.apache.accumulo.core.client.IteratorSetting;
 import org.apache.accumulo.core.data.Key;
 import org.apache.accumulo.core.data.Value;
 import org.apache.accumulo.core.iterators.IteratorEnvironment;
-import org.apache.accumulo.core.iterators.OptionDescriber;
 import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
 import org.apache.accumulo.core.security.Authorizations;
 import org.apache.accumulo.core.security.ColumnVisibility;
@@ -37,7 +36,7 @@ import org.apache.hadoop.io.Text;
 /**
  *
  */
-public class VisibilityFilter extends org.apache.accumulo.core.iterators.system.VisibilityFilter implements OptionDescriber {
+public class VisibilityFilter extends org.apache.accumulo.core.iterators.system.VisibilityFilter {
 
   private static final String AUTHS = "auths";
   private static final String FILTER_INVALID_ONLY = "filterInvalid";

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/iterators/user/WholeColumnFamilyIterator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/user/WholeColumnFamilyIterator.java b/core/src/main/java/org/apache/accumulo/core/iterators/user/WholeColumnFamilyIterator.java
index 982d0df..0a3f3e5 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/user/WholeColumnFamilyIterator.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/user/WholeColumnFamilyIterator.java
@@ -73,7 +73,7 @@ public class WholeColumnFamilyIterator implements SortedKeyValueIterator<Key,Val
    *           Signals that an I/O exception has occurred.
    */
   public static final SortedMap<Key,Value> decodeColumnFamily(Key rowKey, Value rowValue) throws IOException {
-    SortedMap<Key,Value> map = new TreeMap<Key,Value>();
+    SortedMap<Key,Value> map = new TreeMap<>();
     ByteArrayInputStream in = new ByteArrayInputStream(rowValue.get());
     DataInputStream din = new DataInputStream(in);
     int numKeys = din.readInt();
@@ -148,8 +148,8 @@ public class WholeColumnFamilyIterator implements SortedKeyValueIterator<Key,Val
     return new Value(out.toByteArray());
   }
 
-  List<Key> keys = new ArrayList<Key>();
-  List<Value> values = new ArrayList<Value>();
+  List<Key> keys = new ArrayList<>();
+  List<Value> values = new ArrayList<>();
 
   private void prepKeys() throws IOException {
     if (topKey != null)

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/iterators/user/WholeRowIterator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/user/WholeRowIterator.java b/core/src/main/java/org/apache/accumulo/core/iterators/user/WholeRowIterator.java
index 665cbfe..17bf315 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/user/WholeRowIterator.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/user/WholeRowIterator.java
@@ -84,7 +84,7 @@ public class WholeRowIterator extends RowEncodingIterator {
 
   // decode a bunch of key value pairs that have been encoded into a single value
   public static final SortedMap<Key,Value> decodeRow(Key rowKey, Value rowValue) throws IOException {
-    SortedMap<Key,Value> map = new TreeMap<Key,Value>();
+    SortedMap<Key,Value> map = new TreeMap<>();
     ByteArrayInputStream in = new ByteArrayInputStream(rowValue.get());
     DataInputStream din = new DataInputStream(in);
     int numKeys = din.readInt();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/metadata/MetadataLocationObtainer.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/metadata/MetadataLocationObtainer.java b/core/src/main/java/org/apache/accumulo/core/metadata/MetadataLocationObtainer.java
index d6af8ba..6336d12 100644
--- a/core/src/main/java/org/apache/accumulo/core/metadata/MetadataLocationObtainer.java
+++ b/core/src/main/java/org/apache/accumulo/core/metadata/MetadataLocationObtainer.java
@@ -68,10 +68,10 @@ public class MetadataLocationObtainer implements TabletLocationObtainer {
 
   public MetadataLocationObtainer() {
 
-    locCols = new TreeSet<Column>();
+    locCols = new TreeSet<>();
     locCols.add(new Column(TextUtil.getBytes(TabletsSection.CurrentLocationColumnFamily.NAME), null, null));
     locCols.add(TabletsSection.TabletColumnFamily.PREV_ROW_COLUMN.toColumn());
-    columns = new ArrayList<Column>(locCols);
+    columns = new ArrayList<>(locCols);
   }
 
   @Override
@@ -90,12 +90,12 @@ public class MetadataLocationObtainer implements TabletLocationObtainer {
 
       Range range = new Range(row, true, stopRow, true);
 
-      TreeMap<Key,Value> encodedResults = new TreeMap<Key,Value>();
-      TreeMap<Key,Value> results = new TreeMap<Key,Value>();
+      TreeMap<Key,Value> encodedResults = new TreeMap<>();
+      TreeMap<Key,Value> results = new TreeMap<>();
 
       // Use the whole row iterator so that a partial mutations is not read. The code that extracts locations for tablets does a sanity check to ensure there is
       // only one location. Reading a partial mutation could make it appear there are multiple locations when there are not.
-      List<IterInfo> serverSideIteratorList = new ArrayList<IterInfo>();
+      List<IterInfo> serverSideIteratorList = new ArrayList<>();
       serverSideIteratorList.add(new IterInfo(10000, WholeRowIterator.class.getName(), "WRI"));
       Map<String,Map<String,String>> serverSideIteratorOptions = Collections.emptyMap();
       boolean more = ThriftScanner.getBatchFromServer(context, range, src.tablet_extent, src.tablet_location, encodedResults, locCols, serverSideIteratorList,
@@ -162,7 +162,7 @@ public class MetadataLocationObtainer implements TabletLocationObtainer {
   public List<TabletLocation> lookupTablets(ClientContext context, String tserver, Map<KeyExtent,List<Range>> tabletsRanges, TabletLocator parent)
       throws AccumuloSecurityException, AccumuloException {
 
-    final TreeMap<Key,Value> results = new TreeMap<Key,Value>();
+    final TreeMap<Key,Value> results = new TreeMap<>();
 
     ResultReceiver rr = new ResultReceiver() {
 
@@ -183,8 +183,8 @@ public class MetadataLocationObtainer implements TabletLocationObtainer {
       opts = unsetOpts.setColumns(locCols);
     }
 
-    Map<KeyExtent,List<Range>> unscanned = new HashMap<KeyExtent,List<Range>>();
-    Map<KeyExtent,List<Range>> failures = new HashMap<KeyExtent,List<Range>>();
+    Map<KeyExtent,List<Range>> unscanned = new HashMap<>();
+    Map<KeyExtent,List<Range>> failures = new HashMap<>();
     try {
       TabletServerBatchReaderIterator.doLookup(context, tserver, tabletsRanges, failures, unscanned, rr, columns, opts, Authorizations.EMPTY);
       if (failures.size() > 0) {
@@ -212,8 +212,8 @@ public class MetadataLocationObtainer implements TabletLocationObtainer {
     Value prevRow = null;
     KeyExtent ke;
 
-    List<TabletLocation> results = new ArrayList<TabletLocation>();
-    ArrayList<KeyExtent> locationless = new ArrayList<KeyExtent>();
+    List<TabletLocation> results = new ArrayList<>();
+    ArrayList<KeyExtent> locationless = new ArrayList<>();
 
     Text lastRowFromKey = new Text();
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/rpc/ThriftUtil.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/rpc/ThriftUtil.java b/core/src/main/java/org/apache/accumulo/core/rpc/ThriftUtil.java
index be4238e..49e4349 100644
--- a/core/src/main/java/org/apache/accumulo/core/rpc/ThriftUtil.java
+++ b/core/src/main/java/org/apache/accumulo/core/rpc/ThriftUtil.java
@@ -59,7 +59,7 @@ public class ThriftUtil {
 
   private static final TraceProtocolFactory protocolFactory = new TraceProtocolFactory();
   private static final TFramedTransport.Factory transportFactory = new TFramedTransport.Factory(Integer.MAX_VALUE);
-  private static final Map<Integer,TTransportFactory> factoryCache = new HashMap<Integer,TTransportFactory>();
+  private static final Map<Integer,TTransportFactory> factoryCache = new HashMap<>();
 
   public static final String GSSAPI = "GSSAPI", DIGEST_MD5 = "DIGEST-MD5";
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/sample/impl/SamplerConfigurationImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/sample/impl/SamplerConfigurationImpl.java b/core/src/main/java/org/apache/accumulo/core/sample/impl/SamplerConfigurationImpl.java
index 8abf4e7..d3e2fe7 100644
--- a/core/src/main/java/org/apache/accumulo/core/sample/impl/SamplerConfigurationImpl.java
+++ b/core/src/main/java/org/apache/accumulo/core/sample/impl/SamplerConfigurationImpl.java
@@ -109,7 +109,7 @@ public class SamplerConfigurationImpl implements Writable {
 
     className = in.readUTF();
 
-    options = new HashMap<String,String>();
+    options = new HashMap<>();
 
     int num = in.readInt();
 
@@ -130,11 +130,11 @@ public class SamplerConfigurationImpl implements Writable {
     ArrayList<Pair<String,String>> props = new ArrayList<>();
 
     for (Entry<String,String> entry : options.entrySet()) {
-      props.add(new Pair<String,String>(Property.TABLE_SAMPLER_OPTS.getKey() + entry.getKey(), entry.getValue()));
+      props.add(new Pair<>(Property.TABLE_SAMPLER_OPTS.getKey() + entry.getKey(), entry.getValue()));
     }
 
     // intentionally added last, so its set last
-    props.add(new Pair<String,String>(Property.TABLE_SAMPLER.getKey(), className));
+    props.add(new Pair<>(Property.TABLE_SAMPLER.getKey(), className));
 
     return props;
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/security/Authorizations.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/security/Authorizations.java b/core/src/main/java/org/apache/accumulo/core/security/Authorizations.java
index 001fed2..c725d9b 100644
--- a/core/src/main/java/org/apache/accumulo/core/security/Authorizations.java
+++ b/core/src/main/java/org/apache/accumulo/core/security/Authorizations.java
@@ -42,8 +42,8 @@ public class Authorizations implements Iterable<byte[]>, Serializable, Authoriza
 
   private static final long serialVersionUID = 1L;
 
-  private Set<ByteSequence> auths = new HashSet<ByteSequence>();
-  private List<byte[]> authsList = new ArrayList<byte[]>(); // sorted order
+  private Set<ByteSequence> auths = new HashSet<>();
+  private List<byte[]> authsList = new ArrayList<>(); // sorted order
 
   /**
    * An empty set of authorizations.
@@ -88,7 +88,7 @@ public class Authorizations implements Iterable<byte[]>, Serializable, Authoriza
   }
 
   private void checkAuths() {
-    Set<ByteSequence> sortedAuths = new TreeSet<ByteSequence>(auths);
+    Set<ByteSequence> sortedAuths = new TreeSet<>(auths);
 
     for (ByteSequence bs : sortedAuths) {
       if (bs.length() == 0) {
@@ -212,7 +212,7 @@ public class Authorizations implements Iterable<byte[]>, Serializable, Authoriza
    * @see #Authorizations(Collection)
    */
   public List<byte[]> getAuthorizations() {
-    ArrayList<byte[]> copy = new ArrayList<byte[]>(authsList.size());
+    ArrayList<byte[]> copy = new ArrayList<>(authsList.size());
     for (byte[] auth : authsList) {
       byte[] bytes = new byte[auth.length];
       System.arraycopy(auth, 0, bytes, 0, auth.length);
@@ -227,7 +227,7 @@ public class Authorizations implements Iterable<byte[]>, Serializable, Authoriza
    * @return authorizations, each as a string encoded in UTF-8 and within a buffer
    */
   public List<ByteBuffer> getAuthorizationsBB() {
-    ArrayList<ByteBuffer> copy = new ArrayList<ByteBuffer>(authsList.size());
+    ArrayList<ByteBuffer> copy = new ArrayList<>(authsList.size());
     for (byte[] auth : authsList) {
       byte[] bytes = new byte[auth.length];
       System.arraycopy(auth, 0, bytes, 0, auth.length);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/security/ColumnVisibility.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/security/ColumnVisibility.java b/core/src/main/java/org/apache/accumulo/core/security/ColumnVisibility.java
index 4e0d597..c51e688 100644
--- a/core/src/main/java/org/apache/accumulo/core/security/ColumnVisibility.java
+++ b/core/src/main/java/org/apache/accumulo/core/security/ColumnVisibility.java
@@ -123,7 +123,7 @@ public class ColumnVisibility {
 
     public void add(Node child) {
       if (children == EMPTY)
-        children = new ArrayList<Node>();
+        children = new ArrayList<>();
 
       children.add(child);
     }
@@ -220,7 +220,7 @@ public class ColumnVisibility {
   // @formatter:on
   public static Node normalize(Node root, byte[] expression, NodeComparator comparator) {
     if (root.type != NodeType.TERM) {
-      TreeSet<Node> rolledUp = new TreeSet<Node>(comparator);
+      TreeSet<Node> rolledUp = new TreeSet<>(comparator);
       java.util.Iterator<Node> itr = root.children.iterator();
       while (itr.hasNext()) {
         Node c = normalize(itr.next(), expression, comparator);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/security/NamespacePermission.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/security/NamespacePermission.java b/core/src/main/java/org/apache/accumulo/core/security/NamespacePermission.java
index 638f630..55a7b75 100644
--- a/core/src/main/java/org/apache/accumulo/core/security/NamespacePermission.java
+++ b/core/src/main/java/org/apache/accumulo/core/security/NamespacePermission.java
@@ -63,7 +63,7 @@ public enum NamespacePermission {
   public static List<String> printableValues() {
     NamespacePermission[] a = NamespacePermission.values();
 
-    List<String> list = new ArrayList<String>(a.length);
+    List<String> list = new ArrayList<>(a.length);
 
     for (NamespacePermission p : a)
       list.add("Namespace." + p);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/security/SystemPermission.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/security/SystemPermission.java b/core/src/main/java/org/apache/accumulo/core/security/SystemPermission.java
index a1df5dc..cf70ec2 100644
--- a/core/src/main/java/org/apache/accumulo/core/security/SystemPermission.java
+++ b/core/src/main/java/org/apache/accumulo/core/security/SystemPermission.java
@@ -44,7 +44,7 @@ public enum SystemPermission {
 
   private static HashMap<Byte,SystemPermission> mapping;
   static {
-    mapping = new HashMap<Byte,SystemPermission>(SystemPermission.values().length);
+    mapping = new HashMap<>(SystemPermission.values().length);
     for (SystemPermission perm : SystemPermission.values())
       mapping.put(perm.permID, perm);
   }
@@ -70,7 +70,7 @@ public enum SystemPermission {
   public static List<String> printableValues() {
     SystemPermission[] a = SystemPermission.values();
 
-    List<String> list = new ArrayList<String>(a.length);
+    List<String> list = new ArrayList<>(a.length);
 
     for (SystemPermission p : a)
       list.add("System." + p);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/security/TablePermission.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/security/TablePermission.java b/core/src/main/java/org/apache/accumulo/core/security/TablePermission.java
index b6d122f..a80be9a 100644
--- a/core/src/main/java/org/apache/accumulo/core/security/TablePermission.java
+++ b/core/src/main/java/org/apache/accumulo/core/security/TablePermission.java
@@ -64,7 +64,7 @@ public enum TablePermission {
   public static List<String> printableValues() {
     TablePermission[] a = TablePermission.values();
 
-    List<String> list = new ArrayList<String>(a.length);
+    List<String> list = new ArrayList<>(a.length);
 
     for (TablePermission p : a)
       list.add("Table." + p);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/security/VisibilityEvaluator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/security/VisibilityEvaluator.java b/core/src/main/java/org/apache/accumulo/core/security/VisibilityEvaluator.java
index 03b336b..efd7ea3 100644
--- a/core/src/main/java/org/apache/accumulo/core/security/VisibilityEvaluator.java
+++ b/core/src/main/java/org/apache/accumulo/core/security/VisibilityEvaluator.java
@@ -93,7 +93,7 @@ public class VisibilityEvaluator {
    * @see #escape(byte[], boolean)
    */
   static Authorizations escape(Authorizations auths) {
-    ArrayList<byte[]> retAuths = new ArrayList<byte[]>(auths.getAuthorizations().size());
+    ArrayList<byte[]> retAuths = new ArrayList<>(auths.getAuthorizations().size());
 
     for (byte[] auth : auths.getAuthorizations())
       retAuths.add(escape(auth, false));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/security/crypto/CachingHDFSSecretKeyEncryptionStrategy.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/security/crypto/CachingHDFSSecretKeyEncryptionStrategy.java b/core/src/main/java/org/apache/accumulo/core/security/crypto/CachingHDFSSecretKeyEncryptionStrategy.java
index 4ee27ef..7b79d99 100644
--- a/core/src/main/java/org/apache/accumulo/core/security/crypto/CachingHDFSSecretKeyEncryptionStrategy.java
+++ b/core/src/main/java/org/apache/accumulo/core/security/crypto/CachingHDFSSecretKeyEncryptionStrategy.java
@@ -112,7 +112,7 @@ public class CachingHDFSSecretKeyEncryptionStrategy implements SecretKeyEncrypti
     private byte[] keyEncryptionKey;
     private String pathToKeyName;
 
-    public SecretKeyCache() {};
+    public SecretKeyCache() {}
 
     public synchronized void ensureSecretKeyCacheInitialized(CryptoModuleParameters context) throws IOException {
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/security/crypto/CryptoModuleFactory.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/security/crypto/CryptoModuleFactory.java b/core/src/main/java/org/apache/accumulo/core/security/crypto/CryptoModuleFactory.java
index e8e2326..79db306 100644
--- a/core/src/main/java/org/apache/accumulo/core/security/crypto/CryptoModuleFactory.java
+++ b/core/src/main/java/org/apache/accumulo/core/security/crypto/CryptoModuleFactory.java
@@ -34,8 +34,8 @@ import org.slf4j.LoggerFactory;
 public class CryptoModuleFactory {
 
   private static final Logger log = LoggerFactory.getLogger(CryptoModuleFactory.class);
-  private static final Map<String,CryptoModule> cryptoModulesCache = new HashMap<String,CryptoModule>();
-  private static final Map<String,SecretKeyEncryptionStrategy> secretKeyEncryptionStrategyCache = new HashMap<String,SecretKeyEncryptionStrategy>();
+  private static final Map<String,CryptoModule> cryptoModulesCache = new HashMap<>();
+  private static final Map<String,SecretKeyEncryptionStrategy> secretKeyEncryptionStrategyCache = new HashMap<>();
 
   /**
    * This method returns a crypto module based on settings in the given configuration parameter.

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/security/crypto/DefaultCryptoModule.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/security/crypto/DefaultCryptoModule.java b/core/src/main/java/org/apache/accumulo/core/security/crypto/DefaultCryptoModule.java
index b7e089f..13104b2 100644
--- a/core/src/main/java/org/apache/accumulo/core/security/crypto/DefaultCryptoModule.java
+++ b/core/src/main/java/org/apache/accumulo/core/security/crypto/DefaultCryptoModule.java
@@ -300,7 +300,7 @@ public class DefaultCryptoModule implements CryptoModule {
       String marker = dataIn.readUTF();
       if (marker.equals(ENCRYPTION_HEADER_MARKER_V1) || marker.equals(ENCRYPTION_HEADER_MARKER_V2)) {
 
-        Map<String,String> paramsFromFile = new HashMap<String,String>();
+        Map<String,String> paramsFromFile = new HashMap<>();
 
         // Read in the bulk of parameters
         int paramsCount = dataIn.readInt();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/trace/DistributedTrace.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/trace/DistributedTrace.java b/core/src/main/java/org/apache/accumulo/core/trace/DistributedTrace.java
index 14886f1..f833b11 100644
--- a/core/src/main/java/org/apache/accumulo/core/trace/DistributedTrace.java
+++ b/core/src/main/java/org/apache/accumulo/core/trace/DistributedTrace.java
@@ -52,7 +52,7 @@ public class DistributedTrace {
   public static final String TRACER_ZK_TIMEOUT = "tracer.zookeeper.timeout";
   public static final String TRACER_ZK_PATH = "tracer.zookeeper.path";
 
-  private static final HashSet<SpanReceiver> receivers = new HashSet<SpanReceiver>();
+  private static final HashSet<SpanReceiver> receivers = new HashSet<>();
 
   /**
    * @deprecated since 1.7, use {@link DistributedTrace#enable(String, String, org.apache.accumulo.core.client.ClientConfiguration)} instead

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/trace/wrappers/TraceWrap.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/trace/wrappers/TraceWrap.java b/core/src/main/java/org/apache/accumulo/core/trace/wrappers/TraceWrap.java
index bbfa386..8f83bd2 100644
--- a/core/src/main/java/org/apache/accumulo/core/trace/wrappers/TraceWrap.java
+++ b/core/src/main/java/org/apache/accumulo/core/trace/wrappers/TraceWrap.java
@@ -39,12 +39,12 @@ import java.lang.reflect.Proxy;
 public class TraceWrap {
 
   public static <T> T service(final T instance) {
-    InvocationHandler handler = new RpcServerInvocationHandler<T>(instance);
+    InvocationHandler handler = new RpcServerInvocationHandler<>(instance);
     return wrappedInstance(handler, instance);
   }
 
   public static <T> T client(final T instance) {
-    InvocationHandler handler = new RpcClientInvocationHandler<T>(instance);
+    InvocationHandler handler = new RpcClientInvocationHandler<>(instance);
     return wrappedInstance(handler, instance);
   }
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/util/ByteArraySet.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/util/ByteArraySet.java b/core/src/main/java/org/apache/accumulo/core/util/ByteArraySet.java
index bf177fd..337fe9c 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/ByteArraySet.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/ByteArraySet.java
@@ -38,7 +38,7 @@ public class ByteArraySet extends TreeSet<byte[]> {
   }
 
   public static ByteArraySet fromStrings(Collection<String> c) {
-    List<byte[]> lst = new ArrayList<byte[]>();
+    List<byte[]> lst = new ArrayList<>();
     for (String s : c)
       lst.add(s.getBytes(UTF_8));
     return new ByteArraySet(lst);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/util/ByteBufferUtil.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/util/ByteBufferUtil.java b/core/src/main/java/org/apache/accumulo/core/util/ByteBufferUtil.java
index de889a4..27188fe 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/ByteBufferUtil.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/ByteBufferUtil.java
@@ -48,7 +48,7 @@ public class ByteBufferUtil {
   public static List<ByteBuffer> toByteBuffers(Collection<byte[]> bytesList) {
     if (bytesList == null)
       return null;
-    ArrayList<ByteBuffer> result = new ArrayList<ByteBuffer>();
+    ArrayList<ByteBuffer> result = new ArrayList<>();
     for (byte[] bytes : bytesList) {
       result.add(ByteBuffer.wrap(bytes));
     }
@@ -58,7 +58,7 @@ public class ByteBufferUtil {
   public static List<byte[]> toBytesList(Collection<ByteBuffer> bytesList) {
     if (bytesList == null)
       return null;
-    ArrayList<byte[]> result = new ArrayList<byte[]>(bytesList.size());
+    ArrayList<byte[]> result = new ArrayList<>(bytesList.size());
     for (ByteBuffer bytes : bytesList) {
       result.add(toBytes(bytes));
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/util/LocalityGroupUtil.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/util/LocalityGroupUtil.java b/core/src/main/java/org/apache/accumulo/core/util/LocalityGroupUtil.java
index a5255c7..2063855 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/LocalityGroupUtil.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/LocalityGroupUtil.java
@@ -51,7 +51,7 @@ public class LocalityGroupUtil {
   public static Set<ByteSequence> families(Collection<Column> columns) {
     if (columns.size() == 0)
       return EMPTY_CF_SET;
-    Set<ByteSequence> result = new HashSet<ByteSequence>(columns.size());
+    Set<ByteSequence> result = new HashSet<>(columns.size());
     for (Column col : columns) {
       result.add(new ArrayByteSequence(col.getColumnFamily()));
     }
@@ -66,13 +66,13 @@ public class LocalityGroupUtil {
   }
 
   public static Map<String,Set<ByteSequence>> getLocalityGroups(AccumuloConfiguration acuconf) throws LocalityGroupConfigurationError {
-    Map<String,Set<ByteSequence>> result = new HashMap<String,Set<ByteSequence>>();
+    Map<String,Set<ByteSequence>> result = new HashMap<>();
     String[] groups = acuconf.get(Property.TABLE_LOCALITY_GROUPS).split(",");
     for (String group : groups) {
       if (group.length() > 0)
         result.put(group, new HashSet<ByteSequence>());
     }
-    HashSet<ByteSequence> all = new HashSet<ByteSequence>();
+    HashSet<ByteSequence> all = new HashSet<>();
     for (Entry<String,String> entry : acuconf) {
       String property = entry.getKey();
       String value = entry.getValue();
@@ -101,7 +101,7 @@ public class LocalityGroupUtil {
   }
 
   public static Set<ByteSequence> decodeColumnFamilies(String colFams) throws LocalityGroupConfigurationError {
-    HashSet<ByteSequence> colFamsSet = new HashSet<ByteSequence>();
+    HashSet<ByteSequence> colFamsSet = new HashSet<>();
 
     for (String family : colFams.split(",")) {
       ByteSequence cfbs = decodeColumnFamily(family);
@@ -152,7 +152,7 @@ public class LocalityGroupUtil {
   }
 
   public static String encodeColumnFamilies(Set<Text> colFams) {
-    SortedSet<String> ecfs = new TreeSet<String>();
+    SortedSet<String> ecfs = new TreeSet<>();
 
     StringBuilder sb = new StringBuilder();
 
@@ -235,7 +235,7 @@ public class LocalityGroupUtil {
 
     public Partitioner(PreAllocatedArray<Map<ByteSequence,MutableLong>> groups) {
       this.groups = groups;
-      this.colfamToLgidMap = new HashMap<ByteSequence,Integer>();
+      this.colfamToLgidMap = new HashMap<>();
 
       for (int i = 0; i < groups.length; i++) {
         for (ByteSequence cf : groups.get(i).keySet()) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/util/MapCounter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/util/MapCounter.java b/core/src/main/java/org/apache/accumulo/core/util/MapCounter.java
index 4372cfc..9c504e9 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/MapCounter.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/MapCounter.java
@@ -30,7 +30,7 @@ public class MapCounter<KT> {
   private HashMap<KT,MutableLong> map;
 
   public MapCounter() {
-    map = new HashMap<KT,MutableLong>();
+    map = new HashMap<>();
   }
 
   public long increment(KT key, long l) {
@@ -68,7 +68,7 @@ public class MapCounter<KT> {
 
   public Collection<Long> values() {
     Collection<MutableLong> vals = map.values();
-    ArrayList<Long> ret = new ArrayList<Long>(vals.size());
+    ArrayList<Long> ret = new ArrayList<>(vals.size());
     for (MutableLong ml : vals) {
       ret.add(ml.l);
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/util/Merge.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/util/Merge.java b/core/src/main/java/org/apache/accumulo/core/util/Merge.java
index 71f8325..1af5e37 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/Merge.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/Merge.java
@@ -51,7 +51,7 @@ public class Merge {
     MergeException(Exception ex) {
       super(ex);
     }
-  };
+  }
 
   private static final Logger log = LoggerFactory.getLogger(Merge.class);
 
@@ -120,7 +120,7 @@ public class Merge {
       if (table.equals(MetadataTable.NAME)) {
         throw new IllegalArgumentException("cannot merge tablets on the metadata table");
       }
-      List<Size> sizes = new ArrayList<Size>();
+      List<Size> sizes = new ArrayList<>();
       long totalSize = 0;
       // Merge any until you get larger than the goal size, and then merge one less tablet
       Iterator<Size> sizeIterator = getSizeIterator(conn, table, start, end);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/util/Pair.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/util/Pair.java b/core/src/main/java/org/apache/accumulo/core/util/Pair.java
index 293d126..2d51bcd 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/Pair.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/Pair.java
@@ -73,11 +73,11 @@ public class Pair<A,B> {
   }
 
   public Entry<A,B> toMapEntry() {
-    return new SimpleImmutableEntry<A,B>(getFirst(), getSecond());
+    return new SimpleImmutableEntry<>(getFirst(), getSecond());
   }
 
   public Pair<B,A> swap() {
-    return new Pair<B,A>(getSecond(), getFirst());
+    return new Pair<>(getSecond(), getFirst());
   }
 
   public static <K2,V2,K1 extends K2,V1 extends V2> Pair<K2,V2> fromEntry(Entry<K1,V1> entry) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/util/ServerServices.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/util/ServerServices.java b/core/src/main/java/org/apache/accumulo/core/util/ServerServices.java
index a07ef76..de39d5c 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/ServerServices.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/ServerServices.java
@@ -32,7 +32,7 @@ public class ServerServices implements Comparable<ServerServices> {
   private String stringForm = null;
 
   public ServerServices(String services) {
-    this.services = new EnumMap<Service,String>(Service.class);
+    this.services = new EnumMap<>(Service.class);
 
     String[] addresses = services.split(SERVICE_SEPARATOR);
     for (String address : addresses) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/util/StopWatch.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/util/StopWatch.java b/core/src/main/java/org/apache/accumulo/core/util/StopWatch.java
index 8abe19e..5a574db 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/StopWatch.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/StopWatch.java
@@ -23,8 +23,8 @@ public class StopWatch<K extends Enum<K>> {
   EnumMap<K,Long> totalTime;
 
   public StopWatch(Class<K> k) {
-    startTime = new EnumMap<K,Long>(k);
-    totalTime = new EnumMap<K,Long>(k);
+    startTime = new EnumMap<>(k);
+    totalTime = new EnumMap<>(k);
   }
 
   public synchronized void start(K timer) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/util/format/ShardedTableDistributionFormatter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/util/format/ShardedTableDistributionFormatter.java b/core/src/main/java/org/apache/accumulo/core/util/format/ShardedTableDistributionFormatter.java
index 877f164..336e986 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/format/ShardedTableDistributionFormatter.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/format/ShardedTableDistributionFormatter.java
@@ -34,7 +34,7 @@ import org.apache.accumulo.core.data.Value;
  */
 public class ShardedTableDistributionFormatter extends AggregatingFormatter {
 
-  private Map<String,HashSet<String>> countsByDay = new HashMap<String,HashSet<String>>();
+  private Map<String,HashSet<String>> countsByDay = new HashMap<>();
 
   @Override
   protected void aggregateStats(Entry<Key,Value> entry) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/util/format/StatisticsDisplayFormatter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/util/format/StatisticsDisplayFormatter.java b/core/src/main/java/org/apache/accumulo/core/util/format/StatisticsDisplayFormatter.java
index b3ee3ee..0f4858a 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/format/StatisticsDisplayFormatter.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/format/StatisticsDisplayFormatter.java
@@ -28,9 +28,9 @@ import org.apache.accumulo.core.data.Value;
  * debugging. If used on large result sets it will likely fail.
  */
 public class StatisticsDisplayFormatter extends AggregatingFormatter {
-  private Map<String,Long> classifications = new HashMap<String,Long>();
-  private Map<String,Long> columnFamilies = new HashMap<String,Long>();
-  private Map<String,Long> columnQualifiers = new HashMap<String,Long>();
+  private Map<String,Long> classifications = new HashMap<>();
+  private Map<String,Long> columnFamilies = new HashMap<>();
+  private Map<String,Long> columnQualifiers = new HashMap<>();
   private long total = 0;
 
   @Override
@@ -71,9 +71,9 @@ public class StatisticsDisplayFormatter extends AggregatingFormatter {
 
     buf.append(total).append(" entries matched.");
     total = 0;
-    classifications = new HashMap<String,Long>();
-    columnFamilies = new HashMap<String,Long>();
-    columnQualifiers = new HashMap<String,Long>();
+    classifications = new HashMap<>();
+    columnFamilies = new HashMap<>();
+    columnQualifiers = new HashMap<>();
 
     return buf.toString();
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/util/interpret/HexScanInterpreter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/util/interpret/HexScanInterpreter.java b/core/src/main/java/org/apache/accumulo/core/util/interpret/HexScanInterpreter.java
index 964e8c6..3794f27 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/interpret/HexScanInterpreter.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/interpret/HexScanInterpreter.java
@@ -22,6 +22,6 @@ import org.apache.accumulo.core.util.format.HexFormatter;
  * As simple scan interpreter that converts hex to binary. IT supports translating the output of {@link HexFormatter} back to binary. The hex input can contain
  * dashes (because {@link HexFormatter} outputs dashes) which are ignored.
  */
-public class HexScanInterpreter extends HexFormatter implements ScanInterpreter {
+public class HexScanInterpreter extends HexFormatter {
 
 }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/client/IteratorSettingTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/client/IteratorSettingTest.java b/core/src/test/java/org/apache/accumulo/core/client/IteratorSettingTest.java
index bbe2415..ddea0b3 100644
--- a/core/src/test/java/org/apache/accumulo/core/client/IteratorSettingTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/client/IteratorSettingTest.java
@@ -104,7 +104,7 @@ public class IteratorSettingTest {
 
     assertNotEquals(setting1, notEqual1);
 
-    Map<String,String> props = new HashMap<String,String>();
+    Map<String,String> props = new HashMap<>();
     props.put("foo", "bar");
     IteratorSetting notEquals2 = new IteratorSetting(100, "Combiner", Combiner.class, props);
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/client/RowIteratorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/client/RowIteratorTest.java b/core/src/test/java/org/apache/accumulo/core/client/RowIteratorTest.java
index 55e21d1..d8b0696 100644
--- a/core/src/test/java/org/apache/accumulo/core/client/RowIteratorTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/client/RowIteratorTest.java
@@ -36,7 +36,7 @@ import org.junit.Test;
 public class RowIteratorTest {
 
   Iterator<Entry<Key,Value>> makeIterator(final String... args) {
-    final Map<Key,Value> result = new TreeMap<Key,Value>();
+    final Map<Key,Value> result = new TreeMap<>();
     for (String s : args) {
       final String parts[] = s.split("[ \t]");
       final Key key = new Key(parts[0], parts[1], parts[2]);
@@ -47,11 +47,11 @@ public class RowIteratorTest {
   }
 
   List<List<Entry<Key,Value>>> getRows(final Iterator<Entry<Key,Value>> iter) {
-    final List<List<Entry<Key,Value>>> result = new ArrayList<List<Entry<Key,Value>>>();
+    final List<List<Entry<Key,Value>>> result = new ArrayList<>();
     final RowIterator riter = new RowIterator(iter);
     while (riter.hasNext()) {
       final Iterator<Entry<Key,Value>> row = riter.next();
-      final List<Entry<Key,Value>> rlist = new ArrayList<Entry<Key,Value>>();
+      final List<Entry<Key,Value>> rlist = new ArrayList<>();
       while (row.hasNext())
         rlist.add(row.next());
       result.add(rlist);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/client/ZooKeeperInstanceTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/client/ZooKeeperInstanceTest.java b/core/src/test/java/org/apache/accumulo/core/client/ZooKeeperInstanceTest.java
index 41e0b92..aecc947 100644
--- a/core/src/test/java/org/apache/accumulo/core/client/ZooKeeperInstanceTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/client/ZooKeeperInstanceTest.java
@@ -139,7 +139,7 @@ public class ZooKeeperInstanceTest {
     replay(config);
     zki = new ZooKeeperInstance(config, zcf);
     expect(zc.get(Constants.ZROOT + "/" + IID_STRING)).andReturn("yup".getBytes());
-    List<String> children = new java.util.ArrayList<String>();
+    List<String> children = new java.util.ArrayList<>();
     children.add("child1");
     children.add("child2");
     expect(zc.getChildren(Constants.ZROOT + Constants.ZINSTANCES)).andReturn(children);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/client/impl/ClientContextTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/client/impl/ClientContextTest.java b/core/src/test/java/org/apache/accumulo/core/client/impl/ClientContextTest.java
index ff9863c..4eb348e 100644
--- a/core/src/test/java/org/apache/accumulo/core/client/impl/ClientContextTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/client/impl/ClientContextTest.java
@@ -99,7 +99,7 @@ public class ClientContextTest {
     clientConf.addProperty(Property.GENERAL_SECURITY_CREDENTIAL_PROVIDER_PATHS.getKey(), absPath);
 
     AccumuloConfiguration accClientConf = ClientContext.convertClientConfig(clientConf);
-    Map<String,String> props = new HashMap<String,String>();
+    Map<String,String> props = new HashMap<>();
     Predicate<String> all = Predicates.alwaysTrue();
     accClientConf.getProperties(props, all);
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/client/impl/TableOperationsHelperTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/client/impl/TableOperationsHelperTest.java b/core/src/test/java/org/apache/accumulo/core/client/impl/TableOperationsHelperTest.java
index c55b62f..1d699c2 100644
--- a/core/src/test/java/org/apache/accumulo/core/client/impl/TableOperationsHelperTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/client/impl/TableOperationsHelperTest.java
@@ -49,7 +49,7 @@ import org.junit.Test;
 public class TableOperationsHelperTest {
 
   static class Tester extends TableOperationsHelper {
-    Map<String,Map<String,String>> settings = new HashMap<String,Map<String,String>>();
+    Map<String,Map<String,String>> settings = new HashMap<>();
 
     @Override
     public SortedSet<String> list() {
@@ -256,12 +256,12 @@ public class TableOperationsHelperTest {
   }
 
   void check(TableOperationsHelper t, String tablename, String[] values) throws Exception {
-    Map<String,String> expected = new TreeMap<String,String>();
+    Map<String,String> expected = new TreeMap<>();
     for (String value : values) {
       String parts[] = value.split("=", 2);
       expected.put(parts[0], parts[1]);
     }
-    Map<String,String> actual = new TreeMap<String,String>();
+    Map<String,String> actual = new TreeMap<>();
     for (Entry<String,String> entry : t.getProperties(tablename)) {
       actual.put(entry.getKey(), entry.getValue());
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/client/impl/TabletLocatorImplTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/client/impl/TabletLocatorImplTest.java b/core/src/test/java/org/apache/accumulo/core/client/impl/TabletLocatorImplTest.java
index a053cef..bab52f6 100644
--- a/core/src/test/java/org/apache/accumulo/core/client/impl/TabletLocatorImplTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/client/impl/TabletLocatorImplTest.java
@@ -88,13 +88,13 @@ public class TabletLocatorImplTest {
   @SuppressWarnings("unchecked")
   static Map<String,Map<KeyExtent,List<Range>>> createExpectedBinnings(Object... data) {
 
-    Map<String,Map<KeyExtent,List<Range>>> expBinnedRanges = new HashMap<String,Map<KeyExtent,List<Range>>>();
+    Map<String,Map<KeyExtent,List<Range>>> expBinnedRanges = new HashMap<>();
 
     for (int i = 0; i < data.length; i += 2) {
       String loc = (String) data[i];
       Object binData[] = (Object[]) data[i + 1];
 
-      HashMap<KeyExtent,List<Range>> binnedKE = new HashMap<KeyExtent,List<Range>>();
+      HashMap<KeyExtent,List<Range>> binnedKE = new HashMap<>();
 
       expBinnedRanges.put(loc, binnedKE);
 
@@ -110,7 +110,7 @@ public class TabletLocatorImplTest {
   }
 
   static TreeMap<KeyExtent,TabletLocation> createMetaCacheKE(Object... data) {
-    TreeMap<KeyExtent,TabletLocation> mcke = new TreeMap<KeyExtent,TabletLocation>();
+    TreeMap<KeyExtent,TabletLocation> mcke = new TreeMap<>();
 
     for (int i = 0; i < data.length; i += 2) {
       KeyExtent ke = (KeyExtent) data[i];
@@ -124,7 +124,7 @@ public class TabletLocatorImplTest {
   static TreeMap<Text,TabletLocation> createMetaCache(Object... data) {
     TreeMap<KeyExtent,TabletLocation> mcke = createMetaCacheKE(data);
 
-    TreeMap<Text,TabletLocation> mc = new TreeMap<Text,TabletLocation>(TabletLocatorImpl.endRowComparator);
+    TreeMap<Text,TabletLocation> mc = new TreeMap<>(TabletLocatorImpl.endRowComparator);
 
     for (Entry<KeyExtent,TabletLocation> entry : mcke.entrySet()) {
       if (entry.getKey().getEndRow() == null)
@@ -182,18 +182,18 @@ public class TabletLocatorImplTest {
   private void runTest(Text tableName, List<Range> ranges, TabletLocatorImpl tab1TabletCache, Map<String,Map<KeyExtent,List<Range>>> expected,
       List<Range> efailures) throws Exception {
 
-    Map<String,Map<KeyExtent,List<Range>>> binnedRanges = new HashMap<String,Map<KeyExtent,List<Range>>>();
+    Map<String,Map<KeyExtent,List<Range>>> binnedRanges = new HashMap<>();
     List<Range> f = tab1TabletCache.binRanges(context, ranges, binnedRanges);
     assertEquals(expected, binnedRanges);
 
-    HashSet<Range> f1 = new HashSet<Range>(f);
-    HashSet<Range> f2 = new HashSet<Range>(efailures);
+    HashSet<Range> f1 = new HashSet<>(f);
+    HashSet<Range> f2 = new HashSet<>(efailures);
 
     assertEquals(f2, f1);
   }
 
   static Set<KeyExtent> nkes(KeyExtent... extents) {
-    HashSet<KeyExtent> kes = new HashSet<KeyExtent>();
+    HashSet<KeyExtent> kes = new HashSet<>();
 
     for (KeyExtent keyExtent : extents) {
       kes.add(keyExtent);
@@ -205,11 +205,11 @@ public class TabletLocatorImplTest {
   static void runTest(TreeMap<Text,TabletLocation> mc, KeyExtent remove, Set<KeyExtent> expected) {
     // copy so same metaCache can be used for multiple test
 
-    mc = new TreeMap<Text,TabletLocation>(mc);
+    mc = new TreeMap<>(mc);
 
     TabletLocatorImpl.removeOverlapping(mc, remove);
 
-    HashSet<KeyExtent> eic = new HashSet<KeyExtent>();
+    HashSet<KeyExtent> eic = new HashSet<>();
     for (TabletLocation tl : mc.values()) {
       eic.add(tl.tablet_extent);
     }
@@ -235,14 +235,14 @@ public class TabletLocatorImplTest {
   }
 
   private void runTest(TabletLocatorImpl metaCache, List<Mutation> ml, Map<String,Map<KeyExtent,List<String>>> emb, String... efailures) throws Exception {
-    Map<String,TabletServerMutations<Mutation>> binnedMutations = new HashMap<String,TabletServerMutations<Mutation>>();
-    List<Mutation> afailures = new ArrayList<Mutation>();
+    Map<String,TabletServerMutations<Mutation>> binnedMutations = new HashMap<>();
+    List<Mutation> afailures = new ArrayList<>();
     metaCache.binMutations(context, ml, binnedMutations, afailures);
 
     verify(emb, binnedMutations);
 
-    ArrayList<String> afs = new ArrayList<String>();
-    ArrayList<String> efs = new ArrayList<String>(Arrays.asList(efailures));
+    ArrayList<String> afs = new ArrayList<>();
+    ArrayList<String> efs = new ArrayList<>(Arrays.asList(efailures));
 
     for (Mutation mutation : afailures) {
       afs.add(new String(mutation.getRow()));
@@ -265,8 +265,8 @@ public class TabletLocatorImplTest {
       assertEquals(etb.keySet(), atb.getMutations().keySet());
 
       for (KeyExtent ke : etb.keySet()) {
-        ArrayList<String> eRows = new ArrayList<String>(etb.get(ke));
-        ArrayList<String> aRows = new ArrayList<String>();
+        ArrayList<String> eRows = new ArrayList<>(etb.get(ke));
+        ArrayList<String> aRows = new ArrayList<>();
 
         for (Mutation m : atb.getMutations().get(ke)) {
           aRows.add(new String(m.getRow()));
@@ -283,7 +283,7 @@ public class TabletLocatorImplTest {
 
   static Map<String,Map<KeyExtent,List<String>>> cemb(Object[]... ols) {
 
-    Map<String,Map<KeyExtent,List<String>>> emb = new HashMap<String,Map<KeyExtent,List<String>>>();
+    Map<String,Map<KeyExtent,List<String>>> emb = new HashMap<>();
 
     for (Object[] ol : ols) {
       String row = (String) ol[0];
@@ -292,13 +292,13 @@ public class TabletLocatorImplTest {
 
       Map<KeyExtent,List<String>> tb = emb.get(server);
       if (tb == null) {
-        tb = new HashMap<KeyExtent,List<String>>();
+        tb = new HashMap<>();
         emb.put(server, tb);
       }
 
       List<String> rl = tb.get(ke);
       if (rl == null) {
-        rl = new ArrayList<String>();
+        rl = new ArrayList<>();
         tb.put(ke, rl);
       }
 
@@ -476,7 +476,7 @@ public class TabletLocatorImplTest {
   }
 
   static class TServers {
-    private final Map<String,Map<KeyExtent,SortedMap<Key,Value>>> tservers = new HashMap<String,Map<KeyExtent,SortedMap<Key,Value>>>();
+    private final Map<String,Map<KeyExtent,SortedMap<Key,Value>>> tservers = new HashMap<>();
   }
 
   static class TestTabletLocationObtainer implements TabletLocationObtainer {
@@ -523,7 +523,7 @@ public class TabletLocatorImplTest {
     public List<TabletLocation> lookupTablets(ClientContext context, String tserver, Map<KeyExtent,List<Range>> map, TabletLocator parent)
         throws AccumuloSecurityException {
 
-      ArrayList<TabletLocation> list = new ArrayList<TabletLocation>();
+      ArrayList<TabletLocation> list = new ArrayList<>();
 
       Map<KeyExtent,SortedMap<Key,Value>> tablets = tservers.get(tserver);
 
@@ -532,10 +532,10 @@ public class TabletLocatorImplTest {
         return list;
       }
 
-      TreeMap<Key,Value> results = new TreeMap<Key,Value>();
+      TreeMap<Key,Value> results = new TreeMap<>();
 
       Set<Entry<KeyExtent,List<Range>>> es = map.entrySet();
-      List<KeyExtent> failures = new ArrayList<KeyExtent>();
+      List<KeyExtent> failures = new ArrayList<>();
       for (Entry<KeyExtent,List<Range>> entry : es) {
         SortedMap<Key,Value> tabletData = tablets.get(entry.getKey());
 
@@ -601,13 +601,13 @@ public class TabletLocatorImplTest {
   static void createEmptyTablet(TServers tservers, String server, KeyExtent tablet) {
     Map<KeyExtent,SortedMap<Key,Value>> tablets = tservers.tservers.get(server);
     if (tablets == null) {
-      tablets = new HashMap<KeyExtent,SortedMap<Key,Value>>();
+      tablets = new HashMap<>();
       tservers.tservers.put(server, tablets);
     }
 
     SortedMap<Key,Value> tabletData = tablets.get(tablet);
     if (tabletData == null) {
-      tabletData = new TreeMap<Key,Value>();
+      tabletData = new TreeMap<>();
       tablets.put(tablet, tabletData);
     } else if (tabletData.size() > 0) {
       throw new RuntimeException("Asked for empty tablet, but non empty tablet exists");
@@ -634,13 +634,13 @@ public class TabletLocatorImplTest {
   static void setLocation(TServers tservers, String server, KeyExtent tablet, KeyExtent ke, String location, String instance) {
     Map<KeyExtent,SortedMap<Key,Value>> tablets = tservers.tservers.get(server);
     if (tablets == null) {
-      tablets = new HashMap<KeyExtent,SortedMap<Key,Value>>();
+      tablets = new HashMap<>();
       tservers.tservers.put(server, tablets);
     }
 
     SortedMap<Key,Value> tabletData = tablets.get(tablet);
     if (tabletData == null) {
-      tabletData = new TreeMap<Key,Value>();
+      tabletData = new TreeMap<>();
       tablets.put(tablet, tabletData);
     }
 
@@ -1269,7 +1269,7 @@ public class TabletLocatorImplTest {
     setLocation(tservers, "tserver1", RTE, mte2, "tserver3");
 
     // create the ~ tablet so it exists
-    Map<KeyExtent,SortedMap<Key,Value>> ts3 = new HashMap<KeyExtent,SortedMap<Key,Value>>();
+    Map<KeyExtent,SortedMap<Key,Value>> ts3 = new HashMap<>();
     ts3.put(mte2, new TreeMap<Key,Value>());
     tservers.tservers.put("tserver3", ts3);
 
@@ -1336,7 +1336,7 @@ public class TabletLocatorImplTest {
   @Test
   public void testLostLock() throws Exception {
 
-    final HashSet<String> activeLocks = new HashSet<String>();
+    final HashSet<String> activeLocks = new HashSet<>();
 
     TServers tservers = new TServers();
     TabletLocatorImpl metaCache = createLocators(tservers, "tserver1", "tserver2", "foo", new TabletServerLockChecker() {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/client/lexicoder/LexicoderTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/client/lexicoder/LexicoderTest.java b/core/src/test/java/org/apache/accumulo/core/client/lexicoder/LexicoderTest.java
index 6d06f97..faf3c23 100644
--- a/core/src/test/java/org/apache/accumulo/core/client/lexicoder/LexicoderTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/client/lexicoder/LexicoderTest.java
@@ -32,8 +32,8 @@ public abstract class LexicoderTest extends TestCase {
   }
 
   public <T extends Comparable<T>> void assertSortOrder(Lexicoder<T> lexicoder, Comparator<T> comp, List<T> data) {
-    List<T> list = new ArrayList<T>();
-    List<Text> encList = new ArrayList<Text>();
+    List<T> list = new ArrayList<>();
+    List<Text> encList = new ArrayList<>();
 
     for (T d : data) {
       list.add(d);
@@ -47,7 +47,7 @@ public abstract class LexicoderTest extends TestCase {
 
     Collections.sort(encList);
 
-    List<T> decodedList = new ArrayList<T>();
+    List<T> decodedList = new ArrayList<>();
 
     for (Text t : encList) {
       decodedList.add(lexicoder.decode(TextUtil.getBytes(t)));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/client/lexicoder/ListLexicoderTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/client/lexicoder/ListLexicoderTest.java b/core/src/test/java/org/apache/accumulo/core/client/lexicoder/ListLexicoderTest.java
index 6353863..22cdc50 100644
--- a/core/src/test/java/org/apache/accumulo/core/client/lexicoder/ListLexicoderTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/client/lexicoder/ListLexicoderTest.java
@@ -26,11 +26,11 @@ import org.apache.hadoop.io.Text;
 
 public class ListLexicoderTest extends AbstractLexicoderTest {
 
-  private List<Long> data1 = new ArrayList<Long>();
-  private List<Long> data2 = new ArrayList<Long>();
-  private List<Long> data3 = new ArrayList<Long>();
-  private List<Long> data4 = new ArrayList<Long>();
-  private List<Long> data5 = new ArrayList<Long>();
+  private List<Long> data1 = new ArrayList<>();
+  private List<Long> data2 = new ArrayList<>();
+  private List<Long> data3 = new ArrayList<>();
+  private List<Long> data4 = new ArrayList<>();
+  private List<Long> data5 = new ArrayList<>();
 
   @Override
   public void setUp() {
@@ -52,7 +52,7 @@ public class ListLexicoderTest extends AbstractLexicoderTest {
   }
 
   public void testSortOrder() {
-    List<List<Long>> data = new ArrayList<List<Long>>();
+    List<List<Long>> data = new ArrayList<>();
 
     // add list in expected sort order
     data.add(data2);
@@ -61,15 +61,15 @@ public class ListLexicoderTest extends AbstractLexicoderTest {
     data.add(data3);
     data.add(data5);
 
-    TreeSet<Text> sortedEnc = new TreeSet<Text>();
+    TreeSet<Text> sortedEnc = new TreeSet<>();
 
-    ListLexicoder<Long> listLexicoder = new ListLexicoder<Long>(new LongLexicoder());
+    ListLexicoder<Long> listLexicoder = new ListLexicoder<>(new LongLexicoder());
 
     for (List<Long> list : data) {
       sortedEnc.add(new Text(listLexicoder.encode(list)));
     }
 
-    List<List<Long>> unenc = new ArrayList<List<Long>>();
+    List<List<Long>> unenc = new ArrayList<>();
 
     for (Text enc : sortedEnc) {
       unenc.add(listLexicoder.decode(TextUtil.getBytes(enc)));
@@ -80,10 +80,10 @@ public class ListLexicoderTest extends AbstractLexicoderTest {
   }
 
   public void testDecodes() {
-    assertDecodes(new ListLexicoder<Long>(new LongLexicoder()), data1);
-    assertDecodes(new ListLexicoder<Long>(new LongLexicoder()), data2);
-    assertDecodes(new ListLexicoder<Long>(new LongLexicoder()), data3);
-    assertDecodes(new ListLexicoder<Long>(new LongLexicoder()), data4);
-    assertDecodes(new ListLexicoder<Long>(new LongLexicoder()), data5);
+    assertDecodes(new ListLexicoder<>(new LongLexicoder()), data1);
+    assertDecodes(new ListLexicoder<>(new LongLexicoder()), data2);
+    assertDecodes(new ListLexicoder<>(new LongLexicoder()), data3);
+    assertDecodes(new ListLexicoder<>(new LongLexicoder()), data4);
+    assertDecodes(new ListLexicoder<>(new LongLexicoder()), data5);
   }
 }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/client/lexicoder/PairLexicoderTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/client/lexicoder/PairLexicoderTest.java b/core/src/test/java/org/apache/accumulo/core/client/lexicoder/PairLexicoderTest.java
index 0979801..d94793e 100644
--- a/core/src/test/java/org/apache/accumulo/core/client/lexicoder/PairLexicoderTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/client/lexicoder/PairLexicoderTest.java
@@ -26,20 +26,19 @@ import java.util.Arrays;
  */
 public class PairLexicoderTest extends AbstractLexicoderTest {
   public void testSortOrder() {
-    PairLexicoder<String,String> plexc = new PairLexicoder<String,String>(new StringLexicoder(), new StringLexicoder());
+    PairLexicoder<String,String> plexc = new PairLexicoder<>(new StringLexicoder(), new StringLexicoder());
 
-    assertSortOrder(plexc, Arrays.asList(new ComparablePair<String,String>("a", "b"), new ComparablePair<String,String>("a", "bc"),
-        new ComparablePair<String,String>("a", "c"), new ComparablePair<String,String>("ab", "c"), new ComparablePair<String,String>("ab", ""),
-        new ComparablePair<String,String>("ab", "d"), new ComparablePair<String,String>("b", "f"), new ComparablePair<String,String>("b", "a")));
+    assertSortOrder(plexc, Arrays.asList(new ComparablePair<>("a", "b"), new ComparablePair<>("a", "bc"), new ComparablePair<>("a", "c"), new ComparablePair<>(
+        "ab", "c"), new ComparablePair<>("ab", ""), new ComparablePair<>("ab", "d"), new ComparablePair<>("b", "f"), new ComparablePair<>("b", "a")));
 
-    PairLexicoder<Long,String> plexc2 = new PairLexicoder<Long,String>(new LongLexicoder(), new StringLexicoder());
+    PairLexicoder<Long,String> plexc2 = new PairLexicoder<>(new LongLexicoder(), new StringLexicoder());
 
-    assertSortOrder(plexc2, Arrays.asList(new ComparablePair<Long,String>(0x100l, "a"), new ComparablePair<Long,String>(0x100l, "ab"),
-        new ComparablePair<Long,String>(0xf0l, "a"), new ComparablePair<Long,String>(0xf0l, "ab")));
+    assertSortOrder(plexc2, Arrays.asList(new ComparablePair<>(0x100l, "a"), new ComparablePair<>(0x100l, "ab"), new ComparablePair<>(0xf0l, "a"),
+        new ComparablePair<>(0xf0l, "ab")));
   }
 
   public void testDecodes() {
-    PairLexicoder<String,String> plexc = new PairLexicoder<String,String>(new StringLexicoder(), new StringLexicoder());
-    assertDecodes(plexc, new ComparablePair<String,String>("a", "b"));
+    PairLexicoder<String,String> plexc = new PairLexicoder<>(new StringLexicoder(), new StringLexicoder());
+    assertDecodes(plexc, new ComparablePair<>("a", "b"));
   }
 }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/client/lexicoder/ReverseLexicoderTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/client/lexicoder/ReverseLexicoderTest.java b/core/src/test/java/org/apache/accumulo/core/client/lexicoder/ReverseLexicoderTest.java
index a49409f..df6f131 100644
--- a/core/src/test/java/org/apache/accumulo/core/client/lexicoder/ReverseLexicoderTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/client/lexicoder/ReverseLexicoderTest.java
@@ -29,12 +29,12 @@ import java.util.Date;
 public class ReverseLexicoderTest extends AbstractLexicoderTest {
   public void testSortOrder() {
     Comparator<Long> comp = Collections.reverseOrder();
-    assertSortOrder(new ReverseLexicoder<Long>(new LongLexicoder()), comp, Arrays.asList(Long.MIN_VALUE, 0xff1234567890abcdl, 0xffff1234567890abl,
+    assertSortOrder(new ReverseLexicoder<>(new LongLexicoder()), comp, Arrays.asList(Long.MIN_VALUE, 0xff1234567890abcdl, 0xffff1234567890abl,
         0xffffff567890abcdl, 0xffffffff7890abcdl, 0xffffffffff90abcdl, 0xffffffffffffabcdl, 0xffffffffffffffcdl, -1l, 0l, 0x01l, 0x1234l, 0x123456l,
         0x12345678l, 0x1234567890l, 0x1234567890abl, 0x1234567890abcdl, 0x1234567890abcdefl, Long.MAX_VALUE));
 
     Comparator<String> comp2 = Collections.reverseOrder();
-    assertSortOrder(new ReverseLexicoder<String>(new StringLexicoder()), comp2, Arrays.asList("a", "aa", "ab", "b", "aab"));
+    assertSortOrder(new ReverseLexicoder<>(new StringLexicoder()), comp2, Arrays.asList("a", "aa", "ab", "b", "aab"));
 
   }
 
@@ -44,7 +44,7 @@ public class ReverseLexicoderTest extends AbstractLexicoderTest {
   @Test
   public void testReverseSortDates() throws UnsupportedEncodingException {
 
-    ReverseLexicoder<Date> revLex = new ReverseLexicoder<Date>(new DateLexicoder());
+    ReverseLexicoder<Date> revLex = new ReverseLexicoder<>(new DateLexicoder());
 
     Calendar cal = Calendar.getInstance();
     cal.set(1920, 1, 2, 3, 4, 5); // create an instance prior to 1970 for ACCUMULO-3385
@@ -65,10 +65,10 @@ public class ReverseLexicoderTest extends AbstractLexicoderTest {
   }
 
   public void testDecodes() {
-    assertDecodes(new ReverseLexicoder<Long>(new LongLexicoder()), Long.MIN_VALUE);
-    assertDecodes(new ReverseLexicoder<Long>(new LongLexicoder()), -1l);
-    assertDecodes(new ReverseLexicoder<Long>(new LongLexicoder()), 0l);
-    assertDecodes(new ReverseLexicoder<Long>(new LongLexicoder()), 1l);
-    assertDecodes(new ReverseLexicoder<Long>(new LongLexicoder()), Long.MAX_VALUE);
+    assertDecodes(new ReverseLexicoder<>(new LongLexicoder()), Long.MIN_VALUE);
+    assertDecodes(new ReverseLexicoder<>(new LongLexicoder()), -1l);
+    assertDecodes(new ReverseLexicoder<>(new LongLexicoder()), 0l);
+    assertDecodes(new ReverseLexicoder<>(new LongLexicoder()), 1l);
+    assertDecodes(new ReverseLexicoder<>(new LongLexicoder()), Long.MAX_VALUE);
   }
 }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/client/lexicoder/UUIDLexicoderTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/client/lexicoder/UUIDLexicoderTest.java b/core/src/test/java/org/apache/accumulo/core/client/lexicoder/UUIDLexicoderTest.java
index 60c89a3..8424a75 100644
--- a/core/src/test/java/org/apache/accumulo/core/client/lexicoder/UUIDLexicoderTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/client/lexicoder/UUIDLexicoderTest.java
@@ -28,7 +28,7 @@ public class UUIDLexicoderTest extends AbstractLexicoderTest {
     assertSortOrder(new UUIDLexicoder(),
         Arrays.asList(UUID.randomUUID(), UUID.randomUUID(), UUID.randomUUID(), UUID.randomUUID(), UUID.randomUUID(), UUID.randomUUID()));
 
-    ArrayList<UUID> uuids = new ArrayList<UUID>();
+    ArrayList<UUID> uuids = new ArrayList<>();
 
     for (long ms = -260l; ms < 260l; ms++) {
       for (long ls = -2l; ls < 2; ls++) {


[12/32] accumulo git commit: ACCUMULO-4357 Remove unneeded code for readability

Posted by ct...@apache.org.
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/iterators/conf/ColumnToClassMapping.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/conf/ColumnToClassMapping.java b/core/src/main/java/org/apache/accumulo/core/iterators/conf/ColumnToClassMapping.java
index 84a6996..11d5222 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/conf/ColumnToClassMapping.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/conf/ColumnToClassMapping.java
@@ -37,8 +37,8 @@ public class ColumnToClassMapping<K> {
   private ColFamHashKey lookupCF = new ColFamHashKey();
 
   public ColumnToClassMapping() {
-    objectsCF = new HashMap<ColFamHashKey,K>();
-    objectsCol = new HashMap<ColHashKey,K>();
+    objectsCF = new HashMap<>();
+    objectsCol = new HashMap<>();
   }
 
   public ColumnToClassMapping(Map<String,String> objectStrings, Class<? extends K> c) throws InstantiationException, IllegalAccessException,

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/iterators/system/ColumnFamilySkippingIterator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/system/ColumnFamilySkippingIterator.java b/core/src/main/java/org/apache/accumulo/core/iterators/system/ColumnFamilySkippingIterator.java
index 350c4cd..53f3643 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/system/ColumnFamilySkippingIterator.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/system/ColumnFamilySkippingIterator.java
@@ -108,12 +108,12 @@ public class ColumnFamilySkippingIterator extends SkippingIterator implements In
     if (columnFamilies instanceof Set<?>) {
       colFamSet = (Set<ByteSequence>) columnFamilies;
     } else {
-      colFamSet = new HashSet<ByteSequence>();
+      colFamSet = new HashSet<>();
       colFamSet.addAll(columnFamilies);
     }
 
     if (inclusive) {
-      sortedColFams = new TreeSet<ByteSequence>(colFamSet);
+      sortedColFams = new TreeSet<>(colFamSet);
     } else {
       sortedColFams = null;
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/iterators/system/ColumnQualifierFilter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/system/ColumnQualifierFilter.java b/core/src/main/java/org/apache/accumulo/core/iterators/system/ColumnQualifierFilter.java
index aa6426d..866f04f 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/system/ColumnQualifierFilter.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/system/ColumnQualifierFilter.java
@@ -66,8 +66,8 @@ public class ColumnQualifierFilter extends Filter {
   }
 
   public void init(Set<Column> columns) {
-    this.columnFamilies = new HashSet<ByteSequence>();
-    this.columnsQualifiers = new HashMap<ByteSequence,HashSet<ByteSequence>>();
+    this.columnFamilies = new HashSet<>();
+    this.columnsQualifiers = new HashMap<>();
 
     for (Iterator<Column> iter = columns.iterator(); iter.hasNext();) {
       Column col = iter.next();
@@ -75,7 +75,7 @@ public class ColumnQualifierFilter extends Filter {
         ArrayByteSequence cq = new ArrayByteSequence(col.columnQualifier);
         HashSet<ByteSequence> cfset = this.columnsQualifiers.get(cq);
         if (cfset == null) {
-          cfset = new HashSet<ByteSequence>();
+          cfset = new HashSet<>();
           this.columnsQualifiers.put(cq, cfset);
         }
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/iterators/system/HeapIterator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/system/HeapIterator.java b/core/src/main/java/org/apache/accumulo/core/iterators/system/HeapIterator.java
index 8f2f66c..6ed2d3e 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/system/HeapIterator.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/system/HeapIterator.java
@@ -53,7 +53,7 @@ public abstract class HeapIterator implements SortedKeyValueIterator<Key,Value>
     if (heap != null)
       throw new IllegalStateException("heap already exist");
 
-    heap = new PriorityQueue<SortedKeyValueIterator<Key,Value>>(maxSize == 0 ? 1 : maxSize, new SKVIComparator());
+    heap = new PriorityQueue<>(maxSize == 0 ? 1 : maxSize, new SKVIComparator());
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/iterators/system/LocalityGroupIterator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/system/LocalityGroupIterator.java b/core/src/main/java/org/apache/accumulo/core/iterators/system/LocalityGroupIterator.java
index b2fae6d..ac8355b 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/system/LocalityGroupIterator.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/system/LocalityGroupIterator.java
@@ -91,7 +91,7 @@ public class LocalityGroupIterator extends HeapIterator implements Interruptible
       if (columnFamilies instanceof Set<?>) {
         cfSet = (Set<ByteSequence>) columnFamilies;
       } else {
-        cfSet = new HashSet<ByteSequence>();
+        cfSet = new HashSet<>();
         cfSet.addAll(columnFamilies);
       }
     else

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/iterators/system/MultiIterator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/system/MultiIterator.java b/core/src/main/java/org/apache/accumulo/core/iterators/system/MultiIterator.java
index aef6aeb..7ff07e6 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/system/MultiIterator.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/system/MultiIterator.java
@@ -50,7 +50,7 @@ public class MultiIterator extends HeapIterator {
 
   private MultiIterator(MultiIterator other, IteratorEnvironment env) {
     super(other.iters.size());
-    this.iters = new ArrayList<SortedKeyValueIterator<Key,Value>>();
+    this.iters = new ArrayList<>();
     this.fence = other.fence;
     for (SortedKeyValueIterator<Key,Value> iter : other.iters) {
       iters.add(iter.deepCopy(env));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/iterators/system/SourceSwitchingIterator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/system/SourceSwitchingIterator.java b/core/src/main/java/org/apache/accumulo/core/iterators/system/SourceSwitchingIterator.java
index 1f06a71..098aa63 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/system/SourceSwitchingIterator.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/system/SourceSwitchingIterator.java
@@ -36,7 +36,7 @@ import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
  * (InMemoryMap that was minor compacted to a file). Clients reading from a table that has data in memory should not see interruption in their scan when that
  * data is minor compacted. This iterator is designed to manage this behind the scene.
  */
-public class SourceSwitchingIterator implements SortedKeyValueIterator<Key,Value>, InterruptibleIterator {
+public class SourceSwitchingIterator implements InterruptibleIterator {
 
   public interface DataSource {
     boolean isCurrent();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/iterators/system/SynchronizedIterator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/system/SynchronizedIterator.java b/core/src/main/java/org/apache/accumulo/core/iterators/system/SynchronizedIterator.java
index a095106..43da54d 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/system/SynchronizedIterator.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/system/SynchronizedIterator.java
@@ -68,7 +68,7 @@ public class SynchronizedIterator<K extends WritableComparable<?>,V extends Writ
 
   @Override
   public synchronized SortedKeyValueIterator<K,V> deepCopy(IteratorEnvironment env) {
-    return new SynchronizedIterator<K,V>(source.deepCopy(env));
+    return new SynchronizedIterator<>(source.deepCopy(env));
   }
 
   public SynchronizedIterator() {}

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/iterators/user/BigDecimalCombiner.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/user/BigDecimalCombiner.java b/core/src/main/java/org/apache/accumulo/core/iterators/user/BigDecimalCombiner.java
index d9e6cdd..77f33d9 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/user/BigDecimalCombiner.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/user/BigDecimalCombiner.java
@@ -101,8 +101,7 @@ public abstract class BigDecimalCombiner extends TypedValueCombiner<BigDecimal>
    * Provides the ability to encode scientific notation.
    *
    */
-  public static class BigDecimalEncoder extends AbstractLexicoder<BigDecimal> implements
-      org.apache.accumulo.core.iterators.TypedValueCombiner.Encoder<BigDecimal> {
+  public static class BigDecimalEncoder extends AbstractLexicoder<BigDecimal> {
     @Override
     public byte[] encode(BigDecimal v) {
       return v.toString().getBytes(UTF_8);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/iterators/user/CfCqSliceFilter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/user/CfCqSliceFilter.java b/core/src/main/java/org/apache/accumulo/core/iterators/user/CfCqSliceFilter.java
index a323028..d4630b0 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/user/CfCqSliceFilter.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/user/CfCqSliceFilter.java
@@ -16,17 +16,16 @@
  */
 package org.apache.accumulo.core.iterators.user;
 
+import java.io.IOException;
+import java.util.Map;
+
 import org.apache.accumulo.core.data.Key;
 import org.apache.accumulo.core.data.PartialKey;
 import org.apache.accumulo.core.data.Value;
 import org.apache.accumulo.core.iterators.Filter;
 import org.apache.accumulo.core.iterators.IteratorEnvironment;
-import org.apache.accumulo.core.iterators.OptionDescriber;
 import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
 
-import java.io.IOException;
-import java.util.Map;
-
 /**
  * Filters key/value pairs for a range of column families and a range of column qualifiers. Only keys which fall in both ranges will be passed by the filter.
  * Note that if you have a small, well-defined set of column families it will be much more efficient to configure locality groups to isolate that data instead
@@ -34,7 +33,7 @@ import java.util.Map;
  *
  * @see org.apache.accumulo.core.iterators.user.CfCqSliceOpts for a description of this iterator's options.
  */
-public class CfCqSliceFilter extends Filter implements OptionDescriber {
+public class CfCqSliceFilter extends Filter {
 
   private CfCqSliceOpts cso;
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/iterators/user/CfCqSliceOpts.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/user/CfCqSliceOpts.java b/core/src/main/java/org/apache/accumulo/core/iterators/user/CfCqSliceOpts.java
index c70e4bd..53cbfb0 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/user/CfCqSliceOpts.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/user/CfCqSliceOpts.java
@@ -95,7 +95,7 @@ public class CfCqSliceOpts {
   static class Describer implements OptionDescriber {
     @Override
     public OptionDescriber.IteratorOptions describeOptions() {
-      Map<String,String> options = new HashMap<String,String>();
+      Map<String,String> options = new HashMap<>();
       options.put(OPT_MIN_CF, OPT_MIN_CF_DESC);
       options.put(OPT_MIN_CQ, OPT_MIN_CQ_DESC);
       options.put(OPT_MAX_CF, OPT_MAX_CF_DESC);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/iterators/user/LargeRowFilter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/user/LargeRowFilter.java b/core/src/main/java/org/apache/accumulo/core/iterators/user/LargeRowFilter.java
index 59a5dec..9fd40b6 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/user/LargeRowFilter.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/user/LargeRowFilter.java
@@ -56,8 +56,8 @@ public class LargeRowFilter implements SortedKeyValueIterator<Key,Value>, Option
   private SortedKeyValueIterator<Key,Value> source;
 
   // a cache of keys
-  private ArrayList<Key> keys = new ArrayList<Key>();
-  private ArrayList<Value> values = new ArrayList<Value>();
+  private ArrayList<Key> keys = new ArrayList<>();
+  private ArrayList<Value> values = new ArrayList<>();
 
   private int currentPosition;
 
@@ -195,11 +195,11 @@ public class LargeRowFilter implements SortedKeyValueIterator<Key,Value>, Option
   public void seek(Range range, Collection<ByteSequence> columnFamilies, boolean inclusive) throws IOException {
 
     if (inclusive && !columnFamilies.contains(EMPTY)) {
-      columnFamilies = new HashSet<ByteSequence>(columnFamilies);
+      columnFamilies = new HashSet<>(columnFamilies);
       columnFamilies.add(EMPTY);
       dropEmptyColFams = true;
     } else if (!inclusive && columnFamilies.contains(EMPTY)) {
-      columnFamilies = new HashSet<ByteSequence>(columnFamilies);
+      columnFamilies = new HashSet<>(columnFamilies);
       columnFamilies.remove(EMPTY);
       dropEmptyColFams = true;
     } else {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/iterators/user/RowDeletingIterator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/user/RowDeletingIterator.java b/core/src/main/java/org/apache/accumulo/core/iterators/user/RowDeletingIterator.java
index 60870d8..3f704db 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/user/RowDeletingIterator.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/user/RowDeletingIterator.java
@@ -144,11 +144,11 @@ public class RowDeletingIterator implements SortedKeyValueIterator<Key,Value> {
   public void seek(Range range, Collection<ByteSequence> columnFamilies, boolean inclusive) throws IOException {
 
     if (inclusive && !columnFamilies.contains(EMPTY)) {
-      columnFamilies = new HashSet<ByteSequence>(columnFamilies);
+      columnFamilies = new HashSet<>(columnFamilies);
       columnFamilies.add(EMPTY);
       dropEmptyColFams = true;
     } else if (!inclusive && columnFamilies.contains(EMPTY)) {
-      columnFamilies = new HashSet<ByteSequence>(columnFamilies);
+      columnFamilies = new HashSet<>(columnFamilies);
       columnFamilies.remove(EMPTY);
       dropEmptyColFams = true;
     } else {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/iterators/user/RowEncodingIterator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/user/RowEncodingIterator.java b/core/src/main/java/org/apache/accumulo/core/iterators/user/RowEncodingIterator.java
index 320301d..e0fd64e 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/user/RowEncodingIterator.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/user/RowEncodingIterator.java
@@ -91,8 +91,8 @@ public abstract class RowEncodingIterator implements SortedKeyValueIterator<Key,
     return newInstance;
   }
 
-  List<Key> keys = new ArrayList<Key>();
-  List<Value> values = new ArrayList<Value>();
+  List<Key> keys = new ArrayList<>();
+  List<Value> values = new ArrayList<>();
 
   private void prepKeys() throws IOException {
     long kvBufSize = 0;
@@ -163,7 +163,7 @@ public abstract class RowEncodingIterator implements SortedKeyValueIterator<Key,
   public IteratorOptions describeOptions() {
     String desc = "This iterator encapsulates an entire row of Key/Value pairs into a single Key/Value pair.";
     String bufferDesc = "Maximum buffer size (in accumulo memory spec) to use for buffering keys before throwing a BufferOverflowException.";
-    HashMap<String,String> namedOptions = new HashMap<String,String>();
+    HashMap<String,String> namedOptions = new HashMap<>();
     namedOptions.put(MAX_BUFFER_SIZE_OPT, bufferDesc);
     return new IteratorOptions(getClass().getSimpleName(), desc, namedOptions, null);
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/iterators/user/SummingArrayCombiner.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/user/SummingArrayCombiner.java b/core/src/main/java/org/apache/accumulo/core/iterators/user/SummingArrayCombiner.java
index 260fa36..2e59b2c 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/user/SummingArrayCombiner.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/user/SummingArrayCombiner.java
@@ -69,7 +69,7 @@ public class SummingArrayCombiner extends TypedValueCombiner<List<Long>> {
 
   @Override
   public List<Long> typedReduce(Key key, Iterator<List<Long>> iter) {
-    List<Long> sum = new ArrayList<Long>();
+    List<Long> sum = new ArrayList<>();
     while (iter.hasNext()) {
       sum = arrayAdd(sum, iter.next());
     }
@@ -142,7 +142,7 @@ public class SummingArrayCombiner extends TypedValueCombiner<List<Long>> {
     return true;
   }
 
-  public abstract static class DOSArrayEncoder<V> extends AbstractLexicoder<List<V>> implements Encoder<List<V>> {
+  public abstract static class DOSArrayEncoder<V> extends AbstractLexicoder<List<V>> {
     public abstract void write(DataOutputStream dos, V v) throws IOException;
 
     public abstract V read(DataInputStream dis) throws IOException;
@@ -173,7 +173,7 @@ public class SummingArrayCombiner extends TypedValueCombiner<List<Long>> {
       DataInputStream dis = new DataInputStream(new ByteArrayInputStream(b, offset, origLen));
       try {
         int len = WritableUtils.readVInt(dis);
-        List<V> vl = new ArrayList<V>(len);
+        List<V> vl = new ArrayList<>(len);
         for (int i = 0; i < len; i++) {
           vl.add(read(dis));
         }
@@ -208,7 +208,7 @@ public class SummingArrayCombiner extends TypedValueCombiner<List<Long>> {
     }
   }
 
-  public static class StringArrayEncoder extends AbstractEncoder<List<Long>> implements Encoder<List<Long>> {
+  public static class StringArrayEncoder extends AbstractEncoder<List<Long>> {
     @Override
     public byte[] encode(List<Long> la) {
       if (la.size() == 0)
@@ -230,7 +230,7 @@ public class SummingArrayCombiner extends TypedValueCombiner<List<Long>> {
     @Override
     protected List<Long> decodeUnchecked(byte[] b, int offset, int len) {
       String[] longstrs = new String(b, offset, len, UTF_8).split(",");
-      List<Long> la = new ArrayList<Long>(longstrs.length);
+      List<Long> la = new ArrayList<>(longstrs.length);
       for (String s : longstrs) {
         if (s.length() == 0)
           la.add(0l);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/iterators/user/TransformingIterator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/user/TransformingIterator.java b/core/src/main/java/org/apache/accumulo/core/iterators/user/TransformingIterator.java
index 66de3d6..1c99f7a 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/user/TransformingIterator.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/user/TransformingIterator.java
@@ -86,7 +86,7 @@ abstract public class TransformingIterator extends WrappingIterator implements O
 
   protected Logger log = LoggerFactory.getLogger(getClass());
 
-  protected ArrayList<Pair<Key,Value>> keys = new ArrayList<Pair<Key,Value>>();
+  protected ArrayList<Pair<Key,Value>> keys = new ArrayList<>();
   protected int keyPos = -1;
   protected boolean scanning;
   protected Range seekRange;
@@ -136,7 +136,7 @@ abstract public class TransformingIterator extends WrappingIterator implements O
     String bufferDesc = "Maximum buffer size (in accumulo memory spec) to use for buffering keys before throwing a BufferOverflowException.  "
         + "Users should keep this limit in mind when deciding what to transform.  That is, if transforming the column family for example, then all "
         + "keys sharing the same row and column family must fit within this limit (along with their associated values)";
-    HashMap<String,String> namedOptions = new HashMap<String,String>();
+    HashMap<String,String> namedOptions = new HashMap<>();
     namedOptions.put(AUTH_OPT, authDesc);
     namedOptions.put(MAX_BUFFER_SIZE_OPT, bufferDesc);
     return new IteratorOptions(getClass().getSimpleName(), desc, namedOptions, null);
@@ -176,7 +176,7 @@ abstract public class TransformingIterator extends WrappingIterator implements O
     copy.keyPos = keyPos;
     copy.keys.addAll(keys);
     copy.seekRange = (seekRange == null) ? null : new Range(seekRange);
-    copy.seekColumnFamilies = (seekColumnFamilies == null) ? null : new HashSet<ByteSequence>(seekColumnFamilies);
+    copy.seekColumnFamilies = (seekColumnFamilies == null) ? null : new HashSet<>(seekColumnFamilies);
     copy.seekColumnFamiliesInclusive = seekColumnFamiliesInclusive;
 
     copy.ve = ve;
@@ -334,7 +334,7 @@ abstract public class TransformingIterator extends WrappingIterator implements O
 
           if (getSource().hasTop() && key == getSource().getTopKey())
             key = new Key(key);
-          keys.add(new Pair<Key,Value>(key, new Value(val)));
+          keys.add(new Pair<>(key, new Value(val)));
           appened += (key.getSize() + val.getSize() + 128);
         }
       }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/iterators/user/VisibilityFilter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/user/VisibilityFilter.java b/core/src/main/java/org/apache/accumulo/core/iterators/user/VisibilityFilter.java
index 6e55aec..f7007a1 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/user/VisibilityFilter.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/user/VisibilityFilter.java
@@ -25,7 +25,6 @@ import org.apache.accumulo.core.client.IteratorSetting;
 import org.apache.accumulo.core.data.Key;
 import org.apache.accumulo.core.data.Value;
 import org.apache.accumulo.core.iterators.IteratorEnvironment;
-import org.apache.accumulo.core.iterators.OptionDescriber;
 import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
 import org.apache.accumulo.core.security.Authorizations;
 import org.apache.accumulo.core.security.ColumnVisibility;
@@ -37,7 +36,7 @@ import org.apache.hadoop.io.Text;
 /**
  *
  */
-public class VisibilityFilter extends org.apache.accumulo.core.iterators.system.VisibilityFilter implements OptionDescriber {
+public class VisibilityFilter extends org.apache.accumulo.core.iterators.system.VisibilityFilter {
 
   private static final String AUTHS = "auths";
   private static final String FILTER_INVALID_ONLY = "filterInvalid";

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/iterators/user/WholeColumnFamilyIterator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/user/WholeColumnFamilyIterator.java b/core/src/main/java/org/apache/accumulo/core/iterators/user/WholeColumnFamilyIterator.java
index 982d0df..0a3f3e5 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/user/WholeColumnFamilyIterator.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/user/WholeColumnFamilyIterator.java
@@ -73,7 +73,7 @@ public class WholeColumnFamilyIterator implements SortedKeyValueIterator<Key,Val
    *           Signals that an I/O exception has occurred.
    */
   public static final SortedMap<Key,Value> decodeColumnFamily(Key rowKey, Value rowValue) throws IOException {
-    SortedMap<Key,Value> map = new TreeMap<Key,Value>();
+    SortedMap<Key,Value> map = new TreeMap<>();
     ByteArrayInputStream in = new ByteArrayInputStream(rowValue.get());
     DataInputStream din = new DataInputStream(in);
     int numKeys = din.readInt();
@@ -148,8 +148,8 @@ public class WholeColumnFamilyIterator implements SortedKeyValueIterator<Key,Val
     return new Value(out.toByteArray());
   }
 
-  List<Key> keys = new ArrayList<Key>();
-  List<Value> values = new ArrayList<Value>();
+  List<Key> keys = new ArrayList<>();
+  List<Value> values = new ArrayList<>();
 
   private void prepKeys() throws IOException {
     if (topKey != null)

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/iterators/user/WholeRowIterator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/user/WholeRowIterator.java b/core/src/main/java/org/apache/accumulo/core/iterators/user/WholeRowIterator.java
index 665cbfe..17bf315 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/user/WholeRowIterator.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/user/WholeRowIterator.java
@@ -84,7 +84,7 @@ public class WholeRowIterator extends RowEncodingIterator {
 
   // decode a bunch of key value pairs that have been encoded into a single value
   public static final SortedMap<Key,Value> decodeRow(Key rowKey, Value rowValue) throws IOException {
-    SortedMap<Key,Value> map = new TreeMap<Key,Value>();
+    SortedMap<Key,Value> map = new TreeMap<>();
     ByteArrayInputStream in = new ByteArrayInputStream(rowValue.get());
     DataInputStream din = new DataInputStream(in);
     int numKeys = din.readInt();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/metadata/MetadataLocationObtainer.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/metadata/MetadataLocationObtainer.java b/core/src/main/java/org/apache/accumulo/core/metadata/MetadataLocationObtainer.java
index d6af8ba..6336d12 100644
--- a/core/src/main/java/org/apache/accumulo/core/metadata/MetadataLocationObtainer.java
+++ b/core/src/main/java/org/apache/accumulo/core/metadata/MetadataLocationObtainer.java
@@ -68,10 +68,10 @@ public class MetadataLocationObtainer implements TabletLocationObtainer {
 
   public MetadataLocationObtainer() {
 
-    locCols = new TreeSet<Column>();
+    locCols = new TreeSet<>();
     locCols.add(new Column(TextUtil.getBytes(TabletsSection.CurrentLocationColumnFamily.NAME), null, null));
     locCols.add(TabletsSection.TabletColumnFamily.PREV_ROW_COLUMN.toColumn());
-    columns = new ArrayList<Column>(locCols);
+    columns = new ArrayList<>(locCols);
   }
 
   @Override
@@ -90,12 +90,12 @@ public class MetadataLocationObtainer implements TabletLocationObtainer {
 
       Range range = new Range(row, true, stopRow, true);
 
-      TreeMap<Key,Value> encodedResults = new TreeMap<Key,Value>();
-      TreeMap<Key,Value> results = new TreeMap<Key,Value>();
+      TreeMap<Key,Value> encodedResults = new TreeMap<>();
+      TreeMap<Key,Value> results = new TreeMap<>();
 
       // Use the whole row iterator so that a partial mutations is not read. The code that extracts locations for tablets does a sanity check to ensure there is
       // only one location. Reading a partial mutation could make it appear there are multiple locations when there are not.
-      List<IterInfo> serverSideIteratorList = new ArrayList<IterInfo>();
+      List<IterInfo> serverSideIteratorList = new ArrayList<>();
       serverSideIteratorList.add(new IterInfo(10000, WholeRowIterator.class.getName(), "WRI"));
       Map<String,Map<String,String>> serverSideIteratorOptions = Collections.emptyMap();
       boolean more = ThriftScanner.getBatchFromServer(context, range, src.tablet_extent, src.tablet_location, encodedResults, locCols, serverSideIteratorList,
@@ -162,7 +162,7 @@ public class MetadataLocationObtainer implements TabletLocationObtainer {
   public List<TabletLocation> lookupTablets(ClientContext context, String tserver, Map<KeyExtent,List<Range>> tabletsRanges, TabletLocator parent)
       throws AccumuloSecurityException, AccumuloException {
 
-    final TreeMap<Key,Value> results = new TreeMap<Key,Value>();
+    final TreeMap<Key,Value> results = new TreeMap<>();
 
     ResultReceiver rr = new ResultReceiver() {
 
@@ -183,8 +183,8 @@ public class MetadataLocationObtainer implements TabletLocationObtainer {
       opts = unsetOpts.setColumns(locCols);
     }
 
-    Map<KeyExtent,List<Range>> unscanned = new HashMap<KeyExtent,List<Range>>();
-    Map<KeyExtent,List<Range>> failures = new HashMap<KeyExtent,List<Range>>();
+    Map<KeyExtent,List<Range>> unscanned = new HashMap<>();
+    Map<KeyExtent,List<Range>> failures = new HashMap<>();
     try {
       TabletServerBatchReaderIterator.doLookup(context, tserver, tabletsRanges, failures, unscanned, rr, columns, opts, Authorizations.EMPTY);
       if (failures.size() > 0) {
@@ -212,8 +212,8 @@ public class MetadataLocationObtainer implements TabletLocationObtainer {
     Value prevRow = null;
     KeyExtent ke;
 
-    List<TabletLocation> results = new ArrayList<TabletLocation>();
-    ArrayList<KeyExtent> locationless = new ArrayList<KeyExtent>();
+    List<TabletLocation> results = new ArrayList<>();
+    ArrayList<KeyExtent> locationless = new ArrayList<>();
 
     Text lastRowFromKey = new Text();
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/rpc/ThriftUtil.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/rpc/ThriftUtil.java b/core/src/main/java/org/apache/accumulo/core/rpc/ThriftUtil.java
index be4238e..49e4349 100644
--- a/core/src/main/java/org/apache/accumulo/core/rpc/ThriftUtil.java
+++ b/core/src/main/java/org/apache/accumulo/core/rpc/ThriftUtil.java
@@ -59,7 +59,7 @@ public class ThriftUtil {
 
   private static final TraceProtocolFactory protocolFactory = new TraceProtocolFactory();
   private static final TFramedTransport.Factory transportFactory = new TFramedTransport.Factory(Integer.MAX_VALUE);
-  private static final Map<Integer,TTransportFactory> factoryCache = new HashMap<Integer,TTransportFactory>();
+  private static final Map<Integer,TTransportFactory> factoryCache = new HashMap<>();
 
   public static final String GSSAPI = "GSSAPI", DIGEST_MD5 = "DIGEST-MD5";
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/sample/impl/SamplerConfigurationImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/sample/impl/SamplerConfigurationImpl.java b/core/src/main/java/org/apache/accumulo/core/sample/impl/SamplerConfigurationImpl.java
index 8abf4e7..d3e2fe7 100644
--- a/core/src/main/java/org/apache/accumulo/core/sample/impl/SamplerConfigurationImpl.java
+++ b/core/src/main/java/org/apache/accumulo/core/sample/impl/SamplerConfigurationImpl.java
@@ -109,7 +109,7 @@ public class SamplerConfigurationImpl implements Writable {
 
     className = in.readUTF();
 
-    options = new HashMap<String,String>();
+    options = new HashMap<>();
 
     int num = in.readInt();
 
@@ -130,11 +130,11 @@ public class SamplerConfigurationImpl implements Writable {
     ArrayList<Pair<String,String>> props = new ArrayList<>();
 
     for (Entry<String,String> entry : options.entrySet()) {
-      props.add(new Pair<String,String>(Property.TABLE_SAMPLER_OPTS.getKey() + entry.getKey(), entry.getValue()));
+      props.add(new Pair<>(Property.TABLE_SAMPLER_OPTS.getKey() + entry.getKey(), entry.getValue()));
     }
 
     // intentionally added last, so its set last
-    props.add(new Pair<String,String>(Property.TABLE_SAMPLER.getKey(), className));
+    props.add(new Pair<>(Property.TABLE_SAMPLER.getKey(), className));
 
     return props;
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/security/Authorizations.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/security/Authorizations.java b/core/src/main/java/org/apache/accumulo/core/security/Authorizations.java
index 001fed2..c725d9b 100644
--- a/core/src/main/java/org/apache/accumulo/core/security/Authorizations.java
+++ b/core/src/main/java/org/apache/accumulo/core/security/Authorizations.java
@@ -42,8 +42,8 @@ public class Authorizations implements Iterable<byte[]>, Serializable, Authoriza
 
   private static final long serialVersionUID = 1L;
 
-  private Set<ByteSequence> auths = new HashSet<ByteSequence>();
-  private List<byte[]> authsList = new ArrayList<byte[]>(); // sorted order
+  private Set<ByteSequence> auths = new HashSet<>();
+  private List<byte[]> authsList = new ArrayList<>(); // sorted order
 
   /**
    * An empty set of authorizations.
@@ -88,7 +88,7 @@ public class Authorizations implements Iterable<byte[]>, Serializable, Authoriza
   }
 
   private void checkAuths() {
-    Set<ByteSequence> sortedAuths = new TreeSet<ByteSequence>(auths);
+    Set<ByteSequence> sortedAuths = new TreeSet<>(auths);
 
     for (ByteSequence bs : sortedAuths) {
       if (bs.length() == 0) {
@@ -212,7 +212,7 @@ public class Authorizations implements Iterable<byte[]>, Serializable, Authoriza
    * @see #Authorizations(Collection)
    */
   public List<byte[]> getAuthorizations() {
-    ArrayList<byte[]> copy = new ArrayList<byte[]>(authsList.size());
+    ArrayList<byte[]> copy = new ArrayList<>(authsList.size());
     for (byte[] auth : authsList) {
       byte[] bytes = new byte[auth.length];
       System.arraycopy(auth, 0, bytes, 0, auth.length);
@@ -227,7 +227,7 @@ public class Authorizations implements Iterable<byte[]>, Serializable, Authoriza
    * @return authorizations, each as a string encoded in UTF-8 and within a buffer
    */
   public List<ByteBuffer> getAuthorizationsBB() {
-    ArrayList<ByteBuffer> copy = new ArrayList<ByteBuffer>(authsList.size());
+    ArrayList<ByteBuffer> copy = new ArrayList<>(authsList.size());
     for (byte[] auth : authsList) {
       byte[] bytes = new byte[auth.length];
       System.arraycopy(auth, 0, bytes, 0, auth.length);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/security/ColumnVisibility.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/security/ColumnVisibility.java b/core/src/main/java/org/apache/accumulo/core/security/ColumnVisibility.java
index 4e0d597..c51e688 100644
--- a/core/src/main/java/org/apache/accumulo/core/security/ColumnVisibility.java
+++ b/core/src/main/java/org/apache/accumulo/core/security/ColumnVisibility.java
@@ -123,7 +123,7 @@ public class ColumnVisibility {
 
     public void add(Node child) {
       if (children == EMPTY)
-        children = new ArrayList<Node>();
+        children = new ArrayList<>();
 
       children.add(child);
     }
@@ -220,7 +220,7 @@ public class ColumnVisibility {
   // @formatter:on
   public static Node normalize(Node root, byte[] expression, NodeComparator comparator) {
     if (root.type != NodeType.TERM) {
-      TreeSet<Node> rolledUp = new TreeSet<Node>(comparator);
+      TreeSet<Node> rolledUp = new TreeSet<>(comparator);
       java.util.Iterator<Node> itr = root.children.iterator();
       while (itr.hasNext()) {
         Node c = normalize(itr.next(), expression, comparator);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/security/NamespacePermission.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/security/NamespacePermission.java b/core/src/main/java/org/apache/accumulo/core/security/NamespacePermission.java
index 638f630..55a7b75 100644
--- a/core/src/main/java/org/apache/accumulo/core/security/NamespacePermission.java
+++ b/core/src/main/java/org/apache/accumulo/core/security/NamespacePermission.java
@@ -63,7 +63,7 @@ public enum NamespacePermission {
   public static List<String> printableValues() {
     NamespacePermission[] a = NamespacePermission.values();
 
-    List<String> list = new ArrayList<String>(a.length);
+    List<String> list = new ArrayList<>(a.length);
 
     for (NamespacePermission p : a)
       list.add("Namespace." + p);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/security/SystemPermission.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/security/SystemPermission.java b/core/src/main/java/org/apache/accumulo/core/security/SystemPermission.java
index a1df5dc..cf70ec2 100644
--- a/core/src/main/java/org/apache/accumulo/core/security/SystemPermission.java
+++ b/core/src/main/java/org/apache/accumulo/core/security/SystemPermission.java
@@ -44,7 +44,7 @@ public enum SystemPermission {
 
   private static HashMap<Byte,SystemPermission> mapping;
   static {
-    mapping = new HashMap<Byte,SystemPermission>(SystemPermission.values().length);
+    mapping = new HashMap<>(SystemPermission.values().length);
     for (SystemPermission perm : SystemPermission.values())
       mapping.put(perm.permID, perm);
   }
@@ -70,7 +70,7 @@ public enum SystemPermission {
   public static List<String> printableValues() {
     SystemPermission[] a = SystemPermission.values();
 
-    List<String> list = new ArrayList<String>(a.length);
+    List<String> list = new ArrayList<>(a.length);
 
     for (SystemPermission p : a)
       list.add("System." + p);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/security/TablePermission.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/security/TablePermission.java b/core/src/main/java/org/apache/accumulo/core/security/TablePermission.java
index b6d122f..a80be9a 100644
--- a/core/src/main/java/org/apache/accumulo/core/security/TablePermission.java
+++ b/core/src/main/java/org/apache/accumulo/core/security/TablePermission.java
@@ -64,7 +64,7 @@ public enum TablePermission {
   public static List<String> printableValues() {
     TablePermission[] a = TablePermission.values();
 
-    List<String> list = new ArrayList<String>(a.length);
+    List<String> list = new ArrayList<>(a.length);
 
     for (TablePermission p : a)
       list.add("Table." + p);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/security/VisibilityEvaluator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/security/VisibilityEvaluator.java b/core/src/main/java/org/apache/accumulo/core/security/VisibilityEvaluator.java
index 03b336b..efd7ea3 100644
--- a/core/src/main/java/org/apache/accumulo/core/security/VisibilityEvaluator.java
+++ b/core/src/main/java/org/apache/accumulo/core/security/VisibilityEvaluator.java
@@ -93,7 +93,7 @@ public class VisibilityEvaluator {
    * @see #escape(byte[], boolean)
    */
   static Authorizations escape(Authorizations auths) {
-    ArrayList<byte[]> retAuths = new ArrayList<byte[]>(auths.getAuthorizations().size());
+    ArrayList<byte[]> retAuths = new ArrayList<>(auths.getAuthorizations().size());
 
     for (byte[] auth : auths.getAuthorizations())
       retAuths.add(escape(auth, false));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/security/crypto/CachingHDFSSecretKeyEncryptionStrategy.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/security/crypto/CachingHDFSSecretKeyEncryptionStrategy.java b/core/src/main/java/org/apache/accumulo/core/security/crypto/CachingHDFSSecretKeyEncryptionStrategy.java
index 4ee27ef..7b79d99 100644
--- a/core/src/main/java/org/apache/accumulo/core/security/crypto/CachingHDFSSecretKeyEncryptionStrategy.java
+++ b/core/src/main/java/org/apache/accumulo/core/security/crypto/CachingHDFSSecretKeyEncryptionStrategy.java
@@ -112,7 +112,7 @@ public class CachingHDFSSecretKeyEncryptionStrategy implements SecretKeyEncrypti
     private byte[] keyEncryptionKey;
     private String pathToKeyName;
 
-    public SecretKeyCache() {};
+    public SecretKeyCache() {}
 
     public synchronized void ensureSecretKeyCacheInitialized(CryptoModuleParameters context) throws IOException {
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/security/crypto/CryptoModuleFactory.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/security/crypto/CryptoModuleFactory.java b/core/src/main/java/org/apache/accumulo/core/security/crypto/CryptoModuleFactory.java
index e8e2326..79db306 100644
--- a/core/src/main/java/org/apache/accumulo/core/security/crypto/CryptoModuleFactory.java
+++ b/core/src/main/java/org/apache/accumulo/core/security/crypto/CryptoModuleFactory.java
@@ -34,8 +34,8 @@ import org.slf4j.LoggerFactory;
 public class CryptoModuleFactory {
 
   private static final Logger log = LoggerFactory.getLogger(CryptoModuleFactory.class);
-  private static final Map<String,CryptoModule> cryptoModulesCache = new HashMap<String,CryptoModule>();
-  private static final Map<String,SecretKeyEncryptionStrategy> secretKeyEncryptionStrategyCache = new HashMap<String,SecretKeyEncryptionStrategy>();
+  private static final Map<String,CryptoModule> cryptoModulesCache = new HashMap<>();
+  private static final Map<String,SecretKeyEncryptionStrategy> secretKeyEncryptionStrategyCache = new HashMap<>();
 
   /**
    * This method returns a crypto module based on settings in the given configuration parameter.

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/security/crypto/DefaultCryptoModule.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/security/crypto/DefaultCryptoModule.java b/core/src/main/java/org/apache/accumulo/core/security/crypto/DefaultCryptoModule.java
index b7e089f..13104b2 100644
--- a/core/src/main/java/org/apache/accumulo/core/security/crypto/DefaultCryptoModule.java
+++ b/core/src/main/java/org/apache/accumulo/core/security/crypto/DefaultCryptoModule.java
@@ -300,7 +300,7 @@ public class DefaultCryptoModule implements CryptoModule {
       String marker = dataIn.readUTF();
       if (marker.equals(ENCRYPTION_HEADER_MARKER_V1) || marker.equals(ENCRYPTION_HEADER_MARKER_V2)) {
 
-        Map<String,String> paramsFromFile = new HashMap<String,String>();
+        Map<String,String> paramsFromFile = new HashMap<>();
 
         // Read in the bulk of parameters
         int paramsCount = dataIn.readInt();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/trace/DistributedTrace.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/trace/DistributedTrace.java b/core/src/main/java/org/apache/accumulo/core/trace/DistributedTrace.java
index 14886f1..f833b11 100644
--- a/core/src/main/java/org/apache/accumulo/core/trace/DistributedTrace.java
+++ b/core/src/main/java/org/apache/accumulo/core/trace/DistributedTrace.java
@@ -52,7 +52,7 @@ public class DistributedTrace {
   public static final String TRACER_ZK_TIMEOUT = "tracer.zookeeper.timeout";
   public static final String TRACER_ZK_PATH = "tracer.zookeeper.path";
 
-  private static final HashSet<SpanReceiver> receivers = new HashSet<SpanReceiver>();
+  private static final HashSet<SpanReceiver> receivers = new HashSet<>();
 
   /**
    * @deprecated since 1.7, use {@link DistributedTrace#enable(String, String, org.apache.accumulo.core.client.ClientConfiguration)} instead

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/trace/wrappers/TraceWrap.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/trace/wrappers/TraceWrap.java b/core/src/main/java/org/apache/accumulo/core/trace/wrappers/TraceWrap.java
index bbfa386..8f83bd2 100644
--- a/core/src/main/java/org/apache/accumulo/core/trace/wrappers/TraceWrap.java
+++ b/core/src/main/java/org/apache/accumulo/core/trace/wrappers/TraceWrap.java
@@ -39,12 +39,12 @@ import java.lang.reflect.Proxy;
 public class TraceWrap {
 
   public static <T> T service(final T instance) {
-    InvocationHandler handler = new RpcServerInvocationHandler<T>(instance);
+    InvocationHandler handler = new RpcServerInvocationHandler<>(instance);
     return wrappedInstance(handler, instance);
   }
 
   public static <T> T client(final T instance) {
-    InvocationHandler handler = new RpcClientInvocationHandler<T>(instance);
+    InvocationHandler handler = new RpcClientInvocationHandler<>(instance);
     return wrappedInstance(handler, instance);
   }
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/util/ByteArraySet.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/util/ByteArraySet.java b/core/src/main/java/org/apache/accumulo/core/util/ByteArraySet.java
index bf177fd..337fe9c 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/ByteArraySet.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/ByteArraySet.java
@@ -38,7 +38,7 @@ public class ByteArraySet extends TreeSet<byte[]> {
   }
 
   public static ByteArraySet fromStrings(Collection<String> c) {
-    List<byte[]> lst = new ArrayList<byte[]>();
+    List<byte[]> lst = new ArrayList<>();
     for (String s : c)
       lst.add(s.getBytes(UTF_8));
     return new ByteArraySet(lst);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/util/ByteBufferUtil.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/util/ByteBufferUtil.java b/core/src/main/java/org/apache/accumulo/core/util/ByteBufferUtil.java
index de889a4..27188fe 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/ByteBufferUtil.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/ByteBufferUtil.java
@@ -48,7 +48,7 @@ public class ByteBufferUtil {
   public static List<ByteBuffer> toByteBuffers(Collection<byte[]> bytesList) {
     if (bytesList == null)
       return null;
-    ArrayList<ByteBuffer> result = new ArrayList<ByteBuffer>();
+    ArrayList<ByteBuffer> result = new ArrayList<>();
     for (byte[] bytes : bytesList) {
       result.add(ByteBuffer.wrap(bytes));
     }
@@ -58,7 +58,7 @@ public class ByteBufferUtil {
   public static List<byte[]> toBytesList(Collection<ByteBuffer> bytesList) {
     if (bytesList == null)
       return null;
-    ArrayList<byte[]> result = new ArrayList<byte[]>(bytesList.size());
+    ArrayList<byte[]> result = new ArrayList<>(bytesList.size());
     for (ByteBuffer bytes : bytesList) {
       result.add(toBytes(bytes));
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/util/LocalityGroupUtil.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/util/LocalityGroupUtil.java b/core/src/main/java/org/apache/accumulo/core/util/LocalityGroupUtil.java
index a5255c7..2063855 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/LocalityGroupUtil.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/LocalityGroupUtil.java
@@ -51,7 +51,7 @@ public class LocalityGroupUtil {
   public static Set<ByteSequence> families(Collection<Column> columns) {
     if (columns.size() == 0)
       return EMPTY_CF_SET;
-    Set<ByteSequence> result = new HashSet<ByteSequence>(columns.size());
+    Set<ByteSequence> result = new HashSet<>(columns.size());
     for (Column col : columns) {
       result.add(new ArrayByteSequence(col.getColumnFamily()));
     }
@@ -66,13 +66,13 @@ public class LocalityGroupUtil {
   }
 
   public static Map<String,Set<ByteSequence>> getLocalityGroups(AccumuloConfiguration acuconf) throws LocalityGroupConfigurationError {
-    Map<String,Set<ByteSequence>> result = new HashMap<String,Set<ByteSequence>>();
+    Map<String,Set<ByteSequence>> result = new HashMap<>();
     String[] groups = acuconf.get(Property.TABLE_LOCALITY_GROUPS).split(",");
     for (String group : groups) {
       if (group.length() > 0)
         result.put(group, new HashSet<ByteSequence>());
     }
-    HashSet<ByteSequence> all = new HashSet<ByteSequence>();
+    HashSet<ByteSequence> all = new HashSet<>();
     for (Entry<String,String> entry : acuconf) {
       String property = entry.getKey();
       String value = entry.getValue();
@@ -101,7 +101,7 @@ public class LocalityGroupUtil {
   }
 
   public static Set<ByteSequence> decodeColumnFamilies(String colFams) throws LocalityGroupConfigurationError {
-    HashSet<ByteSequence> colFamsSet = new HashSet<ByteSequence>();
+    HashSet<ByteSequence> colFamsSet = new HashSet<>();
 
     for (String family : colFams.split(",")) {
       ByteSequence cfbs = decodeColumnFamily(family);
@@ -152,7 +152,7 @@ public class LocalityGroupUtil {
   }
 
   public static String encodeColumnFamilies(Set<Text> colFams) {
-    SortedSet<String> ecfs = new TreeSet<String>();
+    SortedSet<String> ecfs = new TreeSet<>();
 
     StringBuilder sb = new StringBuilder();
 
@@ -235,7 +235,7 @@ public class LocalityGroupUtil {
 
     public Partitioner(PreAllocatedArray<Map<ByteSequence,MutableLong>> groups) {
       this.groups = groups;
-      this.colfamToLgidMap = new HashMap<ByteSequence,Integer>();
+      this.colfamToLgidMap = new HashMap<>();
 
       for (int i = 0; i < groups.length; i++) {
         for (ByteSequence cf : groups.get(i).keySet()) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/util/MapCounter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/util/MapCounter.java b/core/src/main/java/org/apache/accumulo/core/util/MapCounter.java
index 4372cfc..9c504e9 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/MapCounter.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/MapCounter.java
@@ -30,7 +30,7 @@ public class MapCounter<KT> {
   private HashMap<KT,MutableLong> map;
 
   public MapCounter() {
-    map = new HashMap<KT,MutableLong>();
+    map = new HashMap<>();
   }
 
   public long increment(KT key, long l) {
@@ -68,7 +68,7 @@ public class MapCounter<KT> {
 
   public Collection<Long> values() {
     Collection<MutableLong> vals = map.values();
-    ArrayList<Long> ret = new ArrayList<Long>(vals.size());
+    ArrayList<Long> ret = new ArrayList<>(vals.size());
     for (MutableLong ml : vals) {
       ret.add(ml.l);
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/util/Merge.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/util/Merge.java b/core/src/main/java/org/apache/accumulo/core/util/Merge.java
index 71f8325..1af5e37 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/Merge.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/Merge.java
@@ -51,7 +51,7 @@ public class Merge {
     MergeException(Exception ex) {
       super(ex);
     }
-  };
+  }
 
   private static final Logger log = LoggerFactory.getLogger(Merge.class);
 
@@ -120,7 +120,7 @@ public class Merge {
       if (table.equals(MetadataTable.NAME)) {
         throw new IllegalArgumentException("cannot merge tablets on the metadata table");
       }
-      List<Size> sizes = new ArrayList<Size>();
+      List<Size> sizes = new ArrayList<>();
       long totalSize = 0;
       // Merge any until you get larger than the goal size, and then merge one less tablet
       Iterator<Size> sizeIterator = getSizeIterator(conn, table, start, end);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/util/Pair.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/util/Pair.java b/core/src/main/java/org/apache/accumulo/core/util/Pair.java
index 293d126..2d51bcd 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/Pair.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/Pair.java
@@ -73,11 +73,11 @@ public class Pair<A,B> {
   }
 
   public Entry<A,B> toMapEntry() {
-    return new SimpleImmutableEntry<A,B>(getFirst(), getSecond());
+    return new SimpleImmutableEntry<>(getFirst(), getSecond());
   }
 
   public Pair<B,A> swap() {
-    return new Pair<B,A>(getSecond(), getFirst());
+    return new Pair<>(getSecond(), getFirst());
   }
 
   public static <K2,V2,K1 extends K2,V1 extends V2> Pair<K2,V2> fromEntry(Entry<K1,V1> entry) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/util/ServerServices.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/util/ServerServices.java b/core/src/main/java/org/apache/accumulo/core/util/ServerServices.java
index a07ef76..de39d5c 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/ServerServices.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/ServerServices.java
@@ -32,7 +32,7 @@ public class ServerServices implements Comparable<ServerServices> {
   private String stringForm = null;
 
   public ServerServices(String services) {
-    this.services = new EnumMap<Service,String>(Service.class);
+    this.services = new EnumMap<>(Service.class);
 
     String[] addresses = services.split(SERVICE_SEPARATOR);
     for (String address : addresses) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/util/StopWatch.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/util/StopWatch.java b/core/src/main/java/org/apache/accumulo/core/util/StopWatch.java
index 8abe19e..5a574db 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/StopWatch.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/StopWatch.java
@@ -23,8 +23,8 @@ public class StopWatch<K extends Enum<K>> {
   EnumMap<K,Long> totalTime;
 
   public StopWatch(Class<K> k) {
-    startTime = new EnumMap<K,Long>(k);
-    totalTime = new EnumMap<K,Long>(k);
+    startTime = new EnumMap<>(k);
+    totalTime = new EnumMap<>(k);
   }
 
   public synchronized void start(K timer) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/util/format/ShardedTableDistributionFormatter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/util/format/ShardedTableDistributionFormatter.java b/core/src/main/java/org/apache/accumulo/core/util/format/ShardedTableDistributionFormatter.java
index 877f164..336e986 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/format/ShardedTableDistributionFormatter.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/format/ShardedTableDistributionFormatter.java
@@ -34,7 +34,7 @@ import org.apache.accumulo.core.data.Value;
  */
 public class ShardedTableDistributionFormatter extends AggregatingFormatter {
 
-  private Map<String,HashSet<String>> countsByDay = new HashMap<String,HashSet<String>>();
+  private Map<String,HashSet<String>> countsByDay = new HashMap<>();
 
   @Override
   protected void aggregateStats(Entry<Key,Value> entry) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/util/format/StatisticsDisplayFormatter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/util/format/StatisticsDisplayFormatter.java b/core/src/main/java/org/apache/accumulo/core/util/format/StatisticsDisplayFormatter.java
index b3ee3ee..0f4858a 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/format/StatisticsDisplayFormatter.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/format/StatisticsDisplayFormatter.java
@@ -28,9 +28,9 @@ import org.apache.accumulo.core.data.Value;
  * debugging. If used on large result sets it will likely fail.
  */
 public class StatisticsDisplayFormatter extends AggregatingFormatter {
-  private Map<String,Long> classifications = new HashMap<String,Long>();
-  private Map<String,Long> columnFamilies = new HashMap<String,Long>();
-  private Map<String,Long> columnQualifiers = new HashMap<String,Long>();
+  private Map<String,Long> classifications = new HashMap<>();
+  private Map<String,Long> columnFamilies = new HashMap<>();
+  private Map<String,Long> columnQualifiers = new HashMap<>();
   private long total = 0;
 
   @Override
@@ -71,9 +71,9 @@ public class StatisticsDisplayFormatter extends AggregatingFormatter {
 
     buf.append(total).append(" entries matched.");
     total = 0;
-    classifications = new HashMap<String,Long>();
-    columnFamilies = new HashMap<String,Long>();
-    columnQualifiers = new HashMap<String,Long>();
+    classifications = new HashMap<>();
+    columnFamilies = new HashMap<>();
+    columnQualifiers = new HashMap<>();
 
     return buf.toString();
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/util/interpret/HexScanInterpreter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/util/interpret/HexScanInterpreter.java b/core/src/main/java/org/apache/accumulo/core/util/interpret/HexScanInterpreter.java
index 964e8c6..3794f27 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/interpret/HexScanInterpreter.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/interpret/HexScanInterpreter.java
@@ -22,6 +22,6 @@ import org.apache.accumulo.core.util.format.HexFormatter;
  * As simple scan interpreter that converts hex to binary. IT supports translating the output of {@link HexFormatter} back to binary. The hex input can contain
  * dashes (because {@link HexFormatter} outputs dashes) which are ignored.
  */
-public class HexScanInterpreter extends HexFormatter implements ScanInterpreter {
+public class HexScanInterpreter extends HexFormatter {
 
 }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/client/IteratorSettingTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/client/IteratorSettingTest.java b/core/src/test/java/org/apache/accumulo/core/client/IteratorSettingTest.java
index bbe2415..ddea0b3 100644
--- a/core/src/test/java/org/apache/accumulo/core/client/IteratorSettingTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/client/IteratorSettingTest.java
@@ -104,7 +104,7 @@ public class IteratorSettingTest {
 
     assertNotEquals(setting1, notEqual1);
 
-    Map<String,String> props = new HashMap<String,String>();
+    Map<String,String> props = new HashMap<>();
     props.put("foo", "bar");
     IteratorSetting notEquals2 = new IteratorSetting(100, "Combiner", Combiner.class, props);
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/client/RowIteratorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/client/RowIteratorTest.java b/core/src/test/java/org/apache/accumulo/core/client/RowIteratorTest.java
index 55e21d1..d8b0696 100644
--- a/core/src/test/java/org/apache/accumulo/core/client/RowIteratorTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/client/RowIteratorTest.java
@@ -36,7 +36,7 @@ import org.junit.Test;
 public class RowIteratorTest {
 
   Iterator<Entry<Key,Value>> makeIterator(final String... args) {
-    final Map<Key,Value> result = new TreeMap<Key,Value>();
+    final Map<Key,Value> result = new TreeMap<>();
     for (String s : args) {
       final String parts[] = s.split("[ \t]");
       final Key key = new Key(parts[0], parts[1], parts[2]);
@@ -47,11 +47,11 @@ public class RowIteratorTest {
   }
 
   List<List<Entry<Key,Value>>> getRows(final Iterator<Entry<Key,Value>> iter) {
-    final List<List<Entry<Key,Value>>> result = new ArrayList<List<Entry<Key,Value>>>();
+    final List<List<Entry<Key,Value>>> result = new ArrayList<>();
     final RowIterator riter = new RowIterator(iter);
     while (riter.hasNext()) {
       final Iterator<Entry<Key,Value>> row = riter.next();
-      final List<Entry<Key,Value>> rlist = new ArrayList<Entry<Key,Value>>();
+      final List<Entry<Key,Value>> rlist = new ArrayList<>();
       while (row.hasNext())
         rlist.add(row.next());
       result.add(rlist);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/client/ZooKeeperInstanceTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/client/ZooKeeperInstanceTest.java b/core/src/test/java/org/apache/accumulo/core/client/ZooKeeperInstanceTest.java
index 41e0b92..aecc947 100644
--- a/core/src/test/java/org/apache/accumulo/core/client/ZooKeeperInstanceTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/client/ZooKeeperInstanceTest.java
@@ -139,7 +139,7 @@ public class ZooKeeperInstanceTest {
     replay(config);
     zki = new ZooKeeperInstance(config, zcf);
     expect(zc.get(Constants.ZROOT + "/" + IID_STRING)).andReturn("yup".getBytes());
-    List<String> children = new java.util.ArrayList<String>();
+    List<String> children = new java.util.ArrayList<>();
     children.add("child1");
     children.add("child2");
     expect(zc.getChildren(Constants.ZROOT + Constants.ZINSTANCES)).andReturn(children);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/client/impl/ClientContextTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/client/impl/ClientContextTest.java b/core/src/test/java/org/apache/accumulo/core/client/impl/ClientContextTest.java
index ff9863c..4eb348e 100644
--- a/core/src/test/java/org/apache/accumulo/core/client/impl/ClientContextTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/client/impl/ClientContextTest.java
@@ -99,7 +99,7 @@ public class ClientContextTest {
     clientConf.addProperty(Property.GENERAL_SECURITY_CREDENTIAL_PROVIDER_PATHS.getKey(), absPath);
 
     AccumuloConfiguration accClientConf = ClientContext.convertClientConfig(clientConf);
-    Map<String,String> props = new HashMap<String,String>();
+    Map<String,String> props = new HashMap<>();
     Predicate<String> all = Predicates.alwaysTrue();
     accClientConf.getProperties(props, all);
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/client/impl/TableOperationsHelperTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/client/impl/TableOperationsHelperTest.java b/core/src/test/java/org/apache/accumulo/core/client/impl/TableOperationsHelperTest.java
index c55b62f..1d699c2 100644
--- a/core/src/test/java/org/apache/accumulo/core/client/impl/TableOperationsHelperTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/client/impl/TableOperationsHelperTest.java
@@ -49,7 +49,7 @@ import org.junit.Test;
 public class TableOperationsHelperTest {
 
   static class Tester extends TableOperationsHelper {
-    Map<String,Map<String,String>> settings = new HashMap<String,Map<String,String>>();
+    Map<String,Map<String,String>> settings = new HashMap<>();
 
     @Override
     public SortedSet<String> list() {
@@ -256,12 +256,12 @@ public class TableOperationsHelperTest {
   }
 
   void check(TableOperationsHelper t, String tablename, String[] values) throws Exception {
-    Map<String,String> expected = new TreeMap<String,String>();
+    Map<String,String> expected = new TreeMap<>();
     for (String value : values) {
       String parts[] = value.split("=", 2);
       expected.put(parts[0], parts[1]);
     }
-    Map<String,String> actual = new TreeMap<String,String>();
+    Map<String,String> actual = new TreeMap<>();
     for (Entry<String,String> entry : t.getProperties(tablename)) {
       actual.put(entry.getKey(), entry.getValue());
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/client/impl/TabletLocatorImplTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/client/impl/TabletLocatorImplTest.java b/core/src/test/java/org/apache/accumulo/core/client/impl/TabletLocatorImplTest.java
index a053cef..bab52f6 100644
--- a/core/src/test/java/org/apache/accumulo/core/client/impl/TabletLocatorImplTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/client/impl/TabletLocatorImplTest.java
@@ -88,13 +88,13 @@ public class TabletLocatorImplTest {
   @SuppressWarnings("unchecked")
   static Map<String,Map<KeyExtent,List<Range>>> createExpectedBinnings(Object... data) {
 
-    Map<String,Map<KeyExtent,List<Range>>> expBinnedRanges = new HashMap<String,Map<KeyExtent,List<Range>>>();
+    Map<String,Map<KeyExtent,List<Range>>> expBinnedRanges = new HashMap<>();
 
     for (int i = 0; i < data.length; i += 2) {
       String loc = (String) data[i];
       Object binData[] = (Object[]) data[i + 1];
 
-      HashMap<KeyExtent,List<Range>> binnedKE = new HashMap<KeyExtent,List<Range>>();
+      HashMap<KeyExtent,List<Range>> binnedKE = new HashMap<>();
 
       expBinnedRanges.put(loc, binnedKE);
 
@@ -110,7 +110,7 @@ public class TabletLocatorImplTest {
   }
 
   static TreeMap<KeyExtent,TabletLocation> createMetaCacheKE(Object... data) {
-    TreeMap<KeyExtent,TabletLocation> mcke = new TreeMap<KeyExtent,TabletLocation>();
+    TreeMap<KeyExtent,TabletLocation> mcke = new TreeMap<>();
 
     for (int i = 0; i < data.length; i += 2) {
       KeyExtent ke = (KeyExtent) data[i];
@@ -124,7 +124,7 @@ public class TabletLocatorImplTest {
   static TreeMap<Text,TabletLocation> createMetaCache(Object... data) {
     TreeMap<KeyExtent,TabletLocation> mcke = createMetaCacheKE(data);
 
-    TreeMap<Text,TabletLocation> mc = new TreeMap<Text,TabletLocation>(TabletLocatorImpl.endRowComparator);
+    TreeMap<Text,TabletLocation> mc = new TreeMap<>(TabletLocatorImpl.endRowComparator);
 
     for (Entry<KeyExtent,TabletLocation> entry : mcke.entrySet()) {
       if (entry.getKey().getEndRow() == null)
@@ -182,18 +182,18 @@ public class TabletLocatorImplTest {
   private void runTest(Text tableName, List<Range> ranges, TabletLocatorImpl tab1TabletCache, Map<String,Map<KeyExtent,List<Range>>> expected,
       List<Range> efailures) throws Exception {
 
-    Map<String,Map<KeyExtent,List<Range>>> binnedRanges = new HashMap<String,Map<KeyExtent,List<Range>>>();
+    Map<String,Map<KeyExtent,List<Range>>> binnedRanges = new HashMap<>();
     List<Range> f = tab1TabletCache.binRanges(context, ranges, binnedRanges);
     assertEquals(expected, binnedRanges);
 
-    HashSet<Range> f1 = new HashSet<Range>(f);
-    HashSet<Range> f2 = new HashSet<Range>(efailures);
+    HashSet<Range> f1 = new HashSet<>(f);
+    HashSet<Range> f2 = new HashSet<>(efailures);
 
     assertEquals(f2, f1);
   }
 
   static Set<KeyExtent> nkes(KeyExtent... extents) {
-    HashSet<KeyExtent> kes = new HashSet<KeyExtent>();
+    HashSet<KeyExtent> kes = new HashSet<>();
 
     for (KeyExtent keyExtent : extents) {
       kes.add(keyExtent);
@@ -205,11 +205,11 @@ public class TabletLocatorImplTest {
   static void runTest(TreeMap<Text,TabletLocation> mc, KeyExtent remove, Set<KeyExtent> expected) {
     // copy so same metaCache can be used for multiple test
 
-    mc = new TreeMap<Text,TabletLocation>(mc);
+    mc = new TreeMap<>(mc);
 
     TabletLocatorImpl.removeOverlapping(mc, remove);
 
-    HashSet<KeyExtent> eic = new HashSet<KeyExtent>();
+    HashSet<KeyExtent> eic = new HashSet<>();
     for (TabletLocation tl : mc.values()) {
       eic.add(tl.tablet_extent);
     }
@@ -235,14 +235,14 @@ public class TabletLocatorImplTest {
   }
 
   private void runTest(TabletLocatorImpl metaCache, List<Mutation> ml, Map<String,Map<KeyExtent,List<String>>> emb, String... efailures) throws Exception {
-    Map<String,TabletServerMutations<Mutation>> binnedMutations = new HashMap<String,TabletServerMutations<Mutation>>();
-    List<Mutation> afailures = new ArrayList<Mutation>();
+    Map<String,TabletServerMutations<Mutation>> binnedMutations = new HashMap<>();
+    List<Mutation> afailures = new ArrayList<>();
     metaCache.binMutations(context, ml, binnedMutations, afailures);
 
     verify(emb, binnedMutations);
 
-    ArrayList<String> afs = new ArrayList<String>();
-    ArrayList<String> efs = new ArrayList<String>(Arrays.asList(efailures));
+    ArrayList<String> afs = new ArrayList<>();
+    ArrayList<String> efs = new ArrayList<>(Arrays.asList(efailures));
 
     for (Mutation mutation : afailures) {
       afs.add(new String(mutation.getRow()));
@@ -265,8 +265,8 @@ public class TabletLocatorImplTest {
       assertEquals(etb.keySet(), atb.getMutations().keySet());
 
       for (KeyExtent ke : etb.keySet()) {
-        ArrayList<String> eRows = new ArrayList<String>(etb.get(ke));
-        ArrayList<String> aRows = new ArrayList<String>();
+        ArrayList<String> eRows = new ArrayList<>(etb.get(ke));
+        ArrayList<String> aRows = new ArrayList<>();
 
         for (Mutation m : atb.getMutations().get(ke)) {
           aRows.add(new String(m.getRow()));
@@ -283,7 +283,7 @@ public class TabletLocatorImplTest {
 
   static Map<String,Map<KeyExtent,List<String>>> cemb(Object[]... ols) {
 
-    Map<String,Map<KeyExtent,List<String>>> emb = new HashMap<String,Map<KeyExtent,List<String>>>();
+    Map<String,Map<KeyExtent,List<String>>> emb = new HashMap<>();
 
     for (Object[] ol : ols) {
       String row = (String) ol[0];
@@ -292,13 +292,13 @@ public class TabletLocatorImplTest {
 
       Map<KeyExtent,List<String>> tb = emb.get(server);
       if (tb == null) {
-        tb = new HashMap<KeyExtent,List<String>>();
+        tb = new HashMap<>();
         emb.put(server, tb);
       }
 
       List<String> rl = tb.get(ke);
       if (rl == null) {
-        rl = new ArrayList<String>();
+        rl = new ArrayList<>();
         tb.put(ke, rl);
       }
 
@@ -476,7 +476,7 @@ public class TabletLocatorImplTest {
   }
 
   static class TServers {
-    private final Map<String,Map<KeyExtent,SortedMap<Key,Value>>> tservers = new HashMap<String,Map<KeyExtent,SortedMap<Key,Value>>>();
+    private final Map<String,Map<KeyExtent,SortedMap<Key,Value>>> tservers = new HashMap<>();
   }
 
   static class TestTabletLocationObtainer implements TabletLocationObtainer {
@@ -523,7 +523,7 @@ public class TabletLocatorImplTest {
     public List<TabletLocation> lookupTablets(ClientContext context, String tserver, Map<KeyExtent,List<Range>> map, TabletLocator parent)
         throws AccumuloSecurityException {
 
-      ArrayList<TabletLocation> list = new ArrayList<TabletLocation>();
+      ArrayList<TabletLocation> list = new ArrayList<>();
 
       Map<KeyExtent,SortedMap<Key,Value>> tablets = tservers.get(tserver);
 
@@ -532,10 +532,10 @@ public class TabletLocatorImplTest {
         return list;
       }
 
-      TreeMap<Key,Value> results = new TreeMap<Key,Value>();
+      TreeMap<Key,Value> results = new TreeMap<>();
 
       Set<Entry<KeyExtent,List<Range>>> es = map.entrySet();
-      List<KeyExtent> failures = new ArrayList<KeyExtent>();
+      List<KeyExtent> failures = new ArrayList<>();
       for (Entry<KeyExtent,List<Range>> entry : es) {
         SortedMap<Key,Value> tabletData = tablets.get(entry.getKey());
 
@@ -601,13 +601,13 @@ public class TabletLocatorImplTest {
   static void createEmptyTablet(TServers tservers, String server, KeyExtent tablet) {
     Map<KeyExtent,SortedMap<Key,Value>> tablets = tservers.tservers.get(server);
     if (tablets == null) {
-      tablets = new HashMap<KeyExtent,SortedMap<Key,Value>>();
+      tablets = new HashMap<>();
       tservers.tservers.put(server, tablets);
     }
 
     SortedMap<Key,Value> tabletData = tablets.get(tablet);
     if (tabletData == null) {
-      tabletData = new TreeMap<Key,Value>();
+      tabletData = new TreeMap<>();
       tablets.put(tablet, tabletData);
     } else if (tabletData.size() > 0) {
       throw new RuntimeException("Asked for empty tablet, but non empty tablet exists");
@@ -634,13 +634,13 @@ public class TabletLocatorImplTest {
   static void setLocation(TServers tservers, String server, KeyExtent tablet, KeyExtent ke, String location, String instance) {
     Map<KeyExtent,SortedMap<Key,Value>> tablets = tservers.tservers.get(server);
     if (tablets == null) {
-      tablets = new HashMap<KeyExtent,SortedMap<Key,Value>>();
+      tablets = new HashMap<>();
       tservers.tservers.put(server, tablets);
     }
 
     SortedMap<Key,Value> tabletData = tablets.get(tablet);
     if (tabletData == null) {
-      tabletData = new TreeMap<Key,Value>();
+      tabletData = new TreeMap<>();
       tablets.put(tablet, tabletData);
     }
 
@@ -1269,7 +1269,7 @@ public class TabletLocatorImplTest {
     setLocation(tservers, "tserver1", RTE, mte2, "tserver3");
 
     // create the ~ tablet so it exists
-    Map<KeyExtent,SortedMap<Key,Value>> ts3 = new HashMap<KeyExtent,SortedMap<Key,Value>>();
+    Map<KeyExtent,SortedMap<Key,Value>> ts3 = new HashMap<>();
     ts3.put(mte2, new TreeMap<Key,Value>());
     tservers.tservers.put("tserver3", ts3);
 
@@ -1336,7 +1336,7 @@ public class TabletLocatorImplTest {
   @Test
   public void testLostLock() throws Exception {
 
-    final HashSet<String> activeLocks = new HashSet<String>();
+    final HashSet<String> activeLocks = new HashSet<>();
 
     TServers tservers = new TServers();
     TabletLocatorImpl metaCache = createLocators(tservers, "tserver1", "tserver2", "foo", new TabletServerLockChecker() {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/client/lexicoder/LexicoderTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/client/lexicoder/LexicoderTest.java b/core/src/test/java/org/apache/accumulo/core/client/lexicoder/LexicoderTest.java
index 6d06f97..faf3c23 100644
--- a/core/src/test/java/org/apache/accumulo/core/client/lexicoder/LexicoderTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/client/lexicoder/LexicoderTest.java
@@ -32,8 +32,8 @@ public abstract class LexicoderTest extends TestCase {
   }
 
   public <T extends Comparable<T>> void assertSortOrder(Lexicoder<T> lexicoder, Comparator<T> comp, List<T> data) {
-    List<T> list = new ArrayList<T>();
-    List<Text> encList = new ArrayList<Text>();
+    List<T> list = new ArrayList<>();
+    List<Text> encList = new ArrayList<>();
 
     for (T d : data) {
       list.add(d);
@@ -47,7 +47,7 @@ public abstract class LexicoderTest extends TestCase {
 
     Collections.sort(encList);
 
-    List<T> decodedList = new ArrayList<T>();
+    List<T> decodedList = new ArrayList<>();
 
     for (Text t : encList) {
       decodedList.add(lexicoder.decode(TextUtil.getBytes(t)));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/client/lexicoder/ListLexicoderTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/client/lexicoder/ListLexicoderTest.java b/core/src/test/java/org/apache/accumulo/core/client/lexicoder/ListLexicoderTest.java
index 6353863..22cdc50 100644
--- a/core/src/test/java/org/apache/accumulo/core/client/lexicoder/ListLexicoderTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/client/lexicoder/ListLexicoderTest.java
@@ -26,11 +26,11 @@ import org.apache.hadoop.io.Text;
 
 public class ListLexicoderTest extends AbstractLexicoderTest {
 
-  private List<Long> data1 = new ArrayList<Long>();
-  private List<Long> data2 = new ArrayList<Long>();
-  private List<Long> data3 = new ArrayList<Long>();
-  private List<Long> data4 = new ArrayList<Long>();
-  private List<Long> data5 = new ArrayList<Long>();
+  private List<Long> data1 = new ArrayList<>();
+  private List<Long> data2 = new ArrayList<>();
+  private List<Long> data3 = new ArrayList<>();
+  private List<Long> data4 = new ArrayList<>();
+  private List<Long> data5 = new ArrayList<>();
 
   @Override
   public void setUp() {
@@ -52,7 +52,7 @@ public class ListLexicoderTest extends AbstractLexicoderTest {
   }
 
   public void testSortOrder() {
-    List<List<Long>> data = new ArrayList<List<Long>>();
+    List<List<Long>> data = new ArrayList<>();
 
     // add list in expected sort order
     data.add(data2);
@@ -61,15 +61,15 @@ public class ListLexicoderTest extends AbstractLexicoderTest {
     data.add(data3);
     data.add(data5);
 
-    TreeSet<Text> sortedEnc = new TreeSet<Text>();
+    TreeSet<Text> sortedEnc = new TreeSet<>();
 
-    ListLexicoder<Long> listLexicoder = new ListLexicoder<Long>(new LongLexicoder());
+    ListLexicoder<Long> listLexicoder = new ListLexicoder<>(new LongLexicoder());
 
     for (List<Long> list : data) {
       sortedEnc.add(new Text(listLexicoder.encode(list)));
     }
 
-    List<List<Long>> unenc = new ArrayList<List<Long>>();
+    List<List<Long>> unenc = new ArrayList<>();
 
     for (Text enc : sortedEnc) {
       unenc.add(listLexicoder.decode(TextUtil.getBytes(enc)));
@@ -80,10 +80,10 @@ public class ListLexicoderTest extends AbstractLexicoderTest {
   }
 
   public void testDecodes() {
-    assertDecodes(new ListLexicoder<Long>(new LongLexicoder()), data1);
-    assertDecodes(new ListLexicoder<Long>(new LongLexicoder()), data2);
-    assertDecodes(new ListLexicoder<Long>(new LongLexicoder()), data3);
-    assertDecodes(new ListLexicoder<Long>(new LongLexicoder()), data4);
-    assertDecodes(new ListLexicoder<Long>(new LongLexicoder()), data5);
+    assertDecodes(new ListLexicoder<>(new LongLexicoder()), data1);
+    assertDecodes(new ListLexicoder<>(new LongLexicoder()), data2);
+    assertDecodes(new ListLexicoder<>(new LongLexicoder()), data3);
+    assertDecodes(new ListLexicoder<>(new LongLexicoder()), data4);
+    assertDecodes(new ListLexicoder<>(new LongLexicoder()), data5);
   }
 }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/client/lexicoder/PairLexicoderTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/client/lexicoder/PairLexicoderTest.java b/core/src/test/java/org/apache/accumulo/core/client/lexicoder/PairLexicoderTest.java
index 0979801..d94793e 100644
--- a/core/src/test/java/org/apache/accumulo/core/client/lexicoder/PairLexicoderTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/client/lexicoder/PairLexicoderTest.java
@@ -26,20 +26,19 @@ import java.util.Arrays;
  */
 public class PairLexicoderTest extends AbstractLexicoderTest {
   public void testSortOrder() {
-    PairLexicoder<String,String> plexc = new PairLexicoder<String,String>(new StringLexicoder(), new StringLexicoder());
+    PairLexicoder<String,String> plexc = new PairLexicoder<>(new StringLexicoder(), new StringLexicoder());
 
-    assertSortOrder(plexc, Arrays.asList(new ComparablePair<String,String>("a", "b"), new ComparablePair<String,String>("a", "bc"),
-        new ComparablePair<String,String>("a", "c"), new ComparablePair<String,String>("ab", "c"), new ComparablePair<String,String>("ab", ""),
-        new ComparablePair<String,String>("ab", "d"), new ComparablePair<String,String>("b", "f"), new ComparablePair<String,String>("b", "a")));
+    assertSortOrder(plexc, Arrays.asList(new ComparablePair<>("a", "b"), new ComparablePair<>("a", "bc"), new ComparablePair<>("a", "c"), new ComparablePair<>(
+        "ab", "c"), new ComparablePair<>("ab", ""), new ComparablePair<>("ab", "d"), new ComparablePair<>("b", "f"), new ComparablePair<>("b", "a")));
 
-    PairLexicoder<Long,String> plexc2 = new PairLexicoder<Long,String>(new LongLexicoder(), new StringLexicoder());
+    PairLexicoder<Long,String> plexc2 = new PairLexicoder<>(new LongLexicoder(), new StringLexicoder());
 
-    assertSortOrder(plexc2, Arrays.asList(new ComparablePair<Long,String>(0x100l, "a"), new ComparablePair<Long,String>(0x100l, "ab"),
-        new ComparablePair<Long,String>(0xf0l, "a"), new ComparablePair<Long,String>(0xf0l, "ab")));
+    assertSortOrder(plexc2, Arrays.asList(new ComparablePair<>(0x100l, "a"), new ComparablePair<>(0x100l, "ab"), new ComparablePair<>(0xf0l, "a"),
+        new ComparablePair<>(0xf0l, "ab")));
   }
 
   public void testDecodes() {
-    PairLexicoder<String,String> plexc = new PairLexicoder<String,String>(new StringLexicoder(), new StringLexicoder());
-    assertDecodes(plexc, new ComparablePair<String,String>("a", "b"));
+    PairLexicoder<String,String> plexc = new PairLexicoder<>(new StringLexicoder(), new StringLexicoder());
+    assertDecodes(plexc, new ComparablePair<>("a", "b"));
   }
 }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/client/lexicoder/ReverseLexicoderTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/client/lexicoder/ReverseLexicoderTest.java b/core/src/test/java/org/apache/accumulo/core/client/lexicoder/ReverseLexicoderTest.java
index a49409f..df6f131 100644
--- a/core/src/test/java/org/apache/accumulo/core/client/lexicoder/ReverseLexicoderTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/client/lexicoder/ReverseLexicoderTest.java
@@ -29,12 +29,12 @@ import java.util.Date;
 public class ReverseLexicoderTest extends AbstractLexicoderTest {
   public void testSortOrder() {
     Comparator<Long> comp = Collections.reverseOrder();
-    assertSortOrder(new ReverseLexicoder<Long>(new LongLexicoder()), comp, Arrays.asList(Long.MIN_VALUE, 0xff1234567890abcdl, 0xffff1234567890abl,
+    assertSortOrder(new ReverseLexicoder<>(new LongLexicoder()), comp, Arrays.asList(Long.MIN_VALUE, 0xff1234567890abcdl, 0xffff1234567890abl,
         0xffffff567890abcdl, 0xffffffff7890abcdl, 0xffffffffff90abcdl, 0xffffffffffffabcdl, 0xffffffffffffffcdl, -1l, 0l, 0x01l, 0x1234l, 0x123456l,
         0x12345678l, 0x1234567890l, 0x1234567890abl, 0x1234567890abcdl, 0x1234567890abcdefl, Long.MAX_VALUE));
 
     Comparator<String> comp2 = Collections.reverseOrder();
-    assertSortOrder(new ReverseLexicoder<String>(new StringLexicoder()), comp2, Arrays.asList("a", "aa", "ab", "b", "aab"));
+    assertSortOrder(new ReverseLexicoder<>(new StringLexicoder()), comp2, Arrays.asList("a", "aa", "ab", "b", "aab"));
 
   }
 
@@ -44,7 +44,7 @@ public class ReverseLexicoderTest extends AbstractLexicoderTest {
   @Test
   public void testReverseSortDates() throws UnsupportedEncodingException {
 
-    ReverseLexicoder<Date> revLex = new ReverseLexicoder<Date>(new DateLexicoder());
+    ReverseLexicoder<Date> revLex = new ReverseLexicoder<>(new DateLexicoder());
 
     Calendar cal = Calendar.getInstance();
     cal.set(1920, 1, 2, 3, 4, 5); // create an instance prior to 1970 for ACCUMULO-3385
@@ -65,10 +65,10 @@ public class ReverseLexicoderTest extends AbstractLexicoderTest {
   }
 
   public void testDecodes() {
-    assertDecodes(new ReverseLexicoder<Long>(new LongLexicoder()), Long.MIN_VALUE);
-    assertDecodes(new ReverseLexicoder<Long>(new LongLexicoder()), -1l);
-    assertDecodes(new ReverseLexicoder<Long>(new LongLexicoder()), 0l);
-    assertDecodes(new ReverseLexicoder<Long>(new LongLexicoder()), 1l);
-    assertDecodes(new ReverseLexicoder<Long>(new LongLexicoder()), Long.MAX_VALUE);
+    assertDecodes(new ReverseLexicoder<>(new LongLexicoder()), Long.MIN_VALUE);
+    assertDecodes(new ReverseLexicoder<>(new LongLexicoder()), -1l);
+    assertDecodes(new ReverseLexicoder<>(new LongLexicoder()), 0l);
+    assertDecodes(new ReverseLexicoder<>(new LongLexicoder()), 1l);
+    assertDecodes(new ReverseLexicoder<>(new LongLexicoder()), Long.MAX_VALUE);
   }
 }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/client/lexicoder/UUIDLexicoderTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/client/lexicoder/UUIDLexicoderTest.java b/core/src/test/java/org/apache/accumulo/core/client/lexicoder/UUIDLexicoderTest.java
index 60c89a3..8424a75 100644
--- a/core/src/test/java/org/apache/accumulo/core/client/lexicoder/UUIDLexicoderTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/client/lexicoder/UUIDLexicoderTest.java
@@ -28,7 +28,7 @@ public class UUIDLexicoderTest extends AbstractLexicoderTest {
     assertSortOrder(new UUIDLexicoder(),
         Arrays.asList(UUID.randomUUID(), UUID.randomUUID(), UUID.randomUUID(), UUID.randomUUID(), UUID.randomUUID(), UUID.randomUUID()));
 
-    ArrayList<UUID> uuids = new ArrayList<UUID>();
+    ArrayList<UUID> uuids = new ArrayList<>();
 
     for (long ms = -260l; ms < 260l; ms++) {
       for (long ls = -2l; ls < 2; ls++) {


[32/32] accumulo git commit: ACCUMULO-4357 Use more diamond operators in Java 8

Posted by ct...@apache.org.
ACCUMULO-4357 Use more diamond operators in Java 8


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/fd67a6c8
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/fd67a6c8
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/fd67a6c8

Branch: refs/heads/master
Commit: fd67a6c85a93bb26817700982954232b65a01abf
Parents: 72d8e74
Author: Christopher Tubbs <ct...@apache.org>
Authored: Thu Jun 30 21:58:15 2016 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Thu Jun 30 21:58:15 2016 -0400

----------------------------------------------------------------------
 .../apache/accumulo/core/client/impl/ThriftTransportPool.java  | 4 ++--
 .../accumulo/core/client/mapreduce/InputTableConfig.java       | 6 +++---
 .../core/client/mapreduce/lib/impl/InputConfigurator.java      | 2 +-
 .../org/apache/accumulo/core/conf/AccumuloConfiguration.java   | 2 +-
 core/src/main/java/org/apache/accumulo/core/util/Pair.java     | 2 +-
 .../java/org/apache/accumulo/core/client/TestThrift1474.java   | 2 +-
 .../apache/accumulo/core/client/impl/ClientContextTest.java    | 2 +-
 .../apache/accumulo/core/conf/DefaultConfigurationTest.java    | 2 +-
 .../org/apache/accumulo/core/conf/SiteConfigurationTest.java   | 2 +-
 .../accumulo/minicluster/impl/MiniAccumuloConfigImplTest.java  | 2 +-
 proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java | 4 ++--
 .../main/java/org/apache/accumulo/server/util/FileUtil.java    | 4 ++--
 .../org/apache/accumulo/server/util/MetadataTableUtil.java     | 2 +-
 .../accumulo/server/conf/NamespaceConfigurationTest.java       | 2 +-
 .../apache/accumulo/server/conf/TableConfigurationTest.java    | 2 +-
 .../accumulo/server/master/balancer/GroupBalancerTest.java     | 2 +-
 .../java/org/apache/accumulo/server/util/FileUtilTest.java     | 2 +-
 .../java/org/apache/accumulo/monitor/util/TableColumn.java     | 2 +-
 .../apache/accumulo/tserver/TabletServerResourceManager.java   | 2 +-
 .../accumulo/test/functional/TabletStateChangeIteratorIT.java  | 2 +-
 .../org/apache/accumulo/test/functional/ZombieTServer.java     | 2 +-
 .../apache/accumulo/test/performance/thrift/NullTserver.java   | 2 +-
 22 files changed, 27 insertions(+), 27 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/fd67a6c8/core/src/main/java/org/apache/accumulo/core/client/impl/ThriftTransportPool.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/ThriftTransportPool.java b/core/src/main/java/org/apache/accumulo/core/client/impl/ThriftTransportPool.java
index 682ecbd..d9bd4e8 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/ThriftTransportPool.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/ThriftTransportPool.java
@@ -433,7 +433,7 @@ public class ThriftTransportPool {
                 cachedConnection.setReserved(true);
                 final String serverAddr = ttk.getServer().toString();
                 log.trace("Using existing connection to {}", serverAddr);
-                return new Pair<String,TTransport>(serverAddr, cachedConnection.transport);
+                return new Pair<>(serverAddr, cachedConnection.transport);
               }
             }
           }
@@ -455,7 +455,7 @@ public class ThriftTransportPool {
                 cachedConnection.setReserved(true);
                 final String serverAddr = ttk.getServer().toString();
                 log.trace("Using existing connection to {} timeout {}", serverAddr, ttk.getTimeout());
-                return new Pair<String,TTransport>(serverAddr, cachedConnection.transport);
+                return new Pair<>(serverAddr, cachedConnection.transport);
               }
             }
           }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/fd67a6c8/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputTableConfig.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputTableConfig.java b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputTableConfig.java
index a8724c2..b892ac1 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputTableConfig.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputTableConfig.java
@@ -75,7 +75,7 @@ public class InputTableConfig implements Writable {
    * Returns the ranges to be queried in the configuration
    */
   public List<Range> getRanges() {
-    return ranges != null ? ranges : new ArrayList<Range>();
+    return ranges != null ? ranges : new ArrayList<>();
   }
 
   /**
@@ -95,7 +95,7 @@ public class InputTableConfig implements Writable {
    * Returns the columns to be fetched for this configuration
    */
   public Collection<Pair<Text,Text>> getFetchedColumns() {
-    return columns != null ? columns : new HashSet<Pair<Text,Text>>();
+    return columns != null ? columns : new HashSet<>();
   }
 
   /**
@@ -114,7 +114,7 @@ public class InputTableConfig implements Writable {
    * Returns the iterators to be set on this configuration
    */
   public List<IteratorSetting> getIterators() {
-    return iterators != null ? iterators : new ArrayList<IteratorSetting>();
+    return iterators != null ? iterators : new ArrayList<>();
   }
 
   /**

http://git-wip-us.apache.org/repos/asf/accumulo/blob/fd67a6c8/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/impl/InputConfigurator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/impl/InputConfigurator.java b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/impl/InputConfigurator.java
index 92ae7a4..57158a6 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/impl/InputConfigurator.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/impl/InputConfigurator.java
@@ -351,7 +351,7 @@ public class InputConfigurator extends ConfiguratorBase {
       int idx = col.indexOf(":");
       Text cf = new Text(idx < 0 ? Base64.getDecoder().decode(col) : Base64.getDecoder().decode(col.substring(0, idx)));
       Text cq = idx < 0 ? null : new Text(Base64.getDecoder().decode(col.substring(idx + 1)));
-      columns.add(new Pair<Text,Text>(cf, cq));
+      columns.add(new Pair<>(cf, cq));
     }
     return columns;
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/fd67a6c8/core/src/main/java/org/apache/accumulo/core/conf/AccumuloConfiguration.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/conf/AccumuloConfiguration.java b/core/src/main/java/org/apache/accumulo/core/conf/AccumuloConfiguration.java
index 75a401f..593f466 100644
--- a/core/src/main/java/org/apache/accumulo/core/conf/AccumuloConfiguration.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/AccumuloConfiguration.java
@@ -133,7 +133,7 @@ public abstract class AccumuloConfiguration implements Iterable<Entry<String,Str
   @Override
   public Iterator<Entry<String,String>> iterator() {
     Predicate<String> all = x -> true;
-    TreeMap<String,String> entries = new TreeMap<String,String>();
+    TreeMap<String,String> entries = new TreeMap<>();
     getProperties(entries, all);
     return entries.entrySet().iterator();
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/fd67a6c8/core/src/main/java/org/apache/accumulo/core/util/Pair.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/util/Pair.java b/core/src/main/java/org/apache/accumulo/core/util/Pair.java
index 2d51bcd..37fb04f 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/Pair.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/Pair.java
@@ -81,7 +81,7 @@ public class Pair<A,B> {
   }
 
   public static <K2,V2,K1 extends K2,V1 extends V2> Pair<K2,V2> fromEntry(Entry<K1,V1> entry) {
-    return new Pair<K2,V2>(entry.getKey(), entry.getValue());
+    return new Pair<>(entry.getKey(), entry.getValue());
   }
 
 }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/fd67a6c8/core/src/test/java/org/apache/accumulo/core/client/TestThrift1474.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/client/TestThrift1474.java b/core/src/test/java/org/apache/accumulo/core/client/TestThrift1474.java
index 845439e..621e7f2 100644
--- a/core/src/test/java/org/apache/accumulo/core/client/TestThrift1474.java
+++ b/core/src/test/java/org/apache/accumulo/core/client/TestThrift1474.java
@@ -64,7 +64,7 @@ public class TestThrift1474 {
     serverTransport.listen();
     int port = serverTransport.getServerSocket().getLocalPort();
     TestServer handler = new TestServer();
-    ThriftTest.Processor<ThriftTest.Iface> processor = new ThriftTest.Processor<ThriftTest.Iface>(handler);
+    ThriftTest.Processor<ThriftTest.Iface> processor = new ThriftTest.Processor<>(handler);
 
     TThreadPoolServer.Args args = new TThreadPoolServer.Args(serverTransport);
     args.stopTimeoutVal = 10;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/fd67a6c8/core/src/test/java/org/apache/accumulo/core/client/impl/ClientContextTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/client/impl/ClientContextTest.java b/core/src/test/java/org/apache/accumulo/core/client/impl/ClientContextTest.java
index a423057..ab46c6c 100644
--- a/core/src/test/java/org/apache/accumulo/core/client/impl/ClientContextTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/client/impl/ClientContextTest.java
@@ -96,7 +96,7 @@ public class ClientContextTest {
     clientConf.addProperty(Property.GENERAL_SECURITY_CREDENTIAL_PROVIDER_PATHS.getKey(), absPath);
 
     AccumuloConfiguration accClientConf = ClientContext.convertClientConfig(clientConf);
-    Map<String,String> props = new HashMap<String,String>();
+    Map<String,String> props = new HashMap<>();
     accClientConf.getProperties(props, x -> true);
 
     // Only sensitive properties are added

http://git-wip-us.apache.org/repos/asf/accumulo/blob/fd67a6c8/core/src/test/java/org/apache/accumulo/core/conf/DefaultConfigurationTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/conf/DefaultConfigurationTest.java b/core/src/test/java/org/apache/accumulo/core/conf/DefaultConfigurationTest.java
index a942e15..9e4c5ec 100644
--- a/core/src/test/java/org/apache/accumulo/core/conf/DefaultConfigurationTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/conf/DefaultConfigurationTest.java
@@ -38,7 +38,7 @@ public class DefaultConfigurationTest {
 
   @Test
   public void testGetProperties() {
-    Map<String,String> p = new java.util.HashMap<String,String>();
+    Map<String,String> p = new java.util.HashMap<>();
     c.getProperties(p, x -> true);
     assertEquals(Property.MASTER_CLIENTPORT.getDefaultValue(), p.get(Property.MASTER_CLIENTPORT.getKey()));
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/fd67a6c8/core/src/test/java/org/apache/accumulo/core/conf/SiteConfigurationTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/conf/SiteConfigurationTest.java b/core/src/test/java/org/apache/accumulo/core/conf/SiteConfigurationTest.java
index 7d74804..896bf8c 100644
--- a/core/src/test/java/org/apache/accumulo/core/conf/SiteConfigurationTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/conf/SiteConfigurationTest.java
@@ -64,7 +64,7 @@ public class SiteConfigurationTest {
 
     EasyMock.replay(siteCfg);
 
-    Map<String,String> props = new HashMap<String,String>();
+    Map<String,String> props = new HashMap<>();
     Predicate<String> all = x -> true;
     siteCfg.getProperties(props, all);
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/fd67a6c8/minicluster/src/test/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImplTest.java
----------------------------------------------------------------------
diff --git a/minicluster/src/test/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImplTest.java b/minicluster/src/test/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImplTest.java
index 4293d47..46cf6e3 100644
--- a/minicluster/src/test/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImplTest.java
+++ b/minicluster/src/test/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImplTest.java
@@ -68,7 +68,7 @@ public class MiniAccumuloConfigImplTest {
   public void testSiteConfig() {
 
     // constructor site config overrides default props
-    Map<String,String> siteConfig = new HashMap<String,String>();
+    Map<String,String> siteConfig = new HashMap<>();
     siteConfig.put(INSTANCE_DFS_URI.getKey(), "hdfs://");
     MiniAccumuloConfigImpl config = new MiniAccumuloConfigImpl(tempFolder.getRoot(), "password").setSiteConfig(siteConfig).initialize();
     assertEquals("hdfs://", config.getSiteConfig().get(INSTANCE_DFS_URI.getKey()));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/fd67a6c8/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java
----------------------------------------------------------------------
diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java b/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java
index 40b84f2..c4b422c 100644
--- a/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java
+++ b/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java
@@ -1466,8 +1466,8 @@ public class ProxyServer implements AccumuloProxy.Iface {
       Set<String> propertiesToExclude) throws org.apache.accumulo.proxy.thrift.AccumuloException, org.apache.accumulo.proxy.thrift.AccumuloSecurityException,
       org.apache.accumulo.proxy.thrift.TableNotFoundException, org.apache.accumulo.proxy.thrift.TableExistsException, TException {
     try {
-      propertiesToExclude = propertiesToExclude == null ? new HashSet<String>() : propertiesToExclude;
-      propertiesToSet = propertiesToSet == null ? new HashMap<String,String>() : propertiesToSet;
+      propertiesToExclude = propertiesToExclude == null ? new HashSet<>() : propertiesToExclude;
+      propertiesToSet = propertiesToSet == null ? new HashMap<>() : propertiesToSet;
 
       getConnector(login).tableOperations().clone(tableName, newTableName, flush, propertiesToSet, propertiesToExclude);
     } catch (Exception e) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/fd67a6c8/server/base/src/main/java/org/apache/accumulo/server/util/FileUtil.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/FileUtil.java b/server/base/src/main/java/org/apache/accumulo/server/util/FileUtil.java
index 0a45d99..9205683 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/FileUtil.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/FileUtil.java
@@ -229,7 +229,7 @@ public class FileUtil {
         return .5;
       }
 
-      List<SortedKeyValueIterator<Key,Value>> iters = new ArrayList<SortedKeyValueIterator<Key,Value>>(readers);
+      List<SortedKeyValueIterator<Key,Value>> iters = new ArrayList<>(readers);
       MultiIterator mmfi = new MultiIterator(iters, true);
 
       // skip the prevendrow
@@ -310,7 +310,7 @@ public class FileUtil {
         throw new IOException("Failed to find mid point, no entries between " + prevEndRow + " and " + endRow + " for " + mapFiles);
       }
 
-      List<SortedKeyValueIterator<Key,Value>> iters = new ArrayList<SortedKeyValueIterator<Key,Value>>(readers);
+      List<SortedKeyValueIterator<Key,Value>> iters = new ArrayList<>(readers);
       MultiIterator mmfi = new MultiIterator(iters, true);
 
       // skip the prevendrow

http://git-wip-us.apache.org/repos/asf/accumulo/blob/fd67a6c8/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java b/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java
index dea7064..872febc 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java
@@ -543,7 +543,7 @@ public class MetadataTableUtil {
       }
     }
 
-    return new Pair<List<LogEntry>,SortedMap<FileRef,DataFileValue>>(result, sizes);
+    return new Pair<>(result, sizes);
   }
 
   public static List<LogEntry> getLogEntries(ClientContext context, KeyExtent extent) throws IOException, KeeperException, InterruptedException {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/fd67a6c8/server/base/src/test/java/org/apache/accumulo/server/conf/NamespaceConfigurationTest.java
----------------------------------------------------------------------
diff --git a/server/base/src/test/java/org/apache/accumulo/server/conf/NamespaceConfigurationTest.java b/server/base/src/test/java/org/apache/accumulo/server/conf/NamespaceConfigurationTest.java
index 40753ff..c0e4bc6 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/conf/NamespaceConfigurationTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/conf/NamespaceConfigurationTest.java
@@ -116,7 +116,7 @@ public class NamespaceConfigurationTest {
   @Test
   public void testGetProperties() {
     Predicate<String> all = x -> true;
-    Map<String,String> props = new java.util.HashMap<String,String>();
+    Map<String,String> props = new java.util.HashMap<>();
     parent.getProperties(props, all);
     replay(parent);
     List<String> children = new java.util.ArrayList<>();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/fd67a6c8/server/base/src/test/java/org/apache/accumulo/server/conf/TableConfigurationTest.java
----------------------------------------------------------------------
diff --git a/server/base/src/test/java/org/apache/accumulo/server/conf/TableConfigurationTest.java b/server/base/src/test/java/org/apache/accumulo/server/conf/TableConfigurationTest.java
index c67dae9..53a56c6 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/conf/TableConfigurationTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/conf/TableConfigurationTest.java
@@ -100,7 +100,7 @@ public class TableConfigurationTest {
   @Test
   public void testGetProperties() {
     Predicate<String> all = x -> true;
-    Map<String,String> props = new java.util.HashMap<String,String>();
+    Map<String,String> props = new java.util.HashMap<>();
     parent.getProperties(props, all);
     replay(parent);
     List<String> children = new java.util.ArrayList<>();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/fd67a6c8/server/base/src/test/java/org/apache/accumulo/server/master/balancer/GroupBalancerTest.java
----------------------------------------------------------------------
diff --git a/server/base/src/test/java/org/apache/accumulo/server/master/balancer/GroupBalancerTest.java b/server/base/src/test/java/org/apache/accumulo/server/master/balancer/GroupBalancerTest.java
index 47d50f3..24d8fe2 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/master/balancer/GroupBalancerTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/master/balancer/GroupBalancerTest.java
@@ -80,7 +80,7 @@ public class GroupBalancerTest {
 
         @Override
         protected Iterable<Pair<KeyExtent,Location>> getLocationProvider() {
-          return Iterables.transform(tabletLocs.entrySet(), input -> new Pair<KeyExtent,Location>(input.getKey(), new Location(input.getValue())));
+          return Iterables.transform(tabletLocs.entrySet(), input -> new Pair<>(input.getKey(), new Location(input.getValue())));
         }
 
         @Override

http://git-wip-us.apache.org/repos/asf/accumulo/blob/fd67a6c8/server/base/src/test/java/org/apache/accumulo/server/util/FileUtilTest.java
----------------------------------------------------------------------
diff --git a/server/base/src/test/java/org/apache/accumulo/server/util/FileUtilTest.java b/server/base/src/test/java/org/apache/accumulo/server/util/FileUtilTest.java
index e748969..4292eed 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/util/FileUtilTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/util/FileUtilTest.java
@@ -91,7 +91,7 @@ public class FileUtilTest {
     assertTrue(tmp1.mkdirs() || tmp1.isDirectory());
     Path tmpPath1 = new Path(tmp1.toURI());
 
-    HashMap<Property,String> testProps = new HashMap<Property,String>();
+    HashMap<Property,String> testProps = new HashMap<>();
     testProps.put(INSTANCE_DFS_DIR, accumuloDir.getAbsolutePath());
 
     AccumuloConfiguration testConf = new FileUtilTestConfiguration(testProps);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/fd67a6c8/server/monitor/src/main/java/org/apache/accumulo/monitor/util/TableColumn.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/util/TableColumn.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/util/TableColumn.java
index 1e00927..86ba393 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/util/TableColumn.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/util/TableColumn.java
@@ -26,7 +26,7 @@ public class TableColumn<T> {
 
   public TableColumn(String title, CellType<T> type, String legend) {
     this.title = title;
-    this.type = type != null ? type : new StringType<T>();
+    this.type = type != null ? type : new StringType<>();
     this.legend = legend;
   }
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/fd67a6c8/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServerResourceManager.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServerResourceManager.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServerResourceManager.java
index 97606ea..089bd12 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServerResourceManager.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServerResourceManager.java
@@ -410,7 +410,7 @@ public class TabletServerResourceManager {
           synchronized (tabletReports) {
             tabletReportsCopy = new HashMap<>(tabletReports);
           }
-          ArrayList<TabletState> tabletStates = new ArrayList<TabletState>(tabletReportsCopy.values());
+          ArrayList<TabletState> tabletStates = new ArrayList<>(tabletReportsCopy.values());
           mma = memoryManager.getMemoryManagementActions(tabletStates);
 
         } catch (Throwable t) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/fd67a6c8/test/src/main/java/org/apache/accumulo/test/functional/TabletStateChangeIteratorIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/TabletStateChangeIteratorIT.java b/test/src/main/java/org/apache/accumulo/test/functional/TabletStateChangeIteratorIT.java
index 0283f37..e61ec9a 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/TabletStateChangeIteratorIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/TabletStateChangeIteratorIT.java
@@ -213,7 +213,7 @@ public class TabletStateChangeIteratorIT extends SharedMiniClusterBase {
 
     @Override
     public Set<String> onlineTables() {
-      HashSet<String> onlineTables = new HashSet<String>(getConnector().tableOperations().tableIdMap().values());
+      HashSet<String> onlineTables = new HashSet<>(getConnector().tableOperations().tableIdMap().values());
       return Sets.filter(onlineTables, tableId -> Tables.getTableState(getConnector().getInstance(), tableId) == TableState.ONLINE);
     }
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/fd67a6c8/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 6c20cda..14d594a 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
@@ -103,7 +103,7 @@ public class ZombieTServer {
 
     TransactionWatcher watcher = new TransactionWatcher();
     final ThriftClientHandler tch = new ThriftClientHandler(context, watcher);
-    Processor<Iface> processor = new Processor<Iface>(tch);
+    Processor<Iface> processor = new Processor<>(tch);
     ServerAddress serverPort = TServerUtils.startTServer(context.getConfiguration(), ThriftServerType.CUSTOM_HS_HA, processor, "ZombieTServer", "walking dead",
         2, 1, 1000, 10 * 1024 * 1024, null, null, -1, HostAndPort.fromParts("0.0.0.0", port));
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/fd67a6c8/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 63a7771..7c27413 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
@@ -257,7 +257,7 @@ public class NullTserver {
 
     TransactionWatcher watcher = new TransactionWatcher();
     ThriftClientHandler tch = new ThriftClientHandler(new AccumuloServerContext(new ServerConfigurationFactory(HdfsZooInstance.getInstance())), watcher);
-    Processor<Iface> processor = new Processor<Iface>(tch);
+    Processor<Iface> processor = new Processor<>(tch);
     TServerUtils.startTServer(context.getConfiguration(), ThriftServerType.CUSTOM_HS_HA, processor, "NullTServer",
         "null tserver", 2, 1, 1000, 10 * 1024 * 1024, null, null, -1, HostAndPort.fromParts("0.0.0.0", opts.port));
 


[29/32] accumulo git commit: ACCUMULO-4357 Remove unneeded code for readability

Posted by ct...@apache.org.
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsHelper.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsHelper.java b/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsHelper.java
index 4068dee..a81241a 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsHelper.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsHelper.java
@@ -59,7 +59,7 @@ public abstract class TableOperationsHelper implements TableOperations {
   @Override
   public void removeIterator(String tableName, String name, EnumSet<IteratorScope> scopes) throws AccumuloSecurityException, AccumuloException,
       TableNotFoundException {
-    Map<String,String> copy = new TreeMap<String,String>();
+    Map<String,String> copy = new TreeMap<>();
     for (Entry<String,String> property : this.getProperties(tableName)) {
       copy.put(property.getKey(), property.getValue());
     }
@@ -80,7 +80,7 @@ public abstract class TableOperationsHelper implements TableOperations {
     checkArgument(scope != null, "scope is null");
     int priority = -1;
     String classname = null;
-    Map<String,String> settings = new HashMap<String,String>();
+    Map<String,String> settings = new HashMap<>();
 
     String root = String.format("%s%s.%s", Property.TABLE_ITERATOR_PREFIX, scope.name().toLowerCase(), name);
     String opt = root + ".opt.";
@@ -104,7 +104,7 @@ public abstract class TableOperationsHelper implements TableOperations {
 
   @Override
   public Map<String,EnumSet<IteratorScope>> listIterators(String tableName) throws AccumuloSecurityException, AccumuloException, TableNotFoundException {
-    Map<String,EnumSet<IteratorScope>> result = new TreeMap<String,EnumSet<IteratorScope>>();
+    Map<String,EnumSet<IteratorScope>> result = new TreeMap<>();
     for (Entry<String,String> property : this.getProperties(tableName)) {
       String name = property.getKey();
       String[] parts = name.split("\\.");
@@ -129,7 +129,7 @@ public abstract class TableOperationsHelper implements TableOperations {
       String scopeStr = String.format("%s%s", Property.TABLE_ITERATOR_PREFIX, scope.name().toLowerCase());
       String nameStr = String.format("%s.%s", scopeStr, setting.getName());
       String optStr = String.format("%s.opt.", nameStr);
-      Map<String,String> optionConflicts = new TreeMap<String,String>();
+      Map<String,String> optionConflicts = new TreeMap<>();
       for (Entry<String,String> property : this.getProperties(tableName)) {
         if (property.getKey().startsWith(scopeStr)) {
           if (property.getKey().equals(nameStr))
@@ -157,8 +157,8 @@ public abstract class TableOperationsHelper implements TableOperations {
 
   @Override
   public int addConstraint(String tableName, String constraintClassName) throws AccumuloException, AccumuloSecurityException, TableNotFoundException {
-    TreeSet<Integer> constraintNumbers = new TreeSet<Integer>();
-    TreeMap<String,Integer> constraintClasses = new TreeMap<String,Integer>();
+    TreeSet<Integer> constraintNumbers = new TreeSet<>();
+    TreeMap<String,Integer> constraintClasses = new TreeMap<>();
     int i;
     for (Entry<String,String> property : this.getProperties(tableName)) {
       if (property.getKey().startsWith(Property.TABLE_CONSTRAINT_PREFIX.toString())) {
@@ -188,7 +188,7 @@ public abstract class TableOperationsHelper implements TableOperations {
 
   @Override
   public Map<String,Integer> listConstraints(String tableName) throws AccumuloException, TableNotFoundException {
-    Map<String,Integer> constraints = new TreeMap<String,Integer>();
+    Map<String,Integer> constraints = new TreeMap<>();
     for (Entry<String,String> property : this.getProperties(tableName)) {
       if (property.getKey().startsWith(Property.TABLE_CONSTRAINT_PREFIX.toString())) {
         if (constraints.containsKey(property.getValue()))

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java b/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java
index 1940a26..3d17a85 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java
@@ -148,7 +148,7 @@ public class TableOperationsImpl extends TableOperationsHelper {
       timer = new OpTimer().start();
     }
 
-    TreeSet<String> tableNames = new TreeSet<String>(Tables.getNameToIdMap(context.getInstance()).keySet());
+    TreeSet<String> tableNames = new TreeSet<>(Tables.getNameToIdMap(context.getInstance()).keySet());
 
     if (timer != null) {
       timer.stop();
@@ -378,7 +378,7 @@ public class TableOperationsImpl extends TableOperationsHelper {
           return;
 
         if (splits.size() <= 2) {
-          addSplits(env.tableName, new TreeSet<Text>(splits), env.tableId);
+          addSplits(env.tableName, new TreeSet<>(splits), env.tableId);
           for (int i = 0; i < splits.size(); i++)
             env.latch.countDown();
           return;
@@ -388,7 +388,7 @@ public class TableOperationsImpl extends TableOperationsHelper {
 
         // split the middle split point to ensure that child task split different tablets and can therefore
         // run in parallel
-        addSplits(env.tableName, new TreeSet<Text>(splits.subList(mid, mid + 1)), env.tableId);
+        addSplits(env.tableName, new TreeSet<>(splits.subList(mid, mid + 1)), env.tableId);
         env.latch.countDown();
 
         env.executor.submit(new SplitTask(env, splits.subList(0, mid)));
@@ -405,13 +405,13 @@ public class TableOperationsImpl extends TableOperationsHelper {
   public void addSplits(String tableName, SortedSet<Text> partitionKeys) throws TableNotFoundException, AccumuloException, AccumuloSecurityException {
     String tableId = Tables.getTableId(context.getInstance(), tableName);
 
-    List<Text> splits = new ArrayList<Text>(partitionKeys);
+    List<Text> splits = new ArrayList<>(partitionKeys);
     // should be sorted because we copied from a sorted set, but that makes assumptions about
     // how the copy was done so resort to be sure.
     Collections.sort(splits);
 
     CountDownLatch latch = new CountDownLatch(splits.size());
-    AtomicReference<Exception> exception = new AtomicReference<Exception>(null);
+    AtomicReference<Exception> exception = new AtomicReference<>(null);
 
     ExecutorService executor = Executors.newFixedThreadPool(16, new NamingThreadFactory("addSplits"));
     try {
@@ -529,7 +529,7 @@ public class TableOperationsImpl extends TableOperationsHelper {
     ByteBuffer EMPTY = ByteBuffer.allocate(0);
     List<ByteBuffer> args = Arrays.asList(ByteBuffer.wrap(tableName.getBytes(UTF_8)), start == null ? EMPTY : TextUtil.getByteBuffer(start),
         end == null ? EMPTY : TextUtil.getByteBuffer(end));
-    Map<String,String> opts = new HashMap<String,String>();
+    Map<String,String> opts = new HashMap<>();
     try {
       doTableFateOperation(tableName, TableNotFoundException.class, FateOperation.TABLE_MERGE, args, opts);
     } catch (TableExistsException e) {
@@ -545,7 +545,7 @@ public class TableOperationsImpl extends TableOperationsHelper {
     ByteBuffer EMPTY = ByteBuffer.allocate(0);
     List<ByteBuffer> args = Arrays.asList(ByteBuffer.wrap(tableName.getBytes(UTF_8)), start == null ? EMPTY : TextUtil.getByteBuffer(start),
         end == null ? EMPTY : TextUtil.getByteBuffer(end));
-    Map<String,String> opts = new HashMap<String,String>();
+    Map<String,String> opts = new HashMap<>();
     try {
       doTableFateOperation(tableName, TableNotFoundException.class, FateOperation.TABLE_DELETE_RANGE, args, opts);
     } catch (TableExistsException e) {
@@ -561,7 +561,7 @@ public class TableOperationsImpl extends TableOperationsHelper {
 
     String tableId = Tables.getTableId(context.getInstance(), tableName);
 
-    TreeMap<KeyExtent,String> tabletLocations = new TreeMap<KeyExtent,String>();
+    TreeMap<KeyExtent,String> tabletLocations = new TreeMap<>();
 
     while (true) {
       try {
@@ -585,7 +585,7 @@ public class TableOperationsImpl extends TableOperationsHelper {
       }
     }
 
-    ArrayList<Text> endRows = new ArrayList<Text>(tabletLocations.size());
+    ArrayList<Text> endRows = new ArrayList<>(tabletLocations.size());
 
     for (KeyExtent ke : tabletLocations.keySet())
       if (ke.getEndRow() != null)
@@ -614,7 +614,7 @@ public class TableOperationsImpl extends TableOperationsHelper {
     double r = (maxSplits + 1) / (double) (endRows.size());
     double pos = 0;
 
-    ArrayList<Text> subset = new ArrayList<Text>(maxSplits);
+    ArrayList<Text> subset = new ArrayList<>(maxSplits);
 
     int j = 0;
     for (int i = 0; i < endRows.size() && j < maxSplits; i++) {
@@ -644,7 +644,7 @@ public class TableOperationsImpl extends TableOperationsHelper {
     checkArgument(tableName != null, "tableName is null");
 
     List<ByteBuffer> args = Arrays.asList(ByteBuffer.wrap(tableName.getBytes(UTF_8)));
-    Map<String,String> opts = new HashMap<String,String>();
+    Map<String,String> opts = new HashMap<>();
 
     try {
       doTableFateOperation(tableName, TableNotFoundException.class, FateOperation.TABLE_DELETE, args, opts);
@@ -674,7 +674,7 @@ public class TableOperationsImpl extends TableOperationsHelper {
       propertiesToSet = Collections.emptyMap();
 
     List<ByteBuffer> args = Arrays.asList(ByteBuffer.wrap(srcTableId.getBytes(UTF_8)), ByteBuffer.wrap(newTableName.getBytes(UTF_8)));
-    Map<String,String> opts = new HashMap<String,String>();
+    Map<String,String> opts = new HashMap<>();
     for (Entry<String,String> entry : propertiesToSet.entrySet()) {
       if (entry.getKey().startsWith(CLONE_EXCLUDE_PREFIX))
         throw new IllegalArgumentException("Property can not start with " + CLONE_EXCLUDE_PREFIX);
@@ -693,7 +693,7 @@ public class TableOperationsImpl extends TableOperationsHelper {
       TableExistsException {
 
     List<ByteBuffer> args = Arrays.asList(ByteBuffer.wrap(oldTableName.getBytes(UTF_8)), ByteBuffer.wrap(newTableName.getBytes(UTF_8)));
-    Map<String,String> opts = new HashMap<String,String>();
+    Map<String,String> opts = new HashMap<>();
     doTableFateOperation(oldTableName, TableNotFoundException.class, FateOperation.TABLE_RENAME, args, opts);
   }
 
@@ -761,7 +761,7 @@ public class TableOperationsImpl extends TableOperationsHelper {
         : TextUtil.getByteBuffer(end), ByteBuffer.wrap(IteratorUtil.encodeIteratorSettings(config.getIterators())), ByteBuffer
         .wrap(CompactionStrategyConfigUtil.encode(config.getCompactionStrategy())));
 
-    Map<String,String> opts = new HashMap<String,String>();
+    Map<String,String> opts = new HashMap<>();
     try {
       doFateOperation(FateOperation.TABLE_COMPACT, args, opts, tableName, config.getWait());
     } catch (TableExistsException e) {
@@ -781,7 +781,7 @@ public class TableOperationsImpl extends TableOperationsHelper {
 
     List<ByteBuffer> args = Arrays.asList(ByteBuffer.wrap(tableId.getBytes(UTF_8)));
 
-    Map<String,String> opts = new HashMap<String,String>();
+    Map<String,String> opts = new HashMap<>();
     try {
       doTableFateOperation(tableName, TableNotFoundException.class, FateOperation.TABLE_CANCEL_COMPACT, args, opts);
     } catch (TableExistsException e) {
@@ -910,7 +910,7 @@ public class TableOperationsImpl extends TableOperationsHelper {
   @Override
   public void setLocalityGroups(String tableName, Map<String,Set<Text>> groups) throws AccumuloException, AccumuloSecurityException, TableNotFoundException {
     // ensure locality groups do not overlap
-    HashSet<Text> all = new HashSet<Text>();
+    HashSet<Text> all = new HashSet<>();
     for (Entry<String,Set<Text>> entry : groups.entrySet()) {
 
       if (!Collections.disjoint(all, entry.getValue())) {
@@ -956,10 +956,10 @@ public class TableOperationsImpl extends TableOperationsHelper {
     AccumuloConfiguration conf = new ConfigurationCopy(this.getProperties(tableName));
     Map<String,Set<ByteSequence>> groups = LocalityGroupUtil.getLocalityGroups(conf);
 
-    Map<String,Set<Text>> groups2 = new HashMap<String,Set<Text>>();
+    Map<String,Set<Text>> groups2 = new HashMap<>();
     for (Entry<String,Set<ByteSequence>> entry : groups.entrySet()) {
 
-      HashSet<Text> colFams = new HashSet<Text>();
+      HashSet<Text> colFams = new HashSet<>();
 
       for (ByteSequence bs : entry.getValue()) {
         colFams.add(new Text(bs.toArray()));
@@ -982,7 +982,7 @@ public class TableOperationsImpl extends TableOperationsHelper {
       return Collections.singleton(range);
 
     Random random = new Random();
-    Map<String,Map<KeyExtent,List<Range>>> binnedRanges = new HashMap<String,Map<KeyExtent,List<Range>>>();
+    Map<String,Map<KeyExtent,List<Range>>> binnedRanges = new HashMap<>();
     String tableId = Tables.getTableId(context.getInstance(), tableName);
     TabletLocator tl = TabletLocator.getLocator(context, tableId);
     // its possible that the cache could contain complete, but old information about a tables tablets... so clear it
@@ -1001,8 +1001,8 @@ public class TableOperationsImpl extends TableOperationsHelper {
     }
 
     // group key extents to get <= maxSplits
-    LinkedList<KeyExtent> unmergedExtents = new LinkedList<KeyExtent>();
-    List<KeyExtent> mergedExtents = new ArrayList<KeyExtent>();
+    LinkedList<KeyExtent> unmergedExtents = new LinkedList<>();
+    List<KeyExtent> mergedExtents = new ArrayList<>();
 
     for (Map<KeyExtent,List<Range>> map : binnedRanges.values())
       unmergedExtents.addAll(map.keySet());
@@ -1027,7 +1027,7 @@ public class TableOperationsImpl extends TableOperationsHelper {
 
     mergedExtents.addAll(unmergedExtents);
 
-    Set<Range> ranges = new HashSet<Range>();
+    Set<Range> ranges = new HashSet<>();
     for (KeyExtent k : mergedExtents)
       ranges.add(k.toDataRange().clip(range));
 
@@ -1079,7 +1079,7 @@ public class TableOperationsImpl extends TableOperationsHelper {
 
     List<ByteBuffer> args = Arrays.asList(ByteBuffer.wrap(tableName.getBytes(UTF_8)), ByteBuffer.wrap(dirPath.toString().getBytes(UTF_8)),
         ByteBuffer.wrap(failPath.toString().getBytes(UTF_8)), ByteBuffer.wrap((setTime + "").getBytes(UTF_8)));
-    Map<String,String> opts = new HashMap<String,String>();
+    Map<String,String> opts = new HashMap<>();
 
     try {
       doTableFateOperation(tableName, TableNotFoundException.class, FateOperation.TABLE_BULK_IMPORT, args, opts);
@@ -1126,7 +1126,7 @@ public class TableOperationsImpl extends TableOperationsHelper {
       int waitFor = 0;
       int holes = 0;
       Text continueRow = null;
-      MapCounter<String> serverCounts = new MapCounter<String>();
+      MapCounter<String> serverCounts = new MapCounter<>();
 
       while (rowIter.hasNext()) {
         Iterator<Entry<Key,Value>> row = rowIter.next();
@@ -1225,7 +1225,7 @@ public class TableOperationsImpl extends TableOperationsHelper {
     checkArgument(tableName != null, "tableName is null");
     String tableId = Tables.getTableId(context.getInstance(), tableName);
     List<ByteBuffer> args = Arrays.asList(ByteBuffer.wrap(tableId.getBytes(UTF_8)));
-    Map<String,String> opts = new HashMap<String,String>();
+    Map<String,String> opts = new HashMap<>();
 
     try {
       doTableFateOperation(tableName, TableNotFoundException.class, FateOperation.TABLE_OFFLINE, args, opts);
@@ -1248,7 +1248,7 @@ public class TableOperationsImpl extends TableOperationsHelper {
     checkArgument(tableName != null, "tableName is null");
     String tableId = Tables.getTableId(context.getInstance(), tableName);
     List<ByteBuffer> args = Arrays.asList(ByteBuffer.wrap(tableId.getBytes(UTF_8)));
-    Map<String,String> opts = new HashMap<String,String>();
+    Map<String,String> opts = new HashMap<>();
 
     try {
       doTableFateOperation(tableName, TableNotFoundException.class, FateOperation.TABLE_ONLINE, args, opts);
@@ -1322,16 +1322,16 @@ public class TableOperationsImpl extends TableOperationsHelper {
       }
     }
 
-    List<DiskUsage> finalUsages = new ArrayList<DiskUsage>();
+    List<DiskUsage> finalUsages = new ArrayList<>();
     for (TDiskUsage diskUsage : diskUsages) {
-      finalUsages.add(new DiskUsage(new TreeSet<String>(diskUsage.getTables()), diskUsage.getUsage()));
+      finalUsages.add(new DiskUsage(new TreeSet<>(diskUsage.getTables()), diskUsage.getUsage()));
     }
 
     return finalUsages;
   }
 
   public static Map<String,String> getExportedProps(FileSystem fs, Path path) throws IOException {
-    HashMap<String,String> props = new HashMap<String,String>();
+    HashMap<String,String> props = new HashMap<>();
 
     ZipInputStream zis = new ZipInputStream(fs.open(path));
     try {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/impl/Tables.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/Tables.java b/core/src/main/java/org/apache/accumulo/core/client/impl/Tables.java
index cf388bf..9f869ff 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/Tables.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/Tables.java
@@ -60,8 +60,8 @@ public class Tables {
     ZooCache zc = getZooCache(instance);
 
     List<String> tableIds = zc.getChildren(ZooUtil.getRoot(instance) + Constants.ZTABLES);
-    TreeMap<String,String> tableMap = new TreeMap<String,String>();
-    Map<String,String> namespaceIdToNameMap = new HashMap<String,String>();
+    TreeMap<String,String> tableMap = new TreeMap<>();
+    Map<String,String> namespaceIdToNameMap = new HashMap<>();
 
     for (String tableId : tableIds) {
       byte[] tableName = zc.get(ZooUtil.getRoot(instance) + Constants.ZTABLES + "/" + tableId + Constants.ZTABLE_NAME);
@@ -211,9 +211,9 @@ public class Tables {
       tableName = MetadataTable.NAME;
     if (tableName.contains(".")) {
       String[] s = tableName.split("\\.", 2);
-      return new Pair<String,String>(s[0], s[1]);
+      return new Pair<>(s[0], s[1]);
     }
-    return new Pair<String,String>(defaultNamespace, tableName);
+    return new Pair<>(defaultNamespace, tableName);
   }
 
   /**

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/impl/TabletLocator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/TabletLocator.java b/core/src/main/java/org/apache/accumulo/core/client/impl/TabletLocator.java
index 6054c19..9229643 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/TabletLocator.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/TabletLocator.java
@@ -99,7 +99,7 @@ public abstract class TabletLocator {
 
   }
 
-  private static HashMap<LocatorKey,TabletLocator> locators = new HashMap<LocatorKey,TabletLocator>();
+  private static HashMap<LocatorKey,TabletLocator> locators = new HashMap<>();
 
   public static synchronized void clearLocators() {
     for (TabletLocator locator : locators.values()) {
@@ -148,7 +148,7 @@ public abstract class TabletLocator {
   }
 
   public static class TabletLocation implements Comparable<TabletLocation> {
-    private static final WeakHashMap<String,WeakReference<String>> tabletLocs = new WeakHashMap<String,WeakReference<String>>();
+    private static final WeakHashMap<String,WeakReference<String>> tabletLocs = new WeakHashMap<>();
 
     private static String dedupeLocation(String tabletLoc) {
       synchronized (tabletLocs) {
@@ -160,7 +160,7 @@ public abstract class TabletLocator {
           }
         }
 
-        tabletLocs.put(tabletLoc, new WeakReference<String>(tabletLoc));
+        tabletLocs.put(tabletLoc, new WeakReference<>(tabletLoc));
         return tabletLoc;
       }
     }
@@ -215,13 +215,13 @@ public abstract class TabletLocator {
 
     public TabletServerMutations(String tserverSession) {
       this.tserverSession = tserverSession;
-      this.mutations = new HashMap<KeyExtent,List<T>>();
+      this.mutations = new HashMap<>();
     }
 
     public void addMutation(KeyExtent ke, T m) {
       List<T> mutList = mutations.get(ke);
       if (mutList == null) {
-        mutList = new ArrayList<T>();
+        mutList = new ArrayList<>();
         mutations.put(ke, mutList);
       }
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/impl/TabletLocatorImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/TabletLocatorImpl.java b/core/src/main/java/org/apache/accumulo/core/client/impl/TabletLocatorImpl.java
index 1422b0c..5932fda 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/TabletLocatorImpl.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/TabletLocatorImpl.java
@@ -90,12 +90,12 @@ public class TabletLocatorImpl extends TabletLocator {
 
   protected String tableId;
   protected TabletLocator parent;
-  protected TreeMap<Text,TabletLocation> metaCache = new TreeMap<Text,TabletLocation>(endRowComparator);
+  protected TreeMap<Text,TabletLocation> metaCache = new TreeMap<>(endRowComparator);
   protected TabletLocationObtainer locationObtainer;
   private TabletServerLockChecker lockChecker;
   protected Text lastTabletRow;
 
-  private TreeSet<KeyExtent> badExtents = new TreeSet<KeyExtent>();
+  private TreeSet<KeyExtent> badExtents = new TreeSet<>();
   private ReentrantReadWriteLock rwLock = new ReentrantReadWriteLock();
   private final Lock rLock = rwLock.readLock();
   private final Lock wLock = rwLock.writeLock();
@@ -119,8 +119,8 @@ public class TabletLocatorImpl extends TabletLocator {
 
   private class LockCheckerSession {
 
-    private HashSet<Pair<String,String>> okLocks = new HashSet<Pair<String,String>>();
-    private HashSet<Pair<String,String>> invalidLocks = new HashSet<Pair<String,String>>();
+    private HashSet<Pair<String,String>> okLocks = new HashSet<>();
+    private HashSet<Pair<String,String>> invalidLocks = new HashSet<>();
 
     private TabletLocation checkLock(TabletLocation tl) {
       // the goal of this class is to minimize calls out to lockChecker under that assumption that its a resource synchronized among many threads... want to
@@ -130,7 +130,7 @@ public class TabletLocatorImpl extends TabletLocator {
       if (tl == null)
         return null;
 
-      Pair<String,String> lock = new Pair<String,String>(tl.tablet_location, tl.tablet_session);
+      Pair<String,String> lock = new Pair<>(tl.tablet_location, tl.tablet_session);
 
       if (okLocks.contains(lock))
         return tl;
@@ -173,7 +173,7 @@ public class TabletLocatorImpl extends TabletLocator {
       timer = new OpTimer().start();
     }
 
-    ArrayList<T> notInCache = new ArrayList<T>();
+    ArrayList<T> notInCache = new ArrayList<>();
     Text row = new Text();
 
     LockCheckerSession lcSession = new LockCheckerSession();
@@ -247,7 +247,7 @@ public class TabletLocatorImpl extends TabletLocator {
       // do lock check once per tserver here to make binning faster
       boolean lockHeld = lcSession.checkLock(tl) != null;
       if (lockHeld) {
-        tsm = new TabletServerMutations<T>(tl.tablet_session);
+        tsm = new TabletServerMutations<>(tl.tablet_session);
         binnedMutations.put(tl.tablet_location, tsm);
       } else {
         return false;
@@ -265,8 +265,8 @@ public class TabletLocatorImpl extends TabletLocator {
 
   private List<Range> binRanges(ClientContext context, List<Range> ranges, Map<String,Map<KeyExtent,List<Range>>> binnedRanges, boolean useCache,
       LockCheckerSession lcSession) throws AccumuloException, AccumuloSecurityException, TableNotFoundException {
-    List<Range> failures = new ArrayList<Range>();
-    List<TabletLocation> tabletLocations = new ArrayList<TabletLocation>();
+    List<Range> failures = new ArrayList<>();
+    List<TabletLocation> tabletLocations = new ArrayList<>();
 
     boolean lookupFailed = false;
 
@@ -676,7 +676,7 @@ public class TabletLocatorImpl extends TabletLocator {
           return;
       }
 
-      List<Range> lookups = new ArrayList<Range>(badExtents.size());
+      List<Range> lookups = new ArrayList<>(badExtents.size());
 
       for (KeyExtent be : badExtents) {
         lookups.add(be.toMetadataRange());
@@ -685,12 +685,12 @@ public class TabletLocatorImpl extends TabletLocator {
 
       lookups = Range.mergeOverlapping(lookups);
 
-      Map<String,Map<KeyExtent,List<Range>>> binnedRanges = new HashMap<String,Map<KeyExtent,List<Range>>>();
+      Map<String,Map<KeyExtent,List<Range>>> binnedRanges = new HashMap<>();
 
       parent.binRanges(context, lookups, binnedRanges);
 
       // randomize server order
-      ArrayList<String> tabletServers = new ArrayList<String>(binnedRanges.keySet());
+      ArrayList<String> tabletServers = new ArrayList<>(binnedRanges.keySet());
       Collections.shuffle(tabletServers);
 
       for (String tserver : tabletServers) {
@@ -711,13 +711,13 @@ public class TabletLocatorImpl extends TabletLocator {
   protected static void addRange(Map<String,Map<KeyExtent,List<Range>>> binnedRanges, String location, KeyExtent ke, Range range) {
     Map<KeyExtent,List<Range>> tablets = binnedRanges.get(location);
     if (tablets == null) {
-      tablets = new HashMap<KeyExtent,List<Range>>();
+      tablets = new HashMap<>();
       binnedRanges.put(location, tablets);
     }
 
     List<Range> tabletsRanges = tablets.get(ke);
     if (tabletsRanges == null) {
-      tabletsRanges = new ArrayList<Range>();
+      tabletsRanges = new ArrayList<>();
       tablets.put(ke, tabletsRanges);
     }
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReader.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReader.java b/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReader.java
index ce28f8b..0d4909b 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReader.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReader.java
@@ -98,7 +98,7 @@ public class TabletServerBatchReader extends ScannerOptions implements BatchScan
       throw new IllegalStateException("batch reader closed");
     }
 
-    this.ranges = new ArrayList<Range>(ranges);
+    this.ranges = new ArrayList<>(ranges);
 
   }
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java b/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java
index baeb2c9..8796d3c 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java
@@ -90,7 +90,7 @@ public class TabletServerBatchReaderIterator implements Iterator<Entry<Key,Value
   private ArrayBlockingQueue<List<Entry<Key,Value>>> resultsQueue;
   private Iterator<Entry<Key,Value>> batchIterator;
   private List<Entry<Key,Value>> batch;
-  private static final List<Entry<Key,Value>> LAST_BATCH = new ArrayList<Map.Entry<Key,Value>>();
+  private static final List<Entry<Key,Value>> LAST_BATCH = new ArrayList<>();
   private final Object nextLock = new Object();
 
   private long failSleepTime = 100;
@@ -117,7 +117,7 @@ public class TabletServerBatchReaderIterator implements Iterator<Entry<Key,Value
     this.numThreads = numThreads;
     this.queryThreadPool = queryThreadPool;
     this.options = new ScannerOptions(scannerOptions);
-    resultsQueue = new ArrayBlockingQueue<List<Entry<Key,Value>>>(numThreads);
+    resultsQueue = new ArrayBlockingQueue<>(numThreads);
 
     this.locator = new TimeoutTabletLocator(timeout, context, tableId);
 
@@ -126,7 +126,7 @@ public class TabletServerBatchReaderIterator implements Iterator<Entry<Key,Value
     this.timeout = timeout;
 
     if (options.fetchedColumns.size() > 0) {
-      ArrayList<Range> ranges2 = new ArrayList<Range>(ranges.size());
+      ArrayList<Range> ranges2 = new ArrayList<>(ranges.size());
       for (Range range : ranges) {
         ranges2.add(range.bound(options.fetchedColumns.first(), options.fetchedColumns.last()));
       }
@@ -215,10 +215,10 @@ public class TabletServerBatchReaderIterator implements Iterator<Entry<Key,Value
   }
 
   private synchronized void lookup(List<Range> ranges, ResultReceiver receiver) throws AccumuloException, AccumuloSecurityException, TableNotFoundException {
-    List<Column> columns = new ArrayList<Column>(options.fetchedColumns);
+    List<Column> columns = new ArrayList<>(options.fetchedColumns);
     ranges = Range.mergeOverlapping(ranges);
 
-    Map<String,Map<KeyExtent,List<Range>>> binnedRanges = new HashMap<String,Map<KeyExtent,List<Range>>>();
+    Map<String,Map<KeyExtent,List<Range>>> binnedRanges = new HashMap<>();
 
     binRanges(locator, ranges, binnedRanges);
 
@@ -264,13 +264,13 @@ public class TabletServerBatchReaderIterator implements Iterator<Entry<Key,Value
 
     // truncate the ranges to within the tablets... this makes it easier to know what work
     // needs to be redone when failures occurs and tablets have merged or split
-    Map<String,Map<KeyExtent,List<Range>>> binnedRanges2 = new HashMap<String,Map<KeyExtent,List<Range>>>();
+    Map<String,Map<KeyExtent,List<Range>>> binnedRanges2 = new HashMap<>();
     for (Entry<String,Map<KeyExtent,List<Range>>> entry : binnedRanges.entrySet()) {
-      Map<KeyExtent,List<Range>> tabletMap = new HashMap<KeyExtent,List<Range>>();
+      Map<KeyExtent,List<Range>> tabletMap = new HashMap<>();
       binnedRanges2.put(entry.getKey(), tabletMap);
       for (Entry<KeyExtent,List<Range>> tabletRanges : entry.getValue().entrySet()) {
         Range tabletRange = tabletRanges.getKey().toDataRange();
-        List<Range> clippedRanges = new ArrayList<Range>();
+        List<Range> clippedRanges = new ArrayList<>();
         tabletMap.put(tabletRanges.getKey(), clippedRanges);
         for (Range range : tabletRanges.getValue())
           clippedRanges.add(tabletRange.clip(range));
@@ -298,8 +298,8 @@ public class TabletServerBatchReaderIterator implements Iterator<Entry<Key,Value
 
     failSleepTime = Math.min(5000, failSleepTime * 2);
 
-    Map<String,Map<KeyExtent,List<Range>>> binnedRanges = new HashMap<String,Map<KeyExtent,List<Range>>>();
-    List<Range> allRanges = new ArrayList<Range>();
+    Map<String,Map<KeyExtent,List<Range>>> binnedRanges = new HashMap<>();
+    List<Range> allRanges = new ArrayList<>();
 
     for (List<Range> ranges : failures.values())
       allRanges.addAll(ranges);
@@ -342,8 +342,8 @@ public class TabletServerBatchReaderIterator implements Iterator<Entry<Key,Value
     public void run() {
       String threadName = Thread.currentThread().getName();
       Thread.currentThread().setName(threadName + " looking up " + tabletsRanges.size() + " ranges at " + tsLocation);
-      Map<KeyExtent,List<Range>> unscanned = new HashMap<KeyExtent,List<Range>>();
-      Map<KeyExtent,List<Range>> tsFailures = new HashMap<KeyExtent,List<Range>>();
+      Map<KeyExtent,List<Range>> unscanned = new HashMap<>();
+      Map<KeyExtent,List<Range>> tsFailures = new HashMap<>();
       try {
         TimeoutTracker timeoutTracker = timeoutTrackers.get(tsLocation);
         if (timeoutTracker == null) {
@@ -462,7 +462,7 @@ public class TabletServerBatchReaderIterator implements Iterator<Entry<Key,Value
 
     }
 
-    Map<KeyExtent,List<Range>> failures = new HashMap<KeyExtent,List<Range>>();
+    Map<KeyExtent,List<Range>> failures = new HashMap<>();
 
     if (timedoutServers.size() > 0) {
       // go ahead and fail any timed out servers
@@ -477,10 +477,10 @@ public class TabletServerBatchReaderIterator implements Iterator<Entry<Key,Value
 
     // randomize tabletserver order... this will help when there are multiple
     // batch readers and writers running against accumulo
-    List<String> locations = new ArrayList<String>(binnedRanges.keySet());
+    List<String> locations = new ArrayList<>(binnedRanges.keySet());
     Collections.shuffle(locations);
 
-    List<QueryTask> queryTasks = new ArrayList<QueryTask>();
+    List<QueryTask> queryTasks = new ArrayList<>();
 
     for (final String tsLocation : locations) {
 
@@ -489,13 +489,13 @@ public class TabletServerBatchReaderIterator implements Iterator<Entry<Key,Value
         QueryTask queryTask = new QueryTask(tsLocation, tabletsRanges, failures, receiver, columns);
         queryTasks.add(queryTask);
       } else {
-        HashMap<KeyExtent,List<Range>> tabletSubset = new HashMap<KeyExtent,List<Range>>();
+        HashMap<KeyExtent,List<Range>> tabletSubset = new HashMap<>();
         for (Entry<KeyExtent,List<Range>> entry : tabletsRanges.entrySet()) {
           tabletSubset.put(entry.getKey(), entry.getValue());
           if (tabletSubset.size() >= maxTabletsPerRequest) {
             QueryTask queryTask = new QueryTask(tsLocation, tabletSubset, failures, receiver, columns);
             queryTasks.add(queryTask);
-            tabletSubset = new HashMap<KeyExtent,List<Range>>();
+            tabletSubset = new HashMap<>();
           }
         }
 
@@ -518,13 +518,12 @@ public class TabletServerBatchReaderIterator implements Iterator<Entry<Key,Value
   static void trackScanning(Map<KeyExtent,List<Range>> failures, Map<KeyExtent,List<Range>> unscanned, MultiScanResult scanResult) {
 
     // translate returned failures, remove them from unscanned, and add them to failures
-    Map<KeyExtent,List<Range>> retFailures = Translator.translate(scanResult.failures, Translators.TKET, new Translator.ListTranslator<TRange,Range>(
-        Translators.TRT));
+    Map<KeyExtent,List<Range>> retFailures = Translator.translate(scanResult.failures, Translators.TKET, new Translator.ListTranslator<>(Translators.TRT));
     unscanned.keySet().removeAll(retFailures.keySet());
     failures.putAll(retFailures);
 
     // translate full scans and remove them from unscanned
-    HashSet<KeyExtent> fullScans = new HashSet<KeyExtent>(Translator.translate(scanResult.fullScans, Translators.TKET));
+    HashSet<KeyExtent> fullScans = new HashSet<>(Translator.translate(scanResult.fullScans, Translators.TKET));
     unscanned.keySet().removeAll(fullScans);
 
     // remove partial scan from unscanned
@@ -612,7 +611,7 @@ public class TabletServerBatchReaderIterator implements Iterator<Entry<Key,Value
 
     // copy requested to unscanned map. we will remove ranges as they are scanned in trackScanning()
     for (Entry<KeyExtent,List<Range>> entry : requested.entrySet()) {
-      ArrayList<Range> ranges = new ArrayList<Range>();
+      ArrayList<Range> ranges = new ArrayList<>();
       for (Range range : entry.getValue()) {
         ranges.add(new Range(range));
       }
@@ -643,8 +642,7 @@ public class TabletServerBatchReaderIterator implements Iterator<Entry<Key,Value
         TabletType ttype = TabletType.type(requested.keySet());
         boolean waitForWrites = !ThriftScanner.serversWaitedForWrites.get(ttype).contains(server);
 
-        Map<TKeyExtent,List<TRange>> thriftTabletRanges = Translator.translate(requested, Translators.KET, new Translator.ListTranslator<Range,TRange>(
-            Translators.RT));
+        Map<TKeyExtent,List<TRange>> thriftTabletRanges = Translator.translate(requested, Translators.KET, new Translator.ListTranslator<>(Translators.RT));
         InitialMultiScan imsr = client.startMultiScan(Tracer.traceInfo(), context.rpcCreds(), thriftTabletRanges,
             Translator.translate(columns, Translators.CT), options.serverSideIteratorList, options.serverSideIteratorOptions,
             ByteBufferUtil.toByteBuffers(authorizations.getAuthorizations()), waitForWrites,
@@ -660,9 +658,9 @@ public class TabletServerBatchReaderIterator implements Iterator<Entry<Key,Value
               (scanResult.more ? "scanID=" + imsr.scanID : ""), String.format("%.3f secs", timer.scale(TimeUnit.SECONDS)));
         }
 
-        ArrayList<Entry<Key,Value>> entries = new ArrayList<Map.Entry<Key,Value>>(scanResult.results.size());
+        ArrayList<Entry<Key,Value>> entries = new ArrayList<>(scanResult.results.size());
         for (TKeyValue kv : scanResult.results) {
-          entries.add(new SimpleImmutableEntry<Key,Value>(new Key(kv.key), new Value(kv.value)));
+          entries.add(new SimpleImmutableEntry<>(new Key(kv.key), new Value(kv.value)));
         }
 
         if (entries.size() > 0)
@@ -692,9 +690,9 @@ public class TabletServerBatchReaderIterator implements Iterator<Entry<Key,Value
                 scanResult.results.size(), (scanResult.more ? " scanID=" + imsr.scanID : ""), String.format("%.3f secs", timer.scale(TimeUnit.SECONDS)));
           }
 
-          entries = new ArrayList<Map.Entry<Key,Value>>(scanResult.results.size());
+          entries = new ArrayList<>(scanResult.results.size());
           for (TKeyValue kv : scanResult.results) {
-            entries.add(new SimpleImmutableEntry<Key,Value>(new Key(kv.key), new Value(kv.value)));
+            entries.add(new SimpleImmutableEntry<>(new Key(kv.key), new Value(kv.value)));
           }
 
           if (entries.size() > 0)

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java b/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java
index 92f90a3..4df2db6 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java
@@ -150,8 +150,8 @@ public class TabletServerBatchWriter {
 
   // error handling
   private final Violations violations = new Violations();
-  private final Map<KeyExtent,Set<SecurityErrorCode>> authorizationFailures = new HashMap<KeyExtent,Set<SecurityErrorCode>>();
-  private final HashSet<String> serverSideErrors = new HashSet<String>();
+  private final Map<KeyExtent,Set<SecurityErrorCode>> authorizationFailures = new HashMap<>();
+  private final HashSet<String> serverSideErrors = new HashSet<>();
   private final FailedMutations failedMutations = new FailedMutations();
   private int unknownErrors = 0;
   private boolean somethingFailed = false;
@@ -503,7 +503,7 @@ public class TabletServerBatchWriter {
   }
 
   private void updateAuthorizationFailures(Set<KeyExtent> keySet, SecurityErrorCode code) {
-    HashMap<KeyExtent,SecurityErrorCode> map = new HashMap<KeyExtent,SecurityErrorCode>();
+    HashMap<KeyExtent,SecurityErrorCode> map = new HashMap<>();
     for (KeyExtent ke : keySet)
       map.put(ke, code);
 
@@ -514,7 +514,7 @@ public class TabletServerBatchWriter {
     if (authorizationFailures.size() > 0) {
 
       // was a table deleted?
-      HashSet<String> tableIds = new HashSet<String>();
+      HashSet<String> tableIds = new HashSet<>();
       for (KeyExtent ke : authorizationFailures.keySet())
         tableIds.add(ke.getTableId());
 
@@ -535,7 +535,7 @@ public class TabletServerBatchWriter {
     for (Entry<KeyExtent,SecurityErrorCode> entry : addition.entrySet()) {
       Set<SecurityErrorCode> secs = source.get(entry.getKey());
       if (secs == null) {
-        secs = new HashSet<SecurityErrorCode>();
+        secs = new HashSet<>();
         source.put(entry.getKey(), secs);
       }
       secs.add(entry.getValue());
@@ -563,9 +563,9 @@ public class TabletServerBatchWriter {
   private void checkForFailures() throws MutationsRejectedException {
     if (somethingFailed) {
       List<ConstraintViolationSummary> cvsList = violations.asList();
-      HashMap<TabletId,Set<org.apache.accumulo.core.client.security.SecurityErrorCode>> af = new HashMap<TabletId,Set<org.apache.accumulo.core.client.security.SecurityErrorCode>>();
+      HashMap<TabletId,Set<org.apache.accumulo.core.client.security.SecurityErrorCode>> af = new HashMap<>();
       for (Entry<KeyExtent,Set<SecurityErrorCode>> entry : authorizationFailures.entrySet()) {
-        HashSet<org.apache.accumulo.core.client.security.SecurityErrorCode> codes = new HashSet<org.apache.accumulo.core.client.security.SecurityErrorCode>();
+        HashSet<org.apache.accumulo.core.client.security.SecurityErrorCode> codes = new HashSet<>();
 
         for (SecurityErrorCode sce : entry.getValue()) {
           codes.add(org.apache.accumulo.core.client.security.SecurityErrorCode.valueOf(sce.name()));
@@ -663,10 +663,10 @@ public class TabletServerBatchWriter {
     private final Map<String,TabletLocator> locators;
 
     public MutationWriter(int numSendThreads) {
-      serversMutations = new HashMap<String,TabletServerMutations<Mutation>>();
-      queued = new HashSet<String>();
+      serversMutations = new HashMap<>();
+      queued = new HashSet<>();
       sendThreadPool = new SimpleThreadPool(numSendThreads, this.getClass().getName());
-      locators = new HashMap<String,TabletLocator>();
+      locators = new HashMap<>();
       binningThreadPool = new SimpleThreadPool(1, "BinMutations", new SynchronousQueue<Runnable>());
       binningThreadPool.setRejectedExecutionHandler(new ThreadPoolExecutor.CallerRunsPolicy());
     }
@@ -693,7 +693,7 @@ public class TabletServerBatchWriter {
           List<Mutation> tableMutations = entry.getValue();
 
           if (tableMutations != null) {
-            ArrayList<Mutation> tableFailures = new ArrayList<Mutation>();
+            ArrayList<Mutation> tableFailures = new ArrayList<>();
             locator.binMutations(context, tableMutations, binnedMutations, tableFailures);
 
             if (tableFailures.size() > 0) {
@@ -749,7 +749,7 @@ public class TabletServerBatchWriter {
     }
 
     private void addMutations(MutationSet mutationsToSend) {
-      Map<String,TabletServerMutations<Mutation>> binnedMutations = new HashMap<String,TabletServerMutations<Mutation>>();
+      Map<String,TabletServerMutations<Mutation>> binnedMutations = new HashMap<>();
       Span span = Trace.start("binMutations");
       try {
         long t1 = System.currentTimeMillis();
@@ -792,7 +792,7 @@ public class TabletServerBatchWriter {
         log.trace(String.format("Started sending %,d mutations to %,d tablet servers", count, binnedMutations.keySet().size()));
 
       // randomize order of servers
-      ArrayList<String> servers = new ArrayList<String>(binnedMutations.keySet());
+      ArrayList<String> servers = new ArrayList<>(binnedMutations.keySet());
       Collections.shuffle(servers);
 
       for (String server : servers)
@@ -893,7 +893,7 @@ public class TabletServerBatchWriter {
           if (log.isTraceEnabled())
             log.trace("failed to send mutations to {} : {}", location, e.getMessage());
 
-          HashSet<String> tables = new HashSet<String>();
+          HashSet<String> tables = new HashSet<>();
           for (KeyExtent ke : mutationBatch.keySet())
             tables.add(ke.getTableId());
 
@@ -944,7 +944,7 @@ public class TabletServerBatchWriter {
 
             long usid = client.startUpdate(tinfo, context.rpcCreds(), DurabilityImpl.toThrift(durability));
 
-            List<TMutation> updates = new ArrayList<TMutation>();
+            List<TMutation> updates = new ArrayList<>();
             for (Entry<KeyExtent,List<Mutation>> entry : tabMuts.entrySet()) {
               long size = 0;
               Iterator<Mutation> iter = entry.getValue().iterator();
@@ -1019,13 +1019,13 @@ public class TabletServerBatchWriter {
     private int memoryUsed = 0;
 
     MutationSet() {
-      mutations = new HashMap<String,List<Mutation>>();
+      mutations = new HashMap<>();
     }
 
     void addMutation(String table, Mutation mutation) {
       List<Mutation> tabMutList = mutations.get(table);
       if (tabMutList == null) {
-        tabMutList = new ArrayList<Mutation>();
+        tabMutList = new ArrayList<>();
         mutations.put(table, tabMutList);
       }
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/impl/ThriftScanner.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/ThriftScanner.java b/core/src/main/java/org/apache/accumulo/core/client/impl/ThriftScanner.java
index 9a7f782..91b2637 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/ThriftScanner.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/ThriftScanner.java
@@ -75,7 +75,7 @@ import com.google.common.net.HostAndPort;
 public class ThriftScanner {
   private static final Logger log = LoggerFactory.getLogger(ThriftScanner.class);
 
-  public static final Map<TabletType,Set<String>> serversWaitedForWrites = new EnumMap<TabletType,Set<String>>(TabletType.class);
+  public static final Map<TabletType,Set<String>> serversWaitedForWrites = new EnumMap<>(TabletType.class);
 
   static {
     for (TabletType ttype : TabletType.values()) {
@@ -171,7 +171,7 @@ public class ThriftScanner {
       this.authorizations = authorizations;
       this.classLoaderContext = classLoaderContext;
 
-      columns = new ArrayList<Column>(fetchedColumns.size());
+      columns = new ArrayList<>(fetchedColumns.size());
       for (Column column : fetchedColumns) {
         columns.add(column);
       }
@@ -498,7 +498,7 @@ public class ThriftScanner {
       if (sr.results.size() > 0 && !scanState.finished)
         scanState.range = new Range(new Key(sr.results.get(sr.results.size() - 1).key), false, scanState.range.getEndKey(), scanState.range.isEndKeyInclusive());
 
-      List<KeyValue> results = new ArrayList<KeyValue>(sr.results.size());
+      List<KeyValue> results = new ArrayList<>(sr.results.size());
       for (TKeyValue tkv : sr.results)
         results.add(new KeyValue(new Key(tkv.key), tkv.value));
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/impl/ThriftTransportPool.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/ThriftTransportPool.java b/core/src/main/java/org/apache/accumulo/core/client/impl/ThriftTransportPool.java
index ba62cec..682ecbd 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/ThriftTransportPool.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/ThriftTransportPool.java
@@ -48,10 +48,10 @@ public class ThriftTransportPool {
   private static final Random random = new Random();
   private long killTime = 1000 * 3;
 
-  private Map<ThriftTransportKey,List<CachedConnection>> cache = new HashMap<ThriftTransportKey,List<CachedConnection>>();
-  private Map<ThriftTransportKey,Long> errorCount = new HashMap<ThriftTransportKey,Long>();
-  private Map<ThriftTransportKey,Long> errorTime = new HashMap<ThriftTransportKey,Long>();
-  private Set<ThriftTransportKey> serversWarnedAbout = new HashSet<ThriftTransportKey>();
+  private Map<ThriftTransportKey,List<CachedConnection>> cache = new HashMap<>();
+  private Map<ThriftTransportKey,Long> errorCount = new HashMap<>();
+  private Map<ThriftTransportKey,Long> errorTime = new HashMap<>();
+  private Set<ThriftTransportKey> serversWarnedAbout = new HashSet<>();
 
   private CountDownLatch closerExitLatch;
 
@@ -95,7 +95,7 @@ public class ThriftTransportPool {
     private void closeConnections() {
       while (true) {
 
-        ArrayList<CachedConnection> connectionsToClose = new ArrayList<CachedConnection>();
+        ArrayList<CachedConnection> connectionsToClose = new ArrayList<>();
 
         synchronized (pool) {
           for (List<CachedConnection> ccl : pool.getCache().values()) {
@@ -394,7 +394,7 @@ public class ThriftTransportPool {
       List<CachedConnection> ccl = getCache().get(cacheKey);
 
       if (ccl == null) {
-        ccl = new LinkedList<CachedConnection>();
+        ccl = new LinkedList<>();
         getCache().put(cacheKey, ccl);
       }
 
@@ -413,10 +413,10 @@ public class ThriftTransportPool {
   @VisibleForTesting
   public Pair<String,TTransport> getAnyTransport(List<ThriftTransportKey> servers, boolean preferCachedConnection) throws TTransportException {
 
-    servers = new ArrayList<ThriftTransportKey>(servers);
+    servers = new ArrayList<>(servers);
 
     if (preferCachedConnection) {
-      HashSet<ThriftTransportKey> serversSet = new HashSet<ThriftTransportKey>(servers);
+      HashSet<ThriftTransportKey> serversSet = new HashSet<>(servers);
 
       synchronized (this) {
 
@@ -424,7 +424,7 @@ public class ThriftTransportPool {
         serversSet.retainAll(getCache().keySet());
 
         if (serversSet.size() > 0) {
-          ArrayList<ThriftTransportKey> cachedServers = new ArrayList<ThriftTransportKey>(serversSet);
+          ArrayList<ThriftTransportKey> cachedServers = new ArrayList<>(serversSet);
           Collections.shuffle(cachedServers, random);
 
           for (ThriftTransportKey ttk : cachedServers) {
@@ -463,7 +463,7 @@ public class ThriftTransportPool {
       }
 
       try {
-        return new Pair<String,TTransport>(ttk.getServer().toString(), createNewTransport(ttk));
+        return new Pair<>(ttk.getServer().toString(), createNewTransport(ttk));
       } catch (TTransportException tte) {
         log.debug("Failed to connect to {}", servers.get(index), tte);
         servers.remove(index);
@@ -490,7 +490,7 @@ public class ThriftTransportPool {
         List<CachedConnection> ccl = getCache().get(cacheKey);
 
         if (ccl == null) {
-          ccl = new LinkedList<CachedConnection>();
+          ccl = new LinkedList<>();
           getCache().put(cacheKey, ccl);
         }
 
@@ -511,7 +511,7 @@ public class ThriftTransportPool {
     boolean existInCache = false;
     CachedTTransport ctsc = (CachedTTransport) tsc;
 
-    ArrayList<CachedConnection> closeList = new ArrayList<ThriftTransportPool.CachedConnection>();
+    ArrayList<CachedConnection> closeList = new ArrayList<>();
 
     synchronized (this) {
       List<CachedConnection> ccl = getCache().get(ctsc.getCacheKey());

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/impl/Translator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/Translator.java b/core/src/main/java/org/apache/accumulo/core/client/impl/Translator.java
index e5141cf..00c43ac 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/Translator.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/Translator.java
@@ -111,7 +111,7 @@ public abstract class Translator<IT,OT> {
   }
 
   public static <IKT,OKT,T> Map<OKT,T> translate(Map<IKT,T> input, Translator<IKT,OKT> keyTranslator) {
-    HashMap<OKT,T> output = new HashMap<OKT,T>();
+    HashMap<OKT,T> output = new HashMap<>();
 
     for (Entry<IKT,T> entry : input.entrySet())
       output.put(keyTranslator.translate(entry.getKey()), entry.getValue());
@@ -120,7 +120,7 @@ public abstract class Translator<IT,OT> {
   }
 
   public static <IKT,OKT,IVT,OVT> Map<OKT,OVT> translate(Map<IKT,IVT> input, Translator<IKT,OKT> keyTranslator, Translator<IVT,OVT> valueTranslator) {
-    HashMap<OKT,OVT> output = new HashMap<OKT,OVT>();
+    HashMap<OKT,OVT> output = new HashMap<>();
 
     for (Entry<IKT,IVT> entry : input.entrySet())
       output.put(keyTranslator.translate(entry.getKey()), valueTranslator.translate(entry.getValue()));
@@ -129,7 +129,7 @@ public abstract class Translator<IT,OT> {
   }
 
   public static <IT,OT> List<OT> translate(Collection<IT> input, Translator<IT,OT> translator) {
-    ArrayList<OT> output = new ArrayList<OT>(input.size());
+    ArrayList<OT> output = new ArrayList<>(input.size());
 
     for (IT in : input)
       output.add(translator.translate(in));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/lexicoder/BigIntegerLexicoder.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/BigIntegerLexicoder.java b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/BigIntegerLexicoder.java
index 8147f18..669d070 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/BigIntegerLexicoder.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/BigIntegerLexicoder.java
@@ -16,22 +16,22 @@
  */
 package org.apache.accumulo.core.client.lexicoder;
 
-import org.apache.accumulo.core.client.lexicoder.impl.AbstractLexicoder;
-import org.apache.accumulo.core.client.lexicoder.impl.FixedByteArrayOutputStream;
-import org.apache.accumulo.core.iterators.ValueFormatException;
-
 import java.io.ByteArrayInputStream;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 import java.math.BigInteger;
 
+import org.apache.accumulo.core.client.lexicoder.impl.AbstractLexicoder;
+import org.apache.accumulo.core.client.lexicoder.impl.FixedByteArrayOutputStream;
+import org.apache.accumulo.core.iterators.ValueFormatException;
+
 /**
  * A lexicoder to encode/decode a BigInteger to/from bytes that maintain its native Java sort order.
  *
  * @since 1.6.0
  */
-public class BigIntegerLexicoder extends AbstractLexicoder<BigInteger> implements Lexicoder<BigInteger> {
+public class BigIntegerLexicoder extends AbstractLexicoder<BigInteger> {
 
   @Override
   public byte[] encode(BigInteger v) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/lexicoder/BytesLexicoder.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/BytesLexicoder.java b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/BytesLexicoder.java
index ae4dfbd..c755db6 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/BytesLexicoder.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/BytesLexicoder.java
@@ -24,7 +24,7 @@ import org.apache.accumulo.core.client.lexicoder.impl.AbstractLexicoder;
  *
  * @since 1.6.0
  */
-public class BytesLexicoder extends AbstractLexicoder<byte[]> implements Lexicoder<byte[]> {
+public class BytesLexicoder extends AbstractLexicoder<byte[]> {
 
   @Override
   public byte[] encode(byte[] data) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/lexicoder/DateLexicoder.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/DateLexicoder.java b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/DateLexicoder.java
index 84ad808..8ce9c4d 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/DateLexicoder.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/DateLexicoder.java
@@ -16,16 +16,16 @@
  */
 package org.apache.accumulo.core.client.lexicoder;
 
-import org.apache.accumulo.core.client.lexicoder.impl.AbstractLexicoder;
-
 import java.util.Date;
 
+import org.apache.accumulo.core.client.lexicoder.impl.AbstractLexicoder;
+
 /**
  * A lexicoder for date objects. It preserves the native Java sort order for Date.
  *
  * @since 1.6.0
  */
-public class DateLexicoder extends AbstractLexicoder<Date> implements Lexicoder<Date> {
+public class DateLexicoder extends AbstractLexicoder<Date> {
 
   private LongLexicoder longEncoder = new LongLexicoder();
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/lexicoder/DoubleLexicoder.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/DoubleLexicoder.java b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/DoubleLexicoder.java
index 67cf4d9..252523f 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/DoubleLexicoder.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/DoubleLexicoder.java
@@ -23,7 +23,7 @@ import org.apache.accumulo.core.client.lexicoder.impl.AbstractLexicoder;
  *
  * @since 1.6.0
  */
-public class DoubleLexicoder extends AbstractLexicoder<Double> implements Lexicoder<Double> {
+public class DoubleLexicoder extends AbstractLexicoder<Double> {
 
   private ULongLexicoder longEncoder = new ULongLexicoder();
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/lexicoder/IntegerLexicoder.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/IntegerLexicoder.java b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/IntegerLexicoder.java
index f113f48..b58e673 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/IntegerLexicoder.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/IntegerLexicoder.java
@@ -24,7 +24,7 @@ import org.apache.accumulo.core.client.lexicoder.impl.AbstractLexicoder;
  *
  * @since 1.6.0
  */
-public class IntegerLexicoder extends AbstractLexicoder<Integer> implements Lexicoder<Integer> {
+public class IntegerLexicoder extends AbstractLexicoder<Integer> {
 
   private UIntegerLexicoder uil = new UIntegerLexicoder();
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/lexicoder/ListLexicoder.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/ListLexicoder.java b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/ListLexicoder.java
index d78cff2..8a38eb0 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/ListLexicoder.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/ListLexicoder.java
@@ -31,7 +31,7 @@ import org.apache.accumulo.core.client.lexicoder.impl.AbstractLexicoder;
  *
  * @since 1.6.0
  */
-public class ListLexicoder<LT> extends AbstractLexicoder<List<LT>> implements Lexicoder<List<LT>> {
+public class ListLexicoder<LT> extends AbstractLexicoder<List<LT>> {
 
   private Lexicoder<LT> lexicoder;
 
@@ -66,7 +66,7 @@ public class ListLexicoder<LT> extends AbstractLexicoder<List<LT>> implements Le
   protected List<LT> decodeUnchecked(byte[] b, int offset, int len) {
 
     byte[][] escapedElements = split(b, offset, len);
-    ArrayList<LT> ret = new ArrayList<LT>(escapedElements.length);
+    ArrayList<LT> ret = new ArrayList<>(escapedElements.length);
 
     for (byte[] escapedElement : escapedElements) {
       ret.add(lexicoder.decode(unescape(escapedElement)));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/lexicoder/PairLexicoder.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/PairLexicoder.java b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/PairLexicoder.java
index 9198b43..b286cf4 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/PairLexicoder.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/PairLexicoder.java
@@ -16,14 +16,14 @@
  */
 package org.apache.accumulo.core.client.lexicoder;
 
-import org.apache.accumulo.core.client.lexicoder.impl.AbstractLexicoder;
-import org.apache.accumulo.core.util.ComparablePair;
-
 import static org.apache.accumulo.core.client.lexicoder.impl.ByteUtils.concat;
 import static org.apache.accumulo.core.client.lexicoder.impl.ByteUtils.escape;
 import static org.apache.accumulo.core.client.lexicoder.impl.ByteUtils.split;
 import static org.apache.accumulo.core.client.lexicoder.impl.ByteUtils.unescape;
 
+import org.apache.accumulo.core.client.lexicoder.impl.AbstractLexicoder;
+import org.apache.accumulo.core.util.ComparablePair;
+
 /**
  * This class is a lexicoder that sorts a ComparablePair. Each item in the pair is encoded with the given lexicoder and concatenated together. This makes it
  * easy to construct a sortable key based on two components. There are many examples of this- but a key/value relationship is a great one.
@@ -49,8 +49,7 @@ import static org.apache.accumulo.core.client.lexicoder.impl.ByteUtils.unescape;
  * @since 1.6.0
  */
 
-public class PairLexicoder<A extends Comparable<A>,B extends Comparable<B>> extends AbstractLexicoder<ComparablePair<A,B>> implements
-    Lexicoder<ComparablePair<A,B>> {
+public class PairLexicoder<A extends Comparable<A>,B extends Comparable<B>> extends AbstractLexicoder<ComparablePair<A,B>> {
 
   private Lexicoder<A> firstLexicoder;
   private Lexicoder<B> secondLexicoder;
@@ -79,7 +78,7 @@ public class PairLexicoder<A extends Comparable<A>,B extends Comparable<B>> exte
       throw new RuntimeException("Data does not have 2 fields, it has " + fields.length);
     }
 
-    return new ComparablePair<A,B>(firstLexicoder.decode(unescape(fields[0])), secondLexicoder.decode(unescape(fields[1])));
+    return new ComparablePair<>(firstLexicoder.decode(unescape(fields[0])), secondLexicoder.decode(unescape(fields[1])));
   }
 
 }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/lexicoder/ReverseLexicoder.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/ReverseLexicoder.java b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/ReverseLexicoder.java
index 3a422d5..5243ea9 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/ReverseLexicoder.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/ReverseLexicoder.java
@@ -16,11 +16,11 @@
  */
 package org.apache.accumulo.core.client.lexicoder;
 
-import org.apache.accumulo.core.client.lexicoder.impl.AbstractLexicoder;
-
 import static org.apache.accumulo.core.client.lexicoder.impl.ByteUtils.escape;
 import static org.apache.accumulo.core.client.lexicoder.impl.ByteUtils.unescape;
 
+import org.apache.accumulo.core.client.lexicoder.impl.AbstractLexicoder;
+
 /**
  * A lexicoder that flips the sort order from another lexicoder. If this is applied to {@link DateLexicoder}, the most recent date will be sorted first and the
  * oldest date will be sorted last. If it's applied to {@link LongLexicoder}, the Long.MAX_VALUE will be sorted first and Long.MIN_VALUE will be sorted last,
@@ -29,7 +29,7 @@ import static org.apache.accumulo.core.client.lexicoder.impl.ByteUtils.unescape;
  * @since 1.6.0
  */
 
-public class ReverseLexicoder<T> extends AbstractLexicoder<T> implements Lexicoder<T> {
+public class ReverseLexicoder<T> extends AbstractLexicoder<T> {
 
   private Lexicoder<T> lexicoder;
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/lexicoder/StringLexicoder.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/StringLexicoder.java b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/StringLexicoder.java
index cec78de..17d4578 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/StringLexicoder.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/StringLexicoder.java
@@ -16,10 +16,10 @@
  */
 package org.apache.accumulo.core.client.lexicoder;
 
-import org.apache.accumulo.core.client.lexicoder.impl.AbstractLexicoder;
-
 import static java.nio.charset.StandardCharsets.UTF_8;
 
+import org.apache.accumulo.core.client.lexicoder.impl.AbstractLexicoder;
+
 /**
  * This lexicoder encodes/decodes a given String to/from bytes without further processing. It can be combined with other encoders like the
  * {@link ReverseLexicoder} to flip the default sort order.
@@ -27,7 +27,7 @@ import static java.nio.charset.StandardCharsets.UTF_8;
  * @since 1.6.0
  */
 
-public class StringLexicoder extends AbstractLexicoder<String> implements Lexicoder<String> {
+public class StringLexicoder extends AbstractLexicoder<String> {
 
   @Override
   public byte[] encode(String data) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/lexicoder/TextLexicoder.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/TextLexicoder.java b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/TextLexicoder.java
index 2129ce7..c5a7596 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/TextLexicoder.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/TextLexicoder.java
@@ -27,7 +27,7 @@ import org.apache.hadoop.io.Text;
  * @since 1.6.0
  */
 
-public class TextLexicoder extends AbstractLexicoder<Text> implements Lexicoder<Text> {
+public class TextLexicoder extends AbstractLexicoder<Text> {
 
   @Override
   public byte[] encode(Text data) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/lexicoder/UIntegerLexicoder.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/UIntegerLexicoder.java b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/UIntegerLexicoder.java
index bd41ab6..c156d4c 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/UIntegerLexicoder.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/UIntegerLexicoder.java
@@ -24,7 +24,7 @@ import org.apache.accumulo.core.client.lexicoder.impl.AbstractLexicoder;
  *
  * @since 1.6.0
  */
-public class UIntegerLexicoder extends AbstractLexicoder<Integer> implements Lexicoder<Integer> {
+public class UIntegerLexicoder extends AbstractLexicoder<Integer> {
 
   @Override
   public byte[] encode(Integer i) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/lexicoder/ULongLexicoder.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/ULongLexicoder.java b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/ULongLexicoder.java
index 0176043..8ebd0b9 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/ULongLexicoder.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/ULongLexicoder.java
@@ -24,7 +24,7 @@ import org.apache.accumulo.core.client.lexicoder.impl.AbstractLexicoder;
  *
  * @since 1.6.0
  */
-public class ULongLexicoder extends AbstractLexicoder<Long> implements Lexicoder<Long> {
+public class ULongLexicoder extends AbstractLexicoder<Long> {
 
   @Override
   public byte[] encode(Long l) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/lexicoder/UUIDLexicoder.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/UUIDLexicoder.java b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/UUIDLexicoder.java
index 70405f5..2d5b811 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/UUIDLexicoder.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/UUIDLexicoder.java
@@ -31,7 +31,7 @@ import org.apache.accumulo.core.iterators.ValueFormatException;
  *
  * @since 1.6.0
  */
-public class UUIDLexicoder extends AbstractLexicoder<UUID> implements Lexicoder<UUID> {
+public class UUIDLexicoder extends AbstractLexicoder<UUID> {
 
   /**
    * {@inheritDoc}

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/lexicoder/impl/ByteUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/impl/ByteUtils.java b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/impl/ByteUtils.java
index b168807..0daceaa 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/impl/ByteUtils.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/impl/ByteUtils.java
@@ -97,7 +97,7 @@ public class ByteUtils {
    * Splits a byte array by 0x00
    */
   public static byte[][] split(byte[] data, int dataOffset, int len) {
-    ArrayList<Integer> offsets = new ArrayList<Integer>();
+    ArrayList<Integer> offsets = new ArrayList<>();
 
     for (int i = dataOffset; i < (dataOffset + len); i++) {
       if (data[i] == 0x00) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/mapred/AbstractInputFormat.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/mapred/AbstractInputFormat.java b/core/src/main/java/org/apache/accumulo/core/client/mapred/AbstractInputFormat.java
index dd92ae3..6165346 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/mapred/AbstractInputFormat.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/mapred/AbstractInputFormat.java
@@ -662,7 +662,7 @@ public abstract class AbstractInputFormat<K,V> implements InputFormat<K,V> {
     validateOptions(job);
 
     Random random = new Random();
-    LinkedList<InputSplit> splits = new LinkedList<InputSplit>();
+    LinkedList<InputSplit> splits = new LinkedList<>();
     Map<String,InputTableConfig> tableConfigs = getInputTableConfigs(job);
     for (Map.Entry<String,InputTableConfig> tableConfigEntry : tableConfigs.entrySet()) {
       String tableName = tableConfigEntry.getKey();
@@ -696,12 +696,12 @@ public abstract class AbstractInputFormat<K,V> implements InputFormat<K,V> {
 
       List<Range> ranges = autoAdjust ? Range.mergeOverlapping(tableConfig.getRanges()) : tableConfig.getRanges();
       if (ranges.isEmpty()) {
-        ranges = new ArrayList<Range>(1);
+        ranges = new ArrayList<>(1);
         ranges.add(new Range());
       }
 
       // get the metadata information for these ranges
-      Map<String,Map<KeyExtent,List<Range>>> binnedRanges = new HashMap<String,Map<KeyExtent,List<Range>>>();
+      Map<String,Map<KeyExtent,List<Range>>> binnedRanges = new HashMap<>();
       TabletLocator tl;
       try {
         if (tableConfig.isOfflineScan()) {
@@ -740,9 +740,9 @@ public abstract class AbstractInputFormat<K,V> implements InputFormat<K,V> {
       HashMap<Range,ArrayList<String>> splitsToAdd = null;
 
       if (!autoAdjust)
-        splitsToAdd = new HashMap<Range,ArrayList<String>>();
+        splitsToAdd = new HashMap<>();
 
-      HashMap<String,String> hostNameCache = new HashMap<String,String>();
+      HashMap<String,String> hostNameCache = new HashMap<>();
       for (Map.Entry<String,Map<KeyExtent,List<Range>>> tserverBin : binnedRanges.entrySet()) {
         String ip = tserverBin.getKey().split(":", 2)[0];
         String location = hostNameCache.get(ip);
@@ -755,7 +755,7 @@ public abstract class AbstractInputFormat<K,V> implements InputFormat<K,V> {
           Range ke = extentRanges.getKey().toDataRange();
           if (batchScan) {
             // group ranges by tablet to be read by a BatchScanner
-            ArrayList<Range> clippedRanges = new ArrayList<Range>();
+            ArrayList<Range> clippedRanges = new ArrayList<>();
             for (Range r : extentRanges.getValue())
               clippedRanges.add(ke.clip(r));
 
@@ -779,7 +779,7 @@ public abstract class AbstractInputFormat<K,V> implements InputFormat<K,V> {
                 // don't divide ranges
                 ArrayList<String> locations = splitsToAdd.get(r);
                 if (locations == null)
-                  locations = new ArrayList<String>(1);
+                  locations = new ArrayList<>(1);
                 locations.add(location);
                 splitsToAdd.put(r, locations);
               }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.java b/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.java
index 461bdc0..5feadb8 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.java
@@ -429,7 +429,7 @@ public class AccumuloOutputFormat implements OutputFormat<Text,Mutation> {
       if (simulate)
         log.info("Simulating output only. No writes to tables will occur");
 
-      this.bws = new HashMap<Text,BatchWriter>();
+      this.bws = new HashMap<>();
 
       String tname = getDefaultTableName(job);
       this.defaultTableName = (tname == null) ? null : new Text(tname);
@@ -543,12 +543,12 @@ public class AccumuloOutputFormat implements OutputFormat<Text,Mutation> {
         mtbw.close();
       } catch (MutationsRejectedException e) {
         if (e.getSecurityErrorCodes().size() >= 0) {
-          HashMap<String,Set<SecurityErrorCode>> tables = new HashMap<String,Set<SecurityErrorCode>>();
+          HashMap<String,Set<SecurityErrorCode>> tables = new HashMap<>();
           for (Entry<TabletId,Set<SecurityErrorCode>> ke : e.getSecurityErrorCodes().entrySet()) {
             String tableId = ke.getKey().getTableId().toString();
             Set<SecurityErrorCode> secCodes = tables.get(tableId);
             if (secCodes == null) {
-              secCodes = new HashSet<SecurityErrorCode>();
+              secCodes = new HashSet<>();
               tables.put(tableId, secCodes);
             }
             secCodes.addAll(ke.getValue());

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloRowInputFormat.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloRowInputFormat.java b/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloRowInputFormat.java
index 067fde8..5049ef7 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloRowInputFormat.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloRowInputFormat.java
@@ -78,7 +78,7 @@ public class AccumuloRowInputFormat extends InputFormatBase<Text,PeekingIterator
 
       @Override
       public PeekingIterator<Entry<Key,Value>> createValue() {
-        return new PeekingIterator<Entry<Key,Value>>();
+        return new PeekingIterator<>();
       }
     };
     recordReader.initialize(split, job);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.java b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.java
index e7cb8ec..9ccf78a 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.java
@@ -708,7 +708,7 @@ public abstract class AbstractInputFormat<K,V> extends InputFormat<K,V> {
     log.setLevel(logLevel);
     validateOptions(context);
     Random random = new Random();
-    LinkedList<InputSplit> splits = new LinkedList<InputSplit>();
+    LinkedList<InputSplit> splits = new LinkedList<>();
     Map<String,InputTableConfig> tableConfigs = getInputTableConfigs(context);
     for (Map.Entry<String,InputTableConfig> tableConfigEntry : tableConfigs.entrySet()) {
 
@@ -743,12 +743,12 @@ public abstract class AbstractInputFormat<K,V> extends InputFormat<K,V> {
 
       List<Range> ranges = autoAdjust ? Range.mergeOverlapping(tableConfig.getRanges()) : tableConfig.getRanges();
       if (ranges.isEmpty()) {
-        ranges = new ArrayList<Range>(1);
+        ranges = new ArrayList<>(1);
         ranges.add(new Range());
       }
 
       // get the metadata information for these ranges
-      Map<String,Map<KeyExtent,List<Range>>> binnedRanges = new HashMap<String,Map<KeyExtent,List<Range>>>();
+      Map<String,Map<KeyExtent,List<Range>>> binnedRanges = new HashMap<>();
       TabletLocator tl;
       try {
         if (tableConfig.isOfflineScan()) {
@@ -790,9 +790,9 @@ public abstract class AbstractInputFormat<K,V> extends InputFormat<K,V> {
       HashMap<Range,ArrayList<String>> splitsToAdd = null;
 
       if (!autoAdjust)
-        splitsToAdd = new HashMap<Range,ArrayList<String>>();
+        splitsToAdd = new HashMap<>();
 
-      HashMap<String,String> hostNameCache = new HashMap<String,String>();
+      HashMap<String,String> hostNameCache = new HashMap<>();
       for (Map.Entry<String,Map<KeyExtent,List<Range>>> tserverBin : binnedRanges.entrySet()) {
         String ip = tserverBin.getKey().split(":", 2)[0];
         String location = hostNameCache.get(ip);
@@ -805,7 +805,7 @@ public abstract class AbstractInputFormat<K,V> extends InputFormat<K,V> {
           Range ke = extentRanges.getKey().toDataRange();
           if (batchScan) {
             // group ranges by tablet to be read by a BatchScanner
-            ArrayList<Range> clippedRanges = new ArrayList<Range>();
+            ArrayList<Range> clippedRanges = new ArrayList<>();
             for (Range r : extentRanges.getValue())
               clippedRanges.add(ke.clip(r));
             BatchInputSplit split = new BatchInputSplit(tableName, tableId, clippedRanges, new String[] {location});
@@ -828,7 +828,7 @@ public abstract class AbstractInputFormat<K,V> extends InputFormat<K,V> {
                 // don't divide ranges
                 ArrayList<String> locations = splitsToAdd.get(r);
                 if (locations == null)
-                  locations = new ArrayList<String>(1);
+                  locations = new ArrayList<>(1);
                 locations.add(location);
                 splitsToAdd.put(r, locations);
               }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.java b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.java
index fa926b6..1e06ca3 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.java
@@ -428,7 +428,7 @@ public class AccumuloOutputFormat extends OutputFormat<Text,Mutation> {
       if (simulate)
         log.info("Simulating output only. No writes to tables will occur");
 
-      this.bws = new HashMap<Text,BatchWriter>();
+      this.bws = new HashMap<>();
 
       String tname = getDefaultTableName(context);
       this.defaultTableName = (tname == null) ? null : new Text(tname);
@@ -542,12 +542,12 @@ public class AccumuloOutputFormat extends OutputFormat<Text,Mutation> {
         mtbw.close();
       } catch (MutationsRejectedException e) {
         if (e.getSecurityErrorCodes().size() >= 0) {
-          HashMap<String,Set<SecurityErrorCode>> tables = new HashMap<String,Set<SecurityErrorCode>>();
+          HashMap<String,Set<SecurityErrorCode>> tables = new HashMap<>();
           for (Entry<TabletId,Set<SecurityErrorCode>> ke : e.getSecurityErrorCodes().entrySet()) {
             String tableId = ke.getKey().getTableId().toString();
             Set<SecurityErrorCode> secCodes = tables.get(tableId);
             if (secCodes == null) {
-              secCodes = new HashSet<SecurityErrorCode>();
+              secCodes = new HashSet<>();
               tables.put(tableId, secCodes);
             }
             secCodes.addAll(ke.getValue());

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloRowInputFormat.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloRowInputFormat.java b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloRowInputFormat.java
index 7dcb35b..043f88a 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloRowInputFormat.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloRowInputFormat.java
@@ -68,7 +68,7 @@ public class AccumuloRowInputFormat extends InputFormatBase<Text,PeekingIterator
       public boolean nextKeyValue() throws IOException, InterruptedException {
         if (!rowIterator.hasNext())
           return false;
-        currentV = new PeekingIterator<Entry<Key,Value>>(rowIterator.next());
+        currentV = new PeekingIterator<>(rowIterator.next());
         numKeysRead = rowIterator.getKVCount();
         currentKey = currentV.peek().getKey();
         currentK = new Text(currentKey.getRow());

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputTableConfig.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputTableConfig.java b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputTableConfig.java
index df0aa65..a8724c2 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputTableConfig.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputTableConfig.java
@@ -305,13 +305,13 @@ public class InputTableConfig implements Writable {
     // load iterators
     long iterSize = dataInput.readInt();
     if (iterSize > 0)
-      iterators = new ArrayList<IteratorSetting>();
+      iterators = new ArrayList<>();
     for (int i = 0; i < iterSize; i++)
       iterators.add(new IteratorSetting(dataInput));
     // load ranges
     long rangeSize = dataInput.readInt();
     if (rangeSize > 0)
-      ranges = new ArrayList<Range>();
+      ranges = new ArrayList<>();
     for (int i = 0; i < rangeSize; i++) {
       Range range = new Range();
       range.readFields(dataInput);
@@ -320,7 +320,7 @@ public class InputTableConfig implements Writable {
     // load columns
     long columnSize = dataInput.readInt();
     if (columnSize > 0)
-      columns = new HashSet<Pair<Text,Text>>();
+      columns = new HashSet<>();
     for (int i = 0; i < columnSize; i++) {
       long numPairs = dataInput.readInt();
       Text colFam = new Text();
@@ -330,7 +330,7 @@ public class InputTableConfig implements Writable {
       } else if (numPairs == 2) {
         Text colQual = new Text();
         colQual.readFields(dataInput);
-        columns.add(new Pair<Text,Text>(colFam, colQual));
+        columns.add(new Pair<>(colFam, colQual));
       }
     }
     autoAdjustRanges = dataInput.readBoolean();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/mapreduce/RangeInputSplit.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/RangeInputSplit.java b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/RangeInputSplit.java
index 1786eb3..1e89500 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/RangeInputSplit.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/RangeInputSplit.java
@@ -160,7 +160,7 @@ public class RangeInputSplit extends InputSplit implements Writable {
 
     if (in.readBoolean()) {
       int numColumns = in.readInt();
-      List<String> columns = new ArrayList<String>(numColumns);
+      List<String> columns = new ArrayList<>(numColumns);
       for (int i = 0; i < numColumns; i++) {
         columns.add(in.readUTF());
       }
@@ -209,7 +209,7 @@ public class RangeInputSplit extends InputSplit implements Writable {
 
     if (in.readBoolean()) {
       int numIterators = in.readInt();
-      iterators = new ArrayList<IteratorSetting>(numIterators);
+      iterators = new ArrayList<>(numIterators);
       for (int i = 0; i < numIterators; i++) {
         iterators.add(new IteratorSetting(in));
       }
@@ -475,7 +475,7 @@ public class RangeInputSplit extends InputSplit implements Writable {
   }
 
   public void setFetchedColumns(Collection<Pair<Text,Text>> fetchedColumns) {
-    this.fetchedColumns = new HashSet<Pair<Text,Text>>();
+    this.fetchedColumns = new HashSet<>();
     for (Pair<Text,Text> columns : fetchedColumns) {
       this.fetchedColumns.add(columns);
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/mapreduce/impl/BatchInputSplit.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/impl/BatchInputSplit.java b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/impl/BatchInputSplit.java
index 04875ac..2965788 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/impl/BatchInputSplit.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/impl/BatchInputSplit.java
@@ -107,7 +107,7 @@ public class BatchInputSplit extends RangeInputSplit {
     super.readFields(in);
 
     int numRanges = in.readInt();
-    ranges = new ArrayList<Range>(numRanges);
+    ranges = new ArrayList<>(numRanges);
     for (int i = 0; i < numRanges; ++i) {
       Range r = new Range();
       r.readFields(in);


[15/32] accumulo git commit: ACCUMULO-4357 Remove unneeded code for readability

Posted by ct...@apache.org.
ACCUMULO-4357 Remove unneeded code for readability

* Remove extra semicolons
* Remove redundant interface declarations
* Remove unnecessary generics parameters when diamond would suffice


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b102e760
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b102e760
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b102e760

Branch: refs/heads/1.8
Commit: b102e7605035cc7eb128bd0a9ee95b2417389bc9
Parents: 5660464
Author: Christopher Tubbs <ct...@apache.org>
Authored: Thu Jun 30 21:32:12 2016 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Thu Jun 30 21:32:12 2016 -0400

----------------------------------------------------------------------
 .../apache/accumulo/core/cli/ClientOpts.java    |  2 +-
 .../accumulo/core/client/BatchWriterConfig.java |  2 +-
 .../core/client/ClientConfiguration.java        |  6 +-
 .../core/client/ClientSideIteratorScanner.java  |  4 +-
 .../accumulo/core/client/IsolatedScanner.java   |  2 +-
 .../accumulo/core/client/IteratorSetting.java   |  4 +-
 .../core/client/MutationsRejectedException.java |  6 +-
 .../accumulo/core/client/RowIterator.java       |  2 +-
 .../accumulo/core/client/TimedOutException.java |  2 +-
 .../core/client/admin/ActiveCompaction.java     |  4 +-
 .../client/admin/NewTableConfiguration.java     |  4 +-
 .../core/client/impl/ActiveCompactionImpl.java  |  2 +-
 .../core/client/impl/ActiveScanImpl.java        |  4 +-
 .../core/client/impl/CompressedIterators.java   | 10 +--
 .../core/client/impl/ConditionalWriterImpl.java | 40 +++++------
 .../client/impl/InstanceOperationsImpl.java     |  8 +--
 .../client/impl/MultiTableBatchWriterImpl.java  |  2 +-
 .../client/impl/NamespaceOperationsHelper.java  | 14 ++--
 .../client/impl/NamespaceOperationsImpl.java    |  6 +-
 .../accumulo/core/client/impl/Namespaces.java   |  6 +-
 .../core/client/impl/OfflineIterator.java       | 15 ++--
 .../core/client/impl/RootTabletLocator.java     |  2 +-
 .../core/client/impl/ScannerIterator.java       |  2 +-
 .../core/client/impl/ScannerOptions.java        | 20 +++---
 .../accumulo/core/client/impl/ServerClient.java |  4 +-
 .../core/client/impl/TableOperationsHelper.java | 14 ++--
 .../core/client/impl/TableOperationsImpl.java   | 58 +++++++--------
 .../accumulo/core/client/impl/Tables.java       |  8 +--
 .../core/client/impl/TabletLocator.java         | 10 +--
 .../core/client/impl/TabletLocatorImpl.java     | 28 ++++----
 .../client/impl/TabletServerBatchReader.java    |  2 +-
 .../impl/TabletServerBatchReaderIterator.java   | 52 +++++++-------
 .../client/impl/TabletServerBatchWriter.java    | 34 ++++-----
 .../core/client/impl/ThriftScanner.java         |  6 +-
 .../core/client/impl/ThriftTransportPool.java   | 24 +++----
 .../accumulo/core/client/impl/Translator.java   |  6 +-
 .../client/lexicoder/BigIntegerLexicoder.java   | 10 +--
 .../core/client/lexicoder/BytesLexicoder.java   |  2 +-
 .../core/client/lexicoder/DateLexicoder.java    |  6 +-
 .../core/client/lexicoder/DoubleLexicoder.java  |  2 +-
 .../core/client/lexicoder/IntegerLexicoder.java |  2 +-
 .../core/client/lexicoder/ListLexicoder.java    |  4 +-
 .../core/client/lexicoder/PairLexicoder.java    | 11 ++-
 .../core/client/lexicoder/ReverseLexicoder.java |  6 +-
 .../core/client/lexicoder/StringLexicoder.java  |  6 +-
 .../core/client/lexicoder/TextLexicoder.java    |  2 +-
 .../client/lexicoder/UIntegerLexicoder.java     |  2 +-
 .../core/client/lexicoder/ULongLexicoder.java   |  2 +-
 .../core/client/lexicoder/UUIDLexicoder.java    |  2 +-
 .../core/client/lexicoder/impl/ByteUtils.java   |  2 +-
 .../core/client/mapred/AbstractInputFormat.java | 14 ++--
 .../client/mapred/AccumuloOutputFormat.java     |  6 +-
 .../client/mapred/AccumuloRowInputFormat.java   |  2 +-
 .../client/mapreduce/AbstractInputFormat.java   | 14 ++--
 .../client/mapreduce/AccumuloOutputFormat.java  |  6 +-
 .../mapreduce/AccumuloRowInputFormat.java       |  2 +-
 .../core/client/mapreduce/InputTableConfig.java |  8 +--
 .../core/client/mapreduce/RangeInputSplit.java  |  6 +-
 .../client/mapreduce/impl/BatchInputSplit.java  |  2 +-
 .../mapreduce/lib/impl/InputConfigurator.java   | 24 +++----
 .../lib/partition/RangePartitioner.java         |  2 +-
 .../accumulo/core/client/mock/MockAccumulo.java |  8 +--
 .../core/client/mock/MockBatchScanner.java      |  2 +-
 .../accumulo/core/client/mock/MockInstance.java |  2 +-
 .../client/mock/MockInstanceOperations.java     |  6 +-
 .../client/mock/MockMultiTableBatchWriter.java  |  2 +-
 .../core/client/mock/MockNamespace.java         |  6 +-
 .../client/mock/MockNamespaceOperations.java    |  4 +-
 .../core/client/mock/MockScannerBase.java       | 11 ++-
 .../accumulo/core/client/mock/MockTable.java    | 10 +--
 .../core/client/mock/MockTableOperations.java   | 12 ++--
 .../client/mock/impl/MockTabletLocator.java     |  2 +-
 .../core/client/rfile/RFileScannerBuilder.java  |  2 +-
 .../accumulo/core/client/rfile/RFileWriter.java |  6 +-
 .../core/client/rfile/RFileWriterBuilder.java   |  2 +-
 .../security/tokens/AuthenticationToken.java    |  2 +-
 .../tokens/CredentialProviderToken.java         |  2 +-
 .../client/security/tokens/PasswordToken.java   |  2 +-
 .../core/conf/AccumuloConfiguration.java        |  6 +-
 .../accumulo/core/conf/ConfigurationDocGen.java |  4 +-
 .../conf/CredentialProviderFactoryShim.java     |  4 +-
 .../core/conf/DefaultConfiguration.java         |  2 +-
 .../core/conf/ObservableConfiguration.java      |  2 +-
 .../org/apache/accumulo/core/conf/Property.java |  8 +--
 .../apache/accumulo/core/conf/PropertyType.java |  2 +-
 .../constraints/DefaultKeySizeConstraint.java   |  4 +-
 .../accumulo/core/constraints/Violations.java   |  4 +-
 .../core/constraints/VisibilityConstraint.java  |  2 +-
 .../apache/accumulo/core/data/Condition.java    |  4 +-
 .../accumulo/core/data/ConditionalMutation.java |  4 +-
 .../org/apache/accumulo/core/data/Mutation.java |  8 +--
 .../org/apache/accumulo/core/data/Range.java    |  4 +-
 .../accumulo/core/data/impl/KeyExtent.java      | 12 ++--
 .../accumulo/core/file/BloomFilterLayer.java    |  6 +-
 .../accumulo/core/file/FileOperations.java      |  2 +-
 .../core/file/blockfile/cache/CachedBlock.java  |  2 +-
 .../file/blockfile/cache/CachedBlockQueue.java  |  6 +-
 .../file/blockfile/impl/CachableBlockFile.java  |  6 +-
 .../accumulo/core/file/rfile/BlockIndex.java    |  2 +-
 .../accumulo/core/file/rfile/CreateEmpty.java   |  2 +-
 .../core/file/rfile/MultiLevelIndex.java        |  8 +--
 .../accumulo/core/file/rfile/PrintInfo.java     |  2 +-
 .../apache/accumulo/core/file/rfile/RFile.java  | 32 ++++-----
 .../accumulo/core/file/rfile/SplitLarge.java    |  2 +-
 .../accumulo/core/file/rfile/bcfile/BCFile.java | 10 +--
 .../core/file/rfile/bcfile/Compression.java     |  2 +-
 .../core/iterators/AggregatingIterator.java     |  3 +-
 .../core/iterators/FirstEntryInRowIterator.java |  2 +-
 .../accumulo/core/iterators/IteratorUtil.java   | 22 +++---
 .../accumulo/core/iterators/LongCombiner.java   |  6 +-
 .../core/iterators/OptionDescriber.java         | 12 ++--
 .../accumulo/core/iterators/OrIterator.java     |  6 +-
 .../core/iterators/TypedValueCombiner.java      |  2 +-
 .../accumulo/core/iterators/conf/ColumnSet.java |  8 +--
 .../iterators/conf/ColumnToClassMapping.java    |  4 +-
 .../system/ColumnFamilySkippingIterator.java    |  4 +-
 .../iterators/system/ColumnQualifierFilter.java |  6 +-
 .../core/iterators/system/HeapIterator.java     |  2 +-
 .../iterators/system/LocalityGroupIterator.java |  2 +-
 .../core/iterators/system/MultiIterator.java    |  2 +-
 .../system/SourceSwitchingIterator.java         |  2 +-
 .../iterators/system/SynchronizedIterator.java  |  2 +-
 .../core/iterators/user/BigDecimalCombiner.java |  3 +-
 .../core/iterators/user/CfCqSliceFilter.java    |  9 ++-
 .../core/iterators/user/CfCqSliceOpts.java      |  2 +-
 .../core/iterators/user/LargeRowFilter.java     |  8 +--
 .../iterators/user/RowDeletingIterator.java     |  4 +-
 .../iterators/user/RowEncodingIterator.java     |  6 +-
 .../iterators/user/SummingArrayCombiner.java    | 10 +--
 .../iterators/user/TransformingIterator.java    |  8 +--
 .../core/iterators/user/VisibilityFilter.java   |  3 +-
 .../user/WholeColumnFamilyIterator.java         |  6 +-
 .../core/iterators/user/WholeRowIterator.java   |  2 +-
 .../core/metadata/MetadataLocationObtainer.java | 20 +++---
 .../apache/accumulo/core/rpc/ThriftUtil.java    |  2 +-
 .../sample/impl/SamplerConfigurationImpl.java   |  6 +-
 .../accumulo/core/security/Authorizations.java  | 10 +--
 .../core/security/ColumnVisibility.java         |  4 +-
 .../core/security/NamespacePermission.java      |  2 +-
 .../core/security/SystemPermission.java         |  4 +-
 .../accumulo/core/security/TablePermission.java |  2 +-
 .../core/security/VisibilityEvaluator.java      |  2 +-
 .../CachingHDFSSecretKeyEncryptionStrategy.java |  2 +-
 .../security/crypto/CryptoModuleFactory.java    |  4 +-
 .../security/crypto/DefaultCryptoModule.java    |  2 +-
 .../accumulo/core/trace/DistributedTrace.java   |  2 +-
 .../accumulo/core/trace/wrappers/TraceWrap.java |  4 +-
 .../apache/accumulo/core/util/ByteArraySet.java |  2 +-
 .../accumulo/core/util/ByteBufferUtil.java      |  4 +-
 .../accumulo/core/util/LocalityGroupUtil.java   | 12 ++--
 .../apache/accumulo/core/util/MapCounter.java   |  4 +-
 .../org/apache/accumulo/core/util/Merge.java    |  4 +-
 .../org/apache/accumulo/core/util/Pair.java     |  4 +-
 .../accumulo/core/util/ServerServices.java      |  2 +-
 .../apache/accumulo/core/util/StopWatch.java    |  4 +-
 .../ShardedTableDistributionFormatter.java      |  2 +-
 .../util/format/StatisticsDisplayFormatter.java | 12 ++--
 .../core/util/interpret/HexScanInterpreter.java |  2 +-
 .../core/client/IteratorSettingTest.java        |  2 +-
 .../accumulo/core/client/RowIteratorTest.java   |  6 +-
 .../core/client/ZooKeeperInstanceTest.java      |  2 +-
 .../core/client/impl/ClientContextTest.java     |  2 +-
 .../client/impl/TableOperationsHelperTest.java  |  6 +-
 .../core/client/impl/TabletLocatorImplTest.java | 58 +++++++--------
 .../core/client/lexicoder/LexicoderTest.java    |  6 +-
 .../client/lexicoder/ListLexicoderTest.java     | 28 ++++----
 .../client/lexicoder/PairLexicoderTest.java     | 17 +++--
 .../client/lexicoder/ReverseLexicoderTest.java  | 16 ++---
 .../client/lexicoder/UUIDLexicoderTest.java     |  2 +-
 .../AccumuloMultiTableInputFormatTest.java      |  6 +-
 .../core/client/mapred/RangeInputSplitTest.java |  8 +--
 .../mapreduce/AccumuloInputFormatTest.java      | 10 +--
 .../AccumuloMultiTableInputFormatTest.java      |  4 +-
 .../client/mapreduce/InputTableConfigTest.java  |  8 +--
 .../client/mapreduce/RangeInputSplitTest.java   |  8 +--
 .../mapreduce/impl/BatchInputSplitTest.java     |  8 +--
 .../core/client/mock/MockConnectorTest.java     |  2 +-
 .../core/client/mock/MockNamespacesTest.java    |  2 +-
 .../client/mock/MockTableOperationsTest.java    |  4 +-
 .../client/security/SecurityErrorCodeTest.java  |  4 +-
 .../core/conf/ConfigSanityCheckTest.java        |  2 +-
 .../conf/CredentialProviderFactoryShimTest.java |  8 +--
 .../core/conf/DefaultConfigurationTest.java     |  2 +-
 .../apache/accumulo/core/conf/PropertyTest.java | 12 ++--
 .../core/conf/SiteConfigurationTest.java        |  2 +-
 .../accumulo/core/data/KeyExtentTest.java       | 20 +++---
 .../org/apache/accumulo/core/data/KeyTest.java  |  2 +-
 .../apache/accumulo/core/data/OldMutation.java  |  4 +-
 .../apache/accumulo/core/data/RangeTest.java    |  4 +-
 .../apache/accumulo/core/data/ValueTest.java    |  2 +-
 .../core/file/BloomFilterLayerLookupTest.java   |  4 +-
 .../core/file/rfile/CreateCompatTestFile.java   |  2 +-
 .../accumulo/core/file/rfile/RFileTest.java     | 38 +++++-----
 .../core/file/rfile/RelativeKeyTest.java        |  6 +-
 .../core/iterators/AggregatingIteratorTest.java | 36 +++++-----
 .../iterators/FirstEntryInRowIteratorTest.java  |  4 +-
 .../core/iterators/FirstEntryInRowTest.java     |  8 +--
 .../core/iterators/IteratorUtilTest.java        | 18 ++---
 .../ColumnFamilySkippingIteratorTest.java       | 24 +++----
 .../core/iterators/system/ColumnFilterTest.java |  6 +-
 .../iterators/system/DeletingIteratorTest.java  | 14 ++--
 .../iterators/system/MultiIteratorTest.java     | 38 +++++-----
 .../system/SourceSwitchingIteratorTest.java     | 22 +++---
 .../system/TimeSettingIteratorTest.java         |  4 +-
 .../iterators/system/VisibilityFilterTest.java  |  2 +-
 .../iterators/user/BigDecimalCombinerTest.java  |  4 +-
 .../iterators/user/ColumnSliceFilterTest.java   |  4 +-
 .../core/iterators/user/CombinerTest.java       | 46 ++++++------
 .../core/iterators/user/FilterTest.java         | 34 ++++-----
 .../core/iterators/user/GrepIteratorTest.java   |  6 +-
 .../iterators/user/IndexedDocIteratorTest.java  | 14 ++--
 .../user/IntersectingIteratorTest.java          |  8 +--
 .../core/iterators/user/LargeRowFilterTest.java | 34 ++++-----
 .../core/iterators/user/RegExFilterTest.java    |  6 +-
 .../iterators/user/RowDeletingIteratorTest.java | 10 +--
 .../iterators/user/RowEncodingIteratorTest.java | 22 +++---
 .../core/iterators/user/RowFilterTest.java      | 24 +++----
 .../core/iterators/user/TestCfCqSlice.java      | 12 ++--
 .../user/TransformingIteratorTest.java          | 26 +++----
 .../iterators/user/VersioningIteratorTest.java  | 16 ++---
 .../iterators/user/VisibilityFilterTest.java    |  8 +--
 .../user/WholeColumnFamilyIteratorTest.java     | 22 +++---
 .../iterators/user/WholeRowIteratorTest.java    | 22 +++---
 .../core/util/LocalityGroupUtilTest.java        |  4 +-
 .../apache/accumulo/core/util/MergeTest.java    |  6 +-
 .../org/apache/accumulo/core/util/PairTest.java | 20 +++---
 .../accumulo/core/util/PartitionerTest.java     |  2 +-
 .../util/format/DateStringFormatterTest.java    |  2 +-
 .../core/util/format/DefaultFormatterTest.java  |  2 +-
 .../core/util/format/HexFormatterTest.java      |  2 +-
 .../ShardedTableDistributionFormatterTest.java  |  2 +-
 .../format/StatisticsDisplayFormatterTest.java  |  2 +-
 .../simple/client/RandomBatchScanner.java       |  4 +-
 .../simple/client/RandomBatchWriter.java        |  6 +-
 .../simple/client/ReadWriteExample.java         |  2 +-
 .../constraints/AlphaNumKeyConstraint.java      |  2 +-
 .../examples/simple/dirlist/Ingest.java         |  2 +-
 .../examples/simple/dirlist/QueryUtil.java      |  4 +-
 .../simple/filedata/ChunkInputFormat.java       |  4 +-
 .../simple/filedata/ChunkInputStream.java       |  2 +-
 .../simple/filedata/FileDataIngest.java         |  2 +-
 .../examples/simple/filedata/FileDataQuery.java |  4 +-
 .../examples/simple/filedata/KeyUtil.java       |  2 +-
 .../simple/filedata/VisibilityCombiner.java     |  2 +-
 .../simple/isolation/InterferenceTest.java      |  2 +-
 .../examples/simple/mapreduce/NGramIngest.java  |  2 +-
 .../examples/simple/mapreduce/RowHash.java      |  2 +-
 .../examples/simple/mapreduce/TableToFile.java  |  6 +-
 .../simple/mapreduce/TeraSortIngest.java        |  2 +-
 .../simple/mapreduce/bulk/SetupTable.java       |  4 +-
 .../examples/simple/reservations/ARS.java       |  4 +-
 .../examples/simple/shard/ContinuousQuery.java  |  4 +-
 .../accumulo/examples/simple/shard/Index.java   |  4 +-
 .../accumulo/examples/simple/shard/Query.java   |  4 +-
 .../examples/simple/shell/DebugCommand.java     |  2 +-
 .../simple/filedata/ChunkCombinerTest.java      | 30 ++++----
 .../simple/filedata/ChunkInputStreamTest.java   | 28 ++++----
 .../org/apache/accumulo/fate/AdminUtil.java     |  8 +--
 .../org/apache/accumulo/fate/AgeOffStore.java   |  4 +-
 .../org/apache/accumulo/fate/ReadOnlyStore.java |  2 +-
 .../java/org/apache/accumulo/fate/ZooStore.java | 12 ++--
 .../zookeeper/DistributedReadWriteLock.java     |  2 +-
 .../fate/zookeeper/TransactionWatcher.java      |  2 +-
 .../accumulo/fate/zookeeper/ZooCache.java       |  6 +-
 .../fate/zookeeper/ZooCacheFactory.java         |  2 +-
 .../apache/accumulo/fate/zookeeper/ZooLock.java |  6 +-
 .../accumulo/fate/zookeeper/ZooQueueLock.java   |  2 +-
 .../accumulo/fate/zookeeper/ZooSession.java     |  2 +-
 .../apache/accumulo/fate/zookeeper/ZooUtil.java |  6 +-
 .../apache/accumulo/fate/AgeOffStoreTest.java   | 42 +++++------
 .../apache/accumulo/fate/ReadOnlyStoreTest.java |  2 +-
 .../org/apache/accumulo/fate/SimpleStore.java   |  6 +-
 .../zookeeper/DistributedReadWriteLockTest.java |  4 +-
 .../fate/zookeeper/TransactionWatcherTest.java  | 10 +--
 .../maven/plugin/AbstractAccumuloMojo.java      |  2 +-
 .../standalone/StandaloneClusterControl.java    |  2 +-
 .../minicluster/MiniAccumuloRunner.java         |  2 +-
 .../impl/MiniAccumuloClusterControl.java        |  2 +-
 .../impl/MiniAccumuloClusterImpl.java           | 22 +++---
 .../impl/MiniAccumuloConfigImpl.java            | 22 +++---
 .../minicluster/MiniAccumuloClusterTest.java    |  4 +-
 .../impl/MiniAccumuloConfigImplTest.java        |  2 +-
 .../java/org/apache/accumulo/proxy/Proxy.java   |  2 +-
 .../org/apache/accumulo/proxy/ProxyServer.java  | 50 ++++++-------
 .../apache/accumulo/proxy/ProxyServerTest.java  |  4 +-
 .../org/apache/accumulo/server/Accumulo.java    |  6 +-
 .../server/GarbageCollectionLogger.java         |  2 +-
 .../apache/accumulo/server/ServerConstants.java |  8 +--
 .../accumulo/server/client/BulkImporter.java    | 46 ++++++------
 .../server/client/ClientServiceHandler.java     |  8 +--
 .../server/conf/NamespaceConfiguration.java     |  2 +-
 .../server/conf/ServerConfigurationFactory.java |  6 +-
 .../server/conf/TableConfiguration.java         |  2 +-
 .../server/conf/ZooConfigurationFactory.java    |  2 +-
 .../server/constraints/MetadataConstraints.java | 10 +--
 .../server/fs/PerTableVolumeChooser.java        |  2 +-
 .../server/fs/PreferredVolumeChooser.java       |  8 +--
 .../accumulo/server/fs/VolumeManagerImpl.java   |  4 +-
 .../apache/accumulo/server/fs/VolumeUtil.java   | 16 ++---
 .../apache/accumulo/server/init/Initialize.java | 13 ++--
 .../iterators/MetadataBulkLoadFilter.java       |  2 +-
 .../accumulo/server/master/LiveTServerSet.java  | 20 +++---
 .../master/balancer/ChaoticLoadBalancer.java    |  8 +--
 .../master/balancer/DefaultLoadBalancer.java    | 12 ++--
 .../server/master/balancer/GroupBalancer.java   | 10 +--
 .../balancer/HostRegexTableLoadBalancer.java    | 14 ++--
 .../master/balancer/TableLoadBalancer.java      | 10 +--
 .../server/master/balancer/TabletBalancer.java  |  2 +-
 .../server/master/state/DeadServerList.java     |  2 +-
 .../master/state/MetaDataTableScanner.java      |  2 +-
 .../server/master/state/TabletServerState.java  |  4 +-
 .../master/state/TabletStateChangeIterator.java | 12 ++--
 .../master/state/ZooTabletStateStore.java       |  2 +-
 .../master/tableOps/UserCompactionConfig.java   |  2 +-
 .../server/metrics/AbstractMetricsImpl.java     |  2 +-
 .../accumulo/server/monitor/LogService.java     |  2 +-
 .../server/problems/ProblemReports.java         |  4 +-
 .../server/replication/StatusCombiner.java      |  2 +-
 .../apache/accumulo/server/rpc/RpcWrapper.java  |  2 +-
 .../server/rpc/TCredentialsUpdatingWrapper.java |  2 +-
 .../accumulo/server/rpc/TServerUtils.java       |  4 +-
 .../server/rpc/UGIAssumingProcessor.java        |  4 +-
 .../security/AuditedSecurityOperation.java      |  4 +-
 .../AuthenticationTokenSecretManager.java       |  4 +-
 .../security/handler/InsecureAuthenticator.java |  2 +-
 .../security/handler/ZKAuthenticator.java       |  4 +-
 .../server/security/handler/ZKAuthorizor.java   |  4 +-
 .../server/security/handler/ZKPermHandler.java  | 12 ++--
 .../server/security/handler/ZKSecurityTool.java |  6 +-
 .../tabletserver/LargestFirstMemoryManager.java |  8 +--
 .../org/apache/accumulo/server/util/Admin.java  | 14 ++--
 .../accumulo/server/util/ChangeSecret.java      |  4 +-
 .../server/util/CheckForMetadataProblems.java   |  4 +-
 .../accumulo/server/util/DeleteZooInstance.java |  4 +-
 .../accumulo/server/util/FileSystemMonitor.java |  6 +-
 .../apache/accumulo/server/util/FileUtil.java   | 20 +++---
 .../accumulo/server/util/ListInstances.java     |  4 +-
 .../accumulo/server/util/ListVolumesUsed.java   |  6 +-
 .../accumulo/server/util/LocalityCheck.java     |  6 +-
 .../accumulo/server/util/LoginProperties.java   |  2 +-
 .../server/util/MasterMetadataUtil.java         |  8 +--
 .../accumulo/server/util/MetadataTableUtil.java | 26 +++----
 .../util/RemoveEntriesForMissingFiles.java      |  4 +-
 .../server/util/ReplicationTableUtil.java       |  2 +-
 .../accumulo/server/util/RestoreZookeeper.java  |  2 +-
 .../accumulo/server/util/TableDiskUsage.java    | 32 ++++-----
 .../accumulo/server/util/TableInfoUtil.java     |  2 +-
 .../accumulo/server/util/TabletIterator.java    |  2 +-
 .../server/util/VerifyTabletAssignments.java    | 10 +--
 .../server/zookeeper/DistributedWorkQueue.java  |  2 +-
 .../accumulo/server/ServerConstantsTest.java    |  2 +-
 .../server/client/BulkImporterTest.java         |  2 +-
 .../server/conf/NamespaceConfigurationTest.java |  4 +-
 .../server/conf/TableConfigurationTest.java     |  4 +-
 .../conf/ZooCachePropertyAccessorTest.java      | 12 ++--
 .../apache/accumulo/server/fs/FileRefTest.java  |  2 +-
 .../accumulo/server/fs/VolumeUtilTest.java      | 48 ++++++-------
 .../iterators/MetadataBulkLoadFilterTest.java   |  6 +-
 .../balancer/ChaoticLoadBalancerTest.java       | 18 ++---
 .../balancer/DefaultLoadBalancerTest.java       | 28 ++++----
 .../master/balancer/GroupBalancerTest.java      |  2 +-
 ...gexTableLoadBalancerReconfigurationTest.java |  4 +-
 .../HostRegexTableLoadBalancerTest.java         |  6 +-
 .../master/balancer/TableLoadBalancerTest.java  | 10 +--
 .../master/state/TabletLocationStateTest.java   | 12 ++--
 .../problems/ProblemReportingIteratorTest.java  |  2 +-
 .../accumulo/server/rpc/RpcWrapperTest.java     | 11 ++-
 ...redentialsUpdatingInvocationHandlerTest.java | 26 +++----
 .../security/handler/ZKAuthenticatorTest.java   |  4 +-
 .../server/tablets/LogicalTimeTest.java         |  4 +-
 .../accumulo/server/tablets/MillisTimeTest.java |  4 +-
 .../accumulo/server/util/DefaultMapTest.java    |  2 +-
 .../server/util/FileSystemMonitorTest.java      |  2 +-
 .../accumulo/server/util/FileUtilTest.java      | 12 ++--
 .../server/util/ReplicationTableUtilTest.java   |  2 +-
 .../accumulo/server/util/TServerUtilsTest.java  |  2 +-
 .../accumulo/gc/GarbageCollectionAlgorithm.java |  8 +--
 .../accumulo/gc/SimpleGarbageCollector.java     |  4 +-
 .../gc/GarbageCollectWriteAheadLogsTest.java    |  6 +-
 .../accumulo/gc/GarbageCollectionTest.java      | 18 ++---
 .../accumulo/master/FateServiceHandler.java     | 36 +++++-----
 .../java/org/apache/accumulo/master/Master.java | 44 ++++++------
 .../master/MasterClientServiceHandler.java      |  6 +-
 .../accumulo/master/TabletGroupWatcher.java     | 24 +++----
 .../master/recovery/RecoveryManager.java        |  6 +-
 .../accumulo/master/state/TableStats.java       |  4 +-
 .../master/tableOps/CompactionDriver.java       |  2 +-
 .../accumulo/master/tableOps/CopyFailed.java    |  8 +--
 .../accumulo/master/tableOps/LoadFiles.java     |  8 +--
 .../master/tableOps/PopulateMetadataTable.java  |  2 +-
 .../accumulo/master/tableOps/TraceRepo.java     |  2 +-
 .../master/tableOps/WriteExportFiles.java       |  2 +-
 .../apache/accumulo/master/util/FateAdmin.java  | 10 +--
 .../apache/accumulo/master/DefaultMapTest.java  |  2 +-
 .../master/state/RootTabletStateStoreTest.java  | 10 +--
 .../org/apache/accumulo/monitor/Monitor.java    | 56 +++++++--------
 .../accumulo/monitor/ZooKeeperStatus.java       |  4 +-
 .../monitor/servlets/GcStatusServlet.java       |  2 +-
 .../accumulo/monitor/servlets/JSONServlet.java  | 10 +--
 .../monitor/servlets/MasterServlet.java         |  8 +--
 .../monitor/servlets/ProblemServlet.java        |  2 +-
 .../monitor/servlets/ReplicationServlet.java    |  2 +-
 .../accumulo/monitor/servlets/ShellServlet.java |  2 +-
 .../monitor/servlets/TServersServlet.java       |  8 +--
 .../monitor/servlets/TablesServlet.java         |  8 +--
 .../accumulo/monitor/servlets/VisServlet.java   |  2 +-
 .../accumulo/monitor/servlets/XMLServlet.java   |  2 +-
 .../accumulo/monitor/servlets/trace/Basic.java  |  2 +-
 .../monitor/servlets/trace/Summary.java         |  2 +-
 .../org/apache/accumulo/monitor/util/Table.java |  8 +--
 .../apache/accumulo/monitor/util/TableRow.java  |  4 +-
 .../accumulo/monitor/ShowTraceLinkTypeTest.java |  2 +-
 .../accumulo/monitor/ZooKeeperStatusTest.java   |  4 +-
 .../accumulo/tracer/AsyncSpanReceiver.java      |  6 +-
 .../org/apache/accumulo/tracer/SpanTree.java    |  8 +--
 .../org/apache/accumulo/tracer/TraceDump.java   |  4 +-
 .../org/apache/accumulo/tracer/TraceServer.java |  2 +-
 .../apache/accumulo/tracer/ZooTraceClient.java  |  4 +-
 .../org/apache/accumulo/tracer/TracerTest.java  |  2 +-
 .../accumulo/tserver/CompactionQueue.java       |  2 +-
 .../tserver/ConditionalMutationSet.java         |  4 +-
 .../apache/accumulo/tserver/FileManager.java    | 34 ++++-----
 .../apache/accumulo/tserver/InMemoryMap.java    |  8 +--
 .../org/apache/accumulo/tserver/NativeMap.java  | 10 +--
 .../org/apache/accumulo/tserver/RowLocks.java   | 10 +--
 .../tserver/TabletIteratorEnvironment.java      |  4 +-
 .../apache/accumulo/tserver/TabletServer.java   | 75 ++++++++++----------
 .../tserver/TabletServerResourceManager.java    |  8 +--
 .../apache/accumulo/tserver/WriteTracker.java   |  4 +-
 .../tserver/compaction/CompactionPlan.java      |  8 +--
 .../compaction/DefaultCompactionStrategy.java   | 10 +--
 .../compaction/SizeLimitCompactionStrategy.java |  2 +-
 .../tserver/constraints/ConstraintChecker.java  |  2 +-
 .../apache/accumulo/tserver/log/DfsLogger.java  | 14 ++--
 .../apache/accumulo/tserver/log/LogSorter.java  |  6 +-
 .../accumulo/tserver/log/SortedLogRecovery.java |  4 +-
 .../tserver/log/TabletServerLogger.java         |  6 +-
 .../accumulo/tserver/logger/LogFileValue.java   |  2 +-
 .../accumulo/tserver/logger/LogReader.java      |  4 +-
 .../replication/AccumuloReplicaSystem.java      |  2 +-
 .../accumulo/tserver/scan/LookupTask.java       | 10 +--
 .../apache/accumulo/tserver/scan/ScanTask.java  |  4 +-
 .../tserver/session/MultiScanSession.java       |  2 +-
 .../tserver/session/SessionManager.java         | 16 ++---
 .../accumulo/tserver/session/UpdateSession.java |  8 +--
 .../accumulo/tserver/tablet/CompactionInfo.java |  6 +-
 .../tserver/tablet/CompactionWatcher.java       |  6 +-
 .../accumulo/tserver/tablet/Compactor.java      |  8 +--
 .../tserver/tablet/CountingIterator.java        |  2 +-
 .../tserver/tablet/DatafileManager.java         | 26 +++----
 .../accumulo/tserver/tablet/RootFiles.java      |  2 +-
 .../accumulo/tserver/tablet/ScanDataSource.java |  2 +-
 .../apache/accumulo/tserver/tablet/Tablet.java  | 74 +++++++++----------
 .../accumulo/tserver/tablet/TabletMemory.java   |  2 +-
 .../accumulo/tserver/AssignmentWatcherTest.java |  2 +-
 .../tserver/CheckTabletMetadataTest.java        | 10 +--
 .../accumulo/tserver/CountingIteratorTest.java  |  2 +-
 .../accumulo/tserver/InMemoryMapTest.java       |  4 +-
 .../DefaultCompactionStrategyTest.java          | 10 +--
 .../SizeLimitCompactionStrategyTest.java        |  6 +-
 .../constraints/ConstraintCheckerTest.java      |  2 +-
 .../accumulo/tserver/log/DfsLoggerTest.java     |  2 +-
 .../tserver/log/SortedLogRecoveryTest.java      | 44 ++++++------
 .../accumulo/tserver/tablet/RootFilesTest.java  | 10 +--
 .../java/org/apache/accumulo/shell/Shell.java   | 22 +++---
 .../apache/accumulo/shell/ShellOptionsJC.java   |  6 +-
 .../java/org/apache/accumulo/shell/Token.java   |  8 +--
 .../commands/ActiveCompactionIterator.java      |  8 +--
 .../shell/commands/ActiveScanIterator.java      |  2 +-
 .../shell/commands/AddSplitsCommand.java        |  2 +-
 .../shell/commands/CloneTableCommand.java       |  4 +-
 .../accumulo/shell/commands/ConfigCommand.java  | 12 ++--
 .../shell/commands/CreateTableCommand.java      |  4 +-
 .../accumulo/shell/commands/DUCommand.java      |  2 +-
 .../shell/commands/DeleteAuthsCommand.java      |  2 +-
 .../shell/commands/ExtensionCommand.java        |  6 +-
 .../accumulo/shell/commands/FateCommand.java    |  6 +-
 .../shell/commands/GetAuthsCommand.java         |  2 +-
 .../accumulo/shell/commands/HelpCommand.java    |  2 +-
 .../accumulo/shell/commands/InsertCommand.java  |  2 +-
 .../shell/commands/ListBulkCommand.java         |  2 +-
 .../shell/commands/ListCompactionsCommand.java  |  2 +-
 .../shell/commands/ListIterCommand.java         |  4 +-
 .../shell/commands/ListScansCommand.java        |  2 +-
 .../shell/commands/NamespacesCommand.java       |  2 +-
 .../accumulo/shell/commands/PingCommand.java    |  2 +-
 .../shell/commands/QuotedStringTokenizer.java   |  2 +-
 .../accumulo/shell/commands/ScriptCommand.java  |  4 +-
 .../shell/commands/SetGroupsCommand.java        |  4 +-
 .../accumulo/shell/commands/SetIterCommand.java |  6 +-
 .../shell/commands/SetScanIterCommand.java      |  4 +-
 .../shell/commands/SetShellIterCommand.java     |  4 +-
 .../accumulo/shell/commands/TableOperation.java |  2 +-
 .../accumulo/shell/commands/TablesCommand.java  |  2 +-
 .../accumulo/shell/ShellSetInstanceTest.java    |  2 +-
 .../shell/commands/DeleteTableCommandTest.java  |  4 +-
 .../shell/format/DeleterFormatterTest.java      |  9 +--
 .../start/classloader/AccumuloClassLoader.java  |  6 +-
 .../vfs/AccumuloReloadingVFSClassLoader.java    |  4 +-
 .../classloader/vfs/AccumuloVFSClassLoader.java |  6 +-
 .../start/classloader/vfs/ContextManager.java   |  4 +-
 .../AccumuloClusterPropertyConfiguration.java   |  2 +-
 .../accumulo/test/AssignmentThreadsIT.java      |  2 +-
 .../apache/accumulo/test/AuditMessageIT.java    |  4 +-
 .../test/BadDeleteMarkersCreatedIT.java         |  2 +-
 .../apache/accumulo/test/BalanceFasterIT.java   |  4 +-
 .../org/apache/accumulo/test/BalanceIT.java     |  2 +-
 .../test/BalanceWithOfflineTableIT.java         |  2 +-
 .../accumulo/test/BatchWriterIterator.java      |  2 +-
 .../accumulo/test/BulkImportDirectory.java      |  2 +-
 .../accumulo/test/BulkImportMonitoringIT.java   |  2 +-
 .../accumulo/test/ClientSideIteratorIT.java     |  6 +-
 .../java/org/apache/accumulo/test/CloneIT.java  | 10 +--
 .../accumulo/test/ConditionalWriterIT.java      | 36 +++++-----
 .../test/ConfigurableMajorCompactionIT.java     |  2 +-
 .../test/CreateTableWithNewTableConfigIT.java   |  2 +-
 .../apache/accumulo/test/FairVolumeChooser.java |  2 +-
 .../accumulo/test/FaultyConditionalWriter.java  |  4 +-
 .../org/apache/accumulo/test/FindMaxIT.java     |  2 +-
 .../apache/accumulo/test/GetFileInfoBulkIT.java |  2 +-
 .../apache/accumulo/test/IMMLGBenchmark.java    |  8 +--
 .../org/apache/accumulo/test/InMemoryMapIT.java |  8 +--
 .../accumulo/test/InterruptibleScannersIT.java  |  2 +-
 .../apache/accumulo/test/LargeSplitRowIT.java   |  4 +-
 .../org/apache/accumulo/test/LocatorIT.java     |  2 +-
 .../org/apache/accumulo/test/ManySplitIT.java   |  2 +-
 .../test/MasterRepairsDualAssignmentIT.java     |  6 +-
 .../org/apache/accumulo/test/MetaSplitIT.java   |  8 +--
 .../accumulo/test/MultiTableBatchWriterIT.java  | 16 ++---
 .../accumulo/test/NativeMapPerformanceTest.java |  2 +-
 .../accumulo/test/NativeMapStressTest.java      |  8 +--
 .../accumulo/test/QueryMetadataTable.java       |  4 +-
 .../test/RewriteTabletDirectoriesIT.java        |  2 +-
 .../java/org/apache/accumulo/test/SampleIT.java |  6 +-
 .../org/apache/accumulo/test/ShellServerIT.java |  6 +-
 .../accumulo/test/SplitCancelsMajCIT.java       |  4 +-
 .../test/TableConfigurationUpdateIT.java        |  2 +-
 .../apache/accumulo/test/TableOperationsIT.java |  4 +-
 .../apache/accumulo/test/TestBinaryRows.java    |  2 +-
 .../org/apache/accumulo/test/TestIngest.java    |  2 +-
 .../accumulo/test/TestMultiTableIngest.java     |  2 +-
 .../apache/accumulo/test/TestRandomDeletes.java |  4 +-
 .../accumulo/test/TextMemoryUsageTest.java      |  2 +-
 .../accumulo/test/TransportCachingIT.java       |  2 +-
 .../accumulo/test/UserCompactionStrategyIT.java |  4 +-
 .../accumulo/test/VerifySerialRecoveryIT.java   |  2 +-
 .../apache/accumulo/test/VolumeChooserIT.java   |  6 +-
 .../java/org/apache/accumulo/test/VolumeIT.java | 14 ++--
 .../apache/accumulo/test/WaitForBalanceIT.java  |  4 +-
 .../test/continuous/ContinuousBatchWalker.java  | 12 ++--
 .../test/continuous/ContinuousIngest.java       |  2 +-
 .../continuous/ContinuousStatsCollector.java    |  2 +-
 .../test/continuous/ContinuousVerify.java       |  2 +-
 .../test/continuous/ContinuousWalk.java         |  4 +-
 .../accumulo/test/continuous/Histogram.java     | 12 ++--
 .../test/continuous/PrintScanTimeHistogram.java |  4 +-
 .../accumulo/test/continuous/TimeBinner.java    | 10 +--
 .../test/continuous/UndefinedAnalyzer.java      | 14 ++--
 .../test/examples/simple/dirlist/CountIT.java   | 10 +--
 .../simple/filedata/ChunkInputFormatIT.java     |  4 +-
 .../simple/filedata/ChunkInputStreamIT.java     |  8 +--
 .../accumulo/test/functional/AddSplitIT.java    |  6 +-
 .../functional/BalanceAfterCommsFailureIT.java  |  6 +-
 .../BalanceInPresenceOfOfflineTableIT.java      |  2 +-
 .../test/functional/BatchScanSplitIT.java       |  6 +-
 .../test/functional/BatchWriterFlushIT.java     |  2 +-
 .../accumulo/test/functional/BinaryIT.java      |  2 +-
 .../accumulo/test/functional/BloomFilterIT.java |  4 +-
 .../accumulo/test/functional/BulkFileIT.java    |  2 +-
 .../test/functional/CacheTestReader.java        |  2 +-
 .../test/functional/CacheTestWriter.java        |  4 +-
 .../test/functional/ChaoticBalancerIT.java      |  2 +-
 .../accumulo/test/functional/CloneTestIT.java   | 20 +++---
 .../functional/ConfigurableCompactionIT.java    |  2 +-
 .../accumulo/test/functional/ConstraintIT.java  |  2 +-
 .../test/functional/CreateAndUseIT.java         |  4 +-
 .../accumulo/test/functional/DeleteRowsIT.java  |  4 +-
 .../test/functional/DeleteRowsSplitIT.java      |  6 +-
 .../functional/DeleteTableDuringSplitIT.java    |  6 +-
 .../accumulo/test/functional/DurabilityIT.java  |  2 +-
 .../test/functional/FateStarvationIT.java       |  2 +-
 .../test/functional/FunctionalTestUtils.java    |  4 +-
 .../test/functional/HalfDeadTServerIT.java      |  2 +-
 .../accumulo/test/functional/LargeRowIT.java    |  2 +-
 .../accumulo/test/functional/LogicalTimeIT.java |  2 +-
 .../accumulo/test/functional/MaxOpenIT.java     |  2 +-
 .../accumulo/test/functional/MergeIT.java       | 12 ++--
 .../accumulo/test/functional/MetadataIT.java    |  8 +--
 .../test/functional/MetadataMaxFilesIT.java     |  2 +-
 .../accumulo/test/functional/NativeMapIT.java   |  6 +-
 .../accumulo/test/functional/PermissionsIT.java | 10 +--
 .../accumulo/test/functional/ReadWriteIT.java   |  6 +-
 .../accumulo/test/functional/RowDeleteIT.java   |  2 +-
 .../accumulo/test/functional/ScanIdIT.java      |  6 +-
 .../test/functional/ScanIteratorIT.java         |  6 +-
 .../accumulo/test/functional/ScanRangeIT.java   |  2 +-
 .../test/functional/SessionBlockVerifyIT.java   |  2 +-
 .../accumulo/test/functional/ShutdownIT.java    |  2 +-
 .../functional/SimpleBalancerFairnessIT.java    |  2 +-
 .../test/functional/SplitRecoveryIT.java        | 12 ++--
 .../accumulo/test/functional/TabletIT.java      |  2 +-
 .../functional/TabletStateChangeIteratorIT.java |  6 +-
 .../accumulo/test/functional/VisibilityIT.java  | 18 ++---
 .../accumulo/test/functional/WALSunnyDayIT.java |  2 +-
 .../accumulo/test/functional/WriteLotsIT.java   |  2 +-
 .../accumulo/test/functional/ZombieTServer.java |  5 +-
 .../accumulo/test/functional/ZooCacheIT.java    |  4 +-
 .../test/functional/ZookeeperRestartIT.java     |  2 +-
 .../test/mapred/AccumuloInputFormatIT.java      |  2 +-
 .../mapred/AccumuloMultiTableInputFormatIT.java |  2 +-
 .../test/mapred/AccumuloRowInputFormatIT.java   |  6 +-
 .../test/mapreduce/AccumuloInputFormatIT.java   | 10 +--
 .../AccumuloMultiTableInputFormatIT.java        |  2 +-
 .../mapreduce/AccumuloRowInputFormatIT.java     |  6 +-
 .../test/performance/RollWALPerformanceIT.java  |  2 +-
 .../metadata/MetadataBatchScanTest.java         |  8 +--
 .../performance/scan/CollectTabletStats.java    | 24 +++----
 .../test/performance/thrift/NullTserver.java    |  6 +-
 .../accumulo/test/proxy/ProxyDurabilityIT.java  |  4 +-
 .../accumulo/test/proxy/SimpleProxyBase.java    | 28 ++++----
 .../accumulo/test/proxy/TestProxyClient.java    |  4 +-
 .../accumulo/test/proxy/TestProxyReadWrite.java | 20 +++---
 .../test/proxy/TestProxySecurityOperations.java |  4 +-
 .../test/proxy/TestProxyTableOperations.java    | 12 ++--
 .../accumulo/test/randomwalk/Framework.java     |  2 +-
 .../apache/accumulo/test/randomwalk/Module.java | 18 ++---
 .../apache/accumulo/test/randomwalk/State.java  |  2 +-
 .../test/randomwalk/bulk/BulkPlusOne.java       |  8 +--
 .../accumulo/test/randomwalk/bulk/Split.java    |  2 +-
 .../test/randomwalk/concurrent/AddSplits.java   |  4 +-
 .../test/randomwalk/concurrent/BatchScan.java   |  2 +-
 .../test/randomwalk/concurrent/BulkImport.java  |  2 +-
 .../concurrent/ChangeAuthorizations.java        |  2 +-
 .../concurrent/ChangePermissions.java           | 12 ++--
 .../concurrent/ConcurrentFixture.java           |  2 +-
 .../test/randomwalk/concurrent/DeleteRange.java |  2 +-
 .../randomwalk/concurrent/IsolatedScan.java     |  2 +-
 .../test/randomwalk/concurrent/Merge.java       |  2 +-
 .../test/randomwalk/concurrent/Setup.java       |  6 +-
 .../randomwalk/concurrent/StopTabletServer.java |  4 +-
 .../test/randomwalk/conditional/Init.java       |  4 +-
 .../test/randomwalk/conditional/Split.java      |  2 +-
 .../test/randomwalk/image/ImageFixture.java     |  8 +--
 .../test/randomwalk/image/ScanMeta.java         |  6 +-
 .../accumulo/test/randomwalk/image/TableOp.java |  2 +-
 .../test/randomwalk/multitable/CopyTable.java   |  2 +-
 .../test/randomwalk/multitable/CreateTable.java |  2 +-
 .../test/randomwalk/security/TableOp.java       |  2 +-
 .../randomwalk/security/WalkingSecurity.java    |  4 +-
 .../test/randomwalk/sequential/BatchVerify.java |  4 +-
 .../test/randomwalk/shard/CompactFilter.java    |  6 +-
 .../test/randomwalk/shard/DeleteSomeDocs.java   |  2 +-
 .../test/randomwalk/shard/DeleteWord.java       |  2 +-
 .../test/randomwalk/shard/ExportIndex.java      |  8 +--
 .../accumulo/test/randomwalk/shard/Grep.java    |  4 +-
 .../accumulo/test/randomwalk/shard/Insert.java  |  2 +-
 .../accumulo/test/randomwalk/shard/Merge.java   |  2 +-
 .../accumulo/test/randomwalk/shard/Search.java  |  2 +-
 .../test/randomwalk/shard/ShardFixture.java     |  2 +-
 .../test/replication/CyclicReplicationIT.java   |  2 +-
 ...bageCollectorCommunicatesWithTServersIT.java |  6 +-
 .../replication/MultiInstanceReplicationIT.java |  2 +-
 .../test/replication/StatusCombinerMacIT.java   |  2 +-
 .../UnorderedWorkAssignerReplicationIT.java     |  2 +-
 .../test/replication/merkle/MerkleTree.java     |  6 +-
 .../test/replication/merkle/MerkleTreeNode.java |  2 +-
 .../replication/merkle/cli/ComputeRootHash.java |  2 +-
 .../replication/merkle/cli/GenerateHashes.java  |  4 +-
 .../accumulo/test/scalability/ScaleTest.java    |  2 +-
 .../apache/accumulo/test/util/CertUtils.java    |  2 +-
 .../accumulo/test/iterator/RegExTest.java       |  2 +-
 671 files changed, 2399 insertions(+), 2410 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java b/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java
index 71ee6d1..c07c4cb 100644
--- a/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java
+++ b/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java
@@ -122,7 +122,7 @@ public class ClientOpts extends Help {
 
   @DynamicParameter(names = "-l",
       description = "login properties in the format key=value. Reuse -l for each property (prompt for properties if this option is missing")
-  public Map<String,String> loginProps = new LinkedHashMap<String,String>();
+  public Map<String,String> loginProps = new LinkedHashMap<>();
 
   public AuthenticationToken getToken() {
     if (null != tokenClassName) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/BatchWriterConfig.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/BatchWriterConfig.java b/core/src/main/java/org/apache/accumulo/core/client/BatchWriterConfig.java
index 3421f76..521e0ce 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/BatchWriterConfig.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/BatchWriterConfig.java
@@ -196,7 +196,7 @@ public class BatchWriterConfig implements Writable {
   @Override
   public void write(DataOutput out) throws IOException {
     // write this out in a human-readable way
-    ArrayList<String> fields = new ArrayList<String>();
+    ArrayList<String> fields = new ArrayList<>();
     if (maxMemory != null)
       addField(fields, "maxMemory", maxMemory);
     if (maxLatency != null)

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java b/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java
index d5bf920..1b9b380 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java
@@ -145,7 +145,7 @@ public class ClientConfiguration extends CompositeConfiguration {
           return prop;
       return null;
     }
-  };
+  }
 
   public ClientConfiguration(String configFile) throws ConfigurationException {
     this(new PropertiesConfiguration(), configFile);
@@ -215,7 +215,7 @@ public class ClientConfiguration extends CompositeConfiguration {
 
   private static ClientConfiguration loadFromSearchPath(List<String> paths) {
     try {
-      List<Configuration> configs = new LinkedList<Configuration>();
+      List<Configuration> configs = new LinkedList<>();
       for (String path : paths) {
         File conf = new File(path);
         if (conf.isFile() && conf.canRead()) {
@@ -272,7 +272,7 @@ public class ClientConfiguration extends CompositeConfiguration {
       // ~/.accumulo/config
       // $ACCUMULO_CONF_DIR/client.conf -OR- $ACCUMULO_HOME/conf/client.conf (depending on whether $ACCUMULO_CONF_DIR is set)
       // /etc/accumulo/client.conf
-      clientConfPaths = new LinkedList<String>();
+      clientConfPaths = new LinkedList<>();
       clientConfPaths.add(System.getProperty("user.home") + File.separator + USER_ACCUMULO_DIR_NAME + File.separator + USER_CONF_FILENAME);
       if (System.getenv("ACCUMULO_CONF_DIR") != null) {
         clientConfPaths.add(System.getenv("ACCUMULO_CONF_DIR") + File.separator + GLOBAL_CONF_FILENAME);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/ClientSideIteratorScanner.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/ClientSideIteratorScanner.java b/core/src/main/java/org/apache/accumulo/core/client/ClientSideIteratorScanner.java
index 9f9449a..d4622c6 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/ClientSideIteratorScanner.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/ClientSideIteratorScanner.java
@@ -251,7 +251,7 @@ public class ClientSideIteratorScanner extends ScannerOptions implements Scanner
 
     smi.samplerConfig = getSamplerConfiguration();
 
-    final TreeMap<Integer,IterInfo> tm = new TreeMap<Integer,IterInfo>();
+    final TreeMap<Integer,IterInfo> tm = new TreeMap<>();
 
     for (IterInfo iterInfo : serverSideIteratorList) {
       tm.put(iterInfo.getPriority(), iterInfo);
@@ -265,7 +265,7 @@ public class ClientSideIteratorScanner extends ScannerOptions implements Scanner
       throw new RuntimeException(e);
     }
 
-    final Set<ByteSequence> colfs = new TreeSet<ByteSequence>();
+    final Set<ByteSequence> colfs = new TreeSet<>();
     for (Column c : this.getFetchedColumns()) {
       colfs.add(new ArrayByteSequence(c.getColumnFamily()));
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/IsolatedScanner.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/IsolatedScanner.java b/core/src/main/java/org/apache/accumulo/core/client/IsolatedScanner.java
index 0479f3b..90e8637 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/IsolatedScanner.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/IsolatedScanner.java
@@ -194,7 +194,7 @@ public class IsolatedScanner extends ScannerOptions implements Scanner {
 
   public static class MemoryRowBuffer implements RowBuffer {
 
-    private ArrayList<Entry<Key,Value>> buffer = new ArrayList<Entry<Key,Value>>();
+    private ArrayList<Entry<Key,Value>> buffer = new ArrayList<>();
 
     @Override
     public void add(Entry<Key,Value> entry) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/IteratorSetting.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/IteratorSetting.java b/core/src/main/java/org/apache/accumulo/core/client/IteratorSetting.java
index e7bbbdf..a6d9a09 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/IteratorSetting.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/IteratorSetting.java
@@ -140,7 +140,7 @@ public class IteratorSetting implements Writable {
     setPriority(priority);
     setName(name);
     setIteratorClass(iteratorClass);
-    this.properties = new HashMap<String,String>();
+    this.properties = new HashMap<>();
     addOptions(properties);
   }
 
@@ -209,7 +209,7 @@ public class IteratorSetting implements Writable {
    * @since 1.5.0
    */
   public IteratorSetting(DataInput din) throws IOException {
-    this.properties = new HashMap<String,String>();
+    this.properties = new HashMap<>();
     this.readFields(din);
   }
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/MutationsRejectedException.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/MutationsRejectedException.java b/core/src/main/java/org/apache/accumulo/core/client/MutationsRejectedException.java
index e8f675b..676957a 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/MutationsRejectedException.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/MutationsRejectedException.java
@@ -47,7 +47,7 @@ public class MutationsRejectedException extends AccumuloException {
   private int unknownErrors;
 
   private static <K,V,L> Map<L,V> transformKeys(Map<K,V> map, Function<K,L> keyFunction) {
-    HashMap<L,V> ret = new HashMap<L,V>();
+    HashMap<L,V> ret = new HashMap<>();
     for (Entry<K,V> entry : map.entrySet()) {
       ret.put(keyFunction.apply(entry.getKey()), entry.getValue());
     }
@@ -125,7 +125,7 @@ public class MutationsRejectedException extends AccumuloException {
   }
 
   private static String format(Map<TabletId,Set<SecurityErrorCode>> hashMap, Instance instance) {
-    Map<String,Set<SecurityErrorCode>> result = new HashMap<String,Set<SecurityErrorCode>>();
+    Map<String,Set<SecurityErrorCode>> result = new HashMap<>();
 
     for (Entry<TabletId,Set<SecurityErrorCode>> entry : hashMap.entrySet()) {
       String tableInfo = Tables.getPrintableTableInfoFromId(instance, entry.getKey().getTableId().toString());
@@ -153,7 +153,7 @@ public class MutationsRejectedException extends AccumuloException {
    */
   @Deprecated
   public List<org.apache.accumulo.core.data.KeyExtent> getAuthorizationFailures() {
-    return new ArrayList<org.apache.accumulo.core.data.KeyExtent>(Collections2.transform(af.keySet(), TabletIdImpl.TID_2_KE_OLD));
+    return new ArrayList<>(Collections2.transform(af.keySet(), TabletIdImpl.TID_2_KE_OLD));
   }
 
   /**

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/RowIterator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/RowIterator.java b/core/src/main/java/org/apache/accumulo/core/client/RowIterator.java
index 190b0b2..c8dab71 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/RowIterator.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/RowIterator.java
@@ -107,7 +107,7 @@ public class RowIterator implements Iterator<Iterator<Entry<Key,Value>>> {
    * Create an iterator from an (ordered) sequence of KeyValue pairs.
    */
   public RowIterator(Iterator<Entry<Key,Value>> iterator) {
-    this.iter = new PeekingIterator<Entry<Key,Value>>(iterator);
+    this.iter = new PeekingIterator<>(iterator);
   }
 
   /**

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/TimedOutException.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/TimedOutException.java b/core/src/main/java/org/apache/accumulo/core/client/TimedOutException.java
index 5ec9c59..e5bba3e 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/TimedOutException.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/TimedOutException.java
@@ -34,7 +34,7 @@ public class TimedOutException extends RuntimeException {
       return set.toString();
     }
 
-    return new ArrayList<String>(set).subList(0, 10).toString() + " ... " + (set.size() - 10) + " servers not shown";
+    return new ArrayList<>(set).subList(0, 10).toString() + " ... " + (set.size() - 10) + " servers not shown";
   }
 
   public TimedOutException(Set<String> timedoutServers) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/admin/ActiveCompaction.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/admin/ActiveCompaction.java b/core/src/main/java/org/apache/accumulo/core/client/admin/ActiveCompaction.java
index 89d30b1..5228391 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/admin/ActiveCompaction.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/admin/ActiveCompaction.java
@@ -45,7 +45,7 @@ public abstract class ActiveCompaction {
      * compaction that merges all of a tablets files into one file
      */
     FULL
-  };
+  }
 
   public static enum CompactionReason {
     /**
@@ -68,7 +68,7 @@ public abstract class ActiveCompaction {
      * Compaction initiated to close a unload a tablet
      */
     CLOSE
-  };
+  }
 
   /**
    *

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/admin/NewTableConfiguration.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/admin/NewTableConfiguration.java b/core/src/main/java/org/apache/accumulo/core/client/admin/NewTableConfiguration.java
index e7dc898..4694e1e 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/admin/NewTableConfiguration.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/admin/NewTableConfiguration.java
@@ -41,7 +41,7 @@ public class NewTableConfiguration {
 
   private boolean limitVersion = true;
 
-  private Map<String,String> properties = new HashMap<String,String>();
+  private Map<String,String> properties = new HashMap<>();
   private SamplerConfiguration samplerConfiguration;
 
   /**
@@ -90,7 +90,7 @@ public class NewTableConfiguration {
     checkArgument(prop != null, "properties is null");
     SamplerConfigurationImpl.checkDisjoint(prop, samplerConfiguration);
 
-    this.properties = new HashMap<String,String>(prop);
+    this.properties = new HashMap<>(prop);
     return this;
   }
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/impl/ActiveCompactionImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/ActiveCompactionImpl.java b/core/src/main/java/org/apache/accumulo/core/client/impl/ActiveCompactionImpl.java
index 838baa9..bdd5d51 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/ActiveCompactionImpl.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/ActiveCompactionImpl.java
@@ -104,7 +104,7 @@ public class ActiveCompactionImpl extends ActiveCompaction {
 
   @Override
   public List<IteratorSetting> getIterators() {
-    ArrayList<IteratorSetting> ret = new ArrayList<IteratorSetting>();
+    ArrayList<IteratorSetting> ret = new ArrayList<>();
 
     for (IterInfo ii : tac.getSsiList()) {
       IteratorSetting settings = new IteratorSetting(ii.getPriority(), ii.getIterName(), ii.getClassName());

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/impl/ActiveScanImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/ActiveScanImpl.java b/core/src/main/java/org/apache/accumulo/core/client/impl/ActiveScanImpl.java
index 7015303..9021190 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/ActiveScanImpl.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/ActiveScanImpl.java
@@ -67,12 +67,12 @@ public class ActiveScanImpl extends ActiveScan {
     this.extent = new KeyExtent(activeScan.extent);
     this.authorizations = new Authorizations(activeScan.authorizations);
 
-    this.columns = new ArrayList<Column>(activeScan.columns.size());
+    this.columns = new ArrayList<>(activeScan.columns.size());
 
     for (TColumn tcolumn : activeScan.columns)
       this.columns.add(new Column(tcolumn));
 
-    this.ssiList = new ArrayList<String>();
+    this.ssiList = new ArrayList<>();
     for (IterInfo ii : activeScan.ssiList) {
       this.ssiList.add(ii.iterName + "=" + ii.priority + "," + ii.className);
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/impl/CompressedIterators.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/CompressedIterators.java b/core/src/main/java/org/apache/accumulo/core/client/impl/CompressedIterators.java
index 96d58a7..c227b40 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/CompressedIterators.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/CompressedIterators.java
@@ -32,13 +32,13 @@ public class CompressedIterators {
   private List<String> symbolTable;
 
   public static class IterConfig {
-    public List<IterInfo> ssiList = new ArrayList<IterInfo>();
-    public Map<String,Map<String,String>> ssio = new HashMap<String,Map<String,String>>();
+    public List<IterInfo> ssiList = new ArrayList<>();
+    public Map<String,Map<String,String>> ssio = new HashMap<>();
   }
 
   public CompressedIterators() {
-    symbolMap = new HashMap<String,Integer>();
-    symbolTable = new ArrayList<String>();
+    symbolMap = new HashMap<>();
+    symbolTable = new ArrayList<>();
   }
 
   public CompressedIterators(List<String> symbols) {
@@ -96,7 +96,7 @@ public class CompressedIterators {
 
       int numOpts = in.readVInt();
 
-      HashMap<String,String> opts = new HashMap<String,String>();
+      HashMap<String,String> opts = new HashMap<>();
 
       for (int j = 0; j < numOpts; j++) {
         String key = symbolTable.get(in.readVInt());

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java b/core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java
index 1c1aaf3..98a15ca 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java
@@ -119,12 +119,12 @@ class ConditionalWriterImpl implements ConditionalWriter {
   private final String classLoaderContext;
 
   private static class ServerQueue {
-    BlockingQueue<TabletServerMutations<QCMutation>> queue = new LinkedBlockingQueue<TabletServerMutations<QCMutation>>();
+    BlockingQueue<TabletServerMutations<QCMutation>> queue = new LinkedBlockingQueue<>();
     boolean taskQueued = false;
   }
 
   private Map<String,ServerQueue> serverQueues;
-  private DelayQueue<QCMutation> failedMutations = new DelayQueue<QCMutation>();
+  private DelayQueue<QCMutation> failedMutations = new DelayQueue<>();
   private ScheduledThreadPoolExecutor threadPool;
 
   private class RQIterator implements Iterator<Result> {
@@ -262,7 +262,7 @@ class ConditionalWriterImpl implements ConditionalWriter {
 
       long time = System.currentTimeMillis();
 
-      ArrayList<QCMutation> mutations2 = new ArrayList<ConditionalWriterImpl.QCMutation>(mutations.size());
+      ArrayList<QCMutation> mutations2 = new ArrayList<>(mutations.size());
 
       for (QCMutation qcm : mutations) {
         qcm.resetDelay();
@@ -290,8 +290,8 @@ class ConditionalWriterImpl implements ConditionalWriter {
   }
 
   private void queue(List<QCMutation> mutations) {
-    List<QCMutation> failures = new ArrayList<QCMutation>();
-    Map<String,TabletServerMutations<QCMutation>> binnedMutations = new HashMap<String,TabletLocator.TabletServerMutations<QCMutation>>();
+    List<QCMutation> failures = new ArrayList<>();
+    Map<String,TabletServerMutations<QCMutation>> binnedMutations = new HashMap<>();
 
     try {
       locator.binMutations(context, mutations, binnedMutations, failures);
@@ -355,7 +355,7 @@ class ConditionalWriterImpl implements ConditionalWriter {
   private TabletServerMutations<QCMutation> dequeue(String location) {
     BlockingQueue<TabletServerMutations<QCMutation>> queue = getServerQueue(location).queue;
 
-    ArrayList<TabletServerMutations<QCMutation>> mutations = new ArrayList<TabletLocator.TabletServerMutations<QCMutation>>();
+    ArrayList<TabletServerMutations<QCMutation>> mutations = new ArrayList<>();
     queue.drainTo(mutations);
 
     if (mutations.size() == 0)
@@ -371,7 +371,7 @@ class ConditionalWriterImpl implements ConditionalWriter {
         for (Entry<KeyExtent,List<QCMutation>> entry : mutations.get(i).getMutations().entrySet()) {
           List<QCMutation> list = tsm.getMutations().get(entry.getKey());
           if (list == null) {
-            list = new ArrayList<QCMutation>();
+            list = new ArrayList<>();
             tsm.getMutations().put(entry.getKey(), list);
           }
 
@@ -389,7 +389,7 @@ class ConditionalWriterImpl implements ConditionalWriter {
     this.ve = new VisibilityEvaluator(config.getAuthorizations());
     this.threadPool = new ScheduledThreadPoolExecutor(config.getMaxWriteThreads(), new NamingThreadFactory(this.getClass().getSimpleName()));
     this.locator = new SyncingTabletLocator(context, tableId);
-    this.serverQueues = new HashMap<String,ServerQueue>();
+    this.serverQueues = new HashMap<>();
     this.tableId = tableId;
     this.timeout = config.getTimeout(TimeUnit.MILLISECONDS);
     this.durability = config.getDurability();
@@ -399,7 +399,7 @@ class ConditionalWriterImpl implements ConditionalWriter {
 
       @Override
       public void run() {
-        List<QCMutation> mutations = new ArrayList<QCMutation>();
+        List<QCMutation> mutations = new ArrayList<>();
         failedMutations.drainTo(mutations);
         if (mutations.size() > 0)
           queue(mutations);
@@ -414,9 +414,9 @@ class ConditionalWriterImpl implements ConditionalWriter {
   @Override
   public Iterator<Result> write(Iterator<ConditionalMutation> mutations) {
 
-    BlockingQueue<Result> resultQueue = new LinkedBlockingQueue<Result>();
+    BlockingQueue<Result> resultQueue = new LinkedBlockingQueue<>();
 
-    List<QCMutation> mutationList = new ArrayList<QCMutation>();
+    List<QCMutation> mutationList = new ArrayList<>();
 
     int count = 0;
 
@@ -491,7 +491,7 @@ class ConditionalWriterImpl implements ConditionalWriter {
     }
   }
 
-  private HashMap<HostAndPort,SessionID> cachedSessionIDs = new HashMap<HostAndPort,SessionID>();
+  private HashMap<HostAndPort,SessionID> cachedSessionIDs = new HashMap<>();
 
   private SessionID reserveSessionID(HostAndPort location, TabletClientService.Iface client, TInfo tinfo) throws ThriftSecurityException, TException {
     // avoid cost of repeatedly making RPC to create sessions, reuse sessions
@@ -548,7 +548,7 @@ class ConditionalWriterImpl implements ConditionalWriter {
   }
 
   List<SessionID> getActiveSessions() {
-    ArrayList<SessionID> activeSessions = new ArrayList<SessionID>();
+    ArrayList<SessionID> activeSessions = new ArrayList<>();
     for (SessionID sid : cachedSessionIDs.values())
       if (sid.isActive())
         activeSessions.add(sid);
@@ -569,13 +569,13 @@ class ConditionalWriterImpl implements ConditionalWriter {
 
     TInfo tinfo = Tracer.traceInfo();
 
-    Map<Long,CMK> cmidToCm = new HashMap<Long,CMK>();
+    Map<Long,CMK> cmidToCm = new HashMap<>();
     MutableLong cmid = new MutableLong(0);
 
     SessionID sessionId = null;
 
     try {
-      Map<TKeyExtent,List<TConditionalMutation>> tmutations = new HashMap<TKeyExtent,List<TConditionalMutation>>();
+      Map<TKeyExtent,List<TConditionalMutation>> tmutations = new HashMap<>();
 
       CompressedIterators compressedIters = new CompressedIterators();
       convertMutations(mutations, cmidToCm, cmid, tmutations, compressedIters);
@@ -594,9 +594,9 @@ class ConditionalWriterImpl implements ConditionalWriter {
         }
       }
 
-      HashSet<KeyExtent> extentsToInvalidate = new HashSet<KeyExtent>();
+      HashSet<KeyExtent> extentsToInvalidate = new HashSet<>();
 
-      ArrayList<QCMutation> ignored = new ArrayList<QCMutation>();
+      ArrayList<QCMutation> ignored = new ArrayList<>();
 
       for (TCMResult tcmResult : tresults) {
         if (tcmResult.status == TCMStatus.IGNORED) {
@@ -637,7 +637,7 @@ class ConditionalWriterImpl implements ConditionalWriter {
   }
 
   private void queueRetry(Map<Long,CMK> cmidToCm, HostAndPort location) {
-    ArrayList<QCMutation> ignored = new ArrayList<QCMutation>();
+    ArrayList<QCMutation> ignored = new ArrayList<>();
     for (CMK cmk : cmidToCm.values())
       ignored.add(cmk.cm);
     queueRetry(ignored, location);
@@ -739,7 +739,7 @@ class ConditionalWriterImpl implements ConditionalWriter {
 
     for (Entry<KeyExtent,List<QCMutation>> entry : mutations.getMutations().entrySet()) {
       TKeyExtent tke = entry.getKey().toThrift();
-      ArrayList<TConditionalMutation> tcondMutaions = new ArrayList<TConditionalMutation>();
+      ArrayList<TConditionalMutation> tcondMutaions = new ArrayList<>();
 
       List<QCMutation> condMutations = entry.getValue();
 
@@ -792,7 +792,7 @@ class ConditionalWriterImpl implements ConditionalWriter {
   private static final ConditionComparator CONDITION_COMPARATOR = new ConditionComparator();
 
   private List<TCondition> convertConditions(ConditionalMutation cm, CompressedIterators compressedIters) {
-    List<TCondition> conditions = new ArrayList<TCondition>(cm.getConditions().size());
+    List<TCondition> conditions = new ArrayList<>(cm.getConditions().size());
 
     // sort conditions inorder to get better lookup performance. Sort on client side so tserver does not have to do it.
     Condition[] ca = cm.getConditions().toArray(new Condition[cm.getConditions().size()]);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/impl/InstanceOperationsImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/InstanceOperationsImpl.java b/core/src/main/java/org/apache/accumulo/core/client/impl/InstanceOperationsImpl.java
index 32a7ec0..d716650 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/InstanceOperationsImpl.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/InstanceOperationsImpl.java
@@ -110,11 +110,11 @@ public class InstanceOperationsImpl implements InstanceOperations {
     Instance instance = context.getInstance();
     ZooCache cache = new ZooCacheFactory().getZooCache(instance.getZooKeepers(), instance.getZooKeepersSessionTimeOut());
     String path = ZooUtil.getRoot(instance) + Constants.ZTSERVERS;
-    List<String> results = new ArrayList<String>();
+    List<String> results = new ArrayList<>();
     for (String candidate : cache.getChildren(path)) {
       List<String> children = cache.getChildren(path + "/" + candidate);
       if (children != null && children.size() > 0) {
-        List<String> copy = new ArrayList<String>(children);
+        List<String> copy = new ArrayList<>(children);
         Collections.sort(copy);
         byte[] data = cache.get(path + "/" + candidate + "/" + copy.get(0));
         if (data != null && !"master".equals(new String(data, UTF_8))) {
@@ -132,7 +132,7 @@ public class InstanceOperationsImpl implements InstanceOperations {
     try {
       client = ThriftUtil.getTServerClient(parsedTserver, context);
 
-      List<ActiveScan> as = new ArrayList<ActiveScan>();
+      List<ActiveScan> as = new ArrayList<>();
       for (org.apache.accumulo.core.tabletserver.thrift.ActiveScan activeScan : client.getActiveScans(Tracer.traceInfo(), context.rpcCreds())) {
         try {
           as.add(new ActiveScanImpl(context.getInstance(), activeScan));
@@ -170,7 +170,7 @@ public class InstanceOperationsImpl implements InstanceOperations {
     try {
       client = ThriftUtil.getTServerClient(parsedTserver, context);
 
-      List<ActiveCompaction> as = new ArrayList<ActiveCompaction>();
+      List<ActiveCompaction> as = new ArrayList<>();
       for (org.apache.accumulo.core.tabletserver.thrift.ActiveCompaction activeCompaction : client.getActiveCompactions(Tracer.traceInfo(), context.rpcCreds())) {
         as.add(new ActiveCompactionImpl(context.getInstance(), activeCompaction));
       }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/impl/MultiTableBatchWriterImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/MultiTableBatchWriterImpl.java b/core/src/main/java/org/apache/accumulo/core/client/impl/MultiTableBatchWriterImpl.java
index 6f700a3..15d1c34 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/MultiTableBatchWriterImpl.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/MultiTableBatchWriterImpl.java
@@ -118,7 +118,7 @@ public class MultiTableBatchWriterImpl implements MultiTableBatchWriter {
     checkArgument(cacheTimeUnit != null, "cacheTimeUnit is null");
     this.context = context;
     this.bw = new TabletServerBatchWriter(context, config);
-    tableWriters = new ConcurrentHashMap<String,BatchWriter>();
+    tableWriters = new ConcurrentHashMap<>();
     this.closed = new AtomicBoolean(false);
     this.cacheLastState = new AtomicLong(0);
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/impl/NamespaceOperationsHelper.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/NamespaceOperationsHelper.java b/core/src/main/java/org/apache/accumulo/core/client/impl/NamespaceOperationsHelper.java
index 2dac1fa..9b3a358 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/NamespaceOperationsHelper.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/NamespaceOperationsHelper.java
@@ -66,7 +66,7 @@ public abstract class NamespaceOperationsHelper implements NamespaceOperations {
       NamespaceNotFoundException {
     if (!exists(namespace))
       throw new NamespaceNotFoundException(null, namespace, null);
-    Map<String,String> copy = new TreeMap<String,String>();
+    Map<String,String> copy = new TreeMap<>();
     for (Entry<String,String> property : this.getProperties(namespace)) {
       copy.put(property.getKey(), property.getValue());
     }
@@ -86,7 +86,7 @@ public abstract class NamespaceOperationsHelper implements NamespaceOperations {
       throw new NamespaceNotFoundException(null, namespace, null);
     int priority = -1;
     String classname = null;
-    Map<String,String> settings = new HashMap<String,String>();
+    Map<String,String> settings = new HashMap<>();
 
     String root = String.format("%s%s.%s", Property.TABLE_ITERATOR_PREFIX, scope.name().toLowerCase(), name);
     String opt = root + ".opt.";
@@ -112,7 +112,7 @@ public abstract class NamespaceOperationsHelper implements NamespaceOperations {
   public Map<String,EnumSet<IteratorScope>> listIterators(String namespace) throws AccumuloSecurityException, AccumuloException, NamespaceNotFoundException {
     if (!exists(namespace))
       throw new NamespaceNotFoundException(null, namespace, null);
-    Map<String,EnumSet<IteratorScope>> result = new TreeMap<String,EnumSet<IteratorScope>>();
+    Map<String,EnumSet<IteratorScope>> result = new TreeMap<>();
     for (Entry<String,String> property : this.getProperties(namespace)) {
       String name = property.getKey();
       String[] parts = name.split("\\.");
@@ -137,7 +137,7 @@ public abstract class NamespaceOperationsHelper implements NamespaceOperations {
       String scopeStr = String.format("%s%s", Property.TABLE_ITERATOR_PREFIX, scope.name().toLowerCase());
       String nameStr = String.format("%s.%s", scopeStr, setting.getName());
       String optStr = String.format("%s.opt.", nameStr);
-      Map<String,String> optionConflicts = new TreeMap<String,String>();
+      Map<String,String> optionConflicts = new TreeMap<>();
       for (Entry<String,String> property : this.getProperties(namespace)) {
         if (property.getKey().startsWith(scopeStr)) {
           if (property.getKey().equals(nameStr))
@@ -165,8 +165,8 @@ public abstract class NamespaceOperationsHelper implements NamespaceOperations {
 
   @Override
   public int addConstraint(String namespace, String constraintClassName) throws AccumuloException, AccumuloSecurityException, NamespaceNotFoundException {
-    TreeSet<Integer> constraintNumbers = new TreeSet<Integer>();
-    TreeMap<String,Integer> constraintClasses = new TreeMap<String,Integer>();
+    TreeSet<Integer> constraintNumbers = new TreeSet<>();
+    TreeMap<String,Integer> constraintClasses = new TreeMap<>();
     int i;
     for (Entry<String,String> property : this.getProperties(namespace)) {
       if (property.getKey().startsWith(Property.TABLE_CONSTRAINT_PREFIX.toString())) {
@@ -196,7 +196,7 @@ public abstract class NamespaceOperationsHelper implements NamespaceOperations {
 
   @Override
   public Map<String,Integer> listConstraints(String namespace) throws AccumuloException, NamespaceNotFoundException, AccumuloSecurityException {
-    Map<String,Integer> constraints = new TreeMap<String,Integer>();
+    Map<String,Integer> constraints = new TreeMap<>();
     for (Entry<String,String> property : this.getProperties(namespace)) {
       if (property.getKey().startsWith(Property.TABLE_CONSTRAINT_PREFIX.toString())) {
         if (constraints.containsKey(property.getValue()))

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/impl/NamespaceOperationsImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/NamespaceOperationsImpl.java b/core/src/main/java/org/apache/accumulo/core/client/impl/NamespaceOperationsImpl.java
index ae5fc81..0716122 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/NamespaceOperationsImpl.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/NamespaceOperationsImpl.java
@@ -76,7 +76,7 @@ public class NamespaceOperationsImpl extends NamespaceOperationsHelper {
       timer = new OpTimer().start();
     }
 
-    TreeSet<String> namespaces = new TreeSet<String>(Namespaces.getNameToIdMap(context.getInstance()).keySet());
+    TreeSet<String> namespaces = new TreeSet<>(Namespaces.getNameToIdMap(context.getInstance()).keySet());
 
     if (timer != null) {
       timer.stop();
@@ -137,7 +137,7 @@ public class NamespaceOperationsImpl extends NamespaceOperationsHelper {
     }
 
     List<ByteBuffer> args = Arrays.asList(ByteBuffer.wrap(namespace.getBytes(UTF_8)));
-    Map<String,String> opts = new HashMap<String,String>();
+    Map<String,String> opts = new HashMap<>();
 
     try {
       doNamespaceFateOperation(FateOperation.NAMESPACE_DELETE, args, opts, namespace);
@@ -153,7 +153,7 @@ public class NamespaceOperationsImpl extends NamespaceOperationsHelper {
       NamespaceExistsException {
 
     List<ByteBuffer> args = Arrays.asList(ByteBuffer.wrap(oldNamespaceName.getBytes(UTF_8)), ByteBuffer.wrap(newNamespaceName.getBytes(UTF_8)));
-    Map<String,String> opts = new HashMap<String,String>();
+    Map<String,String> opts = new HashMap<>();
     doNamespaceFateOperation(FateOperation.NAMESPACE_RENAME, args, opts, oldNamespaceName);
   }
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/impl/Namespaces.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/Namespaces.java b/core/src/main/java/org/apache/accumulo/core/client/impl/Namespaces.java
index 433b020..39d5822 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/Namespaces.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/Namespaces.java
@@ -93,7 +93,7 @@ public class Namespaces {
 
     List<String> namespaceIds = zc.getChildren(ZooUtil.getRoot(instance) + Constants.ZNAMESPACES);
 
-    TreeMap<String,String> namespaceMap = new TreeMap<String,String>();
+    TreeMap<String,String> namespaceMap = new TreeMap<>();
 
     for (String id : namespaceIds) {
       byte[] path = zc.get(ZooUtil.getRoot(instance) + Constants.ZNAMESPACES + "/" + id + Constants.ZNAMESPACE_NAME);
@@ -137,7 +137,7 @@ public class Namespaces {
 
   public static List<String> getTableIds(Instance instance, String namespaceId) throws NamespaceNotFoundException {
     String namespace = getNamespaceName(instance, namespaceId);
-    List<String> names = new LinkedList<String>();
+    List<String> names = new LinkedList<>();
     for (Entry<String,String> nameToId : Tables.getNameToIdMap(instance).entrySet())
       if (namespace.equals(Tables.qualify(nameToId.getKey()).getFirst()))
         names.add(nameToId.getValue());
@@ -146,7 +146,7 @@ public class Namespaces {
 
   public static List<String> getTableNames(Instance instance, String namespaceId) throws NamespaceNotFoundException {
     String namespace = getNamespaceName(instance, namespaceId);
-    List<String> names = new LinkedList<String>();
+    List<String> names = new LinkedList<>();
     for (String name : Tables.getNameToIdMap(instance).keySet())
       if (namespace.equals(Tables.qualify(name).getFirst()))
         names.add(name);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineIterator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineIterator.java b/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineIterator.java
index 54fe4ff..9f51704 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineIterator.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineIterator.java
@@ -39,7 +39,6 @@ import org.apache.accumulo.core.client.sample.SamplerConfiguration;
 import org.apache.accumulo.core.conf.AccumuloConfiguration;
 import org.apache.accumulo.core.conf.ConfigurationCopy;
 import org.apache.accumulo.core.conf.Property;
-import org.apache.accumulo.core.data.Column;
 import org.apache.accumulo.core.data.Key;
 import org.apache.accumulo.core.data.KeyValue;
 import org.apache.accumulo.core.data.PartialKey;
@@ -105,7 +104,7 @@ class OfflineIterator implements Iterator<Entry<Key,Value>> {
       return false;
     }
 
-    private ArrayList<SortedKeyValueIterator<Key,Value>> topLevelIterators = new ArrayList<SortedKeyValueIterator<Key,Value>>();
+    private ArrayList<SortedKeyValueIterator<Key,Value>> topLevelIterators = new ArrayList<>();
 
     @Override
     public void registerSideChannel(SortedKeyValueIterator<Key,Value> iter) {
@@ -120,7 +119,7 @@ class OfflineIterator implements Iterator<Entry<Key,Value>> {
     SortedKeyValueIterator<Key,Value> getTopLevelIterator(SortedKeyValueIterator<Key,Value> iter) {
       if (topLevelIterators.isEmpty())
         return iter;
-      ArrayList<SortedKeyValueIterator<Key,Value>> allIters = new ArrayList<SortedKeyValueIterator<Key,Value>>(topLevelIterators);
+      ArrayList<SortedKeyValueIterator<Key,Value>> allIters = new ArrayList<>(topLevelIterators);
       allIters.add(iter);
       return new MultiIterator(allIters, false);
     }
@@ -165,7 +164,7 @@ class OfflineIterator implements Iterator<Entry<Key,Value>> {
 
     this.tableId = table.toString();
     this.authorizations = authorizations;
-    this.readers = new ArrayList<SortedKeyValueIterator<Key,Value>>();
+    this.readers = new ArrayList<>();
 
     try {
       conn = instance.getConnector(credentials.getPrincipal(), credentials.getToken());
@@ -233,7 +232,7 @@ class OfflineIterator implements Iterator<Entry<Key,Value>> {
       nextRange = new Range(currentExtent.getMetadataEntry(), false, null, false);
     }
 
-    List<String> relFiles = new ArrayList<String>();
+    List<String> relFiles = new ArrayList<>();
 
     Pair<KeyExtent,String> eloc = getTabletFiles(nextRange, relFiles);
 
@@ -264,7 +263,7 @@ class OfflineIterator implements Iterator<Entry<Key,Value>> {
     @SuppressWarnings("deprecation")
     String tablesDir = config.get(Property.INSTANCE_DFS_DIR) + Constants.HDFS_TABLES_DIR;
 
-    List<String> absFiles = new ArrayList<String>();
+    List<String> absFiles = new ArrayList<>();
     for (String relPath : relFiles) {
       if (relPath.contains(":")) {
         absFiles.add(relPath);
@@ -313,7 +312,7 @@ class OfflineIterator implements Iterator<Entry<Key,Value>> {
       }
 
     }
-    return new Pair<KeyExtent,String>(extent, location);
+    return new Pair<>(extent, location);
   }
 
   private SortedKeyValueIterator<Key,Value> createIterator(KeyExtent extent, List<String> absFiles) throws TableNotFoundException, AccumuloException,
@@ -359,7 +358,7 @@ class OfflineIterator implements Iterator<Entry<Key,Value>> {
     ColumnVisibility cv = new ColumnVisibility(acuTableConf.get(Property.TABLE_DEFAULT_SCANTIME_VISIBILITY));
     defaultSecurityLabel = cv.getExpression();
 
-    SortedKeyValueIterator<Key,Value> visFilter = IteratorUtil.setupSystemScanIterators(multiIter, new HashSet<Column>(options.fetchedColumns), authorizations,
+    SortedKeyValueIterator<Key,Value> visFilter = IteratorUtil.setupSystemScanIterators(multiIter, new HashSet<>(options.fetchedColumns), authorizations,
         defaultSecurityLabel);
 
     return iterEnv.getTopLevelIterator(IteratorUtil.loadIterators(IteratorScope.scan, visFilter, extent, acuTableConf, options.serverSideIteratorList,

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/impl/RootTabletLocator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/RootTabletLocator.java b/core/src/main/java/org/apache/accumulo/core/client/impl/RootTabletLocator.java
index 4df2e08..9fdbb25 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/RootTabletLocator.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/RootTabletLocator.java
@@ -61,7 +61,7 @@ public class RootTabletLocator extends TabletLocator {
       throws AccumuloException, AccumuloSecurityException, TableNotFoundException {
     TabletLocation rootTabletLocation = getRootTabletLocation(context);
     if (rootTabletLocation != null) {
-      TabletServerMutations<T> tsm = new TabletServerMutations<T>(rootTabletLocation.tablet_session);
+      TabletServerMutations<T> tsm = new TabletServerMutations<>(rootTabletLocation.tablet_session);
       for (T mutation : mutations) {
         tsm.addMutation(RootTable.EXTENT, mutation);
       }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/impl/ScannerIterator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/ScannerIterator.java b/core/src/main/java/org/apache/accumulo/core/client/impl/ScannerIterator.java
index 18b90e0..ae55cc0 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/ScannerIterator.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/ScannerIterator.java
@@ -111,7 +111,7 @@ public class ScannerIterator implements Iterator<Entry<Key,Value>> {
 
     this.options = new ScannerOptions(options);
 
-    synchQ = new ArrayBlockingQueue<Object>(1);
+    synchQ = new ArrayBlockingQueue<>(1);
 
     if (this.options.fetchedColumns.size() > 0) {
       range = range.bound(this.options.fetchedColumns.first(), this.options.fetchedColumns.last());

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/impl/ScannerOptions.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/ScannerOptions.java b/core/src/main/java/org/apache/accumulo/core/client/impl/ScannerOptions.java
index c3a1a63..a986d87 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/ScannerOptions.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/ScannerOptions.java
@@ -47,7 +47,7 @@ public class ScannerOptions implements ScannerBase {
   protected List<IterInfo> serverSideIteratorList = Collections.emptyList();
   protected Map<String,Map<String,String>> serverSideIteratorOptions = Collections.emptyMap();
 
-  protected SortedSet<Column> fetchedColumns = new TreeSet<Column>();
+  protected SortedSet<Column> fetchedColumns = new TreeSet<>();
 
   protected long timeOut = Long.MAX_VALUE;
 
@@ -69,7 +69,7 @@ public class ScannerOptions implements ScannerBase {
   public synchronized void addScanIterator(IteratorSetting si) {
     checkArgument(si != null, "si is null");
     if (serverSideIteratorList.size() == 0)
-      serverSideIteratorList = new ArrayList<IterInfo>();
+      serverSideIteratorList = new ArrayList<>();
 
     for (IterInfo ii : serverSideIteratorList) {
       if (ii.iterName.equals(si.getName()))
@@ -81,12 +81,12 @@ public class ScannerOptions implements ScannerBase {
     serverSideIteratorList.add(new IterInfo(si.getPriority(), si.getIteratorClass(), si.getName()));
 
     if (serverSideIteratorOptions.size() == 0)
-      serverSideIteratorOptions = new HashMap<String,Map<String,String>>();
+      serverSideIteratorOptions = new HashMap<>();
 
     Map<String,String> opts = serverSideIteratorOptions.get(si.getName());
 
     if (opts == null) {
-      opts = new HashMap<String,String>();
+      opts = new HashMap<>();
       serverSideIteratorOptions.put(si.getName(), opts);
     }
     opts.putAll(si.getOptions());
@@ -115,12 +115,12 @@ public class ScannerOptions implements ScannerBase {
     checkArgument(key != null, "key is null");
     checkArgument(value != null, "value is null");
     if (serverSideIteratorOptions.size() == 0)
-      serverSideIteratorOptions = new HashMap<String,Map<String,String>>();
+      serverSideIteratorOptions = new HashMap<>();
 
     Map<String,String> opts = serverSideIteratorOptions.get(iteratorName);
 
     if (opts == null) {
-      opts = new HashMap<String,String>();
+      opts = new HashMap<>();
       serverSideIteratorOptions.put(iteratorName, opts);
     }
     opts.put(key, value);
@@ -167,14 +167,14 @@ public class ScannerOptions implements ScannerBase {
     synchronized (dst) {
       synchronized (src) {
         dst.regexIterName = src.regexIterName;
-        dst.fetchedColumns = new TreeSet<Column>(src.fetchedColumns);
-        dst.serverSideIteratorList = new ArrayList<IterInfo>(src.serverSideIteratorList);
+        dst.fetchedColumns = new TreeSet<>(src.fetchedColumns);
+        dst.serverSideIteratorList = new ArrayList<>(src.serverSideIteratorList);
         dst.classLoaderContext = src.classLoaderContext;
 
-        dst.serverSideIteratorOptions = new HashMap<String,Map<String,String>>();
+        dst.serverSideIteratorOptions = new HashMap<>();
         Set<Entry<String,Map<String,String>>> es = src.serverSideIteratorOptions.entrySet();
         for (Entry<String,Map<String,String>> entry : es)
-          dst.serverSideIteratorOptions.put(entry.getKey(), new HashMap<String,String>(entry.getValue()));
+          dst.serverSideIteratorOptions.put(entry.getKey(), new HashMap<>(entry.getValue()));
 
         dst.samplerConfig = src.samplerConfig;
         dst.batchTimeOut = src.batchTimeOut;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/impl/ServerClient.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/ServerClient.java b/core/src/main/java/org/apache/accumulo/core/client/impl/ServerClient.java
index 680d23a..501b4df 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/ServerClient.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/ServerClient.java
@@ -123,7 +123,7 @@ public class ServerClient {
       throws TTransportException {
     checkArgument(context != null, "context is null");
     // create list of servers
-    ArrayList<ThriftTransportKey> servers = new ArrayList<ThriftTransportKey>();
+    ArrayList<ThriftTransportKey> servers = new ArrayList<>();
 
     // add tservers
     Instance instance = context.getInstance();
@@ -144,7 +144,7 @@ public class ServerClient {
       ClientService.Client client = ThriftUtil.createClient(new ClientService.Client.Factory(), pair.getSecond());
       opened = true;
       warnedAboutTServersBeingDown = false;
-      return new Pair<String,ClientService.Client>(pair.getFirst(), client);
+      return new Pair<>(pair.getFirst(), client);
     } finally {
       if (!opened) {
         if (!warnedAboutTServersBeingDown) {


[04/32] accumulo git commit: ACCUMULO-4357 Remove unneeded code for readability

Posted by ct...@apache.org.
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
index 15b5226..6637521 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
@@ -18,6 +18,7 @@ package org.apache.accumulo.tserver.tablet;
 
 import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly;
 import static java.nio.charset.StandardCharsets.UTF_8;
+import static java.util.Objects.requireNonNull;
 
 import java.io.ByteArrayInputStream;
 import java.io.DataInputStream;
@@ -91,6 +92,7 @@ import org.apache.accumulo.core.trace.Span;
 import org.apache.accumulo.core.trace.Trace;
 import org.apache.accumulo.core.util.LocalityGroupUtil;
 import org.apache.accumulo.core.util.Pair;
+import org.apache.accumulo.core.util.ratelimit.RateLimiter;
 import org.apache.accumulo.server.ServerConstants;
 import org.apache.accumulo.server.conf.TableConfiguration;
 import org.apache.accumulo.server.fs.FileRef;
@@ -152,8 +154,6 @@ import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Optional;
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
-import org.apache.accumulo.core.util.ratelimit.RateLimiter;
-import static java.util.Objects.requireNonNull;
 
 /**
  *
@@ -186,7 +186,7 @@ public class Tablet implements TabletCommitter {
     return dataSourceDeletions.get();
   }
 
-  private final Set<ScanDataSource> activeScans = new HashSet<ScanDataSource>();
+  private final Set<ScanDataSource> activeScans = new HashSet<>();
 
   private static enum CloseState {
     OPEN, CLOSING, CLOSED, COMPLETE
@@ -209,14 +209,14 @@ public class Tablet implements TabletCommitter {
 
   static enum CompactionState {
     WAITING_TO_START, IN_PROGRESS
-  };
+  }
 
   private volatile CompactionState minorCompactionState = null;
   private volatile CompactionState majorCompactionState = null;
 
   private final Set<MajorCompactionReason> majorCompactionQueued = Collections.synchronizedSet(EnumSet.noneOf(MajorCompactionReason.class));
 
-  private final AtomicReference<ConstraintChecker> constraintChecker = new AtomicReference<ConstraintChecker>();
+  private final AtomicReference<ConstraintChecker> constraintChecker = new AtomicReference<>();
 
   private int writesInProgress = 0;
 
@@ -257,7 +257,7 @@ public class Tablet implements TabletCommitter {
   }
 
   public static class LookupResult {
-    public List<Range> unfinishedRanges = new ArrayList<Range>();
+    public List<Range> unfinishedRanges = new ArrayList<>();
     public long bytesAdded = 0;
     public long dataSize = 0;
     public boolean closed = false;
@@ -349,7 +349,7 @@ public class Tablet implements TabletCommitter {
     this.location = locationPath;
     this.tabletDirectory = tabletPaths.dir;
     for (Entry<Long,List<FileRef>> entry : data.getBulkImported().entrySet()) {
-      this.bulkImported.put(entry.getKey(), new CopyOnWriteArrayList<FileRef>(entry.getValue()));
+      this.bulkImported.put(entry.getKey(), new CopyOnWriteArrayList<>(entry.getValue()));
     }
     setupDefaultSecurityLabels(extent);
 
@@ -408,7 +408,7 @@ public class Tablet implements TabletCommitter {
       final AtomicLong maxTime = new AtomicLong(Long.MIN_VALUE);
       final CommitSession commitSession = getTabletMemory().getCommitSession();
       try {
-        Set<String> absPaths = new HashSet<String>();
+        Set<String> absPaths = new HashSet<>();
         for (FileRef ref : datafiles.keySet())
           absPaths.add(ref.path().toString());
 
@@ -466,7 +466,7 @@ public class Tablet implements TabletCommitter {
         }
       }
       // make some closed references that represent the recovered logs
-      currentLogs = new ConcurrentSkipListSet<DfsLogger>();
+      currentLogs = new ConcurrentSkipListSet<>();
       for (LogEntry logEntry : logEntries) {
         currentLogs.add(new DfsLogger(tabletServer.getServerConfig(), logEntry.filename, logEntry.getColumnQualifier().toString()));
       }
@@ -704,7 +704,7 @@ public class Tablet implements TabletCommitter {
     if (batchTimeOut == Long.MAX_VALUE || batchTimeOut <= 0) {
       batchTimeOut = 0;
     }
-    List<KVEntry> results = new ArrayList<KVEntry>();
+    List<KVEntry> results = new ArrayList<>();
     Key key = null;
 
     Value value;
@@ -853,7 +853,7 @@ public class Tablet implements TabletCommitter {
   private synchronized MinorCompactionTask prepareForMinC(long flushId, MinorCompactionReason mincReason) {
     CommitSession oldCommitSession = getTabletMemory().prepareForMinC();
     otherLogs = currentLogs;
-    currentLogs = new ConcurrentSkipListSet<DfsLogger>();
+    currentLogs = new ConcurrentSkipListSet<>();
 
     FileRef mergeFile = null;
     if (mincReason != MinorCompactionReason.RECOVERY) {
@@ -1050,7 +1050,7 @@ public class Tablet implements TabletCommitter {
         }
       }
 
-      return new Pair<Long,UserCompactionConfig>(compactID, compactionConfig);
+      return new Pair<>(compactID, compactionConfig);
     } catch (InterruptedException e) {
       throw new RuntimeException(e);
     } catch (NumberFormatException nfe) {
@@ -1103,7 +1103,7 @@ public class Tablet implements TabletCommitter {
       if (more != null) {
         violations.add(more);
         if (violators == null)
-          violators = new ArrayList<Mutation>();
+          violators = new ArrayList<>();
         violators.add(mutation);
       }
     }
@@ -1112,8 +1112,8 @@ public class Tablet implements TabletCommitter {
 
     if (!violations.isEmpty()) {
 
-      HashSet<Mutation> violatorsSet = new HashSet<Mutation>(violators);
-      ArrayList<Mutation> nonViolators = new ArrayList<Mutation>();
+      HashSet<Mutation> violatorsSet = new HashSet<>(violators);
+      ArrayList<Mutation> nonViolators = new ArrayList<>();
 
       for (Mutation mutation : mutations) {
         if (!violatorsSet.contains(mutation)) {
@@ -1578,7 +1578,7 @@ public class Tablet implements TabletCommitter {
   }
 
   private Map<FileRef,Pair<Key,Key>> getFirstAndLastKeys(SortedMap<FileRef,DataFileValue> allFiles) throws IOException {
-    Map<FileRef,Pair<Key,Key>> result = new HashMap<FileRef,Pair<Key,Key>>();
+    Map<FileRef,Pair<Key,Key>> result = new HashMap<>();
     FileOperations fileFactory = FileOperations.getInstance();
     VolumeManager fs = getTabletServer().getFileSystem();
     for (Entry<FileRef,DataFileValue> entry : allFiles.entrySet()) {
@@ -1589,7 +1589,7 @@ public class Tablet implements TabletCommitter {
       try {
         Key first = openReader.getFirstKey();
         Key last = openReader.getLastKey();
-        result.put(file, new Pair<Key,Key>(first, last));
+        result.put(file, new Pair<>(first, last));
       } finally {
         openReader.close();
       }
@@ -1598,7 +1598,7 @@ public class Tablet implements TabletCommitter {
   }
 
   List<FileRef> findChopFiles(KeyExtent extent, Map<FileRef,Pair<Key,Key>> firstAndLastKeys, Collection<FileRef> allFiles) throws IOException {
-    List<FileRef> result = new ArrayList<FileRef>();
+    List<FileRef> result = new ArrayList<>();
     if (firstAndLastKeys == null) {
       result.addAll(allFiles);
       return result;
@@ -1706,7 +1706,7 @@ public class Tablet implements TabletCommitter {
         RootFiles.cleanupReplacement(fs, fs.listStatus(this.location), false);
       }
       SortedMap<FileRef,DataFileValue> allFiles = getDatafileManager().getDatafileSizes();
-      List<FileRef> inputFiles = new ArrayList<FileRef>();
+      List<FileRef> inputFiles = new ArrayList<>();
       if (reason == MajorCompactionReason.CHOP) {
         // enforce rules: files with keys outside our range need to be compacted
         inputFiles.addAll(findChopFiles(extent, firstAndLastKeys, allFiles.keySet()));
@@ -1773,7 +1773,7 @@ public class Tablet implements TabletCommitter {
         }
       }
 
-      List<IteratorSetting> compactionIterators = new ArrayList<IteratorSetting>();
+      List<IteratorSetting> compactionIterators = new ArrayList<>();
       if (compactionId != null) {
         if (reason == MajorCompactionReason.USER) {
           if (getCompactionCancelID() >= compactionId.getFirst()) {
@@ -1834,7 +1834,7 @@ public class Tablet implements TabletCommitter {
 
           };
 
-          HashMap<FileRef,DataFileValue> copy = new HashMap<FileRef,DataFileValue>(getDatafileManager().getDatafileSizes());
+          HashMap<FileRef,DataFileValue> copy = new HashMap<>(getDatafileManager().getDatafileSizes());
           if (!copy.keySet().containsAll(smallestFiles))
             throw new IllegalStateException("Cannot find data file values for " + smallestFiles);
 
@@ -1902,12 +1902,12 @@ public class Tablet implements TabletCommitter {
 
     // short-circuit; also handles zero files case
     if (filesToCompact.size() <= maxFilesToCompact) {
-      Set<FileRef> smallestFiles = new HashSet<FileRef>(filesToCompact.keySet());
+      Set<FileRef> smallestFiles = new HashSet<>(filesToCompact.keySet());
       filesToCompact.clear();
       return smallestFiles;
     }
 
-    PriorityQueue<Pair<FileRef,Long>> fileHeap = new PriorityQueue<Pair<FileRef,Long>>(filesToCompact.size(), new Comparator<Pair<FileRef,Long>>() {
+    PriorityQueue<Pair<FileRef,Long>> fileHeap = new PriorityQueue<>(filesToCompact.size(), new Comparator<Pair<FileRef,Long>>() {
       @Override
       public int compare(Pair<FileRef,Long> o1, Pair<FileRef,Long> o2) {
         if (o1.getSecond() == o2.getSecond())
@@ -1920,10 +1920,10 @@ public class Tablet implements TabletCommitter {
 
     for (Iterator<Entry<FileRef,DataFileValue>> iterator = filesToCompact.entrySet().iterator(); iterator.hasNext();) {
       Entry<FileRef,DataFileValue> entry = iterator.next();
-      fileHeap.add(new Pair<FileRef,Long>(entry.getKey(), entry.getValue().getSize()));
+      fileHeap.add(new Pair<>(entry.getKey(), entry.getValue().getSize()));
     }
 
-    Set<FileRef> smallestFiles = new HashSet<FileRef>();
+    Set<FileRef> smallestFiles = new HashSet<>();
     while (smallestFiles.size() < maxFilesToCompact && fileHeap.size() > 0) {
       Pair<FileRef,Long> pair = fileHeap.remove();
       filesToCompact.remove(pair.getFirst());
@@ -2092,7 +2092,7 @@ public class Tablet implements TabletCommitter {
 
     synchronized (this) {
       // java needs tuples ...
-      TreeMap<KeyExtent,TabletData> newTablets = new TreeMap<KeyExtent,TabletData>();
+      TreeMap<KeyExtent,TabletData> newTablets = new TreeMap<>();
 
       long t1 = System.currentTimeMillis();
       // choose a split point
@@ -2123,9 +2123,9 @@ public class Tablet implements TabletCommitter {
       String lowDirectory = createTabletDirectory(getTabletServer().getFileSystem(), extent.getTableId(), midRow);
 
       // write new tablet information to MetadataTable
-      SortedMap<FileRef,DataFileValue> lowDatafileSizes = new TreeMap<FileRef,DataFileValue>();
-      SortedMap<FileRef,DataFileValue> highDatafileSizes = new TreeMap<FileRef,DataFileValue>();
-      List<FileRef> highDatafilesToRemove = new ArrayList<FileRef>();
+      SortedMap<FileRef,DataFileValue> lowDatafileSizes = new TreeMap<>();
+      SortedMap<FileRef,DataFileValue> highDatafileSizes = new TreeMap<>();
+      List<FileRef> highDatafilesToRemove = new ArrayList<>();
 
       MetadataTableUtil.splitDatafiles(extent.getTableId(), midRow, splitRatio, firstAndLastRows, getDatafileManager().getDatafileSizes(), lowDatafileSizes,
           highDatafileSizes, highDatafilesToRemove);
@@ -2196,7 +2196,7 @@ public class Tablet implements TabletCommitter {
   }
 
   public void importMapFiles(long tid, Map<FileRef,MapFileInfo> fileMap, boolean setTime) throws IOException {
-    Map<FileRef,DataFileValue> entries = new HashMap<FileRef,DataFileValue>(fileMap.size());
+    Map<FileRef,DataFileValue> entries = new HashMap<>(fileMap.size());
     List<String> files = new ArrayList<>();
 
     for (Entry<FileRef,MapFileInfo> entry : fileMap.entrySet()) {
@@ -2259,7 +2259,7 @@ public class Tablet implements TabletCommitter {
           bulkImported.get(tid, new Callable<List<FileRef>>() {
             @Override
             public List<FileRef> call() throws Exception {
-              return new ArrayList<FileRef>();
+              return new ArrayList<>();
             }
           }).addAll(fileMap.keySet());
         } catch (Exception ex) {
@@ -2270,18 +2270,18 @@ public class Tablet implements TabletCommitter {
     }
   }
 
-  private ConcurrentSkipListSet<DfsLogger> currentLogs = new ConcurrentSkipListSet<DfsLogger>();
+  private ConcurrentSkipListSet<DfsLogger> currentLogs = new ConcurrentSkipListSet<>();
 
   // currentLogs may be updated while a tablet is otherwise locked
   public Set<DfsLogger> getCurrentLogFiles() {
-    return new HashSet<DfsLogger>(currentLogs);
+    return new HashSet<>(currentLogs);
   }
 
   Set<String> beginClearingUnusedLogs() {
-    Set<String> doomed = new HashSet<String>();
+    Set<String> doomed = new HashSet<>();
 
-    ArrayList<String> otherLogsCopy = new ArrayList<String>();
-    ArrayList<String> currentLogsCopy = new ArrayList<String>();
+    ArrayList<String> otherLogsCopy = new ArrayList<>();
+    ArrayList<String> currentLogsCopy = new ArrayList<>();
 
     // do not hold tablet lock while acquiring the log lock
     logLock.lock();
@@ -2650,7 +2650,7 @@ public class Tablet implements TabletCommitter {
   }
 
   public Map<Long,List<FileRef>> getBulkIngestedFiles() {
-    return new HashMap<Long,List<FileRef>>(bulkImported.asMap());
+    return new HashMap<>(bulkImported.asMap());
   }
 
   public void cleanupBulkLoadedFiles(Set<Long> tids) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/TabletMemory.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/TabletMemory.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/TabletMemory.java
index 86cc262..f66e457 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/TabletMemory.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/TabletMemory.java
@@ -158,7 +158,7 @@ class TabletMemory implements Closeable {
   }
 
   public List<MemoryIterator> getIterators(SamplerConfigurationImpl samplerConfig) {
-    List<MemoryIterator> toReturn = new ArrayList<MemoryIterator>(2);
+    List<MemoryIterator> toReturn = new ArrayList<>(2);
     toReturn.add(memTable.skvIterator(samplerConfig));
     if (otherMemTable != null)
       toReturn.add(otherMemTable.skvIterator(samplerConfig));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/tserver/src/test/java/org/apache/accumulo/tserver/AssignmentWatcherTest.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/test/java/org/apache/accumulo/tserver/AssignmentWatcherTest.java b/server/tserver/src/test/java/org/apache/accumulo/tserver/AssignmentWatcherTest.java
index 51e14df..5dd3c19 100644
--- a/server/tserver/src/test/java/org/apache/accumulo/tserver/AssignmentWatcherTest.java
+++ b/server/tserver/src/test/java/org/apache/accumulo/tserver/AssignmentWatcherTest.java
@@ -37,7 +37,7 @@ public class AssignmentWatcherTest {
 
   @Before
   public void setup() {
-    assignments = new HashMap<KeyExtent,RunnableStartedAt>();
+    assignments = new HashMap<>();
     timer = EasyMock.createMock(SimpleTimer.class);
     conf = EasyMock.createMock(AccumuloConfiguration.class);
     watcher = new AssignmentWatcher(conf, assignments, timer);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/tserver/src/test/java/org/apache/accumulo/tserver/CheckTabletMetadataTest.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/test/java/org/apache/accumulo/tserver/CheckTabletMetadataTest.java b/server/tserver/src/test/java/org/apache/accumulo/tserver/CheckTabletMetadataTest.java
index 27da12b..f474972 100644
--- a/server/tserver/src/test/java/org/apache/accumulo/tserver/CheckTabletMetadataTest.java
+++ b/server/tserver/src/test/java/org/apache/accumulo/tserver/CheckTabletMetadataTest.java
@@ -58,7 +58,7 @@ public class CheckTabletMetadataTest {
   }
 
   private static void assertFail(TreeMap<Key,Value> tabletMeta, KeyExtent ke, TServerInstance tsi, Key keyToDelete) {
-    TreeMap<Key,Value> copy = new TreeMap<Key,Value>(tabletMeta);
+    TreeMap<Key,Value> copy = new TreeMap<>(tabletMeta);
     Assert.assertNotNull(copy.remove(keyToDelete));
     try {
       Assert.assertNull(TabletServer.checkTabletMetadata(ke, tsi, copy, ke.getMetadataEntry()));
@@ -72,7 +72,7 @@ public class CheckTabletMetadataTest {
 
     KeyExtent ke = new KeyExtent("1", null, null);
 
-    TreeMap<Key,Value> tabletMeta = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tabletMeta = new TreeMap<>();
 
     put(tabletMeta, "1<", TabletsSection.TabletColumnFamily.PREV_ROW_COLUMN, KeyExtent.encodePrevEndRow(null).get());
     put(tabletMeta, "1<", TabletsSection.ServerColumnFamily.DIRECTORY_COLUMN, "/t1".getBytes());
@@ -101,18 +101,18 @@ public class CheckTabletMetadataTest {
 
     assertFail(tabletMeta, ke, tsi, nk("1<", TabletsSection.FutureLocationColumnFamily.NAME, "4"));
 
-    TreeMap<Key,Value> copy = new TreeMap<Key,Value>(tabletMeta);
+    TreeMap<Key,Value> copy = new TreeMap<>(tabletMeta);
     put(copy, "1<", TabletsSection.CurrentLocationColumnFamily.NAME, "4", "127.0.0.1:9997");
     assertFail(copy, ke, tsi);
     assertFail(copy, ke, tsi, nk("1<", TabletsSection.FutureLocationColumnFamily.NAME, "4"));
 
-    copy = new TreeMap<Key,Value>(tabletMeta);
+    copy = new TreeMap<>(tabletMeta);
     put(copy, "1<", TabletsSection.CurrentLocationColumnFamily.NAME, "5", "127.0.0.1:9998");
     assertFail(copy, ke, tsi);
     put(copy, "1<", TabletsSection.CurrentLocationColumnFamily.NAME, "6", "127.0.0.1:9999");
     assertFail(copy, ke, tsi);
 
-    copy = new TreeMap<Key,Value>(tabletMeta);
+    copy = new TreeMap<>(tabletMeta);
     put(copy, "1<", TabletsSection.FutureLocationColumnFamily.NAME, "5", "127.0.0.1:9998");
     assertFail(copy, ke, tsi);
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/tserver/src/test/java/org/apache/accumulo/tserver/CountingIteratorTest.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/test/java/org/apache/accumulo/tserver/CountingIteratorTest.java b/server/tserver/src/test/java/org/apache/accumulo/tserver/CountingIteratorTest.java
index 8a1dca5..423d522 100644
--- a/server/tserver/src/test/java/org/apache/accumulo/tserver/CountingIteratorTest.java
+++ b/server/tserver/src/test/java/org/apache/accumulo/tserver/CountingIteratorTest.java
@@ -36,7 +36,7 @@ import org.junit.Test;
 public class CountingIteratorTest {
   @Test
   public void testDeepCopyCount() throws IOException {
-    TreeMap<Key,Value> tm = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm = new TreeMap<>();
 
     tm.put(new Key("r1", "cf1", "cq1"), new Value("data1".getBytes()));
     tm.put(new Key("r2", "cf1", "cq1"), new Value("data2".getBytes()));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/tserver/src/test/java/org/apache/accumulo/tserver/InMemoryMapTest.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/test/java/org/apache/accumulo/tserver/InMemoryMapTest.java b/server/tserver/src/test/java/org/apache/accumulo/tserver/InMemoryMapTest.java
index 264145f..59dc68e 100644
--- a/server/tserver/src/test/java/org/apache/accumulo/tserver/InMemoryMapTest.java
+++ b/server/tserver/src/test/java/org/apache/accumulo/tserver/InMemoryMapTest.java
@@ -416,7 +416,7 @@ public class InMemoryMapTest {
 
     imm.delete(0);
 
-    ArrayList<ByteSequence> columns = new ArrayList<ByteSequence>();
+    ArrayList<ByteSequence> columns = new ArrayList<>();
     columns.add(new ArrayByteSequence("bar"));
 
     // this seek resulted in an infinite loop before a bug was fixed
@@ -474,7 +474,7 @@ public class InMemoryMapTest {
   @Test
   @Ignore
   public void parallelWriteSpeed() throws Exception {
-    List<Double> timings = new ArrayList<Double>();
+    List<Double> timings = new ArrayList<>();
     for (int threads : new int[] {1, 2, 16, /* 64, 256 */}) {
       final long now = System.currentTimeMillis();
       final long counts[] = new long[threads];

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/tserver/src/test/java/org/apache/accumulo/tserver/compaction/DefaultCompactionStrategyTest.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/test/java/org/apache/accumulo/tserver/compaction/DefaultCompactionStrategyTest.java b/server/tserver/src/test/java/org/apache/accumulo/tserver/compaction/DefaultCompactionStrategyTest.java
index dd18584..e54e1c8 100644
--- a/server/tserver/src/test/java/org/apache/accumulo/tserver/compaction/DefaultCompactionStrategyTest.java
+++ b/server/tserver/src/test/java/org/apache/accumulo/tserver/compaction/DefaultCompactionStrategyTest.java
@@ -56,10 +56,10 @@ public class DefaultCompactionStrategyTest {
     Key second = null;
     if (secondString != null)
       second = new Key(new Text(secondString));
-    return new Pair<Key,Key>(first, second);
+    return new Pair<>(first, second);
   }
 
-  static final Map<String,Pair<Key,Key>> fakeFiles = new HashMap<String,Pair<Key,Key>>();
+  static final Map<String,Pair<Key,Key>> fakeFiles = new HashMap<>();
 
   static {
     fakeFiles.put("file1", keys("b", "m"));
@@ -162,7 +162,7 @@ public class DefaultCompactionStrategyTest {
   }
 
   private MajorCompactionRequest createRequest(KeyExtent extent, MajorCompactionReason reason, Object... objs) throws IOException {
-    Map<FileRef,DataFileValue> files = new HashMap<FileRef,DataFileValue>();
+    Map<FileRef,DataFileValue> files = new HashMap<>();
     for (int i = 0; i < objs.length; i += 2) {
       files.put(new FileRef("hdfs://nn1/accumulo/tables/5/t-0001/" + (String) objs[i]), new DataFileValue(((Number) objs[i + 1]).longValue(), 0));
     }
@@ -174,7 +174,7 @@ public class DefaultCompactionStrategyTest {
   }
 
   private static Set<String> asStringSet(Collection<FileRef> refs) {
-    HashSet<String> result = new HashSet<String>();
+    HashSet<String> result = new HashSet<>();
     for (FileRef ref : refs) {
       result.add(ref.path().toString());
     }
@@ -182,7 +182,7 @@ public class DefaultCompactionStrategyTest {
   }
 
   private static Set<String> asSet(Collection<String> strings) {
-    HashSet<String> result = new HashSet<String>();
+    HashSet<String> result = new HashSet<>();
     for (String string : strings)
       result.add("hdfs://nn1/accumulo/tables/5/t-0001/" + string);
     return result;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/tserver/src/test/java/org/apache/accumulo/tserver/compaction/SizeLimitCompactionStrategyTest.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/test/java/org/apache/accumulo/tserver/compaction/SizeLimitCompactionStrategyTest.java b/server/tserver/src/test/java/org/apache/accumulo/tserver/compaction/SizeLimitCompactionStrategyTest.java
index a66715e..648f451 100644
--- a/server/tserver/src/test/java/org/apache/accumulo/tserver/compaction/SizeLimitCompactionStrategyTest.java
+++ b/server/tserver/src/test/java/org/apache/accumulo/tserver/compaction/SizeLimitCompactionStrategyTest.java
@@ -34,7 +34,7 @@ import org.junit.Test;
 public class SizeLimitCompactionStrategyTest {
   private Map<FileRef,DataFileValue> nfl(String... sa) {
 
-    HashMap<FileRef,DataFileValue> ret = new HashMap<FileRef,DataFileValue>();
+    HashMap<FileRef,DataFileValue> ret = new HashMap<>();
     for (int i = 0; i < sa.length; i += 2) {
       ret.put(new FileRef("hdfs://nn1/accumulo/tables/5/t-0001/" + sa[i]), new DataFileValue(AccumuloConfiguration.getMemoryInBytes(sa[i + 1]), 1));
     }
@@ -45,7 +45,7 @@ public class SizeLimitCompactionStrategyTest {
   @Test
   public void testLimits() throws IOException {
     SizeLimitCompactionStrategy slcs = new SizeLimitCompactionStrategy();
-    HashMap<String,String> opts = new HashMap<String,String>();
+    HashMap<String,String> opts = new HashMap<>();
     opts.put(SizeLimitCompactionStrategy.SIZE_LIMIT_OPT, "1G");
 
     slcs.init(opts);
@@ -62,7 +62,7 @@ public class SizeLimitCompactionStrategyTest {
     mcr.setFiles(nfl("f1", "2G", "f2", "2G", "f3", "2G", "f4", "2G", "f5", "500M", "f6", "500M", "f7", "500M", "f8", "500M"));
 
     Assert.assertTrue(slcs.shouldCompact(mcr));
-    Assert.assertEquals(nfl("f5", "500M", "f6", "500M", "f7", "500M", "f8", "500M").keySet(), new HashSet<FileRef>(slcs.getCompactionPlan(mcr).inputFiles));
+    Assert.assertEquals(nfl("f5", "500M", "f6", "500M", "f7", "500M", "f8", "500M").keySet(), new HashSet<>(slcs.getCompactionPlan(mcr).inputFiles));
     Assert.assertEquals(8, mcr.getFiles().size());
   }
 }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/tserver/src/test/java/org/apache/accumulo/tserver/constraints/ConstraintCheckerTest.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/test/java/org/apache/accumulo/tserver/constraints/ConstraintCheckerTest.java b/server/tserver/src/test/java/org/apache/accumulo/tserver/constraints/ConstraintCheckerTest.java
index c590242..0765b5d 100644
--- a/server/tserver/src/test/java/org/apache/accumulo/tserver/constraints/ConstraintCheckerTest.java
+++ b/server/tserver/src/test/java/org/apache/accumulo/tserver/constraints/ConstraintCheckerTest.java
@@ -53,7 +53,7 @@ public class ConstraintCheckerTest {
   @Before
   public void setup() throws NoSuchMethodException, SecurityException {
     cc = createMockBuilder(ConstraintChecker.class).addMockedMethod("getConstraints").createMock();
-    constraints = new ArrayList<Constraint>();
+    constraints = new ArrayList<>();
     expect(cc.getConstraints()).andReturn(constraints);
 
     env = createMock(Environment.class);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/tserver/src/test/java/org/apache/accumulo/tserver/log/DfsLoggerTest.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/test/java/org/apache/accumulo/tserver/log/DfsLoggerTest.java b/server/tserver/src/test/java/org/apache/accumulo/tserver/log/DfsLoggerTest.java
index cd652e4..6f10a48 100644
--- a/server/tserver/src/test/java/org/apache/accumulo/tserver/log/DfsLoggerTest.java
+++ b/server/tserver/src/test/java/org/apache/accumulo/tserver/log/DfsLoggerTest.java
@@ -31,7 +31,7 @@ public class DfsLoggerTest {
 
   @Test
   public void testDurabilityForGroupCommit() {
-    List<TabletMutations> lst = new ArrayList<TabletMutations>();
+    List<TabletMutations> lst = new ArrayList<>();
     assertEquals(Durability.NONE, DfsLogger.chooseDurabilityForGroupCommit(lst));
     TabletMutations m1 = new TabletMutations(0, 1, Collections.<Mutation> emptyList(), Durability.NONE);
     lst.add(m1);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/tserver/src/test/java/org/apache/accumulo/tserver/log/SortedLogRecoveryTest.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/test/java/org/apache/accumulo/tserver/log/SortedLogRecoveryTest.java b/server/tserver/src/test/java/org/apache/accumulo/tserver/log/SortedLogRecoveryTest.java
index 882aed7..b65d5ce 100644
--- a/server/tserver/src/test/java/org/apache/accumulo/tserver/log/SortedLogRecoveryTest.java
+++ b/server/tserver/src/test/java/org/apache/accumulo/tserver/log/SortedLogRecoveryTest.java
@@ -113,7 +113,7 @@ public class SortedLogRecoveryTest {
   }
 
   private static class CaptureMutations implements MutationReceiver {
-    public ArrayList<Mutation> result = new ArrayList<Mutation>();
+    public ArrayList<Mutation> result = new ArrayList<>();
 
     @Override
     public void receive(Mutation m) {
@@ -133,7 +133,7 @@ public class SortedLogRecoveryTest {
     VolumeManager fs = VolumeManagerImpl.getLocal(workdir);
     final Path workdirPath = new Path("file://" + workdir);
     fs.deleteRecursively(workdirPath);
-    ArrayList<Path> dirs = new ArrayList<Path>();
+    ArrayList<Path> dirs = new ArrayList<>();
     try {
       for (Entry<String,KeyValue[]> entry : logs.entrySet()) {
         String path = workdir + "/" + entry.getKey();
@@ -177,7 +177,7 @@ public class SortedLogRecoveryTest {
     KeyValue entries5[] = new KeyValue[] {createKeyValue(OPEN, 0, 4, "70"), createKeyValue(DEFINE_TABLET, 1, 4, extent),
         createKeyValue(COMPACTION_START, 3, 4, "/t1/f3"), createKeyValue(MUTATION, 2, 4, ignored), createKeyValue(MUTATION, 6, 4, m2),};
 
-    Map<String,KeyValue[]> logs = new TreeMap<String,KeyValue[]>();
+    Map<String,KeyValue[]> logs = new TreeMap<>();
     logs.put("entries", entries);
     logs.put("entries2", entries2);
     logs.put("entries3", entries3);
@@ -217,7 +217,7 @@ public class SortedLogRecoveryTest {
         createKeyValue(MUTATION, 11, 1, ignored), createKeyValue(MUTATION, 15, 1, m), createKeyValue(MUTATION, 16, 1, m2),};
     KeyValue entries4[] = new KeyValue[] {createKeyValue(OPEN, 17, -1, "4"), createKeyValue(DEFINE_TABLET, 18, 1, extent),
         createKeyValue(COMPACTION_START, 20, 1, "/t1/f3"), createKeyValue(MUTATION, 19, 1, m3), createKeyValue(MUTATION, 21, 1, m4),};
-    Map<String,KeyValue[]> logs = new TreeMap<String,KeyValue[]>();
+    Map<String,KeyValue[]> logs = new TreeMap<>();
     logs.put("entries", entries);
     logs.put("entries2", entries2);
     logs.put("entries3", entries3);
@@ -252,7 +252,7 @@ public class SortedLogRecoveryTest {
     KeyValue entries2[] = new KeyValue[] {createKeyValue(OPEN, 0, 1, "2"), createKeyValue(DEFINE_TABLET, 1, 1, extent),
         createKeyValue(COMPACTION_START, 2, 1, "/t1/f1"), createKeyValue(COMPACTION_FINISH, 3, 1, "/t1/f1"), createKeyValue(MUTATION, 3, 1, m2),};
 
-    Map<String,KeyValue[]> logs = new TreeMap<String,KeyValue[]>();
+    Map<String,KeyValue[]> logs = new TreeMap<>();
     logs.put("entries", entries);
     logs.put("entries2", entries2);
 
@@ -269,7 +269,7 @@ public class SortedLogRecoveryTest {
   public void testEmpty() throws IOException {
     // Create a test log
     KeyValue entries[] = new KeyValue[] {createKeyValue(OPEN, 0, -1, "1"), createKeyValue(DEFINE_TABLET, 1, 1, extent),};
-    Map<String,KeyValue[]> logs = new TreeMap<String,KeyValue[]>();
+    Map<String,KeyValue[]> logs = new TreeMap<>();
     logs.put("testlog", entries);
     // Recover
     List<Mutation> mutations = recover(logs, extent);
@@ -282,7 +282,7 @@ public class SortedLogRecoveryTest {
   public void testMissingDefinition() {
     // Create a test log
     KeyValue entries[] = new KeyValue[] {createKeyValue(OPEN, 0, -1, "1"),};
-    Map<String,KeyValue[]> logs = new TreeMap<String,KeyValue[]>();
+    Map<String,KeyValue[]> logs = new TreeMap<>();
     logs.put("testlog", entries);
     // Recover
     try {
@@ -297,7 +297,7 @@ public class SortedLogRecoveryTest {
     Mutation m = new ServerMutation(new Text("row1"));
     m.put(cf, cq, value);
     KeyValue entries[] = new KeyValue[] {createKeyValue(OPEN, 0, -1, "1"), createKeyValue(DEFINE_TABLET, 1, 1, extent), createKeyValue(MUTATION, 2, 1, m),};
-    Map<String,KeyValue[]> logs = new TreeMap<String,KeyValue[]>();
+    Map<String,KeyValue[]> logs = new TreeMap<>();
     logs.put("testlog", entries);
     // Recover
     List<Mutation> mutations = recover(logs, extent);
@@ -316,7 +316,7 @@ public class SortedLogRecoveryTest {
     KeyValue entries[] = new KeyValue[] {createKeyValue(OPEN, 0, -1, "1"), createKeyValue(DEFINE_TABLET, 1, 1, extent),
         createKeyValue(COMPACTION_START, 3, 1, "/t1/f1"), createKeyValue(COMPACTION_FINISH, 4, 1, null), createKeyValue(MUTATION, 2, 1, ignored),
         createKeyValue(MUTATION, 5, 1, m),};
-    Map<String,KeyValue[]> logs = new TreeMap<String,KeyValue[]>();
+    Map<String,KeyValue[]> logs = new TreeMap<>();
     logs.put("testlog", entries);
     // Recover
     List<Mutation> mutations = recover(logs, extent);
@@ -336,7 +336,7 @@ public class SortedLogRecoveryTest {
         createKeyValue(COMPACTION_START, 3, 1, "/t1/f1"), createKeyValue(MUTATION, 2, 1, ignored),};
     KeyValue entries2[] = new KeyValue[] {createKeyValue(OPEN, 4, -1, "1"), createKeyValue(DEFINE_TABLET, 5, 1, extent),
         createKeyValue(COMPACTION_FINISH, 6, 1, null), createKeyValue(MUTATION, 7, 1, m),};
-    Map<String,KeyValue[]> logs = new TreeMap<String,KeyValue[]>();
+    Map<String,KeyValue[]> logs = new TreeMap<>();
     logs.put("entries", entries);
     logs.put("entries2", entries2);
     // Recover
@@ -359,7 +359,7 @@ public class SortedLogRecoveryTest {
         createKeyValue(COMPACTION_START, 3, 1, "/t1/f1"), createKeyValue(MUTATION, 2, 1, ignored), createKeyValue(MUTATION, 4, 1, m),};
     KeyValue entries2[] = new KeyValue[] {createKeyValue(OPEN, 5, -1, "1"), createKeyValue(DEFINE_TABLET, 6, 1, extent),
         createKeyValue(COMPACTION_FINISH, 7, 1, null), createKeyValue(MUTATION, 8, 1, m2),};
-    Map<String,KeyValue[]> logs = new TreeMap<String,KeyValue[]>();
+    Map<String,KeyValue[]> logs = new TreeMap<>();
     logs.put("entries", entries);
     logs.put("entries2", entries2);
     // Recover
@@ -382,7 +382,7 @@ public class SortedLogRecoveryTest {
     KeyValue entries[] = new KeyValue[] {createKeyValue(OPEN, 0, -1, "1"), createKeyValue(DEFINE_TABLET, 1, 1, extent),
         createKeyValue(COMPACTION_FINISH, 2, 1, null), createKeyValue(COMPACTION_START, 4, 1, "/t1/f1"), createKeyValue(COMPACTION_FINISH, 6, 1, null),
         createKeyValue(MUTATION, 3, 1, ignored), createKeyValue(MUTATION, 5, 1, m), createKeyValue(MUTATION, 7, 1, m2),};
-    Map<String,KeyValue[]> logs = new TreeMap<String,KeyValue[]>();
+    Map<String,KeyValue[]> logs = new TreeMap<>();
     logs.put("entries", entries);
     // Recover
     List<Mutation> mutations = recover(logs, extent);
@@ -408,7 +408,7 @@ public class SortedLogRecoveryTest {
     KeyValue entries2[] = new KeyValue[] {createKeyValue(OPEN, 5, -1, "1"), createKeyValue(DEFINE_TABLET, 6, 1, extent), createKeyValue(MUTATION, 7, 1, m2),};
     KeyValue entries3[] = new KeyValue[] {createKeyValue(OPEN, 8, -1, "1"), createKeyValue(DEFINE_TABLET, 9, 1, extent),
         createKeyValue(COMPACTION_FINISH, 10, 1, null), createKeyValue(MUTATION, 11, 1, m3),};
-    Map<String,KeyValue[]> logs = new TreeMap<String,KeyValue[]>();
+    Map<String,KeyValue[]> logs = new TreeMap<>();
     logs.put("entries", entries);
     logs.put("entries2", entries2);
     logs.put("entries3", entries3);
@@ -431,7 +431,7 @@ public class SortedLogRecoveryTest {
     KeyValue entries[] = new KeyValue[] {createKeyValue(OPEN, 0, -1, "1"), createKeyValue(DEFINE_TABLET, 1, 1, extent),
         createKeyValue(COMPACTION_START, 30, 1, "/t1/f1"), createKeyValue(COMPACTION_FINISH, 32, 1, "/t1/f1"), createKeyValue(MUTATION, 29, 1, m1),
         createKeyValue(MUTATION, 30, 1, m2),};
-    Map<String,KeyValue[]> logs = new TreeMap<String,KeyValue[]>();
+    Map<String,KeyValue[]> logs = new TreeMap<>();
     logs.put("testlog", entries);
     // Recover
     List<Mutation> mutations = recover(logs, extent);
@@ -454,7 +454,7 @@ public class SortedLogRecoveryTest {
         createKeyValue(COMPACTION_START, 2, 1, "/t1/f1"), createKeyValue(COMPACTION_FINISH, 4, 1, null), createKeyValue(MUTATION, 3, 1, m),};
     KeyValue entries2[] = new KeyValue[] {createKeyValue(OPEN, 5, -1, "1"), createKeyValue(DEFINE_TABLET, 6, 1, extent),
         createKeyValue(COMPACTION_START, 8, 1, "/t1/f1"), createKeyValue(MUTATION, 7, 1, m2), createKeyValue(MUTATION, 9, 1, m3),};
-    Map<String,KeyValue[]> logs = new TreeMap<String,KeyValue[]>();
+    Map<String,KeyValue[]> logs = new TreeMap<>();
     logs.put("entries", entries);
     logs.put("entries2", entries2);
     // Recover
@@ -498,7 +498,7 @@ public class SortedLogRecoveryTest {
         // createKeyValue(COMPACTION_START, 18, 1, "somefile"),
         // createKeyValue(COMPACTION_FINISH, 19, 1, null),
         createKeyValue(MUTATION, 8, 1, m5), createKeyValue(MUTATION, 20, 1, m6),};
-    Map<String,KeyValue[]> logs = new TreeMap<String,KeyValue[]>();
+    Map<String,KeyValue[]> logs = new TreeMap<>();
     logs.put("entries", entries);
     logs.put("entries2", entries2);
     logs.put("entries3", entries3);
@@ -535,7 +535,7 @@ public class SortedLogRecoveryTest {
         createKeyValue(MUTATION, 3, 1, m), createKeyValue(MUTATION, 3, 1, m2), createKeyValue(MUTATION, 3, 1, m3),};
     KeyValue entries2[] = new KeyValue[] {createKeyValue(OPEN, 0, -1, "2"), createKeyValue(DEFINE_TABLET, 1, 1, extent),
         createKeyValue(COMPACTION_START, 2, 1, "/t1/f12"), createKeyValue(MUTATION, 3, 1, m4), createKeyValue(MUTATION, 3, 1, m5),};
-    Map<String,KeyValue[]> logs = new TreeMap<String,KeyValue[]>();
+    Map<String,KeyValue[]> logs = new TreeMap<>();
     logs.put("entries", entries);
     logs.put("entries2", entries2);
     // Recover
@@ -566,7 +566,7 @@ public class SortedLogRecoveryTest {
 
     Arrays.sort(entries);
 
-    Map<String,KeyValue[]> logs = new TreeMap<String,KeyValue[]>();
+    Map<String,KeyValue[]> logs = new TreeMap<>();
     logs.put("entries", entries);
 
     List<Mutation> mutations = recover(logs, extent);
@@ -586,7 +586,7 @@ public class SortedLogRecoveryTest {
         createKeyValue(MUTATION, 2, 2, ignored), createKeyValue(COMPACTION_START, 3, 2, "/t/f1")};
 
     Arrays.sort(entries);
-    Map<String,KeyValue[]> logs = new TreeMap<String,KeyValue[]>();
+    Map<String,KeyValue[]> logs = new TreeMap<>();
     logs.put("entries", entries);
 
     List<Mutation> mutations = recover(logs, Collections.singleton("/t/f1"), extent);
@@ -607,7 +607,7 @@ public class SortedLogRecoveryTest {
         createKeyValue(MUTATION, 2, 2, ignored), createKeyValue(COMPACTION_START, 3, 2, "/t/f1"), createKeyValue(MUTATION, 4, 2, m),};
 
     Arrays.sort(entries);
-    Map<String,KeyValue[]> logs = new TreeMap<String,KeyValue[]>();
+    Map<String,KeyValue[]> logs = new TreeMap<>();
     logs.put("entries", entries);
 
     List<Mutation> mutations = recover(logs, Collections.singleton("/t/f1"), extent);
@@ -626,10 +626,10 @@ public class SortedLogRecoveryTest {
         createKeyValue(COMPACTION_START, 3, 2, compactionStartFile), createKeyValue(MUTATION, 4, 2, m2),};
 
     Arrays.sort(entries);
-    Map<String,KeyValue[]> logs = new TreeMap<String,KeyValue[]>();
+    Map<String,KeyValue[]> logs = new TreeMap<>();
     logs.put("entries", entries);
 
-    HashSet<String> filesSet = new HashSet<String>();
+    HashSet<String> filesSet = new HashSet<>();
     filesSet.addAll(Arrays.asList(tabletFiles));
     List<Mutation> mutations = recover(logs, filesSet, extent);
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/tserver/src/test/java/org/apache/accumulo/tserver/tablet/RootFilesTest.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/test/java/org/apache/accumulo/tserver/tablet/RootFilesTest.java b/server/tserver/src/test/java/org/apache/accumulo/tserver/tablet/RootFilesTest.java
index e5d893a..d9c6862 100644
--- a/server/tserver/src/test/java/org/apache/accumulo/tserver/tablet/RootFilesTest.java
+++ b/server/tserver/src/test/java/org/apache/accumulo/tserver/tablet/RootFilesTest.java
@@ -60,7 +60,7 @@ public class RootFilesTest {
 
       rootTabletDir = new File(tempFolder.newFolder(), "accumulo/tables/+r/root_tablet");
       assertTrue(rootTabletDir.mkdirs() || rootTabletDir.isDirectory());
-      oldDatafiles = new HashSet<FileRef>();
+      oldDatafiles = new HashSet<>();
       for (String filename : inputFiles) {
         File file = new File(rootTabletDir, filename);
         assertTrue(file.createNewFile());
@@ -91,17 +91,17 @@ public class RootFilesTest {
     public Collection<String> cleanupReplacement(String... expectedFiles) throws IOException {
       Collection<String> ret = RootFiles.cleanupReplacement(vm, vm.listStatus(new Path(rootTabletDir.toURI())), true);
 
-      HashSet<String> expected = new HashSet<String>();
+      HashSet<String> expected = new HashSet<>();
       for (String efile : expectedFiles)
         expected.add(new File(rootTabletDir, efile).toURI().toString());
 
-      Assert.assertEquals(expected, new HashSet<String>(ret));
+      Assert.assertEquals(expected, new HashSet<>(ret));
 
       return ret;
     }
 
     public void assertFiles(String... files) {
-      HashSet<String> actual = new HashSet<String>();
+      HashSet<String> actual = new HashSet<>();
       File[] children = rootTabletDir.listFiles();
       if (children != null) {
         for (File file : children) {
@@ -109,7 +109,7 @@ public class RootFilesTest {
         }
       }
 
-      HashSet<String> expected = new HashSet<String>();
+      HashSet<String> expected = new HashSet<>();
       expected.addAll(Arrays.asList(files));
 
       Assert.assertEquals(expected, actual);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/shell/src/main/java/org/apache/accumulo/shell/Shell.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/Shell.java b/shell/src/main/java/org/apache/accumulo/shell/Shell.java
index 5c95129..db9732c 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/Shell.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/Shell.java
@@ -206,12 +206,12 @@ public class Shell extends ShellOptions implements KeywordExecutable {
   protected ConsoleReader reader;
   private AuthenticationToken token;
   private final Class<? extends Formatter> defaultFormatterClass = DefaultFormatter.class;
-  public Map<String,List<IteratorSetting>> scanIteratorOptions = new HashMap<String,List<IteratorSetting>>();
-  public Map<String,List<IteratorSetting>> iteratorProfiles = new HashMap<String,List<IteratorSetting>>();
+  public Map<String,List<IteratorSetting>> scanIteratorOptions = new HashMap<>();
+  public Map<String,List<IteratorSetting>> iteratorProfiles = new HashMap<>();
 
   private Token rootToken;
-  public final Map<String,Command> commandFactory = new TreeMap<String,Command>();
-  public final Map<String,Command[]> commandGrouping = new TreeMap<String,Command[]>();
+  public final Map<String,Command> commandFactory = new TreeMap<>();
+  public final Map<String,Command[]> commandGrouping = new TreeMap<>();
 
   // exit if true
   private boolean exit = false;
@@ -875,15 +875,15 @@ public class Shell extends ShellOptions implements KeywordExecutable {
       namespaces = Collections.emptySet();
     }
 
-    Map<Command.CompletionSet,Set<String>> options = new HashMap<Command.CompletionSet,Set<String>>();
+    Map<Command.CompletionSet,Set<String>> options = new HashMap<>();
 
-    Set<String> commands = new HashSet<String>();
+    Set<String> commands = new HashSet<>();
     for (String a : commandFactory.keySet())
       commands.add(a);
 
-    Set<String> modifiedUserlist = new HashSet<String>();
-    Set<String> modifiedTablenames = new HashSet<String>();
-    Set<String> modifiedNamespaces = new HashSet<String>();
+    Set<String> modifiedUserlist = new HashSet<>();
+    Set<String> modifiedTablenames = new HashSet<>();
+    Set<String> modifiedNamespaces = new HashSet<>();
 
     for (String a : tableNames)
       modifiedTablenames.add(a.replaceAll("([\\s'\"])", "\\\\$1"));
@@ -1026,7 +1026,7 @@ public class Shell extends ShellOptions implements KeywordExecutable {
 
     @Override
     public void close() {}
-  };
+  }
 
   public static class PrintFile implements PrintLine {
     PrintWriter writer;
@@ -1044,7 +1044,7 @@ public class Shell extends ShellOptions implements KeywordExecutable {
     public void close() {
       writer.close();
     }
-  };
+  }
 
   public final void printLines(Iterator<String> lines, boolean paginate) throws IOException {
     printLines(lines, paginate, null);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/shell/src/main/java/org/apache/accumulo/shell/ShellOptionsJC.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/ShellOptionsJC.java b/shell/src/main/java/org/apache/accumulo/shell/ShellOptionsJC.java
index 01b7ce3..1e5156f 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/ShellOptionsJC.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/ShellOptionsJC.java
@@ -105,7 +105,7 @@ public class ShellOptionsJC {
       String process(String value) {
         return value;
       }
-    };
+    }
 
     @Override
     public String convert(String value) {
@@ -141,7 +141,7 @@ public class ShellOptionsJC {
   private AuthenticationToken authenticationToken;
 
   @DynamicParameter(names = {"-l", "--tokenProperty"}, description = "login properties in the format key=value. Reuse -l for each property")
-  private Map<String,String> tokenProperties = new TreeMap<String,String>();
+  private Map<String,String> tokenProperties = new TreeMap<>();
 
   @Parameter(names = "--disable-tab-completion", description = "disables tab completion (for less overhead when scripting)")
   private boolean tabCompletionDisabled;
@@ -169,7 +169,7 @@ public class ShellOptionsJC {
   private boolean hdfsZooInstance;
 
   @Parameter(names = {"-z", "--zooKeeperInstance"}, description = "use a zookeeper instance with the given instance name and list of zoo hosts", arity = 2)
-  private List<String> zooKeeperInstance = new ArrayList<String>();
+  private List<String> zooKeeperInstance = new ArrayList<>();
 
   @Parameter(names = {"--ssl"}, description = "use ssl to connect to accumulo")
   private boolean useSsl = false;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/shell/src/main/java/org/apache/accumulo/shell/Token.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/Token.java b/shell/src/main/java/org/apache/accumulo/shell/Token.java
index fe29537..41921e5 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/Token.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/Token.java
@@ -30,8 +30,8 @@ import java.util.Set;
  */
 
 public class Token {
-  private Set<String> command = new HashSet<String>();
-  private Set<Token> subcommands = new HashSet<Token>();
+  private Set<String> command = new HashSet<>();
+  private Set<Token> subcommands = new HashSet<>();
   private boolean caseSensitive = false;
 
   public Token() {}
@@ -73,7 +73,7 @@ public class Token {
   }
 
   public Set<String> getSubcommandNames() {
-    HashSet<String> set = new HashSet<String>();
+    HashSet<String> set = new HashSet<>();
     for (Token t : subcommands)
       set.addAll(t.getCommandNames());
     return set;
@@ -81,7 +81,7 @@ public class Token {
 
   public Set<String> getSubcommandNames(String startsWith) {
     Iterator<Token> iter = subcommands.iterator();
-    HashSet<String> set = new HashSet<String>();
+    HashSet<String> set = new HashSet<>();
     while (iter.hasNext()) {
       Token t = iter.next();
       Set<String> subset = t.getCommandNames();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/shell/src/main/java/org/apache/accumulo/shell/commands/ActiveCompactionIterator.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/ActiveCompactionIterator.java b/shell/src/main/java/org/apache/accumulo/shell/commands/ActiveCompactionIterator.java
index bd039b0..27a5bc8 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/ActiveCompactionIterator.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/ActiveCompactionIterator.java
@@ -54,7 +54,7 @@ class ActiveCompactionIterator implements Iterator<String> {
   }
 
   private void readNext() {
-    final List<String> compactions = new ArrayList<String>();
+    final List<String> compactions = new ArrayList<>();
 
     while (tsIter.hasNext()) {
 
@@ -62,7 +62,7 @@ class ActiveCompactionIterator implements Iterator<String> {
       try {
         List<ActiveCompaction> acl = instanceOps.getActiveCompactions(tserver);
 
-        acl = new ArrayList<ActiveCompaction>(acl);
+        acl = new ArrayList<>(acl);
 
         Collections.sort(acl, new Comparator<ActiveCompaction>() {
           @Override
@@ -80,8 +80,8 @@ class ActiveCompactionIterator implements Iterator<String> {
 
           ac.getIterators();
 
-          List<String> iterList = new ArrayList<String>();
-          Map<String,Map<String,String>> iterOpts = new HashMap<String,Map<String,String>>();
+          List<String> iterList = new ArrayList<>();
+          Map<String,Map<String,String>> iterOpts = new HashMap<>();
           for (IteratorSetting is : ac.getIterators()) {
             iterList.add(is.getName() + "=" + is.getPriority() + "," + is.getIteratorClass());
             iterOpts.put(is.getName(), is.getOptions());

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/shell/src/main/java/org/apache/accumulo/shell/commands/ActiveScanIterator.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/ActiveScanIterator.java b/shell/src/main/java/org/apache/accumulo/shell/commands/ActiveScanIterator.java
index 1089d78..ab0b344 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/ActiveScanIterator.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/ActiveScanIterator.java
@@ -33,7 +33,7 @@ class ActiveScanIterator implements Iterator<String> {
   private Iterator<String> scansIter;
 
   private void readNext() {
-    final List<String> scans = new ArrayList<String>();
+    final List<String> scans = new ArrayList<>();
 
     while (tsIter.hasNext()) {
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/shell/src/main/java/org/apache/accumulo/shell/commands/AddSplitsCommand.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/AddSplitsCommand.java b/shell/src/main/java/org/apache/accumulo/shell/commands/AddSplitsCommand.java
index 964ec41..86d08a0 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/AddSplitsCommand.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/AddSplitsCommand.java
@@ -36,7 +36,7 @@ public class AddSplitsCommand extends Command {
     final String tableName = OptUtil.getTableOpt(cl, shellState);
     final boolean decode = cl.hasOption(base64Opt.getOpt());
 
-    final TreeSet<Text> splits = new TreeSet<Text>();
+    final TreeSet<Text> splits = new TreeSet<>();
 
     if (cl.hasOption(optSplitsFile.getOpt())) {
       splits.addAll(ShellUtil.scanFile(cl.getOptionValue(optSplitsFile.getOpt()), decode));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/shell/src/main/java/org/apache/accumulo/shell/commands/CloneTableCommand.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/CloneTableCommand.java b/shell/src/main/java/org/apache/accumulo/shell/commands/CloneTableCommand.java
index daca82c..8f99f9c 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/CloneTableCommand.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/CloneTableCommand.java
@@ -42,8 +42,8 @@ public class CloneTableCommand extends Command {
   public int execute(final String fullCommand, final CommandLine cl, final Shell shellState) throws AccumuloException, AccumuloSecurityException,
       TableNotFoundException, TableExistsException {
 
-    final HashMap<String,String> props = new HashMap<String,String>();
-    final HashSet<String> exclude = new HashSet<String>();
+    final HashMap<String,String> props = new HashMap<>();
+    final HashSet<String> exclude = new HashSet<>();
     boolean flush = true;
 
     if (cl.hasOption(setPropsOption.getOpt())) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/shell/src/main/java/org/apache/accumulo/shell/commands/ConfigCommand.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/ConfigCommand.java b/shell/src/main/java/org/apache/accumulo/shell/commands/ConfigCommand.java
index ec3f276..482bd84 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/ConfigCommand.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/ConfigCommand.java
@@ -140,21 +140,21 @@ public class ConfigCommand extends Command {
       }
     } else {
       // display properties
-      final TreeMap<String,String> systemConfig = new TreeMap<String,String>();
+      final TreeMap<String,String> systemConfig = new TreeMap<>();
       systemConfig.putAll(shellState.getConnector().instanceOperations().getSystemConfiguration());
 
       final String outputFile = cl.getOptionValue(outputFileOpt.getOpt());
       final PrintFile printFile = outputFile == null ? null : new PrintFile(outputFile);
 
-      final TreeMap<String,String> siteConfig = new TreeMap<String,String>();
+      final TreeMap<String,String> siteConfig = new TreeMap<>();
       siteConfig.putAll(shellState.getConnector().instanceOperations().getSiteConfiguration());
 
-      final TreeMap<String,String> defaults = new TreeMap<String,String>();
+      final TreeMap<String,String> defaults = new TreeMap<>();
       for (Entry<String,String> defaultEntry : AccumuloConfiguration.getDefaultConfiguration()) {
         defaults.put(defaultEntry.getKey(), defaultEntry.getValue());
       }
 
-      final TreeMap<String,String> namespaceConfig = new TreeMap<String,String>();
+      final TreeMap<String,String> namespaceConfig = new TreeMap<>();
       if (tableName != null) {
         String n = Namespaces.getNamespaceName(shellState.getInstance(),
             Tables.getNamespaceId(shellState.getInstance(), Tables.getTableId(shellState.getInstance(), tableName)));
@@ -169,7 +169,7 @@ public class ConfigCommand extends Command {
       } else if (namespace != null) {
         acuconf = shellState.getConnector().namespaceOperations().getProperties(namespace);
       }
-      final TreeMap<String,String> sortedConf = new TreeMap<String,String>();
+      final TreeMap<String,String> sortedConf = new TreeMap<>();
       for (Entry<String,String> propEntry : acuconf) {
         sortedConf.put(propEntry.getKey(), propEntry.getValue());
       }
@@ -187,7 +187,7 @@ public class ConfigCommand extends Command {
         COL2 = Math.max(COL2, propEntry.getKey().length() + 3);
       }
 
-      final ArrayList<String> output = new ArrayList<String>();
+      final ArrayList<String> output = new ArrayList<>();
       printConfHeader(output);
 
       for (Entry<String,String> propEntry : sortedConf.entrySet()) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/shell/src/main/java/org/apache/accumulo/shell/commands/CreateTableCommand.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/CreateTableCommand.java b/shell/src/main/java/org/apache/accumulo/shell/commands/CreateTableCommand.java
index b0aca92..eac16fa 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/CreateTableCommand.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/CreateTableCommand.java
@@ -62,7 +62,7 @@ public class CreateTableCommand extends Command {
       TableExistsException, TableNotFoundException, IOException, ClassNotFoundException {
 
     final String testTableName = cl.getArgs()[0];
-    final HashMap<String,String> props = new HashMap<String,String>();
+    final HashMap<String,String> props = new HashMap<>();
 
     if (!testTableName.matches(Tables.VALID_NAME_REGEX)) {
       shellState.getReader().println("Only letters, numbers and underscores are allowed for use in table names.");
@@ -73,7 +73,7 @@ public class CreateTableCommand extends Command {
     if (shellState.getConnector().tableOperations().exists(tableName)) {
       throw new TableExistsException(null, tableName, null);
     }
-    final SortedSet<Text> partitions = new TreeSet<Text>();
+    final SortedSet<Text> partitions = new TreeSet<>();
     final boolean decode = cl.hasOption(base64Opt.getOpt());
 
     if (cl.hasOption(createTableOptSplit.getOpt())) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/shell/src/main/java/org/apache/accumulo/shell/commands/DUCommand.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/DUCommand.java b/shell/src/main/java/org/apache/accumulo/shell/commands/DUCommand.java
index 2adcc81..4d312fc 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/DUCommand.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/DUCommand.java
@@ -42,7 +42,7 @@ public class DUCommand extends Command {
   public int execute(final String fullCommand, final CommandLine cl, final Shell shellState) throws IOException, TableNotFoundException,
       NamespaceNotFoundException {
 
-    final SortedSet<String> tables = new TreeSet<String>(Arrays.asList(cl.getArgs()));
+    final SortedSet<String> tables = new TreeSet<>(Arrays.asList(cl.getArgs()));
 
     if (cl.hasOption(ShellOptions.tableOption)) {
       tables.add(cl.getOptionValue(ShellOptions.tableOption));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/shell/src/main/java/org/apache/accumulo/shell/commands/DeleteAuthsCommand.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/DeleteAuthsCommand.java b/shell/src/main/java/org/apache/accumulo/shell/commands/DeleteAuthsCommand.java
index 859dd57..995db0c 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/DeleteAuthsCommand.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/DeleteAuthsCommand.java
@@ -46,7 +46,7 @@ public class DeleteAuthsCommand extends Command {
     final Authorizations auths = connector.securityOperations().getUserAuthorizations(user);
     final StringBuilder userAuths = new StringBuilder();
     final String[] toBeRemovedAuths = scanOpts.split(",");
-    final Set<String> toBeRemovedSet = new HashSet<String>();
+    final Set<String> toBeRemovedSet = new HashSet<>();
     for (String auth : toBeRemovedAuths) {
       toBeRemovedSet.add(auth);
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/shell/src/main/java/org/apache/accumulo/shell/commands/ExtensionCommand.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/ExtensionCommand.java b/shell/src/main/java/org/apache/accumulo/shell/commands/ExtensionCommand.java
index 3cff189..f78a503 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/ExtensionCommand.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/ExtensionCommand.java
@@ -34,9 +34,9 @@ public class ExtensionCommand extends Command {
 
   private ServiceLoader<ShellExtension> extensions = null;
 
-  private Set<String> loadedHeaders = new HashSet<String>();
-  private Set<String> loadedCommands = new HashSet<String>();
-  private Set<String> loadedExtensions = new TreeSet<String>();
+  private Set<String> loadedHeaders = new HashSet<>();
+  private Set<String> loadedCommands = new HashSet<>();
+  private Set<String> loadedExtensions = new TreeSet<>();
 
   @Override
   public int execute(String fullCommand, CommandLine cl, Shell shellState) throws Exception {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/shell/src/main/java/org/apache/accumulo/shell/commands/FateCommand.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/FateCommand.java b/shell/src/main/java/org/apache/accumulo/shell/commands/FateCommand.java
index e5d6c59..88eeefd 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/FateCommand.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/FateCommand.java
@@ -123,12 +123,12 @@ public class FateCommand extends Command {
     String cmd = args[0];
     boolean failedCommand = false;
 
-    AdminUtil<FateCommand> admin = new AdminUtil<FateCommand>(false);
+    AdminUtil<FateCommand> admin = new AdminUtil<>(false);
 
     String path = ZooUtil.getRoot(instance) + Constants.ZFATE;
     String masterPath = ZooUtil.getRoot(instance) + Constants.ZMASTER_LOCK;
     IZooReaderWriter zk = getZooReaderWriter(shellState.getInstance(), cl.getOptionValue(secretOption.getOpt()));
-    ZooStore<FateCommand> zs = new ZooStore<FateCommand>(path, zk);
+    ZooStore<FateCommand> zs = new ZooStore<>(path, zk);
 
     if ("fail".equals(cmd)) {
       if (args.length <= 1) {
@@ -156,7 +156,7 @@ public class FateCommand extends Command {
       // Parse transaction ID filters for print display
       Set<Long> filterTxid = null;
       if (args.length >= 2) {
-        filterTxid = new HashSet<Long>(args.length);
+        filterTxid = new HashSet<>(args.length);
         for (int i = 1; i < args.length; i++) {
           try {
             Long val = Long.parseLong(args[i], 16);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/shell/src/main/java/org/apache/accumulo/shell/commands/GetAuthsCommand.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/GetAuthsCommand.java b/shell/src/main/java/org/apache/accumulo/shell/commands/GetAuthsCommand.java
index 5c6a4eb..1f6cec0 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/GetAuthsCommand.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/GetAuthsCommand.java
@@ -46,7 +46,7 @@ public class GetAuthsCommand extends Command {
   }
 
   protected List<String> sortAuthorizations(Authorizations auths) {
-    List<String> list = new ArrayList<String>();
+    List<String> list = new ArrayList<>();
     for (byte[] auth : auths) {
       list.add(new String(auth));
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/shell/src/main/java/org/apache/accumulo/shell/commands/HelpCommand.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/HelpCommand.java b/shell/src/main/java/org/apache/accumulo/shell/commands/HelpCommand.java
index 5945cc3..bf26a45 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/HelpCommand.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/HelpCommand.java
@@ -49,7 +49,7 @@ public class HelpCommand extends Command {
       if (numColumns < 40) {
         throw new IllegalArgumentException("numColumns must be at least 40 (was " + numColumns + ")");
       }
-      final ArrayList<String> output = new ArrayList<String>();
+      final ArrayList<String> output = new ArrayList<>();
       for (Entry<String,Command[]> cmdGroup : shellState.commandGrouping.entrySet()) {
         output.add(cmdGroup.getKey());
         for (Command c : cmdGroup.getValue()) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/shell/src/main/java/org/apache/accumulo/shell/commands/InsertCommand.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/InsertCommand.java b/shell/src/main/java/org/apache/accumulo/shell/commands/InsertCommand.java
index af5f810..c9da47e 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/InsertCommand.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/InsertCommand.java
@@ -106,7 +106,7 @@ public class InsertCommand extends Command {
     try {
       bw.close();
     } catch (MutationsRejectedException e) {
-      final ArrayList<String> lines = new ArrayList<String>();
+      final ArrayList<String> lines = new ArrayList<>();
       if (e.getSecurityErrorCodes().isEmpty() == false) {
         lines.add("\tAuthorization Failures:");
       }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/shell/src/main/java/org/apache/accumulo/shell/commands/ListBulkCommand.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/ListBulkCommand.java b/shell/src/main/java/org/apache/accumulo/shell/commands/ListBulkCommand.java
index 6db9327..8f09e8a 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/ListBulkCommand.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/ListBulkCommand.java
@@ -60,7 +60,7 @@ public class ListBulkCommand extends Command {
     final boolean paginate = !cl.hasOption(disablePaginationOpt.getOpt());
 
     if (cl.hasOption(tserverOption.getOpt())) {
-      tservers = new ArrayList<String>();
+      tservers = new ArrayList<>();
       tservers.add(cl.getOptionValue(tserverOption.getOpt()));
     } else {
       tservers = Collections.emptyList();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/shell/src/main/java/org/apache/accumulo/shell/commands/ListCompactionsCommand.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/ListCompactionsCommand.java b/shell/src/main/java/org/apache/accumulo/shell/commands/ListCompactionsCommand.java
index e4b3410..f59c481 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/ListCompactionsCommand.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/ListCompactionsCommand.java
@@ -45,7 +45,7 @@ public class ListCompactionsCommand extends Command {
     final boolean paginate = !cl.hasOption(disablePaginationOpt.getOpt());
 
     if (cl.hasOption(tserverOption.getOpt())) {
-      tservers = new ArrayList<String>();
+      tservers = new ArrayList<>();
       tservers.add(cl.getOptionValue(tserverOption.getOpt()));
     } else {
       tservers = instanceOps.getTabletServers();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/shell/src/main/java/org/apache/accumulo/shell/commands/ListIterCommand.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/ListIterCommand.java b/shell/src/main/java/org/apache/accumulo/shell/commands/ListIterCommand.java
index 6187300..4a1c0bf 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/ListIterCommand.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/ListIterCommand.java
@@ -63,7 +63,7 @@ public class ListIterCommand extends Command {
     }
 
     final boolean allScopes = cl.hasOption(allScopesOpt.getOpt());
-    Set<IteratorScope> desiredScopes = new HashSet<IteratorScope>();
+    Set<IteratorScope> desiredScopes = new HashSet<>();
     for (IteratorScope scope : IteratorScope.values()) {
       if (allScopes || cl.hasOption(scopeOpts.get(scope).getOpt()))
         desiredScopes.add(scope);
@@ -120,7 +120,7 @@ public class ListIterCommand extends Command {
     allScopesOpt = new Option("all", "all-scopes", false, "list from all scopes");
     o.addOption(allScopesOpt);
 
-    scopeOpts = new EnumMap<IteratorScope,Option>(IteratorScope.class);
+    scopeOpts = new EnumMap<>(IteratorScope.class);
     scopeOpts.put(IteratorScope.minc, new Option(IteratorScope.minc.name(), "minor-compaction", false, "list iterator for minor compaction scope"));
     scopeOpts.put(IteratorScope.majc, new Option(IteratorScope.majc.name(), "major-compaction", false, "list iterator for major compaction scope"));
     scopeOpts.put(IteratorScope.scan, new Option(IteratorScope.scan.name(), "scan-time", false, "list iterator for scan scope"));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/shell/src/main/java/org/apache/accumulo/shell/commands/ListScansCommand.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/ListScansCommand.java b/shell/src/main/java/org/apache/accumulo/shell/commands/ListScansCommand.java
index f89b6fc..261db07 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/ListScansCommand.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/ListScansCommand.java
@@ -45,7 +45,7 @@ public class ListScansCommand extends Command {
     final boolean paginate = !cl.hasOption(disablePaginationOpt.getOpt());
 
     if (cl.hasOption(tserverOption.getOpt())) {
-      tservers = new ArrayList<String>();
+      tservers = new ArrayList<>();
       tservers.add(cl.getOptionValue(tserverOption.getOpt()));
     } else {
       tservers = instanceOps.getTabletServers();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/shell/src/main/java/org/apache/accumulo/shell/commands/NamespacesCommand.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/NamespacesCommand.java b/shell/src/main/java/org/apache/accumulo/shell/commands/NamespacesCommand.java
index d88d6f1..cb37505 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/NamespacesCommand.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/NamespacesCommand.java
@@ -41,7 +41,7 @@ public class NamespacesCommand extends Command {
 
   @Override
   public int execute(final String fullCommand, final CommandLine cl, final Shell shellState) throws AccumuloException, AccumuloSecurityException, IOException {
-    Map<String,String> namespaces = new TreeMap<String,String>(shellState.getConnector().namespaceOperations().namespaceIdMap());
+    Map<String,String> namespaces = new TreeMap<>(shellState.getConnector().namespaceOperations().namespaceIdMap());
 
     Iterator<String> it = Iterators.transform(namespaces.entrySet().iterator(), new Function<Entry<String,String>,String>() {
       @Override

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/shell/src/main/java/org/apache/accumulo/shell/commands/PingCommand.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/PingCommand.java b/shell/src/main/java/org/apache/accumulo/shell/commands/PingCommand.java
index ba6de68..c0271b7 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/PingCommand.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/PingCommand.java
@@ -48,7 +48,7 @@ public class PingCommand extends Command {
     final boolean paginate = !cl.hasOption(disablePaginationOpt.getOpt());
 
     if (cl.hasOption(tserverOption.getOpt())) {
-      tservers = new ArrayList<String>();
+      tservers = new ArrayList<>();
       tservers.add(cl.getOptionValue(tserverOption.getOpt()));
     } else {
       tservers = instanceOps.getTabletServers();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/shell/src/main/java/org/apache/accumulo/shell/commands/QuotedStringTokenizer.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/QuotedStringTokenizer.java b/shell/src/main/java/org/apache/accumulo/shell/commands/QuotedStringTokenizer.java
index 74397de..a66188e 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/QuotedStringTokenizer.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/QuotedStringTokenizer.java
@@ -38,7 +38,7 @@ public class QuotedStringTokenizer implements Iterable<String> {
   private String input;
 
   public QuotedStringTokenizer(final String t) throws BadArgumentException {
-    tokens = new ArrayList<String>();
+    tokens = new ArrayList<>();
     this.input = t;
     try {
       createTokens();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/shell/src/main/java/org/apache/accumulo/shell/commands/ScriptCommand.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/ScriptCommand.java b/shell/src/main/java/org/apache/accumulo/shell/commands/ScriptCommand.java
index 3059b52..82b7d57 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/ScriptCommand.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/ScriptCommand.java
@@ -88,7 +88,7 @@ public class ScriptCommand extends Command {
       Bindings b = engine.getBindings(ScriptContext.ENGINE_SCOPE);
       b.put("connection", shellState.getConnector());
 
-      List<Object> argValues = new ArrayList<Object>();
+      List<Object> argValues = new ArrayList<>();
       if (cl.hasOption(args.getOpt())) {
         String[] argList = cl.getOptionValue(args.getOpt()).split(",");
         for (String arg : argList) {
@@ -249,7 +249,7 @@ public class ScriptCommand extends Command {
 
   private void listJSREngineInfo(ScriptEngineManager mgr, Shell shellState) throws IOException {
     List<ScriptEngineFactory> factories = mgr.getEngineFactories();
-    Set<String> lines = new TreeSet<String>();
+    Set<String> lines = new TreeSet<>();
     for (ScriptEngineFactory factory : factories) {
       lines.add("ScriptEngineFactory Info");
       String engName = factory.getEngineName();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/shell/src/main/java/org/apache/accumulo/shell/commands/SetGroupsCommand.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/SetGroupsCommand.java b/shell/src/main/java/org/apache/accumulo/shell/commands/SetGroupsCommand.java
index 62ed1a2..b095bcf 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/SetGroupsCommand.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/SetGroupsCommand.java
@@ -36,7 +36,7 @@ public class SetGroupsCommand extends Command {
   public int execute(final String fullCommand, final CommandLine cl, final Shell shellState) throws Exception {
     final String tableName = OptUtil.getTableOpt(cl, shellState);
 
-    final HashMap<String,Set<Text>> groups = new HashMap<String,Set<Text>>();
+    final HashMap<String,Set<Text>> groups = new HashMap<>();
 
     for (String arg : cl.getArgs()) {
       final String sa[] = arg.split("=", 2);
@@ -44,7 +44,7 @@ public class SetGroupsCommand extends Command {
         throw new IllegalArgumentException("Missing '='");
       }
       final String group = sa[0];
-      final HashSet<Text> colFams = new HashSet<Text>();
+      final HashSet<Text> colFams = new HashSet<>();
 
       for (String family : sa[1].split(",")) {
         colFams.add(new Text(family.getBytes(Shell.CHARSET)));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/shell/src/main/java/org/apache/accumulo/shell/commands/SetIterCommand.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/SetIterCommand.java b/shell/src/main/java/org/apache/accumulo/shell/commands/SetIterCommand.java
index 23b98a6..fffdf21 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/SetIterCommand.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/SetIterCommand.java
@@ -64,7 +64,7 @@ public class SetIterCommand extends Command {
 
     final int priority = Integer.parseInt(cl.getOptionValue(priorityOpt.getOpt()));
 
-    final Map<String,String> options = new HashMap<String,String>();
+    final Map<String,String> options = new HashMap<>();
     String classname = cl.getOptionValue(classnameTypeOpt.getOpt());
     if (cl.hasOption(aggTypeOpt.getOpt())) {
       Shell.log.warn("aggregators are deprecated");
@@ -240,7 +240,7 @@ public class SetIterCommand extends Command {
       if (className.contains(".")) {
         shortClassName = className.substring(className.lastIndexOf('.') + 1);
       }
-      final Map<String,String> localOptions = new HashMap<String,String>();
+      final Map<String,String> localOptions = new HashMap<>();
       do {
         // clean up the overall options that caused things to fail
         for (String key : localOptions.keySet()) {
@@ -311,7 +311,7 @@ public class SetIterCommand extends Command {
       reader.flush();
       reader.println("Optional, configure name-value options for iterator:");
       String prompt = Shell.repeat("-", 10) + "> set option (<name> <value>, hit enter to skip): ";
-      final HashMap<String,String> localOptions = new HashMap<String,String>();
+      final HashMap<String,String> localOptions = new HashMap<>();
 
       while (true) {
         reader.flush();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/shell/src/main/java/org/apache/accumulo/shell/commands/SetScanIterCommand.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/SetScanIterCommand.java b/shell/src/main/java/org/apache/accumulo/shell/commands/SetScanIterCommand.java
index e7d2793..2399d0e 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/SetScanIterCommand.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/SetScanIterCommand.java
@@ -63,7 +63,7 @@ public class SetScanIterCommand extends SetIterCommand {
 
     List<IteratorSetting> tableScanIterators = shellState.scanIteratorOptions.get(tableName);
     if (tableScanIterators == null) {
-      tableScanIterators = new ArrayList<IteratorSetting>();
+      tableScanIterators = new ArrayList<>();
       shellState.scanIteratorOptions.put(tableName, tableScanIterators);
     }
     final IteratorSetting setting = new IteratorSetting(priority, name, classname);
@@ -92,7 +92,7 @@ public class SetScanIterCommand extends SetIterCommand {
   public Options getOptions() {
     // Remove the options that specify which type of iterator this is, since
     // they are all scan iterators with this command.
-    final HashSet<OptionGroup> groups = new HashSet<OptionGroup>();
+    final HashSet<OptionGroup> groups = new HashSet<>();
     final Options parentOptions = super.getOptions();
     final Options modifiedOptions = new Options();
     for (Iterator<?> it = parentOptions.getOptions().iterator(); it.hasNext();) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/shell/src/main/java/org/apache/accumulo/shell/commands/SetShellIterCommand.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/SetShellIterCommand.java b/shell/src/main/java/org/apache/accumulo/shell/commands/SetShellIterCommand.java
index ad66995..e1fa5e0 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/SetShellIterCommand.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/SetShellIterCommand.java
@@ -62,7 +62,7 @@ public class SetShellIterCommand extends SetIterCommand {
 
     List<IteratorSetting> tableScanIterators = shellState.iteratorProfiles.get(profile);
     if (tableScanIterators == null) {
-      tableScanIterators = new ArrayList<IteratorSetting>();
+      tableScanIterators = new ArrayList<>();
       shellState.iteratorProfiles.put(profile, tableScanIterators);
     }
     final IteratorSetting setting = new IteratorSetting(priority, name, classname);
@@ -87,7 +87,7 @@ public class SetShellIterCommand extends SetIterCommand {
   public Options getOptions() {
     // Remove the options that specify which type of iterator this is, since
     // they are all scan iterators with this command.
-    final HashSet<OptionGroup> groups = new HashSet<OptionGroup>();
+    final HashSet<OptionGroup> groups = new HashSet<>();
     final Options parentOptions = super.getOptions();
     final Options modifiedOptions = new Options();
     for (Iterator<?> it = parentOptions.getOptions().iterator(); it.hasNext();) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/shell/src/main/java/org/apache/accumulo/shell/commands/TableOperation.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/TableOperation.java b/shell/src/main/java/org/apache/accumulo/shell/commands/TableOperation.java
index b7d0f44..6ad1246 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/TableOperation.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/TableOperation.java
@@ -43,7 +43,7 @@ public abstract class TableOperation extends Command {
   @Override
   public int execute(final String fullCommand, final CommandLine cl, final Shell shellState) throws Exception {
     // populate the tableSet set with the tables you want to operate on
-    final SortedSet<String> tableSet = new TreeSet<String>();
+    final SortedSet<String> tableSet = new TreeSet<>();
     if (cl.hasOption(optTablePattern.getOpt())) {
       String tablePattern = cl.getOptionValue(optTablePattern.getOpt());
       for (String table : shellState.getConnector().tableOperations().list())

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/shell/src/main/java/org/apache/accumulo/shell/commands/TablesCommand.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/TablesCommand.java b/shell/src/main/java/org/apache/accumulo/shell/commands/TablesCommand.java
index a70cc13..397b450 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/TablesCommand.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/TablesCommand.java
@@ -62,7 +62,7 @@ public class TablesCommand extends Command {
     });
 
     final boolean sortByTableId = cl.hasOption(sortByTableIdOption.getOpt());
-    tables = new TreeMap<String,String>((sortByTableId ? MapUtils.invertMap(tables) : tables));
+    tables = new TreeMap<>((sortByTableId ? MapUtils.invertMap(tables) : tables));
 
     Iterator<String> it = Iterators.transform(tables.entrySet().iterator(), new Function<Entry<String,String>,String>() {
       @Override

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/shell/src/test/java/org/apache/accumulo/shell/ShellSetInstanceTest.java
----------------------------------------------------------------------
diff --git a/shell/src/test/java/org/apache/accumulo/shell/ShellSetInstanceTest.java b/shell/src/test/java/org/apache/accumulo/shell/ShellSetInstanceTest.java
index 331b183..428481a 100644
--- a/shell/src/test/java/org/apache/accumulo/shell/ShellSetInstanceTest.java
+++ b/shell/src/test/java/org/apache/accumulo/shell/ShellSetInstanceTest.java
@@ -243,7 +243,7 @@ public class ShellSetInstanceTest {
       expect(clientConf.getString(ClientProperty.INSTANCE_NAME.getKey())).andReturn("foo");
       expect(clientConf.withZkHosts("host1,host2")).andReturn(clientConf);
       expect(clientConf.getString(ClientProperty.INSTANCE_ZK_HOST.getKey())).andReturn("host1,host2");
-      List<String> zl = new java.util.ArrayList<String>();
+      List<String> zl = new java.util.ArrayList<>();
       zl.add("foo");
       zl.add("host1,host2");
       expect(opts.getZooKeeperInstance()).andReturn(zl);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/shell/src/test/java/org/apache/accumulo/shell/commands/DeleteTableCommandTest.java
----------------------------------------------------------------------
diff --git a/shell/src/test/java/org/apache/accumulo/shell/commands/DeleteTableCommandTest.java b/shell/src/test/java/org/apache/accumulo/shell/commands/DeleteTableCommandTest.java
index 4877552..ad9624f 100644
--- a/shell/src/test/java/org/apache/accumulo/shell/commands/DeleteTableCommandTest.java
+++ b/shell/src/test/java/org/apache/accumulo/shell/commands/DeleteTableCommandTest.java
@@ -32,11 +32,11 @@ public class DeleteTableCommandTest {
 
   @Test
   public void removeAccumuloNamespaceTables() {
-    Set<String> tables = new HashSet<String>(Arrays.asList(MetadataTable.NAME, RootTable.NAME, "a1", "a2"));
+    Set<String> tables = new HashSet<>(Arrays.asList(MetadataTable.NAME, RootTable.NAME, "a1", "a2"));
     DeleteTableCommand cmd = new DeleteTableCommand();
     cmd.pruneTables("a.*", tables);
 
-    Assert.assertEquals(new HashSet<String>(Arrays.asList("a1", "a2")), tables);
+    Assert.assertEquals(new HashSet<>(Arrays.asList("a1", "a2")), tables);
   }
 
 }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/shell/src/test/java/org/apache/accumulo/shell/format/DeleterFormatterTest.java
----------------------------------------------------------------------
diff --git a/shell/src/test/java/org/apache/accumulo/shell/format/DeleterFormatterTest.java b/shell/src/test/java/org/apache/accumulo/shell/format/DeleterFormatterTest.java
index 0698beb..2eba15e 100644
--- a/shell/src/test/java/org/apache/accumulo/shell/format/DeleterFormatterTest.java
+++ b/shell/src/test/java/org/apache/accumulo/shell/format/DeleterFormatterTest.java
@@ -34,6 +34,7 @@ import java.io.InputStream;
 import java.util.Collections;
 import java.util.Map;
 import java.util.TreeMap;
+
 import org.apache.accumulo.core.client.BatchWriter;
 import org.apache.accumulo.core.client.MutationsRejectedException;
 import org.apache.accumulo.core.data.Key;
@@ -41,11 +42,11 @@ import org.apache.accumulo.core.data.Mutation;
 import org.apache.accumulo.core.data.Value;
 import org.apache.accumulo.core.util.format.FormatterConfig;
 import org.apache.accumulo.shell.Shell;
+import org.junit.Before;
+import org.junit.Test;
 
 import jline.UnsupportedTerminal;
 import jline.console.ConsoleReader;
-import org.junit.Before;
-import org.junit.Test;
 
 public class DeleterFormatterTest {
   DeleterFormatter formatter;
@@ -70,7 +71,7 @@ public class DeleterFormatterTest {
     public void set(String in) {
       bais = new ByteArrayInputStream(in.getBytes(UTF_8));
     }
-  };
+  }
 
   @Before
   public void setUp() throws IOException, MutationsRejectedException {
@@ -93,7 +94,7 @@ public class DeleterFormatterTest {
 
     replay(writer, exceptionWriter, shellState);
 
-    data = new TreeMap<Key,Value>();
+    data = new TreeMap<>();
     data.put(new Key("r", "cf", "cq"), new Value("value".getBytes(UTF_8)));
   }
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java
----------------------------------------------------------------------
diff --git a/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java b/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java
index 9ebbae0..991e89e 100644
--- a/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java
+++ b/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java
@@ -224,9 +224,9 @@ public class AccumuloClassLoader {
   private static ArrayList<URL> findAccumuloURLs() throws IOException {
     String cp = getAccumuloString(AccumuloClassLoader.CLASSPATH_PROPERTY_NAME, AccumuloClassLoader.ACCUMULO_CLASSPATH_VALUE);
     if (cp == null)
-      return new ArrayList<URL>();
+      return new ArrayList<>();
     String[] cps = replaceEnvVars(cp, System.getenv()).split(",");
-    ArrayList<URL> urls = new ArrayList<URL>();
+    ArrayList<URL> urls = new ArrayList<>();
     for (String classpath : getMavenClasspaths())
       addUrl(classpath, urls);
     for (String classpath : cps) {
@@ -241,7 +241,7 @@ public class AccumuloClassLoader {
     String baseDirname = AccumuloClassLoader.getAccumuloString(MAVEN_PROJECT_BASEDIR_PROPERTY_NAME, DEFAULT_MAVEN_PROJECT_BASEDIR_VALUE);
     if (baseDirname == null || baseDirname.trim().isEmpty())
       return Collections.emptySet();
-    Set<String> paths = new TreeSet<String>();
+    Set<String> paths = new TreeSet<>();
     findMavenTargetClasses(paths, new File(baseDirname.trim()), 0);
     return paths;
   }


[07/32] accumulo git commit: ACCUMULO-4357 Remove unneeded code for readability

Posted by ct...@apache.org.
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java b/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java
index 416a296..b38083f 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java
@@ -105,8 +105,8 @@ public class MetadataTableUtil {
 
   private static final Text EMPTY_TEXT = new Text();
   private static final byte[] EMPTY_BYTES = new byte[0];
-  private static Map<Credentials,Writer> root_tables = new HashMap<Credentials,Writer>();
-  private static Map<Credentials,Writer> metadata_tables = new HashMap<Credentials,Writer>();
+  private static Map<Credentials,Writer> root_tables = new HashMap<>();
+  private static Map<Credentials,Writer> metadata_tables = new HashMap<>();
   private static final Logger log = LoggerFactory.getLogger(MetadataTableUtil.class);
 
   private MetadataTableUtil() {}
@@ -278,7 +278,7 @@ public class MetadataTableUtil {
   }
 
   public static SortedMap<FileRef,DataFileValue> getDataFileSizes(KeyExtent extent, ClientContext context) throws IOException {
-    TreeMap<FileRef,DataFileValue> sizes = new TreeMap<FileRef,DataFileValue>();
+    TreeMap<FileRef,DataFileValue> sizes = new TreeMap<>();
 
     try (Scanner mdScanner = new ScannerImpl(context, MetadataTable.ID, Authorizations.EMPTY)) {
       mdScanner.fetchColumnFamily(DataFileColumnFamily.NAME);
@@ -503,8 +503,8 @@ public class MetadataTableUtil {
 
   public static Pair<List<LogEntry>,SortedMap<FileRef,DataFileValue>> getFileAndLogEntries(ClientContext context, KeyExtent extent) throws KeeperException,
       InterruptedException, IOException {
-    ArrayList<LogEntry> result = new ArrayList<LogEntry>();
-    TreeMap<FileRef,DataFileValue> sizes = new TreeMap<FileRef,DataFileValue>();
+    ArrayList<LogEntry> result = new ArrayList<>();
+    TreeMap<FileRef,DataFileValue> sizes = new TreeMap<>();
 
     VolumeManager fs = VolumeManagerImpl.get();
     if (extent.isRootTablet()) {
@@ -548,7 +548,7 @@ public class MetadataTableUtil {
 
   public static List<LogEntry> getLogEntries(ClientContext context, KeyExtent extent) throws IOException, KeeperException, InterruptedException {
     log.info("Scanning logging entries for " + extent);
-    ArrayList<LogEntry> result = new ArrayList<LogEntry>();
+    ArrayList<LogEntry> result = new ArrayList<>();
     if (extent.equals(RootTable.EXTENT)) {
       log.info("Getting logs for root tablet from zookeeper");
       getRootLogEntries(result);
@@ -757,7 +757,7 @@ public class MetadataTableUtil {
     while (cloneIter.hasNext()) {
       Map<Key,Value> cloneTablet = cloneIter.next();
       Text cloneEndRow = new KeyExtent(cloneTablet.keySet().iterator().next().getRow(), (Text) null).getEndRow();
-      HashSet<String> cloneFiles = new HashSet<String>();
+      HashSet<String> cloneFiles = new HashSet<>();
 
       boolean cloneSuccessful = false;
       for (Entry<Key,Value> entry : cloneTablet.entrySet()) {
@@ -770,7 +770,7 @@ public class MetadataTableUtil {
       if (!cloneSuccessful)
         getFiles(cloneFiles, cloneTablet, null);
 
-      List<Map<Key,Value>> srcTablets = new ArrayList<Map<Key,Value>>();
+      List<Map<Key,Value>> srcTablets = new ArrayList<>();
       Map<Key,Value> srcTablet = srcIter.next();
       srcTablets.add(srcTablet);
 
@@ -780,7 +780,7 @@ public class MetadataTableUtil {
       if (cmp < 0)
         throw new TabletIterator.TabletDeletedException("Tablets deleted from src during clone : " + cloneEndRow + " " + srcEndRow);
 
-      HashSet<String> srcFiles = new HashSet<String>();
+      HashSet<String> srcFiles = new HashSet<>();
       if (!cloneSuccessful)
         getFiles(srcFiles, srcTablet, srcTableId);
 
@@ -905,7 +905,7 @@ public class MetadataTableUtil {
   }
 
   public static List<FileRef> getBulkFilesLoaded(Connector conn, KeyExtent extent, long tid) throws IOException {
-    List<FileRef> result = new ArrayList<FileRef>();
+    List<FileRef> result = new ArrayList<>();
     try (Scanner mscanner = new IsolatedScanner(conn.createScanner(extent.isMeta() ? RootTable.NAME : MetadataTable.NAME, Authorizations.EMPTY))) {
       VolumeManager fs = VolumeManagerImpl.get();
       mscanner.setRange(extent.toMetadataRange());
@@ -1032,11 +1032,11 @@ public class MetadataTableUtil {
   }
 
   public static SortedMap<Text,SortedMap<ColumnFQ,Value>> getTabletEntries(SortedMap<Key,Value> tabletKeyValues, List<ColumnFQ> columns) {
-    TreeMap<Text,SortedMap<ColumnFQ,Value>> tabletEntries = new TreeMap<Text,SortedMap<ColumnFQ,Value>>();
+    TreeMap<Text,SortedMap<ColumnFQ,Value>> tabletEntries = new TreeMap<>();
 
     HashSet<ColumnFQ> colSet = null;
     if (columns != null) {
-      colSet = new HashSet<ColumnFQ>(columns);
+      colSet = new HashSet<>(columns);
     }
 
     for (Entry<Key,Value> entry : tabletKeyValues.entrySet()) {
@@ -1049,7 +1049,7 @@ public class MetadataTableUtil {
 
       SortedMap<ColumnFQ,Value> colVals = tabletEntries.get(row);
       if (colVals == null) {
-        colVals = new TreeMap<ColumnFQ,Value>();
+        colVals = new TreeMap<>();
         tabletEntries.put(row, colVals);
       }
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/util/RemoveEntriesForMissingFiles.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/RemoveEntriesForMissingFiles.java b/server/base/src/main/java/org/apache/accumulo/server/util/RemoveEntriesForMissingFiles.java
index ae59164..e3f531d 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/RemoveEntriesForMissingFiles.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/RemoveEntriesForMissingFiles.java
@@ -124,7 +124,7 @@ public class RemoveEntriesForMissingFiles {
 
     @SuppressWarnings({"rawtypes"})
     Map cache = new LRUMap(100000);
-    Set<Path> processing = new HashSet<Path>();
+    Set<Path> processing = new HashSet<>();
     ExecutorService threadPool = Executors.newFixedThreadPool(16);
 
     System.out.printf("Scanning : %s %s\n", table, range);
@@ -136,7 +136,7 @@ public class RemoveEntriesForMissingFiles {
     metadata.fetchColumnFamily(DataFileColumnFamily.NAME);
     int count = 0;
     AtomicInteger missing = new AtomicInteger(0);
-    AtomicReference<Exception> exceptionRef = new AtomicReference<Exception>(null);
+    AtomicReference<Exception> exceptionRef = new AtomicReference<>(null);
     BatchWriter writer = null;
 
     if (fix)

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/util/ReplicationTableUtil.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/ReplicationTableUtil.java b/server/base/src/main/java/org/apache/accumulo/server/util/ReplicationTableUtil.java
index a400e4f..f234593 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/ReplicationTableUtil.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/ReplicationTableUtil.java
@@ -59,7 +59,7 @@ import org.slf4j.LoggerFactory;
  */
 public class ReplicationTableUtil {
 
-  private static Map<Credentials,Writer> writers = new HashMap<Credentials,Writer>();
+  private static Map<Credentials,Writer> writers = new HashMap<>();
   private static final Logger log = LoggerFactory.getLogger(ReplicationTableUtil.class);
 
   public static final String COMBINER_NAME = "replcombiner";

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/util/RestoreZookeeper.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/RestoreZookeeper.java b/server/base/src/main/java/org/apache/accumulo/server/util/RestoreZookeeper.java
index d4e79d76..8da1ce9 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/RestoreZookeeper.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/RestoreZookeeper.java
@@ -43,7 +43,7 @@ public class RestoreZookeeper {
 
   private static class Restore extends DefaultHandler {
     IZooReaderWriter zk = null;
-    Stack<String> cwd = new Stack<String>();
+    Stack<String> cwd = new Stack<>();
     boolean overwrite = false;
 
     Restore(IZooReaderWriter zk, boolean overwrite) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/util/TableDiskUsage.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/TableDiskUsage.java b/server/base/src/main/java/org/apache/accumulo/server/util/TableDiskUsage.java
index 1a630a9..84d76cb 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/TableDiskUsage.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/TableDiskUsage.java
@@ -58,10 +58,10 @@ public class TableDiskUsage {
 
   private static final Logger log = LoggerFactory.getLogger(TableDiskUsage.class);
   private int nextInternalId = 0;
-  private Map<String,Integer> internalIds = new HashMap<String,Integer>();
-  private Map<Integer,String> externalIds = new HashMap<Integer,String>();
-  private Map<String,Integer[]> tableFiles = new HashMap<String,Integer[]>();
-  private Map<String,Long> fileSizes = new HashMap<String,Long>();
+  private Map<String,Integer> internalIds = new HashMap<>();
+  private Map<Integer,String> externalIds = new HashMap<>();
+  private Map<String,Integer[]> tableFiles = new HashMap<>();
+  private Map<String,Long> fileSizes = new HashMap<>();
 
   void addTable(String tableId) {
     if (internalIds.containsKey(tableId))
@@ -100,7 +100,7 @@ public class TableDiskUsage {
   Map<List<String>,Long> calculateUsage() {
 
     // Bitset of tables that contain a file and total usage by all files that share that usage
-    Map<List<Integer>,Long> usage = new HashMap<List<Integer>,Long>();
+    Map<List<Integer>,Long> usage = new HashMap<>();
 
     if (log.isTraceEnabled()) {
       log.trace("fileSizes " + fileSizes);
@@ -123,10 +123,10 @@ public class TableDiskUsage {
 
     }
 
-    Map<List<String>,Long> externalUsage = new HashMap<List<String>,Long>();
+    Map<List<String>,Long> externalUsage = new HashMap<>();
 
     for (Entry<List<Integer>,Long> entry : usage.entrySet()) {
-      List<String> externalKey = new ArrayList<String>();
+      List<String> externalKey = new ArrayList<>();
       List<Integer> key = entry.getKey();
       // table bitset
       for (int i = 0; i < key.size(); i++)
@@ -164,9 +164,9 @@ public class TableDiskUsage {
     for (String tableId : tableIds)
       tdu.addTable(tableId);
 
-    HashSet<String> tablesReferenced = new HashSet<String>(tableIds);
-    HashSet<String> emptyTableIds = new HashSet<String>();
-    HashSet<String> nameSpacesReferenced = new HashSet<String>();
+    HashSet<String> tablesReferenced = new HashSet<>(tableIds);
+    HashSet<String> emptyTableIds = new HashSet<>();
+    HashSet<String> nameSpacesReferenced = new HashSet<>();
 
     // For each table ID
     for (String tableId : tableIds) {
@@ -222,11 +222,11 @@ public class TableDiskUsage {
     }
 
     // Invert tableId->tableName
-    HashMap<String,String> reverseTableIdMap = new HashMap<String,String>();
+    HashMap<String,String> reverseTableIdMap = new HashMap<>();
     for (Entry<String,String> entry : conn.tableOperations().tableIdMap().entrySet())
       reverseTableIdMap.put(entry.getValue(), entry.getKey());
 
-    TreeMap<TreeSet<String>,Long> usage = new TreeMap<TreeSet<String>,Long>(new Comparator<TreeSet<String>>() {
+    TreeMap<TreeSet<String>,Long> usage = new TreeMap<>(new Comparator<TreeSet<String>>() {
 
       @Override
       public int compare(TreeSet<String> o1, TreeSet<String> o2) {
@@ -257,7 +257,7 @@ public class TableDiskUsage {
     });
 
     for (Entry<List<String>,Long> entry : tdu.calculateUsage().entrySet()) {
-      TreeSet<String> tableNames = new TreeSet<String>();
+      TreeSet<String> tableNames = new TreeSet<>();
       // Convert size shared by each table id into size shared by each table name
       for (String tableId : entry.getKey())
         tableNames.add(reverseTableIdMap.get(tableId));
@@ -267,7 +267,7 @@ public class TableDiskUsage {
     }
 
     if (!emptyTableIds.isEmpty()) {
-      TreeSet<String> emptyTables = new TreeSet<String>();
+      TreeSet<String> emptyTables = new TreeSet<>();
       for (String tableId : emptyTableIds) {
         emptyTables.add(reverseTableIdMap.get(tableId));
       }
@@ -280,7 +280,7 @@ public class TableDiskUsage {
   public static void printDiskUsage(AccumuloConfiguration acuConf, Collection<String> tables, VolumeManager fs, Connector conn, Printer printer,
       boolean humanReadable) throws TableNotFoundException, IOException {
 
-    HashSet<String> tableIds = new HashSet<String>();
+    HashSet<String> tableIds = new HashSet<>();
 
     // Get table IDs for all tables requested to be 'du'
     for (String tableName : tables) {
@@ -302,7 +302,7 @@ public class TableDiskUsage {
 
   static class Opts extends ClientOpts {
     @Parameter(description = " <table> { <table> ... } ")
-    List<String> tables = new ArrayList<String>();
+    List<String> tables = new ArrayList<>();
   }
 
   public static void main(String[] args) throws Exception {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/util/TableInfoUtil.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/TableInfoUtil.java b/server/base/src/main/java/org/apache/accumulo/server/util/TableInfoUtil.java
index 6aa937f..d804e1c 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/TableInfoUtil.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/TableInfoUtil.java
@@ -71,7 +71,7 @@ public class TableInfoUtil {
   }
 
   public static Map<String,Double> summarizeTableStats(MasterMonitorInfo mmi) {
-    Map<String,Double> compactingByTable = new HashMap<String,Double>();
+    Map<String,Double> compactingByTable = new HashMap<>();
     if (mmi != null && mmi.tServerInfo != null) {
       for (TabletServerStatus status : mmi.tServerInfo) {
         if (status != null && status.tableMap != null) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/util/TabletIterator.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/TabletIterator.java b/server/base/src/main/java/org/apache/accumulo/server/util/TabletIterator.java
index 43345f2..9569f49 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/TabletIterator.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/TabletIterator.java
@@ -190,7 +190,7 @@ public class TabletIterator implements Iterator<Map<Key,Value>> {
 
     Text curMetaDataRow = null;
 
-    TreeMap<Key,Value> tm = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm = new TreeMap<>();
 
     boolean sawPrevEndRow = false;
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/util/VerifyTabletAssignments.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/VerifyTabletAssignments.java b/server/base/src/main/java/org/apache/accumulo/server/util/VerifyTabletAssignments.java
index 87c781a..bf072f3 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/VerifyTabletAssignments.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/VerifyTabletAssignments.java
@@ -87,14 +87,14 @@ public class VerifyTabletAssignments {
     else
       System.out.println("Checking table " + tableName + " again, failures " + check.size());
 
-    TreeMap<KeyExtent,String> tabletLocations = new TreeMap<KeyExtent,String>();
+    TreeMap<KeyExtent,String> tabletLocations = new TreeMap<>();
 
     String tableId = Tables.getNameToIdMap(context.getInstance()).get(tableName);
     MetadataServicer.forTableId(context, tableId).getTabletLocations(tabletLocations);
 
-    final HashSet<KeyExtent> failures = new HashSet<KeyExtent>();
+    final HashSet<KeyExtent> failures = new HashSet<>();
 
-    Map<HostAndPort,List<KeyExtent>> extentsPerServer = new TreeMap<HostAndPort,List<KeyExtent>>();
+    Map<HostAndPort,List<KeyExtent>> extentsPerServer = new TreeMap<>();
 
     for (Entry<KeyExtent,String> entry : tabletLocations.entrySet()) {
       KeyExtent keyExtent = entry.getKey();
@@ -108,7 +108,7 @@ public class VerifyTabletAssignments {
         final HostAndPort parsedLoc = HostAndPort.fromString(loc);
         List<KeyExtent> extentList = extentsPerServer.get(parsedLoc);
         if (extentList == null) {
-          extentList = new ArrayList<KeyExtent>();
+          extentList = new ArrayList<>();
           extentsPerServer.put(parsedLoc, extentList);
         }
 
@@ -156,7 +156,7 @@ public class VerifyTabletAssignments {
       throws ThriftSecurityException, TException, NoSuchScanIDException {
     TabletClientService.Iface client = ThriftUtil.getTServerClient(entry.getKey(), context);
 
-    Map<TKeyExtent,List<TRange>> batch = new TreeMap<TKeyExtent,List<TRange>>();
+    Map<TKeyExtent,List<TRange>> batch = new TreeMap<>();
 
     for (KeyExtent keyExtent : entry.getValue()) {
       Text row = keyExtent.getEndRow();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/zookeeper/DistributedWorkQueue.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/zookeeper/DistributedWorkQueue.java b/server/base/src/main/java/org/apache/accumulo/server/zookeeper/DistributedWorkQueue.java
index 0f298b4..4faa7ad 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/zookeeper/DistributedWorkQueue.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/zookeeper/DistributedWorkQueue.java
@@ -233,7 +233,7 @@ public class DistributedWorkQueue {
   }
 
   public List<String> getWorkQueued() throws KeeperException, InterruptedException {
-    ArrayList<String> children = new ArrayList<String>(zoo.getChildren(path));
+    ArrayList<String> children = new ArrayList<>(zoo.getChildren(path));
     children.remove(LOCKS_NODE);
     return children;
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/test/java/org/apache/accumulo/server/ServerConstantsTest.java
----------------------------------------------------------------------
diff --git a/server/base/src/test/java/org/apache/accumulo/server/ServerConstantsTest.java b/server/base/src/test/java/org/apache/accumulo/server/ServerConstantsTest.java
index 05f0a47..15c23be 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/ServerConstantsTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/ServerConstantsTest.java
@@ -94,7 +94,7 @@ public class ServerConstantsTest {
 
     LocalFileSystem fs = FileSystem.getLocal(new Configuration());
 
-    ArrayList<String> accumuloPaths = new ArrayList<String>();
+    ArrayList<String> accumuloPaths = new ArrayList<>();
 
     for (int i = 0; i < uuids.size(); i++) {
       String volume = "v" + i;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/test/java/org/apache/accumulo/server/client/BulkImporterTest.java
----------------------------------------------------------------------
diff --git a/server/base/src/test/java/org/apache/accumulo/server/client/BulkImporterTest.java b/server/base/src/test/java/org/apache/accumulo/server/client/BulkImporterTest.java
index 09ee6e0..cb2bd75 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/client/BulkImporterTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/client/BulkImporterTest.java
@@ -51,7 +51,7 @@ import org.junit.Test;
 
 public class BulkImporterTest {
 
-  static final SortedSet<KeyExtent> fakeMetaData = new TreeSet<KeyExtent>();
+  static final SortedSet<KeyExtent> fakeMetaData = new TreeSet<>();
   static final String tableId = "1";
 
   static {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/test/java/org/apache/accumulo/server/conf/NamespaceConfigurationTest.java
----------------------------------------------------------------------
diff --git a/server/base/src/test/java/org/apache/accumulo/server/conf/NamespaceConfigurationTest.java b/server/base/src/test/java/org/apache/accumulo/server/conf/NamespaceConfigurationTest.java
index 742ebb2..071e9c0 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/conf/NamespaceConfigurationTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/conf/NamespaceConfigurationTest.java
@@ -118,10 +118,10 @@ public class NamespaceConfigurationTest {
   @Test
   public void testGetProperties() {
     Predicate<String> all = Predicates.alwaysTrue();
-    Map<String,String> props = new java.util.HashMap<String,String>();
+    Map<String,String> props = new java.util.HashMap<>();
     parent.getProperties(props, all);
     replay(parent);
-    List<String> children = new java.util.ArrayList<String>();
+    List<String> children = new java.util.ArrayList<>();
     children.add("foo");
     children.add("ding");
     expect(zc.getChildren(ZooUtil.getRoot(iid) + Constants.ZNAMESPACES + "/" + NSID + Constants.ZNAMESPACE_CONF)).andReturn(children);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/test/java/org/apache/accumulo/server/conf/TableConfigurationTest.java
----------------------------------------------------------------------
diff --git a/server/base/src/test/java/org/apache/accumulo/server/conf/TableConfigurationTest.java b/server/base/src/test/java/org/apache/accumulo/server/conf/TableConfigurationTest.java
index 1eb933a..34d6905 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/conf/TableConfigurationTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/conf/TableConfigurationTest.java
@@ -102,10 +102,10 @@ public class TableConfigurationTest {
   @Test
   public void testGetProperties() {
     Predicate<String> all = Predicates.alwaysTrue();
-    Map<String,String> props = new java.util.HashMap<String,String>();
+    Map<String,String> props = new java.util.HashMap<>();
     parent.getProperties(props, all);
     replay(parent);
-    List<String> children = new java.util.ArrayList<String>();
+    List<String> children = new java.util.ArrayList<>();
     children.add("foo");
     children.add("ding");
     expect(zc.getChildren(ZooUtil.getRoot(iid) + Constants.ZTABLES + "/" + TID + Constants.ZTABLE_CONF)).andReturn(children);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/test/java/org/apache/accumulo/server/conf/ZooCachePropertyAccessorTest.java
----------------------------------------------------------------------
diff --git a/server/base/src/test/java/org/apache/accumulo/server/conf/ZooCachePropertyAccessorTest.java b/server/base/src/test/java/org/apache/accumulo/server/conf/ZooCachePropertyAccessorTest.java
index e90e921..9bd7b90 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/conf/ZooCachePropertyAccessorTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/conf/ZooCachePropertyAccessorTest.java
@@ -105,7 +105,7 @@ public class ZooCachePropertyAccessorTest {
 
   @Test
   public void testGetProperties() {
-    Map<String,String> props = new java.util.HashMap<String,String>();
+    Map<String,String> props = new java.util.HashMap<>();
     AccumuloConfiguration parent = createMock(AccumuloConfiguration.class);
     @SuppressWarnings("unchecked")
     Predicate<String> filter = createMock(Predicate.class);
@@ -113,7 +113,7 @@ public class ZooCachePropertyAccessorTest {
     replay(parent);
     String child1 = "child1";
     String child2 = "child2";
-    List<String> children = new java.util.ArrayList<String>();
+    List<String> children = new java.util.ArrayList<>();
     children.add(child1);
     children.add(child2);
     expect(zc.getChildren(PATH)).andReturn(children);
@@ -132,7 +132,7 @@ public class ZooCachePropertyAccessorTest {
 
   @Test
   public void testGetProperties_NoChildren() {
-    Map<String,String> props = new java.util.HashMap<String,String>();
+    Map<String,String> props = new java.util.HashMap<>();
     AccumuloConfiguration parent = createMock(AccumuloConfiguration.class);
     @SuppressWarnings("unchecked")
     Predicate<String> filter = createMock(Predicate.class);
@@ -147,14 +147,14 @@ public class ZooCachePropertyAccessorTest {
 
   @Test
   public void testGetProperties_Filter() {
-    Map<String,String> props = new java.util.HashMap<String,String>();
+    Map<String,String> props = new java.util.HashMap<>();
     AccumuloConfiguration parent = createMock(AccumuloConfiguration.class);
     @SuppressWarnings("unchecked")
     Predicate<String> filter = createMock(Predicate.class);
     parent.getProperties(props, filter);
     replay(parent);
     String child1 = "child1";
-    List<String> children = new java.util.ArrayList<String>();
+    List<String> children = new java.util.ArrayList<>();
     children.add(child1);
     expect(zc.getChildren(PATH)).andReturn(children);
     replay(zc);
@@ -167,7 +167,7 @@ public class ZooCachePropertyAccessorTest {
 
   @Test
   public void testGetProperties_ParentFilter() {
-    Map<String,String> props = new java.util.HashMap<String,String>();
+    Map<String,String> props = new java.util.HashMap<>();
     AccumuloConfiguration parent = createMock(AccumuloConfiguration.class);
     @SuppressWarnings("unchecked")
     Predicate<String> filter = createMock(Predicate.class);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/test/java/org/apache/accumulo/server/fs/FileRefTest.java
----------------------------------------------------------------------
diff --git a/server/base/src/test/java/org/apache/accumulo/server/fs/FileRefTest.java b/server/base/src/test/java/org/apache/accumulo/server/fs/FileRefTest.java
index 402f689..14ca20c 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/fs/FileRefTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/fs/FileRefTest.java
@@ -60,7 +60,7 @@ public class FileRefTest {
     Assert.assertNotEquals(new FileRef("hdfs://1.2.3.4/accumulo/tables/2a/t-0003/C0005.rf"), new FileRef("hdfs://nn1/accumulo/tables/2a/t-0003/C0004.rf"));
     Assert.assertNotEquals(new FileRef("hdfs://nn1/accumulo/tables/2a/t-0003/C0005.rf"), new FileRef("hdfs://nn1/accumulo/tables/2a/t-0003/C0004.rf"));
 
-    HashMap<FileRef,String> refMap = new HashMap<FileRef,String>();
+    HashMap<FileRef,String> refMap = new HashMap<>();
     refMap.put(new FileRef("hdfs://1.2.3.4/accumulo/tables/2a/t-0003/C0004.rf"), "7");
     refMap.put(new FileRef("hdfs://nn1/accumulo/tables/2a/t-0003/C0005.rf"), "8");
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/test/java/org/apache/accumulo/server/fs/VolumeUtilTest.java
----------------------------------------------------------------------
diff --git a/server/base/src/test/java/org/apache/accumulo/server/fs/VolumeUtilTest.java b/server/base/src/test/java/org/apache/accumulo/server/fs/VolumeUtilTest.java
index 9fcd3e0..d04b124 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/fs/VolumeUtilTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/fs/VolumeUtilTest.java
@@ -42,10 +42,10 @@ public class VolumeUtilTest {
 
   @Test
   public void testSwitchVolume() {
-    List<Pair<Path,Path>> replacements = new ArrayList<Pair<Path,Path>>();
-    replacements.add(new Pair<Path,Path>(new Path("hdfs://nn1/accumulo"), new Path("viewfs:/a/accumulo")));
-    replacements.add(new Pair<Path,Path>(new Path("hdfs://nn1:9000/accumulo"), new Path("viewfs:/a/accumulo")));
-    replacements.add(new Pair<Path,Path>(new Path("hdfs://nn2/accumulo"), new Path("viewfs:/b/accumulo")));
+    List<Pair<Path,Path>> replacements = new ArrayList<>();
+    replacements.add(new Pair<>(new Path("hdfs://nn1/accumulo"), new Path("viewfs:/a/accumulo")));
+    replacements.add(new Pair<>(new Path("hdfs://nn1:9000/accumulo"), new Path("viewfs:/a/accumulo")));
+    replacements.add(new Pair<>(new Path("hdfs://nn2/accumulo"), new Path("viewfs:/b/accumulo")));
 
     Assert.assertEquals("viewfs:/a/accumulo/tables/t-00000/C000.rf",
         VolumeUtil.switchVolume("hdfs://nn1/accumulo/tables/t-00000/C000.rf", FileType.TABLE, replacements));
@@ -57,9 +57,9 @@ public class VolumeUtilTest {
     Assert.assertNull(VolumeUtil.switchVolume("file:/nn1/a/accumulo/tables/t-00000/C000.rf", FileType.TABLE, replacements));
 
     replacements.clear();
-    replacements.add(new Pair<Path,Path>(new Path("hdfs://nn1/d1/accumulo"), new Path("viewfs:/a/accumulo")));
-    replacements.add(new Pair<Path,Path>(new Path("hdfs://nn1:9000/d1/accumulo"), new Path("viewfs:/a/accumulo")));
-    replacements.add(new Pair<Path,Path>(new Path("hdfs://nn2/d2/accumulo"), new Path("viewfs:/b/accumulo")));
+    replacements.add(new Pair<>(new Path("hdfs://nn1/d1/accumulo"), new Path("viewfs:/a/accumulo")));
+    replacements.add(new Pair<>(new Path("hdfs://nn1:9000/d1/accumulo"), new Path("viewfs:/a/accumulo")));
+    replacements.add(new Pair<>(new Path("hdfs://nn2/d2/accumulo"), new Path("viewfs:/b/accumulo")));
 
     Assert.assertEquals("viewfs:/a/accumulo/tables/t-00000/C000.rf",
         VolumeUtil.switchVolume("hdfs://nn1/d1/accumulo/tables/t-00000/C000.rf", FileType.TABLE, replacements));
@@ -74,10 +74,10 @@ public class VolumeUtilTest {
 
   @Test
   public void testSwitchVolumesDifferentSourceDepths() {
-    List<Pair<Path,Path>> replacements = new ArrayList<Pair<Path,Path>>();
-    replacements.add(new Pair<Path,Path>(new Path("hdfs://nn1/accumulo"), new Path("viewfs:/a")));
-    replacements.add(new Pair<Path,Path>(new Path("hdfs://nn1:9000/accumulo"), new Path("viewfs:/a")));
-    replacements.add(new Pair<Path,Path>(new Path("hdfs://nn2/accumulo"), new Path("viewfs:/b")));
+    List<Pair<Path,Path>> replacements = new ArrayList<>();
+    replacements.add(new Pair<>(new Path("hdfs://nn1/accumulo"), new Path("viewfs:/a")));
+    replacements.add(new Pair<>(new Path("hdfs://nn1:9000/accumulo"), new Path("viewfs:/a")));
+    replacements.add(new Pair<>(new Path("hdfs://nn2/accumulo"), new Path("viewfs:/b")));
 
     Assert
         .assertEquals("viewfs:/a/tables/t-00000/C000.rf", VolumeUtil.switchVolume("hdfs://nn1/accumulo/tables/t-00000/C000.rf", FileType.TABLE, replacements));
@@ -89,9 +89,9 @@ public class VolumeUtilTest {
     Assert.assertNull(VolumeUtil.switchVolume("file:/nn1/a/accumulo/tables/t-00000/C000.rf", FileType.TABLE, replacements));
 
     replacements.clear();
-    replacements.add(new Pair<Path,Path>(new Path("hdfs://nn1/d1/accumulo"), new Path("viewfs:/a")));
-    replacements.add(new Pair<Path,Path>(new Path("hdfs://nn1:9000/d1/accumulo"), new Path("viewfs:/a")));
-    replacements.add(new Pair<Path,Path>(new Path("hdfs://nn2/d2/accumulo"), new Path("viewfs:/b")));
+    replacements.add(new Pair<>(new Path("hdfs://nn1/d1/accumulo"), new Path("viewfs:/a")));
+    replacements.add(new Pair<>(new Path("hdfs://nn1:9000/d1/accumulo"), new Path("viewfs:/a")));
+    replacements.add(new Pair<>(new Path("hdfs://nn2/d2/accumulo"), new Path("viewfs:/b")));
 
     Assert.assertEquals("viewfs:/a/tables/t-00000/C000.rf",
         VolumeUtil.switchVolume("hdfs://nn1/d1/accumulo/tables/t-00000/C000.rf", FileType.TABLE, replacements));
@@ -106,10 +106,10 @@ public class VolumeUtilTest {
 
   @Test
   public void testSwitchVolumesDifferentTargetDepths() {
-    List<Pair<Path,Path>> replacements = new ArrayList<Pair<Path,Path>>();
-    replacements.add(new Pair<Path,Path>(new Path("hdfs://nn1/accumulo"), new Path("viewfs:/path1/path2")));
-    replacements.add(new Pair<Path,Path>(new Path("hdfs://nn1:9000/accumulo"), new Path("viewfs:/path1/path2")));
-    replacements.add(new Pair<Path,Path>(new Path("hdfs://nn2/accumulo"), new Path("viewfs:/path3")));
+    List<Pair<Path,Path>> replacements = new ArrayList<>();
+    replacements.add(new Pair<>(new Path("hdfs://nn1/accumulo"), new Path("viewfs:/path1/path2")));
+    replacements.add(new Pair<>(new Path("hdfs://nn1:9000/accumulo"), new Path("viewfs:/path1/path2")));
+    replacements.add(new Pair<>(new Path("hdfs://nn2/accumulo"), new Path("viewfs:/path3")));
 
     Assert.assertEquals("viewfs:/path1/path2/tables/t-00000/C000.rf",
         VolumeUtil.switchVolume("hdfs://nn1/accumulo/tables/t-00000/C000.rf", FileType.TABLE, replacements));
@@ -121,9 +121,9 @@ public class VolumeUtilTest {
     Assert.assertNull(VolumeUtil.switchVolume("file:/nn1/a/accumulo/tables/t-00000/C000.rf", FileType.TABLE, replacements));
 
     replacements.clear();
-    replacements.add(new Pair<Path,Path>(new Path("hdfs://nn1/d1/accumulo"), new Path("viewfs:/path1/path2")));
-    replacements.add(new Pair<Path,Path>(new Path("hdfs://nn1:9000/d1/accumulo"), new Path("viewfs:/path1/path2")));
-    replacements.add(new Pair<Path,Path>(new Path("hdfs://nn2/d2/accumulo"), new Path("viewfs:/path3")));
+    replacements.add(new Pair<>(new Path("hdfs://nn1/d1/accumulo"), new Path("viewfs:/path1/path2")));
+    replacements.add(new Pair<>(new Path("hdfs://nn1:9000/d1/accumulo"), new Path("viewfs:/path1/path2")));
+    replacements.add(new Pair<>(new Path("hdfs://nn2/d2/accumulo"), new Path("viewfs:/path3")));
 
     Assert.assertEquals("viewfs:/path1/path2/tables/t-00000/C000.rf",
         VolumeUtil.switchVolume("hdfs://nn1/d1/accumulo/tables/t-00000/C000.rf", FileType.TABLE, replacements));
@@ -199,9 +199,9 @@ public class VolumeUtilTest {
 
   @Test
   public void testRootTableReplacement() throws IOException {
-    List<Pair<Path,Path>> replacements = new ArrayList<Pair<Path,Path>>();
-    replacements.add(new Pair<Path,Path>(new Path("file:/foo/v1"), new Path("file:/foo/v8")));
-    replacements.add(new Pair<Path,Path>(new Path("file:/foo/v2"), new Path("file:/foo/v9")));
+    List<Pair<Path,Path>> replacements = new ArrayList<>();
+    replacements.add(new Pair<>(new Path("file:/foo/v1"), new Path("file:/foo/v8")));
+    replacements.add(new Pair<>(new Path("file:/foo/v2"), new Path("file:/foo/v9")));
 
     FileType ft = FileType.TABLE;
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/test/java/org/apache/accumulo/server/iterators/MetadataBulkLoadFilterTest.java
----------------------------------------------------------------------
diff --git a/server/base/src/test/java/org/apache/accumulo/server/iterators/MetadataBulkLoadFilterTest.java b/server/base/src/test/java/org/apache/accumulo/server/iterators/MetadataBulkLoadFilterTest.java
index 04bcbde..a9a1f7b 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/iterators/MetadataBulkLoadFilterTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/iterators/MetadataBulkLoadFilterTest.java
@@ -78,8 +78,8 @@ public class MetadataBulkLoadFilterTest {
 
   @Test
   public void testBasic() throws IOException {
-    TreeMap<Key,Value> tm1 = new TreeMap<Key,Value>();
-    TreeMap<Key,Value> expected = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm1 = new TreeMap<>();
+    TreeMap<Key,Value> expected = new TreeMap<>();
 
     // following should not be deleted by filter
     put(tm1, "2;m", TabletsSection.ServerColumnFamily.DIRECTORY_COLUMN, "/t1");
@@ -117,7 +117,7 @@ public class MetadataBulkLoadFilterTest {
 
     iter.seek(new Range(), new ArrayList<ByteSequence>(), false);
 
-    TreeMap<Key,Value> actual = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> actual = new TreeMap<>();
 
     while (iter.hasTop()) {
       actual.put(iter.getTopKey(), iter.getTopValue());

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/test/java/org/apache/accumulo/server/master/balancer/ChaoticLoadBalancerTest.java
----------------------------------------------------------------------
diff --git a/server/base/src/test/java/org/apache/accumulo/server/master/balancer/ChaoticLoadBalancerTest.java b/server/base/src/test/java/org/apache/accumulo/server/master/balancer/ChaoticLoadBalancerTest.java
index 7101910..2697d75 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/master/balancer/ChaoticLoadBalancerTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/master/balancer/ChaoticLoadBalancerTest.java
@@ -44,11 +44,11 @@ import com.google.common.net.HostAndPort;
 public class ChaoticLoadBalancerTest {
 
   class FakeTServer {
-    List<KeyExtent> extents = new ArrayList<KeyExtent>();
+    List<KeyExtent> extents = new ArrayList<>();
 
     TabletServerStatus getStatus(TServerInstance server) {
       TabletServerStatus result = new TabletServerStatus();
-      result.tableMap = new HashMap<String,TableInfo>();
+      result.tableMap = new HashMap<>();
       for (KeyExtent extent : extents) {
         String table = extent.getTableId();
         TableInfo info = result.tableMap.get(table);
@@ -63,13 +63,13 @@ public class ChaoticLoadBalancerTest {
     }
   }
 
-  Map<TServerInstance,FakeTServer> servers = new HashMap<TServerInstance,FakeTServer>();
+  Map<TServerInstance,FakeTServer> servers = new HashMap<>();
 
   class TestChaoticLoadBalancer extends ChaoticLoadBalancer {
 
     @Override
     public List<TabletStats> getOnlineTabletsForTable(TServerInstance tserver, String table) throws ThriftSecurityException, TException {
-      List<TabletStats> result = new ArrayList<TabletStats>();
+      List<TabletStats> result = new ArrayList<>();
       for (KeyExtent extent : servers.get(tserver).extents) {
         if (extent.getTableId().equals(table)) {
           result.add(new TabletStats(extent.toThrift(), null, null, null, 0l, 0., 0., 0));
@@ -85,7 +85,7 @@ public class ChaoticLoadBalancerTest {
     servers.put(new TServerInstance(HostAndPort.fromParts("127.0.0.1", 1234), "a"), new FakeTServer());
     servers.put(new TServerInstance(HostAndPort.fromParts("127.0.0.1", 1235), "b"), new FakeTServer());
     servers.put(new TServerInstance(HostAndPort.fromParts("127.0.0.1", 1236), "c"), new FakeTServer());
-    Map<KeyExtent,TServerInstance> metadataTable = new TreeMap<KeyExtent,TServerInstance>();
+    Map<KeyExtent,TServerInstance> metadataTable = new TreeMap<>();
     String table = "t1";
     metadataTable.put(makeExtent(table, null, null), null);
     table = "t2";
@@ -101,19 +101,19 @@ public class ChaoticLoadBalancerTest {
 
     TestChaoticLoadBalancer balancer = new TestChaoticLoadBalancer();
 
-    SortedMap<TServerInstance,TabletServerStatus> current = new TreeMap<TServerInstance,TabletServerStatus>();
+    SortedMap<TServerInstance,TabletServerStatus> current = new TreeMap<>();
     for (Entry<TServerInstance,FakeTServer> entry : servers.entrySet()) {
       current.put(entry.getKey(), entry.getValue().getStatus(entry.getKey()));
     }
 
-    Map<KeyExtent,TServerInstance> assignments = new HashMap<KeyExtent,TServerInstance>();
+    Map<KeyExtent,TServerInstance> assignments = new HashMap<>();
     balancer.getAssignments(getAssignments(servers), metadataTable, assignments);
 
     assertEquals(assignments.size(), metadataTable.size());
   }
 
   SortedMap<TServerInstance,TabletServerStatus> getAssignments(Map<TServerInstance,FakeTServer> servers) {
-    SortedMap<TServerInstance,TabletServerStatus> result = new TreeMap<TServerInstance,TabletServerStatus>();
+    SortedMap<TServerInstance,TabletServerStatus> result = new TreeMap<>();
     for (Entry<TServerInstance,FakeTServer> entry : servers.entrySet()) {
       result.put(entry.getKey(), entry.getValue().getStatus(entry.getKey()));
     }
@@ -147,7 +147,7 @@ public class ChaoticLoadBalancerTest {
     Set<KeyExtent> migrations = Collections.emptySet();
 
     // Just want to make sure it gets some migrations, randomness prevents guarantee of a defined amount, or even expected amount
-    List<TabletMigration> migrationsOut = new ArrayList<TabletMigration>();
+    List<TabletMigration> migrationsOut = new ArrayList<>();
     while (migrationsOut.size() != 0) {
       balancer.balance(getAssignments(servers), migrations, migrationsOut);
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/test/java/org/apache/accumulo/server/master/balancer/DefaultLoadBalancerTest.java
----------------------------------------------------------------------
diff --git a/server/base/src/test/java/org/apache/accumulo/server/master/balancer/DefaultLoadBalancerTest.java b/server/base/src/test/java/org/apache/accumulo/server/master/balancer/DefaultLoadBalancerTest.java
index 20d85fe..e0bd2d1 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/master/balancer/DefaultLoadBalancerTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/master/balancer/DefaultLoadBalancerTest.java
@@ -48,11 +48,11 @@ import com.google.common.net.HostAndPort;
 public class DefaultLoadBalancerTest {
 
   class FakeTServer {
-    List<KeyExtent> extents = new ArrayList<KeyExtent>();
+    List<KeyExtent> extents = new ArrayList<>();
 
     TabletServerStatus getStatus(TServerInstance server) {
       TabletServerStatus result = new TabletServerStatus();
-      result.tableMap = new HashMap<String,TableInfo>();
+      result.tableMap = new HashMap<>();
       for (KeyExtent extent : extents) {
         String table = extent.getTableId();
         TableInfo info = result.tableMap.get(table);
@@ -67,14 +67,14 @@ public class DefaultLoadBalancerTest {
     }
   }
 
-  Map<TServerInstance,FakeTServer> servers = new HashMap<TServerInstance,FakeTServer>();
-  Map<KeyExtent,TServerInstance> last = new HashMap<KeyExtent,TServerInstance>();
+  Map<TServerInstance,FakeTServer> servers = new HashMap<>();
+  Map<KeyExtent,TServerInstance> last = new HashMap<>();
 
   class TestDefaultLoadBalancer extends DefaultLoadBalancer {
 
     @Override
     public List<TabletStats> getOnlineTabletsForTable(TServerInstance tserver, String table) throws ThriftSecurityException, TException {
-      List<TabletStats> result = new ArrayList<TabletStats>();
+      List<TabletStats> result = new ArrayList<>();
       for (KeyExtent extent : servers.get(tserver).extents) {
         if (extent.getTableId().equals(table)) {
           result.add(new TabletStats(extent.toThrift(), null, null, null, 0l, 0., 0., 0));
@@ -95,7 +95,7 @@ public class DefaultLoadBalancerTest {
     servers.put(new TServerInstance(HostAndPort.fromParts("127.0.0.1", 1234), "a"), new FakeTServer());
     servers.put(new TServerInstance(HostAndPort.fromParts("127.0.0.2", 1234), "b"), new FakeTServer());
     servers.put(new TServerInstance(HostAndPort.fromParts("127.0.0.3", 1234), "c"), new FakeTServer());
-    List<KeyExtent> metadataTable = new ArrayList<KeyExtent>();
+    List<KeyExtent> metadataTable = new ArrayList<>();
     String table = "t1";
     metadataTable.add(makeExtent(table, null, null));
     table = "t2";
@@ -112,14 +112,14 @@ public class DefaultLoadBalancerTest {
 
     TestDefaultLoadBalancer balancer = new TestDefaultLoadBalancer();
 
-    SortedMap<TServerInstance,TabletServerStatus> current = new TreeMap<TServerInstance,TabletServerStatus>();
+    SortedMap<TServerInstance,TabletServerStatus> current = new TreeMap<>();
     for (Entry<TServerInstance,FakeTServer> entry : servers.entrySet()) {
       current.put(entry.getKey(), entry.getValue().getStatus(entry.getKey()));
     }
     assignTablets(metadataTable, servers, current, balancer);
 
     // Verify that the counts on the tables are correct
-    Map<String,Integer> expectedCounts = new HashMap<String,Integer>();
+    Map<String,Integer> expectedCounts = new HashMap<>();
     expectedCounts.put("t1", 1);
     expectedCounts.put("t2", 1);
     expectedCounts.put("t3", 2);
@@ -131,7 +131,7 @@ public class DefaultLoadBalancerTest {
     }
 
     // Nothing should happen, we are balanced
-    ArrayList<TabletMigration> out = new ArrayList<TabletMigration>();
+    ArrayList<TabletMigration> out = new ArrayList<>();
     balancer.getMigrations(current, out);
     assertEquals(out.size(), 0);
 
@@ -158,7 +158,7 @@ public class DefaultLoadBalancerTest {
   }
 
   SortedMap<TServerInstance,TabletServerStatus> getAssignments(Map<TServerInstance,FakeTServer> servers) {
-    SortedMap<TServerInstance,TabletServerStatus> result = new TreeMap<TServerInstance,TabletServerStatus>();
+    SortedMap<TServerInstance,TabletServerStatus> result = new TreeMap<>();
     for (Entry<TServerInstance,FakeTServer> entry : servers.entrySet()) {
       result.put(entry.getKey(), entry.getValue().getStatus(entry.getKey()));
     }
@@ -192,7 +192,7 @@ public class DefaultLoadBalancerTest {
     int moved = 0;
     // balance until we can't balance no more!
     while (true) {
-      List<TabletMigration> migrationsOut = new ArrayList<TabletMigration>();
+      List<TabletMigration> migrationsOut = new ArrayList<>();
       balancer.balance(getAssignments(servers), migrations, migrationsOut);
       if (migrationsOut.size() == 0)
         break;
@@ -217,7 +217,7 @@ public class DefaultLoadBalancerTest {
       servers.put(tsi, fakeTServer);
     }
     // put 60 tablets on 25 of them
-    List<Entry<TServerInstance,FakeTServer>> shortList = new ArrayList<Entry<TServerInstance,FakeTServer>>(servers.entrySet());
+    List<Entry<TServerInstance,FakeTServer>> shortList = new ArrayList<>(servers.entrySet());
     Entry<TServerInstance,FakeTServer> shortServer = shortList.remove(0);
     int c = 0;
     for (int i = 0; i < 60; i++) {
@@ -235,7 +235,7 @@ public class DefaultLoadBalancerTest {
     int moved = 0;
     // balance until we can't balance no more!
     while (true) {
-      List<TabletMigration> migrationsOut = new ArrayList<TabletMigration>();
+      List<TabletMigration> migrationsOut = new ArrayList<>();
       balancer.balance(getAssignments(servers), migrations, migrationsOut);
       if (migrationsOut.size() == 0)
         break;
@@ -264,7 +264,7 @@ public class DefaultLoadBalancerTest {
 
     if (expectedCounts != null) {
       for (FakeTServer server : servers.values()) {
-        Map<String,Integer> counts = new HashMap<String,Integer>();
+        Map<String,Integer> counts = new HashMap<>();
         for (KeyExtent extent : server.extents) {
           String t = extent.getTableId();
           if (counts.get(t) == null)

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/test/java/org/apache/accumulo/server/master/balancer/GroupBalancerTest.java
----------------------------------------------------------------------
diff --git a/server/base/src/test/java/org/apache/accumulo/server/master/balancer/GroupBalancerTest.java b/server/base/src/test/java/org/apache/accumulo/server/master/balancer/GroupBalancerTest.java
index 65b43cc..f6c4e0d 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/master/balancer/GroupBalancerTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/master/balancer/GroupBalancerTest.java
@@ -84,7 +84,7 @@ public class GroupBalancerTest {
 
             @Override
             public Pair<KeyExtent,Location> apply(final Entry<KeyExtent,TServerInstance> input) {
-              return new Pair<KeyExtent,Location>(input.getKey(), new Location(input.getValue()));
+              return new Pair<>(input.getKey(), new Location(input.getValue()));
             }
           });
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/test/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancerReconfigurationTest.java
----------------------------------------------------------------------
diff --git a/server/base/src/test/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancerReconfigurationTest.java b/server/base/src/test/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancerReconfigurationTest.java
index eff9a11..504b39b 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancerReconfigurationTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancerReconfigurationTest.java
@@ -70,8 +70,8 @@ public class HostRegexTableLoadBalancerReconfigurationTest extends BaseHostRegex
         Assert.fail("tablet not in bounds: " + e.getKey() + " -> " + e.getValue().host());
       }
     }
-    Set<KeyExtent> migrations = new HashSet<KeyExtent>();
-    List<TabletMigration> migrationsOut = new ArrayList<TabletMigration>();
+    Set<KeyExtent> migrations = new HashSet<>();
+    List<TabletMigration> migrationsOut = new ArrayList<>();
     // Wait to trigger the out of bounds check which will call our version of getOnlineTabletsForTable
     UtilWaitThread.sleep(11000);
     this.balance(Collections.unmodifiableSortedMap(allTabletServers), migrations, migrationsOut);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/test/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancerTest.java
----------------------------------------------------------------------
diff --git a/server/base/src/test/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancerTest.java b/server/base/src/test/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancerTest.java
index 868ac0a..c0ccc48 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancerTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancerTest.java
@@ -325,7 +325,7 @@ public class HostRegexTableLoadBalancerTest extends BaseHostRegexTableLoadBalanc
     }
     SortedMap<TServerInstance,TabletServerStatus> current = createCurrent(15);
     // Remove the BAR tablet servers from current
-    List<TServerInstance> removals = new ArrayList<TServerInstance>();
+    List<TServerInstance> removals = new ArrayList<>();
     for (Entry<TServerInstance,TabletServerStatus> e : current.entrySet()) {
       if (e.getKey().host().equals("192.168.0.6") || e.getKey().host().equals("192.168.0.7") || e.getKey().host().equals("192.168.0.8")
           || e.getKey().host().equals("192.168.0.9") || e.getKey().host().equals("192.168.0.10")) {
@@ -350,8 +350,8 @@ public class HostRegexTableLoadBalancerTest extends BaseHostRegexTableLoadBalanc
     init((ServerConfiguration) factory);
     // Wait to trigger the out of bounds check which will call our version of getOnlineTabletsForTable
     UtilWaitThread.sleep(11000);
-    Set<KeyExtent> migrations = new HashSet<KeyExtent>();
-    List<TabletMigration> migrationsOut = new ArrayList<TabletMigration>();
+    Set<KeyExtent> migrations = new HashSet<>();
+    List<TabletMigration> migrationsOut = new ArrayList<>();
     this.balance(createCurrent(15), migrations, migrationsOut);
     Assert.assertEquals(2, migrationsOut.size());
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/test/java/org/apache/accumulo/server/master/balancer/TableLoadBalancerTest.java
----------------------------------------------------------------------
diff --git a/server/base/src/test/java/org/apache/accumulo/server/master/balancer/TableLoadBalancerTest.java b/server/base/src/test/java/org/apache/accumulo/server/master/balancer/TableLoadBalancerTest.java
index 7caa60b..f34cc3d 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/master/balancer/TableLoadBalancerTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/master/balancer/TableLoadBalancerTest.java
@@ -58,7 +58,7 @@ public class TableLoadBalancerTest {
 
   static private TabletServerStatus status(Object... config) {
     TabletServerStatus result = new TabletServerStatus();
-    result.tableMap = new HashMap<String,TableInfo>();
+    result.tableMap = new HashMap<>();
     String tablename = null;
     for (Object c : config) {
       if (c instanceof String) {
@@ -77,7 +77,7 @@ public class TableLoadBalancerTest {
   static SortedMap<TServerInstance,TabletServerStatus> state;
 
   static List<TabletStats> generateFakeTablets(TServerInstance tserver, String tableId) {
-    List<TabletStats> result = new ArrayList<TabletStats>();
+    List<TabletStats> result = new ArrayList<>();
     TabletServerStatus tableInfo = state.get(tserver);
     // generate some fake tablets
     for (int i = 0; i < tableInfo.tableMap.get(tableId).onlineTablets; i++) {
@@ -155,12 +155,12 @@ public class TableLoadBalancerTest {
     };
 
     String t1Id = TABLE_ID_MAP.get("t1"), t2Id = TABLE_ID_MAP.get("t2"), t3Id = TABLE_ID_MAP.get("t3");
-    state = new TreeMap<TServerInstance,TabletServerStatus>();
+    state = new TreeMap<>();
     TServerInstance svr = mkts("10.0.0.1", "0x01020304");
     state.put(svr, status(t1Id, 10, t2Id, 10, t3Id, 10));
 
     Set<KeyExtent> migrations = Collections.emptySet();
-    List<TabletMigration> migrationsOut = new ArrayList<TabletMigration>();
+    List<TabletMigration> migrationsOut = new ArrayList<>();
     TableLoadBalancer tls = new TableLoadBalancer();
     tls.init(confFactory);
     tls.balance(state, migrations, migrationsOut);
@@ -171,7 +171,7 @@ public class TableLoadBalancerTest {
     tls.init(confFactory);
     tls.balance(state, migrations, migrationsOut);
     int count = 0;
-    Map<String,Integer> movedByTable = new HashMap<String,Integer>();
+    Map<String,Integer> movedByTable = new HashMap<>();
     movedByTable.put(t1Id, Integer.valueOf(0));
     movedByTable.put(t2Id, Integer.valueOf(0));
     movedByTable.put(t3Id, Integer.valueOf(0));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/test/java/org/apache/accumulo/server/master/state/TabletLocationStateTest.java
----------------------------------------------------------------------
diff --git a/server/base/src/test/java/org/apache/accumulo/server/master/state/TabletLocationStateTest.java b/server/base/src/test/java/org/apache/accumulo/server/master/state/TabletLocationStateTest.java
index 0a0afd1..f270fe4 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/master/state/TabletLocationStateTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/master/state/TabletLocationStateTest.java
@@ -35,8 +35,8 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 
 public class TabletLocationStateTest {
-  private static final Collection<String> innerWalogs = new java.util.HashSet<String>();
-  private static final Collection<Collection<String>> walogs = new java.util.HashSet<Collection<String>>();
+  private static final Collection<String> innerWalogs = new java.util.HashSet<>();
+  private static final Collection<Collection<String>> walogs = new java.util.HashSet<>();
 
   @BeforeClass
   public static void setUpClass() {
@@ -137,7 +137,7 @@ public class TabletLocationStateTest {
 
   @Test
   public void testGetState_Assigned() throws Exception {
-    Set<TServerInstance> liveServers = new java.util.HashSet<TServerInstance>();
+    Set<TServerInstance> liveServers = new java.util.HashSet<>();
     liveServers.add(future);
     tls = new TabletLocationState(keyExtent, future, null, last, walogs, true);
     assertEquals(TabletState.ASSIGNED, tls.getState(liveServers));
@@ -145,7 +145,7 @@ public class TabletLocationStateTest {
 
   @Test
   public void testGetState_Hosted() throws Exception {
-    Set<TServerInstance> liveServers = new java.util.HashSet<TServerInstance>();
+    Set<TServerInstance> liveServers = new java.util.HashSet<>();
     liveServers.add(current);
     tls = new TabletLocationState(keyExtent, null, current, last, walogs, true);
     assertEquals(TabletState.HOSTED, tls.getState(liveServers));
@@ -153,7 +153,7 @@ public class TabletLocationStateTest {
 
   @Test
   public void testGetState_Dead1() throws Exception {
-    Set<TServerInstance> liveServers = new java.util.HashSet<TServerInstance>();
+    Set<TServerInstance> liveServers = new java.util.HashSet<>();
     liveServers.add(current);
     tls = new TabletLocationState(keyExtent, future, null, last, walogs, true);
     assertEquals(TabletState.ASSIGNED_TO_DEAD_SERVER, tls.getState(liveServers));
@@ -161,7 +161,7 @@ public class TabletLocationStateTest {
 
   @Test
   public void testGetState_Dead2() throws Exception {
-    Set<TServerInstance> liveServers = new java.util.HashSet<TServerInstance>();
+    Set<TServerInstance> liveServers = new java.util.HashSet<>();
     liveServers.add(future);
     tls = new TabletLocationState(keyExtent, null, current, last, walogs, true);
     assertEquals(TabletState.ASSIGNED_TO_DEAD_SERVER, tls.getState(liveServers));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/test/java/org/apache/accumulo/server/problems/ProblemReportingIteratorTest.java
----------------------------------------------------------------------
diff --git a/server/base/src/test/java/org/apache/accumulo/server/problems/ProblemReportingIteratorTest.java b/server/base/src/test/java/org/apache/accumulo/server/problems/ProblemReportingIteratorTest.java
index 1bcf165..ac91bdf 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/problems/ProblemReportingIteratorTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/problems/ProblemReportingIteratorTest.java
@@ -81,7 +81,7 @@ public class ProblemReportingIteratorTest {
   @Test
   public void testSeek() throws Exception {
     Range r = EasyMock.createMock(Range.class);
-    Collection<ByteSequence> f = new java.util.HashSet<ByteSequence>();
+    Collection<ByteSequence> f = new java.util.HashSet<>();
     ii.seek(r, f, true);
     replay(ii);
     pri.seek(r, f, true);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/test/java/org/apache/accumulo/server/rpc/RpcWrapperTest.java
----------------------------------------------------------------------
diff --git a/server/base/src/test/java/org/apache/accumulo/server/rpc/RpcWrapperTest.java b/server/base/src/test/java/org/apache/accumulo/server/rpc/RpcWrapperTest.java
index 39d3705..d32178e 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/rpc/RpcWrapperTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/rpc/RpcWrapperTest.java
@@ -22,7 +22,6 @@ import java.util.Map;
 import java.util.Set;
 
 import org.apache.accumulo.core.trace.wrappers.RpcServerInvocationHandler;
-import org.apache.accumulo.server.rpc.RpcWrapper;
 import org.apache.thrift.ProcessFunction;
 import org.apache.thrift.TBase;
 import org.apache.thrift.TException;
@@ -49,12 +48,12 @@ public class RpcWrapperTest {
    * @return A ProcessFunction.
    */
   private fake_proc<FakeService> createProcessFunction(String methodName, boolean isOneway) {
-    return new fake_proc<FakeService>(methodName, isOneway);
+    return new fake_proc<>(methodName, isOneway);
   }
 
   @Test
   public void testSomeOnewayMethods() {
-    Map<String,ProcessFunction<FakeService,?>> procs = new HashMap<String,ProcessFunction<FakeService,?>>();
+    Map<String,ProcessFunction<FakeService,?>> procs = new HashMap<>();
     procs.put("foo", createProcessFunction("foo", true));
     procs.put("foobar", createProcessFunction("foobar", false));
     procs.put("bar", createProcessFunction("bar", true));
@@ -66,7 +65,7 @@ public class RpcWrapperTest {
 
   @Test
   public void testNoOnewayMethods() {
-    Map<String,ProcessFunction<FakeService,?>> procs = new HashMap<String,ProcessFunction<FakeService,?>>();
+    Map<String,ProcessFunction<FakeService,?>> procs = new HashMap<>();
     procs.put("foo", createProcessFunction("foo", false));
     procs.put("foobar", createProcessFunction("foobar", false));
     procs.put("bar", createProcessFunction("bar", false));
@@ -78,7 +77,7 @@ public class RpcWrapperTest {
 
   @Test
   public void testAllOnewayMethods() {
-    Map<String,ProcessFunction<FakeService,?>> procs = new HashMap<String,ProcessFunction<FakeService,?>>();
+    Map<String,ProcessFunction<FakeService,?>> procs = new HashMap<>();
     procs.put("foo", createProcessFunction("foo", true));
     procs.put("foobar", createProcessFunction("foobar", true));
     procs.put("bar", createProcessFunction("bar", true));
@@ -196,7 +195,7 @@ public class RpcWrapperTest {
     public long barfoo() {
       return 0;
     }
-  };
+  }
 
   /**
    * A fake ProcessFunction implementation for testing that allows injection of method name and oneway.

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/test/java/org/apache/accumulo/server/rpc/TCredentialsUpdatingInvocationHandlerTest.java
----------------------------------------------------------------------
diff --git a/server/base/src/test/java/org/apache/accumulo/server/rpc/TCredentialsUpdatingInvocationHandlerTest.java b/server/base/src/test/java/org/apache/accumulo/server/rpc/TCredentialsUpdatingInvocationHandlerTest.java
index c4340c6..52eee25 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/rpc/TCredentialsUpdatingInvocationHandlerTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/rpc/TCredentialsUpdatingInvocationHandlerTest.java
@@ -63,7 +63,7 @@ public class TCredentialsUpdatingInvocationHandlerTest {
       }
     };
 
-    proxy = new TCredentialsUpdatingInvocationHandler<Object>(new Object(), conf);
+    proxy = new TCredentialsUpdatingInvocationHandler<>(new Object(), conf);
   }
 
   @After
@@ -123,7 +123,7 @@ public class TCredentialsUpdatingInvocationHandlerTest {
     final String proxyServer = "proxy";
     cc.set(Property.INSTANCE_RPC_SASL_PROXYUSERS.getKey() + proxyServer + ".users", "*");
     cc.set(Property.INSTANCE_RPC_SASL_PROXYUSERS.getKey() + proxyServer + ".hosts", "*");
-    proxy = new TCredentialsUpdatingInvocationHandler<Object>(new Object(), conf);
+    proxy = new TCredentialsUpdatingInvocationHandler<>(new Object(), conf);
     TCredentials tcreds = new TCredentials("client", KerberosToken.class.getName(), ByteBuffer.allocate(0), UUID.randomUUID().toString());
     UGIAssumingProcessor.rpcPrincipal.set(proxyServer);
     proxy.updateArgs(new Object[] {new Object(), tcreds});
@@ -134,7 +134,7 @@ public class TCredentialsUpdatingInvocationHandlerTest {
     final String proxyServer = "proxy";
     cc.set(Property.INSTANCE_RPC_SASL_ALLOWED_USER_IMPERSONATION, proxyServer + ":*");
     cc.set(Property.INSTANCE_RPC_SASL_ALLOWED_HOST_IMPERSONATION, "*");
-    proxy = new TCredentialsUpdatingInvocationHandler<Object>(new Object(), conf);
+    proxy = new TCredentialsUpdatingInvocationHandler<>(new Object(), conf);
     TCredentials tcreds = new TCredentials("client", KerberosToken.class.getName(), ByteBuffer.allocate(0), UUID.randomUUID().toString());
     UGIAssumingProcessor.rpcPrincipal.set(proxyServer);
     proxy.updateArgs(new Object[] {new Object(), tcreds});
@@ -146,7 +146,7 @@ public class TCredentialsUpdatingInvocationHandlerTest {
     final String proxyServer = "proxy";
     cc.set(Property.INSTANCE_RPC_SASL_PROXYUSERS.getKey() + proxyServer + ".users", "client1,client2");
     cc.set(Property.INSTANCE_RPC_SASL_PROXYUSERS.getKey() + proxyServer + ".hosts", "*");
-    proxy = new TCredentialsUpdatingInvocationHandler<Object>(new Object(), conf);
+    proxy = new TCredentialsUpdatingInvocationHandler<>(new Object(), conf);
     TCredentials tcreds = new TCredentials("client1", KerberosToken.class.getName(), ByteBuffer.allocate(0), UUID.randomUUID().toString());
     UGIAssumingProcessor.rpcPrincipal.set(proxyServer);
     proxy.updateArgs(new Object[] {new Object(), tcreds});
@@ -159,7 +159,7 @@ public class TCredentialsUpdatingInvocationHandlerTest {
     final String proxyServer = "proxy";
     cc.set(Property.INSTANCE_RPC_SASL_ALLOWED_USER_IMPERSONATION, proxyServer + ":client1,client2");
     cc.set(Property.INSTANCE_RPC_SASL_ALLOWED_HOST_IMPERSONATION, "*");
-    proxy = new TCredentialsUpdatingInvocationHandler<Object>(new Object(), conf);
+    proxy = new TCredentialsUpdatingInvocationHandler<>(new Object(), conf);
     TCredentials tcreds = new TCredentials("client1", KerberosToken.class.getName(), ByteBuffer.allocate(0), UUID.randomUUID().toString());
     UGIAssumingProcessor.rpcPrincipal.set(proxyServer);
     proxy.updateArgs(new Object[] {new Object(), tcreds});
@@ -174,7 +174,7 @@ public class TCredentialsUpdatingInvocationHandlerTest {
     // let "otherproxy" impersonate, but not "proxy"
     cc.set(Property.INSTANCE_RPC_SASL_PROXYUSERS.getKey() + "otherproxy" + ".users", "*");
     cc.set(Property.INSTANCE_RPC_SASL_PROXYUSERS.getKey() + "otherproxy" + ".hosts", "*");
-    proxy = new TCredentialsUpdatingInvocationHandler<Object>(new Object(), conf);
+    proxy = new TCredentialsUpdatingInvocationHandler<>(new Object(), conf);
     TCredentials tcreds = new TCredentials("client", KerberosToken.class.getName(), ByteBuffer.allocate(0), UUID.randomUUID().toString());
     UGIAssumingProcessor.rpcPrincipal.set(proxyServer);
     proxy.updateArgs(new Object[] {new Object(), tcreds});
@@ -186,7 +186,7 @@ public class TCredentialsUpdatingInvocationHandlerTest {
     // let "otherproxy" impersonate, but not "proxy"
     cc.set(Property.INSTANCE_RPC_SASL_ALLOWED_USER_IMPERSONATION, "otherproxy:*");
     cc.set(Property.INSTANCE_RPC_SASL_ALLOWED_HOST_IMPERSONATION, "*");
-    proxy = new TCredentialsUpdatingInvocationHandler<Object>(new Object(), conf);
+    proxy = new TCredentialsUpdatingInvocationHandler<>(new Object(), conf);
     TCredentials tcreds = new TCredentials("client", KerberosToken.class.getName(), ByteBuffer.allocate(0), UUID.randomUUID().toString());
     UGIAssumingProcessor.rpcPrincipal.set(proxyServer);
     proxy.updateArgs(new Object[] {new Object(), tcreds});
@@ -201,7 +201,7 @@ public class TCredentialsUpdatingInvocationHandlerTest {
     cc.set(Property.INSTANCE_RPC_SASL_PROXYUSERS.getKey() + "otherproxy1" + ".hosts", "*");
     cc.set(Property.INSTANCE_RPC_SASL_PROXYUSERS.getKey() + "otherproxy2" + ".users", "client1,client2");
     cc.set(Property.INSTANCE_RPC_SASL_PROXYUSERS.getKey() + "otherproxy2" + ".hosts", "*");
-    proxy = new TCredentialsUpdatingInvocationHandler<Object>(new Object(), conf);
+    proxy = new TCredentialsUpdatingInvocationHandler<>(new Object(), conf);
     TCredentials tcreds = new TCredentials("client1", KerberosToken.class.getName(), ByteBuffer.allocate(0), UUID.randomUUID().toString());
     UGIAssumingProcessor.rpcPrincipal.set(proxyServer);
     proxy.updateArgs(new Object[] {new Object(), tcreds});
@@ -213,7 +213,7 @@ public class TCredentialsUpdatingInvocationHandlerTest {
     // let "otherproxy" impersonate, but not "proxy"
     cc.set(Property.INSTANCE_RPC_SASL_ALLOWED_USER_IMPERSONATION, "otherproxy1:*;otherproxy2:client1,client2");
     cc.set(Property.INSTANCE_RPC_SASL_ALLOWED_HOST_IMPERSONATION, "*;*");
-    proxy = new TCredentialsUpdatingInvocationHandler<Object>(new Object(), conf);
+    proxy = new TCredentialsUpdatingInvocationHandler<>(new Object(), conf);
     TCredentials tcreds = new TCredentials("client1", KerberosToken.class.getName(), ByteBuffer.allocate(0), UUID.randomUUID().toString());
     UGIAssumingProcessor.rpcPrincipal.set(proxyServer);
     proxy.updateArgs(new Object[] {new Object(), tcreds});
@@ -225,7 +225,7 @@ public class TCredentialsUpdatingInvocationHandlerTest {
     final String proxyServer = "proxy", client = "client", host = "host.domain.com";
     cc.set(Property.INSTANCE_RPC_SASL_PROXYUSERS.getKey() + proxyServer + ".users", client);
     cc.set(Property.INSTANCE_RPC_SASL_PROXYUSERS.getKey() + proxyServer + ".hosts", host);
-    proxy = new TCredentialsUpdatingInvocationHandler<Object>(new Object(), conf);
+    proxy = new TCredentialsUpdatingInvocationHandler<>(new Object(), conf);
     TCredentials tcreds = new TCredentials("client", KerberosToken.class.getName(), ByteBuffer.allocate(0), UUID.randomUUID().toString());
     UGIAssumingProcessor.rpcPrincipal.set(proxyServer);
     TServerUtils.clientAddress.set(host);
@@ -237,7 +237,7 @@ public class TCredentialsUpdatingInvocationHandlerTest {
     final String proxyServer = "proxy", client = "client", host = "host.domain.com";
     cc.set(Property.INSTANCE_RPC_SASL_ALLOWED_USER_IMPERSONATION, proxyServer + ":" + client);
     cc.set(Property.INSTANCE_RPC_SASL_ALLOWED_HOST_IMPERSONATION, host);
-    proxy = new TCredentialsUpdatingInvocationHandler<Object>(new Object(), conf);
+    proxy = new TCredentialsUpdatingInvocationHandler<>(new Object(), conf);
     TCredentials tcreds = new TCredentials("client", KerberosToken.class.getName(), ByteBuffer.allocate(0), UUID.randomUUID().toString());
     UGIAssumingProcessor.rpcPrincipal.set(proxyServer);
     TServerUtils.clientAddress.set(host);
@@ -250,7 +250,7 @@ public class TCredentialsUpdatingInvocationHandlerTest {
     final String proxyServer = "proxy", client = "client", host = "host.domain.com";
     cc.set(Property.INSTANCE_RPC_SASL_PROXYUSERS.getKey() + proxyServer + ".users", client);
     cc.set(Property.INSTANCE_RPC_SASL_PROXYUSERS.getKey() + proxyServer + ".hosts", host);
-    proxy = new TCredentialsUpdatingInvocationHandler<Object>(new Object(), conf);
+    proxy = new TCredentialsUpdatingInvocationHandler<>(new Object(), conf);
     TCredentials tcreds = new TCredentials("client", KerberosToken.class.getName(), ByteBuffer.allocate(0), UUID.randomUUID().toString());
     UGIAssumingProcessor.rpcPrincipal.set(proxyServer);
     // The RPC came from a different host than is allowed
@@ -263,7 +263,7 @@ public class TCredentialsUpdatingInvocationHandlerTest {
     final String proxyServer = "proxy", client = "client", host = "host.domain.com";
     cc.set(Property.INSTANCE_RPC_SASL_ALLOWED_USER_IMPERSONATION, proxyServer + ":" + client);
     cc.set(Property.INSTANCE_RPC_SASL_ALLOWED_HOST_IMPERSONATION, host);
-    proxy = new TCredentialsUpdatingInvocationHandler<Object>(new Object(), conf);
+    proxy = new TCredentialsUpdatingInvocationHandler<>(new Object(), conf);
     TCredentials tcreds = new TCredentials("client", KerberosToken.class.getName(), ByteBuffer.allocate(0), UUID.randomUUID().toString());
     UGIAssumingProcessor.rpcPrincipal.set(proxyServer);
     // The RPC came from a different host than is allowed

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/test/java/org/apache/accumulo/server/security/handler/ZKAuthenticatorTest.java
----------------------------------------------------------------------
diff --git a/server/base/src/test/java/org/apache/accumulo/server/security/handler/ZKAuthenticatorTest.java b/server/base/src/test/java/org/apache/accumulo/server/security/handler/ZKAuthenticatorTest.java
index 827e772..1b0970d 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/security/handler/ZKAuthenticatorTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/security/handler/ZKAuthenticatorTest.java
@@ -55,7 +55,7 @@ public class ZKAuthenticatorTest extends TestCase {
   }
 
   public void testSystemConversion() {
-    Set<SystemPermission> perms = new TreeSet<SystemPermission>();
+    Set<SystemPermission> perms = new TreeSet<>();
     for (SystemPermission s : SystemPermission.values())
       perms.add(s);
 
@@ -66,7 +66,7 @@ public class ZKAuthenticatorTest extends TestCase {
   }
 
   public void testTableConversion() {
-    Set<TablePermission> perms = new TreeSet<TablePermission>();
+    Set<TablePermission> perms = new TreeSet<>();
     for (TablePermission s : TablePermission.values())
       perms.add(s);
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/test/java/org/apache/accumulo/server/tablets/LogicalTimeTest.java
----------------------------------------------------------------------
diff --git a/server/base/src/test/java/org/apache/accumulo/server/tablets/LogicalTimeTest.java b/server/base/src/test/java/org/apache/accumulo/server/tablets/LogicalTimeTest.java
index b491f0e..1076249 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/tablets/LogicalTimeTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/tablets/LogicalTimeTest.java
@@ -57,7 +57,7 @@ public class LogicalTimeTest {
 
   @Test
   public void testSetUpdateTimes() {
-    List<Mutation> ms = new java.util.ArrayList<Mutation>();
+    List<Mutation> ms = new java.util.ArrayList<>();
     ServerMutation m = createMock(ServerMutation.class);
     ServerMutation m2 = createMock(ServerMutation.class);
     m.setSystemTimestamp(1235L);
@@ -74,7 +74,7 @@ public class LogicalTimeTest {
 
   @Test
   public void testSetUpdateTimes_NoMutations() {
-    List<Mutation> ms = new java.util.ArrayList<Mutation>();
+    List<Mutation> ms = new java.util.ArrayList<>();
     assertEquals(TIME, ltime.setUpdateTimes(ms));
   }
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/test/java/org/apache/accumulo/server/tablets/MillisTimeTest.java
----------------------------------------------------------------------
diff --git a/server/base/src/test/java/org/apache/accumulo/server/tablets/MillisTimeTest.java b/server/base/src/test/java/org/apache/accumulo/server/tablets/MillisTimeTest.java
index 3ee220e..49f5913 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/tablets/MillisTimeTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/tablets/MillisTimeTest.java
@@ -59,7 +59,7 @@ public class MillisTimeTest {
 
   @Test
   public void testSetUpdateTimes() {
-    List<Mutation> ms = new java.util.ArrayList<Mutation>();
+    List<Mutation> ms = new java.util.ArrayList<>();
     ServerMutation m = createMock(ServerMutation.class);
     m.setSystemTimestamp(anyLong());
     replay(m);
@@ -71,7 +71,7 @@ public class MillisTimeTest {
 
   @Test
   public void testSetUpdateTimes_NoMutations() {
-    List<Mutation> ms = new java.util.ArrayList<Mutation>();
+    List<Mutation> ms = new java.util.ArrayList<>();
     assertEquals(TIME, mtime.setUpdateTimes(ms));
   }
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/test/java/org/apache/accumulo/server/util/DefaultMapTest.java
----------------------------------------------------------------------
diff --git a/server/base/src/test/java/org/apache/accumulo/server/util/DefaultMapTest.java b/server/base/src/test/java/org/apache/accumulo/server/util/DefaultMapTest.java
index 9ca2596..88aaa71 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/util/DefaultMapTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/util/DefaultMapTest.java
@@ -38,7 +38,7 @@ public class DefaultMapTest {
     assertNotNull(canConstruct);
     assertEquals(new AtomicInteger(0).get(), canConstruct.get());
 
-    DefaultMap<String,String> map = new DefaultMap<String,String>("");
+    DefaultMap<String,String> map = new DefaultMap<>("");
     assertEquals(map.get("foo"), "");
     map.put("foo", "bar");
     assertEquals(map.get("foo"), "bar");

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/test/java/org/apache/accumulo/server/util/FileSystemMonitorTest.java
----------------------------------------------------------------------
diff --git a/server/base/src/test/java/org/apache/accumulo/server/util/FileSystemMonitorTest.java b/server/base/src/test/java/org/apache/accumulo/server/util/FileSystemMonitorTest.java
index 7387035..95167d6 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/util/FileSystemMonitorTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/util/FileSystemMonitorTest.java
@@ -74,7 +74,7 @@ public class FileSystemMonitorTest {
     List<Mount> mounts = FileSystemMonitor.getMountsFromFile(reader);
     log.info("Filtered mount points: " + mounts);
     assertEquals(2, mounts.size());
-    Set<String> expectedCheckedMountPoints = new HashSet<String>();
+    Set<String> expectedCheckedMountPoints = new HashSet<>();
     expectedCheckedMountPoints.add("/");
     expectedCheckedMountPoints.add("/grid/0");
     for (Mount mount : mounts) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/test/java/org/apache/accumulo/server/util/FileUtilTest.java
----------------------------------------------------------------------
diff --git a/server/base/src/test/java/org/apache/accumulo/server/util/FileUtilTest.java b/server/base/src/test/java/org/apache/accumulo/server/util/FileUtilTest.java
index 7bded1a..a826acf 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/util/FileUtilTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/util/FileUtilTest.java
@@ -66,7 +66,7 @@ public class FileUtilTest {
 
   @Test
   public void testToPathStrings() {
-    Collection<FileRef> c = new java.util.ArrayList<FileRef>();
+    Collection<FileRef> c = new java.util.ArrayList<>();
     FileRef r1 = createMock(FileRef.class);
     expect(r1.path()).andReturn(new Path("/foo"));
     replay(r1);
@@ -91,7 +91,7 @@ public class FileUtilTest {
     assertTrue(tmp1.mkdirs() || tmp1.isDirectory());
     Path tmpPath1 = new Path(tmp1.toURI());
 
-    HashMap<Property,String> testProps = new HashMap<Property,String>();
+    HashMap<Property,String> testProps = new HashMap<>();
     testProps.put(Property.INSTANCE_DFS_DIR, accumuloDir.getAbsolutePath());
 
     AccumuloConfiguration testConf = new FileUtilTestConfiguration(testProps);
@@ -118,7 +118,7 @@ public class FileUtilTest {
     assertTrue(tmp2.mkdirs() || tmp2.isDirectory());
     Path tmpPath1 = new Path(tmp1.toURI()), tmpPath2 = new Path(tmp2.toURI());
 
-    HashMap<Property,String> testProps = new HashMap<Property,String>();
+    HashMap<Property,String> testProps = new HashMap<>();
     testProps.put(Property.INSTANCE_VOLUMES, v1.toURI().toString() + "," + v2.toURI().toString());
 
     AccumuloConfiguration testConf = new FileUtilTestConfiguration(testProps);
@@ -150,7 +150,7 @@ public class FileUtilTest {
     assertTrue(tmp2.mkdirs() || tmp2.isDirectory());
     Path tmpPath1 = new Path(tmp1.toURI()), tmpPath2 = new Path(tmp2.toURI());
 
-    HashMap<Property,String> testProps = new HashMap<Property,String>();
+    HashMap<Property,String> testProps = new HashMap<>();
     testProps.put(Property.INSTANCE_VOLUMES, v1.toURI().toString() + "," + v2.toURI().toString());
 
     AccumuloConfiguration testConf = new FileUtilTestConfiguration(testProps);
@@ -178,7 +178,7 @@ public class FileUtilTest {
     assertTrue(tmp2.mkdirs() || tmp2.isDirectory());
     Path tmpPath1 = new Path(tmp1.toURI()), tmpPath2 = new Path(tmp2.toURI());
 
-    HashMap<Property,String> testProps = new HashMap<Property,String>();
+    HashMap<Property,String> testProps = new HashMap<>();
     testProps.put(Property.INSTANCE_VOLUMES, v1.toURI().toString() + "," + v2.toURI().toString());
 
     AccumuloConfiguration testConf = new FileUtilTestConfiguration(testProps);
@@ -207,7 +207,7 @@ public class FileUtilTest {
     assertTrue(tmp2.mkdirs() || tmp2.isDirectory());
     Path tmpPath1 = new Path(tmp1.toURI()), tmpPath2 = new Path(tmp2.toURI());
 
-    HashMap<Property,String> testProps = new HashMap<Property,String>();
+    HashMap<Property,String> testProps = new HashMap<>();
     testProps.put(Property.INSTANCE_VOLUMES, v1.toURI().toString() + "," + v2.toURI().toString());
 
     AccumuloConfiguration testConf = new FileUtilTestConfiguration(testProps);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/test/java/org/apache/accumulo/server/util/ReplicationTableUtilTest.java
----------------------------------------------------------------------
diff --git a/server/base/src/test/java/org/apache/accumulo/server/util/ReplicationTableUtilTest.java b/server/base/src/test/java/org/apache/accumulo/server/util/ReplicationTableUtilTest.java
index 828732d..e135c36 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/util/ReplicationTableUtilTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/util/ReplicationTableUtilTest.java
@@ -65,7 +65,7 @@ public class ReplicationTableUtilTest {
   public void properPathInRow() throws Exception {
     Writer writer = EasyMock.createNiceMock(Writer.class);
     writer.update(EasyMock.anyObject(Mutation.class));
-    final List<Mutation> mutations = new ArrayList<Mutation>();
+    final List<Mutation> mutations = new ArrayList<>();
 
     // Mock a Writer to just add the mutation to a list
     EasyMock.expectLastCall().andAnswer(new IAnswer<Object>() {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/test/java/org/apache/accumulo/server/util/TServerUtilsTest.java
----------------------------------------------------------------------
diff --git a/server/base/src/test/java/org/apache/accumulo/server/util/TServerUtilsTest.java b/server/base/src/test/java/org/apache/accumulo/server/util/TServerUtilsTest.java
index 03d4aaa..37d127a 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/util/TServerUtilsTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/util/TServerUtilsTest.java
@@ -344,7 +344,7 @@ public class TServerUtilsTest {
     AccumuloServerContext ctx = new AccumuloServerContext(factory);
     ClientServiceHandler clientHandler = new ClientServiceHandler(ctx, null, null);
     Iface rpcProxy = RpcWrapper.service(clientHandler, new Processor<Iface>(clientHandler));
-    Processor<Iface> processor = new Processor<Iface>(rpcProxy);
+    Processor<Iface> processor = new Processor<>(rpcProxy);
     // "localhost" explicitly to make sure we can always bind to that interface (avoids DNS misconfiguration)
     String hostname = "localhost";
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionAlgorithm.java
----------------------------------------------------------------------
diff --git a/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionAlgorithm.java b/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionAlgorithm.java
index 9f94622..1e15324 100644
--- a/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionAlgorithm.java
+++ b/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionAlgorithm.java
@@ -81,7 +81,7 @@ public class GarbageCollectionAlgorithm {
     }
 
     if (containsEmpty) {
-      ArrayList<String> tmp = new ArrayList<String>();
+      ArrayList<String> tmp = new ArrayList<>();
       for (String token : tokens) {
         if (!token.equals("")) {
           tmp.add(token);
@@ -112,7 +112,7 @@ public class GarbageCollectionAlgorithm {
 
   private SortedMap<String,String> makeRelative(Collection<String> candidates) {
 
-    SortedMap<String,String> ret = new TreeMap<String,String>();
+    SortedMap<String,String> ret = new TreeMap<>();
 
     for (String candidate : candidates) {
       String relPath;
@@ -243,7 +243,7 @@ public class GarbageCollectionAlgorithm {
   }
 
   private void cleanUpDeletedTableDirs(GarbageCollectionEnvironment gce, SortedMap<String,String> candidateMap) throws IOException {
-    HashSet<String> tableIdsWithDeletes = new HashSet<String>();
+    HashSet<String> tableIdsWithDeletes = new HashSet<>();
 
     // find the table ids that had dirs deleted
     for (String delete : candidateMap.keySet()) {
@@ -305,7 +305,7 @@ public class GarbageCollectionAlgorithm {
 
     boolean outOfMemory = true;
     while (outOfMemory) {
-      List<String> candidates = new ArrayList<String>();
+      List<String> candidates = new ArrayList<>();
 
       outOfMemory = getCandidates(gce, lastCandidate, candidates);
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
----------------------------------------------------------------------
diff --git a/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java b/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
index c3efe5a..1593c75 100644
--- a/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
+++ b/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
@@ -719,9 +719,9 @@ public class SimpleGarbageCollector extends AccumuloServerContext implements Ifa
     final Processor<Iface> processor;
     if (ThriftServerType.SASL == getThriftServerType()) {
       Iface tcProxy = TCredentialsUpdatingWrapper.service(rpcProxy, getClass(), getConfiguration());
-      processor = new Processor<Iface>(tcProxy);
+      processor = new Processor<>(tcProxy);
     } else {
-      processor = new Processor<Iface>(rpcProxy);
+      processor = new Processor<>(rpcProxy);
     }
     int port[] = getConfiguration().getPort(Property.GC_PORT);
     HostAndPort[] addresses = TServerUtils.getHostAndPorts(this.opts.getAddress(), port);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/gc/src/test/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogsTest.java
----------------------------------------------------------------------
diff --git a/server/gc/src/test/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogsTest.java b/server/gc/src/test/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogsTest.java
index 60d6026..691d02d 100644
--- a/server/gc/src/test/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogsTest.java
+++ b/server/gc/src/test/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogsTest.java
@@ -88,7 +88,7 @@ public class GarbageCollectWriteAheadLogsTest {
     EasyMock.expect(tserverSet.getCurrentServers()).andReturn(Collections.singleton(server1));
 
     EasyMock.expect(marker.getAllMarkers()).andReturn(markers).once();
-    EasyMock.expect(marker.state(server1, id)).andReturn(new Pair<WalState,Path>(WalState.UNREFERENCED, path));
+    EasyMock.expect(marker.state(server1, id)).andReturn(new Pair<>(WalState.UNREFERENCED, path));
     EasyMock.expect(fs.deleteRecursively(path)).andReturn(true).once();
     marker.removeWalMarker(server1, id);
     EasyMock.expectLastCall().once();
@@ -114,7 +114,7 @@ public class GarbageCollectWriteAheadLogsTest {
 
     EasyMock.expect(tserverSet.getCurrentServers()).andReturn(Collections.singleton(server1));
     EasyMock.expect(marker.getAllMarkers()).andReturn(markers).once();
-    EasyMock.expect(marker.state(server1, id)).andReturn(new Pair<WalState,Path>(WalState.CLOSED, path));
+    EasyMock.expect(marker.state(server1, id)).andReturn(new Pair<>(WalState.CLOSED, path));
     EasyMock.replay(context, marker, tserverSet, fs);
     GarbageCollectWriteAheadLogs gc = new GarbageCollectWriteAheadLogs(context, fs, false, tserverSet, marker, tabletOnServer1List) {
       @Override
@@ -215,7 +215,7 @@ public class GarbageCollectWriteAheadLogsTest {
 
     EasyMock.expect(tserverSet.getCurrentServers()).andReturn(Collections.singleton(server1));
     EasyMock.expect(marker.getAllMarkers()).andReturn(markers).once();
-    EasyMock.expect(marker.state(server1, id)).andReturn(new Pair<WalState,Path>(WalState.UNREFERENCED, path));
+    EasyMock.expect(marker.state(server1, id)).andReturn(new Pair<>(WalState.UNREFERENCED, path));
     EasyMock.expect(context.getConnector()).andReturn(conn);
 
     EasyMock.expect(conn.createScanner(ReplicationTable.NAME, Authorizations.EMPTY)).andReturn(rscanner);


[14/32] accumulo git commit: ACCUMULO-4357 Remove unneeded code for readability

Posted by ct...@apache.org.
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsHelper.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsHelper.java b/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsHelper.java
index 4068dee..a81241a 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsHelper.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsHelper.java
@@ -59,7 +59,7 @@ public abstract class TableOperationsHelper implements TableOperations {
   @Override
   public void removeIterator(String tableName, String name, EnumSet<IteratorScope> scopes) throws AccumuloSecurityException, AccumuloException,
       TableNotFoundException {
-    Map<String,String> copy = new TreeMap<String,String>();
+    Map<String,String> copy = new TreeMap<>();
     for (Entry<String,String> property : this.getProperties(tableName)) {
       copy.put(property.getKey(), property.getValue());
     }
@@ -80,7 +80,7 @@ public abstract class TableOperationsHelper implements TableOperations {
     checkArgument(scope != null, "scope is null");
     int priority = -1;
     String classname = null;
-    Map<String,String> settings = new HashMap<String,String>();
+    Map<String,String> settings = new HashMap<>();
 
     String root = String.format("%s%s.%s", Property.TABLE_ITERATOR_PREFIX, scope.name().toLowerCase(), name);
     String opt = root + ".opt.";
@@ -104,7 +104,7 @@ public abstract class TableOperationsHelper implements TableOperations {
 
   @Override
   public Map<String,EnumSet<IteratorScope>> listIterators(String tableName) throws AccumuloSecurityException, AccumuloException, TableNotFoundException {
-    Map<String,EnumSet<IteratorScope>> result = new TreeMap<String,EnumSet<IteratorScope>>();
+    Map<String,EnumSet<IteratorScope>> result = new TreeMap<>();
     for (Entry<String,String> property : this.getProperties(tableName)) {
       String name = property.getKey();
       String[] parts = name.split("\\.");
@@ -129,7 +129,7 @@ public abstract class TableOperationsHelper implements TableOperations {
       String scopeStr = String.format("%s%s", Property.TABLE_ITERATOR_PREFIX, scope.name().toLowerCase());
       String nameStr = String.format("%s.%s", scopeStr, setting.getName());
       String optStr = String.format("%s.opt.", nameStr);
-      Map<String,String> optionConflicts = new TreeMap<String,String>();
+      Map<String,String> optionConflicts = new TreeMap<>();
       for (Entry<String,String> property : this.getProperties(tableName)) {
         if (property.getKey().startsWith(scopeStr)) {
           if (property.getKey().equals(nameStr))
@@ -157,8 +157,8 @@ public abstract class TableOperationsHelper implements TableOperations {
 
   @Override
   public int addConstraint(String tableName, String constraintClassName) throws AccumuloException, AccumuloSecurityException, TableNotFoundException {
-    TreeSet<Integer> constraintNumbers = new TreeSet<Integer>();
-    TreeMap<String,Integer> constraintClasses = new TreeMap<String,Integer>();
+    TreeSet<Integer> constraintNumbers = new TreeSet<>();
+    TreeMap<String,Integer> constraintClasses = new TreeMap<>();
     int i;
     for (Entry<String,String> property : this.getProperties(tableName)) {
       if (property.getKey().startsWith(Property.TABLE_CONSTRAINT_PREFIX.toString())) {
@@ -188,7 +188,7 @@ public abstract class TableOperationsHelper implements TableOperations {
 
   @Override
   public Map<String,Integer> listConstraints(String tableName) throws AccumuloException, TableNotFoundException {
-    Map<String,Integer> constraints = new TreeMap<String,Integer>();
+    Map<String,Integer> constraints = new TreeMap<>();
     for (Entry<String,String> property : this.getProperties(tableName)) {
       if (property.getKey().startsWith(Property.TABLE_CONSTRAINT_PREFIX.toString())) {
         if (constraints.containsKey(property.getValue()))

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java b/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java
index 1940a26..3d17a85 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java
@@ -148,7 +148,7 @@ public class TableOperationsImpl extends TableOperationsHelper {
       timer = new OpTimer().start();
     }
 
-    TreeSet<String> tableNames = new TreeSet<String>(Tables.getNameToIdMap(context.getInstance()).keySet());
+    TreeSet<String> tableNames = new TreeSet<>(Tables.getNameToIdMap(context.getInstance()).keySet());
 
     if (timer != null) {
       timer.stop();
@@ -378,7 +378,7 @@ public class TableOperationsImpl extends TableOperationsHelper {
           return;
 
         if (splits.size() <= 2) {
-          addSplits(env.tableName, new TreeSet<Text>(splits), env.tableId);
+          addSplits(env.tableName, new TreeSet<>(splits), env.tableId);
           for (int i = 0; i < splits.size(); i++)
             env.latch.countDown();
           return;
@@ -388,7 +388,7 @@ public class TableOperationsImpl extends TableOperationsHelper {
 
         // split the middle split point to ensure that child task split different tablets and can therefore
         // run in parallel
-        addSplits(env.tableName, new TreeSet<Text>(splits.subList(mid, mid + 1)), env.tableId);
+        addSplits(env.tableName, new TreeSet<>(splits.subList(mid, mid + 1)), env.tableId);
         env.latch.countDown();
 
         env.executor.submit(new SplitTask(env, splits.subList(0, mid)));
@@ -405,13 +405,13 @@ public class TableOperationsImpl extends TableOperationsHelper {
   public void addSplits(String tableName, SortedSet<Text> partitionKeys) throws TableNotFoundException, AccumuloException, AccumuloSecurityException {
     String tableId = Tables.getTableId(context.getInstance(), tableName);
 
-    List<Text> splits = new ArrayList<Text>(partitionKeys);
+    List<Text> splits = new ArrayList<>(partitionKeys);
     // should be sorted because we copied from a sorted set, but that makes assumptions about
     // how the copy was done so resort to be sure.
     Collections.sort(splits);
 
     CountDownLatch latch = new CountDownLatch(splits.size());
-    AtomicReference<Exception> exception = new AtomicReference<Exception>(null);
+    AtomicReference<Exception> exception = new AtomicReference<>(null);
 
     ExecutorService executor = Executors.newFixedThreadPool(16, new NamingThreadFactory("addSplits"));
     try {
@@ -529,7 +529,7 @@ public class TableOperationsImpl extends TableOperationsHelper {
     ByteBuffer EMPTY = ByteBuffer.allocate(0);
     List<ByteBuffer> args = Arrays.asList(ByteBuffer.wrap(tableName.getBytes(UTF_8)), start == null ? EMPTY : TextUtil.getByteBuffer(start),
         end == null ? EMPTY : TextUtil.getByteBuffer(end));
-    Map<String,String> opts = new HashMap<String,String>();
+    Map<String,String> opts = new HashMap<>();
     try {
       doTableFateOperation(tableName, TableNotFoundException.class, FateOperation.TABLE_MERGE, args, opts);
     } catch (TableExistsException e) {
@@ -545,7 +545,7 @@ public class TableOperationsImpl extends TableOperationsHelper {
     ByteBuffer EMPTY = ByteBuffer.allocate(0);
     List<ByteBuffer> args = Arrays.asList(ByteBuffer.wrap(tableName.getBytes(UTF_8)), start == null ? EMPTY : TextUtil.getByteBuffer(start),
         end == null ? EMPTY : TextUtil.getByteBuffer(end));
-    Map<String,String> opts = new HashMap<String,String>();
+    Map<String,String> opts = new HashMap<>();
     try {
       doTableFateOperation(tableName, TableNotFoundException.class, FateOperation.TABLE_DELETE_RANGE, args, opts);
     } catch (TableExistsException e) {
@@ -561,7 +561,7 @@ public class TableOperationsImpl extends TableOperationsHelper {
 
     String tableId = Tables.getTableId(context.getInstance(), tableName);
 
-    TreeMap<KeyExtent,String> tabletLocations = new TreeMap<KeyExtent,String>();
+    TreeMap<KeyExtent,String> tabletLocations = new TreeMap<>();
 
     while (true) {
       try {
@@ -585,7 +585,7 @@ public class TableOperationsImpl extends TableOperationsHelper {
       }
     }
 
-    ArrayList<Text> endRows = new ArrayList<Text>(tabletLocations.size());
+    ArrayList<Text> endRows = new ArrayList<>(tabletLocations.size());
 
     for (KeyExtent ke : tabletLocations.keySet())
       if (ke.getEndRow() != null)
@@ -614,7 +614,7 @@ public class TableOperationsImpl extends TableOperationsHelper {
     double r = (maxSplits + 1) / (double) (endRows.size());
     double pos = 0;
 
-    ArrayList<Text> subset = new ArrayList<Text>(maxSplits);
+    ArrayList<Text> subset = new ArrayList<>(maxSplits);
 
     int j = 0;
     for (int i = 0; i < endRows.size() && j < maxSplits; i++) {
@@ -644,7 +644,7 @@ public class TableOperationsImpl extends TableOperationsHelper {
     checkArgument(tableName != null, "tableName is null");
 
     List<ByteBuffer> args = Arrays.asList(ByteBuffer.wrap(tableName.getBytes(UTF_8)));
-    Map<String,String> opts = new HashMap<String,String>();
+    Map<String,String> opts = new HashMap<>();
 
     try {
       doTableFateOperation(tableName, TableNotFoundException.class, FateOperation.TABLE_DELETE, args, opts);
@@ -674,7 +674,7 @@ public class TableOperationsImpl extends TableOperationsHelper {
       propertiesToSet = Collections.emptyMap();
 
     List<ByteBuffer> args = Arrays.asList(ByteBuffer.wrap(srcTableId.getBytes(UTF_8)), ByteBuffer.wrap(newTableName.getBytes(UTF_8)));
-    Map<String,String> opts = new HashMap<String,String>();
+    Map<String,String> opts = new HashMap<>();
     for (Entry<String,String> entry : propertiesToSet.entrySet()) {
       if (entry.getKey().startsWith(CLONE_EXCLUDE_PREFIX))
         throw new IllegalArgumentException("Property can not start with " + CLONE_EXCLUDE_PREFIX);
@@ -693,7 +693,7 @@ public class TableOperationsImpl extends TableOperationsHelper {
       TableExistsException {
 
     List<ByteBuffer> args = Arrays.asList(ByteBuffer.wrap(oldTableName.getBytes(UTF_8)), ByteBuffer.wrap(newTableName.getBytes(UTF_8)));
-    Map<String,String> opts = new HashMap<String,String>();
+    Map<String,String> opts = new HashMap<>();
     doTableFateOperation(oldTableName, TableNotFoundException.class, FateOperation.TABLE_RENAME, args, opts);
   }
 
@@ -761,7 +761,7 @@ public class TableOperationsImpl extends TableOperationsHelper {
         : TextUtil.getByteBuffer(end), ByteBuffer.wrap(IteratorUtil.encodeIteratorSettings(config.getIterators())), ByteBuffer
         .wrap(CompactionStrategyConfigUtil.encode(config.getCompactionStrategy())));
 
-    Map<String,String> opts = new HashMap<String,String>();
+    Map<String,String> opts = new HashMap<>();
     try {
       doFateOperation(FateOperation.TABLE_COMPACT, args, opts, tableName, config.getWait());
     } catch (TableExistsException e) {
@@ -781,7 +781,7 @@ public class TableOperationsImpl extends TableOperationsHelper {
 
     List<ByteBuffer> args = Arrays.asList(ByteBuffer.wrap(tableId.getBytes(UTF_8)));
 
-    Map<String,String> opts = new HashMap<String,String>();
+    Map<String,String> opts = new HashMap<>();
     try {
       doTableFateOperation(tableName, TableNotFoundException.class, FateOperation.TABLE_CANCEL_COMPACT, args, opts);
     } catch (TableExistsException e) {
@@ -910,7 +910,7 @@ public class TableOperationsImpl extends TableOperationsHelper {
   @Override
   public void setLocalityGroups(String tableName, Map<String,Set<Text>> groups) throws AccumuloException, AccumuloSecurityException, TableNotFoundException {
     // ensure locality groups do not overlap
-    HashSet<Text> all = new HashSet<Text>();
+    HashSet<Text> all = new HashSet<>();
     for (Entry<String,Set<Text>> entry : groups.entrySet()) {
 
       if (!Collections.disjoint(all, entry.getValue())) {
@@ -956,10 +956,10 @@ public class TableOperationsImpl extends TableOperationsHelper {
     AccumuloConfiguration conf = new ConfigurationCopy(this.getProperties(tableName));
     Map<String,Set<ByteSequence>> groups = LocalityGroupUtil.getLocalityGroups(conf);
 
-    Map<String,Set<Text>> groups2 = new HashMap<String,Set<Text>>();
+    Map<String,Set<Text>> groups2 = new HashMap<>();
     for (Entry<String,Set<ByteSequence>> entry : groups.entrySet()) {
 
-      HashSet<Text> colFams = new HashSet<Text>();
+      HashSet<Text> colFams = new HashSet<>();
 
       for (ByteSequence bs : entry.getValue()) {
         colFams.add(new Text(bs.toArray()));
@@ -982,7 +982,7 @@ public class TableOperationsImpl extends TableOperationsHelper {
       return Collections.singleton(range);
 
     Random random = new Random();
-    Map<String,Map<KeyExtent,List<Range>>> binnedRanges = new HashMap<String,Map<KeyExtent,List<Range>>>();
+    Map<String,Map<KeyExtent,List<Range>>> binnedRanges = new HashMap<>();
     String tableId = Tables.getTableId(context.getInstance(), tableName);
     TabletLocator tl = TabletLocator.getLocator(context, tableId);
     // its possible that the cache could contain complete, but old information about a tables tablets... so clear it
@@ -1001,8 +1001,8 @@ public class TableOperationsImpl extends TableOperationsHelper {
     }
 
     // group key extents to get <= maxSplits
-    LinkedList<KeyExtent> unmergedExtents = new LinkedList<KeyExtent>();
-    List<KeyExtent> mergedExtents = new ArrayList<KeyExtent>();
+    LinkedList<KeyExtent> unmergedExtents = new LinkedList<>();
+    List<KeyExtent> mergedExtents = new ArrayList<>();
 
     for (Map<KeyExtent,List<Range>> map : binnedRanges.values())
       unmergedExtents.addAll(map.keySet());
@@ -1027,7 +1027,7 @@ public class TableOperationsImpl extends TableOperationsHelper {
 
     mergedExtents.addAll(unmergedExtents);
 
-    Set<Range> ranges = new HashSet<Range>();
+    Set<Range> ranges = new HashSet<>();
     for (KeyExtent k : mergedExtents)
       ranges.add(k.toDataRange().clip(range));
 
@@ -1079,7 +1079,7 @@ public class TableOperationsImpl extends TableOperationsHelper {
 
     List<ByteBuffer> args = Arrays.asList(ByteBuffer.wrap(tableName.getBytes(UTF_8)), ByteBuffer.wrap(dirPath.toString().getBytes(UTF_8)),
         ByteBuffer.wrap(failPath.toString().getBytes(UTF_8)), ByteBuffer.wrap((setTime + "").getBytes(UTF_8)));
-    Map<String,String> opts = new HashMap<String,String>();
+    Map<String,String> opts = new HashMap<>();
 
     try {
       doTableFateOperation(tableName, TableNotFoundException.class, FateOperation.TABLE_BULK_IMPORT, args, opts);
@@ -1126,7 +1126,7 @@ public class TableOperationsImpl extends TableOperationsHelper {
       int waitFor = 0;
       int holes = 0;
       Text continueRow = null;
-      MapCounter<String> serverCounts = new MapCounter<String>();
+      MapCounter<String> serverCounts = new MapCounter<>();
 
       while (rowIter.hasNext()) {
         Iterator<Entry<Key,Value>> row = rowIter.next();
@@ -1225,7 +1225,7 @@ public class TableOperationsImpl extends TableOperationsHelper {
     checkArgument(tableName != null, "tableName is null");
     String tableId = Tables.getTableId(context.getInstance(), tableName);
     List<ByteBuffer> args = Arrays.asList(ByteBuffer.wrap(tableId.getBytes(UTF_8)));
-    Map<String,String> opts = new HashMap<String,String>();
+    Map<String,String> opts = new HashMap<>();
 
     try {
       doTableFateOperation(tableName, TableNotFoundException.class, FateOperation.TABLE_OFFLINE, args, opts);
@@ -1248,7 +1248,7 @@ public class TableOperationsImpl extends TableOperationsHelper {
     checkArgument(tableName != null, "tableName is null");
     String tableId = Tables.getTableId(context.getInstance(), tableName);
     List<ByteBuffer> args = Arrays.asList(ByteBuffer.wrap(tableId.getBytes(UTF_8)));
-    Map<String,String> opts = new HashMap<String,String>();
+    Map<String,String> opts = new HashMap<>();
 
     try {
       doTableFateOperation(tableName, TableNotFoundException.class, FateOperation.TABLE_ONLINE, args, opts);
@@ -1322,16 +1322,16 @@ public class TableOperationsImpl extends TableOperationsHelper {
       }
     }
 
-    List<DiskUsage> finalUsages = new ArrayList<DiskUsage>();
+    List<DiskUsage> finalUsages = new ArrayList<>();
     for (TDiskUsage diskUsage : diskUsages) {
-      finalUsages.add(new DiskUsage(new TreeSet<String>(diskUsage.getTables()), diskUsage.getUsage()));
+      finalUsages.add(new DiskUsage(new TreeSet<>(diskUsage.getTables()), diskUsage.getUsage()));
     }
 
     return finalUsages;
   }
 
   public static Map<String,String> getExportedProps(FileSystem fs, Path path) throws IOException {
-    HashMap<String,String> props = new HashMap<String,String>();
+    HashMap<String,String> props = new HashMap<>();
 
     ZipInputStream zis = new ZipInputStream(fs.open(path));
     try {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/impl/Tables.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/Tables.java b/core/src/main/java/org/apache/accumulo/core/client/impl/Tables.java
index cf388bf..9f869ff 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/Tables.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/Tables.java
@@ -60,8 +60,8 @@ public class Tables {
     ZooCache zc = getZooCache(instance);
 
     List<String> tableIds = zc.getChildren(ZooUtil.getRoot(instance) + Constants.ZTABLES);
-    TreeMap<String,String> tableMap = new TreeMap<String,String>();
-    Map<String,String> namespaceIdToNameMap = new HashMap<String,String>();
+    TreeMap<String,String> tableMap = new TreeMap<>();
+    Map<String,String> namespaceIdToNameMap = new HashMap<>();
 
     for (String tableId : tableIds) {
       byte[] tableName = zc.get(ZooUtil.getRoot(instance) + Constants.ZTABLES + "/" + tableId + Constants.ZTABLE_NAME);
@@ -211,9 +211,9 @@ public class Tables {
       tableName = MetadataTable.NAME;
     if (tableName.contains(".")) {
       String[] s = tableName.split("\\.", 2);
-      return new Pair<String,String>(s[0], s[1]);
+      return new Pair<>(s[0], s[1]);
     }
-    return new Pair<String,String>(defaultNamespace, tableName);
+    return new Pair<>(defaultNamespace, tableName);
   }
 
   /**

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/impl/TabletLocator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/TabletLocator.java b/core/src/main/java/org/apache/accumulo/core/client/impl/TabletLocator.java
index 6054c19..9229643 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/TabletLocator.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/TabletLocator.java
@@ -99,7 +99,7 @@ public abstract class TabletLocator {
 
   }
 
-  private static HashMap<LocatorKey,TabletLocator> locators = new HashMap<LocatorKey,TabletLocator>();
+  private static HashMap<LocatorKey,TabletLocator> locators = new HashMap<>();
 
   public static synchronized void clearLocators() {
     for (TabletLocator locator : locators.values()) {
@@ -148,7 +148,7 @@ public abstract class TabletLocator {
   }
 
   public static class TabletLocation implements Comparable<TabletLocation> {
-    private static final WeakHashMap<String,WeakReference<String>> tabletLocs = new WeakHashMap<String,WeakReference<String>>();
+    private static final WeakHashMap<String,WeakReference<String>> tabletLocs = new WeakHashMap<>();
 
     private static String dedupeLocation(String tabletLoc) {
       synchronized (tabletLocs) {
@@ -160,7 +160,7 @@ public abstract class TabletLocator {
           }
         }
 
-        tabletLocs.put(tabletLoc, new WeakReference<String>(tabletLoc));
+        tabletLocs.put(tabletLoc, new WeakReference<>(tabletLoc));
         return tabletLoc;
       }
     }
@@ -215,13 +215,13 @@ public abstract class TabletLocator {
 
     public TabletServerMutations(String tserverSession) {
       this.tserverSession = tserverSession;
-      this.mutations = new HashMap<KeyExtent,List<T>>();
+      this.mutations = new HashMap<>();
     }
 
     public void addMutation(KeyExtent ke, T m) {
       List<T> mutList = mutations.get(ke);
       if (mutList == null) {
-        mutList = new ArrayList<T>();
+        mutList = new ArrayList<>();
         mutations.put(ke, mutList);
       }
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/impl/TabletLocatorImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/TabletLocatorImpl.java b/core/src/main/java/org/apache/accumulo/core/client/impl/TabletLocatorImpl.java
index 1422b0c..5932fda 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/TabletLocatorImpl.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/TabletLocatorImpl.java
@@ -90,12 +90,12 @@ public class TabletLocatorImpl extends TabletLocator {
 
   protected String tableId;
   protected TabletLocator parent;
-  protected TreeMap<Text,TabletLocation> metaCache = new TreeMap<Text,TabletLocation>(endRowComparator);
+  protected TreeMap<Text,TabletLocation> metaCache = new TreeMap<>(endRowComparator);
   protected TabletLocationObtainer locationObtainer;
   private TabletServerLockChecker lockChecker;
   protected Text lastTabletRow;
 
-  private TreeSet<KeyExtent> badExtents = new TreeSet<KeyExtent>();
+  private TreeSet<KeyExtent> badExtents = new TreeSet<>();
   private ReentrantReadWriteLock rwLock = new ReentrantReadWriteLock();
   private final Lock rLock = rwLock.readLock();
   private final Lock wLock = rwLock.writeLock();
@@ -119,8 +119,8 @@ public class TabletLocatorImpl extends TabletLocator {
 
   private class LockCheckerSession {
 
-    private HashSet<Pair<String,String>> okLocks = new HashSet<Pair<String,String>>();
-    private HashSet<Pair<String,String>> invalidLocks = new HashSet<Pair<String,String>>();
+    private HashSet<Pair<String,String>> okLocks = new HashSet<>();
+    private HashSet<Pair<String,String>> invalidLocks = new HashSet<>();
 
     private TabletLocation checkLock(TabletLocation tl) {
       // the goal of this class is to minimize calls out to lockChecker under that assumption that its a resource synchronized among many threads... want to
@@ -130,7 +130,7 @@ public class TabletLocatorImpl extends TabletLocator {
       if (tl == null)
         return null;
 
-      Pair<String,String> lock = new Pair<String,String>(tl.tablet_location, tl.tablet_session);
+      Pair<String,String> lock = new Pair<>(tl.tablet_location, tl.tablet_session);
 
       if (okLocks.contains(lock))
         return tl;
@@ -173,7 +173,7 @@ public class TabletLocatorImpl extends TabletLocator {
       timer = new OpTimer().start();
     }
 
-    ArrayList<T> notInCache = new ArrayList<T>();
+    ArrayList<T> notInCache = new ArrayList<>();
     Text row = new Text();
 
     LockCheckerSession lcSession = new LockCheckerSession();
@@ -247,7 +247,7 @@ public class TabletLocatorImpl extends TabletLocator {
       // do lock check once per tserver here to make binning faster
       boolean lockHeld = lcSession.checkLock(tl) != null;
       if (lockHeld) {
-        tsm = new TabletServerMutations<T>(tl.tablet_session);
+        tsm = new TabletServerMutations<>(tl.tablet_session);
         binnedMutations.put(tl.tablet_location, tsm);
       } else {
         return false;
@@ -265,8 +265,8 @@ public class TabletLocatorImpl extends TabletLocator {
 
   private List<Range> binRanges(ClientContext context, List<Range> ranges, Map<String,Map<KeyExtent,List<Range>>> binnedRanges, boolean useCache,
       LockCheckerSession lcSession) throws AccumuloException, AccumuloSecurityException, TableNotFoundException {
-    List<Range> failures = new ArrayList<Range>();
-    List<TabletLocation> tabletLocations = new ArrayList<TabletLocation>();
+    List<Range> failures = new ArrayList<>();
+    List<TabletLocation> tabletLocations = new ArrayList<>();
 
     boolean lookupFailed = false;
 
@@ -676,7 +676,7 @@ public class TabletLocatorImpl extends TabletLocator {
           return;
       }
 
-      List<Range> lookups = new ArrayList<Range>(badExtents.size());
+      List<Range> lookups = new ArrayList<>(badExtents.size());
 
       for (KeyExtent be : badExtents) {
         lookups.add(be.toMetadataRange());
@@ -685,12 +685,12 @@ public class TabletLocatorImpl extends TabletLocator {
 
       lookups = Range.mergeOverlapping(lookups);
 
-      Map<String,Map<KeyExtent,List<Range>>> binnedRanges = new HashMap<String,Map<KeyExtent,List<Range>>>();
+      Map<String,Map<KeyExtent,List<Range>>> binnedRanges = new HashMap<>();
 
       parent.binRanges(context, lookups, binnedRanges);
 
       // randomize server order
-      ArrayList<String> tabletServers = new ArrayList<String>(binnedRanges.keySet());
+      ArrayList<String> tabletServers = new ArrayList<>(binnedRanges.keySet());
       Collections.shuffle(tabletServers);
 
       for (String tserver : tabletServers) {
@@ -711,13 +711,13 @@ public class TabletLocatorImpl extends TabletLocator {
   protected static void addRange(Map<String,Map<KeyExtent,List<Range>>> binnedRanges, String location, KeyExtent ke, Range range) {
     Map<KeyExtent,List<Range>> tablets = binnedRanges.get(location);
     if (tablets == null) {
-      tablets = new HashMap<KeyExtent,List<Range>>();
+      tablets = new HashMap<>();
       binnedRanges.put(location, tablets);
     }
 
     List<Range> tabletsRanges = tablets.get(ke);
     if (tabletsRanges == null) {
-      tabletsRanges = new ArrayList<Range>();
+      tabletsRanges = new ArrayList<>();
       tablets.put(ke, tabletsRanges);
     }
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReader.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReader.java b/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReader.java
index ce28f8b..0d4909b 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReader.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReader.java
@@ -98,7 +98,7 @@ public class TabletServerBatchReader extends ScannerOptions implements BatchScan
       throw new IllegalStateException("batch reader closed");
     }
 
-    this.ranges = new ArrayList<Range>(ranges);
+    this.ranges = new ArrayList<>(ranges);
 
   }
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java b/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java
index baeb2c9..8796d3c 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java
@@ -90,7 +90,7 @@ public class TabletServerBatchReaderIterator implements Iterator<Entry<Key,Value
   private ArrayBlockingQueue<List<Entry<Key,Value>>> resultsQueue;
   private Iterator<Entry<Key,Value>> batchIterator;
   private List<Entry<Key,Value>> batch;
-  private static final List<Entry<Key,Value>> LAST_BATCH = new ArrayList<Map.Entry<Key,Value>>();
+  private static final List<Entry<Key,Value>> LAST_BATCH = new ArrayList<>();
   private final Object nextLock = new Object();
 
   private long failSleepTime = 100;
@@ -117,7 +117,7 @@ public class TabletServerBatchReaderIterator implements Iterator<Entry<Key,Value
     this.numThreads = numThreads;
     this.queryThreadPool = queryThreadPool;
     this.options = new ScannerOptions(scannerOptions);
-    resultsQueue = new ArrayBlockingQueue<List<Entry<Key,Value>>>(numThreads);
+    resultsQueue = new ArrayBlockingQueue<>(numThreads);
 
     this.locator = new TimeoutTabletLocator(timeout, context, tableId);
 
@@ -126,7 +126,7 @@ public class TabletServerBatchReaderIterator implements Iterator<Entry<Key,Value
     this.timeout = timeout;
 
     if (options.fetchedColumns.size() > 0) {
-      ArrayList<Range> ranges2 = new ArrayList<Range>(ranges.size());
+      ArrayList<Range> ranges2 = new ArrayList<>(ranges.size());
       for (Range range : ranges) {
         ranges2.add(range.bound(options.fetchedColumns.first(), options.fetchedColumns.last()));
       }
@@ -215,10 +215,10 @@ public class TabletServerBatchReaderIterator implements Iterator<Entry<Key,Value
   }
 
   private synchronized void lookup(List<Range> ranges, ResultReceiver receiver) throws AccumuloException, AccumuloSecurityException, TableNotFoundException {
-    List<Column> columns = new ArrayList<Column>(options.fetchedColumns);
+    List<Column> columns = new ArrayList<>(options.fetchedColumns);
     ranges = Range.mergeOverlapping(ranges);
 
-    Map<String,Map<KeyExtent,List<Range>>> binnedRanges = new HashMap<String,Map<KeyExtent,List<Range>>>();
+    Map<String,Map<KeyExtent,List<Range>>> binnedRanges = new HashMap<>();
 
     binRanges(locator, ranges, binnedRanges);
 
@@ -264,13 +264,13 @@ public class TabletServerBatchReaderIterator implements Iterator<Entry<Key,Value
 
     // truncate the ranges to within the tablets... this makes it easier to know what work
     // needs to be redone when failures occurs and tablets have merged or split
-    Map<String,Map<KeyExtent,List<Range>>> binnedRanges2 = new HashMap<String,Map<KeyExtent,List<Range>>>();
+    Map<String,Map<KeyExtent,List<Range>>> binnedRanges2 = new HashMap<>();
     for (Entry<String,Map<KeyExtent,List<Range>>> entry : binnedRanges.entrySet()) {
-      Map<KeyExtent,List<Range>> tabletMap = new HashMap<KeyExtent,List<Range>>();
+      Map<KeyExtent,List<Range>> tabletMap = new HashMap<>();
       binnedRanges2.put(entry.getKey(), tabletMap);
       for (Entry<KeyExtent,List<Range>> tabletRanges : entry.getValue().entrySet()) {
         Range tabletRange = tabletRanges.getKey().toDataRange();
-        List<Range> clippedRanges = new ArrayList<Range>();
+        List<Range> clippedRanges = new ArrayList<>();
         tabletMap.put(tabletRanges.getKey(), clippedRanges);
         for (Range range : tabletRanges.getValue())
           clippedRanges.add(tabletRange.clip(range));
@@ -298,8 +298,8 @@ public class TabletServerBatchReaderIterator implements Iterator<Entry<Key,Value
 
     failSleepTime = Math.min(5000, failSleepTime * 2);
 
-    Map<String,Map<KeyExtent,List<Range>>> binnedRanges = new HashMap<String,Map<KeyExtent,List<Range>>>();
-    List<Range> allRanges = new ArrayList<Range>();
+    Map<String,Map<KeyExtent,List<Range>>> binnedRanges = new HashMap<>();
+    List<Range> allRanges = new ArrayList<>();
 
     for (List<Range> ranges : failures.values())
       allRanges.addAll(ranges);
@@ -342,8 +342,8 @@ public class TabletServerBatchReaderIterator implements Iterator<Entry<Key,Value
     public void run() {
       String threadName = Thread.currentThread().getName();
       Thread.currentThread().setName(threadName + " looking up " + tabletsRanges.size() + " ranges at " + tsLocation);
-      Map<KeyExtent,List<Range>> unscanned = new HashMap<KeyExtent,List<Range>>();
-      Map<KeyExtent,List<Range>> tsFailures = new HashMap<KeyExtent,List<Range>>();
+      Map<KeyExtent,List<Range>> unscanned = new HashMap<>();
+      Map<KeyExtent,List<Range>> tsFailures = new HashMap<>();
       try {
         TimeoutTracker timeoutTracker = timeoutTrackers.get(tsLocation);
         if (timeoutTracker == null) {
@@ -462,7 +462,7 @@ public class TabletServerBatchReaderIterator implements Iterator<Entry<Key,Value
 
     }
 
-    Map<KeyExtent,List<Range>> failures = new HashMap<KeyExtent,List<Range>>();
+    Map<KeyExtent,List<Range>> failures = new HashMap<>();
 
     if (timedoutServers.size() > 0) {
       // go ahead and fail any timed out servers
@@ -477,10 +477,10 @@ public class TabletServerBatchReaderIterator implements Iterator<Entry<Key,Value
 
     // randomize tabletserver order... this will help when there are multiple
     // batch readers and writers running against accumulo
-    List<String> locations = new ArrayList<String>(binnedRanges.keySet());
+    List<String> locations = new ArrayList<>(binnedRanges.keySet());
     Collections.shuffle(locations);
 
-    List<QueryTask> queryTasks = new ArrayList<QueryTask>();
+    List<QueryTask> queryTasks = new ArrayList<>();
 
     for (final String tsLocation : locations) {
 
@@ -489,13 +489,13 @@ public class TabletServerBatchReaderIterator implements Iterator<Entry<Key,Value
         QueryTask queryTask = new QueryTask(tsLocation, tabletsRanges, failures, receiver, columns);
         queryTasks.add(queryTask);
       } else {
-        HashMap<KeyExtent,List<Range>> tabletSubset = new HashMap<KeyExtent,List<Range>>();
+        HashMap<KeyExtent,List<Range>> tabletSubset = new HashMap<>();
         for (Entry<KeyExtent,List<Range>> entry : tabletsRanges.entrySet()) {
           tabletSubset.put(entry.getKey(), entry.getValue());
           if (tabletSubset.size() >= maxTabletsPerRequest) {
             QueryTask queryTask = new QueryTask(tsLocation, tabletSubset, failures, receiver, columns);
             queryTasks.add(queryTask);
-            tabletSubset = new HashMap<KeyExtent,List<Range>>();
+            tabletSubset = new HashMap<>();
           }
         }
 
@@ -518,13 +518,12 @@ public class TabletServerBatchReaderIterator implements Iterator<Entry<Key,Value
   static void trackScanning(Map<KeyExtent,List<Range>> failures, Map<KeyExtent,List<Range>> unscanned, MultiScanResult scanResult) {
 
     // translate returned failures, remove them from unscanned, and add them to failures
-    Map<KeyExtent,List<Range>> retFailures = Translator.translate(scanResult.failures, Translators.TKET, new Translator.ListTranslator<TRange,Range>(
-        Translators.TRT));
+    Map<KeyExtent,List<Range>> retFailures = Translator.translate(scanResult.failures, Translators.TKET, new Translator.ListTranslator<>(Translators.TRT));
     unscanned.keySet().removeAll(retFailures.keySet());
     failures.putAll(retFailures);
 
     // translate full scans and remove them from unscanned
-    HashSet<KeyExtent> fullScans = new HashSet<KeyExtent>(Translator.translate(scanResult.fullScans, Translators.TKET));
+    HashSet<KeyExtent> fullScans = new HashSet<>(Translator.translate(scanResult.fullScans, Translators.TKET));
     unscanned.keySet().removeAll(fullScans);
 
     // remove partial scan from unscanned
@@ -612,7 +611,7 @@ public class TabletServerBatchReaderIterator implements Iterator<Entry<Key,Value
 
     // copy requested to unscanned map. we will remove ranges as they are scanned in trackScanning()
     for (Entry<KeyExtent,List<Range>> entry : requested.entrySet()) {
-      ArrayList<Range> ranges = new ArrayList<Range>();
+      ArrayList<Range> ranges = new ArrayList<>();
       for (Range range : entry.getValue()) {
         ranges.add(new Range(range));
       }
@@ -643,8 +642,7 @@ public class TabletServerBatchReaderIterator implements Iterator<Entry<Key,Value
         TabletType ttype = TabletType.type(requested.keySet());
         boolean waitForWrites = !ThriftScanner.serversWaitedForWrites.get(ttype).contains(server);
 
-        Map<TKeyExtent,List<TRange>> thriftTabletRanges = Translator.translate(requested, Translators.KET, new Translator.ListTranslator<Range,TRange>(
-            Translators.RT));
+        Map<TKeyExtent,List<TRange>> thriftTabletRanges = Translator.translate(requested, Translators.KET, new Translator.ListTranslator<>(Translators.RT));
         InitialMultiScan imsr = client.startMultiScan(Tracer.traceInfo(), context.rpcCreds(), thriftTabletRanges,
             Translator.translate(columns, Translators.CT), options.serverSideIteratorList, options.serverSideIteratorOptions,
             ByteBufferUtil.toByteBuffers(authorizations.getAuthorizations()), waitForWrites,
@@ -660,9 +658,9 @@ public class TabletServerBatchReaderIterator implements Iterator<Entry<Key,Value
               (scanResult.more ? "scanID=" + imsr.scanID : ""), String.format("%.3f secs", timer.scale(TimeUnit.SECONDS)));
         }
 
-        ArrayList<Entry<Key,Value>> entries = new ArrayList<Map.Entry<Key,Value>>(scanResult.results.size());
+        ArrayList<Entry<Key,Value>> entries = new ArrayList<>(scanResult.results.size());
         for (TKeyValue kv : scanResult.results) {
-          entries.add(new SimpleImmutableEntry<Key,Value>(new Key(kv.key), new Value(kv.value)));
+          entries.add(new SimpleImmutableEntry<>(new Key(kv.key), new Value(kv.value)));
         }
 
         if (entries.size() > 0)
@@ -692,9 +690,9 @@ public class TabletServerBatchReaderIterator implements Iterator<Entry<Key,Value
                 scanResult.results.size(), (scanResult.more ? " scanID=" + imsr.scanID : ""), String.format("%.3f secs", timer.scale(TimeUnit.SECONDS)));
           }
 
-          entries = new ArrayList<Map.Entry<Key,Value>>(scanResult.results.size());
+          entries = new ArrayList<>(scanResult.results.size());
           for (TKeyValue kv : scanResult.results) {
-            entries.add(new SimpleImmutableEntry<Key,Value>(new Key(kv.key), new Value(kv.value)));
+            entries.add(new SimpleImmutableEntry<>(new Key(kv.key), new Value(kv.value)));
           }
 
           if (entries.size() > 0)

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java b/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java
index 92f90a3..4df2db6 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java
@@ -150,8 +150,8 @@ public class TabletServerBatchWriter {
 
   // error handling
   private final Violations violations = new Violations();
-  private final Map<KeyExtent,Set<SecurityErrorCode>> authorizationFailures = new HashMap<KeyExtent,Set<SecurityErrorCode>>();
-  private final HashSet<String> serverSideErrors = new HashSet<String>();
+  private final Map<KeyExtent,Set<SecurityErrorCode>> authorizationFailures = new HashMap<>();
+  private final HashSet<String> serverSideErrors = new HashSet<>();
   private final FailedMutations failedMutations = new FailedMutations();
   private int unknownErrors = 0;
   private boolean somethingFailed = false;
@@ -503,7 +503,7 @@ public class TabletServerBatchWriter {
   }
 
   private void updateAuthorizationFailures(Set<KeyExtent> keySet, SecurityErrorCode code) {
-    HashMap<KeyExtent,SecurityErrorCode> map = new HashMap<KeyExtent,SecurityErrorCode>();
+    HashMap<KeyExtent,SecurityErrorCode> map = new HashMap<>();
     for (KeyExtent ke : keySet)
       map.put(ke, code);
 
@@ -514,7 +514,7 @@ public class TabletServerBatchWriter {
     if (authorizationFailures.size() > 0) {
 
       // was a table deleted?
-      HashSet<String> tableIds = new HashSet<String>();
+      HashSet<String> tableIds = new HashSet<>();
       for (KeyExtent ke : authorizationFailures.keySet())
         tableIds.add(ke.getTableId());
 
@@ -535,7 +535,7 @@ public class TabletServerBatchWriter {
     for (Entry<KeyExtent,SecurityErrorCode> entry : addition.entrySet()) {
       Set<SecurityErrorCode> secs = source.get(entry.getKey());
       if (secs == null) {
-        secs = new HashSet<SecurityErrorCode>();
+        secs = new HashSet<>();
         source.put(entry.getKey(), secs);
       }
       secs.add(entry.getValue());
@@ -563,9 +563,9 @@ public class TabletServerBatchWriter {
   private void checkForFailures() throws MutationsRejectedException {
     if (somethingFailed) {
       List<ConstraintViolationSummary> cvsList = violations.asList();
-      HashMap<TabletId,Set<org.apache.accumulo.core.client.security.SecurityErrorCode>> af = new HashMap<TabletId,Set<org.apache.accumulo.core.client.security.SecurityErrorCode>>();
+      HashMap<TabletId,Set<org.apache.accumulo.core.client.security.SecurityErrorCode>> af = new HashMap<>();
       for (Entry<KeyExtent,Set<SecurityErrorCode>> entry : authorizationFailures.entrySet()) {
-        HashSet<org.apache.accumulo.core.client.security.SecurityErrorCode> codes = new HashSet<org.apache.accumulo.core.client.security.SecurityErrorCode>();
+        HashSet<org.apache.accumulo.core.client.security.SecurityErrorCode> codes = new HashSet<>();
 
         for (SecurityErrorCode sce : entry.getValue()) {
           codes.add(org.apache.accumulo.core.client.security.SecurityErrorCode.valueOf(sce.name()));
@@ -663,10 +663,10 @@ public class TabletServerBatchWriter {
     private final Map<String,TabletLocator> locators;
 
     public MutationWriter(int numSendThreads) {
-      serversMutations = new HashMap<String,TabletServerMutations<Mutation>>();
-      queued = new HashSet<String>();
+      serversMutations = new HashMap<>();
+      queued = new HashSet<>();
       sendThreadPool = new SimpleThreadPool(numSendThreads, this.getClass().getName());
-      locators = new HashMap<String,TabletLocator>();
+      locators = new HashMap<>();
       binningThreadPool = new SimpleThreadPool(1, "BinMutations", new SynchronousQueue<Runnable>());
       binningThreadPool.setRejectedExecutionHandler(new ThreadPoolExecutor.CallerRunsPolicy());
     }
@@ -693,7 +693,7 @@ public class TabletServerBatchWriter {
           List<Mutation> tableMutations = entry.getValue();
 
           if (tableMutations != null) {
-            ArrayList<Mutation> tableFailures = new ArrayList<Mutation>();
+            ArrayList<Mutation> tableFailures = new ArrayList<>();
             locator.binMutations(context, tableMutations, binnedMutations, tableFailures);
 
             if (tableFailures.size() > 0) {
@@ -749,7 +749,7 @@ public class TabletServerBatchWriter {
     }
 
     private void addMutations(MutationSet mutationsToSend) {
-      Map<String,TabletServerMutations<Mutation>> binnedMutations = new HashMap<String,TabletServerMutations<Mutation>>();
+      Map<String,TabletServerMutations<Mutation>> binnedMutations = new HashMap<>();
       Span span = Trace.start("binMutations");
       try {
         long t1 = System.currentTimeMillis();
@@ -792,7 +792,7 @@ public class TabletServerBatchWriter {
         log.trace(String.format("Started sending %,d mutations to %,d tablet servers", count, binnedMutations.keySet().size()));
 
       // randomize order of servers
-      ArrayList<String> servers = new ArrayList<String>(binnedMutations.keySet());
+      ArrayList<String> servers = new ArrayList<>(binnedMutations.keySet());
       Collections.shuffle(servers);
 
       for (String server : servers)
@@ -893,7 +893,7 @@ public class TabletServerBatchWriter {
           if (log.isTraceEnabled())
             log.trace("failed to send mutations to {} : {}", location, e.getMessage());
 
-          HashSet<String> tables = new HashSet<String>();
+          HashSet<String> tables = new HashSet<>();
           for (KeyExtent ke : mutationBatch.keySet())
             tables.add(ke.getTableId());
 
@@ -944,7 +944,7 @@ public class TabletServerBatchWriter {
 
             long usid = client.startUpdate(tinfo, context.rpcCreds(), DurabilityImpl.toThrift(durability));
 
-            List<TMutation> updates = new ArrayList<TMutation>();
+            List<TMutation> updates = new ArrayList<>();
             for (Entry<KeyExtent,List<Mutation>> entry : tabMuts.entrySet()) {
               long size = 0;
               Iterator<Mutation> iter = entry.getValue().iterator();
@@ -1019,13 +1019,13 @@ public class TabletServerBatchWriter {
     private int memoryUsed = 0;
 
     MutationSet() {
-      mutations = new HashMap<String,List<Mutation>>();
+      mutations = new HashMap<>();
     }
 
     void addMutation(String table, Mutation mutation) {
       List<Mutation> tabMutList = mutations.get(table);
       if (tabMutList == null) {
-        tabMutList = new ArrayList<Mutation>();
+        tabMutList = new ArrayList<>();
         mutations.put(table, tabMutList);
       }
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/impl/ThriftScanner.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/ThriftScanner.java b/core/src/main/java/org/apache/accumulo/core/client/impl/ThriftScanner.java
index 9a7f782..91b2637 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/ThriftScanner.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/ThriftScanner.java
@@ -75,7 +75,7 @@ import com.google.common.net.HostAndPort;
 public class ThriftScanner {
   private static final Logger log = LoggerFactory.getLogger(ThriftScanner.class);
 
-  public static final Map<TabletType,Set<String>> serversWaitedForWrites = new EnumMap<TabletType,Set<String>>(TabletType.class);
+  public static final Map<TabletType,Set<String>> serversWaitedForWrites = new EnumMap<>(TabletType.class);
 
   static {
     for (TabletType ttype : TabletType.values()) {
@@ -171,7 +171,7 @@ public class ThriftScanner {
       this.authorizations = authorizations;
       this.classLoaderContext = classLoaderContext;
 
-      columns = new ArrayList<Column>(fetchedColumns.size());
+      columns = new ArrayList<>(fetchedColumns.size());
       for (Column column : fetchedColumns) {
         columns.add(column);
       }
@@ -498,7 +498,7 @@ public class ThriftScanner {
       if (sr.results.size() > 0 && !scanState.finished)
         scanState.range = new Range(new Key(sr.results.get(sr.results.size() - 1).key), false, scanState.range.getEndKey(), scanState.range.isEndKeyInclusive());
 
-      List<KeyValue> results = new ArrayList<KeyValue>(sr.results.size());
+      List<KeyValue> results = new ArrayList<>(sr.results.size());
       for (TKeyValue tkv : sr.results)
         results.add(new KeyValue(new Key(tkv.key), tkv.value));
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/impl/ThriftTransportPool.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/ThriftTransportPool.java b/core/src/main/java/org/apache/accumulo/core/client/impl/ThriftTransportPool.java
index ba62cec..682ecbd 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/ThriftTransportPool.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/ThriftTransportPool.java
@@ -48,10 +48,10 @@ public class ThriftTransportPool {
   private static final Random random = new Random();
   private long killTime = 1000 * 3;
 
-  private Map<ThriftTransportKey,List<CachedConnection>> cache = new HashMap<ThriftTransportKey,List<CachedConnection>>();
-  private Map<ThriftTransportKey,Long> errorCount = new HashMap<ThriftTransportKey,Long>();
-  private Map<ThriftTransportKey,Long> errorTime = new HashMap<ThriftTransportKey,Long>();
-  private Set<ThriftTransportKey> serversWarnedAbout = new HashSet<ThriftTransportKey>();
+  private Map<ThriftTransportKey,List<CachedConnection>> cache = new HashMap<>();
+  private Map<ThriftTransportKey,Long> errorCount = new HashMap<>();
+  private Map<ThriftTransportKey,Long> errorTime = new HashMap<>();
+  private Set<ThriftTransportKey> serversWarnedAbout = new HashSet<>();
 
   private CountDownLatch closerExitLatch;
 
@@ -95,7 +95,7 @@ public class ThriftTransportPool {
     private void closeConnections() {
       while (true) {
 
-        ArrayList<CachedConnection> connectionsToClose = new ArrayList<CachedConnection>();
+        ArrayList<CachedConnection> connectionsToClose = new ArrayList<>();
 
         synchronized (pool) {
           for (List<CachedConnection> ccl : pool.getCache().values()) {
@@ -394,7 +394,7 @@ public class ThriftTransportPool {
       List<CachedConnection> ccl = getCache().get(cacheKey);
 
       if (ccl == null) {
-        ccl = new LinkedList<CachedConnection>();
+        ccl = new LinkedList<>();
         getCache().put(cacheKey, ccl);
       }
 
@@ -413,10 +413,10 @@ public class ThriftTransportPool {
   @VisibleForTesting
   public Pair<String,TTransport> getAnyTransport(List<ThriftTransportKey> servers, boolean preferCachedConnection) throws TTransportException {
 
-    servers = new ArrayList<ThriftTransportKey>(servers);
+    servers = new ArrayList<>(servers);
 
     if (preferCachedConnection) {
-      HashSet<ThriftTransportKey> serversSet = new HashSet<ThriftTransportKey>(servers);
+      HashSet<ThriftTransportKey> serversSet = new HashSet<>(servers);
 
       synchronized (this) {
 
@@ -424,7 +424,7 @@ public class ThriftTransportPool {
         serversSet.retainAll(getCache().keySet());
 
         if (serversSet.size() > 0) {
-          ArrayList<ThriftTransportKey> cachedServers = new ArrayList<ThriftTransportKey>(serversSet);
+          ArrayList<ThriftTransportKey> cachedServers = new ArrayList<>(serversSet);
           Collections.shuffle(cachedServers, random);
 
           for (ThriftTransportKey ttk : cachedServers) {
@@ -463,7 +463,7 @@ public class ThriftTransportPool {
       }
 
       try {
-        return new Pair<String,TTransport>(ttk.getServer().toString(), createNewTransport(ttk));
+        return new Pair<>(ttk.getServer().toString(), createNewTransport(ttk));
       } catch (TTransportException tte) {
         log.debug("Failed to connect to {}", servers.get(index), tte);
         servers.remove(index);
@@ -490,7 +490,7 @@ public class ThriftTransportPool {
         List<CachedConnection> ccl = getCache().get(cacheKey);
 
         if (ccl == null) {
-          ccl = new LinkedList<CachedConnection>();
+          ccl = new LinkedList<>();
           getCache().put(cacheKey, ccl);
         }
 
@@ -511,7 +511,7 @@ public class ThriftTransportPool {
     boolean existInCache = false;
     CachedTTransport ctsc = (CachedTTransport) tsc;
 
-    ArrayList<CachedConnection> closeList = new ArrayList<ThriftTransportPool.CachedConnection>();
+    ArrayList<CachedConnection> closeList = new ArrayList<>();
 
     synchronized (this) {
       List<CachedConnection> ccl = getCache().get(ctsc.getCacheKey());

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/impl/Translator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/Translator.java b/core/src/main/java/org/apache/accumulo/core/client/impl/Translator.java
index e5141cf..00c43ac 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/Translator.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/Translator.java
@@ -111,7 +111,7 @@ public abstract class Translator<IT,OT> {
   }
 
   public static <IKT,OKT,T> Map<OKT,T> translate(Map<IKT,T> input, Translator<IKT,OKT> keyTranslator) {
-    HashMap<OKT,T> output = new HashMap<OKT,T>();
+    HashMap<OKT,T> output = new HashMap<>();
 
     for (Entry<IKT,T> entry : input.entrySet())
       output.put(keyTranslator.translate(entry.getKey()), entry.getValue());
@@ -120,7 +120,7 @@ public abstract class Translator<IT,OT> {
   }
 
   public static <IKT,OKT,IVT,OVT> Map<OKT,OVT> translate(Map<IKT,IVT> input, Translator<IKT,OKT> keyTranslator, Translator<IVT,OVT> valueTranslator) {
-    HashMap<OKT,OVT> output = new HashMap<OKT,OVT>();
+    HashMap<OKT,OVT> output = new HashMap<>();
 
     for (Entry<IKT,IVT> entry : input.entrySet())
       output.put(keyTranslator.translate(entry.getKey()), valueTranslator.translate(entry.getValue()));
@@ -129,7 +129,7 @@ public abstract class Translator<IT,OT> {
   }
 
   public static <IT,OT> List<OT> translate(Collection<IT> input, Translator<IT,OT> translator) {
-    ArrayList<OT> output = new ArrayList<OT>(input.size());
+    ArrayList<OT> output = new ArrayList<>(input.size());
 
     for (IT in : input)
       output.add(translator.translate(in));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/lexicoder/BigIntegerLexicoder.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/BigIntegerLexicoder.java b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/BigIntegerLexicoder.java
index 8147f18..669d070 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/BigIntegerLexicoder.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/BigIntegerLexicoder.java
@@ -16,22 +16,22 @@
  */
 package org.apache.accumulo.core.client.lexicoder;
 
-import org.apache.accumulo.core.client.lexicoder.impl.AbstractLexicoder;
-import org.apache.accumulo.core.client.lexicoder.impl.FixedByteArrayOutputStream;
-import org.apache.accumulo.core.iterators.ValueFormatException;
-
 import java.io.ByteArrayInputStream;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 import java.math.BigInteger;
 
+import org.apache.accumulo.core.client.lexicoder.impl.AbstractLexicoder;
+import org.apache.accumulo.core.client.lexicoder.impl.FixedByteArrayOutputStream;
+import org.apache.accumulo.core.iterators.ValueFormatException;
+
 /**
  * A lexicoder to encode/decode a BigInteger to/from bytes that maintain its native Java sort order.
  *
  * @since 1.6.0
  */
-public class BigIntegerLexicoder extends AbstractLexicoder<BigInteger> implements Lexicoder<BigInteger> {
+public class BigIntegerLexicoder extends AbstractLexicoder<BigInteger> {
 
   @Override
   public byte[] encode(BigInteger v) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/lexicoder/BytesLexicoder.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/BytesLexicoder.java b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/BytesLexicoder.java
index ae4dfbd..c755db6 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/BytesLexicoder.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/BytesLexicoder.java
@@ -24,7 +24,7 @@ import org.apache.accumulo.core.client.lexicoder.impl.AbstractLexicoder;
  *
  * @since 1.6.0
  */
-public class BytesLexicoder extends AbstractLexicoder<byte[]> implements Lexicoder<byte[]> {
+public class BytesLexicoder extends AbstractLexicoder<byte[]> {
 
   @Override
   public byte[] encode(byte[] data) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/lexicoder/DateLexicoder.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/DateLexicoder.java b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/DateLexicoder.java
index 84ad808..8ce9c4d 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/DateLexicoder.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/DateLexicoder.java
@@ -16,16 +16,16 @@
  */
 package org.apache.accumulo.core.client.lexicoder;
 
-import org.apache.accumulo.core.client.lexicoder.impl.AbstractLexicoder;
-
 import java.util.Date;
 
+import org.apache.accumulo.core.client.lexicoder.impl.AbstractLexicoder;
+
 /**
  * A lexicoder for date objects. It preserves the native Java sort order for Date.
  *
  * @since 1.6.0
  */
-public class DateLexicoder extends AbstractLexicoder<Date> implements Lexicoder<Date> {
+public class DateLexicoder extends AbstractLexicoder<Date> {
 
   private LongLexicoder longEncoder = new LongLexicoder();
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/lexicoder/DoubleLexicoder.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/DoubleLexicoder.java b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/DoubleLexicoder.java
index 67cf4d9..252523f 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/DoubleLexicoder.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/DoubleLexicoder.java
@@ -23,7 +23,7 @@ import org.apache.accumulo.core.client.lexicoder.impl.AbstractLexicoder;
  *
  * @since 1.6.0
  */
-public class DoubleLexicoder extends AbstractLexicoder<Double> implements Lexicoder<Double> {
+public class DoubleLexicoder extends AbstractLexicoder<Double> {
 
   private ULongLexicoder longEncoder = new ULongLexicoder();
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/lexicoder/IntegerLexicoder.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/IntegerLexicoder.java b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/IntegerLexicoder.java
index f113f48..b58e673 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/IntegerLexicoder.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/IntegerLexicoder.java
@@ -24,7 +24,7 @@ import org.apache.accumulo.core.client.lexicoder.impl.AbstractLexicoder;
  *
  * @since 1.6.0
  */
-public class IntegerLexicoder extends AbstractLexicoder<Integer> implements Lexicoder<Integer> {
+public class IntegerLexicoder extends AbstractLexicoder<Integer> {
 
   private UIntegerLexicoder uil = new UIntegerLexicoder();
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/lexicoder/ListLexicoder.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/ListLexicoder.java b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/ListLexicoder.java
index d78cff2..8a38eb0 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/ListLexicoder.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/ListLexicoder.java
@@ -31,7 +31,7 @@ import org.apache.accumulo.core.client.lexicoder.impl.AbstractLexicoder;
  *
  * @since 1.6.0
  */
-public class ListLexicoder<LT> extends AbstractLexicoder<List<LT>> implements Lexicoder<List<LT>> {
+public class ListLexicoder<LT> extends AbstractLexicoder<List<LT>> {
 
   private Lexicoder<LT> lexicoder;
 
@@ -66,7 +66,7 @@ public class ListLexicoder<LT> extends AbstractLexicoder<List<LT>> implements Le
   protected List<LT> decodeUnchecked(byte[] b, int offset, int len) {
 
     byte[][] escapedElements = split(b, offset, len);
-    ArrayList<LT> ret = new ArrayList<LT>(escapedElements.length);
+    ArrayList<LT> ret = new ArrayList<>(escapedElements.length);
 
     for (byte[] escapedElement : escapedElements) {
       ret.add(lexicoder.decode(unescape(escapedElement)));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/lexicoder/PairLexicoder.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/PairLexicoder.java b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/PairLexicoder.java
index 9198b43..b286cf4 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/PairLexicoder.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/PairLexicoder.java
@@ -16,14 +16,14 @@
  */
 package org.apache.accumulo.core.client.lexicoder;
 
-import org.apache.accumulo.core.client.lexicoder.impl.AbstractLexicoder;
-import org.apache.accumulo.core.util.ComparablePair;
-
 import static org.apache.accumulo.core.client.lexicoder.impl.ByteUtils.concat;
 import static org.apache.accumulo.core.client.lexicoder.impl.ByteUtils.escape;
 import static org.apache.accumulo.core.client.lexicoder.impl.ByteUtils.split;
 import static org.apache.accumulo.core.client.lexicoder.impl.ByteUtils.unescape;
 
+import org.apache.accumulo.core.client.lexicoder.impl.AbstractLexicoder;
+import org.apache.accumulo.core.util.ComparablePair;
+
 /**
  * This class is a lexicoder that sorts a ComparablePair. Each item in the pair is encoded with the given lexicoder and concatenated together. This makes it
  * easy to construct a sortable key based on two components. There are many examples of this- but a key/value relationship is a great one.
@@ -49,8 +49,7 @@ import static org.apache.accumulo.core.client.lexicoder.impl.ByteUtils.unescape;
  * @since 1.6.0
  */
 
-public class PairLexicoder<A extends Comparable<A>,B extends Comparable<B>> extends AbstractLexicoder<ComparablePair<A,B>> implements
-    Lexicoder<ComparablePair<A,B>> {
+public class PairLexicoder<A extends Comparable<A>,B extends Comparable<B>> extends AbstractLexicoder<ComparablePair<A,B>> {
 
   private Lexicoder<A> firstLexicoder;
   private Lexicoder<B> secondLexicoder;
@@ -79,7 +78,7 @@ public class PairLexicoder<A extends Comparable<A>,B extends Comparable<B>> exte
       throw new RuntimeException("Data does not have 2 fields, it has " + fields.length);
     }
 
-    return new ComparablePair<A,B>(firstLexicoder.decode(unescape(fields[0])), secondLexicoder.decode(unescape(fields[1])));
+    return new ComparablePair<>(firstLexicoder.decode(unescape(fields[0])), secondLexicoder.decode(unescape(fields[1])));
   }
 
 }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/lexicoder/ReverseLexicoder.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/ReverseLexicoder.java b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/ReverseLexicoder.java
index 3a422d5..5243ea9 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/ReverseLexicoder.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/ReverseLexicoder.java
@@ -16,11 +16,11 @@
  */
 package org.apache.accumulo.core.client.lexicoder;
 
-import org.apache.accumulo.core.client.lexicoder.impl.AbstractLexicoder;
-
 import static org.apache.accumulo.core.client.lexicoder.impl.ByteUtils.escape;
 import static org.apache.accumulo.core.client.lexicoder.impl.ByteUtils.unescape;
 
+import org.apache.accumulo.core.client.lexicoder.impl.AbstractLexicoder;
+
 /**
  * A lexicoder that flips the sort order from another lexicoder. If this is applied to {@link DateLexicoder}, the most recent date will be sorted first and the
  * oldest date will be sorted last. If it's applied to {@link LongLexicoder}, the Long.MAX_VALUE will be sorted first and Long.MIN_VALUE will be sorted last,
@@ -29,7 +29,7 @@ import static org.apache.accumulo.core.client.lexicoder.impl.ByteUtils.unescape;
  * @since 1.6.0
  */
 
-public class ReverseLexicoder<T> extends AbstractLexicoder<T> implements Lexicoder<T> {
+public class ReverseLexicoder<T> extends AbstractLexicoder<T> {
 
   private Lexicoder<T> lexicoder;
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/lexicoder/StringLexicoder.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/StringLexicoder.java b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/StringLexicoder.java
index cec78de..17d4578 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/StringLexicoder.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/StringLexicoder.java
@@ -16,10 +16,10 @@
  */
 package org.apache.accumulo.core.client.lexicoder;
 
-import org.apache.accumulo.core.client.lexicoder.impl.AbstractLexicoder;
-
 import static java.nio.charset.StandardCharsets.UTF_8;
 
+import org.apache.accumulo.core.client.lexicoder.impl.AbstractLexicoder;
+
 /**
  * This lexicoder encodes/decodes a given String to/from bytes without further processing. It can be combined with other encoders like the
  * {@link ReverseLexicoder} to flip the default sort order.
@@ -27,7 +27,7 @@ import static java.nio.charset.StandardCharsets.UTF_8;
  * @since 1.6.0
  */
 
-public class StringLexicoder extends AbstractLexicoder<String> implements Lexicoder<String> {
+public class StringLexicoder extends AbstractLexicoder<String> {
 
   @Override
   public byte[] encode(String data) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/lexicoder/TextLexicoder.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/TextLexicoder.java b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/TextLexicoder.java
index 2129ce7..c5a7596 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/TextLexicoder.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/TextLexicoder.java
@@ -27,7 +27,7 @@ import org.apache.hadoop.io.Text;
  * @since 1.6.0
  */
 
-public class TextLexicoder extends AbstractLexicoder<Text> implements Lexicoder<Text> {
+public class TextLexicoder extends AbstractLexicoder<Text> {
 
   @Override
   public byte[] encode(Text data) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/lexicoder/UIntegerLexicoder.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/UIntegerLexicoder.java b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/UIntegerLexicoder.java
index bd41ab6..c156d4c 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/UIntegerLexicoder.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/UIntegerLexicoder.java
@@ -24,7 +24,7 @@ import org.apache.accumulo.core.client.lexicoder.impl.AbstractLexicoder;
  *
  * @since 1.6.0
  */
-public class UIntegerLexicoder extends AbstractLexicoder<Integer> implements Lexicoder<Integer> {
+public class UIntegerLexicoder extends AbstractLexicoder<Integer> {
 
   @Override
   public byte[] encode(Integer i) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/lexicoder/ULongLexicoder.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/ULongLexicoder.java b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/ULongLexicoder.java
index 0176043..8ebd0b9 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/ULongLexicoder.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/ULongLexicoder.java
@@ -24,7 +24,7 @@ import org.apache.accumulo.core.client.lexicoder.impl.AbstractLexicoder;
  *
  * @since 1.6.0
  */
-public class ULongLexicoder extends AbstractLexicoder<Long> implements Lexicoder<Long> {
+public class ULongLexicoder extends AbstractLexicoder<Long> {
 
   @Override
   public byte[] encode(Long l) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/lexicoder/UUIDLexicoder.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/UUIDLexicoder.java b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/UUIDLexicoder.java
index 70405f5..2d5b811 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/UUIDLexicoder.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/UUIDLexicoder.java
@@ -31,7 +31,7 @@ import org.apache.accumulo.core.iterators.ValueFormatException;
  *
  * @since 1.6.0
  */
-public class UUIDLexicoder extends AbstractLexicoder<UUID> implements Lexicoder<UUID> {
+public class UUIDLexicoder extends AbstractLexicoder<UUID> {
 
   /**
    * {@inheritDoc}

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/lexicoder/impl/ByteUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/impl/ByteUtils.java b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/impl/ByteUtils.java
index b168807..0daceaa 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/impl/ByteUtils.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/impl/ByteUtils.java
@@ -97,7 +97,7 @@ public class ByteUtils {
    * Splits a byte array by 0x00
    */
   public static byte[][] split(byte[] data, int dataOffset, int len) {
-    ArrayList<Integer> offsets = new ArrayList<Integer>();
+    ArrayList<Integer> offsets = new ArrayList<>();
 
     for (int i = dataOffset; i < (dataOffset + len); i++) {
       if (data[i] == 0x00) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/mapred/AbstractInputFormat.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/mapred/AbstractInputFormat.java b/core/src/main/java/org/apache/accumulo/core/client/mapred/AbstractInputFormat.java
index dd92ae3..6165346 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/mapred/AbstractInputFormat.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/mapred/AbstractInputFormat.java
@@ -662,7 +662,7 @@ public abstract class AbstractInputFormat<K,V> implements InputFormat<K,V> {
     validateOptions(job);
 
     Random random = new Random();
-    LinkedList<InputSplit> splits = new LinkedList<InputSplit>();
+    LinkedList<InputSplit> splits = new LinkedList<>();
     Map<String,InputTableConfig> tableConfigs = getInputTableConfigs(job);
     for (Map.Entry<String,InputTableConfig> tableConfigEntry : tableConfigs.entrySet()) {
       String tableName = tableConfigEntry.getKey();
@@ -696,12 +696,12 @@ public abstract class AbstractInputFormat<K,V> implements InputFormat<K,V> {
 
       List<Range> ranges = autoAdjust ? Range.mergeOverlapping(tableConfig.getRanges()) : tableConfig.getRanges();
       if (ranges.isEmpty()) {
-        ranges = new ArrayList<Range>(1);
+        ranges = new ArrayList<>(1);
         ranges.add(new Range());
       }
 
       // get the metadata information for these ranges
-      Map<String,Map<KeyExtent,List<Range>>> binnedRanges = new HashMap<String,Map<KeyExtent,List<Range>>>();
+      Map<String,Map<KeyExtent,List<Range>>> binnedRanges = new HashMap<>();
       TabletLocator tl;
       try {
         if (tableConfig.isOfflineScan()) {
@@ -740,9 +740,9 @@ public abstract class AbstractInputFormat<K,V> implements InputFormat<K,V> {
       HashMap<Range,ArrayList<String>> splitsToAdd = null;
 
       if (!autoAdjust)
-        splitsToAdd = new HashMap<Range,ArrayList<String>>();
+        splitsToAdd = new HashMap<>();
 
-      HashMap<String,String> hostNameCache = new HashMap<String,String>();
+      HashMap<String,String> hostNameCache = new HashMap<>();
       for (Map.Entry<String,Map<KeyExtent,List<Range>>> tserverBin : binnedRanges.entrySet()) {
         String ip = tserverBin.getKey().split(":", 2)[0];
         String location = hostNameCache.get(ip);
@@ -755,7 +755,7 @@ public abstract class AbstractInputFormat<K,V> implements InputFormat<K,V> {
           Range ke = extentRanges.getKey().toDataRange();
           if (batchScan) {
             // group ranges by tablet to be read by a BatchScanner
-            ArrayList<Range> clippedRanges = new ArrayList<Range>();
+            ArrayList<Range> clippedRanges = new ArrayList<>();
             for (Range r : extentRanges.getValue())
               clippedRanges.add(ke.clip(r));
 
@@ -779,7 +779,7 @@ public abstract class AbstractInputFormat<K,V> implements InputFormat<K,V> {
                 // don't divide ranges
                 ArrayList<String> locations = splitsToAdd.get(r);
                 if (locations == null)
-                  locations = new ArrayList<String>(1);
+                  locations = new ArrayList<>(1);
                 locations.add(location);
                 splitsToAdd.put(r, locations);
               }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.java b/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.java
index 461bdc0..5feadb8 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.java
@@ -429,7 +429,7 @@ public class AccumuloOutputFormat implements OutputFormat<Text,Mutation> {
       if (simulate)
         log.info("Simulating output only. No writes to tables will occur");
 
-      this.bws = new HashMap<Text,BatchWriter>();
+      this.bws = new HashMap<>();
 
       String tname = getDefaultTableName(job);
       this.defaultTableName = (tname == null) ? null : new Text(tname);
@@ -543,12 +543,12 @@ public class AccumuloOutputFormat implements OutputFormat<Text,Mutation> {
         mtbw.close();
       } catch (MutationsRejectedException e) {
         if (e.getSecurityErrorCodes().size() >= 0) {
-          HashMap<String,Set<SecurityErrorCode>> tables = new HashMap<String,Set<SecurityErrorCode>>();
+          HashMap<String,Set<SecurityErrorCode>> tables = new HashMap<>();
           for (Entry<TabletId,Set<SecurityErrorCode>> ke : e.getSecurityErrorCodes().entrySet()) {
             String tableId = ke.getKey().getTableId().toString();
             Set<SecurityErrorCode> secCodes = tables.get(tableId);
             if (secCodes == null) {
-              secCodes = new HashSet<SecurityErrorCode>();
+              secCodes = new HashSet<>();
               tables.put(tableId, secCodes);
             }
             secCodes.addAll(ke.getValue());

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloRowInputFormat.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloRowInputFormat.java b/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloRowInputFormat.java
index 067fde8..5049ef7 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloRowInputFormat.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloRowInputFormat.java
@@ -78,7 +78,7 @@ public class AccumuloRowInputFormat extends InputFormatBase<Text,PeekingIterator
 
       @Override
       public PeekingIterator<Entry<Key,Value>> createValue() {
-        return new PeekingIterator<Entry<Key,Value>>();
+        return new PeekingIterator<>();
       }
     };
     recordReader.initialize(split, job);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.java b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.java
index e7cb8ec..9ccf78a 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.java
@@ -708,7 +708,7 @@ public abstract class AbstractInputFormat<K,V> extends InputFormat<K,V> {
     log.setLevel(logLevel);
     validateOptions(context);
     Random random = new Random();
-    LinkedList<InputSplit> splits = new LinkedList<InputSplit>();
+    LinkedList<InputSplit> splits = new LinkedList<>();
     Map<String,InputTableConfig> tableConfigs = getInputTableConfigs(context);
     for (Map.Entry<String,InputTableConfig> tableConfigEntry : tableConfigs.entrySet()) {
 
@@ -743,12 +743,12 @@ public abstract class AbstractInputFormat<K,V> extends InputFormat<K,V> {
 
       List<Range> ranges = autoAdjust ? Range.mergeOverlapping(tableConfig.getRanges()) : tableConfig.getRanges();
       if (ranges.isEmpty()) {
-        ranges = new ArrayList<Range>(1);
+        ranges = new ArrayList<>(1);
         ranges.add(new Range());
       }
 
       // get the metadata information for these ranges
-      Map<String,Map<KeyExtent,List<Range>>> binnedRanges = new HashMap<String,Map<KeyExtent,List<Range>>>();
+      Map<String,Map<KeyExtent,List<Range>>> binnedRanges = new HashMap<>();
       TabletLocator tl;
       try {
         if (tableConfig.isOfflineScan()) {
@@ -790,9 +790,9 @@ public abstract class AbstractInputFormat<K,V> extends InputFormat<K,V> {
       HashMap<Range,ArrayList<String>> splitsToAdd = null;
 
       if (!autoAdjust)
-        splitsToAdd = new HashMap<Range,ArrayList<String>>();
+        splitsToAdd = new HashMap<>();
 
-      HashMap<String,String> hostNameCache = new HashMap<String,String>();
+      HashMap<String,String> hostNameCache = new HashMap<>();
       for (Map.Entry<String,Map<KeyExtent,List<Range>>> tserverBin : binnedRanges.entrySet()) {
         String ip = tserverBin.getKey().split(":", 2)[0];
         String location = hostNameCache.get(ip);
@@ -805,7 +805,7 @@ public abstract class AbstractInputFormat<K,V> extends InputFormat<K,V> {
           Range ke = extentRanges.getKey().toDataRange();
           if (batchScan) {
             // group ranges by tablet to be read by a BatchScanner
-            ArrayList<Range> clippedRanges = new ArrayList<Range>();
+            ArrayList<Range> clippedRanges = new ArrayList<>();
             for (Range r : extentRanges.getValue())
               clippedRanges.add(ke.clip(r));
             BatchInputSplit split = new BatchInputSplit(tableName, tableId, clippedRanges, new String[] {location});
@@ -828,7 +828,7 @@ public abstract class AbstractInputFormat<K,V> extends InputFormat<K,V> {
                 // don't divide ranges
                 ArrayList<String> locations = splitsToAdd.get(r);
                 if (locations == null)
-                  locations = new ArrayList<String>(1);
+                  locations = new ArrayList<>(1);
                 locations.add(location);
                 splitsToAdd.put(r, locations);
               }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.java b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.java
index fa926b6..1e06ca3 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.java
@@ -428,7 +428,7 @@ public class AccumuloOutputFormat extends OutputFormat<Text,Mutation> {
       if (simulate)
         log.info("Simulating output only. No writes to tables will occur");
 
-      this.bws = new HashMap<Text,BatchWriter>();
+      this.bws = new HashMap<>();
 
       String tname = getDefaultTableName(context);
       this.defaultTableName = (tname == null) ? null : new Text(tname);
@@ -542,12 +542,12 @@ public class AccumuloOutputFormat extends OutputFormat<Text,Mutation> {
         mtbw.close();
       } catch (MutationsRejectedException e) {
         if (e.getSecurityErrorCodes().size() >= 0) {
-          HashMap<String,Set<SecurityErrorCode>> tables = new HashMap<String,Set<SecurityErrorCode>>();
+          HashMap<String,Set<SecurityErrorCode>> tables = new HashMap<>();
           for (Entry<TabletId,Set<SecurityErrorCode>> ke : e.getSecurityErrorCodes().entrySet()) {
             String tableId = ke.getKey().getTableId().toString();
             Set<SecurityErrorCode> secCodes = tables.get(tableId);
             if (secCodes == null) {
-              secCodes = new HashSet<SecurityErrorCode>();
+              secCodes = new HashSet<>();
               tables.put(tableId, secCodes);
             }
             secCodes.addAll(ke.getValue());

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloRowInputFormat.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloRowInputFormat.java b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloRowInputFormat.java
index 7dcb35b..043f88a 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloRowInputFormat.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloRowInputFormat.java
@@ -68,7 +68,7 @@ public class AccumuloRowInputFormat extends InputFormatBase<Text,PeekingIterator
       public boolean nextKeyValue() throws IOException, InterruptedException {
         if (!rowIterator.hasNext())
           return false;
-        currentV = new PeekingIterator<Entry<Key,Value>>(rowIterator.next());
+        currentV = new PeekingIterator<>(rowIterator.next());
         numKeysRead = rowIterator.getKVCount();
         currentKey = currentV.peek().getKey();
         currentK = new Text(currentKey.getRow());

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputTableConfig.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputTableConfig.java b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputTableConfig.java
index df0aa65..a8724c2 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputTableConfig.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputTableConfig.java
@@ -305,13 +305,13 @@ public class InputTableConfig implements Writable {
     // load iterators
     long iterSize = dataInput.readInt();
     if (iterSize > 0)
-      iterators = new ArrayList<IteratorSetting>();
+      iterators = new ArrayList<>();
     for (int i = 0; i < iterSize; i++)
       iterators.add(new IteratorSetting(dataInput));
     // load ranges
     long rangeSize = dataInput.readInt();
     if (rangeSize > 0)
-      ranges = new ArrayList<Range>();
+      ranges = new ArrayList<>();
     for (int i = 0; i < rangeSize; i++) {
       Range range = new Range();
       range.readFields(dataInput);
@@ -320,7 +320,7 @@ public class InputTableConfig implements Writable {
     // load columns
     long columnSize = dataInput.readInt();
     if (columnSize > 0)
-      columns = new HashSet<Pair<Text,Text>>();
+      columns = new HashSet<>();
     for (int i = 0; i < columnSize; i++) {
       long numPairs = dataInput.readInt();
       Text colFam = new Text();
@@ -330,7 +330,7 @@ public class InputTableConfig implements Writable {
       } else if (numPairs == 2) {
         Text colQual = new Text();
         colQual.readFields(dataInput);
-        columns.add(new Pair<Text,Text>(colFam, colQual));
+        columns.add(new Pair<>(colFam, colQual));
       }
     }
     autoAdjustRanges = dataInput.readBoolean();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/mapreduce/RangeInputSplit.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/RangeInputSplit.java b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/RangeInputSplit.java
index 1786eb3..1e89500 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/RangeInputSplit.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/RangeInputSplit.java
@@ -160,7 +160,7 @@ public class RangeInputSplit extends InputSplit implements Writable {
 
     if (in.readBoolean()) {
       int numColumns = in.readInt();
-      List<String> columns = new ArrayList<String>(numColumns);
+      List<String> columns = new ArrayList<>(numColumns);
       for (int i = 0; i < numColumns; i++) {
         columns.add(in.readUTF());
       }
@@ -209,7 +209,7 @@ public class RangeInputSplit extends InputSplit implements Writable {
 
     if (in.readBoolean()) {
       int numIterators = in.readInt();
-      iterators = new ArrayList<IteratorSetting>(numIterators);
+      iterators = new ArrayList<>(numIterators);
       for (int i = 0; i < numIterators; i++) {
         iterators.add(new IteratorSetting(in));
       }
@@ -475,7 +475,7 @@ public class RangeInputSplit extends InputSplit implements Writable {
   }
 
   public void setFetchedColumns(Collection<Pair<Text,Text>> fetchedColumns) {
-    this.fetchedColumns = new HashSet<Pair<Text,Text>>();
+    this.fetchedColumns = new HashSet<>();
     for (Pair<Text,Text> columns : fetchedColumns) {
       this.fetchedColumns.add(columns);
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/client/mapreduce/impl/BatchInputSplit.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/impl/BatchInputSplit.java b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/impl/BatchInputSplit.java
index 04875ac..2965788 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/impl/BatchInputSplit.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/impl/BatchInputSplit.java
@@ -107,7 +107,7 @@ public class BatchInputSplit extends RangeInputSplit {
     super.readFields(in);
 
     int numRanges = in.readInt();
-    ranges = new ArrayList<Range>(numRanges);
+    ranges = new ArrayList<>(numRanges);
     for (int i = 0; i < numRanges; ++i) {
       Range r = new Range();
       r.readFields(in);


[09/32] accumulo git commit: ACCUMULO-4357 Remove unneeded code for readability

Posted by ct...@apache.org.
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/examples/simple/src/main/java/org/apache/accumulo/examples/simple/reservations/ARS.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/reservations/ARS.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/reservations/ARS.java
index d99f7af..eff8e21 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/reservations/ARS.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/reservations/ARS.java
@@ -220,7 +220,7 @@ public class ARS {
       scanner.setRange(new Range(row));
       scanner.fetchColumnFamily(new Text("res"));
 
-      List<String> reservations = new ArrayList<String>();
+      List<String> reservations = new ArrayList<>();
 
       for (Entry<Key,Value> entry : scanner) {
         String val = entry.getValue().toString();
@@ -246,7 +246,7 @@ public class ARS {
         // start up multiple threads all trying to reserve the same resource, no more than one should succeed
 
         final ARS fars = ars;
-        ArrayList<Thread> threads = new ArrayList<Thread>();
+        ArrayList<Thread> threads = new ArrayList<>();
         for (int i = 3; i < tokens.length; i++) {
           final int whoIndex = i;
           Runnable reservationTask = new Runnable() {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shard/ContinuousQuery.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shard/ContinuousQuery.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shard/ContinuousQuery.java
index 6f0ceac..604c851 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shard/ContinuousQuery.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shard/ContinuousQuery.java
@@ -98,8 +98,8 @@ public class ContinuousQuery {
 
     Text currentRow = null;
 
-    ArrayList<Text> words = new ArrayList<Text>();
-    ArrayList<Text[]> ret = new ArrayList<Text[]>();
+    ArrayList<Text> words = new ArrayList<>();
+    ArrayList<Text[]> ret = new ArrayList<>();
 
     Random rand = new Random();
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shard/Index.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shard/Index.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shard/Index.java
index bc76c03..ba1e32e 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shard/Index.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shard/Index.java
@@ -53,7 +53,7 @@ public class Index {
 
     Mutation m = new Mutation(partition);
 
-    HashSet<String> tokensSeen = new HashSet<String>();
+    HashSet<String> tokensSeen = new HashSet<>();
 
     for (String token : tokens) {
       token = token.toLowerCase();
@@ -98,7 +98,7 @@ public class Index {
     @Parameter(names = "--partitions", required = true, description = "the number of shards to create")
     int partitions;
     @Parameter(required = true, description = "<file> { <file> ... }")
-    List<String> files = new ArrayList<String>();
+    List<String> files = new ArrayList<>();
   }
 
   public static void main(String[] args) throws Exception {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shard/Query.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shard/Query.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shard/Query.java
index 72a6384..13adcca 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shard/Query.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shard/Query.java
@@ -46,7 +46,7 @@ public class Query {
 
   static class Opts extends ClientOnRequiredTable {
     @Parameter(description = " term { <term> ... }")
-    List<String> terms = new ArrayList<String>();
+    List<String> terms = new ArrayList<>();
 
     @Parameter(names = {"--sample"}, description = "Do queries against sample, useful when sample is built using column qualifier")
     private boolean useSample = false;
@@ -76,7 +76,7 @@ public class Query {
     IntersectingIterator.setColumnFamilies(ii, columns);
     bs.addScanIterator(ii);
     bs.setRanges(Collections.singleton(new Range()));
-    List<String> result = new ArrayList<String>();
+    List<String> result = new ArrayList<>();
     for (Entry<Key,Value> entry : bs) {
       result.add(entry.getKey().getColumnQualifier().toString());
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shell/DebugCommand.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shell/DebugCommand.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shell/DebugCommand.java
index e429f62..4395fe7 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shell/DebugCommand.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shell/DebugCommand.java
@@ -27,7 +27,7 @@ public class DebugCommand extends Command {
 
   @Override
   public int execute(String fullCommand, CommandLine cl, Shell shellState) throws Exception {
-    Set<String> lines = new TreeSet<String>();
+    Set<String> lines = new TreeSet<>();
     lines.add("This is a test");
     shellState.printLines(lines.iterator(), true);
     return 0;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/examples/simple/src/test/java/org/apache/accumulo/examples/simple/filedata/ChunkCombinerTest.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/test/java/org/apache/accumulo/examples/simple/filedata/ChunkCombinerTest.java b/examples/simple/src/test/java/org/apache/accumulo/examples/simple/filedata/ChunkCombinerTest.java
index 9efd68b..40f4bb9 100644
--- a/examples/simple/src/test/java/org/apache/accumulo/examples/simple/filedata/ChunkCombinerTest.java
+++ b/examples/simple/src/test/java/org/apache/accumulo/examples/simple/filedata/ChunkCombinerTest.java
@@ -135,22 +135,22 @@ public class ChunkCombinerTest extends TestCase {
 
   @Override
   protected void setUp() {
-    row1 = new TreeMap<Key,Value>();
-    row2 = new TreeMap<Key,Value>();
-    row3 = new TreeMap<Key,Value>();
-    allRows = new TreeMap<Key,Value>();
+    row1 = new TreeMap<>();
+    row2 = new TreeMap<>();
+    row3 = new TreeMap<>();
+    allRows = new TreeMap<>();
 
-    cRow1 = new TreeMap<Key,Value>();
-    cRow2 = new TreeMap<Key,Value>();
-    cRow3 = new TreeMap<Key,Value>();
-    allCRows = new TreeMap<Key,Value>();
+    cRow1 = new TreeMap<>();
+    cRow2 = new TreeMap<>();
+    cRow3 = new TreeMap<>();
+    allCRows = new TreeMap<>();
 
-    cOnlyRow1 = new TreeMap<Key,Value>();
-    cOnlyRow2 = new TreeMap<Key,Value>();
-    cOnlyRow3 = new TreeMap<Key,Value>();
-    allCOnlyRows = new TreeMap<Key,Value>();
+    cOnlyRow1 = new TreeMap<>();
+    cOnlyRow2 = new TreeMap<>();
+    cOnlyRow3 = new TreeMap<>();
+    allCOnlyRows = new TreeMap<>();
 
-    badrow = new TreeMap<Key,Value>();
+    badrow = new TreeMap<>();
 
     String refs = FileDataIngest.REFS_CF.toString();
     String fileext = FileDataIngest.REFS_FILE_EXT;
@@ -218,7 +218,7 @@ public class ChunkCombinerTest extends TestCase {
     allCOnlyRows.putAll(cOnlyRow3);
   }
 
-  private static final Collection<ByteSequence> emptyColfs = new HashSet<ByteSequence>();
+  private static final Collection<ByteSequence> emptyColfs = new HashSet<>();
 
   public void test1() throws IOException {
     runTest(false, allRows, allCRows, emptyColfs);
@@ -241,7 +241,7 @@ public class ChunkCombinerTest extends TestCase {
     iter = iter.deepCopy(null);
     iter.seek(new Range(), cols, true);
 
-    TreeMap<Key,Value> seen = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> seen = new TreeMap<>();
 
     while (iter.hasTop()) {
       assertFalse("already contains " + iter.getTopKey(), seen.containsKey(iter.getTopKey()));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/examples/simple/src/test/java/org/apache/accumulo/examples/simple/filedata/ChunkInputStreamTest.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/test/java/org/apache/accumulo/examples/simple/filedata/ChunkInputStreamTest.java b/examples/simple/src/test/java/org/apache/accumulo/examples/simple/filedata/ChunkInputStreamTest.java
index 4f249fb..2796d47 100644
--- a/examples/simple/src/test/java/org/apache/accumulo/examples/simple/filedata/ChunkInputStreamTest.java
+++ b/examples/simple/src/test/java/org/apache/accumulo/examples/simple/filedata/ChunkInputStreamTest.java
@@ -43,7 +43,7 @@ public class ChunkInputStreamTest {
 
   @Before
   public void setupData() {
-    data = new ArrayList<Entry<Key,Value>>();
+    data = new ArrayList<>();
     addData(data, "a", "refs", "id\0ext", "A&B", "ext");
     addData(data, "a", "refs", "id\0name", "A&B", "name");
     addData(data, "a", "~chunk", 100, 0, "A&B", "asdfjkl;");
@@ -61,7 +61,7 @@ public class ChunkInputStreamTest {
     addData(data, "d", "~chunk", 100, 0, "A&B", "");
     addData(data, "e", "~chunk", 100, 0, "A&B", "asdfjkl;");
     addData(data, "e", "~chunk", 100, 1, "A&B", "");
-    baddata = new ArrayList<Entry<Key,Value>>();
+    baddata = new ArrayList<>();
     addData(baddata, "a", "~chunk", 100, 0, "A", "asdfjkl;");
     addData(baddata, "b", "~chunk", 100, 0, "B", "asdfjkl;");
     addData(baddata, "b", "~chunk", 100, 2, "C", "");
@@ -75,7 +75,7 @@ public class ChunkInputStreamTest {
     addData(baddata, "e", "~chunk", 100, 2, "I", "asdfjkl;");
     addData(baddata, "f", "~chunk", 100, 2, "K", "asdfjkl;");
     addData(baddata, "g", "~chunk", 100, 0, "L", "");
-    multidata = new ArrayList<Entry<Key,Value>>();
+    multidata = new ArrayList<>();
     addData(multidata, "a", "~chunk", 100, 0, "A&B", "asdfjkl;");
     addData(multidata, "a", "~chunk", 100, 1, "A&B", "");
     addData(multidata, "a", "~chunk", 200, 0, "B&C", "asdfjkl;");
@@ -99,8 +99,8 @@ public class ChunkInputStreamTest {
   @Test
   public void testExceptionOnMultipleSetSourceWithoutClose() throws IOException {
     ChunkInputStream cis = new ChunkInputStream();
-    PeekingIterator<Entry<Key,Value>> pi = new PeekingIterator<Entry<Key,Value>>(data.iterator());
-    pi = new PeekingIterator<Entry<Key,Value>>(data.iterator());
+    PeekingIterator<Entry<Key,Value>> pi = new PeekingIterator<>(data.iterator());
+    pi = new PeekingIterator<>(data.iterator());
     cis.setSource(pi);
     try {
       cis.setSource(pi);
@@ -114,7 +114,7 @@ public class ChunkInputStreamTest {
   @Test
   public void testExceptionOnGetVisBeforeClose() throws IOException {
     ChunkInputStream cis = new ChunkInputStream();
-    PeekingIterator<Entry<Key,Value>> pi = new PeekingIterator<Entry<Key,Value>>(data.iterator());
+    PeekingIterator<Entry<Key,Value>> pi = new PeekingIterator<>(data.iterator());
 
     cis.setSource(pi);
     try {
@@ -132,7 +132,7 @@ public class ChunkInputStreamTest {
     ChunkInputStream cis = new ChunkInputStream();
     byte[] b = new byte[5];
 
-    PeekingIterator<Entry<Key,Value>> pi = new PeekingIterator<Entry<Key,Value>>(data.iterator());
+    PeekingIterator<Entry<Key,Value>> pi = new PeekingIterator<>(data.iterator());
 
     cis.setSource(pi);
     int read;
@@ -184,7 +184,7 @@ public class ChunkInputStreamTest {
     ChunkInputStream cis = new ChunkInputStream();
     byte[] b = new byte[20];
     int read;
-    PeekingIterator<Entry<Key,Value>> pi = new PeekingIterator<Entry<Key,Value>>(data.iterator());
+    PeekingIterator<Entry<Key,Value>> pi = new PeekingIterator<>(data.iterator());
 
     cis.setSource(pi);
     assertEquals(read = cis.read(b), 8);
@@ -243,7 +243,7 @@ public class ChunkInputStreamTest {
     ChunkInputStream cis = new ChunkInputStream();
     byte[] b = new byte[20];
     int read;
-    PeekingIterator<Entry<Key,Value>> pi = new PeekingIterator<Entry<Key,Value>>(baddata.iterator());
+    PeekingIterator<Entry<Key,Value>> pi = new PeekingIterator<>(baddata.iterator());
 
     cis.setSource(pi);
     assumeExceptionOnRead(cis, b);
@@ -289,7 +289,7 @@ public class ChunkInputStreamTest {
 
     assertFalse(pi.hasNext());
 
-    pi = new PeekingIterator<Entry<Key,Value>>(baddata.iterator());
+    pi = new PeekingIterator<>(baddata.iterator());
     cis.setSource(pi);
     assumeExceptionOnClose(cis);
   }
@@ -299,7 +299,7 @@ public class ChunkInputStreamTest {
     ChunkInputStream cis = new ChunkInputStream();
     byte[] b = new byte[20];
     int read;
-    PeekingIterator<Entry<Key,Value>> pi = new PeekingIterator<Entry<Key,Value>>(baddata.iterator());
+    PeekingIterator<Entry<Key,Value>> pi = new PeekingIterator<>(baddata.iterator());
 
     cis.setSource(pi);
     assumeExceptionOnRead(cis, b);
@@ -340,7 +340,7 @@ public class ChunkInputStreamTest {
 
     assertFalse(pi.hasNext());
 
-    pi = new PeekingIterator<Entry<Key,Value>>(baddata.iterator());
+    pi = new PeekingIterator<>(baddata.iterator());
     cis.setSource(pi);
     assumeExceptionOnClose(cis);
   }
@@ -350,7 +350,7 @@ public class ChunkInputStreamTest {
     ChunkInputStream cis = new ChunkInputStream();
     byte[] b = new byte[20];
     int read;
-    PeekingIterator<Entry<Key,Value>> pi = new PeekingIterator<Entry<Key,Value>>(multidata.iterator());
+    PeekingIterator<Entry<Key,Value>> pi = new PeekingIterator<>(multidata.iterator());
 
     b = new byte[20];
 
@@ -377,7 +377,7 @@ public class ChunkInputStreamTest {
   @Test
   public void testSingleByteRead() throws IOException {
     ChunkInputStream cis = new ChunkInputStream();
-    PeekingIterator<Entry<Key,Value>> pi = new PeekingIterator<Entry<Key,Value>>(data.iterator());
+    PeekingIterator<Entry<Key,Value>> pi = new PeekingIterator<>(data.iterator());
 
     cis.setSource(pi);
     assertEquals((byte) 'a', (byte) cis.read());

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/fate/src/main/java/org/apache/accumulo/fate/AdminUtil.java
----------------------------------------------------------------------
diff --git a/fate/src/main/java/org/apache/accumulo/fate/AdminUtil.java b/fate/src/main/java/org/apache/accumulo/fate/AdminUtil.java
index 8532e92..f6aa811 100644
--- a/fate/src/main/java/org/apache/accumulo/fate/AdminUtil.java
+++ b/fate/src/main/java/org/apache/accumulo/fate/AdminUtil.java
@@ -68,15 +68,15 @@ public class AdminUtil<T> {
 
   public void print(ReadOnlyTStore<T> zs, IZooReaderWriter zk, String lockPath, Formatter fmt, Set<Long> filterTxid, EnumSet<TStatus> filterStatus)
       throws KeeperException, InterruptedException {
-    Map<Long,List<String>> heldLocks = new HashMap<Long,List<String>>();
-    Map<Long,List<String>> waitingLocks = new HashMap<Long,List<String>>();
+    Map<Long,List<String>> heldLocks = new HashMap<>();
+    Map<Long,List<String>> waitingLocks = new HashMap<>();
 
     List<String> lockedIds = zk.getChildren(lockPath);
 
     for (String id : lockedIds) {
       try {
         List<String> lockNodes = zk.getChildren(lockPath + "/" + id);
-        lockNodes = new ArrayList<String>(lockNodes);
+        lockNodes = new ArrayList<>(lockNodes);
         Collections.sort(lockNodes);
 
         int pos = 0;
@@ -104,7 +104,7 @@ public class AdminUtil<T> {
 
             List<String> tables = locks.get(Long.parseLong(lda[1], 16));
             if (tables == null) {
-              tables = new ArrayList<String>();
+              tables = new ArrayList<>();
               locks.put(Long.parseLong(lda[1], 16), tables);
             }
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/fate/src/main/java/org/apache/accumulo/fate/AgeOffStore.java
----------------------------------------------------------------------
diff --git a/fate/src/main/java/org/apache/accumulo/fate/AgeOffStore.java b/fate/src/main/java/org/apache/accumulo/fate/AgeOffStore.java
index 83b726b..376dad4 100644
--- a/fate/src/main/java/org/apache/accumulo/fate/AgeOffStore.java
+++ b/fate/src/main/java/org/apache/accumulo/fate/AgeOffStore.java
@@ -70,7 +70,7 @@ public class AgeOffStore<T> implements TStore<T> {
   }
 
   public void ageOff() {
-    HashSet<Long> oldTxs = new HashSet<Long>();
+    HashSet<Long> oldTxs = new HashSet<>();
 
     synchronized (this) {
       long time = timeSource.currentTimeMillis();
@@ -114,7 +114,7 @@ public class AgeOffStore<T> implements TStore<T> {
     this.store = store;
     this.ageOffTime = ageOffTime;
     this.timeSource = timeSource;
-    candidates = new HashMap<Long,Long>();
+    candidates = new HashMap<>();
 
     minTime = Long.MAX_VALUE;
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/fate/src/main/java/org/apache/accumulo/fate/ReadOnlyStore.java
----------------------------------------------------------------------
diff --git a/fate/src/main/java/org/apache/accumulo/fate/ReadOnlyStore.java b/fate/src/main/java/org/apache/accumulo/fate/ReadOnlyStore.java
index cf2683b..5d5aeab 100644
--- a/fate/src/main/java/org/apache/accumulo/fate/ReadOnlyStore.java
+++ b/fate/src/main/java/org/apache/accumulo/fate/ReadOnlyStore.java
@@ -86,7 +86,7 @@ public class ReadOnlyStore<T> implements ReadOnlyTStore<T> {
 
   @Override
   public ReadOnlyRepo<T> top(long tid) {
-    return new ReadOnlyRepoWrapper<T>(store.top(tid));
+    return new ReadOnlyRepoWrapper<>(store.top(tid));
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
----------------------------------------------------------------------
diff --git a/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java b/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
index 36a88e3..2a68f44 100644
--- a/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
+++ b/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
@@ -97,8 +97,8 @@ public class ZooStore<T> implements TStore<T> {
 
     this.path = path;
     this.zk = zk;
-    this.reserved = new HashSet<Long>();
-    this.defered = new HashMap<Long,Long>();
+    this.reserved = new HashSet<>();
+    this.defered = new HashMap<>();
     this.idgenerator = new SecureRandom();
 
     zk.putPersistentData(path, new byte[0], NodeExistsPolicy.SKIP);
@@ -130,7 +130,7 @@ public class ZooStore<T> implements TStore<T> {
           events = statusChangeEvents;
         }
 
-        List<String> txdirs = new ArrayList<String>(zk.getChildren(path));
+        List<String> txdirs = new ArrayList<>(zk.getChildren(path));
         Collections.sort(txdirs);
 
         synchronized (this) {
@@ -287,7 +287,7 @@ public class ZooStore<T> implements TStore<T> {
   private String findTop(String txpath) throws KeeperException, InterruptedException {
     List<String> ops = zk.getChildren(txpath);
 
-    ops = new ArrayList<String>(ops);
+    ops = new ArrayList<>(ops);
 
     String max = "";
 
@@ -448,7 +448,7 @@ public class ZooStore<T> implements TStore<T> {
   @Override
   public List<Long> list() {
     try {
-      ArrayList<Long> l = new ArrayList<Long>();
+      ArrayList<Long> l = new ArrayList<>();
       List<String> transactions = zk.getChildren(path);
       for (String txid : transactions) {
         l.add(parseTid(txid));
@@ -473,7 +473,7 @@ public class ZooStore<T> implements TStore<T> {
         throw new RuntimeException(e1);
       }
 
-      ops = new ArrayList<String>(ops);
+      ops = new ArrayList<>(ops);
       Collections.sort(ops, Collections.reverseOrder());
 
       ArrayList<ReadOnlyRepo<T>> dops = new ArrayList<>();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/fate/src/main/java/org/apache/accumulo/fate/zookeeper/DistributedReadWriteLock.java
----------------------------------------------------------------------
diff --git a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/DistributedReadWriteLock.java b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/DistributedReadWriteLock.java
index 624ce5d..fe31011 100644
--- a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/DistributedReadWriteLock.java
+++ b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/DistributedReadWriteLock.java
@@ -37,7 +37,7 @@ public class DistributedReadWriteLock implements java.util.concurrent.locks.Read
 
   static enum LockType {
     READ, WRITE,
-  };
+  }
 
   // serializer for lock type and user data
   static class ParsedLock {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/fate/src/main/java/org/apache/accumulo/fate/zookeeper/TransactionWatcher.java
----------------------------------------------------------------------
diff --git a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/TransactionWatcher.java b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/TransactionWatcher.java
index dda7db9..b10ddea 100644
--- a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/TransactionWatcher.java
+++ b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/TransactionWatcher.java
@@ -33,7 +33,7 @@ public class TransactionWatcher {
   }
 
   private static final Logger log = LoggerFactory.getLogger(TransactionWatcher.class);
-  final private Map<Long,AtomicInteger> counts = new HashMap<Long,AtomicInteger>();
+  final private Map<Long,AtomicInteger> counts = new HashMap<>();
   final private Arbitrator arbitrator;
 
   public TransactionWatcher(Arbitrator arbitrator) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooCache.java
----------------------------------------------------------------------
diff --git a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooCache.java b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooCache.java
index 2526aad..bec3d64 100644
--- a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooCache.java
+++ b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooCache.java
@@ -148,9 +148,9 @@ public class ZooCache {
    */
   public ZooCache(ZooReader reader, Watcher watcher) {
     this.zReader = reader;
-    this.cache = new HashMap<String,byte[]>();
-    this.statCache = new HashMap<String,Stat>();
-    this.childrenCache = new HashMap<String,List<String>>();
+    this.cache = new HashMap<>();
+    this.statCache = new HashMap<>();
+    this.childrenCache = new HashMap<>();
     this.externalWatcher = watcher;
   }
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooCacheFactory.java
----------------------------------------------------------------------
diff --git a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooCacheFactory.java b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooCacheFactory.java
index 1475928..9fecf2e 100644
--- a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooCacheFactory.java
+++ b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooCacheFactory.java
@@ -26,7 +26,7 @@ import org.apache.zookeeper.Watcher;
  */
 public class ZooCacheFactory {
   // TODO: make this better - LRU, soft references, ...
-  private static Map<String,ZooCache> instances = new HashMap<String,ZooCache>();
+  private static Map<String,ZooCache> instances = new HashMap<>();
 
   /**
    * Gets a {@link ZooCache}. The same object may be returned for multiple calls with the same arguments.

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooLock.java
----------------------------------------------------------------------
diff --git a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooLock.java b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooLock.java
index 992a444..90fb4aa 100644
--- a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooLock.java
+++ b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooLock.java
@@ -404,7 +404,7 @@ public class ZooLock implements Watcher {
       return false;
     }
 
-    children = new ArrayList<String>(children);
+    children = new ArrayList<>(children);
     Collections.sort(children);
 
     String lockNode = children.get(0);
@@ -437,7 +437,7 @@ public class ZooLock implements Watcher {
       return null;
     }
 
-    children = new ArrayList<String>(children);
+    children = new ArrayList<>(children);
     Collections.sort(children);
 
     String lockNode = children.get(0);
@@ -456,7 +456,7 @@ public class ZooLock implements Watcher {
       return 0;
     }
 
-    children = new ArrayList<String>(children);
+    children = new ArrayList<>(children);
     Collections.sort(children);
 
     String lockNode = children.get(0);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooQueueLock.java
----------------------------------------------------------------------
diff --git a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooQueueLock.java b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooQueueLock.java
index 1b22dc9..25c735b 100644
--- a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooQueueLock.java
+++ b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooQueueLock.java
@@ -68,7 +68,7 @@ public class ZooQueueLock implements QueueLock {
 
   @Override
   public SortedMap<Long,byte[]> getEarlierEntries(long entry) {
-    SortedMap<Long,byte[]> result = new TreeMap<Long,byte[]>();
+    SortedMap<Long,byte[]> result = new TreeMap<>();
     try {
       List<String> children = Collections.emptyList();
       try {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
----------------------------------------------------------------------
diff --git a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
index 837785f..b9fedac 100644
--- a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
+++ b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
@@ -51,7 +51,7 @@ public class ZooSession {
     ZooKeeper zooKeeper;
   }
 
-  private static Map<String,ZooSessionInfo> sessions = new HashMap<String,ZooSessionInfo>();
+  private static Map<String,ZooSessionInfo> sessions = new HashMap<>();
 
   private static String sessionKey(String keepers, int timeout, String scheme, byte[] auth) {
     return keepers + ":" + timeout + ":" + (scheme == null ? "" : scheme) + ":" + (auth == null ? "" : new String(auth, UTF_8));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooUtil.java
----------------------------------------------------------------------
diff --git a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooUtil.java b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooUtil.java
index 4c4aa13..6ea10d0 100644
--- a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooUtil.java
+++ b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooUtil.java
@@ -161,9 +161,9 @@ public class ZooUtil {
   private static final RetryFactory RETRY_FACTORY;
 
   static {
-    PRIVATE = new ArrayList<ACL>();
+    PRIVATE = new ArrayList<>();
     PRIVATE.addAll(Ids.CREATOR_ALL_ACL);
-    PUBLIC = new ArrayList<ACL>();
+    PUBLIC = new ArrayList<>();
     PUBLIC.addAll(PRIVATE);
     PUBLIC.add(new ACL(Perms.READ, Ids.ANYONE_ID_UNSAFE));
     RETRY_FACTORY = RetryFactory.DEFAULT_INSTANCE;
@@ -483,7 +483,7 @@ public class ZooUtil {
       return null;
     }
 
-    children = new ArrayList<String>(children);
+    children = new ArrayList<>(children);
     Collections.sort(children);
 
     String lockNode = children.get(0);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/fate/src/test/java/org/apache/accumulo/fate/AgeOffStoreTest.java
----------------------------------------------------------------------
diff --git a/fate/src/test/java/org/apache/accumulo/fate/AgeOffStoreTest.java b/fate/src/test/java/org/apache/accumulo/fate/AgeOffStoreTest.java
index 2c3b813..9549bd8 100644
--- a/fate/src/test/java/org/apache/accumulo/fate/AgeOffStoreTest.java
+++ b/fate/src/test/java/org/apache/accumulo/fate/AgeOffStoreTest.java
@@ -43,8 +43,8 @@ public class AgeOffStoreTest {
   public void testBasic() {
 
     TestTimeSource tts = new TestTimeSource();
-    SimpleStore<String> sstore = new SimpleStore<String>();
-    AgeOffStore<String> aoStore = new AgeOffStore<String>(sstore, 10, tts);
+    SimpleStore<String> sstore = new SimpleStore<>();
+    AgeOffStore<String> aoStore = new AgeOffStore<>(sstore, 10, tts);
 
     aoStore.ageOff();
 
@@ -73,22 +73,22 @@ public class AgeOffStoreTest {
 
     aoStore.ageOff();
 
-    Assert.assertEquals(new HashSet<Long>(Arrays.asList(txid1, txid2, txid3, txid4)), new HashSet<Long>(aoStore.list()));
-    Assert.assertEquals(4, new HashSet<Long>(aoStore.list()).size());
+    Assert.assertEquals(new HashSet<>(Arrays.asList(txid1, txid2, txid3, txid4)), new HashSet<>(aoStore.list()));
+    Assert.assertEquals(4, new HashSet<>(aoStore.list()).size());
 
     tts.time = 15;
 
     aoStore.ageOff();
 
-    Assert.assertEquals(new HashSet<Long>(Arrays.asList(txid1, txid3, txid4)), new HashSet<Long>(aoStore.list()));
-    Assert.assertEquals(3, new HashSet<Long>(aoStore.list()).size());
+    Assert.assertEquals(new HashSet<>(Arrays.asList(txid1, txid3, txid4)), new HashSet<>(aoStore.list()));
+    Assert.assertEquals(3, new HashSet<>(aoStore.list()).size());
 
     tts.time = 30;
 
     aoStore.ageOff();
 
-    Assert.assertEquals(new HashSet<Long>(Arrays.asList(txid1)), new HashSet<Long>(aoStore.list()));
-    Assert.assertEquals(1, new HashSet<Long>(aoStore.list()).size());
+    Assert.assertEquals(new HashSet<>(Arrays.asList(txid1)), new HashSet<>(aoStore.list()));
+    Assert.assertEquals(1, new HashSet<>(aoStore.list()).size());
   }
 
   @Test
@@ -96,7 +96,7 @@ public class AgeOffStoreTest {
     // test age off when source store starts off non empty
 
     TestTimeSource tts = new TestTimeSource();
-    SimpleStore<String> sstore = new SimpleStore<String>();
+    SimpleStore<String> sstore = new SimpleStore<>();
     Long txid1 = sstore.create();
     sstore.reserve(txid1);
     sstore.setStatus(txid1, TStatus.IN_PROGRESS);
@@ -116,22 +116,22 @@ public class AgeOffStoreTest {
 
     Long txid4 = sstore.create();
 
-    AgeOffStore<String> aoStore = new AgeOffStore<String>(sstore, 10, tts);
+    AgeOffStore<String> aoStore = new AgeOffStore<>(sstore, 10, tts);
 
-    Assert.assertEquals(new HashSet<Long>(Arrays.asList(txid1, txid2, txid3, txid4)), new HashSet<Long>(aoStore.list()));
-    Assert.assertEquals(4, new HashSet<Long>(aoStore.list()).size());
+    Assert.assertEquals(new HashSet<>(Arrays.asList(txid1, txid2, txid3, txid4)), new HashSet<>(aoStore.list()));
+    Assert.assertEquals(4, new HashSet<>(aoStore.list()).size());
 
     aoStore.ageOff();
 
-    Assert.assertEquals(new HashSet<Long>(Arrays.asList(txid1, txid2, txid3, txid4)), new HashSet<Long>(aoStore.list()));
-    Assert.assertEquals(4, new HashSet<Long>(aoStore.list()).size());
+    Assert.assertEquals(new HashSet<>(Arrays.asList(txid1, txid2, txid3, txid4)), new HashSet<>(aoStore.list()));
+    Assert.assertEquals(4, new HashSet<>(aoStore.list()).size());
 
     tts.time = 15;
 
     aoStore.ageOff();
 
-    Assert.assertEquals(new HashSet<Long>(Arrays.asList(txid1)), new HashSet<Long>(aoStore.list()));
-    Assert.assertEquals(1, new HashSet<Long>(aoStore.list()).size());
+    Assert.assertEquals(new HashSet<>(Arrays.asList(txid1)), new HashSet<>(aoStore.list()));
+    Assert.assertEquals(1, new HashSet<>(aoStore.list()).size());
 
     aoStore.reserve(txid1);
     aoStore.setStatus(txid1, TStatus.FAILED_IN_PROGRESS);
@@ -141,8 +141,8 @@ public class AgeOffStoreTest {
 
     aoStore.ageOff();
 
-    Assert.assertEquals(new HashSet<Long>(Arrays.asList(txid1)), new HashSet<Long>(aoStore.list()));
-    Assert.assertEquals(1, new HashSet<Long>(aoStore.list()).size());
+    Assert.assertEquals(new HashSet<>(Arrays.asList(txid1)), new HashSet<>(aoStore.list()));
+    Assert.assertEquals(1, new HashSet<>(aoStore.list()).size());
 
     aoStore.reserve(txid1);
     aoStore.setStatus(txid1, TStatus.FAILED);
@@ -150,13 +150,13 @@ public class AgeOffStoreTest {
 
     aoStore.ageOff();
 
-    Assert.assertEquals(new HashSet<Long>(Arrays.asList(txid1)), new HashSet<Long>(aoStore.list()));
-    Assert.assertEquals(1, new HashSet<Long>(aoStore.list()).size());
+    Assert.assertEquals(new HashSet<>(Arrays.asList(txid1)), new HashSet<>(aoStore.list()));
+    Assert.assertEquals(1, new HashSet<>(aoStore.list()).size());
 
     tts.time = 42;
 
     aoStore.ageOff();
 
-    Assert.assertEquals(0, new HashSet<Long>(aoStore.list()).size());
+    Assert.assertEquals(0, new HashSet<>(aoStore.list()).size());
   }
 }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/fate/src/test/java/org/apache/accumulo/fate/ReadOnlyStoreTest.java
----------------------------------------------------------------------
diff --git a/fate/src/test/java/org/apache/accumulo/fate/ReadOnlyStoreTest.java b/fate/src/test/java/org/apache/accumulo/fate/ReadOnlyStoreTest.java
index eea5f1b..e8f0cee 100644
--- a/fate/src/test/java/org/apache/accumulo/fate/ReadOnlyStoreTest.java
+++ b/fate/src/test/java/org/apache/accumulo/fate/ReadOnlyStoreTest.java
@@ -51,7 +51,7 @@ public class ReadOnlyStoreTest {
     EasyMock.replay(repo);
     EasyMock.replay(mock);
 
-    ReadOnlyTStore<String> store = new ReadOnlyStore<String>(mock);
+    ReadOnlyTStore<String> store = new ReadOnlyStore<>(mock);
     Assert.assertEquals(0xdeadbeefl, store.reserve());
     store.reserve(0xdeadbeefl);
     ReadOnlyRepo<String> top = store.top(0xdeadbeefl);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/fate/src/test/java/org/apache/accumulo/fate/SimpleStore.java
----------------------------------------------------------------------
diff --git a/fate/src/test/java/org/apache/accumulo/fate/SimpleStore.java b/fate/src/test/java/org/apache/accumulo/fate/SimpleStore.java
index ab03525..3277270 100644
--- a/fate/src/test/java/org/apache/accumulo/fate/SimpleStore.java
+++ b/fate/src/test/java/org/apache/accumulo/fate/SimpleStore.java
@@ -33,8 +33,8 @@ import org.apache.commons.lang.NotImplementedException;
 public class SimpleStore<T> implements TStore<T> {
 
   private long nextId = 1;
-  private Map<Long,TStatus> statuses = new HashMap<Long,TStore.TStatus>();
-  private Set<Long> reserved = new HashSet<Long>();
+  private Map<Long,TStatus> statuses = new HashMap<>();
+  private Set<Long> reserved = new HashSet<>();
 
   @Override
   public long create() {
@@ -120,7 +120,7 @@ public class SimpleStore<T> implements TStore<T> {
 
   @Override
   public List<Long> list() {
-    return new ArrayList<Long>(statuses.keySet());
+    return new ArrayList<>(statuses.keySet());
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/fate/src/test/java/org/apache/accumulo/fate/zookeeper/DistributedReadWriteLockTest.java
----------------------------------------------------------------------
diff --git a/fate/src/test/java/org/apache/accumulo/fate/zookeeper/DistributedReadWriteLockTest.java b/fate/src/test/java/org/apache/accumulo/fate/zookeeper/DistributedReadWriteLockTest.java
index 0b04bd1..486a4c6 100644
--- a/fate/src/test/java/org/apache/accumulo/fate/zookeeper/DistributedReadWriteLockTest.java
+++ b/fate/src/test/java/org/apache/accumulo/fate/zookeeper/DistributedReadWriteLockTest.java
@@ -34,11 +34,11 @@ public class DistributedReadWriteLockTest {
   public static class MockQueueLock implements QueueLock {
 
     long next = 0L;
-    final SortedMap<Long,byte[]> locks = new TreeMap<Long,byte[]>();
+    final SortedMap<Long,byte[]> locks = new TreeMap<>();
 
     @Override
     synchronized public SortedMap<Long,byte[]> getEarlierEntries(long entry) {
-      SortedMap<Long,byte[]> result = new TreeMap<Long,byte[]>();
+      SortedMap<Long,byte[]> result = new TreeMap<>();
       result.putAll(locks.headMap(entry + 1));
       return result;
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/fate/src/test/java/org/apache/accumulo/fate/zookeeper/TransactionWatcherTest.java
----------------------------------------------------------------------
diff --git a/fate/src/test/java/org/apache/accumulo/fate/zookeeper/TransactionWatcherTest.java b/fate/src/test/java/org/apache/accumulo/fate/zookeeper/TransactionWatcherTest.java
index 0e4e329..6779f6c 100644
--- a/fate/src/test/java/org/apache/accumulo/fate/zookeeper/TransactionWatcherTest.java
+++ b/fate/src/test/java/org/apache/accumulo/fate/zookeeper/TransactionWatcherTest.java
@@ -28,13 +28,13 @@ import org.junit.Test;
 public class TransactionWatcherTest {
 
   static class SimpleArbitrator implements TransactionWatcher.Arbitrator {
-    Map<String,List<Long>> started = new HashMap<String,List<Long>>();
-    Map<String,List<Long>> cleanedUp = new HashMap<String,List<Long>>();
+    Map<String,List<Long>> started = new HashMap<>();
+    Map<String,List<Long>> cleanedUp = new HashMap<>();
 
     public synchronized void start(String txType, Long txid) throws Exception {
       List<Long> txids = started.get(txType);
       if (txids == null)
-        txids = new ArrayList<Long>();
+        txids = new ArrayList<>();
       if (txids.contains(txid))
         throw new Exception("transaction already started");
       txids.add(txid);
@@ -42,7 +42,7 @@ public class TransactionWatcherTest {
 
       txids = cleanedUp.get(txType);
       if (txids == null)
-        txids = new ArrayList<Long>();
+        txids = new ArrayList<>();
       if (txids.contains(txid))
         throw new IllegalStateException("transaction was started but not cleaned up");
       txids.add(txid);
@@ -124,7 +124,7 @@ public class TransactionWatcherTest {
       });
       Assert.fail("work against stopped transaction should fail");
     } catch (Exception ex) {
-      ;
+
     }
     final long txid2 = 9;
     sa.start(txType, txid2);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/maven-plugin/src/main/java/org/apache/accumulo/maven/plugin/AbstractAccumuloMojo.java
----------------------------------------------------------------------
diff --git a/maven-plugin/src/main/java/org/apache/accumulo/maven/plugin/AbstractAccumuloMojo.java b/maven-plugin/src/main/java/org/apache/accumulo/maven/plugin/AbstractAccumuloMojo.java
index 2028a2e..37eeb4d 100644
--- a/maven-plugin/src/main/java/org/apache/accumulo/maven/plugin/AbstractAccumuloMojo.java
+++ b/maven-plugin/src/main/java/org/apache/accumulo/maven/plugin/AbstractAccumuloMojo.java
@@ -43,7 +43,7 @@ public abstract class AbstractAccumuloMojo extends AbstractMojo {
   }
 
   void configureMiniClasspath(MiniAccumuloConfigImpl macConfig, String miniClasspath) throws MalformedURLException {
-    ArrayList<String> classpathItems = new ArrayList<String>();
+    ArrayList<String> classpathItems = new ArrayList<>();
     if (miniClasspath == null && project != null) {
       classpathItems.add(project.getBuild().getOutputDirectory());
       classpathItems.add(project.getBuild().getTestOutputDirectory());

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/minicluster/src/main/java/org/apache/accumulo/cluster/standalone/StandaloneClusterControl.java
----------------------------------------------------------------------
diff --git a/minicluster/src/main/java/org/apache/accumulo/cluster/standalone/StandaloneClusterControl.java b/minicluster/src/main/java/org/apache/accumulo/cluster/standalone/StandaloneClusterControl.java
index 3edf60d..febc94c 100644
--- a/minicluster/src/main/java/org/apache/accumulo/cluster/standalone/StandaloneClusterControl.java
+++ b/minicluster/src/main/java/org/apache/accumulo/cluster/standalone/StandaloneClusterControl.java
@@ -377,7 +377,7 @@ public class StandaloneClusterControl implements ClusterControl {
   protected List<String> getHosts(File f) throws IOException {
     BufferedReader reader = new BufferedReader(new FileReader(f));
     try {
-      List<String> hosts = new ArrayList<String>();
+      List<String> hosts = new ArrayList<>();
       String line = null;
       while ((line = reader.readLine()) != null) {
         line = line.trim();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloRunner.java
----------------------------------------------------------------------
diff --git a/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloRunner.java b/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloRunner.java
index 78af6a0..4745e0a 100644
--- a/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloRunner.java
+++ b/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloRunner.java
@@ -184,7 +184,7 @@ public class MiniAccumuloRunner {
     if (opts.prop.containsKey(SHUTDOWN_PORT_PROP))
       shutdownPort = Integer.parseInt(opts.prop.getProperty(SHUTDOWN_PORT_PROP));
 
-    Map<String,String> siteConfig = new HashMap<String,String>();
+    Map<String,String> siteConfig = new HashMap<>();
     for (Map.Entry<Object,Object> entry : opts.prop.entrySet()) {
       String key = (String) entry.getKey();
       if (key.startsWith("site."))

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterControl.java
----------------------------------------------------------------------
diff --git a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterControl.java b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterControl.java
index 80c4edc..8cc7950 100644
--- a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterControl.java
+++ b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterControl.java
@@ -56,7 +56,7 @@ public class MiniAccumuloClusterControl implements ClusterControl {
   Process gcProcess = null;
   Process monitor = null;
   Process tracer = null;
-  final List<Process> tabletServerProcesses = new ArrayList<Process>();
+  final List<Process> tabletServerProcesses = new ArrayList<>();
 
   public MiniAccumuloClusterControl(MiniAccumuloClusterImpl cluster) {
     requireNonNull(cluster);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
----------------------------------------------------------------------
diff --git a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
index 772ba69..fd017be 100644
--- a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
+++ b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
@@ -169,7 +169,7 @@ public class MiniAccumuloClusterImpl implements AccumuloCluster {
 
   private boolean initialized = false;
 
-  private Set<Pair<ServerType,Integer>> debugPorts = new HashSet<Pair<ServerType,Integer>>();
+  private Set<Pair<ServerType,Integer>> debugPorts = new HashSet<>();
 
   private File zooCfgFile;
   private String dfsUri;
@@ -178,11 +178,11 @@ public class MiniAccumuloClusterImpl implements AccumuloCluster {
     return logWriters;
   }
 
-  private List<LogWriter> logWriters = new ArrayList<MiniAccumuloClusterImpl.LogWriter>();
+  private List<LogWriter> logWriters = new ArrayList<>();
 
   private MiniAccumuloConfigImpl config;
   private MiniDFSCluster miniDFS = null;
-  private List<Process> cleanup = new ArrayList<Process>();
+  private List<Process> cleanup = new ArrayList<>();
 
   private ExecutorService executor;
 
@@ -197,7 +197,7 @@ public class MiniAccumuloClusterImpl implements AccumuloCluster {
   }
 
   public Process exec(Class<?> clazz, List<String> jvmArgs, String... args) throws IOException {
-    ArrayList<String> jvmArgs2 = new ArrayList<String>(1 + (jvmArgs == null ? 0 : jvmArgs.size()));
+    ArrayList<String> jvmArgs2 = new ArrayList<>(1 + (jvmArgs == null ? 0 : jvmArgs.size()));
     jvmArgs2.add("-Xmx" + config.getDefaultMemory());
     if (jvmArgs != null)
       jvmArgs2.addAll(jvmArgs);
@@ -231,7 +231,7 @@ public class MiniAccumuloClusterImpl implements AccumuloCluster {
   private String getClasspath() throws IOException {
 
     try {
-      ArrayList<ClassLoader> classloaders = new ArrayList<ClassLoader>();
+      ArrayList<ClassLoader> classloaders = new ArrayList<>();
 
       ClassLoader cl = this.getClass().getClassLoader();
 
@@ -289,7 +289,7 @@ public class MiniAccumuloClusterImpl implements AccumuloCluster {
 
     String className = clazz.getName();
 
-    ArrayList<String> argList = new ArrayList<String>();
+    ArrayList<String> argList = new ArrayList<>();
     argList.addAll(Arrays.asList(javaBin, "-Dproc=" + clazz.getSimpleName(), "-cp", classpath));
     argList.addAll(extraJvmOpts);
     for (Entry<String,String> sysProp : config.getSystemProperties().entrySet()) {
@@ -344,13 +344,13 @@ public class MiniAccumuloClusterImpl implements AccumuloCluster {
 
   Process _exec(Class<?> clazz, ServerType serverType, String... args) throws IOException {
 
-    List<String> jvmOpts = new ArrayList<String>();
+    List<String> jvmOpts = new ArrayList<>();
     jvmOpts.add("-Xmx" + config.getMemory(serverType));
 
     if (config.isJDWPEnabled()) {
       Integer port = PortUtils.getRandomFreePort();
       jvmOpts.addAll(buildRemoteDebugParams(port));
-      debugPorts.add(new Pair<ServerType,Integer>(serverType, port));
+      debugPorts.add(new Pair<>(serverType, port));
     }
     return _exec(clazz, jvmOpts, args);
   }
@@ -649,7 +649,7 @@ public class MiniAccumuloClusterImpl implements AccumuloCluster {
   }
 
   List<ProcessReference> references(Process... procs) {
-    List<ProcessReference> result = new ArrayList<ProcessReference>();
+    List<ProcessReference> result = new ArrayList<>();
     for (Process proc : procs) {
       result.add(new ProcessReference(proc));
     }
@@ -657,7 +657,7 @@ public class MiniAccumuloClusterImpl implements AccumuloCluster {
   }
 
   public Map<ServerType,Collection<ProcessReference>> getProcesses() {
-    Map<ServerType,Collection<ProcessReference>> result = new HashMap<ServerType,Collection<ProcessReference>>();
+    Map<ServerType,Collection<ProcessReference>> result = new HashMap<>();
     MiniAccumuloClusterControl control = getClusterControl();
     result.put(ServerType.MASTER, references(control.masterProcess));
     result.put(ServerType.TABLET_SERVER, references(control.tabletServerProcesses.toArray(new Process[0])));
@@ -771,7 +771,7 @@ public class MiniAccumuloClusterImpl implements AccumuloCluster {
   }
 
   int stopProcessWithTimeout(final Process proc, long timeout, TimeUnit unit) throws InterruptedException, ExecutionException, TimeoutException {
-    FutureTask<Integer> future = new FutureTask<Integer>(new Callable<Integer>() {
+    FutureTask<Integer> future = new FutureTask<>(new Callable<Integer>() {
       @Override
       public Integer call() throws InterruptedException {
         proc.destroy();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java
----------------------------------------------------------------------
diff --git a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java
index 5939d2f..8e35705 100644
--- a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java
+++ b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java
@@ -47,12 +47,12 @@ public class MiniAccumuloConfigImpl {
 
   private File dir = null;
   private String rootPassword = null;
-  private Map<String,String> siteConfig = new HashMap<String,String>();
-  private Map<String,String> configuredSiteConig = new HashMap<String,String>();
+  private Map<String,String> siteConfig = new HashMap<>();
+  private Map<String,String> configuredSiteConig = new HashMap<>();
   private int numTservers = 2;
-  private Map<ServerType,Long> memoryConfig = new HashMap<ServerType,Long>();
+  private Map<ServerType,Long> memoryConfig = new HashMap<>();
   private boolean jdwpEnabled = false;
-  private Map<String,String> systemProperties = new HashMap<String,String>();
+  private Map<String,String> systemProperties = new HashMap<>();
 
   private String instanceName = "miniInstance";
   private String rootUserName = "root";
@@ -284,8 +284,8 @@ public class MiniAccumuloConfigImpl {
   }
 
   private MiniAccumuloConfigImpl _setSiteConfig(Map<String,String> siteConfig) {
-    this.siteConfig = new HashMap<String,String>(siteConfig);
-    this.configuredSiteConig = new HashMap<String,String>(siteConfig);
+    this.siteConfig = new HashMap<>(siteConfig);
+    this.configuredSiteConig = new HashMap<>(siteConfig);
     return this;
   }
 
@@ -378,11 +378,11 @@ public class MiniAccumuloConfigImpl {
    * @return a copy of the site config
    */
   public Map<String,String> getSiteConfig() {
-    return new HashMap<String,String>(siteConfig);
+    return new HashMap<>(siteConfig);
   }
 
   public Map<String,String> getConfiguredSiteConfig() {
-    return new HashMap<String,String>(configuredSiteConig);
+    return new HashMap<>(configuredSiteConig);
   }
 
   /**
@@ -547,7 +547,7 @@ public class MiniAccumuloConfigImpl {
    * @since 1.6.0
    */
   public void setSystemProperties(Map<String,String> systemProperties) {
-    this.systemProperties = new HashMap<String,String>(systemProperties);
+    this.systemProperties = new HashMap<>(systemProperties);
   }
 
   /**
@@ -556,7 +556,7 @@ public class MiniAccumuloConfigImpl {
    * @since 1.6.0
    */
   public Map<String,String> getSystemProperties() {
-    return new HashMap<String,String>(systemProperties);
+    return new HashMap<>(systemProperties);
   }
 
   /**
@@ -662,7 +662,7 @@ public class MiniAccumuloConfigImpl {
       throw e1;
     }
 
-    Map<String,String> siteConfigMap = new HashMap<String,String>();
+    Map<String,String> siteConfigMap = new HashMap<>();
     for (Entry<String,String> e : accumuloConf) {
       siteConfigMap.put(e.getKey(), e.getValue());
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/minicluster/src/test/java/org/apache/accumulo/minicluster/MiniAccumuloClusterTest.java
----------------------------------------------------------------------
diff --git a/minicluster/src/test/java/org/apache/accumulo/minicluster/MiniAccumuloClusterTest.java b/minicluster/src/test/java/org/apache/accumulo/minicluster/MiniAccumuloClusterTest.java
index 7c62384..f691bf6 100644
--- a/minicluster/src/test/java/org/apache/accumulo/minicluster/MiniAccumuloClusterTest.java
+++ b/minicluster/src/test/java/org/apache/accumulo/minicluster/MiniAccumuloClusterTest.java
@@ -69,7 +69,7 @@ public class MiniAccumuloClusterTest {
 
     MiniAccumuloConfig config = new MiniAccumuloConfig(testDir, "superSecret").setJDWPEnabled(true);
     config.setZooKeeperPort(0);
-    HashMap<String,String> site = new HashMap<String,String>();
+    HashMap<String,String> site = new HashMap<>();
     site.put(Property.TSERV_WORKQ_THREADS.getKey(), "2");
     config.setSiteConfig(site);
     accumulo = new MiniAccumuloCluster(config);
@@ -216,7 +216,7 @@ public class MiniAccumuloClusterTest {
   public void testConfig() {
     // ensure what user passed in is what comes back
     Assert.assertEquals(0, accumulo.getConfig().getZooKeeperPort());
-    HashMap<String,String> site = new HashMap<String,String>();
+    HashMap<String,String> site = new HashMap<>();
     site.put(Property.TSERV_WORKQ_THREADS.getKey(), "2");
     Assert.assertEquals(site, accumulo.getConfig().getSiteConfig());
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/minicluster/src/test/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImplTest.java
----------------------------------------------------------------------
diff --git a/minicluster/src/test/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImplTest.java b/minicluster/src/test/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImplTest.java
index dc616df..ba12f53 100644
--- a/minicluster/src/test/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImplTest.java
+++ b/minicluster/src/test/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImplTest.java
@@ -66,7 +66,7 @@ public class MiniAccumuloConfigImplTest {
   public void testSiteConfig() {
 
     // constructor site config overrides default props
-    Map<String,String> siteConfig = new HashMap<String,String>();
+    Map<String,String> siteConfig = new HashMap<>();
     siteConfig.put(Property.INSTANCE_DFS_URI.getKey(), "hdfs://");
     MiniAccumuloConfigImpl config = new MiniAccumuloConfigImpl(tempFolder.getRoot(), "password").setSiteConfig(siteConfig).initialize();
     assertEquals("hdfs://", config.getSiteConfig().get(Property.INSTANCE_DFS_URI.getKey()));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/proxy/src/main/java/org/apache/accumulo/proxy/Proxy.java
----------------------------------------------------------------------
diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/Proxy.java b/proxy/src/main/java/org/apache/accumulo/proxy/Proxy.java
index 5f3b991..a3d185d 100644
--- a/proxy/src/main/java/org/apache/accumulo/proxy/Proxy.java
+++ b/proxy/src/main/java/org/apache/accumulo/proxy/Proxy.java
@@ -204,7 +204,7 @@ public class Proxy implements KeywordExecutable {
     AccumuloProxy.Iface wrappedImpl = RpcWrapper.service(impl, new AccumuloProxy.Processor<AccumuloProxy.Iface>(impl));
 
     // Create the processor from the implementation
-    TProcessor processor = new AccumuloProxy.Processor<AccumuloProxy.Iface>(wrappedImpl);
+    TProcessor processor = new AccumuloProxy.Processor<>(wrappedImpl);
 
     // Get the type of thrift server to instantiate
     final String serverTypeStr = properties.getProperty(THRIFT_SERVER_TYPE, THRIFT_SERVER_TYPE_DEFAULT);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java
----------------------------------------------------------------------
diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java b/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java
index 7e2c312..a62e1a1 100644
--- a/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java
+++ b/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java
@@ -364,7 +364,7 @@ public class ProxyServer implements AccumuloProxy.Iface {
       org.apache.accumulo.proxy.thrift.AccumuloSecurityException, org.apache.accumulo.proxy.thrift.TableNotFoundException, TException {
 
     try {
-      SortedSet<Text> sorted = new TreeSet<Text>();
+      SortedSet<Text> sorted = new TreeSet<>();
       for (ByteBuffer split : splits) {
         sorted.add(ByteBufferUtil.toText(split));
       }
@@ -420,7 +420,7 @@ public class ProxyServer implements AccumuloProxy.Iface {
   }
 
   private List<IteratorSetting> getIteratorSettings(List<org.apache.accumulo.proxy.thrift.IteratorSetting> iterators) {
-    List<IteratorSetting> result = new ArrayList<IteratorSetting>();
+    List<IteratorSetting> result = new ArrayList<>();
     if (iterators != null) {
       for (org.apache.accumulo.proxy.thrift.IteratorSetting is : iterators) {
         result.add(getIteratorSetting(is));
@@ -493,9 +493,9 @@ public class ProxyServer implements AccumuloProxy.Iface {
       org.apache.accumulo.proxy.thrift.AccumuloSecurityException, org.apache.accumulo.proxy.thrift.TableNotFoundException, TException {
     try {
       Map<String,Set<Text>> groups = getConnector(login).tableOperations().getLocalityGroups(tableName);
-      Map<String,Set<String>> ret = new HashMap<String,Set<String>>();
+      Map<String,Set<String>> ret = new HashMap<>();
       for (Entry<String,Set<Text>> entry : groups.entrySet()) {
-        Set<String> value = new HashSet<String>();
+        Set<String> value = new HashSet<>();
         ret.put(entry.getKey(), value);
         for (Text val : entry.getValue()) {
           value.add(val.toString());
@@ -534,7 +534,7 @@ public class ProxyServer implements AccumuloProxy.Iface {
   public Map<String,String> getTableProperties(ByteBuffer login, String tableName) throws org.apache.accumulo.proxy.thrift.AccumuloException,
       org.apache.accumulo.proxy.thrift.AccumuloSecurityException, org.apache.accumulo.proxy.thrift.TableNotFoundException, TException {
     try {
-      Map<String,String> ret = new HashMap<String,String>();
+      Map<String,String> ret = new HashMap<>();
 
       for (Map.Entry<String,String> entry : getConnector(login).tableOperations().getProperties(tableName)) {
         ret.put(entry.getKey(), entry.getValue());
@@ -551,7 +551,7 @@ public class ProxyServer implements AccumuloProxy.Iface {
       org.apache.accumulo.proxy.thrift.AccumuloSecurityException, org.apache.accumulo.proxy.thrift.TableNotFoundException, TException {
     try {
       Collection<Text> splits = getConnector(login).tableOperations().listSplits(tableName, maxSplits);
-      List<ByteBuffer> ret = new ArrayList<ByteBuffer>();
+      List<ByteBuffer> ret = new ArrayList<>();
       for (Text split : splits) {
         ret.add(TextUtil.getByteBuffer(split));
       }
@@ -651,7 +651,7 @@ public class ProxyServer implements AccumuloProxy.Iface {
       throws org.apache.accumulo.proxy.thrift.AccumuloException, org.apache.accumulo.proxy.thrift.AccumuloSecurityException,
       org.apache.accumulo.proxy.thrift.TableNotFoundException, TException {
     try {
-      Map<String,Set<Text>> groups = new HashMap<String,Set<Text>>();
+      Map<String,Set<Text>> groups = new HashMap<>();
       for (Entry<String,Set<String>> groupEntry : groupStrings.entrySet()) {
         groups.put(groupEntry.getKey(), new HashSet<Text>());
         for (String val : groupEntry.getValue()) {
@@ -688,10 +688,10 @@ public class ProxyServer implements AccumuloProxy.Iface {
       org.apache.accumulo.proxy.thrift.AccumuloSecurityException, org.apache.accumulo.proxy.thrift.TableNotFoundException, TException {
     try {
       List<org.apache.accumulo.core.client.admin.DiskUsage> diskUsages = getConnector(login).tableOperations().getDiskUsage(tables);
-      List<DiskUsage> retUsages = new ArrayList<DiskUsage>();
+      List<DiskUsage> retUsages = new ArrayList<>();
       for (org.apache.accumulo.core.client.admin.DiskUsage diskUsage : diskUsages) {
         DiskUsage usage = new DiskUsage();
-        usage.setTables(new ArrayList<String>(diskUsage.getTables()));
+        usage.setTables(new ArrayList<>(diskUsage.getTables()));
         usage.setUsage(diskUsage.getUsage());
         retUsages.add(usage);
       }
@@ -736,7 +736,7 @@ public class ProxyServer implements AccumuloProxy.Iface {
   @Override
   public List<org.apache.accumulo.proxy.thrift.ActiveScan> getActiveScans(ByteBuffer login, String tserver)
       throws org.apache.accumulo.proxy.thrift.AccumuloException, org.apache.accumulo.proxy.thrift.AccumuloSecurityException, TException {
-    List<org.apache.accumulo.proxy.thrift.ActiveScan> result = new ArrayList<org.apache.accumulo.proxy.thrift.ActiveScan>();
+    List<org.apache.accumulo.proxy.thrift.ActiveScan> result = new ArrayList<>();
     try {
       List<ActiveScan> activeScans = getConnector(login).instanceOperations().getActiveScans(tserver);
       for (ActiveScan scan : activeScans) {
@@ -751,7 +751,7 @@ public class ProxyServer implements AccumuloProxy.Iface {
         TabletId e = scan.getTablet();
         pscan.extent = new org.apache.accumulo.proxy.thrift.KeyExtent(e.getTableId().toString(), TextUtil.getByteBuffer(e.getEndRow()),
             TextUtil.getByteBuffer(e.getPrevEndRow()));
-        pscan.columns = new ArrayList<org.apache.accumulo.proxy.thrift.Column>();
+        pscan.columns = new ArrayList<>();
         if (scan.getColumns() != null) {
           for (Column c : scan.getColumns()) {
             org.apache.accumulo.proxy.thrift.Column column = new org.apache.accumulo.proxy.thrift.Column();
@@ -761,7 +761,7 @@ public class ProxyServer implements AccumuloProxy.Iface {
             pscan.columns.add(column);
           }
         }
-        pscan.iterators = new ArrayList<org.apache.accumulo.proxy.thrift.IteratorSetting>();
+        pscan.iterators = new ArrayList<>();
         for (String iteratorString : scan.getSsiList()) {
           String[] parts = iteratorString.split("[=,]");
           if (parts.length == 3) {
@@ -773,7 +773,7 @@ public class ProxyServer implements AccumuloProxy.Iface {
             pscan.iterators.add(settings);
           }
         }
-        pscan.authorizations = new ArrayList<ByteBuffer>();
+        pscan.authorizations = new ArrayList<>();
         if (scan.getAuthorizations() != null) {
           for (byte[] a : scan.getAuthorizations()) {
             pscan.authorizations.add(ByteBuffer.wrap(a));
@@ -793,7 +793,7 @@ public class ProxyServer implements AccumuloProxy.Iface {
       throws org.apache.accumulo.proxy.thrift.AccumuloException, org.apache.accumulo.proxy.thrift.AccumuloSecurityException, TException {
 
     try {
-      List<org.apache.accumulo.proxy.thrift.ActiveCompaction> result = new ArrayList<org.apache.accumulo.proxy.thrift.ActiveCompaction>();
+      List<org.apache.accumulo.proxy.thrift.ActiveCompaction> result = new ArrayList<>();
       List<ActiveCompaction> active = getConnector(login).instanceOperations().getActiveCompactions(tserver);
       for (ActiveCompaction comp : active) {
         org.apache.accumulo.proxy.thrift.ActiveCompaction pcomp = new org.apache.accumulo.proxy.thrift.ActiveCompaction();
@@ -803,7 +803,7 @@ public class ProxyServer implements AccumuloProxy.Iface {
         TabletId e = comp.getTablet();
         pcomp.extent = new org.apache.accumulo.proxy.thrift.KeyExtent(e.getTableId().toString(), TextUtil.getByteBuffer(e.getEndRow()),
             TextUtil.getByteBuffer(e.getPrevEndRow()));
-        pcomp.inputFiles = new ArrayList<String>();
+        pcomp.inputFiles = new ArrayList<>();
         if (comp.getInputFiles() != null) {
           pcomp.inputFiles.addAll(comp.getInputFiles());
         }
@@ -812,7 +812,7 @@ public class ProxyServer implements AccumuloProxy.Iface {
         pcomp.reason = CompactionReason.valueOf(comp.getReason().toString());
         pcomp.type = CompactionType.valueOf(comp.getType().toString());
 
-        pcomp.iterators = new ArrayList<org.apache.accumulo.proxy.thrift.IteratorSetting>();
+        pcomp.iterators = new ArrayList<>();
         if (comp.getIterators() != null) {
           for (IteratorSetting setting : comp.getIterators()) {
             org.apache.accumulo.proxy.thrift.IteratorSetting psetting = new org.apache.accumulo.proxy.thrift.IteratorSetting(setting.getPriority(),
@@ -875,7 +875,7 @@ public class ProxyServer implements AccumuloProxy.Iface {
   public void changeUserAuthorizations(ByteBuffer login, String user, Set<ByteBuffer> authorizations)
       throws org.apache.accumulo.proxy.thrift.AccumuloException, org.apache.accumulo.proxy.thrift.AccumuloSecurityException, TException {
     try {
-      Set<String> auths = new HashSet<String>();
+      Set<String> auths = new HashSet<>();
       for (ByteBuffer auth : authorizations) {
         auths.add(ByteBufferUtil.toString(auth));
       }
@@ -1035,7 +1035,7 @@ public class ProxyServer implements AccumuloProxy.Iface {
   }
 
   private Authorizations getAuthorizations(Set<ByteBuffer> authorizations) {
-    List<String> auths = new ArrayList<String>();
+    List<String> auths = new ArrayList<>();
     for (ByteBuffer bbauth : authorizations) {
       auths.add(ByteBufferUtil.toString(bbauth));
     }
@@ -1117,7 +1117,7 @@ public class ProxyServer implements AccumuloProxy.Iface {
           }
         }
 
-        ArrayList<Range> ranges = new ArrayList<Range>();
+        ArrayList<Range> ranges = new ArrayList<>();
 
         if (opts.ranges == null) {
           ranges.add(new Range());
@@ -1265,7 +1265,7 @@ public class ProxyServer implements AccumuloProxy.Iface {
     if (bwpe.exception != null)
       return;
 
-    HashMap<Text,ColumnVisibility> vizMap = new HashMap<Text,ColumnVisibility>();
+    HashMap<Text,ColumnVisibility> vizMap = new HashMap<>();
 
     for (Map.Entry<ByteBuffer,List<ColumnUpdate>> entry : cells.entrySet()) {
       Mutation m = new Mutation(ByteBufferUtil.toBytes(entry.getKey()));
@@ -1524,7 +1524,7 @@ public class ProxyServer implements AccumuloProxy.Iface {
       org.apache.accumulo.proxy.thrift.TableNotFoundException, TException {
     try {
       Map<String,EnumSet<IteratorScope>> iterMap = getConnector(login).tableOperations().listIterators(tableName);
-      Map<String,Set<org.apache.accumulo.proxy.thrift.IteratorScope>> result = new HashMap<String,Set<org.apache.accumulo.proxy.thrift.IteratorScope>>();
+      Map<String,Set<org.apache.accumulo.proxy.thrift.IteratorScope>> result = new HashMap<>();
       for (Map.Entry<String,EnumSet<IteratorScope>> entry : iterMap.entrySet()) {
         result.put(entry.getKey(), getProxyIteratorScopes(entry.getValue()));
       }
@@ -1552,7 +1552,7 @@ public class ProxyServer implements AccumuloProxy.Iface {
       org.apache.accumulo.proxy.thrift.TableNotFoundException, TException {
     try {
       Set<Range> ranges = getConnector(login).tableOperations().splitRangeByTablets(tableName, getRange(range), maxSplits);
-      Set<org.apache.accumulo.proxy.thrift.Range> result = new HashSet<org.apache.accumulo.proxy.thrift.Range>();
+      Set<org.apache.accumulo.proxy.thrift.Range> result = new HashSet<>();
       for (Range r : ranges) {
         result.add(getRange(r));
       }
@@ -1939,9 +1939,9 @@ public class ProxyServer implements AccumuloProxy.Iface {
     }
 
     try {
-      HashMap<Text,ColumnVisibility> vizMap = new HashMap<Text,ColumnVisibility>();
+      HashMap<Text,ColumnVisibility> vizMap = new HashMap<>();
 
-      ArrayList<ConditionalMutation> cmuts = new ArrayList<ConditionalMutation>(updates.size());
+      ArrayList<ConditionalMutation> cmuts = new ArrayList<>(updates.size());
       for (Entry<ByteBuffer,ConditionalUpdates> cu : updates.entrySet()) {
         ConditionalMutation cmut = new ConditionalMutation(ByteBufferUtil.toBytes(cu.getKey()));
 
@@ -1973,7 +1973,7 @@ public class ProxyServer implements AccumuloProxy.Iface {
 
       Iterator<Result> results = cw.write(cmuts.iterator());
 
-      HashMap<ByteBuffer,ConditionalStatus> resultMap = new HashMap<ByteBuffer,ConditionalStatus>();
+      HashMap<ByteBuffer,ConditionalStatus> resultMap = new HashMap<>();
 
       while (results.hasNext()) {
         Result result = results.next();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/proxy/src/test/java/org/apache/accumulo/proxy/ProxyServerTest.java
----------------------------------------------------------------------
diff --git a/proxy/src/test/java/org/apache/accumulo/proxy/ProxyServerTest.java b/proxy/src/test/java/org/apache/accumulo/proxy/ProxyServerTest.java
index 07fdc45..2f64445 100644
--- a/proxy/src/test/java/org/apache/accumulo/proxy/ProxyServerTest.java
+++ b/proxy/src/test/java/org/apache/accumulo/proxy/ProxyServerTest.java
@@ -48,7 +48,7 @@ public class ProxyServerTest {
 
     final ByteBuffer login = ByteBuffer.wrap("my_login".getBytes(UTF_8));
     final String tableName = "table1";
-    final Map<ByteBuffer,List<ColumnUpdate>> cells = new HashMap<ByteBuffer,List<ColumnUpdate>>();
+    final Map<ByteBuffer,List<ColumnUpdate>> cells = new HashMap<>();
 
     EasyMock.expect(server.getWriter(login, tableName, null)).andReturn(bwpe);
     server.addCellsToWriter(cells, bwpe);
@@ -83,7 +83,7 @@ public class ProxyServerTest {
 
     final ByteBuffer login = ByteBuffer.wrap("my_login".getBytes(UTF_8));
     final String tableName = "table1";
-    final Map<ByteBuffer,List<ColumnUpdate>> cells = new HashMap<ByteBuffer,List<ColumnUpdate>>();
+    final Map<ByteBuffer,List<ColumnUpdate>> cells = new HashMap<>();
 
     EasyMock.expect(server.getWriter(login, tableName, null)).andReturn(bwpe);
     server.addCellsToWriter(cells, bwpe);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/Accumulo.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/Accumulo.java b/server/base/src/main/java/org/apache/accumulo/server/Accumulo.java
index 302b6f9..3cfd759 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/Accumulo.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/Accumulo.java
@@ -182,7 +182,7 @@ public class Accumulo {
       throw new RuntimeException("This version of accumulo (" + codeVersion + ") is not compatible with files stored using data version " + dataVersion);
     }
 
-    TreeMap<String,String> sortedProps = new TreeMap<String,String>();
+    TreeMap<String,String> sortedProps = new TreeMap<>();
     for (Entry<String,String> entry : conf)
       sortedProps.put(entry.getKey(), entry.getValue());
 
@@ -313,8 +313,8 @@ public class Accumulo {
    */
   public static void abortIfFateTransactions() {
     try {
-      final ReadOnlyTStore<Accumulo> fate = new ReadOnlyStore<Accumulo>(new ZooStore<Accumulo>(
-          ZooUtil.getRoot(HdfsZooInstance.getInstance()) + Constants.ZFATE, ZooReaderWriter.getInstance()));
+      final ReadOnlyTStore<Accumulo> fate = new ReadOnlyStore<>(new ZooStore<Accumulo>(ZooUtil.getRoot(HdfsZooInstance.getInstance()) + Constants.ZFATE,
+          ZooReaderWriter.getInstance()));
       if (!(fate.list().isEmpty())) {
         throw new AccumuloException("Aborting upgrade because there are outstanding FATE transactions from a previous Accumulo version. "
             + "Please see the README document for instructions on what to do under your previous version.");

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/GarbageCollectionLogger.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/GarbageCollectionLogger.java b/server/base/src/main/java/org/apache/accumulo/server/GarbageCollectionLogger.java
index 993f0ea..a275df7 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/GarbageCollectionLogger.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/GarbageCollectionLogger.java
@@ -30,7 +30,7 @@ import org.slf4j.LoggerFactory;
 public class GarbageCollectionLogger {
   private static final Logger log = LoggerFactory.getLogger(GarbageCollectionLogger.class);
 
-  private final HashMap<String,Long> prevGcTime = new HashMap<String,Long>();
+  private final HashMap<String,Long> prevGcTime = new HashMap<>();
   private long lastMemorySize = 0;
   private long gcTimeIncreasedCount = 0;
   private static long lastMemoryCheckTime = 0;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/ServerConstants.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/ServerConstants.java b/server/base/src/main/java/org/apache/accumulo/server/ServerConstants.java
index c268e83..8c64d50 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/ServerConstants.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/ServerConstants.java
@@ -96,7 +96,7 @@ public class ServerConstants {
     String firstDir = null;
     String firstIid = null;
     Integer firstVersion = null;
-    ArrayList<String> baseDirsList = new ArrayList<String>();
+    ArrayList<String> baseDirsList = new ArrayList<>();
     for (String baseDir : configuredBaseDirs) {
       Path path = new Path(baseDir, INSTANCE_ID_DIR);
       String currentIid;
@@ -177,7 +177,7 @@ public class ServerConstants {
         return Collections.emptyList();
 
       String[] pairs = replacements.split(",");
-      List<Pair<Path,Path>> ret = new ArrayList<Pair<Path,Path>>();
+      List<Pair<Path,Path>> ret = new ArrayList<>();
 
       for (String pair : pairs) {
 
@@ -203,10 +203,10 @@ public class ServerConstants {
           throw new IllegalArgumentException(Property.INSTANCE_VOLUMES_REPLACEMENTS.getKey() + " contains " + uris[1] + " which has a syntax error", e);
         }
 
-        ret.add(new Pair<Path,Path>(p1, p2));
+        ret.add(new Pair<>(p1, p2));
       }
 
-      HashSet<Path> baseDirs = new HashSet<Path>();
+      HashSet<Path> baseDirs = new HashSet<>();
       for (String baseDir : getBaseUris()) {
         // normalize using path
         baseDirs.add(new Path(baseDir));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/client/BulkImporter.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/client/BulkImporter.java b/server/base/src/main/java/org/apache/accumulo/server/client/BulkImporter.java
index e27ce52..c9af520 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/client/BulkImporter.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/client/BulkImporter.java
@@ -82,7 +82,7 @@ public class BulkImporter {
   public static List<String> bulkLoad(ClientContext context, long tid, String tableId, List<String> files, String errorDir, boolean setTime)
       throws IOException, AccumuloException, AccumuloSecurityException, ThriftTableOperationException {
     AssignmentStats stats = new BulkImporter(context, tid, tableId, setTime).importFiles(files, new Path(errorDir));
-    List<String> result = new ArrayList<String>();
+    List<String> result = new ArrayList<>();
     for (Path p : stats.completeFailures.keySet()) {
       result.add(p.toString());
     }
@@ -113,14 +113,14 @@ public class BulkImporter {
     int numThreads = context.getConfiguration().getCount(Property.TSERV_BULK_PROCESS_THREADS);
     int numAssignThreads = context.getConfiguration().getCount(Property.TSERV_BULK_ASSIGNMENT_THREADS);
 
-    timer = new StopWatch<Timers>(Timers.class);
+    timer = new StopWatch<>(Timers.class);
     timer.start(Timers.TOTAL);
 
     Configuration conf = CachedConfiguration.getInstance();
     VolumeManagerImpl.get(context.getConfiguration());
     final VolumeManager fs = VolumeManagerImpl.get(context.getConfiguration());
 
-    Set<Path> paths = new HashSet<Path>();
+    Set<Path> paths = new HashSet<>();
     for (String file : files) {
       paths.add(new Path(file));
     }
@@ -172,7 +172,7 @@ public class BulkImporter {
       Map<Path,List<KeyExtent>> assignmentFailures = assignMapFiles(context, conf, fs, tableId, assignments, paths, numAssignThreads, numThreads);
       assignmentStats.assignmentsFailed(assignmentFailures);
 
-      Map<Path,Integer> failureCount = new TreeMap<Path,Integer>();
+      Map<Path,Integer> failureCount = new TreeMap<>();
 
       for (Entry<Path,List<KeyExtent>> entry : assignmentFailures.entrySet())
         failureCount.put(entry.getKey(), 1);
@@ -199,7 +199,7 @@ public class BulkImporter {
         for (Entry<Path,List<KeyExtent>> entry : assignmentFailures.entrySet()) {
           Iterator<KeyExtent> keListIter = entry.getValue().iterator();
 
-          List<TabletLocation> tabletsToAssignMapFileTo = new ArrayList<TabletLocation>();
+          List<TabletLocation> tabletsToAssignMapFileTo = new ArrayList<>();
 
           while (keListIter.hasNext()) {
             KeyExtent ke = keListIter.next();
@@ -273,7 +273,7 @@ public class BulkImporter {
 
       totalTime += timer.get(t);
     }
-    List<String> files = new ArrayList<String>();
+    List<String> files = new ArrayList<>();
     for (Path path : paths) {
       files.add(path.getName());
     }
@@ -326,7 +326,7 @@ public class BulkImporter {
   }
 
   private static List<KeyExtent> extentsOf(List<TabletLocation> locations) {
-    List<KeyExtent> result = new ArrayList<KeyExtent>(locations.size());
+    List<KeyExtent> result = new ArrayList<>(locations.size());
     for (TabletLocation tl : locations)
       result.add(tl.tablet_extent);
     return result;
@@ -336,7 +336,7 @@ public class BulkImporter {
       Map<Path,List<TabletLocation>> assignments, Collection<Path> paths, int numThreads) {
 
     long t1 = System.currentTimeMillis();
-    final Map<Path,Long> mapFileSizes = new TreeMap<Path,Long>();
+    final Map<Path,Long> mapFileSizes = new TreeMap<>();
 
     try {
       for (Path path : paths) {
@@ -376,13 +376,13 @@ public class BulkImporter {
 
           if (estimatedSizes == null) {
             // estimation failed, do a simple estimation
-            estimatedSizes = new TreeMap<KeyExtent,Long>();
+            estimatedSizes = new TreeMap<>();
             long estSize = (long) (mapFileSizes.get(entry.getKey()) / (double) entry.getValue().size());
             for (TabletLocation tl : entry.getValue())
               estimatedSizes.put(tl.tablet_extent, estSize);
           }
 
-          List<AssignmentInfo> assignmentInfoList = new ArrayList<AssignmentInfo>(estimatedSizes.size());
+          List<AssignmentInfo> assignmentInfoList = new ArrayList<>(estimatedSizes.size());
 
           for (Entry<KeyExtent,Long> entry2 : estimatedSizes.entrySet())
             assignmentInfoList.add(new AssignmentInfo(entry2.getKey(), entry2.getValue()));
@@ -413,7 +413,7 @@ public class BulkImporter {
   }
 
   private static Map<KeyExtent,String> locationsOf(Map<Path,List<TabletLocation>> assignments) {
-    Map<KeyExtent,String> result = new HashMap<KeyExtent,String>();
+    Map<KeyExtent,String> result = new HashMap<>();
     for (List<TabletLocation> entry : assignments.values()) {
       for (TabletLocation tl : entry) {
         result.put(tl.tablet_extent, tl.tablet_location);
@@ -455,7 +455,7 @@ public class BulkImporter {
           for (PathSize pathSize : mapFiles) {
             List<KeyExtent> existingFailures = assignmentFailures.get(pathSize.path);
             if (existingFailures == null) {
-              existingFailures = new ArrayList<KeyExtent>();
+              existingFailures = new ArrayList<>();
               assignmentFailures.put(pathSize.path, existingFailures);
             }
 
@@ -469,7 +469,7 @@ public class BulkImporter {
 
     @Override
     public void run() {
-      HashSet<Path> uniqMapFiles = new HashSet<Path>();
+      HashSet<Path> uniqMapFiles = new HashSet<>();
       for (List<PathSize> mapFiles : assignmentsPerTablet.values())
         for (PathSize ps : mapFiles)
           uniqMapFiles.add(ps.path);
@@ -506,7 +506,7 @@ public class BulkImporter {
   private Map<Path,List<KeyExtent>> assignMapFiles(String tableName, Map<Path,List<AssignmentInfo>> assignments, Map<KeyExtent,String> locations, int numThreads) {
 
     // group assignments by tablet
-    Map<KeyExtent,List<PathSize>> assignmentsPerTablet = new TreeMap<KeyExtent,List<PathSize>>();
+    Map<KeyExtent,List<PathSize>> assignmentsPerTablet = new TreeMap<>();
     for (Entry<Path,List<AssignmentInfo>> entry : assignments.entrySet()) {
       Path mapFile = entry.getKey();
       List<AssignmentInfo> tabletsToAssignMapFileTo = entry.getValue();
@@ -514,7 +514,7 @@ public class BulkImporter {
       for (AssignmentInfo ai : tabletsToAssignMapFileTo) {
         List<PathSize> mapFiles = assignmentsPerTablet.get(ai.ke);
         if (mapFiles == null) {
-          mapFiles = new ArrayList<PathSize>();
+          mapFiles = new ArrayList<>();
           assignmentsPerTablet.put(ai.ke, mapFiles);
         }
 
@@ -526,7 +526,7 @@ public class BulkImporter {
 
     Map<Path,List<KeyExtent>> assignmentFailures = Collections.synchronizedMap(new TreeMap<Path,List<KeyExtent>>());
 
-    TreeMap<String,Map<KeyExtent,List<PathSize>>> assignmentsPerTabletServer = new TreeMap<String,Map<KeyExtent,List<PathSize>>>();
+    TreeMap<String,Map<KeyExtent,List<PathSize>>> assignmentsPerTabletServer = new TreeMap<>();
 
     for (Entry<KeyExtent,List<PathSize>> entry : assignmentsPerTablet.entrySet()) {
       KeyExtent ke = entry.getKey();
@@ -537,7 +537,7 @@ public class BulkImporter {
           synchronized (assignmentFailures) {
             List<KeyExtent> failures = assignmentFailures.get(pathSize.path);
             if (failures == null) {
-              failures = new ArrayList<KeyExtent>();
+              failures = new ArrayList<>();
               assignmentFailures.put(pathSize.path, failures);
             }
 
@@ -552,7 +552,7 @@ public class BulkImporter {
 
       Map<KeyExtent,List<PathSize>> apt = assignmentsPerTabletServer.get(location);
       if (apt == null) {
-        apt = new TreeMap<KeyExtent,List<PathSize>>();
+        apt = new TreeMap<>();
         assignmentsPerTabletServer.put(location, apt);
       }
 
@@ -586,9 +586,9 @@ public class BulkImporter {
       long timeInMillis = context.getConfiguration().getTimeInMillis(Property.TSERV_BULK_TIMEOUT);
       TabletClientService.Iface client = ThriftUtil.getTServerClient(location, context, timeInMillis);
       try {
-        HashMap<KeyExtent,Map<String,org.apache.accumulo.core.data.thrift.MapFileInfo>> files = new HashMap<KeyExtent,Map<String,org.apache.accumulo.core.data.thrift.MapFileInfo>>();
+        HashMap<KeyExtent,Map<String,org.apache.accumulo.core.data.thrift.MapFileInfo>> files = new HashMap<>();
         for (Entry<KeyExtent,List<PathSize>> entry : assignmentsPerTablet.entrySet()) {
-          HashMap<String,org.apache.accumulo.core.data.thrift.MapFileInfo> tabletFiles = new HashMap<String,org.apache.accumulo.core.data.thrift.MapFileInfo>();
+          HashMap<String,org.apache.accumulo.core.data.thrift.MapFileInfo> tabletFiles = new HashMap<>();
           files.put(entry.getKey(), tabletFiles);
 
           for (PathSize pathSize : entry.getValue()) {
@@ -637,7 +637,7 @@ public class BulkImporter {
 
   public static List<TabletLocation> findOverlappingTablets(ClientContext context, VolumeManager vm, TabletLocator locator, Path file, Text startRow,
       Text endRow) throws Exception {
-    List<TabletLocation> result = new ArrayList<TabletLocation>();
+    List<TabletLocation> result = new ArrayList<>();
     Collection<ByteSequence> columnFamilies = Collections.emptyList();
     String filename = file.toString();
     // log.debug(filename + " finding overlapping tablets " + startRow + " -> " + endRow);
@@ -680,7 +680,7 @@ public class BulkImporter {
     private Set<Path> failedFailures = null;
 
     AssignmentStats(int fileCount) {
-      counts = new HashMap<KeyExtent,Integer>();
+      counts = new HashMap<>();
       numUniqueMapFiles = fileCount;
     }
 
@@ -751,7 +751,7 @@ public class BulkImporter {
       stddev = stddev / counts.size();
       stddev = Math.sqrt(stddev);
 
-      Set<KeyExtent> failedTablets = new HashSet<KeyExtent>();
+      Set<KeyExtent> failedTablets = new HashSet<>();
       for (List<KeyExtent> ft : completeFailures.values())
         failedTablets.addAll(ft);
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/client/ClientServiceHandler.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/client/ClientServiceHandler.java b/server/base/src/main/java/org/apache/accumulo/server/client/ClientServiceHandler.java
index c306e85..3beb1e0 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/client/ClientServiceHandler.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/client/ClientServiceHandler.java
@@ -262,7 +262,7 @@ public class ClientServiceHandler implements ClientService.Iface {
     security.authenticateUser(credentials, credentials);
     conf.invalidateCache();
 
-    Map<String,String> result = new HashMap<String,String>();
+    Map<String,String> result = new HashMap<>();
     for (Entry<String,String> entry : conf) {
       String key = entry.getKey();
       if (!Property.isSensitive(key))
@@ -421,7 +421,7 @@ public class ClientServiceHandler implements ClientService.Iface {
   @Override
   public List<TDiskUsage> getDiskUsage(Set<String> tables, TCredentials credentials) throws ThriftTableOperationException, ThriftSecurityException, TException {
     try {
-      HashSet<String> tableIds = new HashSet<String>();
+      HashSet<String> tableIds = new HashSet<>();
 
       for (String table : tables) {
         // ensure that table table exists
@@ -435,9 +435,9 @@ public class ClientServiceHandler implements ClientService.Iface {
       // use the same set of tableIds that were validated above to avoid race conditions
       Map<TreeSet<String>,Long> diskUsage = TableDiskUsage.getDiskUsage(context.getServerConfigurationFactory().getConfiguration(), tableIds, fs,
           context.getConnector());
-      List<TDiskUsage> retUsages = new ArrayList<TDiskUsage>();
+      List<TDiskUsage> retUsages = new ArrayList<>();
       for (Map.Entry<TreeSet<String>,Long> usageItem : diskUsage.entrySet()) {
-        retUsages.add(new TDiskUsage(new ArrayList<String>(usageItem.getKey()), usageItem.getValue()));
+        retUsages.add(new TDiskUsage(new ArrayList<>(usageItem.getKey()), usageItem.getValue()));
       }
       return retUsages;
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/conf/NamespaceConfiguration.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/conf/NamespaceConfiguration.java b/server/base/src/main/java/org/apache/accumulo/server/conf/NamespaceConfiguration.java
index 3d19723..1ca083e 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/conf/NamespaceConfiguration.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/conf/NamespaceConfiguration.java
@@ -38,7 +38,7 @@ import com.google.common.base.Predicate;
 public class NamespaceConfiguration extends ObservableConfiguration {
   private static final Logger log = LoggerFactory.getLogger(NamespaceConfiguration.class);
 
-  private static final Map<PropCacheKey,ZooCache> propCaches = new java.util.HashMap<PropCacheKey,ZooCache>();
+  private static final Map<PropCacheKey,ZooCache> propCaches = new java.util.HashMap<>();
 
   private final AccumuloConfiguration parent;
   private ZooCachePropertyAccessor propCacheAccessor = null;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/conf/ServerConfigurationFactory.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/conf/ServerConfigurationFactory.java b/server/base/src/main/java/org/apache/accumulo/server/conf/ServerConfigurationFactory.java
index 2995fc8..5cea8b5 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/conf/ServerConfigurationFactory.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/conf/ServerConfigurationFactory.java
@@ -34,9 +34,9 @@ import org.apache.accumulo.fate.zookeeper.ZooCacheFactory;
  */
 public class ServerConfigurationFactory extends ServerConfiguration {
 
-  private static final Map<String,Map<String,TableConfiguration>> tableConfigs = new HashMap<String,Map<String,TableConfiguration>>(1);
-  private static final Map<String,Map<String,NamespaceConfiguration>> namespaceConfigs = new HashMap<String,Map<String,NamespaceConfiguration>>(1);
-  private static final Map<String,Map<String,NamespaceConfiguration>> tableParentConfigs = new HashMap<String,Map<String,NamespaceConfiguration>>(1);
+  private static final Map<String,Map<String,TableConfiguration>> tableConfigs = new HashMap<>(1);
+  private static final Map<String,Map<String,NamespaceConfiguration>> namespaceConfigs = new HashMap<>(1);
+  private static final Map<String,Map<String,NamespaceConfiguration>> tableParentConfigs = new HashMap<>(1);
 
   private static void addInstanceToCaches(String iid) {
     synchronized (tableConfigs) {


[26/32] accumulo git commit: ACCUMULO-4357 Remove unneeded code for readability

Posted by ct...@apache.org.
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/client/mapred/AccumuloMultiTableInputFormatTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/client/mapred/AccumuloMultiTableInputFormatTest.java b/core/src/test/java/org/apache/accumulo/core/client/mapred/AccumuloMultiTableInputFormatTest.java
index ef19901..4e75ab6 100644
--- a/core/src/test/java/org/apache/accumulo/core/client/mapred/AccumuloMultiTableInputFormatTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/client/mapred/AccumuloMultiTableInputFormatTest.java
@@ -48,14 +48,14 @@ public class AccumuloMultiTableInputFormatTest {
     JobConf job = new JobConf();
 
     InputTableConfig table1 = new InputTableConfig().setRanges(Collections.singletonList(new Range("a", "b")))
-        .fetchColumns(Collections.singleton(new Pair<Text,Text>(new Text("CF1"), new Text("CQ1"))))
+        .fetchColumns(Collections.singleton(new Pair<>(new Text("CF1"), new Text("CQ1"))))
         .setIterators(Collections.singletonList(new IteratorSetting(50, "iter1", "iterclass1")));
 
     InputTableConfig table2 = new InputTableConfig().setRanges(Collections.singletonList(new Range("a", "b")))
-        .fetchColumns(Collections.singleton(new Pair<Text,Text>(new Text("CF1"), new Text("CQ1"))))
+        .fetchColumns(Collections.singleton(new Pair<>(new Text("CF1"), new Text("CQ1"))))
         .setIterators(Collections.singletonList(new IteratorSetting(50, "iter1", "iterclass1")));
 
-    Map<String,InputTableConfig> configMap = new HashMap<String,InputTableConfig>();
+    Map<String,InputTableConfig> configMap = new HashMap<>();
     configMap.put(table1Name, table1);
     configMap.put(table2Name, table2);
     AccumuloMultiTableInputFormat.setInputTableConfigs(job, configMap);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/client/mapred/RangeInputSplitTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/client/mapred/RangeInputSplitTest.java b/core/src/test/java/org/apache/accumulo/core/client/mapred/RangeInputSplitTest.java
index 6c75ec2..c399fb0 100644
--- a/core/src/test/java/org/apache/accumulo/core/client/mapred/RangeInputSplitTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/client/mapred/RangeInputSplitTest.java
@@ -64,13 +64,13 @@ public class RangeInputSplitTest {
   public void testAllFieldsWritable() throws IOException {
     RangeInputSplit split = new RangeInputSplit("table", "1", new Range(new Key("a"), new Key("b")), new String[] {"localhost"});
 
-    Set<Pair<Text,Text>> fetchedColumns = new HashSet<Pair<Text,Text>>();
+    Set<Pair<Text,Text>> fetchedColumns = new HashSet<>();
 
-    fetchedColumns.add(new Pair<Text,Text>(new Text("colf1"), new Text("colq1")));
-    fetchedColumns.add(new Pair<Text,Text>(new Text("colf2"), new Text("colq2")));
+    fetchedColumns.add(new Pair<>(new Text("colf1"), new Text("colq1")));
+    fetchedColumns.add(new Pair<>(new Text("colf2"), new Text("colq2")));
 
     // Fake some iterators
-    ArrayList<IteratorSetting> iterators = new ArrayList<IteratorSetting>();
+    ArrayList<IteratorSetting> iterators = new ArrayList<>();
     IteratorSetting setting = new IteratorSetting(50, SummingCombiner.class);
     setting.addOption("foo", "bar");
     iterators.add(setting);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormatTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormatTest.java b/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormatTest.java
index 56c8195..3eef024 100644
--- a/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormatTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormatTest.java
@@ -175,12 +175,12 @@ public class AccumuloInputFormatTest {
   @Test
   public void testEmptyColumnFamily() throws IOException {
     Job job = Job.getInstance();
-    Set<Pair<Text,Text>> cols = new HashSet<Pair<Text,Text>>();
+    Set<Pair<Text,Text>> cols = new HashSet<>();
     cols.add(new Pair<Text,Text>(new Text(""), null));
-    cols.add(new Pair<Text,Text>(new Text("foo"), new Text("bar")));
-    cols.add(new Pair<Text,Text>(new Text(""), new Text("bar")));
-    cols.add(new Pair<Text,Text>(new Text(""), new Text("")));
-    cols.add(new Pair<Text,Text>(new Text("foo"), new Text("")));
+    cols.add(new Pair<>(new Text("foo"), new Text("bar")));
+    cols.add(new Pair<>(new Text(""), new Text("bar")));
+    cols.add(new Pair<>(new Text(""), new Text("")));
+    cols.add(new Pair<>(new Text("foo"), new Text("")));
     AccumuloInputFormat.fetchColumns(job, cols);
     Set<Pair<Text,Text>> setCols = AccumuloInputFormat.getFetchedColumns(job);
     assertEquals(cols, setCols);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloMultiTableInputFormatTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloMultiTableInputFormatTest.java b/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloMultiTableInputFormatTest.java
index 1137916..12849fe 100644
--- a/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloMultiTableInputFormatTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloMultiTableInputFormatTest.java
@@ -47,10 +47,10 @@ public class AccumuloMultiTableInputFormatTest {
     Job job = Job.getInstance();
 
     InputTableConfig tableConfig = new InputTableConfig().setRanges(Collections.singletonList(new Range("a", "b")))
-        .fetchColumns(Collections.singleton(new Pair<Text,Text>(new Text("CF1"), new Text("CQ1"))))
+        .fetchColumns(Collections.singleton(new Pair<>(new Text("CF1"), new Text("CQ1"))))
         .setIterators(Collections.singletonList(new IteratorSetting(50, "iter1", "iterclass1")));
 
-    Map<String,InputTableConfig> configMap = new HashMap<String,InputTableConfig>();
+    Map<String,InputTableConfig> configMap = new HashMap<>();
     configMap.put(table1, tableConfig);
     configMap.put(table2, tableConfig);
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/client/mapreduce/InputTableConfigTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/client/mapreduce/InputTableConfigTest.java b/core/src/test/java/org/apache/accumulo/core/client/mapreduce/InputTableConfigTest.java
index 4953654..f6f7b2f 100644
--- a/core/src/test/java/org/apache/accumulo/core/client/mapreduce/InputTableConfigTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/client/mapreduce/InputTableConfigTest.java
@@ -66,7 +66,7 @@ public class InputTableConfigTest {
 
   @Test
   public void testSerialization_ranges() throws IOException {
-    List<Range> ranges = new ArrayList<Range>();
+    List<Range> ranges = new ArrayList<>();
     ranges.add(new Range("a", "b"));
     ranges.add(new Range("c", "d"));
     tableQueryConfig.setRanges(ranges);
@@ -79,8 +79,8 @@ public class InputTableConfigTest {
 
   @Test
   public void testSerialization_columns() throws IOException {
-    Set<Pair<Text,Text>> columns = new HashSet<Pair<Text,Text>>();
-    columns.add(new Pair<Text,Text>(new Text("cf1"), new Text("cq1")));
+    Set<Pair<Text,Text>> columns = new HashSet<>();
+    columns.add(new Pair<>(new Text("cf1"), new Text("cq1")));
     columns.add(new Pair<Text,Text>(new Text("cf2"), null));
     tableQueryConfig.fetchColumns(columns);
 
@@ -92,7 +92,7 @@ public class InputTableConfigTest {
 
   @Test
   public void testSerialization_iterators() throws IOException {
-    List<IteratorSetting> settings = new ArrayList<IteratorSetting>();
+    List<IteratorSetting> settings = new ArrayList<>();
     settings.add(new IteratorSetting(50, "iter", "iterclass"));
     settings.add(new IteratorSetting(55, "iter2", "iterclass2"));
     tableQueryConfig.setIterators(settings);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/client/mapreduce/RangeInputSplitTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/client/mapreduce/RangeInputSplitTest.java b/core/src/test/java/org/apache/accumulo/core/client/mapreduce/RangeInputSplitTest.java
index 1cf8c55..0eb8010 100644
--- a/core/src/test/java/org/apache/accumulo/core/client/mapreduce/RangeInputSplitTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/client/mapreduce/RangeInputSplitTest.java
@@ -66,13 +66,13 @@ public class RangeInputSplitTest {
   public void testAllFieldsWritable() throws IOException {
     RangeInputSplit split = new RangeInputSplit("table", "1", new Range(new Key("a"), new Key("b")), new String[] {"localhost"});
 
-    Set<Pair<Text,Text>> fetchedColumns = new HashSet<Pair<Text,Text>>();
+    Set<Pair<Text,Text>> fetchedColumns = new HashSet<>();
 
-    fetchedColumns.add(new Pair<Text,Text>(new Text("colf1"), new Text("colq1")));
-    fetchedColumns.add(new Pair<Text,Text>(new Text("colf2"), new Text("colq2")));
+    fetchedColumns.add(new Pair<>(new Text("colf1"), new Text("colq1")));
+    fetchedColumns.add(new Pair<>(new Text("colf2"), new Text("colq2")));
 
     // Fake some iterators
-    ArrayList<IteratorSetting> iterators = new ArrayList<IteratorSetting>();
+    ArrayList<IteratorSetting> iterators = new ArrayList<>();
     IteratorSetting setting = new IteratorSetting(50, SummingCombiner.class);
     setting.addOption("foo", "bar");
     iterators.add(setting);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/client/mapreduce/impl/BatchInputSplitTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/client/mapreduce/impl/BatchInputSplitTest.java b/core/src/test/java/org/apache/accumulo/core/client/mapreduce/impl/BatchInputSplitTest.java
index 74c3438..17c781d 100644
--- a/core/src/test/java/org/apache/accumulo/core/client/mapreduce/impl/BatchInputSplitTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/client/mapreduce/impl/BatchInputSplitTest.java
@@ -68,13 +68,13 @@ public class BatchInputSplitTest {
     Range[] ranges = new Range[] {new Range(new Key("a"), new Key("b"))};
     BatchInputSplit split = new BatchInputSplit("table", "1", Arrays.asList(ranges), new String[] {"localhost"});
 
-    Set<Pair<Text,Text>> fetchedColumns = new HashSet<Pair<Text,Text>>();
+    Set<Pair<Text,Text>> fetchedColumns = new HashSet<>();
 
-    fetchedColumns.add(new Pair<Text,Text>(new Text("colf1"), new Text("colq1")));
-    fetchedColumns.add(new Pair<Text,Text>(new Text("colf2"), new Text("colq2")));
+    fetchedColumns.add(new Pair<>(new Text("colf1"), new Text("colq1")));
+    fetchedColumns.add(new Pair<>(new Text("colf2"), new Text("colq2")));
 
     // Fake some iterators
-    ArrayList<IteratorSetting> iterators = new ArrayList<IteratorSetting>();
+    ArrayList<IteratorSetting> iterators = new ArrayList<>();
     IteratorSetting setting = new IteratorSetting(50, SummingCombiner.class);
     setting.addOption("foo", "bar");
     iterators.add(setting);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/client/mock/MockConnectorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/client/mock/MockConnectorTest.java b/core/src/test/java/org/apache/accumulo/core/client/mock/MockConnectorTest.java
index 4a78a4b..b70cb00 100644
--- a/core/src/test/java/org/apache/accumulo/core/client/mock/MockConnectorTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/client/mock/MockConnectorTest.java
@@ -125,7 +125,7 @@ public class MockConnectorTest {
 
     Mutation good = new Mutation("good");
     good.put(asText(random.nextInt()), asText(random.nextInt()), new Value("good".getBytes()));
-    List<Mutation> mutations = new ArrayList<Mutation>();
+    List<Mutation> mutations = new ArrayList<>();
     mutations.add(good);
     mutations.add(bad);
     try {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/client/mock/MockNamespacesTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/client/mock/MockNamespacesTest.java b/core/src/test/java/org/apache/accumulo/core/client/mock/MockNamespacesTest.java
index c1f39e2..ca12838 100644
--- a/core/src/test/java/org/apache/accumulo/core/client/mock/MockNamespacesTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/client/mock/MockNamespacesTest.java
@@ -248,7 +248,7 @@ public class MockNamespacesTest {
     conn.tableOperations().create(tableName);
 
     IteratorSetting setting = new IteratorSetting(250, iter, SimpleFilter.class.getName());
-    HashSet<IteratorScope> scope = new HashSet<IteratorScope>();
+    HashSet<IteratorScope> scope = new HashSet<>();
     scope.add(IteratorScope.scan);
     conn.namespaceOperations().attachIterator(namespace, setting, EnumSet.copyOf(scope));
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/client/mock/MockTableOperationsTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/client/mock/MockTableOperationsTest.java b/core/src/test/java/org/apache/accumulo/core/client/mock/MockTableOperationsTest.java
index 9bd1455..58f3777 100644
--- a/core/src/test/java/org/apache/accumulo/core/client/mock/MockTableOperationsTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/client/mock/MockTableOperationsTest.java
@@ -228,9 +228,9 @@ public class MockTableOperationsTest {
     FileSKVWriter writer = FileOperations.getInstance().newWriterBuilder().forFile(tempFile.toString(), fs, defaultConf)
         .withTableConfiguration(AccumuloConfiguration.getDefaultConfiguration()).build();
     writer.startDefaultLocalityGroup();
-    List<Pair<Key,Value>> keyVals = new ArrayList<Pair<Key,Value>>();
+    List<Pair<Key,Value>> keyVals = new ArrayList<>();
     for (int i = 0; i < 5; i++) {
-      keyVals.add(new Pair<Key,Value>(new Key("a" + i, "b" + i, "c" + i, new ColumnVisibility(""), 1000l + i), new Value(Integer.toString(i).getBytes())));
+      keyVals.add(new Pair<>(new Key("a" + i, "b" + i, "c" + i, new ColumnVisibility(""), 1000l + i), new Value(Integer.toString(i).getBytes())));
     }
     for (Pair<Key,Value> keyVal : keyVals) {
       writer.append(keyVal.getFirst(), keyVal.getSecond());

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/client/security/SecurityErrorCodeTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/client/security/SecurityErrorCodeTest.java b/core/src/test/java/org/apache/accumulo/core/client/security/SecurityErrorCodeTest.java
index 75d4c35..8843e3a 100644
--- a/core/src/test/java/org/apache/accumulo/core/client/security/SecurityErrorCodeTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/client/security/SecurityErrorCodeTest.java
@@ -28,8 +28,8 @@ public class SecurityErrorCodeTest {
 
   @Test
   public void testEnumsSame() {
-    HashSet<String> secNames1 = new HashSet<String>();
-    HashSet<String> secNames2 = new HashSet<String>();
+    HashSet<String> secNames1 = new HashSet<>();
+    HashSet<String> secNames2 = new HashSet<>();
 
     for (SecurityErrorCode sec : SecurityErrorCode.values())
       secNames1.add(sec.name());

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/conf/ConfigSanityCheckTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/conf/ConfigSanityCheckTest.java b/core/src/test/java/org/apache/accumulo/core/conf/ConfigSanityCheckTest.java
index f34bf3b..7ac2113 100644
--- a/core/src/test/java/org/apache/accumulo/core/conf/ConfigSanityCheckTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/conf/ConfigSanityCheckTest.java
@@ -27,7 +27,7 @@ public class ConfigSanityCheckTest {
 
   @Before
   public void setUp() {
-    m = new java.util.HashMap<String,String>();
+    m = new java.util.HashMap<>();
   }
 
   @Test

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/conf/CredentialProviderFactoryShimTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/conf/CredentialProviderFactoryShimTest.java b/core/src/test/java/org/apache/accumulo/core/conf/CredentialProviderFactoryShimTest.java
index 37dff20..e540b72 100644
--- a/core/src/test/java/org/apache/accumulo/core/conf/CredentialProviderFactoryShimTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/conf/CredentialProviderFactoryShimTest.java
@@ -83,7 +83,7 @@ public class CredentialProviderFactoryShimTest {
     List<String> keys = CredentialProviderFactoryShim.getKeys(conf);
     Assert.assertNotNull(keys);
 
-    Assert.assertEquals(expectation.keySet(), new HashSet<String>(keys));
+    Assert.assertEquals(expectation.keySet(), new HashSet<>(keys));
     for (String expectedKey : keys) {
       char[] value = CredentialProviderFactoryShim.getValueFromCredentialProvider(conf, expectedKey);
       Assert.assertNotNull(value);
@@ -96,7 +96,7 @@ public class CredentialProviderFactoryShimTest {
     String absPath = getKeyStoreUrl(populatedKeyStore);
     Configuration conf = new Configuration();
     conf.set(CredentialProviderFactoryShim.CREDENTIAL_PROVIDER_PATH, absPath);
-    Map<String,String> expectations = new HashMap<String,String>();
+    Map<String,String> expectations = new HashMap<>();
     expectations.put("key1", "value1");
     expectations.put("key2", "value2");
 
@@ -117,7 +117,7 @@ public class CredentialProviderFactoryShimTest {
     String populatedAbsPath = getKeyStoreUrl(populatedKeyStore), emptyAbsPath = getKeyStoreUrl(emptyKeyStore);
     Configuration conf = new Configuration();
     conf.set(CredentialProviderFactoryShim.CREDENTIAL_PROVIDER_PATH, populatedAbsPath + "," + emptyAbsPath);
-    Map<String,String> expectations = new HashMap<String,String>();
+    Map<String,String> expectations = new HashMap<>();
     expectations.put("key1", "value1");
     expectations.put("key2", "value2");
 
@@ -186,7 +186,7 @@ public class CredentialProviderFactoryShimTest {
       Configuration cpConf = CredentialProviderFactoryShim.getConfiguration(dfsConfiguration, "jceks://hdfs/accumulo.jceks");
 
       // The values in the keystore
-      Map<String,String> expectations = new HashMap<String,String>();
+      Map<String,String> expectations = new HashMap<>();
       expectations.put("key1", "value1");
       expectations.put("key2", "value2");
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/conf/DefaultConfigurationTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/conf/DefaultConfigurationTest.java b/core/src/test/java/org/apache/accumulo/core/conf/DefaultConfigurationTest.java
index 9566f2e..cb6810c 100644
--- a/core/src/test/java/org/apache/accumulo/core/conf/DefaultConfigurationTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/conf/DefaultConfigurationTest.java
@@ -42,7 +42,7 @@ public class DefaultConfigurationTest {
   @Test
   public void testGetProperties() {
     Predicate<String> all = Predicates.alwaysTrue();
-    Map<String,String> p = new java.util.HashMap<String,String>();
+    Map<String,String> p = new java.util.HashMap<>();
     c.getProperties(p, all);
     assertEquals(Property.MASTER_CLIENTPORT.getDefaultValue(), p.get(Property.MASTER_CLIENTPORT.getKey()));
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/conf/PropertyTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/conf/PropertyTest.java b/core/src/test/java/org/apache/accumulo/core/conf/PropertyTest.java
index 297f5f8..79f2f21 100644
--- a/core/src/test/java/org/apache/accumulo/core/conf/PropertyTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/conf/PropertyTest.java
@@ -36,12 +36,12 @@ import org.junit.Test;
 public class PropertyTest {
   @Test
   public void testProperties() {
-    HashSet<String> validPrefixes = new HashSet<String>();
+    HashSet<String> validPrefixes = new HashSet<>();
     for (Property prop : Property.values())
       if (prop.getType().equals(PropertyType.PREFIX))
         validPrefixes.add(prop.getKey());
 
-    HashSet<String> propertyNames = new HashSet<String>();
+    HashSet<String> propertyNames = new HashSet<>();
     for (Property prop : Property.values()) {
       // make sure properties default values match their type
       if (prop.getType() == PropertyType.PREFIX) {
@@ -72,7 +72,7 @@ public class PropertyTest {
 
   @Test
   public void testPorts() {
-    HashSet<Integer> usedPorts = new HashSet<Integer>();
+    HashSet<Integer> usedPorts = new HashSet<>();
     for (Property prop : Property.values())
       if (prop.getType().equals(PropertyType.PORT)) {
         int port = Integer.parseInt(prop.getDefaultValue());
@@ -98,7 +98,7 @@ public class PropertyTest {
 
   @Test
   public void testSensitiveKeys() {
-    final TreeMap<String,String> extras = new TreeMap<String,String>();
+    final TreeMap<String,String> extras = new TreeMap<>();
     extras.put("trace.token.property.blah", "something");
 
     AccumuloConfiguration conf = new DefaultConfiguration() {
@@ -126,14 +126,14 @@ public class PropertyTest {
         };
       }
     };
-    TreeSet<String> expected = new TreeSet<String>();
+    TreeSet<String> expected = new TreeSet<>();
     for (Entry<String,String> entry : conf) {
       String key = entry.getKey();
       if (key.equals(Property.INSTANCE_SECRET.getKey()) || key.toLowerCase().contains("password") || key.toLowerCase().endsWith("secret")
           || key.startsWith(Property.TRACE_TOKEN_PROPERTY_PREFIX.getKey()))
         expected.add(key);
     }
-    TreeSet<String> actual = new TreeSet<String>();
+    TreeSet<String> actual = new TreeSet<>();
     for (Entry<String,String> entry : conf) {
       String key = entry.getKey();
       if (Property.isSensitive(key))

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/conf/SiteConfigurationTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/conf/SiteConfigurationTest.java b/core/src/test/java/org/apache/accumulo/core/conf/SiteConfigurationTest.java
index a0d48b9..f89dbfa 100644
--- a/core/src/test/java/org/apache/accumulo/core/conf/SiteConfigurationTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/conf/SiteConfigurationTest.java
@@ -66,7 +66,7 @@ public class SiteConfigurationTest {
 
     EasyMock.replay(siteCfg);
 
-    Map<String,String> props = new HashMap<String,String>();
+    Map<String,String> props = new HashMap<>();
     Predicate<String> all = Predicates.alwaysTrue();
     siteCfg.getProperties(props, all);
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/data/KeyExtentTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/data/KeyExtentTest.java b/core/src/test/java/org/apache/accumulo/core/data/KeyExtentTest.java
index 724bfee..79968be 100644
--- a/core/src/test/java/org/apache/accumulo/core/data/KeyExtentTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/data/KeyExtentTest.java
@@ -52,7 +52,7 @@ public class KeyExtentTest {
 
   @Before
   public void setup() {
-    set0 = new TreeSet<KeyExtent>();
+    set0 = new TreeSet<>();
   }
 
   @Test
@@ -90,7 +90,7 @@ public class KeyExtentTest {
     assertNull(KeyExtent.findContainingExtent(nke("t", "1", null), set0));
     assertNull(KeyExtent.findContainingExtent(nke("t", null, "0"), set0));
 
-    TreeSet<KeyExtent> set1 = new TreeSet<KeyExtent>();
+    TreeSet<KeyExtent> set1 = new TreeSet<>();
 
     set1.add(nke("t", null, null));
 
@@ -99,7 +99,7 @@ public class KeyExtentTest {
     assertEquals(nke("t", null, null), KeyExtent.findContainingExtent(nke("t", "1", null), set1));
     assertEquals(nke("t", null, null), KeyExtent.findContainingExtent(nke("t", null, "0"), set1));
 
-    TreeSet<KeyExtent> set2 = new TreeSet<KeyExtent>();
+    TreeSet<KeyExtent> set2 = new TreeSet<>();
 
     set2.add(nke("t", "g", null));
     set2.add(nke("t", null, "g"));
@@ -123,7 +123,7 @@ public class KeyExtentTest {
     assertEquals(nke("t", null, "g"), KeyExtent.findContainingExtent(nke("t", "z", "h"), set2));
     assertEquals(nke("t", null, "g"), KeyExtent.findContainingExtent(nke("t", null, "h"), set2));
 
-    TreeSet<KeyExtent> set3 = new TreeSet<KeyExtent>();
+    TreeSet<KeyExtent> set3 = new TreeSet<>();
 
     set3.add(nke("t", "g", null));
     set3.add(nke("t", "s", "g"));
@@ -149,7 +149,7 @@ public class KeyExtentTest {
     assertEquals(nke("t", "g", null), KeyExtent.findContainingExtent(nke("t", "f", null), set3));
     assertNull(KeyExtent.findContainingExtent(nke("t", "h", null), set3));
 
-    TreeSet<KeyExtent> set4 = new TreeSet<KeyExtent>();
+    TreeSet<KeyExtent> set4 = new TreeSet<>();
 
     set4.add(nke("t1", "d", null));
     set4.add(nke("t1", "q", "d"));
@@ -185,14 +185,14 @@ public class KeyExtentTest {
 
   @Test
   public void testOverlaps() {
-    SortedMap<KeyExtent,Object> set0 = new TreeMap<KeyExtent,Object>();
+    SortedMap<KeyExtent,Object> set0 = new TreeMap<>();
     set0.put(nke("a", null, null), null);
 
     // Nothing overlaps with the empty set
     assertFalse(overlaps(nke("t", null, null), null));
     assertFalse(overlaps(nke("t", null, null), set0));
 
-    SortedMap<KeyExtent,Object> set1 = new TreeMap<KeyExtent,Object>();
+    SortedMap<KeyExtent,Object> set1 = new TreeMap<>();
 
     // Everything overlaps with the infinite range
     set1.put(nke("t", null, null), null);
@@ -206,7 +206,7 @@ public class KeyExtentTest {
     assertTrue(overlaps(nke("t", null, "a"), set1));
 
     // simple overlaps
-    SortedMap<KeyExtent,Object> set2 = new TreeMap<KeyExtent,Object>();
+    SortedMap<KeyExtent,Object> set2 = new TreeMap<>();
     set2.put(nke("a", null, null), null);
     set2.put(nke("t", "m", "j"), null);
     set2.put(nke("z", null, null), null);
@@ -225,7 +225,7 @@ public class KeyExtentTest {
     assertFalse(overlaps(nke("t", null, "m"), set2));
 
     // infinite overlaps
-    SortedMap<KeyExtent,Object> set3 = new TreeMap<KeyExtent,Object>();
+    SortedMap<KeyExtent,Object> set3 = new TreeMap<>();
     set3.put(nke("t", "j", null), null);
     set3.put(nke("t", null, "m"), null);
     assertTrue(overlaps(nke("t", "k", "a"), set3));
@@ -237,7 +237,7 @@ public class KeyExtentTest {
     // falls between
     assertFalse(overlaps(nke("t", "l", "k"), set3));
 
-    SortedMap<KeyExtent,Object> set4 = new TreeMap<KeyExtent,Object>();
+    SortedMap<KeyExtent,Object> set4 = new TreeMap<>();
     set4.put(nke("t", null, null), null);
     assertTrue(overlaps(nke("t", "k", "a"), set4));
     assertTrue(overlaps(nke("t", "k", null), set4));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/data/KeyTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/data/KeyTest.java b/core/src/test/java/org/apache/accumulo/core/data/KeyTest.java
index 9cee691..c94c6b4 100644
--- a/core/src/test/java/org/apache/accumulo/core/data/KeyTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/data/KeyTest.java
@@ -141,7 +141,7 @@ public class KeyTest {
 
   @Test
   public void testCompressDecompress() {
-    List<KeyValue> kvs = new ArrayList<KeyValue>();
+    List<KeyValue> kvs = new ArrayList<>();
     kvs.add(new KeyValue(new Key(), new byte[] {}));
     kvs.add(new KeyValue(new Key("r"), new byte[] {}));
     kvs.add(new KeyValue(new Key("r", "cf"), new byte[] {}));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/data/OldMutation.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/data/OldMutation.java b/core/src/test/java/org/apache/accumulo/core/data/OldMutation.java
index a40f4e0..5e7d7bd 100644
--- a/core/src/test/java/org/apache/accumulo/core/data/OldMutation.java
+++ b/core/src/test/java/org/apache/accumulo/core/data/OldMutation.java
@@ -221,7 +221,7 @@ public class OldMutation implements Writable {
       put(val);
     } else {
       if (values == null)
-        values = new ArrayList<byte[]>();
+        values = new ArrayList<>();
       byte copy[] = new byte[val.length];
       System.arraycopy(val, 0, copy, 0, val.length);
       values.add(copy);
@@ -428,7 +428,7 @@ public class OldMutation implements Writable {
     if (!valuesPresent) {
       values = null;
     } else {
-      values = new ArrayList<byte[]>();
+      values = new ArrayList<>();
       int numValues = in.readInt();
       for (int i = 0; i < numValues; i++) {
         len = in.readInt();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/data/RangeTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/data/RangeTest.java b/core/src/test/java/org/apache/accumulo/core/data/RangeTest.java
index 2641ef1..c4837fe 100644
--- a/core/src/test/java/org/apache/accumulo/core/data/RangeTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/data/RangeTest.java
@@ -49,8 +49,8 @@ public class RangeTest extends TestCase {
   }
 
   private void check(List<Range> rl, List<Range> expected) {
-    HashSet<Range> s1 = new HashSet<Range>(rl);
-    HashSet<Range> s2 = new HashSet<Range>(expected);
+    HashSet<Range> s1 = new HashSet<>(rl);
+    HashSet<Range> s2 = new HashSet<>(expected);
 
     assertTrue("got : " + rl + " expected : " + expected, s1.equals(s2));
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/data/ValueTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/data/ValueTest.java b/core/src/test/java/org/apache/accumulo/core/data/ValueTest.java
index 0cae140..93fab1f 100644
--- a/core/src/test/java/org/apache/accumulo/core/data/ValueTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/data/ValueTest.java
@@ -202,7 +202,7 @@ public class ValueTest {
   @Test
   @Deprecated
   public void testToArray() {
-    List<byte[]> l = new java.util.ArrayList<byte[]>();
+    List<byte[]> l = new java.util.ArrayList<>();
     byte[] one = toBytes("one");
     byte[] two = toBytes("two");
     byte[] three = toBytes("three");

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/file/BloomFilterLayerLookupTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/file/BloomFilterLayerLookupTest.java b/core/src/test/java/org/apache/accumulo/core/file/BloomFilterLayerLookupTest.java
index 5470722..065438c 100644
--- a/core/src/test/java/org/apache/accumulo/core/file/BloomFilterLayerLookupTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/file/BloomFilterLayerLookupTest.java
@@ -59,12 +59,12 @@ public class BloomFilterLayerLookupTest {
 
   @Test
   public void test() throws IOException {
-    HashSet<Integer> valsSet = new HashSet<Integer>();
+    HashSet<Integer> valsSet = new HashSet<>();
     for (int i = 0; i < 100000; i++) {
       valsSet.add(random.nextInt(Integer.MAX_VALUE));
     }
 
-    ArrayList<Integer> vals = new ArrayList<Integer>(valsSet);
+    ArrayList<Integer> vals = new ArrayList<>(valsSet);
     Collections.sort(vals);
 
     ConfigurationCopy acuconf = new ConfigurationCopy(AccumuloConfiguration.getDefaultConfiguration());

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/file/rfile/CreateCompatTestFile.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/file/rfile/CreateCompatTestFile.java b/core/src/test/java/org/apache/accumulo/core/file/rfile/CreateCompatTestFile.java
index ad29a69..e7c8b46 100644
--- a/core/src/test/java/org/apache/accumulo/core/file/rfile/CreateCompatTestFile.java
+++ b/core/src/test/java/org/apache/accumulo/core/file/rfile/CreateCompatTestFile.java
@@ -32,7 +32,7 @@ import org.apache.hadoop.fs.Path;
 public class CreateCompatTestFile {
 
   public static Set<ByteSequence> ncfs(String... colFams) {
-    HashSet<ByteSequence> cfs = new HashSet<ByteSequence>();
+    HashSet<ByteSequence> cfs = new HashSet<>();
 
     for (String cf : colFams) {
       cfs.add(new ArrayByteSequence(cf));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/file/rfile/RFileTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/file/rfile/RFileTest.java b/core/src/test/java/org/apache/accumulo/core/file/rfile/RFileTest.java
index a60dfa4..069077c 100644
--- a/core/src/test/java/org/apache/accumulo/core/file/rfile/RFileTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/file/rfile/RFileTest.java
@@ -110,7 +110,7 @@ public class RFileTest {
     }
   }
 
-  private static final Collection<ByteSequence> EMPTY_COL_FAMS = new ArrayList<ByteSequence>();
+  private static final Collection<ByteSequence> EMPTY_COL_FAMS = new ArrayList<>();
 
   @Rule
   public TemporaryFolder tempFolder = new TemporaryFolder(new File(System.getProperty("user.dir") + "/target"));
@@ -373,8 +373,8 @@ public class RFileTest {
 
     int val = 0;
 
-    ArrayList<Key> expectedKeys = new ArrayList<Key>(10000);
-    ArrayList<Value> expectedValues = new ArrayList<Value>(10000);
+    ArrayList<Key> expectedKeys = new ArrayList<>(10000);
+    ArrayList<Value> expectedValues = new ArrayList<>(10000);
 
     for (int row = 0; row < 4; row++) {
       String rowS = nf("r_", row);
@@ -797,7 +797,7 @@ public class RFileTest {
   }
 
   public static Set<ByteSequence> ncfs(String... colFams) {
-    HashSet<ByteSequence> cfs = new HashSet<ByteSequence>();
+    HashSet<ByteSequence> cfs = new HashSet<>();
 
     for (String cf : colFams) {
       cfs.add(new ArrayByteSequence(cf));
@@ -1394,7 +1394,7 @@ public class RFileTest {
   }
 
   private Set<ByteSequence> t18ncfs(int... colFams) {
-    HashSet<ByteSequence> cfs = new HashSet<ByteSequence>();
+    HashSet<ByteSequence> cfs = new HashSet<>();
     for (int i : colFams) {
       cfs.add(new ArrayByteSequence(t18ncf(i)));
     }
@@ -1411,7 +1411,7 @@ public class RFileTest {
   private void t18Verify(Set<ByteSequence> cfs, SortedKeyValueIterator<Key,Value> iter, Reader reader, HashSet<ByteSequence> allCf, int eialg, int eealg)
       throws IOException {
 
-    HashSet<ByteSequence> colFamsSeen = new HashSet<ByteSequence>();
+    HashSet<ByteSequence> colFamsSeen = new HashSet<>();
 
     iter.seek(new Range(), cfs, true);
     assertEquals(eialg, reader.getNumLocalityGroupsSeeked());
@@ -1421,7 +1421,7 @@ public class RFileTest {
       iter.next();
     }
 
-    HashSet<ByteSequence> expected = new HashSet<ByteSequence>(allCf);
+    HashSet<ByteSequence> expected = new HashSet<>(allCf);
     expected.retainAll(cfs);
     assertEquals(expected, colFamsSeen);
 
@@ -1434,7 +1434,7 @@ public class RFileTest {
       iter.next();
     }
 
-    HashSet<ByteSequence> nonExcluded = new HashSet<ByteSequence>(allCf);
+    HashSet<ByteSequence> nonExcluded = new HashSet<>(allCf);
     nonExcluded.removeAll(cfs);
     assertEquals(nonExcluded, colFamsSeen);
   }
@@ -1447,7 +1447,7 @@ public class RFileTest {
 
     trf.openWriter(false);
 
-    HashSet<ByteSequence> allCf = new HashSet<ByteSequence>();
+    HashSet<ByteSequence> allCf = new HashSet<>();
 
     trf.writer.startNewLocalityGroup("lg1", t18ncfs(0));
     for (int i = 0; i < 1; i++)
@@ -1850,7 +1850,7 @@ public class RFileTest {
 
   private static void add(TestRFile trf, Key key, Value val, Hasher dataHasher, List<Entry<Key,Value>> sample, Sampler sampler) throws IOException {
     if (sampler.accept(key)) {
-      sample.add(new AbstractMap.SimpleImmutableEntry<Key,Value>(key, val));
+      sample.add(new AbstractMap.SimpleImmutableEntry<>(key, val));
     }
 
     hash(dataHasher, key, val);
@@ -1862,7 +1862,7 @@ public class RFileTest {
     ArrayList<Entry<Key,Value>> ret = new ArrayList<>();
 
     while (sample.hasTop()) {
-      ret.add(new AbstractMap.SimpleImmutableEntry<Key,Value>(new Key(sample.getTopKey()), new Value(sample.getTopValue())));
+      ret.add(new AbstractMap.SimpleImmutableEntry<>(new Key(sample.getTopKey()), new Value(sample.getTopValue())));
       sample.next();
     }
 
@@ -1929,7 +1929,7 @@ public class RFileTest {
 
       for (int modulus : new int[] {19, 103, 1019}) {
         Hasher dataHasher = Hashing.md5().newHasher();
-        List<Entry<Key,Value>> sampleData = new ArrayList<Entry<Key,Value>>();
+        List<Entry<Key,Value>> sampleData = new ArrayList<>();
 
         ConfigurationCopy sampleConf = new ConfigurationCopy(conf == null ? AccumuloConfiguration.getDefaultConfiguration() : conf);
         sampleConf.set(Property.TABLE_SAMPLER, RowSampler.class.getName());
@@ -2009,8 +2009,8 @@ public class RFileTest {
       RFile.setSampleBufferSize(sampleBufferSize);
 
       for (int modulus : new int[] {19, 103, 1019}) {
-        List<Entry<Key,Value>> sampleDataLG1 = new ArrayList<Entry<Key,Value>>();
-        List<Entry<Key,Value>> sampleDataLG2 = new ArrayList<Entry<Key,Value>>();
+        List<Entry<Key,Value>> sampleDataLG1 = new ArrayList<>();
+        List<Entry<Key,Value>> sampleDataLG2 = new ArrayList<>();
 
         ConfigurationCopy sampleConf = new ConfigurationCopy(conf == null ? AccumuloConfiguration.getDefaultConfiguration() : conf);
         sampleConf.set(Property.TABLE_SAMPLER, RowSampler.class.getName());
@@ -2035,9 +2035,9 @@ public class RFileTest {
           Value v3 = new Value(("" + r * 113).getBytes());
 
           if (sampler.accept(k1)) {
-            sampleDataLG1.add(new AbstractMap.SimpleImmutableEntry<Key,Value>(k1, v1));
-            sampleDataLG1.add(new AbstractMap.SimpleImmutableEntry<Key,Value>(k2, v2));
-            sampleDataLG1.add(new AbstractMap.SimpleImmutableEntry<Key,Value>(k3, v3));
+            sampleDataLG1.add(new AbstractMap.SimpleImmutableEntry<>(k1, v1));
+            sampleDataLG1.add(new AbstractMap.SimpleImmutableEntry<>(k2, v2));
+            sampleDataLG1.add(new AbstractMap.SimpleImmutableEntry<>(k3, v3));
           }
 
           trf.writer.append(k1, v1);
@@ -2054,7 +2054,7 @@ public class RFileTest {
           Value v1 = new Value(("" + r).getBytes());
 
           if (sampler.accept(k1)) {
-            sampleDataLG2.add(new AbstractMap.SimpleImmutableEntry<Key,Value>(k1, v1));
+            sampleDataLG2.add(new AbstractMap.SimpleImmutableEntry<>(k1, v1));
           }
 
           trf.writer.append(k1, v1);
@@ -2076,7 +2076,7 @@ public class RFileTest {
         checkSample(sample, sampleDataLG2, ncfs("metaA", "metaB"), false);
         checkSample(sample, sampleDataLG2, ncfs("dataA"), true);
 
-        ArrayList<Entry<Key,Value>> allSampleData = new ArrayList<Entry<Key,Value>>();
+        ArrayList<Entry<Key,Value>> allSampleData = new ArrayList<>();
         allSampleData.addAll(sampleDataLG1);
         allSampleData.addAll(sampleDataLG2);
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/file/rfile/RelativeKeyTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/file/rfile/RelativeKeyTest.java b/core/src/test/java/org/apache/accumulo/core/file/rfile/RelativeKeyTest.java
index 4ca4b6c..4334ccc 100644
--- a/core/src/test/java/org/apache/accumulo/core/file/rfile/RelativeKeyTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/file/rfile/RelativeKeyTest.java
@@ -122,9 +122,9 @@ public class RelativeKeyTest {
     baos = new ByteArrayOutputStream();
     DataOutputStream out = new DataOutputStream(baos);
 
-    expectedKeys = new ArrayList<Key>(initialListSize);
-    expectedValues = new ArrayList<Value>(initialListSize);
-    expectedPositions = new ArrayList<Integer>(initialListSize);
+    expectedKeys = new ArrayList<>(initialListSize);
+    expectedValues = new ArrayList<>(initialListSize);
+    expectedPositions = new ArrayList<>(initialListSize);
 
     Key prev = null;
     int val = 0;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/iterators/AggregatingIteratorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/iterators/AggregatingIteratorTest.java b/core/src/test/java/org/apache/accumulo/core/iterators/AggregatingIteratorTest.java
index e39d0d5..09064a5 100644
--- a/core/src/test/java/org/apache/accumulo/core/iterators/AggregatingIteratorTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/iterators/AggregatingIteratorTest.java
@@ -39,7 +39,7 @@ import org.junit.Test;
 
 public class AggregatingIteratorTest {
 
-  private static final Collection<ByteSequence> EMPTY_COL_FAMS = new ArrayList<ByteSequence>();
+  private static final Collection<ByteSequence> EMPTY_COL_FAMS = new ArrayList<>();
 
   /**
    * @deprecated since 1.4; visible only for testing
@@ -101,7 +101,7 @@ public class AggregatingIteratorTest {
   @Test
   public void test1() throws IOException {
 
-    TreeMap<Key,Value> tm1 = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm1 = new TreeMap<>();
 
     // keys that do not aggregate
     nkv(tm1, 1, 1, 1, 1, false, "2");
@@ -162,7 +162,7 @@ public class AggregatingIteratorTest {
   @SuppressWarnings("deprecation")
   @Test
   public void test2() throws IOException {
-    TreeMap<Key,Value> tm1 = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm1 = new TreeMap<>();
 
     // keys that aggregate
     nkv(tm1, 1, 1, 1, 1, false, "2");
@@ -171,7 +171,7 @@ public class AggregatingIteratorTest {
 
     AggregatingIterator ai = new AggregatingIterator();
 
-    Map<String,String> opts = new HashMap<String,String>();
+    Map<String,String> opts = new HashMap<>();
 
     opts.put("cf001", SummationAggregator.class.getName());
 
@@ -224,7 +224,7 @@ public class AggregatingIteratorTest {
   @Test
   public void test3() throws IOException {
 
-    TreeMap<Key,Value> tm1 = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm1 = new TreeMap<>();
 
     // keys that aggregate
     nkv(tm1, 1, 1, 1, 1, false, "2");
@@ -237,7 +237,7 @@ public class AggregatingIteratorTest {
 
     AggregatingIterator ai = new AggregatingIterator();
 
-    Map<String,String> opts = new HashMap<String,String>();
+    Map<String,String> opts = new HashMap<>();
 
     opts.put("cf001", SummationAggregator.class.getName());
 
@@ -290,7 +290,7 @@ public class AggregatingIteratorTest {
   @Test
   public void test4() throws IOException {
 
-    TreeMap<Key,Value> tm1 = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm1 = new TreeMap<>();
 
     // keys that do not aggregate
     nkv(tm1, 0, 0, 1, 1, false, "7");
@@ -306,7 +306,7 @@ public class AggregatingIteratorTest {
 
     AggregatingIterator ai = new AggregatingIterator();
 
-    Map<String,String> opts = new HashMap<String,String>();
+    Map<String,String> opts = new HashMap<>();
 
     opts.put("cf001", SummationAggregator.class.getName());
 
@@ -367,20 +367,20 @@ public class AggregatingIteratorTest {
     // try aggregating across multiple data sets that contain
     // the exact same keys w/ different values
 
-    TreeMap<Key,Value> tm1 = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm1 = new TreeMap<>();
     nkv(tm1, 1, 1, 1, 1, false, "2");
 
-    TreeMap<Key,Value> tm2 = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm2 = new TreeMap<>();
     nkv(tm2, 1, 1, 1, 1, false, "3");
 
-    TreeMap<Key,Value> tm3 = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm3 = new TreeMap<>();
     nkv(tm3, 1, 1, 1, 1, false, "4");
 
     AggregatingIterator ai = new AggregatingIterator();
-    Map<String,String> opts = new HashMap<String,String>();
+    Map<String,String> opts = new HashMap<>();
     opts.put("cf001", SummationAggregator.class.getName());
 
-    List<SortedKeyValueIterator<Key,Value>> sources = new ArrayList<SortedKeyValueIterator<Key,Value>>(3);
+    List<SortedKeyValueIterator<Key,Value>> sources = new ArrayList<>(3);
     sources.add(new SortedMapIterator(tm1));
     sources.add(new SortedMapIterator(tm2));
     sources.add(new SortedMapIterator(tm3));
@@ -397,7 +397,7 @@ public class AggregatingIteratorTest {
   @SuppressWarnings("deprecation")
   @Test
   public void test6() throws IOException {
-    TreeMap<Key,Value> tm1 = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm1 = new TreeMap<>();
 
     // keys that aggregate
     nkv(tm1, 1, 1, 1, 1, false, "2");
@@ -406,7 +406,7 @@ public class AggregatingIteratorTest {
 
     AggregatingIterator ai = new AggregatingIterator();
 
-    Map<String,String> opts = new HashMap<String,String>();
+    Map<String,String> opts = new HashMap<>();
 
     opts.put("cf001", SummationAggregator.class.getName());
 
@@ -425,7 +425,7 @@ public class AggregatingIteratorTest {
   public void test7() throws IOException {
     // test that delete is not aggregated
 
-    TreeMap<Key,Value> tm1 = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm1 = new TreeMap<>();
 
     nkv(tm1, 1, 1, 1, 2, true, "");
     nkv(tm1, 1, 1, 1, 3, false, "4");
@@ -433,7 +433,7 @@ public class AggregatingIteratorTest {
 
     AggregatingIterator ai = new AggregatingIterator();
 
-    Map<String,String> opts = new HashMap<String,String>();
+    Map<String,String> opts = new HashMap<>();
 
     opts.put("cf001", SummationAggregator.class.getName());
 
@@ -453,7 +453,7 @@ public class AggregatingIteratorTest {
     ai.next();
     assertFalse(ai.hasTop());
 
-    tm1 = new TreeMap<Key,Value>();
+    tm1 = new TreeMap<>();
     nkv(tm1, 1, 1, 1, 2, true, "");
     ai = new AggregatingIterator();
     ai.init(new SortedMapIterator(tm1), opts, new DefaultIteratorEnvironment());

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/iterators/FirstEntryInRowIteratorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/iterators/FirstEntryInRowIteratorTest.java b/core/src/test/java/org/apache/accumulo/core/iterators/FirstEntryInRowIteratorTest.java
index 5455aa6..34b01bc 100644
--- a/core/src/test/java/org/apache/accumulo/core/iterators/FirstEntryInRowIteratorTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/iterators/FirstEntryInRowIteratorTest.java
@@ -51,12 +51,12 @@ public class FirstEntryInRowIteratorTest {
 
   @Test
   public void test() throws IOException {
-    TreeMap<Key,Value> sourceMap = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> sourceMap = new TreeMap<>();
     Value emptyValue = new Value("".getBytes());
     sourceMap.put(new Key("r1", "cf", "cq"), emptyValue);
     sourceMap.put(new Key("r2", "cf", "cq"), emptyValue);
     sourceMap.put(new Key("r3", "cf", "cq"), emptyValue);
-    TreeMap<Key,Value> resultMap = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> resultMap = new TreeMap<>();
     long numSourceEntries = sourceMap.size();
     long numNexts = process(sourceMap, resultMap, new Range(), 10);
     assertEquals(numNexts, numSourceEntries);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/iterators/FirstEntryInRowTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/iterators/FirstEntryInRowTest.java b/core/src/test/java/org/apache/accumulo/core/iterators/FirstEntryInRowTest.java
index 8214c2c..9a5174b 100644
--- a/core/src/test/java/org/apache/accumulo/core/iterators/FirstEntryInRowTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/iterators/FirstEntryInRowTest.java
@@ -34,8 +34,8 @@ import org.apache.hadoop.io.Text;
 import org.junit.Test;
 
 public class FirstEntryInRowTest {
-  private static final Map<String,String> EMPTY_MAP = new HashMap<String,String>();
-  private static final Collection<ByteSequence> EMPTY_SET = new HashSet<ByteSequence>();
+  private static final Map<String,String> EMPTY_MAP = new HashMap<>();
+  private static final Collection<ByteSequence> EMPTY_SET = new HashSet<>();
 
   private Key nk(String row, String cf, String cq, long time) {
     return new Key(new Text(row), new Text(cf), new Text(cq), time);
@@ -73,7 +73,7 @@ public class FirstEntryInRowTest {
 
   @Test
   public void test1() throws Exception {
-    TreeMap<Key,Value> tm1 = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm1 = new TreeMap<>();
     put(tm1, "r1", "cf1", "cq1", 5, "v1");
     put(tm1, "r1", "cf1", "cq3", 5, "v2");
     put(tm1, "r2", "cf1", "cq1", 5, "v3");
@@ -94,7 +94,7 @@ public class FirstEntryInRowTest {
 
   @Test
   public void test2() throws Exception {
-    TreeMap<Key,Value> tm1 = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm1 = new TreeMap<>();
 
     for (int r = 0; r < 5; r++) {
       for (int cf = r; cf < 100; cf++) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/iterators/IteratorUtilTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/iterators/IteratorUtilTest.java b/core/src/test/java/org/apache/accumulo/core/iterators/IteratorUtilTest.java
index 4c4303c..c9b9dcf 100644
--- a/core/src/test/java/org/apache/accumulo/core/iterators/IteratorUtilTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/iterators/IteratorUtilTest.java
@@ -45,7 +45,7 @@ import org.junit.Test;
 
 public class IteratorUtilTest {
 
-  private static final Collection<ByteSequence> EMPTY_COL_FAMS = new ArrayList<ByteSequence>();
+  private static final Collection<ByteSequence> EMPTY_COL_FAMS = new ArrayList<>();
 
   static class WrappedIter implements SortedKeyValueIterator<Key,Value> {
 
@@ -131,7 +131,7 @@ public class IteratorUtilTest {
     conf.set(Property.TABLE_ITERATOR_PREFIX + IteratorScope.minc.name() + ".addIter", "1," + AddingIter.class.getName());
     conf.set(Property.TABLE_ITERATOR_PREFIX + IteratorScope.minc.name() + ".sqIter", "2," + SquaringIter.class.getName());
 
-    TreeMap<Key,Value> tm = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm = new TreeMap<>();
 
     MultiIteratorTest.nkv(tm, 1, 0, false, "1");
     MultiIteratorTest.nkv(tm, 2, 0, false, "2");
@@ -163,7 +163,7 @@ public class IteratorUtilTest {
     // try loading for a different scope
     AccumuloConfiguration conf = new ConfigurationCopy();
 
-    TreeMap<Key,Value> tm = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm = new TreeMap<>();
 
     MultiIteratorTest.nkv(tm, 1, 0, false, "1");
     MultiIteratorTest.nkv(tm, 2, 0, false, "2");
@@ -196,7 +196,7 @@ public class IteratorUtilTest {
 
     ConfigurationCopy conf = new ConfigurationCopy();
 
-    TreeMap<Key,Value> tm = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm = new TreeMap<>();
 
     MultiIteratorTest.nkv(tm, 1, 0, false, "1");
     MultiIteratorTest.nkv(tm, 2, 0, false, "2");
@@ -235,7 +235,7 @@ public class IteratorUtilTest {
     conf.set(Property.TABLE_ITERATOR_PREFIX + IteratorScope.minc.name() + ".addIter.opt.amount", "7");
     conf.set(Property.TABLE_ITERATOR_PREFIX + IteratorScope.minc.name() + ".sqIter", "2," + SquaringIter.class.getName());
 
-    TreeMap<Key,Value> tm = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm = new TreeMap<>();
 
     MultiIteratorTest.nkv(tm, 1, 0, false, "1");
     MultiIteratorTest.nkv(tm, 2, 0, false, "2");
@@ -271,7 +271,7 @@ public class IteratorUtilTest {
     conf.set(Property.TABLE_ITERATOR_PREFIX + IteratorScope.minc.name() + ".filter.opt.ttl", "100");
     conf.set(Property.TABLE_ITERATOR_PREFIX + IteratorScope.minc.name() + ".filter.opt.currentTime", "1000");
 
-    TreeMap<Key,Value> tm = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm = new TreeMap<>();
 
     MultiIteratorTest.nkv(tm, 1, 850, false, "1");
     MultiIteratorTest.nkv(tm, 2, 950, false, "2");
@@ -292,7 +292,7 @@ public class IteratorUtilTest {
 
   @Test
   public void onlyReadsRelevantIteratorScopeConfigurations() throws Exception {
-    Map<String,String> data = new HashMap<String,String>();
+    Map<String,String> data = new HashMap<>();
 
     // Make some configuration items, one with a bogus scope
     data.put(Property.TABLE_ITERATOR_SCAN_PREFIX + "foo", "50," + SummingCombiner.class.getName());
@@ -302,8 +302,8 @@ public class IteratorUtilTest {
 
     AccumuloConfiguration conf = new ConfigurationCopy(data);
 
-    List<IterInfo> iterators = new ArrayList<IterInfo>();
-    Map<String,Map<String,String>> options = new HashMap<String,Map<String,String>>();
+    List<IterInfo> iterators = new ArrayList<>();
+    Map<String,Map<String,String>> options = new HashMap<>();
 
     IteratorUtil.parseIterConf(IteratorScope.scan, iterators, options, conf);
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/iterators/system/ColumnFamilySkippingIteratorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/iterators/system/ColumnFamilySkippingIteratorTest.java b/core/src/test/java/org/apache/accumulo/core/iterators/system/ColumnFamilySkippingIteratorTest.java
index fbe7fd5..33c398f 100644
--- a/core/src/test/java/org/apache/accumulo/core/iterators/system/ColumnFamilySkippingIteratorTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/iterators/system/ColumnFamilySkippingIteratorTest.java
@@ -32,7 +32,7 @@ import org.apache.hadoop.io.Text;
 
 public class ColumnFamilySkippingIteratorTest extends TestCase {
 
-  private static final Collection<ByteSequence> EMPTY_SET = new HashSet<ByteSequence>();
+  private static final Collection<ByteSequence> EMPTY_SET = new HashSet<>();
 
   Key nk(String row, String cf, String cq, long time) {
     return new Key(new Text(row), new Text(cf), new Text(cq), time);
@@ -62,7 +62,7 @@ public class ColumnFamilySkippingIteratorTest extends TestCase {
   }
 
   public void test1() throws Exception {
-    TreeMap<Key,Value> tm1 = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm1 = new TreeMap<>();
     put(tm1, "r1", "cf1", "cq1", 5, "v1");
     put(tm1, "r1", "cf1", "cq3", 5, "v2");
     put(tm1, "r2", "cf1", "cq1", 5, "v3");
@@ -77,14 +77,14 @@ public class ColumnFamilySkippingIteratorTest extends TestCase {
 
     cfi.seek(new Range(), EMPTY_SET, false);
     assertTrue(cfi.hasTop());
-    TreeMap<Key,Value> tm2 = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm2 = new TreeMap<>();
     while (cfi.hasTop()) {
       tm2.put(cfi.getTopKey(), cfi.getTopValue());
       cfi.next();
     }
     assertEquals(tm1, tm2);
 
-    HashSet<ByteSequence> colfams = new HashSet<ByteSequence>();
+    HashSet<ByteSequence> colfams = new HashSet<>();
     colfams.add(new ArrayByteSequence("cf2"));
     cfi.seek(new Range(), colfams, true);
     aten(cfi, "r2", "cf2", "cq4", 5, "v4");
@@ -108,7 +108,7 @@ public class ColumnFamilySkippingIteratorTest extends TestCase {
   }
 
   public void test2() throws Exception {
-    TreeMap<Key,Value> tm1 = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm1 = new TreeMap<>();
 
     for (int r = 0; r < 10; r++) {
       for (int cf = 0; cf < 1000; cf++) {
@@ -118,13 +118,13 @@ public class ColumnFamilySkippingIteratorTest extends TestCase {
       }
     }
 
-    HashSet<ByteSequence> allColfams = new HashSet<ByteSequence>();
+    HashSet<ByteSequence> allColfams = new HashSet<>();
     for (int cf = 0; cf < 1000; cf++) {
       allColfams.add(new ArrayByteSequence(String.format("%06d", cf)));
     }
 
     ColumnFamilySkippingIterator cfi = new ColumnFamilySkippingIterator(new SortedMapIterator(tm1));
-    HashSet<ByteSequence> colfams = new HashSet<ByteSequence>();
+    HashSet<ByteSequence> colfams = new HashSet<>();
 
     runTest(cfi, 30000, 0, allColfams, colfams);
 
@@ -162,11 +162,11 @@ public class ColumnFamilySkippingIteratorTest extends TestCase {
   private void runTest(ColumnFamilySkippingIterator cfi, int total, int expected, HashSet<ByteSequence> allColfams, HashSet<ByteSequence> colfams)
       throws Exception {
     cfi.seek(new Range(), colfams, true);
-    HashSet<ByteSequence> excpected1 = new HashSet<ByteSequence>(colfams);
+    HashSet<ByteSequence> excpected1 = new HashSet<>(colfams);
     excpected1.retainAll(allColfams);
     runTest(cfi, expected, excpected1);
 
-    HashSet<ByteSequence> excpected2 = new HashSet<ByteSequence>(allColfams);
+    HashSet<ByteSequence> excpected2 = new HashSet<>(allColfams);
     excpected2.removeAll(colfams);
     cfi.seek(new Range(), colfams, false);
     runTest(cfi, total - expected, excpected2);
@@ -175,7 +175,7 @@ public class ColumnFamilySkippingIteratorTest extends TestCase {
   private void runTest(ColumnFamilySkippingIterator cfi, int expected, HashSet<ByteSequence> colfams) throws Exception {
     int count = 0;
 
-    HashSet<ByteSequence> ocf = new HashSet<ByteSequence>();
+    HashSet<ByteSequence> ocf = new HashSet<>();
 
     while (cfi.hasTop()) {
       count++;
@@ -189,7 +189,7 @@ public class ColumnFamilySkippingIteratorTest extends TestCase {
 
   public void test3() throws Exception {
     // construct test where ColumnFamilySkippingIterator might try to seek past the end of the user supplied range
-    TreeMap<Key,Value> tm1 = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm1 = new TreeMap<>();
 
     for (int r = 0; r < 3; r++) {
       for (int cf = 4; cf < 1000; cf++) {
@@ -201,7 +201,7 @@ public class ColumnFamilySkippingIteratorTest extends TestCase {
 
     CountingIterator ci = new CountingIterator(new SortedMapIterator(tm1));
     ColumnFamilySkippingIterator cfi = new ColumnFamilySkippingIterator(ci);
-    HashSet<ByteSequence> colfams = new HashSet<ByteSequence>();
+    HashSet<ByteSequence> colfams = new HashSet<>();
     colfams.add(new ArrayByteSequence(String.format("%06d", 4)));
 
     Range range = new Range(nk(0, 4, 0, 6), true, nk(0, 400, 0, 6), true);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/iterators/system/ColumnFilterTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/iterators/system/ColumnFilterTest.java b/core/src/test/java/org/apache/accumulo/core/iterators/system/ColumnFilterTest.java
index 3fd66b4..cfed90f 100644
--- a/core/src/test/java/org/apache/accumulo/core/iterators/system/ColumnFilterTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/iterators/system/ColumnFilterTest.java
@@ -40,7 +40,7 @@ public class ColumnFilterTest extends TestCase {
   }
 
   public void test1() {
-    HashSet<Column> columns = new HashSet<Column>();
+    HashSet<Column> columns = new HashSet<>();
 
     columns.add(nc("cf1"));
 
@@ -52,7 +52,7 @@ public class ColumnFilterTest extends TestCase {
   }
 
   public void test2() {
-    HashSet<Column> columns = new HashSet<Column>();
+    HashSet<Column> columns = new HashSet<>();
 
     columns.add(nc("cf1"));
     columns.add(nc("cf2", "cq1"));
@@ -65,7 +65,7 @@ public class ColumnFilterTest extends TestCase {
   }
 
   public void test3() {
-    HashSet<Column> columns = new HashSet<Column>();
+    HashSet<Column> columns = new HashSet<>();
 
     columns.add(nc("cf2", "cq1"));
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/iterators/system/DeletingIteratorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/iterators/system/DeletingIteratorTest.java b/core/src/test/java/org/apache/accumulo/core/iterators/system/DeletingIteratorTest.java
index 4fd48d5..9082a36 100644
--- a/core/src/test/java/org/apache/accumulo/core/iterators/system/DeletingIteratorTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/iterators/system/DeletingIteratorTest.java
@@ -33,7 +33,7 @@ import org.apache.hadoop.io.Text;
 
 public class DeletingIteratorTest extends TestCase {
 
-  private static final Collection<ByteSequence> EMPTY_COL_FAMS = new ArrayList<ByteSequence>();
+  private static final Collection<ByteSequence> EMPTY_COL_FAMS = new ArrayList<>();
 
   public void test1() {
     Text colf = new Text("a");
@@ -42,7 +42,7 @@ public class DeletingIteratorTest extends TestCase {
     Value dvDel = new Value("old".getBytes());
     Value dvNew = new Value("new".getBytes());
 
-    TreeMap<Key,Value> tm = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm = new TreeMap<>();
     Key k;
 
     for (int i = 0; i < 2; i++) {
@@ -67,7 +67,7 @@ public class DeletingIteratorTest extends TestCase {
       DeletingIterator it = new DeletingIterator(new SortedMapIterator(tm), false);
       it.seek(new Range(), EMPTY_COL_FAMS, false);
 
-      TreeMap<Key,Value> tmOut = new TreeMap<Key,Value>();
+      TreeMap<Key,Value> tmOut = new TreeMap<>();
       while (it.hasTop()) {
         tmOut.put(it.getTopKey(), it.getTopValue());
         it.next();
@@ -88,7 +88,7 @@ public class DeletingIteratorTest extends TestCase {
     try {
       DeletingIterator it = new DeletingIterator(new SortedMapIterator(tm), true);
       it.seek(new Range(), EMPTY_COL_FAMS, false);
-      TreeMap<Key,Value> tmOut = new TreeMap<Key,Value>();
+      TreeMap<Key,Value> tmOut = new TreeMap<>();
       while (it.hasTop()) {
         tmOut.put(it.getTopKey(), it.getTopValue());
         it.next();
@@ -115,7 +115,7 @@ public class DeletingIteratorTest extends TestCase {
 
   // seek test
   public void test2() throws IOException {
-    TreeMap<Key,Value> tm = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm = new TreeMap<>();
 
     nkv(tm, "r000", 4, false, "v4");
     nkv(tm, "r000", 3, false, "v3");
@@ -165,7 +165,7 @@ public class DeletingIteratorTest extends TestCase {
 
   // test delete with same timestamp as existing key
   public void test3() throws IOException {
-    TreeMap<Key,Value> tm = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm = new TreeMap<>();
 
     nkv(tm, "r000", 3, false, "v3");
     nkv(tm, "r000", 2, false, "v2");
@@ -190,7 +190,7 @@ public class DeletingIteratorTest extends TestCase {
 
   // test range inclusiveness
   public void test4() throws IOException {
-    TreeMap<Key,Value> tm = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm = new TreeMap<>();
 
     nkv(tm, "r000", 3, false, "v3");
     nkv(tm, "r000", 2, false, "v2");

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/iterators/system/MultiIteratorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/iterators/system/MultiIteratorTest.java b/core/src/test/java/org/apache/accumulo/core/iterators/system/MultiIteratorTest.java
index bbf87e5..8949c92 100644
--- a/core/src/test/java/org/apache/accumulo/core/iterators/system/MultiIteratorTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/iterators/system/MultiIteratorTest.java
@@ -36,7 +36,7 @@ import junit.framework.TestCase;
 
 public class MultiIteratorTest extends TestCase {
 
-  private static final Collection<ByteSequence> EMPTY_COL_FAMS = new ArrayList<ByteSequence>();
+  private static final Collection<ByteSequence> EMPTY_COL_FAMS = new ArrayList<>();
 
   public static Key nk(int row, long ts) {
     return new Key(nr(row), ts);
@@ -57,7 +57,7 @@ public class MultiIteratorTest extends TestCase {
   }
 
   void verify(int start, int end, Key seekKey, Text endRow, Text prevEndRow, boolean init, boolean incrRow, List<TreeMap<Key,Value>> maps) throws IOException {
-    List<SortedKeyValueIterator<Key,Value>> iters = new ArrayList<SortedKeyValueIterator<Key,Value>>(maps.size());
+    List<SortedKeyValueIterator<Key,Value>> iters = new ArrayList<>(maps.size());
 
     for (TreeMap<Key,Value> map : maps) {
       iters.add(new SortedMapIterator(map));
@@ -121,14 +121,14 @@ public class MultiIteratorTest extends TestCase {
   public void test1() throws IOException {
     // TEST non overlapping inputs
 
-    TreeMap<Key,Value> tm1 = new TreeMap<Key,Value>();
-    List<TreeMap<Key,Value>> tmpList = new ArrayList<TreeMap<Key,Value>>(2);
+    TreeMap<Key,Value> tm1 = new TreeMap<>();
+    List<TreeMap<Key,Value>> tmpList = new ArrayList<>(2);
 
     for (int i = 0; i < 4; i++) {
       nkv(tm1, 0, i, false, "v" + i);
     }
     tmpList.add(tm1);
-    tm1 = new TreeMap<Key,Value>();
+    tm1 = new TreeMap<>();
     for (int i = 4; i < 8; i++) {
       nkv(tm1, 0, i, false, "v" + i);
     }
@@ -144,9 +144,9 @@ public class MultiIteratorTest extends TestCase {
   public void test2() throws IOException {
     // TEST overlapping inputs
 
-    TreeMap<Key,Value> tm1 = new TreeMap<Key,Value>();
-    TreeMap<Key,Value> tm2 = new TreeMap<Key,Value>();
-    List<TreeMap<Key,Value>> tmpList = new ArrayList<TreeMap<Key,Value>>(2);
+    TreeMap<Key,Value> tm1 = new TreeMap<>();
+    TreeMap<Key,Value> tm2 = new TreeMap<>();
+    List<TreeMap<Key,Value>> tmpList = new ArrayList<>(2);
 
     for (int i = 0; i < 8; i++) {
       if (i % 2 == 0)
@@ -167,8 +167,8 @@ public class MultiIteratorTest extends TestCase {
   public void test3() throws IOException {
     // TEST single input
 
-    TreeMap<Key,Value> tm1 = new TreeMap<Key,Value>();
-    List<TreeMap<Key,Value>> tmpList = new ArrayList<TreeMap<Key,Value>>(2);
+    TreeMap<Key,Value> tm1 = new TreeMap<>();
+    List<TreeMap<Key,Value>> tmpList = new ArrayList<>(2);
 
     for (int i = 0; i < 8; i++) {
       nkv(tm1, 0, i, false, "v" + i);
@@ -186,9 +186,9 @@ public class MultiIteratorTest extends TestCase {
   public void test4() throws IOException {
     // TEST empty input
 
-    TreeMap<Key,Value> tm1 = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm1 = new TreeMap<>();
 
-    List<SortedKeyValueIterator<Key,Value>> skvil = new ArrayList<SortedKeyValueIterator<Key,Value>>(1);
+    List<SortedKeyValueIterator<Key,Value>> skvil = new ArrayList<>(1);
     skvil.add(new SortedMapIterator(tm1));
     MultiIterator mi = new MultiIterator(skvil, true);
 
@@ -201,9 +201,9 @@ public class MultiIteratorTest extends TestCase {
   public void test5() throws IOException {
     // TEST overlapping inputs AND prevRow AND endRow AND seek
 
-    TreeMap<Key,Value> tm1 = new TreeMap<Key,Value>();
-    TreeMap<Key,Value> tm2 = new TreeMap<Key,Value>();
-    List<TreeMap<Key,Value>> tmpList = new ArrayList<TreeMap<Key,Value>>(2);
+    TreeMap<Key,Value> tm1 = new TreeMap<>();
+    TreeMap<Key,Value> tm2 = new TreeMap<>();
+    List<TreeMap<Key,Value>> tmpList = new ArrayList<>(2);
 
     for (int i = 0; i < 8; i++) {
       if (i % 2 == 0)
@@ -257,12 +257,12 @@ public class MultiIteratorTest extends TestCase {
 
   public void test6() throws IOException {
     // TEst setting an endKey
-    TreeMap<Key,Value> tm1 = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm1 = new TreeMap<>();
     nkv(tm1, 3, 0, false, "1");
     nkv(tm1, 4, 0, false, "2");
     nkv(tm1, 6, 0, false, "3");
 
-    List<SortedKeyValueIterator<Key,Value>> skvil = new ArrayList<SortedKeyValueIterator<Key,Value>>(1);
+    List<SortedKeyValueIterator<Key,Value>> skvil = new ArrayList<>(1);
     skvil.add(new SortedMapIterator(tm1));
     MultiIterator mi = new MultiIterator(skvil, true);
     mi.seek(new Range(null, true, nk(5, 9), false), EMPTY_COL_FAMS, false);
@@ -330,7 +330,7 @@ public class MultiIteratorTest extends TestCase {
 
   public void test7() throws IOException {
     // TEst setting an endKey
-    TreeMap<Key,Value> tm1 = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm1 = new TreeMap<>();
     nkv(tm1, 0, 3, false, "1");
     nkv(tm1, 0, 2, false, "2");
     nkv(tm1, 0, 1, false, "3");
@@ -341,7 +341,7 @@ public class MultiIteratorTest extends TestCase {
     nkv(tm1, 2, 1, false, "8");
     nkv(tm1, 2, 0, false, "9");
 
-    List<SortedKeyValueIterator<Key,Value>> skvil = new ArrayList<SortedKeyValueIterator<Key,Value>>(1);
+    List<SortedKeyValueIterator<Key,Value>> skvil = new ArrayList<>(1);
     skvil.add(new SortedMapIterator(tm1));
 
     KeyExtent extent = new KeyExtent("tablename", nr(1), nr(0));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/iterators/system/SourceSwitchingIteratorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/iterators/system/SourceSwitchingIteratorTest.java b/core/src/test/java/org/apache/accumulo/core/iterators/system/SourceSwitchingIteratorTest.java
index 7567871..1ebf9df 100644
--- a/core/src/test/java/org/apache/accumulo/core/iterators/system/SourceSwitchingIteratorTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/iterators/system/SourceSwitchingIteratorTest.java
@@ -60,7 +60,7 @@ public class SourceSwitchingIteratorTest extends TestCase {
 
     DataSource next;
     SortedKeyValueIterator<Key,Value> iter;
-    List<TestDataSource> copies = new ArrayList<TestDataSource>();
+    List<TestDataSource> copies = new ArrayList<>();
     AtomicBoolean iflag;
 
     TestDataSource(SortedKeyValueIterator<Key,Value> iter) {
@@ -111,7 +111,7 @@ public class SourceSwitchingIteratorTest extends TestCase {
   }
 
   public void test1() throws Exception {
-    TreeMap<Key,Value> tm1 = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm1 = new TreeMap<>();
     put(tm1, "r1", "cf1", "cq1", 5, "v1");
     put(tm1, "r1", "cf1", "cq3", 5, "v2");
     put(tm1, "r2", "cf1", "cq1", 5, "v3");
@@ -128,7 +128,7 @@ public class SourceSwitchingIteratorTest extends TestCase {
   }
 
   public void test2() throws Exception {
-    TreeMap<Key,Value> tm1 = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm1 = new TreeMap<>();
     put(tm1, "r1", "cf1", "cq1", 5, "v1");
     put(tm1, "r1", "cf1", "cq3", 5, "v2");
     put(tm1, "r2", "cf1", "cq1", 5, "v3");
@@ -140,7 +140,7 @@ public class SourceSwitchingIteratorTest extends TestCase {
     ssi.seek(new Range(), new ArrayList<ByteSequence>(), false);
     ane(ssi, "r1", "cf1", "cq1", 5, "v1", true);
 
-    TreeMap<Key,Value> tm2 = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm2 = new TreeMap<>();
     put(tm2, "r1", "cf1", "cq1", 5, "v4");
     put(tm2, "r1", "cf1", "cq3", 5, "v5");
     put(tm2, "r2", "cf1", "cq1", 5, "v6");
@@ -157,7 +157,7 @@ public class SourceSwitchingIteratorTest extends TestCase {
   public void test3() throws Exception {
     // test switching after a row
 
-    TreeMap<Key,Value> tm1 = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm1 = new TreeMap<>();
     put(tm1, "r1", "cf1", "cq1", 5, "v1");
     put(tm1, "r1", "cf1", "cq2", 5, "v2");
     put(tm1, "r1", "cf1", "cq3", 5, "v3");
@@ -172,7 +172,7 @@ public class SourceSwitchingIteratorTest extends TestCase {
     ssi.seek(new Range(), new ArrayList<ByteSequence>(), false);
     ane(ssi, "r1", "cf1", "cq1", 5, "v1", true);
 
-    TreeMap<Key,Value> tm2 = new TreeMap<Key,Value>(tm1);
+    TreeMap<Key,Value> tm2 = new TreeMap<>(tm1);
     put(tm2, "r1", "cf1", "cq5", 5, "v7"); // should not see this because it should not switch until the row is finished
     put(tm2, "r2", "cf1", "cq1", 5, "v8"); // should see this new row after it switches
 
@@ -192,7 +192,7 @@ public class SourceSwitchingIteratorTest extends TestCase {
 
   public void test4() throws Exception {
     // ensure switch is done on initial seek
-    TreeMap<Key,Value> tm1 = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm1 = new TreeMap<>();
     put(tm1, "r1", "cf1", "cq1", 5, "v1");
     put(tm1, "r1", "cf1", "cq2", 5, "v2");
 
@@ -200,7 +200,7 @@ public class SourceSwitchingIteratorTest extends TestCase {
     TestDataSource tds = new TestDataSource(smi);
     SourceSwitchingIterator ssi = new SourceSwitchingIterator(tds, false);
 
-    TreeMap<Key,Value> tm2 = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm2 = new TreeMap<>();
     put(tm2, "r1", "cf1", "cq1", 6, "v3");
     put(tm2, "r1", "cf1", "cq2", 6, "v4");
 
@@ -217,7 +217,7 @@ public class SourceSwitchingIteratorTest extends TestCase {
 
   public void test5() throws Exception {
     // esnure switchNow() works w/ deepCopy()
-    TreeMap<Key,Value> tm1 = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm1 = new TreeMap<>();
     put(tm1, "r1", "cf1", "cq1", 5, "v1");
     put(tm1, "r1", "cf1", "cq2", 5, "v2");
 
@@ -227,7 +227,7 @@ public class SourceSwitchingIteratorTest extends TestCase {
 
     SortedKeyValueIterator<Key,Value> dc1 = ssi.deepCopy(null);
 
-    TreeMap<Key,Value> tm2 = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm2 = new TreeMap<>();
     put(tm2, "r1", "cf1", "cq1", 6, "v3");
     put(tm2, "r2", "cf1", "cq2", 6, "v4");
 
@@ -248,7 +248,7 @@ public class SourceSwitchingIteratorTest extends TestCase {
 
   public void testSetInterrupt() throws Exception {
 
-    TreeMap<Key,Value> tm1 = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm1 = new TreeMap<>();
     put(tm1, "r1", "cf1", "cq1", 5, "v1");
 
     SortedMapIterator smi = new SortedMapIterator(tm1);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/iterators/system/TimeSettingIteratorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/iterators/system/TimeSettingIteratorTest.java b/core/src/test/java/org/apache/accumulo/core/iterators/system/TimeSettingIteratorTest.java
index 3dbe7ca..9a363a1 100644
--- a/core/src/test/java/org/apache/accumulo/core/iterators/system/TimeSettingIteratorTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/iterators/system/TimeSettingIteratorTest.java
@@ -34,7 +34,7 @@ public class TimeSettingIteratorTest {
 
   @Test
   public void test1() throws Exception {
-    TreeMap<Key,Value> tm1 = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm1 = new TreeMap<>();
 
     tm1.put(new Key("r0", "cf1", "cq1", 9l), new Value("v0".getBytes()));
     tm1.put(new Key("r1", "cf1", "cq1", Long.MAX_VALUE), new Value("v1".getBytes()));
@@ -87,7 +87,7 @@ public class TimeSettingIteratorTest {
 
   @Test
   public void testAvoidKeyCopy() throws Exception {
-    TreeMap<Key,Value> tm1 = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm1 = new TreeMap<>();
     final Key k = new Key("r0", "cf1", "cq1", 9l);
 
     tm1.put(k, new Value("v0".getBytes()));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/iterators/system/VisibilityFilterTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/iterators/system/VisibilityFilterTest.java b/core/src/test/java/org/apache/accumulo/core/iterators/system/VisibilityFilterTest.java
index 667aa5f..68323c6 100644
--- a/core/src/test/java/org/apache/accumulo/core/iterators/system/VisibilityFilterTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/iterators/system/VisibilityFilterTest.java
@@ -34,7 +34,7 @@ import org.apache.log4j.Logger;
 public class VisibilityFilterTest extends TestCase {
 
   public void testBadVisibility() throws IOException {
-    TreeMap<Key,Value> tm = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm = new TreeMap<>();
 
     tm.put(new Key("r1", "cf1", "cq1", "A&"), new Value(new byte[0]));
     VisibilityFilter filter = new VisibilityFilter(new SortedMapIterator(tm), new Authorizations("A"), "".getBytes());

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/iterators/user/BigDecimalCombinerTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/iterators/user/BigDecimalCombinerTest.java b/core/src/test/java/org/apache/accumulo/core/iterators/user/BigDecimalCombinerTest.java
index dfcb869..861ce02 100644
--- a/core/src/test/java/org/apache/accumulo/core/iterators/user/BigDecimalCombinerTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/iterators/user/BigDecimalCombinerTest.java
@@ -42,7 +42,7 @@ import org.junit.Test;
 
 public class BigDecimalCombinerTest {
 
-  private static final Collection<ByteSequence> EMPTY_COL_FAMS = new ArrayList<ByteSequence>();
+  private static final Collection<ByteSequence> EMPTY_COL_FAMS = new ArrayList<>();
   private static double delta = 0.00001;
 
   Encoder<BigDecimal> encoder;
@@ -53,7 +53,7 @@ public class BigDecimalCombinerTest {
   @Before
   public void setup() {
     encoder = new BigDecimalCombiner.BigDecimalEncoder();
-    tm1 = new TreeMap<Key,Value>();
+    tm1 = new TreeMap<>();
     columns = Collections.singletonList(new IteratorSetting.Column("cf001"));
 
     // keys that will aggregate

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/iterators/user/ColumnSliceFilterTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/iterators/user/ColumnSliceFilterTest.java b/core/src/test/java/org/apache/accumulo/core/iterators/user/ColumnSliceFilterTest.java
index 11ad192..698d9ec 100644
--- a/core/src/test/java/org/apache/accumulo/core/iterators/user/ColumnSliceFilterTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/iterators/user/ColumnSliceFilterTest.java
@@ -40,9 +40,9 @@ import org.junit.Test;
 
 public class ColumnSliceFilterTest {
 
-  private static final Collection<ByteSequence> EMPTY_COL_FAMS = new ArrayList<ByteSequence>();
+  private static final Collection<ByteSequence> EMPTY_COL_FAMS = new ArrayList<>();
 
-  private static final SortedMap<Key,Value> TEST_DATA = new TreeMap<Key,Value>();
+  private static final SortedMap<Key,Value> TEST_DATA = new TreeMap<>();
   private static final Key KEY_1 = nkv(TEST_DATA, "boo1", "yup", "20080201", "dog");
   private static final Key KEY_2 = nkv(TEST_DATA, "boo1", "yap", "20080202", "cat");
   private static final Key KEY_3 = nkv(TEST_DATA, "boo2", "yap", "20080203", "hamster");

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/iterators/user/CombinerTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/iterators/user/CombinerTest.java b/core/src/test/java/org/apache/accumulo/core/iterators/user/CombinerTest.java
index a442534..6300532 100644
--- a/core/src/test/java/org/apache/accumulo/core/iterators/user/CombinerTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/iterators/user/CombinerTest.java
@@ -58,7 +58,7 @@ import org.junit.Test;
 
 public class CombinerTest {
 
-  private static final Collection<ByteSequence> EMPTY_COL_FAMS = new ArrayList<ByteSequence>();
+  private static final Collection<ByteSequence> EMPTY_COL_FAMS = new ArrayList<>();
 
   static class CombinerIteratorEnvironment extends DefaultIteratorEnvironment {
 
@@ -115,7 +115,7 @@ public class CombinerTest {
   public void test1() throws IOException {
     Encoder<Long> encoder = LongCombiner.VAR_LEN_ENCODER;
 
-    TreeMap<Key,Value> tm1 = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm1 = new TreeMap<>();
 
     // keys that do not aggregate
     nkv(tm1, 1, 1, 1, 1, false, 2l, encoder);
@@ -180,7 +180,7 @@ public class CombinerTest {
   public void test2() throws IOException {
     Encoder<Long> encoder = LongCombiner.VAR_LEN_ENCODER;
 
-    TreeMap<Key,Value> tm1 = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm1 = new TreeMap<>();
 
     // keys that aggregate
     nkv(tm1, 1, 1, 1, 1, false, 2l, encoder);
@@ -242,7 +242,7 @@ public class CombinerTest {
   public void test3() throws IOException {
     Encoder<Long> encoder = LongCombiner.FIXED_LEN_ENCODER;
 
-    TreeMap<Key,Value> tm1 = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm1 = new TreeMap<>();
 
     // keys that aggregate
     nkv(tm1, 1, 1, 1, 1, false, 2l, encoder);
@@ -308,7 +308,7 @@ public class CombinerTest {
   public void testDeepCopy() throws IOException {
     Encoder<Long> encoder = LongCombiner.FIXED_LEN_ENCODER;
 
-    TreeMap<Key,Value> tm1 = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm1 = new TreeMap<>();
 
     // keys that aggregate
     nkv(tm1, 1, 1, 1, 1, false, 2l, encoder);
@@ -376,7 +376,7 @@ public class CombinerTest {
   public void test4() throws IOException {
     Encoder<Long> encoder = LongCombiner.STRING_ENCODER;
 
-    TreeMap<Key,Value> tm1 = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm1 = new TreeMap<>();
 
     // keys that do not aggregate
     nkv(tm1, 0, 0, 1, 1, false, 7l, encoder);
@@ -481,13 +481,13 @@ public class CombinerTest {
     // try aggregating across multiple data sets that contain
     // the exact same keys w/ different values
 
-    TreeMap<Key,Value> tm1 = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm1 = new TreeMap<>();
     nkv(tm1, 1, 1, 1, 1, false, 2l, encoder);
 
-    TreeMap<Key,Value> tm2 = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm2 = new TreeMap<>();
     nkv(tm2, 1, 1, 1, 1, false, 3l, encoder);
 
-    TreeMap<Key,Value> tm3 = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm3 = new TreeMap<>();
     nkv(tm3, 1, 1, 1, 1, false, 4l, encoder);
 
     Combiner ai = new SummingCombiner();
@@ -496,7 +496,7 @@ public class CombinerTest {
     LongCombiner.setEncodingType(is, StringEncoder.class);
     Combiner.setColumns(is, Collections.singletonList(new IteratorSetting.Column("cf001")));
 
-    List<SortedKeyValueIterator<Key,Value>> sources = new ArrayList<SortedKeyValueIterator<Key,Value>>(3);
+    List<SortedKeyValueIterator<Key,Value>> sources = new ArrayList<>(3);
     sources.add(new SortedMapIterator(tm1));
     sources.add(new SortedMapIterator(tm2));
     sources.add(new SortedMapIterator(tm3));
@@ -513,7 +513,7 @@ public class CombinerTest {
   @Test
   public void test6() throws IOException {
     Encoder<Long> encoder = LongCombiner.VAR_LEN_ENCODER;
-    TreeMap<Key,Value> tm1 = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm1 = new TreeMap<>();
 
     // keys that aggregate
     nkv(tm1, 1, 1, 1, 1, false, 2l, encoder);
@@ -542,7 +542,7 @@ public class CombinerTest {
 
     // test that delete is not aggregated
 
-    TreeMap<Key,Value> tm1 = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm1 = new TreeMap<>();
 
     nkv(tm1, 1, 1, 1, 2, true, 0l, encoder);
     nkv(tm1, 1, 1, 1, 3, false, 4l, encoder);
@@ -570,7 +570,7 @@ public class CombinerTest {
     ai.next();
     assertFalse(ai.hasTop());
 
-    tm1 = new TreeMap<Key,Value>();
+    tm1 = new TreeMap<>();
     nkv(tm1, 1, 1, 1, 2, true, 0l, encoder);
     ai = new SummingCombiner();
     ai.init(new SortedMapIterator(tm1), is.getOptions(), SCAN_IE);
@@ -587,7 +587,7 @@ public class CombinerTest {
 
   @Test
   public void valueIteratorTest() throws IOException {
-    TreeMap<Key,Value> tm = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm = new TreeMap<>();
     tm.put(new Key("r", "f", "q", 1), new Value("1".getBytes()));
     tm.put(new Key("r", "f", "q", 2), new Value("2".getBytes()));
     SortedMapIterator smi = new SortedMapIterator(tm);
@@ -600,7 +600,7 @@ public class CombinerTest {
 
   @Test
   public void sumAllColumns() throws IOException {
-    TreeMap<Key,Value> tm = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm = new TreeMap<>();
     tm.put(new Key("r", "count", "a", 1), new Value("1".getBytes()));
     tm.put(new Key("r", "count", "a", 2), new Value("1".getBytes()));
     tm.put(new Key("r", "count", "b", 3), new Value("1".getBytes()));
@@ -636,7 +636,7 @@ public class CombinerTest {
   public void maxMinTest() throws IOException {
     Encoder<Long> encoder = LongCombiner.VAR_LEN_ENCODER;
 
-    TreeMap<Key,Value> tm1 = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm1 = new TreeMap<>();
 
     // keys that aggregate
     nkv(tm1, 1, 1, 1, 1, false, 4l, encoder);
@@ -675,7 +675,7 @@ public class CombinerTest {
   }
 
   public static List<Long> nal(Long... longs) {
-    List<Long> al = new ArrayList<Long>(longs.length);
+    List<Long> al = new ArrayList<>(longs.length);
     for (Long l : longs) {
       al.add(l);
     }
@@ -692,7 +692,7 @@ public class CombinerTest {
       IllegalAccessException {
     Encoder<List<Long>> encoder = encoderClass.newInstance();
 
-    TreeMap<Key,Value> tm1 = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm1 = new TreeMap<>();
 
     // keys that aggregate
     nkv(tm1, 1, 1, 1, 1, false, nal(1l, 2l), encoder);
@@ -773,11 +773,11 @@ public class CombinerTest {
 
     @Override
     public List<Long> decode(byte[] b) {
-      return new ArrayList<Long>();
+      return new ArrayList<>();
     }
 
     public List<Long> decode(byte[] b, int offset, int len) {
-      return new ArrayList<Long>();
+      return new ArrayList<>();
     }
 
   }
@@ -821,7 +821,7 @@ public class CombinerTest {
   }
 
   private TreeMap<Key,Value> readAll(SortedKeyValueIterator<Key,Value> combiner) throws Exception {
-    TreeMap<Key,Value> ret = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> ret = new TreeMap<>();
 
     combiner.seek(new Range(), EMPTY_COL_FAMS, false);
 
@@ -895,7 +895,7 @@ public class CombinerTest {
   public void testDeleteHandling() throws Exception {
     Encoder<Long> encoder = LongCombiner.STRING_ENCODER;
 
-    TreeMap<Key,Value> input = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> input = new TreeMap<>();
 
     IteratorEnvironment paritalMajcIe = new CombinerIteratorEnvironment(IteratorScope.majc, false);
     IteratorEnvironment fullMajcIe = new CombinerIteratorEnvironment(IteratorScope.majc, true);
@@ -906,7 +906,7 @@ public class CombinerTest {
     nkv(input, 1, 1, 1, 3, false, 2l, encoder);
     nkv(input, 1, 1, 1, 4, false, 9l, encoder);
 
-    TreeMap<Key,Value> expected = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> expected = new TreeMap<>();
     nkv(expected, 1, 1, 1, 1, false, 4l, encoder);
     nkv(expected, 1, 1, 1, 2, true, 0l, encoder);
     nkv(expected, 1, 1, 1, 4, false, 11l, encoder);


[19/32] accumulo git commit: ACCUMULO-4357 Remove unneeded code for readability

Posted by ct...@apache.org.
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
index 15b5226..6637521 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
@@ -18,6 +18,7 @@ package org.apache.accumulo.tserver.tablet;
 
 import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly;
 import static java.nio.charset.StandardCharsets.UTF_8;
+import static java.util.Objects.requireNonNull;
 
 import java.io.ByteArrayInputStream;
 import java.io.DataInputStream;
@@ -91,6 +92,7 @@ import org.apache.accumulo.core.trace.Span;
 import org.apache.accumulo.core.trace.Trace;
 import org.apache.accumulo.core.util.LocalityGroupUtil;
 import org.apache.accumulo.core.util.Pair;
+import org.apache.accumulo.core.util.ratelimit.RateLimiter;
 import org.apache.accumulo.server.ServerConstants;
 import org.apache.accumulo.server.conf.TableConfiguration;
 import org.apache.accumulo.server.fs.FileRef;
@@ -152,8 +154,6 @@ import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Optional;
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
-import org.apache.accumulo.core.util.ratelimit.RateLimiter;
-import static java.util.Objects.requireNonNull;
 
 /**
  *
@@ -186,7 +186,7 @@ public class Tablet implements TabletCommitter {
     return dataSourceDeletions.get();
   }
 
-  private final Set<ScanDataSource> activeScans = new HashSet<ScanDataSource>();
+  private final Set<ScanDataSource> activeScans = new HashSet<>();
 
   private static enum CloseState {
     OPEN, CLOSING, CLOSED, COMPLETE
@@ -209,14 +209,14 @@ public class Tablet implements TabletCommitter {
 
   static enum CompactionState {
     WAITING_TO_START, IN_PROGRESS
-  };
+  }
 
   private volatile CompactionState minorCompactionState = null;
   private volatile CompactionState majorCompactionState = null;
 
   private final Set<MajorCompactionReason> majorCompactionQueued = Collections.synchronizedSet(EnumSet.noneOf(MajorCompactionReason.class));
 
-  private final AtomicReference<ConstraintChecker> constraintChecker = new AtomicReference<ConstraintChecker>();
+  private final AtomicReference<ConstraintChecker> constraintChecker = new AtomicReference<>();
 
   private int writesInProgress = 0;
 
@@ -257,7 +257,7 @@ public class Tablet implements TabletCommitter {
   }
 
   public static class LookupResult {
-    public List<Range> unfinishedRanges = new ArrayList<Range>();
+    public List<Range> unfinishedRanges = new ArrayList<>();
     public long bytesAdded = 0;
     public long dataSize = 0;
     public boolean closed = false;
@@ -349,7 +349,7 @@ public class Tablet implements TabletCommitter {
     this.location = locationPath;
     this.tabletDirectory = tabletPaths.dir;
     for (Entry<Long,List<FileRef>> entry : data.getBulkImported().entrySet()) {
-      this.bulkImported.put(entry.getKey(), new CopyOnWriteArrayList<FileRef>(entry.getValue()));
+      this.bulkImported.put(entry.getKey(), new CopyOnWriteArrayList<>(entry.getValue()));
     }
     setupDefaultSecurityLabels(extent);
 
@@ -408,7 +408,7 @@ public class Tablet implements TabletCommitter {
       final AtomicLong maxTime = new AtomicLong(Long.MIN_VALUE);
       final CommitSession commitSession = getTabletMemory().getCommitSession();
       try {
-        Set<String> absPaths = new HashSet<String>();
+        Set<String> absPaths = new HashSet<>();
         for (FileRef ref : datafiles.keySet())
           absPaths.add(ref.path().toString());
 
@@ -466,7 +466,7 @@ public class Tablet implements TabletCommitter {
         }
       }
       // make some closed references that represent the recovered logs
-      currentLogs = new ConcurrentSkipListSet<DfsLogger>();
+      currentLogs = new ConcurrentSkipListSet<>();
       for (LogEntry logEntry : logEntries) {
         currentLogs.add(new DfsLogger(tabletServer.getServerConfig(), logEntry.filename, logEntry.getColumnQualifier().toString()));
       }
@@ -704,7 +704,7 @@ public class Tablet implements TabletCommitter {
     if (batchTimeOut == Long.MAX_VALUE || batchTimeOut <= 0) {
       batchTimeOut = 0;
     }
-    List<KVEntry> results = new ArrayList<KVEntry>();
+    List<KVEntry> results = new ArrayList<>();
     Key key = null;
 
     Value value;
@@ -853,7 +853,7 @@ public class Tablet implements TabletCommitter {
   private synchronized MinorCompactionTask prepareForMinC(long flushId, MinorCompactionReason mincReason) {
     CommitSession oldCommitSession = getTabletMemory().prepareForMinC();
     otherLogs = currentLogs;
-    currentLogs = new ConcurrentSkipListSet<DfsLogger>();
+    currentLogs = new ConcurrentSkipListSet<>();
 
     FileRef mergeFile = null;
     if (mincReason != MinorCompactionReason.RECOVERY) {
@@ -1050,7 +1050,7 @@ public class Tablet implements TabletCommitter {
         }
       }
 
-      return new Pair<Long,UserCompactionConfig>(compactID, compactionConfig);
+      return new Pair<>(compactID, compactionConfig);
     } catch (InterruptedException e) {
       throw new RuntimeException(e);
     } catch (NumberFormatException nfe) {
@@ -1103,7 +1103,7 @@ public class Tablet implements TabletCommitter {
       if (more != null) {
         violations.add(more);
         if (violators == null)
-          violators = new ArrayList<Mutation>();
+          violators = new ArrayList<>();
         violators.add(mutation);
       }
     }
@@ -1112,8 +1112,8 @@ public class Tablet implements TabletCommitter {
 
     if (!violations.isEmpty()) {
 
-      HashSet<Mutation> violatorsSet = new HashSet<Mutation>(violators);
-      ArrayList<Mutation> nonViolators = new ArrayList<Mutation>();
+      HashSet<Mutation> violatorsSet = new HashSet<>(violators);
+      ArrayList<Mutation> nonViolators = new ArrayList<>();
 
       for (Mutation mutation : mutations) {
         if (!violatorsSet.contains(mutation)) {
@@ -1578,7 +1578,7 @@ public class Tablet implements TabletCommitter {
   }
 
   private Map<FileRef,Pair<Key,Key>> getFirstAndLastKeys(SortedMap<FileRef,DataFileValue> allFiles) throws IOException {
-    Map<FileRef,Pair<Key,Key>> result = new HashMap<FileRef,Pair<Key,Key>>();
+    Map<FileRef,Pair<Key,Key>> result = new HashMap<>();
     FileOperations fileFactory = FileOperations.getInstance();
     VolumeManager fs = getTabletServer().getFileSystem();
     for (Entry<FileRef,DataFileValue> entry : allFiles.entrySet()) {
@@ -1589,7 +1589,7 @@ public class Tablet implements TabletCommitter {
       try {
         Key first = openReader.getFirstKey();
         Key last = openReader.getLastKey();
-        result.put(file, new Pair<Key,Key>(first, last));
+        result.put(file, new Pair<>(first, last));
       } finally {
         openReader.close();
       }
@@ -1598,7 +1598,7 @@ public class Tablet implements TabletCommitter {
   }
 
   List<FileRef> findChopFiles(KeyExtent extent, Map<FileRef,Pair<Key,Key>> firstAndLastKeys, Collection<FileRef> allFiles) throws IOException {
-    List<FileRef> result = new ArrayList<FileRef>();
+    List<FileRef> result = new ArrayList<>();
     if (firstAndLastKeys == null) {
       result.addAll(allFiles);
       return result;
@@ -1706,7 +1706,7 @@ public class Tablet implements TabletCommitter {
         RootFiles.cleanupReplacement(fs, fs.listStatus(this.location), false);
       }
       SortedMap<FileRef,DataFileValue> allFiles = getDatafileManager().getDatafileSizes();
-      List<FileRef> inputFiles = new ArrayList<FileRef>();
+      List<FileRef> inputFiles = new ArrayList<>();
       if (reason == MajorCompactionReason.CHOP) {
         // enforce rules: files with keys outside our range need to be compacted
         inputFiles.addAll(findChopFiles(extent, firstAndLastKeys, allFiles.keySet()));
@@ -1773,7 +1773,7 @@ public class Tablet implements TabletCommitter {
         }
       }
 
-      List<IteratorSetting> compactionIterators = new ArrayList<IteratorSetting>();
+      List<IteratorSetting> compactionIterators = new ArrayList<>();
       if (compactionId != null) {
         if (reason == MajorCompactionReason.USER) {
           if (getCompactionCancelID() >= compactionId.getFirst()) {
@@ -1834,7 +1834,7 @@ public class Tablet implements TabletCommitter {
 
           };
 
-          HashMap<FileRef,DataFileValue> copy = new HashMap<FileRef,DataFileValue>(getDatafileManager().getDatafileSizes());
+          HashMap<FileRef,DataFileValue> copy = new HashMap<>(getDatafileManager().getDatafileSizes());
           if (!copy.keySet().containsAll(smallestFiles))
             throw new IllegalStateException("Cannot find data file values for " + smallestFiles);
 
@@ -1902,12 +1902,12 @@ public class Tablet implements TabletCommitter {
 
     // short-circuit; also handles zero files case
     if (filesToCompact.size() <= maxFilesToCompact) {
-      Set<FileRef> smallestFiles = new HashSet<FileRef>(filesToCompact.keySet());
+      Set<FileRef> smallestFiles = new HashSet<>(filesToCompact.keySet());
       filesToCompact.clear();
       return smallestFiles;
     }
 
-    PriorityQueue<Pair<FileRef,Long>> fileHeap = new PriorityQueue<Pair<FileRef,Long>>(filesToCompact.size(), new Comparator<Pair<FileRef,Long>>() {
+    PriorityQueue<Pair<FileRef,Long>> fileHeap = new PriorityQueue<>(filesToCompact.size(), new Comparator<Pair<FileRef,Long>>() {
       @Override
       public int compare(Pair<FileRef,Long> o1, Pair<FileRef,Long> o2) {
         if (o1.getSecond() == o2.getSecond())
@@ -1920,10 +1920,10 @@ public class Tablet implements TabletCommitter {
 
     for (Iterator<Entry<FileRef,DataFileValue>> iterator = filesToCompact.entrySet().iterator(); iterator.hasNext();) {
       Entry<FileRef,DataFileValue> entry = iterator.next();
-      fileHeap.add(new Pair<FileRef,Long>(entry.getKey(), entry.getValue().getSize()));
+      fileHeap.add(new Pair<>(entry.getKey(), entry.getValue().getSize()));
     }
 
-    Set<FileRef> smallestFiles = new HashSet<FileRef>();
+    Set<FileRef> smallestFiles = new HashSet<>();
     while (smallestFiles.size() < maxFilesToCompact && fileHeap.size() > 0) {
       Pair<FileRef,Long> pair = fileHeap.remove();
       filesToCompact.remove(pair.getFirst());
@@ -2092,7 +2092,7 @@ public class Tablet implements TabletCommitter {
 
     synchronized (this) {
       // java needs tuples ...
-      TreeMap<KeyExtent,TabletData> newTablets = new TreeMap<KeyExtent,TabletData>();
+      TreeMap<KeyExtent,TabletData> newTablets = new TreeMap<>();
 
       long t1 = System.currentTimeMillis();
       // choose a split point
@@ -2123,9 +2123,9 @@ public class Tablet implements TabletCommitter {
       String lowDirectory = createTabletDirectory(getTabletServer().getFileSystem(), extent.getTableId(), midRow);
 
       // write new tablet information to MetadataTable
-      SortedMap<FileRef,DataFileValue> lowDatafileSizes = new TreeMap<FileRef,DataFileValue>();
-      SortedMap<FileRef,DataFileValue> highDatafileSizes = new TreeMap<FileRef,DataFileValue>();
-      List<FileRef> highDatafilesToRemove = new ArrayList<FileRef>();
+      SortedMap<FileRef,DataFileValue> lowDatafileSizes = new TreeMap<>();
+      SortedMap<FileRef,DataFileValue> highDatafileSizes = new TreeMap<>();
+      List<FileRef> highDatafilesToRemove = new ArrayList<>();
 
       MetadataTableUtil.splitDatafiles(extent.getTableId(), midRow, splitRatio, firstAndLastRows, getDatafileManager().getDatafileSizes(), lowDatafileSizes,
           highDatafileSizes, highDatafilesToRemove);
@@ -2196,7 +2196,7 @@ public class Tablet implements TabletCommitter {
   }
 
   public void importMapFiles(long tid, Map<FileRef,MapFileInfo> fileMap, boolean setTime) throws IOException {
-    Map<FileRef,DataFileValue> entries = new HashMap<FileRef,DataFileValue>(fileMap.size());
+    Map<FileRef,DataFileValue> entries = new HashMap<>(fileMap.size());
     List<String> files = new ArrayList<>();
 
     for (Entry<FileRef,MapFileInfo> entry : fileMap.entrySet()) {
@@ -2259,7 +2259,7 @@ public class Tablet implements TabletCommitter {
           bulkImported.get(tid, new Callable<List<FileRef>>() {
             @Override
             public List<FileRef> call() throws Exception {
-              return new ArrayList<FileRef>();
+              return new ArrayList<>();
             }
           }).addAll(fileMap.keySet());
         } catch (Exception ex) {
@@ -2270,18 +2270,18 @@ public class Tablet implements TabletCommitter {
     }
   }
 
-  private ConcurrentSkipListSet<DfsLogger> currentLogs = new ConcurrentSkipListSet<DfsLogger>();
+  private ConcurrentSkipListSet<DfsLogger> currentLogs = new ConcurrentSkipListSet<>();
 
   // currentLogs may be updated while a tablet is otherwise locked
   public Set<DfsLogger> getCurrentLogFiles() {
-    return new HashSet<DfsLogger>(currentLogs);
+    return new HashSet<>(currentLogs);
   }
 
   Set<String> beginClearingUnusedLogs() {
-    Set<String> doomed = new HashSet<String>();
+    Set<String> doomed = new HashSet<>();
 
-    ArrayList<String> otherLogsCopy = new ArrayList<String>();
-    ArrayList<String> currentLogsCopy = new ArrayList<String>();
+    ArrayList<String> otherLogsCopy = new ArrayList<>();
+    ArrayList<String> currentLogsCopy = new ArrayList<>();
 
     // do not hold tablet lock while acquiring the log lock
     logLock.lock();
@@ -2650,7 +2650,7 @@ public class Tablet implements TabletCommitter {
   }
 
   public Map<Long,List<FileRef>> getBulkIngestedFiles() {
-    return new HashMap<Long,List<FileRef>>(bulkImported.asMap());
+    return new HashMap<>(bulkImported.asMap());
   }
 
   public void cleanupBulkLoadedFiles(Set<Long> tids) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/TabletMemory.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/TabletMemory.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/TabletMemory.java
index 86cc262..f66e457 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/TabletMemory.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/TabletMemory.java
@@ -158,7 +158,7 @@ class TabletMemory implements Closeable {
   }
 
   public List<MemoryIterator> getIterators(SamplerConfigurationImpl samplerConfig) {
-    List<MemoryIterator> toReturn = new ArrayList<MemoryIterator>(2);
+    List<MemoryIterator> toReturn = new ArrayList<>(2);
     toReturn.add(memTable.skvIterator(samplerConfig));
     if (otherMemTable != null)
       toReturn.add(otherMemTable.skvIterator(samplerConfig));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/tserver/src/test/java/org/apache/accumulo/tserver/AssignmentWatcherTest.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/test/java/org/apache/accumulo/tserver/AssignmentWatcherTest.java b/server/tserver/src/test/java/org/apache/accumulo/tserver/AssignmentWatcherTest.java
index 51e14df..5dd3c19 100644
--- a/server/tserver/src/test/java/org/apache/accumulo/tserver/AssignmentWatcherTest.java
+++ b/server/tserver/src/test/java/org/apache/accumulo/tserver/AssignmentWatcherTest.java
@@ -37,7 +37,7 @@ public class AssignmentWatcherTest {
 
   @Before
   public void setup() {
-    assignments = new HashMap<KeyExtent,RunnableStartedAt>();
+    assignments = new HashMap<>();
     timer = EasyMock.createMock(SimpleTimer.class);
     conf = EasyMock.createMock(AccumuloConfiguration.class);
     watcher = new AssignmentWatcher(conf, assignments, timer);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/tserver/src/test/java/org/apache/accumulo/tserver/CheckTabletMetadataTest.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/test/java/org/apache/accumulo/tserver/CheckTabletMetadataTest.java b/server/tserver/src/test/java/org/apache/accumulo/tserver/CheckTabletMetadataTest.java
index 27da12b..f474972 100644
--- a/server/tserver/src/test/java/org/apache/accumulo/tserver/CheckTabletMetadataTest.java
+++ b/server/tserver/src/test/java/org/apache/accumulo/tserver/CheckTabletMetadataTest.java
@@ -58,7 +58,7 @@ public class CheckTabletMetadataTest {
   }
 
   private static void assertFail(TreeMap<Key,Value> tabletMeta, KeyExtent ke, TServerInstance tsi, Key keyToDelete) {
-    TreeMap<Key,Value> copy = new TreeMap<Key,Value>(tabletMeta);
+    TreeMap<Key,Value> copy = new TreeMap<>(tabletMeta);
     Assert.assertNotNull(copy.remove(keyToDelete));
     try {
       Assert.assertNull(TabletServer.checkTabletMetadata(ke, tsi, copy, ke.getMetadataEntry()));
@@ -72,7 +72,7 @@ public class CheckTabletMetadataTest {
 
     KeyExtent ke = new KeyExtent("1", null, null);
 
-    TreeMap<Key,Value> tabletMeta = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tabletMeta = new TreeMap<>();
 
     put(tabletMeta, "1<", TabletsSection.TabletColumnFamily.PREV_ROW_COLUMN, KeyExtent.encodePrevEndRow(null).get());
     put(tabletMeta, "1<", TabletsSection.ServerColumnFamily.DIRECTORY_COLUMN, "/t1".getBytes());
@@ -101,18 +101,18 @@ public class CheckTabletMetadataTest {
 
     assertFail(tabletMeta, ke, tsi, nk("1<", TabletsSection.FutureLocationColumnFamily.NAME, "4"));
 
-    TreeMap<Key,Value> copy = new TreeMap<Key,Value>(tabletMeta);
+    TreeMap<Key,Value> copy = new TreeMap<>(tabletMeta);
     put(copy, "1<", TabletsSection.CurrentLocationColumnFamily.NAME, "4", "127.0.0.1:9997");
     assertFail(copy, ke, tsi);
     assertFail(copy, ke, tsi, nk("1<", TabletsSection.FutureLocationColumnFamily.NAME, "4"));
 
-    copy = new TreeMap<Key,Value>(tabletMeta);
+    copy = new TreeMap<>(tabletMeta);
     put(copy, "1<", TabletsSection.CurrentLocationColumnFamily.NAME, "5", "127.0.0.1:9998");
     assertFail(copy, ke, tsi);
     put(copy, "1<", TabletsSection.CurrentLocationColumnFamily.NAME, "6", "127.0.0.1:9999");
     assertFail(copy, ke, tsi);
 
-    copy = new TreeMap<Key,Value>(tabletMeta);
+    copy = new TreeMap<>(tabletMeta);
     put(copy, "1<", TabletsSection.FutureLocationColumnFamily.NAME, "5", "127.0.0.1:9998");
     assertFail(copy, ke, tsi);
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/tserver/src/test/java/org/apache/accumulo/tserver/CountingIteratorTest.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/test/java/org/apache/accumulo/tserver/CountingIteratorTest.java b/server/tserver/src/test/java/org/apache/accumulo/tserver/CountingIteratorTest.java
index 8a1dca5..423d522 100644
--- a/server/tserver/src/test/java/org/apache/accumulo/tserver/CountingIteratorTest.java
+++ b/server/tserver/src/test/java/org/apache/accumulo/tserver/CountingIteratorTest.java
@@ -36,7 +36,7 @@ import org.junit.Test;
 public class CountingIteratorTest {
   @Test
   public void testDeepCopyCount() throws IOException {
-    TreeMap<Key,Value> tm = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm = new TreeMap<>();
 
     tm.put(new Key("r1", "cf1", "cq1"), new Value("data1".getBytes()));
     tm.put(new Key("r2", "cf1", "cq1"), new Value("data2".getBytes()));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/tserver/src/test/java/org/apache/accumulo/tserver/InMemoryMapTest.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/test/java/org/apache/accumulo/tserver/InMemoryMapTest.java b/server/tserver/src/test/java/org/apache/accumulo/tserver/InMemoryMapTest.java
index 264145f..59dc68e 100644
--- a/server/tserver/src/test/java/org/apache/accumulo/tserver/InMemoryMapTest.java
+++ b/server/tserver/src/test/java/org/apache/accumulo/tserver/InMemoryMapTest.java
@@ -416,7 +416,7 @@ public class InMemoryMapTest {
 
     imm.delete(0);
 
-    ArrayList<ByteSequence> columns = new ArrayList<ByteSequence>();
+    ArrayList<ByteSequence> columns = new ArrayList<>();
     columns.add(new ArrayByteSequence("bar"));
 
     // this seek resulted in an infinite loop before a bug was fixed
@@ -474,7 +474,7 @@ public class InMemoryMapTest {
   @Test
   @Ignore
   public void parallelWriteSpeed() throws Exception {
-    List<Double> timings = new ArrayList<Double>();
+    List<Double> timings = new ArrayList<>();
     for (int threads : new int[] {1, 2, 16, /* 64, 256 */}) {
       final long now = System.currentTimeMillis();
       final long counts[] = new long[threads];

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/tserver/src/test/java/org/apache/accumulo/tserver/compaction/DefaultCompactionStrategyTest.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/test/java/org/apache/accumulo/tserver/compaction/DefaultCompactionStrategyTest.java b/server/tserver/src/test/java/org/apache/accumulo/tserver/compaction/DefaultCompactionStrategyTest.java
index dd18584..e54e1c8 100644
--- a/server/tserver/src/test/java/org/apache/accumulo/tserver/compaction/DefaultCompactionStrategyTest.java
+++ b/server/tserver/src/test/java/org/apache/accumulo/tserver/compaction/DefaultCompactionStrategyTest.java
@@ -56,10 +56,10 @@ public class DefaultCompactionStrategyTest {
     Key second = null;
     if (secondString != null)
       second = new Key(new Text(secondString));
-    return new Pair<Key,Key>(first, second);
+    return new Pair<>(first, second);
   }
 
-  static final Map<String,Pair<Key,Key>> fakeFiles = new HashMap<String,Pair<Key,Key>>();
+  static final Map<String,Pair<Key,Key>> fakeFiles = new HashMap<>();
 
   static {
     fakeFiles.put("file1", keys("b", "m"));
@@ -162,7 +162,7 @@ public class DefaultCompactionStrategyTest {
   }
 
   private MajorCompactionRequest createRequest(KeyExtent extent, MajorCompactionReason reason, Object... objs) throws IOException {
-    Map<FileRef,DataFileValue> files = new HashMap<FileRef,DataFileValue>();
+    Map<FileRef,DataFileValue> files = new HashMap<>();
     for (int i = 0; i < objs.length; i += 2) {
       files.put(new FileRef("hdfs://nn1/accumulo/tables/5/t-0001/" + (String) objs[i]), new DataFileValue(((Number) objs[i + 1]).longValue(), 0));
     }
@@ -174,7 +174,7 @@ public class DefaultCompactionStrategyTest {
   }
 
   private static Set<String> asStringSet(Collection<FileRef> refs) {
-    HashSet<String> result = new HashSet<String>();
+    HashSet<String> result = new HashSet<>();
     for (FileRef ref : refs) {
       result.add(ref.path().toString());
     }
@@ -182,7 +182,7 @@ public class DefaultCompactionStrategyTest {
   }
 
   private static Set<String> asSet(Collection<String> strings) {
-    HashSet<String> result = new HashSet<String>();
+    HashSet<String> result = new HashSet<>();
     for (String string : strings)
       result.add("hdfs://nn1/accumulo/tables/5/t-0001/" + string);
     return result;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/tserver/src/test/java/org/apache/accumulo/tserver/compaction/SizeLimitCompactionStrategyTest.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/test/java/org/apache/accumulo/tserver/compaction/SizeLimitCompactionStrategyTest.java b/server/tserver/src/test/java/org/apache/accumulo/tserver/compaction/SizeLimitCompactionStrategyTest.java
index a66715e..648f451 100644
--- a/server/tserver/src/test/java/org/apache/accumulo/tserver/compaction/SizeLimitCompactionStrategyTest.java
+++ b/server/tserver/src/test/java/org/apache/accumulo/tserver/compaction/SizeLimitCompactionStrategyTest.java
@@ -34,7 +34,7 @@ import org.junit.Test;
 public class SizeLimitCompactionStrategyTest {
   private Map<FileRef,DataFileValue> nfl(String... sa) {
 
-    HashMap<FileRef,DataFileValue> ret = new HashMap<FileRef,DataFileValue>();
+    HashMap<FileRef,DataFileValue> ret = new HashMap<>();
     for (int i = 0; i < sa.length; i += 2) {
       ret.put(new FileRef("hdfs://nn1/accumulo/tables/5/t-0001/" + sa[i]), new DataFileValue(AccumuloConfiguration.getMemoryInBytes(sa[i + 1]), 1));
     }
@@ -45,7 +45,7 @@ public class SizeLimitCompactionStrategyTest {
   @Test
   public void testLimits() throws IOException {
     SizeLimitCompactionStrategy slcs = new SizeLimitCompactionStrategy();
-    HashMap<String,String> opts = new HashMap<String,String>();
+    HashMap<String,String> opts = new HashMap<>();
     opts.put(SizeLimitCompactionStrategy.SIZE_LIMIT_OPT, "1G");
 
     slcs.init(opts);
@@ -62,7 +62,7 @@ public class SizeLimitCompactionStrategyTest {
     mcr.setFiles(nfl("f1", "2G", "f2", "2G", "f3", "2G", "f4", "2G", "f5", "500M", "f6", "500M", "f7", "500M", "f8", "500M"));
 
     Assert.assertTrue(slcs.shouldCompact(mcr));
-    Assert.assertEquals(nfl("f5", "500M", "f6", "500M", "f7", "500M", "f8", "500M").keySet(), new HashSet<FileRef>(slcs.getCompactionPlan(mcr).inputFiles));
+    Assert.assertEquals(nfl("f5", "500M", "f6", "500M", "f7", "500M", "f8", "500M").keySet(), new HashSet<>(slcs.getCompactionPlan(mcr).inputFiles));
     Assert.assertEquals(8, mcr.getFiles().size());
   }
 }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/tserver/src/test/java/org/apache/accumulo/tserver/constraints/ConstraintCheckerTest.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/test/java/org/apache/accumulo/tserver/constraints/ConstraintCheckerTest.java b/server/tserver/src/test/java/org/apache/accumulo/tserver/constraints/ConstraintCheckerTest.java
index c590242..0765b5d 100644
--- a/server/tserver/src/test/java/org/apache/accumulo/tserver/constraints/ConstraintCheckerTest.java
+++ b/server/tserver/src/test/java/org/apache/accumulo/tserver/constraints/ConstraintCheckerTest.java
@@ -53,7 +53,7 @@ public class ConstraintCheckerTest {
   @Before
   public void setup() throws NoSuchMethodException, SecurityException {
     cc = createMockBuilder(ConstraintChecker.class).addMockedMethod("getConstraints").createMock();
-    constraints = new ArrayList<Constraint>();
+    constraints = new ArrayList<>();
     expect(cc.getConstraints()).andReturn(constraints);
 
     env = createMock(Environment.class);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/tserver/src/test/java/org/apache/accumulo/tserver/log/DfsLoggerTest.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/test/java/org/apache/accumulo/tserver/log/DfsLoggerTest.java b/server/tserver/src/test/java/org/apache/accumulo/tserver/log/DfsLoggerTest.java
index cd652e4..6f10a48 100644
--- a/server/tserver/src/test/java/org/apache/accumulo/tserver/log/DfsLoggerTest.java
+++ b/server/tserver/src/test/java/org/apache/accumulo/tserver/log/DfsLoggerTest.java
@@ -31,7 +31,7 @@ public class DfsLoggerTest {
 
   @Test
   public void testDurabilityForGroupCommit() {
-    List<TabletMutations> lst = new ArrayList<TabletMutations>();
+    List<TabletMutations> lst = new ArrayList<>();
     assertEquals(Durability.NONE, DfsLogger.chooseDurabilityForGroupCommit(lst));
     TabletMutations m1 = new TabletMutations(0, 1, Collections.<Mutation> emptyList(), Durability.NONE);
     lst.add(m1);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/tserver/src/test/java/org/apache/accumulo/tserver/log/SortedLogRecoveryTest.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/test/java/org/apache/accumulo/tserver/log/SortedLogRecoveryTest.java b/server/tserver/src/test/java/org/apache/accumulo/tserver/log/SortedLogRecoveryTest.java
index 882aed7..b65d5ce 100644
--- a/server/tserver/src/test/java/org/apache/accumulo/tserver/log/SortedLogRecoveryTest.java
+++ b/server/tserver/src/test/java/org/apache/accumulo/tserver/log/SortedLogRecoveryTest.java
@@ -113,7 +113,7 @@ public class SortedLogRecoveryTest {
   }
 
   private static class CaptureMutations implements MutationReceiver {
-    public ArrayList<Mutation> result = new ArrayList<Mutation>();
+    public ArrayList<Mutation> result = new ArrayList<>();
 
     @Override
     public void receive(Mutation m) {
@@ -133,7 +133,7 @@ public class SortedLogRecoveryTest {
     VolumeManager fs = VolumeManagerImpl.getLocal(workdir);
     final Path workdirPath = new Path("file://" + workdir);
     fs.deleteRecursively(workdirPath);
-    ArrayList<Path> dirs = new ArrayList<Path>();
+    ArrayList<Path> dirs = new ArrayList<>();
     try {
       for (Entry<String,KeyValue[]> entry : logs.entrySet()) {
         String path = workdir + "/" + entry.getKey();
@@ -177,7 +177,7 @@ public class SortedLogRecoveryTest {
     KeyValue entries5[] = new KeyValue[] {createKeyValue(OPEN, 0, 4, "70"), createKeyValue(DEFINE_TABLET, 1, 4, extent),
         createKeyValue(COMPACTION_START, 3, 4, "/t1/f3"), createKeyValue(MUTATION, 2, 4, ignored), createKeyValue(MUTATION, 6, 4, m2),};
 
-    Map<String,KeyValue[]> logs = new TreeMap<String,KeyValue[]>();
+    Map<String,KeyValue[]> logs = new TreeMap<>();
     logs.put("entries", entries);
     logs.put("entries2", entries2);
     logs.put("entries3", entries3);
@@ -217,7 +217,7 @@ public class SortedLogRecoveryTest {
         createKeyValue(MUTATION, 11, 1, ignored), createKeyValue(MUTATION, 15, 1, m), createKeyValue(MUTATION, 16, 1, m2),};
     KeyValue entries4[] = new KeyValue[] {createKeyValue(OPEN, 17, -1, "4"), createKeyValue(DEFINE_TABLET, 18, 1, extent),
         createKeyValue(COMPACTION_START, 20, 1, "/t1/f3"), createKeyValue(MUTATION, 19, 1, m3), createKeyValue(MUTATION, 21, 1, m4),};
-    Map<String,KeyValue[]> logs = new TreeMap<String,KeyValue[]>();
+    Map<String,KeyValue[]> logs = new TreeMap<>();
     logs.put("entries", entries);
     logs.put("entries2", entries2);
     logs.put("entries3", entries3);
@@ -252,7 +252,7 @@ public class SortedLogRecoveryTest {
     KeyValue entries2[] = new KeyValue[] {createKeyValue(OPEN, 0, 1, "2"), createKeyValue(DEFINE_TABLET, 1, 1, extent),
         createKeyValue(COMPACTION_START, 2, 1, "/t1/f1"), createKeyValue(COMPACTION_FINISH, 3, 1, "/t1/f1"), createKeyValue(MUTATION, 3, 1, m2),};
 
-    Map<String,KeyValue[]> logs = new TreeMap<String,KeyValue[]>();
+    Map<String,KeyValue[]> logs = new TreeMap<>();
     logs.put("entries", entries);
     logs.put("entries2", entries2);
 
@@ -269,7 +269,7 @@ public class SortedLogRecoveryTest {
   public void testEmpty() throws IOException {
     // Create a test log
     KeyValue entries[] = new KeyValue[] {createKeyValue(OPEN, 0, -1, "1"), createKeyValue(DEFINE_TABLET, 1, 1, extent),};
-    Map<String,KeyValue[]> logs = new TreeMap<String,KeyValue[]>();
+    Map<String,KeyValue[]> logs = new TreeMap<>();
     logs.put("testlog", entries);
     // Recover
     List<Mutation> mutations = recover(logs, extent);
@@ -282,7 +282,7 @@ public class SortedLogRecoveryTest {
   public void testMissingDefinition() {
     // Create a test log
     KeyValue entries[] = new KeyValue[] {createKeyValue(OPEN, 0, -1, "1"),};
-    Map<String,KeyValue[]> logs = new TreeMap<String,KeyValue[]>();
+    Map<String,KeyValue[]> logs = new TreeMap<>();
     logs.put("testlog", entries);
     // Recover
     try {
@@ -297,7 +297,7 @@ public class SortedLogRecoveryTest {
     Mutation m = new ServerMutation(new Text("row1"));
     m.put(cf, cq, value);
     KeyValue entries[] = new KeyValue[] {createKeyValue(OPEN, 0, -1, "1"), createKeyValue(DEFINE_TABLET, 1, 1, extent), createKeyValue(MUTATION, 2, 1, m),};
-    Map<String,KeyValue[]> logs = new TreeMap<String,KeyValue[]>();
+    Map<String,KeyValue[]> logs = new TreeMap<>();
     logs.put("testlog", entries);
     // Recover
     List<Mutation> mutations = recover(logs, extent);
@@ -316,7 +316,7 @@ public class SortedLogRecoveryTest {
     KeyValue entries[] = new KeyValue[] {createKeyValue(OPEN, 0, -1, "1"), createKeyValue(DEFINE_TABLET, 1, 1, extent),
         createKeyValue(COMPACTION_START, 3, 1, "/t1/f1"), createKeyValue(COMPACTION_FINISH, 4, 1, null), createKeyValue(MUTATION, 2, 1, ignored),
         createKeyValue(MUTATION, 5, 1, m),};
-    Map<String,KeyValue[]> logs = new TreeMap<String,KeyValue[]>();
+    Map<String,KeyValue[]> logs = new TreeMap<>();
     logs.put("testlog", entries);
     // Recover
     List<Mutation> mutations = recover(logs, extent);
@@ -336,7 +336,7 @@ public class SortedLogRecoveryTest {
         createKeyValue(COMPACTION_START, 3, 1, "/t1/f1"), createKeyValue(MUTATION, 2, 1, ignored),};
     KeyValue entries2[] = new KeyValue[] {createKeyValue(OPEN, 4, -1, "1"), createKeyValue(DEFINE_TABLET, 5, 1, extent),
         createKeyValue(COMPACTION_FINISH, 6, 1, null), createKeyValue(MUTATION, 7, 1, m),};
-    Map<String,KeyValue[]> logs = new TreeMap<String,KeyValue[]>();
+    Map<String,KeyValue[]> logs = new TreeMap<>();
     logs.put("entries", entries);
     logs.put("entries2", entries2);
     // Recover
@@ -359,7 +359,7 @@ public class SortedLogRecoveryTest {
         createKeyValue(COMPACTION_START, 3, 1, "/t1/f1"), createKeyValue(MUTATION, 2, 1, ignored), createKeyValue(MUTATION, 4, 1, m),};
     KeyValue entries2[] = new KeyValue[] {createKeyValue(OPEN, 5, -1, "1"), createKeyValue(DEFINE_TABLET, 6, 1, extent),
         createKeyValue(COMPACTION_FINISH, 7, 1, null), createKeyValue(MUTATION, 8, 1, m2),};
-    Map<String,KeyValue[]> logs = new TreeMap<String,KeyValue[]>();
+    Map<String,KeyValue[]> logs = new TreeMap<>();
     logs.put("entries", entries);
     logs.put("entries2", entries2);
     // Recover
@@ -382,7 +382,7 @@ public class SortedLogRecoveryTest {
     KeyValue entries[] = new KeyValue[] {createKeyValue(OPEN, 0, -1, "1"), createKeyValue(DEFINE_TABLET, 1, 1, extent),
         createKeyValue(COMPACTION_FINISH, 2, 1, null), createKeyValue(COMPACTION_START, 4, 1, "/t1/f1"), createKeyValue(COMPACTION_FINISH, 6, 1, null),
         createKeyValue(MUTATION, 3, 1, ignored), createKeyValue(MUTATION, 5, 1, m), createKeyValue(MUTATION, 7, 1, m2),};
-    Map<String,KeyValue[]> logs = new TreeMap<String,KeyValue[]>();
+    Map<String,KeyValue[]> logs = new TreeMap<>();
     logs.put("entries", entries);
     // Recover
     List<Mutation> mutations = recover(logs, extent);
@@ -408,7 +408,7 @@ public class SortedLogRecoveryTest {
     KeyValue entries2[] = new KeyValue[] {createKeyValue(OPEN, 5, -1, "1"), createKeyValue(DEFINE_TABLET, 6, 1, extent), createKeyValue(MUTATION, 7, 1, m2),};
     KeyValue entries3[] = new KeyValue[] {createKeyValue(OPEN, 8, -1, "1"), createKeyValue(DEFINE_TABLET, 9, 1, extent),
         createKeyValue(COMPACTION_FINISH, 10, 1, null), createKeyValue(MUTATION, 11, 1, m3),};
-    Map<String,KeyValue[]> logs = new TreeMap<String,KeyValue[]>();
+    Map<String,KeyValue[]> logs = new TreeMap<>();
     logs.put("entries", entries);
     logs.put("entries2", entries2);
     logs.put("entries3", entries3);
@@ -431,7 +431,7 @@ public class SortedLogRecoveryTest {
     KeyValue entries[] = new KeyValue[] {createKeyValue(OPEN, 0, -1, "1"), createKeyValue(DEFINE_TABLET, 1, 1, extent),
         createKeyValue(COMPACTION_START, 30, 1, "/t1/f1"), createKeyValue(COMPACTION_FINISH, 32, 1, "/t1/f1"), createKeyValue(MUTATION, 29, 1, m1),
         createKeyValue(MUTATION, 30, 1, m2),};
-    Map<String,KeyValue[]> logs = new TreeMap<String,KeyValue[]>();
+    Map<String,KeyValue[]> logs = new TreeMap<>();
     logs.put("testlog", entries);
     // Recover
     List<Mutation> mutations = recover(logs, extent);
@@ -454,7 +454,7 @@ public class SortedLogRecoveryTest {
         createKeyValue(COMPACTION_START, 2, 1, "/t1/f1"), createKeyValue(COMPACTION_FINISH, 4, 1, null), createKeyValue(MUTATION, 3, 1, m),};
     KeyValue entries2[] = new KeyValue[] {createKeyValue(OPEN, 5, -1, "1"), createKeyValue(DEFINE_TABLET, 6, 1, extent),
         createKeyValue(COMPACTION_START, 8, 1, "/t1/f1"), createKeyValue(MUTATION, 7, 1, m2), createKeyValue(MUTATION, 9, 1, m3),};
-    Map<String,KeyValue[]> logs = new TreeMap<String,KeyValue[]>();
+    Map<String,KeyValue[]> logs = new TreeMap<>();
     logs.put("entries", entries);
     logs.put("entries2", entries2);
     // Recover
@@ -498,7 +498,7 @@ public class SortedLogRecoveryTest {
         // createKeyValue(COMPACTION_START, 18, 1, "somefile"),
         // createKeyValue(COMPACTION_FINISH, 19, 1, null),
         createKeyValue(MUTATION, 8, 1, m5), createKeyValue(MUTATION, 20, 1, m6),};
-    Map<String,KeyValue[]> logs = new TreeMap<String,KeyValue[]>();
+    Map<String,KeyValue[]> logs = new TreeMap<>();
     logs.put("entries", entries);
     logs.put("entries2", entries2);
     logs.put("entries3", entries3);
@@ -535,7 +535,7 @@ public class SortedLogRecoveryTest {
         createKeyValue(MUTATION, 3, 1, m), createKeyValue(MUTATION, 3, 1, m2), createKeyValue(MUTATION, 3, 1, m3),};
     KeyValue entries2[] = new KeyValue[] {createKeyValue(OPEN, 0, -1, "2"), createKeyValue(DEFINE_TABLET, 1, 1, extent),
         createKeyValue(COMPACTION_START, 2, 1, "/t1/f12"), createKeyValue(MUTATION, 3, 1, m4), createKeyValue(MUTATION, 3, 1, m5),};
-    Map<String,KeyValue[]> logs = new TreeMap<String,KeyValue[]>();
+    Map<String,KeyValue[]> logs = new TreeMap<>();
     logs.put("entries", entries);
     logs.put("entries2", entries2);
     // Recover
@@ -566,7 +566,7 @@ public class SortedLogRecoveryTest {
 
     Arrays.sort(entries);
 
-    Map<String,KeyValue[]> logs = new TreeMap<String,KeyValue[]>();
+    Map<String,KeyValue[]> logs = new TreeMap<>();
     logs.put("entries", entries);
 
     List<Mutation> mutations = recover(logs, extent);
@@ -586,7 +586,7 @@ public class SortedLogRecoveryTest {
         createKeyValue(MUTATION, 2, 2, ignored), createKeyValue(COMPACTION_START, 3, 2, "/t/f1")};
 
     Arrays.sort(entries);
-    Map<String,KeyValue[]> logs = new TreeMap<String,KeyValue[]>();
+    Map<String,KeyValue[]> logs = new TreeMap<>();
     logs.put("entries", entries);
 
     List<Mutation> mutations = recover(logs, Collections.singleton("/t/f1"), extent);
@@ -607,7 +607,7 @@ public class SortedLogRecoveryTest {
         createKeyValue(MUTATION, 2, 2, ignored), createKeyValue(COMPACTION_START, 3, 2, "/t/f1"), createKeyValue(MUTATION, 4, 2, m),};
 
     Arrays.sort(entries);
-    Map<String,KeyValue[]> logs = new TreeMap<String,KeyValue[]>();
+    Map<String,KeyValue[]> logs = new TreeMap<>();
     logs.put("entries", entries);
 
     List<Mutation> mutations = recover(logs, Collections.singleton("/t/f1"), extent);
@@ -626,10 +626,10 @@ public class SortedLogRecoveryTest {
         createKeyValue(COMPACTION_START, 3, 2, compactionStartFile), createKeyValue(MUTATION, 4, 2, m2),};
 
     Arrays.sort(entries);
-    Map<String,KeyValue[]> logs = new TreeMap<String,KeyValue[]>();
+    Map<String,KeyValue[]> logs = new TreeMap<>();
     logs.put("entries", entries);
 
-    HashSet<String> filesSet = new HashSet<String>();
+    HashSet<String> filesSet = new HashSet<>();
     filesSet.addAll(Arrays.asList(tabletFiles));
     List<Mutation> mutations = recover(logs, filesSet, extent);
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/tserver/src/test/java/org/apache/accumulo/tserver/tablet/RootFilesTest.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/test/java/org/apache/accumulo/tserver/tablet/RootFilesTest.java b/server/tserver/src/test/java/org/apache/accumulo/tserver/tablet/RootFilesTest.java
index e5d893a..d9c6862 100644
--- a/server/tserver/src/test/java/org/apache/accumulo/tserver/tablet/RootFilesTest.java
+++ b/server/tserver/src/test/java/org/apache/accumulo/tserver/tablet/RootFilesTest.java
@@ -60,7 +60,7 @@ public class RootFilesTest {
 
       rootTabletDir = new File(tempFolder.newFolder(), "accumulo/tables/+r/root_tablet");
       assertTrue(rootTabletDir.mkdirs() || rootTabletDir.isDirectory());
-      oldDatafiles = new HashSet<FileRef>();
+      oldDatafiles = new HashSet<>();
       for (String filename : inputFiles) {
         File file = new File(rootTabletDir, filename);
         assertTrue(file.createNewFile());
@@ -91,17 +91,17 @@ public class RootFilesTest {
     public Collection<String> cleanupReplacement(String... expectedFiles) throws IOException {
       Collection<String> ret = RootFiles.cleanupReplacement(vm, vm.listStatus(new Path(rootTabletDir.toURI())), true);
 
-      HashSet<String> expected = new HashSet<String>();
+      HashSet<String> expected = new HashSet<>();
       for (String efile : expectedFiles)
         expected.add(new File(rootTabletDir, efile).toURI().toString());
 
-      Assert.assertEquals(expected, new HashSet<String>(ret));
+      Assert.assertEquals(expected, new HashSet<>(ret));
 
       return ret;
     }
 
     public void assertFiles(String... files) {
-      HashSet<String> actual = new HashSet<String>();
+      HashSet<String> actual = new HashSet<>();
       File[] children = rootTabletDir.listFiles();
       if (children != null) {
         for (File file : children) {
@@ -109,7 +109,7 @@ public class RootFilesTest {
         }
       }
 
-      HashSet<String> expected = new HashSet<String>();
+      HashSet<String> expected = new HashSet<>();
       expected.addAll(Arrays.asList(files));
 
       Assert.assertEquals(expected, actual);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/shell/src/main/java/org/apache/accumulo/shell/Shell.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/Shell.java b/shell/src/main/java/org/apache/accumulo/shell/Shell.java
index 5c95129..db9732c 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/Shell.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/Shell.java
@@ -206,12 +206,12 @@ public class Shell extends ShellOptions implements KeywordExecutable {
   protected ConsoleReader reader;
   private AuthenticationToken token;
   private final Class<? extends Formatter> defaultFormatterClass = DefaultFormatter.class;
-  public Map<String,List<IteratorSetting>> scanIteratorOptions = new HashMap<String,List<IteratorSetting>>();
-  public Map<String,List<IteratorSetting>> iteratorProfiles = new HashMap<String,List<IteratorSetting>>();
+  public Map<String,List<IteratorSetting>> scanIteratorOptions = new HashMap<>();
+  public Map<String,List<IteratorSetting>> iteratorProfiles = new HashMap<>();
 
   private Token rootToken;
-  public final Map<String,Command> commandFactory = new TreeMap<String,Command>();
-  public final Map<String,Command[]> commandGrouping = new TreeMap<String,Command[]>();
+  public final Map<String,Command> commandFactory = new TreeMap<>();
+  public final Map<String,Command[]> commandGrouping = new TreeMap<>();
 
   // exit if true
   private boolean exit = false;
@@ -875,15 +875,15 @@ public class Shell extends ShellOptions implements KeywordExecutable {
       namespaces = Collections.emptySet();
     }
 
-    Map<Command.CompletionSet,Set<String>> options = new HashMap<Command.CompletionSet,Set<String>>();
+    Map<Command.CompletionSet,Set<String>> options = new HashMap<>();
 
-    Set<String> commands = new HashSet<String>();
+    Set<String> commands = new HashSet<>();
     for (String a : commandFactory.keySet())
       commands.add(a);
 
-    Set<String> modifiedUserlist = new HashSet<String>();
-    Set<String> modifiedTablenames = new HashSet<String>();
-    Set<String> modifiedNamespaces = new HashSet<String>();
+    Set<String> modifiedUserlist = new HashSet<>();
+    Set<String> modifiedTablenames = new HashSet<>();
+    Set<String> modifiedNamespaces = new HashSet<>();
 
     for (String a : tableNames)
       modifiedTablenames.add(a.replaceAll("([\\s'\"])", "\\\\$1"));
@@ -1026,7 +1026,7 @@ public class Shell extends ShellOptions implements KeywordExecutable {
 
     @Override
     public void close() {}
-  };
+  }
 
   public static class PrintFile implements PrintLine {
     PrintWriter writer;
@@ -1044,7 +1044,7 @@ public class Shell extends ShellOptions implements KeywordExecutable {
     public void close() {
       writer.close();
     }
-  };
+  }
 
   public final void printLines(Iterator<String> lines, boolean paginate) throws IOException {
     printLines(lines, paginate, null);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/shell/src/main/java/org/apache/accumulo/shell/ShellOptionsJC.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/ShellOptionsJC.java b/shell/src/main/java/org/apache/accumulo/shell/ShellOptionsJC.java
index 01b7ce3..1e5156f 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/ShellOptionsJC.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/ShellOptionsJC.java
@@ -105,7 +105,7 @@ public class ShellOptionsJC {
       String process(String value) {
         return value;
       }
-    };
+    }
 
     @Override
     public String convert(String value) {
@@ -141,7 +141,7 @@ public class ShellOptionsJC {
   private AuthenticationToken authenticationToken;
 
   @DynamicParameter(names = {"-l", "--tokenProperty"}, description = "login properties in the format key=value. Reuse -l for each property")
-  private Map<String,String> tokenProperties = new TreeMap<String,String>();
+  private Map<String,String> tokenProperties = new TreeMap<>();
 
   @Parameter(names = "--disable-tab-completion", description = "disables tab completion (for less overhead when scripting)")
   private boolean tabCompletionDisabled;
@@ -169,7 +169,7 @@ public class ShellOptionsJC {
   private boolean hdfsZooInstance;
 
   @Parameter(names = {"-z", "--zooKeeperInstance"}, description = "use a zookeeper instance with the given instance name and list of zoo hosts", arity = 2)
-  private List<String> zooKeeperInstance = new ArrayList<String>();
+  private List<String> zooKeeperInstance = new ArrayList<>();
 
   @Parameter(names = {"--ssl"}, description = "use ssl to connect to accumulo")
   private boolean useSsl = false;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/shell/src/main/java/org/apache/accumulo/shell/Token.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/Token.java b/shell/src/main/java/org/apache/accumulo/shell/Token.java
index fe29537..41921e5 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/Token.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/Token.java
@@ -30,8 +30,8 @@ import java.util.Set;
  */
 
 public class Token {
-  private Set<String> command = new HashSet<String>();
-  private Set<Token> subcommands = new HashSet<Token>();
+  private Set<String> command = new HashSet<>();
+  private Set<Token> subcommands = new HashSet<>();
   private boolean caseSensitive = false;
 
   public Token() {}
@@ -73,7 +73,7 @@ public class Token {
   }
 
   public Set<String> getSubcommandNames() {
-    HashSet<String> set = new HashSet<String>();
+    HashSet<String> set = new HashSet<>();
     for (Token t : subcommands)
       set.addAll(t.getCommandNames());
     return set;
@@ -81,7 +81,7 @@ public class Token {
 
   public Set<String> getSubcommandNames(String startsWith) {
     Iterator<Token> iter = subcommands.iterator();
-    HashSet<String> set = new HashSet<String>();
+    HashSet<String> set = new HashSet<>();
     while (iter.hasNext()) {
       Token t = iter.next();
       Set<String> subset = t.getCommandNames();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/shell/src/main/java/org/apache/accumulo/shell/commands/ActiveCompactionIterator.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/ActiveCompactionIterator.java b/shell/src/main/java/org/apache/accumulo/shell/commands/ActiveCompactionIterator.java
index bd039b0..27a5bc8 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/ActiveCompactionIterator.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/ActiveCompactionIterator.java
@@ -54,7 +54,7 @@ class ActiveCompactionIterator implements Iterator<String> {
   }
 
   private void readNext() {
-    final List<String> compactions = new ArrayList<String>();
+    final List<String> compactions = new ArrayList<>();
 
     while (tsIter.hasNext()) {
 
@@ -62,7 +62,7 @@ class ActiveCompactionIterator implements Iterator<String> {
       try {
         List<ActiveCompaction> acl = instanceOps.getActiveCompactions(tserver);
 
-        acl = new ArrayList<ActiveCompaction>(acl);
+        acl = new ArrayList<>(acl);
 
         Collections.sort(acl, new Comparator<ActiveCompaction>() {
           @Override
@@ -80,8 +80,8 @@ class ActiveCompactionIterator implements Iterator<String> {
 
           ac.getIterators();
 
-          List<String> iterList = new ArrayList<String>();
-          Map<String,Map<String,String>> iterOpts = new HashMap<String,Map<String,String>>();
+          List<String> iterList = new ArrayList<>();
+          Map<String,Map<String,String>> iterOpts = new HashMap<>();
           for (IteratorSetting is : ac.getIterators()) {
             iterList.add(is.getName() + "=" + is.getPriority() + "," + is.getIteratorClass());
             iterOpts.put(is.getName(), is.getOptions());

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/shell/src/main/java/org/apache/accumulo/shell/commands/ActiveScanIterator.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/ActiveScanIterator.java b/shell/src/main/java/org/apache/accumulo/shell/commands/ActiveScanIterator.java
index 1089d78..ab0b344 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/ActiveScanIterator.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/ActiveScanIterator.java
@@ -33,7 +33,7 @@ class ActiveScanIterator implements Iterator<String> {
   private Iterator<String> scansIter;
 
   private void readNext() {
-    final List<String> scans = new ArrayList<String>();
+    final List<String> scans = new ArrayList<>();
 
     while (tsIter.hasNext()) {
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/shell/src/main/java/org/apache/accumulo/shell/commands/AddSplitsCommand.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/AddSplitsCommand.java b/shell/src/main/java/org/apache/accumulo/shell/commands/AddSplitsCommand.java
index 964ec41..86d08a0 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/AddSplitsCommand.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/AddSplitsCommand.java
@@ -36,7 +36,7 @@ public class AddSplitsCommand extends Command {
     final String tableName = OptUtil.getTableOpt(cl, shellState);
     final boolean decode = cl.hasOption(base64Opt.getOpt());
 
-    final TreeSet<Text> splits = new TreeSet<Text>();
+    final TreeSet<Text> splits = new TreeSet<>();
 
     if (cl.hasOption(optSplitsFile.getOpt())) {
       splits.addAll(ShellUtil.scanFile(cl.getOptionValue(optSplitsFile.getOpt()), decode));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/shell/src/main/java/org/apache/accumulo/shell/commands/CloneTableCommand.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/CloneTableCommand.java b/shell/src/main/java/org/apache/accumulo/shell/commands/CloneTableCommand.java
index daca82c..8f99f9c 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/CloneTableCommand.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/CloneTableCommand.java
@@ -42,8 +42,8 @@ public class CloneTableCommand extends Command {
   public int execute(final String fullCommand, final CommandLine cl, final Shell shellState) throws AccumuloException, AccumuloSecurityException,
       TableNotFoundException, TableExistsException {
 
-    final HashMap<String,String> props = new HashMap<String,String>();
-    final HashSet<String> exclude = new HashSet<String>();
+    final HashMap<String,String> props = new HashMap<>();
+    final HashSet<String> exclude = new HashSet<>();
     boolean flush = true;
 
     if (cl.hasOption(setPropsOption.getOpt())) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/shell/src/main/java/org/apache/accumulo/shell/commands/ConfigCommand.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/ConfigCommand.java b/shell/src/main/java/org/apache/accumulo/shell/commands/ConfigCommand.java
index ec3f276..482bd84 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/ConfigCommand.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/ConfigCommand.java
@@ -140,21 +140,21 @@ public class ConfigCommand extends Command {
       }
     } else {
       // display properties
-      final TreeMap<String,String> systemConfig = new TreeMap<String,String>();
+      final TreeMap<String,String> systemConfig = new TreeMap<>();
       systemConfig.putAll(shellState.getConnector().instanceOperations().getSystemConfiguration());
 
       final String outputFile = cl.getOptionValue(outputFileOpt.getOpt());
       final PrintFile printFile = outputFile == null ? null : new PrintFile(outputFile);
 
-      final TreeMap<String,String> siteConfig = new TreeMap<String,String>();
+      final TreeMap<String,String> siteConfig = new TreeMap<>();
       siteConfig.putAll(shellState.getConnector().instanceOperations().getSiteConfiguration());
 
-      final TreeMap<String,String> defaults = new TreeMap<String,String>();
+      final TreeMap<String,String> defaults = new TreeMap<>();
       for (Entry<String,String> defaultEntry : AccumuloConfiguration.getDefaultConfiguration()) {
         defaults.put(defaultEntry.getKey(), defaultEntry.getValue());
       }
 
-      final TreeMap<String,String> namespaceConfig = new TreeMap<String,String>();
+      final TreeMap<String,String> namespaceConfig = new TreeMap<>();
       if (tableName != null) {
         String n = Namespaces.getNamespaceName(shellState.getInstance(),
             Tables.getNamespaceId(shellState.getInstance(), Tables.getTableId(shellState.getInstance(), tableName)));
@@ -169,7 +169,7 @@ public class ConfigCommand extends Command {
       } else if (namespace != null) {
         acuconf = shellState.getConnector().namespaceOperations().getProperties(namespace);
       }
-      final TreeMap<String,String> sortedConf = new TreeMap<String,String>();
+      final TreeMap<String,String> sortedConf = new TreeMap<>();
       for (Entry<String,String> propEntry : acuconf) {
         sortedConf.put(propEntry.getKey(), propEntry.getValue());
       }
@@ -187,7 +187,7 @@ public class ConfigCommand extends Command {
         COL2 = Math.max(COL2, propEntry.getKey().length() + 3);
       }
 
-      final ArrayList<String> output = new ArrayList<String>();
+      final ArrayList<String> output = new ArrayList<>();
       printConfHeader(output);
 
       for (Entry<String,String> propEntry : sortedConf.entrySet()) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/shell/src/main/java/org/apache/accumulo/shell/commands/CreateTableCommand.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/CreateTableCommand.java b/shell/src/main/java/org/apache/accumulo/shell/commands/CreateTableCommand.java
index b0aca92..eac16fa 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/CreateTableCommand.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/CreateTableCommand.java
@@ -62,7 +62,7 @@ public class CreateTableCommand extends Command {
       TableExistsException, TableNotFoundException, IOException, ClassNotFoundException {
 
     final String testTableName = cl.getArgs()[0];
-    final HashMap<String,String> props = new HashMap<String,String>();
+    final HashMap<String,String> props = new HashMap<>();
 
     if (!testTableName.matches(Tables.VALID_NAME_REGEX)) {
       shellState.getReader().println("Only letters, numbers and underscores are allowed for use in table names.");
@@ -73,7 +73,7 @@ public class CreateTableCommand extends Command {
     if (shellState.getConnector().tableOperations().exists(tableName)) {
       throw new TableExistsException(null, tableName, null);
     }
-    final SortedSet<Text> partitions = new TreeSet<Text>();
+    final SortedSet<Text> partitions = new TreeSet<>();
     final boolean decode = cl.hasOption(base64Opt.getOpt());
 
     if (cl.hasOption(createTableOptSplit.getOpt())) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/shell/src/main/java/org/apache/accumulo/shell/commands/DUCommand.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/DUCommand.java b/shell/src/main/java/org/apache/accumulo/shell/commands/DUCommand.java
index 2adcc81..4d312fc 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/DUCommand.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/DUCommand.java
@@ -42,7 +42,7 @@ public class DUCommand extends Command {
   public int execute(final String fullCommand, final CommandLine cl, final Shell shellState) throws IOException, TableNotFoundException,
       NamespaceNotFoundException {
 
-    final SortedSet<String> tables = new TreeSet<String>(Arrays.asList(cl.getArgs()));
+    final SortedSet<String> tables = new TreeSet<>(Arrays.asList(cl.getArgs()));
 
     if (cl.hasOption(ShellOptions.tableOption)) {
       tables.add(cl.getOptionValue(ShellOptions.tableOption));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/shell/src/main/java/org/apache/accumulo/shell/commands/DeleteAuthsCommand.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/DeleteAuthsCommand.java b/shell/src/main/java/org/apache/accumulo/shell/commands/DeleteAuthsCommand.java
index 859dd57..995db0c 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/DeleteAuthsCommand.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/DeleteAuthsCommand.java
@@ -46,7 +46,7 @@ public class DeleteAuthsCommand extends Command {
     final Authorizations auths = connector.securityOperations().getUserAuthorizations(user);
     final StringBuilder userAuths = new StringBuilder();
     final String[] toBeRemovedAuths = scanOpts.split(",");
-    final Set<String> toBeRemovedSet = new HashSet<String>();
+    final Set<String> toBeRemovedSet = new HashSet<>();
     for (String auth : toBeRemovedAuths) {
       toBeRemovedSet.add(auth);
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/shell/src/main/java/org/apache/accumulo/shell/commands/ExtensionCommand.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/ExtensionCommand.java b/shell/src/main/java/org/apache/accumulo/shell/commands/ExtensionCommand.java
index 3cff189..f78a503 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/ExtensionCommand.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/ExtensionCommand.java
@@ -34,9 +34,9 @@ public class ExtensionCommand extends Command {
 
   private ServiceLoader<ShellExtension> extensions = null;
 
-  private Set<String> loadedHeaders = new HashSet<String>();
-  private Set<String> loadedCommands = new HashSet<String>();
-  private Set<String> loadedExtensions = new TreeSet<String>();
+  private Set<String> loadedHeaders = new HashSet<>();
+  private Set<String> loadedCommands = new HashSet<>();
+  private Set<String> loadedExtensions = new TreeSet<>();
 
   @Override
   public int execute(String fullCommand, CommandLine cl, Shell shellState) throws Exception {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/shell/src/main/java/org/apache/accumulo/shell/commands/FateCommand.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/FateCommand.java b/shell/src/main/java/org/apache/accumulo/shell/commands/FateCommand.java
index e5d6c59..88eeefd 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/FateCommand.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/FateCommand.java
@@ -123,12 +123,12 @@ public class FateCommand extends Command {
     String cmd = args[0];
     boolean failedCommand = false;
 
-    AdminUtil<FateCommand> admin = new AdminUtil<FateCommand>(false);
+    AdminUtil<FateCommand> admin = new AdminUtil<>(false);
 
     String path = ZooUtil.getRoot(instance) + Constants.ZFATE;
     String masterPath = ZooUtil.getRoot(instance) + Constants.ZMASTER_LOCK;
     IZooReaderWriter zk = getZooReaderWriter(shellState.getInstance(), cl.getOptionValue(secretOption.getOpt()));
-    ZooStore<FateCommand> zs = new ZooStore<FateCommand>(path, zk);
+    ZooStore<FateCommand> zs = new ZooStore<>(path, zk);
 
     if ("fail".equals(cmd)) {
       if (args.length <= 1) {
@@ -156,7 +156,7 @@ public class FateCommand extends Command {
       // Parse transaction ID filters for print display
       Set<Long> filterTxid = null;
       if (args.length >= 2) {
-        filterTxid = new HashSet<Long>(args.length);
+        filterTxid = new HashSet<>(args.length);
         for (int i = 1; i < args.length; i++) {
           try {
             Long val = Long.parseLong(args[i], 16);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/shell/src/main/java/org/apache/accumulo/shell/commands/GetAuthsCommand.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/GetAuthsCommand.java b/shell/src/main/java/org/apache/accumulo/shell/commands/GetAuthsCommand.java
index 5c6a4eb..1f6cec0 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/GetAuthsCommand.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/GetAuthsCommand.java
@@ -46,7 +46,7 @@ public class GetAuthsCommand extends Command {
   }
 
   protected List<String> sortAuthorizations(Authorizations auths) {
-    List<String> list = new ArrayList<String>();
+    List<String> list = new ArrayList<>();
     for (byte[] auth : auths) {
       list.add(new String(auth));
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/shell/src/main/java/org/apache/accumulo/shell/commands/HelpCommand.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/HelpCommand.java b/shell/src/main/java/org/apache/accumulo/shell/commands/HelpCommand.java
index 5945cc3..bf26a45 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/HelpCommand.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/HelpCommand.java
@@ -49,7 +49,7 @@ public class HelpCommand extends Command {
       if (numColumns < 40) {
         throw new IllegalArgumentException("numColumns must be at least 40 (was " + numColumns + ")");
       }
-      final ArrayList<String> output = new ArrayList<String>();
+      final ArrayList<String> output = new ArrayList<>();
       for (Entry<String,Command[]> cmdGroup : shellState.commandGrouping.entrySet()) {
         output.add(cmdGroup.getKey());
         for (Command c : cmdGroup.getValue()) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/shell/src/main/java/org/apache/accumulo/shell/commands/InsertCommand.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/InsertCommand.java b/shell/src/main/java/org/apache/accumulo/shell/commands/InsertCommand.java
index af5f810..c9da47e 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/InsertCommand.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/InsertCommand.java
@@ -106,7 +106,7 @@ public class InsertCommand extends Command {
     try {
       bw.close();
     } catch (MutationsRejectedException e) {
-      final ArrayList<String> lines = new ArrayList<String>();
+      final ArrayList<String> lines = new ArrayList<>();
       if (e.getSecurityErrorCodes().isEmpty() == false) {
         lines.add("\tAuthorization Failures:");
       }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/shell/src/main/java/org/apache/accumulo/shell/commands/ListBulkCommand.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/ListBulkCommand.java b/shell/src/main/java/org/apache/accumulo/shell/commands/ListBulkCommand.java
index 6db9327..8f09e8a 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/ListBulkCommand.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/ListBulkCommand.java
@@ -60,7 +60,7 @@ public class ListBulkCommand extends Command {
     final boolean paginate = !cl.hasOption(disablePaginationOpt.getOpt());
 
     if (cl.hasOption(tserverOption.getOpt())) {
-      tservers = new ArrayList<String>();
+      tservers = new ArrayList<>();
       tservers.add(cl.getOptionValue(tserverOption.getOpt()));
     } else {
       tservers = Collections.emptyList();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/shell/src/main/java/org/apache/accumulo/shell/commands/ListCompactionsCommand.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/ListCompactionsCommand.java b/shell/src/main/java/org/apache/accumulo/shell/commands/ListCompactionsCommand.java
index e4b3410..f59c481 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/ListCompactionsCommand.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/ListCompactionsCommand.java
@@ -45,7 +45,7 @@ public class ListCompactionsCommand extends Command {
     final boolean paginate = !cl.hasOption(disablePaginationOpt.getOpt());
 
     if (cl.hasOption(tserverOption.getOpt())) {
-      tservers = new ArrayList<String>();
+      tservers = new ArrayList<>();
       tservers.add(cl.getOptionValue(tserverOption.getOpt()));
     } else {
       tservers = instanceOps.getTabletServers();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/shell/src/main/java/org/apache/accumulo/shell/commands/ListIterCommand.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/ListIterCommand.java b/shell/src/main/java/org/apache/accumulo/shell/commands/ListIterCommand.java
index 6187300..4a1c0bf 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/ListIterCommand.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/ListIterCommand.java
@@ -63,7 +63,7 @@ public class ListIterCommand extends Command {
     }
 
     final boolean allScopes = cl.hasOption(allScopesOpt.getOpt());
-    Set<IteratorScope> desiredScopes = new HashSet<IteratorScope>();
+    Set<IteratorScope> desiredScopes = new HashSet<>();
     for (IteratorScope scope : IteratorScope.values()) {
       if (allScopes || cl.hasOption(scopeOpts.get(scope).getOpt()))
         desiredScopes.add(scope);
@@ -120,7 +120,7 @@ public class ListIterCommand extends Command {
     allScopesOpt = new Option("all", "all-scopes", false, "list from all scopes");
     o.addOption(allScopesOpt);
 
-    scopeOpts = new EnumMap<IteratorScope,Option>(IteratorScope.class);
+    scopeOpts = new EnumMap<>(IteratorScope.class);
     scopeOpts.put(IteratorScope.minc, new Option(IteratorScope.minc.name(), "minor-compaction", false, "list iterator for minor compaction scope"));
     scopeOpts.put(IteratorScope.majc, new Option(IteratorScope.majc.name(), "major-compaction", false, "list iterator for major compaction scope"));
     scopeOpts.put(IteratorScope.scan, new Option(IteratorScope.scan.name(), "scan-time", false, "list iterator for scan scope"));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/shell/src/main/java/org/apache/accumulo/shell/commands/ListScansCommand.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/ListScansCommand.java b/shell/src/main/java/org/apache/accumulo/shell/commands/ListScansCommand.java
index f89b6fc..261db07 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/ListScansCommand.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/ListScansCommand.java
@@ -45,7 +45,7 @@ public class ListScansCommand extends Command {
     final boolean paginate = !cl.hasOption(disablePaginationOpt.getOpt());
 
     if (cl.hasOption(tserverOption.getOpt())) {
-      tservers = new ArrayList<String>();
+      tservers = new ArrayList<>();
       tservers.add(cl.getOptionValue(tserverOption.getOpt()));
     } else {
       tservers = instanceOps.getTabletServers();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/shell/src/main/java/org/apache/accumulo/shell/commands/NamespacesCommand.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/NamespacesCommand.java b/shell/src/main/java/org/apache/accumulo/shell/commands/NamespacesCommand.java
index d88d6f1..cb37505 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/NamespacesCommand.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/NamespacesCommand.java
@@ -41,7 +41,7 @@ public class NamespacesCommand extends Command {
 
   @Override
   public int execute(final String fullCommand, final CommandLine cl, final Shell shellState) throws AccumuloException, AccumuloSecurityException, IOException {
-    Map<String,String> namespaces = new TreeMap<String,String>(shellState.getConnector().namespaceOperations().namespaceIdMap());
+    Map<String,String> namespaces = new TreeMap<>(shellState.getConnector().namespaceOperations().namespaceIdMap());
 
     Iterator<String> it = Iterators.transform(namespaces.entrySet().iterator(), new Function<Entry<String,String>,String>() {
       @Override

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/shell/src/main/java/org/apache/accumulo/shell/commands/PingCommand.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/PingCommand.java b/shell/src/main/java/org/apache/accumulo/shell/commands/PingCommand.java
index ba6de68..c0271b7 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/PingCommand.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/PingCommand.java
@@ -48,7 +48,7 @@ public class PingCommand extends Command {
     final boolean paginate = !cl.hasOption(disablePaginationOpt.getOpt());
 
     if (cl.hasOption(tserverOption.getOpt())) {
-      tservers = new ArrayList<String>();
+      tservers = new ArrayList<>();
       tservers.add(cl.getOptionValue(tserverOption.getOpt()));
     } else {
       tservers = instanceOps.getTabletServers();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/shell/src/main/java/org/apache/accumulo/shell/commands/QuotedStringTokenizer.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/QuotedStringTokenizer.java b/shell/src/main/java/org/apache/accumulo/shell/commands/QuotedStringTokenizer.java
index 74397de..a66188e 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/QuotedStringTokenizer.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/QuotedStringTokenizer.java
@@ -38,7 +38,7 @@ public class QuotedStringTokenizer implements Iterable<String> {
   private String input;
 
   public QuotedStringTokenizer(final String t) throws BadArgumentException {
-    tokens = new ArrayList<String>();
+    tokens = new ArrayList<>();
     this.input = t;
     try {
       createTokens();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/shell/src/main/java/org/apache/accumulo/shell/commands/ScriptCommand.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/ScriptCommand.java b/shell/src/main/java/org/apache/accumulo/shell/commands/ScriptCommand.java
index 3059b52..82b7d57 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/ScriptCommand.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/ScriptCommand.java
@@ -88,7 +88,7 @@ public class ScriptCommand extends Command {
       Bindings b = engine.getBindings(ScriptContext.ENGINE_SCOPE);
       b.put("connection", shellState.getConnector());
 
-      List<Object> argValues = new ArrayList<Object>();
+      List<Object> argValues = new ArrayList<>();
       if (cl.hasOption(args.getOpt())) {
         String[] argList = cl.getOptionValue(args.getOpt()).split(",");
         for (String arg : argList) {
@@ -249,7 +249,7 @@ public class ScriptCommand extends Command {
 
   private void listJSREngineInfo(ScriptEngineManager mgr, Shell shellState) throws IOException {
     List<ScriptEngineFactory> factories = mgr.getEngineFactories();
-    Set<String> lines = new TreeSet<String>();
+    Set<String> lines = new TreeSet<>();
     for (ScriptEngineFactory factory : factories) {
       lines.add("ScriptEngineFactory Info");
       String engName = factory.getEngineName();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/shell/src/main/java/org/apache/accumulo/shell/commands/SetGroupsCommand.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/SetGroupsCommand.java b/shell/src/main/java/org/apache/accumulo/shell/commands/SetGroupsCommand.java
index 62ed1a2..b095bcf 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/SetGroupsCommand.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/SetGroupsCommand.java
@@ -36,7 +36,7 @@ public class SetGroupsCommand extends Command {
   public int execute(final String fullCommand, final CommandLine cl, final Shell shellState) throws Exception {
     final String tableName = OptUtil.getTableOpt(cl, shellState);
 
-    final HashMap<String,Set<Text>> groups = new HashMap<String,Set<Text>>();
+    final HashMap<String,Set<Text>> groups = new HashMap<>();
 
     for (String arg : cl.getArgs()) {
       final String sa[] = arg.split("=", 2);
@@ -44,7 +44,7 @@ public class SetGroupsCommand extends Command {
         throw new IllegalArgumentException("Missing '='");
       }
       final String group = sa[0];
-      final HashSet<Text> colFams = new HashSet<Text>();
+      final HashSet<Text> colFams = new HashSet<>();
 
       for (String family : sa[1].split(",")) {
         colFams.add(new Text(family.getBytes(Shell.CHARSET)));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/shell/src/main/java/org/apache/accumulo/shell/commands/SetIterCommand.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/SetIterCommand.java b/shell/src/main/java/org/apache/accumulo/shell/commands/SetIterCommand.java
index 23b98a6..fffdf21 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/SetIterCommand.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/SetIterCommand.java
@@ -64,7 +64,7 @@ public class SetIterCommand extends Command {
 
     final int priority = Integer.parseInt(cl.getOptionValue(priorityOpt.getOpt()));
 
-    final Map<String,String> options = new HashMap<String,String>();
+    final Map<String,String> options = new HashMap<>();
     String classname = cl.getOptionValue(classnameTypeOpt.getOpt());
     if (cl.hasOption(aggTypeOpt.getOpt())) {
       Shell.log.warn("aggregators are deprecated");
@@ -240,7 +240,7 @@ public class SetIterCommand extends Command {
       if (className.contains(".")) {
         shortClassName = className.substring(className.lastIndexOf('.') + 1);
       }
-      final Map<String,String> localOptions = new HashMap<String,String>();
+      final Map<String,String> localOptions = new HashMap<>();
       do {
         // clean up the overall options that caused things to fail
         for (String key : localOptions.keySet()) {
@@ -311,7 +311,7 @@ public class SetIterCommand extends Command {
       reader.flush();
       reader.println("Optional, configure name-value options for iterator:");
       String prompt = Shell.repeat("-", 10) + "> set option (<name> <value>, hit enter to skip): ";
-      final HashMap<String,String> localOptions = new HashMap<String,String>();
+      final HashMap<String,String> localOptions = new HashMap<>();
 
       while (true) {
         reader.flush();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/shell/src/main/java/org/apache/accumulo/shell/commands/SetScanIterCommand.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/SetScanIterCommand.java b/shell/src/main/java/org/apache/accumulo/shell/commands/SetScanIterCommand.java
index e7d2793..2399d0e 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/SetScanIterCommand.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/SetScanIterCommand.java
@@ -63,7 +63,7 @@ public class SetScanIterCommand extends SetIterCommand {
 
     List<IteratorSetting> tableScanIterators = shellState.scanIteratorOptions.get(tableName);
     if (tableScanIterators == null) {
-      tableScanIterators = new ArrayList<IteratorSetting>();
+      tableScanIterators = new ArrayList<>();
       shellState.scanIteratorOptions.put(tableName, tableScanIterators);
     }
     final IteratorSetting setting = new IteratorSetting(priority, name, classname);
@@ -92,7 +92,7 @@ public class SetScanIterCommand extends SetIterCommand {
   public Options getOptions() {
     // Remove the options that specify which type of iterator this is, since
     // they are all scan iterators with this command.
-    final HashSet<OptionGroup> groups = new HashSet<OptionGroup>();
+    final HashSet<OptionGroup> groups = new HashSet<>();
     final Options parentOptions = super.getOptions();
     final Options modifiedOptions = new Options();
     for (Iterator<?> it = parentOptions.getOptions().iterator(); it.hasNext();) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/shell/src/main/java/org/apache/accumulo/shell/commands/SetShellIterCommand.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/SetShellIterCommand.java b/shell/src/main/java/org/apache/accumulo/shell/commands/SetShellIterCommand.java
index ad66995..e1fa5e0 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/SetShellIterCommand.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/SetShellIterCommand.java
@@ -62,7 +62,7 @@ public class SetShellIterCommand extends SetIterCommand {
 
     List<IteratorSetting> tableScanIterators = shellState.iteratorProfiles.get(profile);
     if (tableScanIterators == null) {
-      tableScanIterators = new ArrayList<IteratorSetting>();
+      tableScanIterators = new ArrayList<>();
       shellState.iteratorProfiles.put(profile, tableScanIterators);
     }
     final IteratorSetting setting = new IteratorSetting(priority, name, classname);
@@ -87,7 +87,7 @@ public class SetShellIterCommand extends SetIterCommand {
   public Options getOptions() {
     // Remove the options that specify which type of iterator this is, since
     // they are all scan iterators with this command.
-    final HashSet<OptionGroup> groups = new HashSet<OptionGroup>();
+    final HashSet<OptionGroup> groups = new HashSet<>();
     final Options parentOptions = super.getOptions();
     final Options modifiedOptions = new Options();
     for (Iterator<?> it = parentOptions.getOptions().iterator(); it.hasNext();) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/shell/src/main/java/org/apache/accumulo/shell/commands/TableOperation.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/TableOperation.java b/shell/src/main/java/org/apache/accumulo/shell/commands/TableOperation.java
index b7d0f44..6ad1246 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/TableOperation.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/TableOperation.java
@@ -43,7 +43,7 @@ public abstract class TableOperation extends Command {
   @Override
   public int execute(final String fullCommand, final CommandLine cl, final Shell shellState) throws Exception {
     // populate the tableSet set with the tables you want to operate on
-    final SortedSet<String> tableSet = new TreeSet<String>();
+    final SortedSet<String> tableSet = new TreeSet<>();
     if (cl.hasOption(optTablePattern.getOpt())) {
       String tablePattern = cl.getOptionValue(optTablePattern.getOpt());
       for (String table : shellState.getConnector().tableOperations().list())

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/shell/src/main/java/org/apache/accumulo/shell/commands/TablesCommand.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/TablesCommand.java b/shell/src/main/java/org/apache/accumulo/shell/commands/TablesCommand.java
index a70cc13..397b450 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/TablesCommand.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/TablesCommand.java
@@ -62,7 +62,7 @@ public class TablesCommand extends Command {
     });
 
     final boolean sortByTableId = cl.hasOption(sortByTableIdOption.getOpt());
-    tables = new TreeMap<String,String>((sortByTableId ? MapUtils.invertMap(tables) : tables));
+    tables = new TreeMap<>((sortByTableId ? MapUtils.invertMap(tables) : tables));
 
     Iterator<String> it = Iterators.transform(tables.entrySet().iterator(), new Function<Entry<String,String>,String>() {
       @Override

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/shell/src/test/java/org/apache/accumulo/shell/ShellSetInstanceTest.java
----------------------------------------------------------------------
diff --git a/shell/src/test/java/org/apache/accumulo/shell/ShellSetInstanceTest.java b/shell/src/test/java/org/apache/accumulo/shell/ShellSetInstanceTest.java
index 331b183..428481a 100644
--- a/shell/src/test/java/org/apache/accumulo/shell/ShellSetInstanceTest.java
+++ b/shell/src/test/java/org/apache/accumulo/shell/ShellSetInstanceTest.java
@@ -243,7 +243,7 @@ public class ShellSetInstanceTest {
       expect(clientConf.getString(ClientProperty.INSTANCE_NAME.getKey())).andReturn("foo");
       expect(clientConf.withZkHosts("host1,host2")).andReturn(clientConf);
       expect(clientConf.getString(ClientProperty.INSTANCE_ZK_HOST.getKey())).andReturn("host1,host2");
-      List<String> zl = new java.util.ArrayList<String>();
+      List<String> zl = new java.util.ArrayList<>();
       zl.add("foo");
       zl.add("host1,host2");
       expect(opts.getZooKeeperInstance()).andReturn(zl);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/shell/src/test/java/org/apache/accumulo/shell/commands/DeleteTableCommandTest.java
----------------------------------------------------------------------
diff --git a/shell/src/test/java/org/apache/accumulo/shell/commands/DeleteTableCommandTest.java b/shell/src/test/java/org/apache/accumulo/shell/commands/DeleteTableCommandTest.java
index 4877552..ad9624f 100644
--- a/shell/src/test/java/org/apache/accumulo/shell/commands/DeleteTableCommandTest.java
+++ b/shell/src/test/java/org/apache/accumulo/shell/commands/DeleteTableCommandTest.java
@@ -32,11 +32,11 @@ public class DeleteTableCommandTest {
 
   @Test
   public void removeAccumuloNamespaceTables() {
-    Set<String> tables = new HashSet<String>(Arrays.asList(MetadataTable.NAME, RootTable.NAME, "a1", "a2"));
+    Set<String> tables = new HashSet<>(Arrays.asList(MetadataTable.NAME, RootTable.NAME, "a1", "a2"));
     DeleteTableCommand cmd = new DeleteTableCommand();
     cmd.pruneTables("a.*", tables);
 
-    Assert.assertEquals(new HashSet<String>(Arrays.asList("a1", "a2")), tables);
+    Assert.assertEquals(new HashSet<>(Arrays.asList("a1", "a2")), tables);
   }
 
 }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/shell/src/test/java/org/apache/accumulo/shell/format/DeleterFormatterTest.java
----------------------------------------------------------------------
diff --git a/shell/src/test/java/org/apache/accumulo/shell/format/DeleterFormatterTest.java b/shell/src/test/java/org/apache/accumulo/shell/format/DeleterFormatterTest.java
index 0698beb..2eba15e 100644
--- a/shell/src/test/java/org/apache/accumulo/shell/format/DeleterFormatterTest.java
+++ b/shell/src/test/java/org/apache/accumulo/shell/format/DeleterFormatterTest.java
@@ -34,6 +34,7 @@ import java.io.InputStream;
 import java.util.Collections;
 import java.util.Map;
 import java.util.TreeMap;
+
 import org.apache.accumulo.core.client.BatchWriter;
 import org.apache.accumulo.core.client.MutationsRejectedException;
 import org.apache.accumulo.core.data.Key;
@@ -41,11 +42,11 @@ import org.apache.accumulo.core.data.Mutation;
 import org.apache.accumulo.core.data.Value;
 import org.apache.accumulo.core.util.format.FormatterConfig;
 import org.apache.accumulo.shell.Shell;
+import org.junit.Before;
+import org.junit.Test;
 
 import jline.UnsupportedTerminal;
 import jline.console.ConsoleReader;
-import org.junit.Before;
-import org.junit.Test;
 
 public class DeleterFormatterTest {
   DeleterFormatter formatter;
@@ -70,7 +71,7 @@ public class DeleterFormatterTest {
     public void set(String in) {
       bais = new ByteArrayInputStream(in.getBytes(UTF_8));
     }
-  };
+  }
 
   @Before
   public void setUp() throws IOException, MutationsRejectedException {
@@ -93,7 +94,7 @@ public class DeleterFormatterTest {
 
     replay(writer, exceptionWriter, shellState);
 
-    data = new TreeMap<Key,Value>();
+    data = new TreeMap<>();
     data.put(new Key("r", "cf", "cq"), new Value("value".getBytes(UTF_8)));
   }
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java
----------------------------------------------------------------------
diff --git a/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java b/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java
index 9ebbae0..991e89e 100644
--- a/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java
+++ b/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java
@@ -224,9 +224,9 @@ public class AccumuloClassLoader {
   private static ArrayList<URL> findAccumuloURLs() throws IOException {
     String cp = getAccumuloString(AccumuloClassLoader.CLASSPATH_PROPERTY_NAME, AccumuloClassLoader.ACCUMULO_CLASSPATH_VALUE);
     if (cp == null)
-      return new ArrayList<URL>();
+      return new ArrayList<>();
     String[] cps = replaceEnvVars(cp, System.getenv()).split(",");
-    ArrayList<URL> urls = new ArrayList<URL>();
+    ArrayList<URL> urls = new ArrayList<>();
     for (String classpath : getMavenClasspaths())
       addUrl(classpath, urls);
     for (String classpath : cps) {
@@ -241,7 +241,7 @@ public class AccumuloClassLoader {
     String baseDirname = AccumuloClassLoader.getAccumuloString(MAVEN_PROJECT_BASEDIR_PROPERTY_NAME, DEFAULT_MAVEN_PROJECT_BASEDIR_VALUE);
     if (baseDirname == null || baseDirname.trim().isEmpty())
       return Collections.emptySet();
-    Set<String> paths = new TreeSet<String>();
+    Set<String> paths = new TreeSet<>();
     findMavenTargetClasses(paths, new File(baseDirname.trim()), 0);
     return paths;
   }


[03/32] accumulo git commit: ACCUMULO-4357 Remove unneeded code for readability

Posted by ct...@apache.org.
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);
       }
 


[17/32] accumulo git commit: ACCUMULO-4357 Remove unneeded code for readability

Posted by ct...@apache.org.
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/examples/simple/dirlist/CountIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/examples/simple/dirlist/CountIT.java b/test/src/main/java/org/apache/accumulo/test/examples/simple/dirlist/CountIT.java
index 8853733..93708a6 100644
--- a/test/src/main/java/org/apache/accumulo/test/examples/simple/dirlist/CountIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/examples/simple/dirlist/CountIT.java
@@ -84,11 +84,11 @@ public class CountIT extends ConfigurableMacBase {
     FileCount fc = new FileCount(opts, scanOpts, bwOpts);
     fc.run();
 
-    ArrayList<Pair<String,String>> expected = new ArrayList<Pair<String,String>>();
-    expected.add(new Pair<String,String>(QueryUtil.getRow("").toString(), "1,0,3,3"));
-    expected.add(new Pair<String,String>(QueryUtil.getRow("/local").toString(), "2,1,2,3"));
-    expected.add(new Pair<String,String>(QueryUtil.getRow("/local/user1").toString(), "0,2,0,2"));
-    expected.add(new Pair<String,String>(QueryUtil.getRow("/local/user2").toString(), "0,0,0,0"));
+    ArrayList<Pair<String,String>> expected = new ArrayList<>();
+    expected.add(new Pair<>(QueryUtil.getRow("").toString(), "1,0,3,3"));
+    expected.add(new Pair<>(QueryUtil.getRow("/local").toString(), "2,1,2,3"));
+    expected.add(new Pair<>(QueryUtil.getRow("/local/user1").toString(), "0,2,0,2"));
+    expected.add(new Pair<>(QueryUtil.getRow("/local/user2").toString(), "0,0,0,0"));
 
     int i = 0;
     for (Entry<Key,Value> e : scanner) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/examples/simple/filedata/ChunkInputFormatIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/examples/simple/filedata/ChunkInputFormatIT.java b/test/src/main/java/org/apache/accumulo/test/examples/simple/filedata/ChunkInputFormatIT.java
index 69d30af..cb53ec0 100644
--- a/test/src/main/java/org/apache/accumulo/test/examples/simple/filedata/ChunkInputFormatIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/examples/simple/filedata/ChunkInputFormatIT.java
@@ -78,7 +78,7 @@ public class ChunkInputFormatIT extends AccumuloClusterHarness {
   public static void setupClass() {
     System.setProperty("hadoop.tmp.dir", System.getProperty("user.dir") + "/target/hadoop-tmp");
 
-    data = new ArrayList<Entry<Key,Value>>();
+    data = new ArrayList<>();
     ChunkInputStreamIT.addData(data, "a", "refs", "ida\0ext", "A&B", "ext");
     ChunkInputStreamIT.addData(data, "a", "refs", "ida\0name", "A&B", "name");
     ChunkInputStreamIT.addData(data, "a", "~chunk", 100, 0, "A&B", "asdfjkl;");
@@ -90,7 +90,7 @@ public class ChunkInputFormatIT extends AccumuloClusterHarness {
     ChunkInputStreamIT.addData(data, "b", "~chunk", 100, 1, "A&B", "");
     ChunkInputStreamIT.addData(data, "b", "~chunk", 100, 1, "B&C", "");
     ChunkInputStreamIT.addData(data, "b", "~chunk", 100, 1, "D", "");
-    baddata = new ArrayList<Entry<Key,Value>>();
+    baddata = new ArrayList<>();
     ChunkInputStreamIT.addData(baddata, "c", "refs", "ida\0ext", "A&B", "ext");
     ChunkInputStreamIT.addData(baddata, "c", "refs", "ida\0name", "A&B", "name");
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/examples/simple/filedata/ChunkInputStreamIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/examples/simple/filedata/ChunkInputStreamIT.java b/test/src/main/java/org/apache/accumulo/test/examples/simple/filedata/ChunkInputStreamIT.java
index 47db6dd..5b956d7 100644
--- a/test/src/main/java/org/apache/accumulo/test/examples/simple/filedata/ChunkInputStreamIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/examples/simple/filedata/ChunkInputStreamIT.java
@@ -66,7 +66,7 @@ public class ChunkInputStreamIT extends AccumuloClusterHarness {
 
   @Before
   public void setupData() {
-    data = new ArrayList<Entry<Key,Value>>();
+    data = new ArrayList<>();
     addData(data, "a", "refs", "id\0ext", "A&B", "ext");
     addData(data, "a", "refs", "id\0name", "A&B", "name");
     addData(data, "a", "~chunk", 100, 0, "A&B", "asdfjkl;");
@@ -84,7 +84,7 @@ public class ChunkInputStreamIT extends AccumuloClusterHarness {
     addData(data, "d", "~chunk", 100, 0, "A&B", "");
     addData(data, "e", "~chunk", 100, 0, "A&B", "asdfjkl;");
     addData(data, "e", "~chunk", 100, 1, "A&B", "");
-    baddata = new ArrayList<Entry<Key,Value>>();
+    baddata = new ArrayList<>();
     addData(baddata, "a", "~chunk", 100, 0, "A", "asdfjkl;");
     addData(baddata, "b", "~chunk", 100, 0, "B", "asdfjkl;");
     addData(baddata, "b", "~chunk", 100, 2, "C", "");
@@ -98,7 +98,7 @@ public class ChunkInputStreamIT extends AccumuloClusterHarness {
     addData(baddata, "e", "~chunk", 100, 2, "I", "asdfjkl;");
     addData(baddata, "f", "~chunk", 100, 2, "K", "asdfjkl;");
     addData(baddata, "g", "~chunk", 100, 0, "L", "");
-    multidata = new ArrayList<Entry<Key,Value>>();
+    multidata = new ArrayList<>();
     addData(multidata, "a", "~chunk", 100, 0, "A&B", "asdfjkl;");
     addData(multidata, "a", "~chunk", 100, 1, "A&B", "");
     addData(multidata, "a", "~chunk", 200, 0, "B&C", "asdfjkl;");
@@ -137,7 +137,7 @@ public class ChunkInputStreamIT extends AccumuloClusterHarness {
     ChunkInputStream cis = new ChunkInputStream();
     byte[] b = new byte[20];
     int read;
-    PeekingIterator<Entry<Key,Value>> pi = new PeekingIterator<Entry<Key,Value>>(scan.iterator());
+    PeekingIterator<Entry<Key,Value>> pi = new PeekingIterator<>(scan.iterator());
 
     cis.setSource(pi);
     assertEquals(read = cis.read(b), 8);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/functional/AddSplitIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/AddSplitIT.java b/test/src/main/java/org/apache/accumulo/test/functional/AddSplitIT.java
index ddaca1e..0558c7f 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/AddSplitIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/AddSplitIT.java
@@ -57,7 +57,7 @@ public class AddSplitIT extends AccumuloClusterHarness {
 
     insertData(tableName, 1l);
 
-    TreeSet<Text> splits = new TreeSet<Text>();
+    TreeSet<Text> splits = new TreeSet<>();
     splits.add(new Text(String.format("%09d", 333)));
     splits.add(new Text(String.format("%09d", 666)));
 
@@ -67,7 +67,7 @@ public class AddSplitIT extends AccumuloClusterHarness {
 
     Collection<Text> actualSplits = c.tableOperations().listSplits(tableName);
 
-    if (!splits.equals(new TreeSet<Text>(actualSplits))) {
+    if (!splits.equals(new TreeSet<>(actualSplits))) {
       throw new Exception(splits + " != " + actualSplits);
     }
 
@@ -87,7 +87,7 @@ public class AddSplitIT extends AccumuloClusterHarness {
 
     actualSplits = c.tableOperations().listSplits(tableName);
 
-    if (!splits.equals(new TreeSet<Text>(actualSplits))) {
+    if (!splits.equals(new TreeSet<>(actualSplits))) {
       throw new Exception(splits + " != " + actualSplits);
     }
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/functional/BalanceAfterCommsFailureIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/BalanceAfterCommsFailureIT.java b/test/src/main/java/org/apache/accumulo/test/functional/BalanceAfterCommsFailureIT.java
index ae470f6..525d9f9 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/BalanceAfterCommsFailureIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/BalanceAfterCommsFailureIT.java
@@ -65,7 +65,7 @@ public class BalanceAfterCommsFailureIT extends ConfigurableMacBase {
     Connector c = this.getConnector();
     c.tableOperations().create("test");
     Collection<ProcessReference> tservers = getCluster().getProcesses().get(ServerType.TABLET_SERVER);
-    ArrayList<Integer> tserverPids = new ArrayList<Integer>(tservers.size());
+    ArrayList<Integer> tserverPids = new ArrayList<>(tservers.size());
     for (ProcessReference tserver : tservers) {
       Process p = tserver.getProcess();
       if (!p.getClass().getName().equals("java.lang.UNIXProcess")) {
@@ -85,7 +85,7 @@ public class BalanceAfterCommsFailureIT extends ConfigurableMacBase {
     for (int pid : tserverPids) {
       assertEquals(0, Runtime.getRuntime().exec(new String[] {"kill", "-SIGCONT", Integer.toString(pid)}).waitFor());
     }
-    SortedSet<Text> splits = new TreeSet<Text>();
+    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));
     }
@@ -120,7 +120,7 @@ public class BalanceAfterCommsFailureIT extends ConfigurableMacBase {
 
     assertEquals("Unassigned tablets were not assigned within 30 seconds", 0, unassignedTablets);
 
-    List<Integer> counts = new ArrayList<Integer>();
+    List<Integer> counts = new ArrayList<>();
     for (TabletServerStatus server : stats.tServerInfo) {
       int count = 0;
       for (TableInfo table : server.tableMap.values()) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/functional/BalanceInPresenceOfOfflineTableIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/BalanceInPresenceOfOfflineTableIT.java b/test/src/main/java/org/apache/accumulo/test/functional/BalanceInPresenceOfOfflineTableIT.java
index 623d79b..2fe5602 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/BalanceInPresenceOfOfflineTableIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/BalanceInPresenceOfOfflineTableIT.java
@@ -93,7 +93,7 @@ public class BalanceInPresenceOfOfflineTableIT extends AccumuloClusterHarness {
     Assume.assumeTrue("Not enough tservers to run test", conn.instanceOperations().getTabletServers().size() >= 2);
 
     // set up splits
-    final SortedSet<Text> splits = new TreeSet<Text>();
+    final SortedSet<Text> splits = new TreeSet<>();
     for (int i = 0; i < NUM_SPLITS; i++) {
       splits.add(new Text(String.format("%08x", i * 1000)));
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/functional/BatchScanSplitIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/BatchScanSplitIT.java b/test/src/main/java/org/apache/accumulo/test/functional/BatchScanSplitIT.java
index 7d36cd2..48ce3fe 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/BatchScanSplitIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/BatchScanSplitIT.java
@@ -89,8 +89,8 @@ public class BatchScanSplitIT extends AccumuloClusterHarness {
     System.out.println("splits : " + splits);
 
     Random random = new Random(19011230);
-    HashMap<Text,Value> expected = new HashMap<Text,Value>();
-    ArrayList<Range> ranges = new ArrayList<Range>();
+    HashMap<Text,Value> expected = new HashMap<>();
+    ArrayList<Range> ranges = new ArrayList<>();
     for (int i = 0; i < 100; i++) {
       int r = random.nextInt(numRows);
       Text row = new Text(String.format("%09x", r));
@@ -100,7 +100,7 @@ public class BatchScanSplitIT extends AccumuloClusterHarness {
 
     // logger.setLevel(Level.TRACE);
 
-    HashMap<Text,Value> found = new HashMap<Text,Value>();
+    HashMap<Text,Value> found = new HashMap<>();
 
     for (int i = 0; i < 20; i++) {
       BatchScanner bs = getConnector().createBatchScanner(tableName, Authorizations.EMPTY, 4);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/functional/BatchWriterFlushIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/BatchWriterFlushIT.java b/test/src/main/java/org/apache/accumulo/test/functional/BatchWriterFlushIT.java
index 967ac24..9b50306 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/BatchWriterFlushIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/BatchWriterFlushIT.java
@@ -180,7 +180,7 @@ public class BatchWriterFlushIT extends AccumuloClusterHarness {
     String tableName = tableNames[0];
     c.tableOperations().create(tableName);
     for (int x = 0; x < NUM_THREADS; x++) {
-      c.tableOperations().addSplits(tableName, new TreeSet<Text>(Collections.singleton(new Text(Integer.toString(x * NUM_TO_FLUSH)))));
+      c.tableOperations().addSplits(tableName, new TreeSet<>(Collections.singleton(new Text(Integer.toString(x * NUM_TO_FLUSH)))));
     }
     c.instanceOperations().waitForBalance();
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/functional/BinaryIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/BinaryIT.java b/test/src/main/java/org/apache/accumulo/test/functional/BinaryIT.java
index 85716d5..f8732d5 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/BinaryIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/BinaryIT.java
@@ -47,7 +47,7 @@ public class BinaryIT extends AccumuloClusterHarness {
     String tableName = getUniqueNames(1)[0];
     Connector c = getConnector();
     c.tableOperations().create(tableName);
-    SortedSet<Text> splits = new TreeSet<Text>();
+    SortedSet<Text> splits = new TreeSet<>();
     splits.add(new Text("8"));
     splits.add(new Text("256"));
     c.tableOperations().addSplits(tableName, splits);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/functional/BloomFilterIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/BloomFilterIT.java b/test/src/main/java/org/apache/accumulo/test/functional/BloomFilterIT.java
index fbbe542..1c6fc9f 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/BloomFilterIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/BloomFilterIT.java
@@ -169,8 +169,8 @@ public class BloomFilterIT extends AccumuloClusterHarness {
   private long query(Connector c, String table, int depth, long start, long end, int num, int step) throws Exception {
     Random r = new Random(42);
 
-    HashSet<Long> expected = new HashSet<Long>();
-    List<Range> ranges = new ArrayList<Range>(num);
+    HashSet<Long> expected = new HashSet<>();
+    List<Range> ranges = new ArrayList<>(num);
     Text key = new Text();
     Text row = new Text("row"), cq = new Text("cq"), cf = new Text("cf");
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/functional/BulkFileIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/BulkFileIT.java b/test/src/main/java/org/apache/accumulo/test/functional/BulkFileIT.java
index bf248e6..ec8ce2d 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/BulkFileIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/BulkFileIT.java
@@ -60,7 +60,7 @@ public class BulkFileIT extends AccumuloClusterHarness {
     Connector c = getConnector();
     String tableName = getUniqueNames(1)[0];
     c.tableOperations().create(tableName);
-    SortedSet<Text> splits = new TreeSet<Text>();
+    SortedSet<Text> splits = new TreeSet<>();
     for (String split : "0333 0666 0999 1333 1666".split(" "))
       splits.add(new Text(split));
     c.tableOperations().addSplits(tableName, splits);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/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 7935aa4..0988795 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
@@ -53,7 +53,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/b102e760/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 5d05a71..50a0b0e 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
@@ -59,7 +59,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();
 
@@ -69,7 +69,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/b102e760/test/src/main/java/org/apache/accumulo/test/functional/ChaoticBalancerIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ChaoticBalancerIT.java b/test/src/main/java/org/apache/accumulo/test/functional/ChaoticBalancerIT.java
index 4055c3a..21d6351 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/ChaoticBalancerIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/ChaoticBalancerIT.java
@@ -58,7 +58,7 @@ public class ChaoticBalancerIT extends AccumuloClusterHarness {
     c.tableOperations().create(tableName);
     c.tableOperations().setProperty(tableName, Property.TABLE_LOAD_BALANCER.getKey(), ChaoticLoadBalancer.class.getName());
     c.tableOperations().setProperty(tableName, Property.TABLE_SPLIT_THRESHOLD.getKey(), "10K");
-    SortedSet<Text> splits = new TreeSet<Text>();
+    SortedSet<Text> splits = new TreeSet<>();
     for (int i = 0; i < 100; i++) {
       splits.add(new Text(String.format("%03d", i)));
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/functional/CloneTestIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/CloneTestIT.java b/test/src/main/java/org/apache/accumulo/test/functional/CloneTestIT.java
index b3d0ab5..64cdc34 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/CloneTestIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/CloneTestIT.java
@@ -83,10 +83,10 @@ public class CloneTestIT extends AccumuloClusterHarness {
 
     BatchWriter bw = writeData(table1, c);
 
-    Map<String,String> props = new HashMap<String,String>();
+    Map<String,String> props = new HashMap<>();
     props.put(Property.TABLE_FILE_COMPRESSED_BLOCK_SIZE.getKey(), "500K");
 
-    Set<String> exclude = new HashSet<String>();
+    Set<String> exclude = new HashSet<>();
     exclude.add(Property.TABLE_FILE_MAX.getKey());
 
     c.tableOperations().clone(table1, table2, true, props, exclude);
@@ -101,7 +101,7 @@ public class CloneTestIT extends AccumuloClusterHarness {
 
     checkMetadata(table2, c);
 
-    HashMap<String,String> tableProps = new HashMap<String,String>();
+    HashMap<String,String> tableProps = new HashMap<>();
     for (Entry<String,String> prop : c.tableOperations().getProperties(table2)) {
       tableProps.put(prop.getKey(), prop.getValue());
     }
@@ -118,13 +118,13 @@ public class CloneTestIT extends AccumuloClusterHarness {
   private void checkData(String table2, Connector c) throws TableNotFoundException {
     Scanner scanner = c.createScanner(table2, Authorizations.EMPTY);
 
-    HashMap<String,String> expected = new HashMap<String,String>();
+    HashMap<String,String> expected = new HashMap<>();
     expected.put("001:x", "9");
     expected.put("001:y", "7");
     expected.put("008:x", "3");
     expected.put("008:y", "4");
 
-    HashMap<String,String> actual = new HashMap<String,String>();
+    HashMap<String,String> actual = new HashMap<>();
 
     for (Entry<Key,Value> entry : scanner)
       actual.put(entry.getKey().getRowData().toString() + ":" + entry.getKey().getColumnQualifierData().toString(), entry.getValue().toString());
@@ -229,10 +229,10 @@ public class CloneTestIT extends AccumuloClusterHarness {
 
     BatchWriter bw = writeData(table1, c);
 
-    Map<String,String> props = new HashMap<String,String>();
+    Map<String,String> props = new HashMap<>();
     props.put(Property.TABLE_FILE_COMPRESSED_BLOCK_SIZE.getKey(), "500K");
 
-    Set<String> exclude = new HashSet<String>();
+    Set<String> exclude = new HashSet<>();
     exclude.add(Property.TABLE_FILE_MAX.getKey());
 
     c.tableOperations().clone(table1, table2, true, props, exclude);
@@ -260,8 +260,8 @@ public class CloneTestIT extends AccumuloClusterHarness {
   public void testCloneWithSplits() throws Exception {
     Connector conn = getConnector();
 
-    List<Mutation> mutations = new ArrayList<Mutation>();
-    TreeSet<Text> splits = new TreeSet<Text>();
+    List<Mutation> mutations = new ArrayList<>();
+    TreeSet<Text> splits = new TreeSet<>();
     for (int i = 0; i < 10; i++) {
       splits.add(new Text(Integer.toString(i)));
       Mutation m = new Mutation(Integer.toString(i));
@@ -284,7 +284,7 @@ public class CloneTestIT extends AccumuloClusterHarness {
     conn.tableOperations().deleteRows(tables[1], new Text("4"), new Text("8"));
 
     List<String> rows = Arrays.asList("0", "1", "2", "3", "4", "9");
-    List<String> actualRows = new ArrayList<String>();
+    List<String> actualRows = new ArrayList<>();
     for (Entry<Key,Value> entry : conn.createScanner(tables[1], Authorizations.EMPTY)) {
       actualRows.add(entry.getKey().getRow().toString());
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/functional/ConfigurableCompactionIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ConfigurableCompactionIT.java b/test/src/main/java/org/apache/accumulo/test/functional/ConfigurableCompactionIT.java
index 84c7206..d812914 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/ConfigurableCompactionIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/ConfigurableCompactionIT.java
@@ -109,7 +109,7 @@ public class ConfigurableCompactionIT extends ConfigurableMacBase {
     // EfgCompactionStrat will only compact a tablet w/ end row of 'efg'. No other tablets are compacted.
     c.tableOperations().setProperty(tableName, Property.TABLE_COMPACTION_STRATEGY.getKey(), "org.apache.accumulo.test.EfgCompactionStrat");
 
-    c.tableOperations().addSplits(tableName, new TreeSet<Text>(Arrays.asList(new Text("efg"))));
+    c.tableOperations().addSplits(tableName, new TreeSet<>(Arrays.asList(new Text("efg"))));
 
     for (char ch = 'a'; ch < 'l'; ch++)
       writeFlush(c, tableName, ch + "");

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/functional/ConstraintIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ConstraintIT.java b/test/src/main/java/org/apache/accumulo/test/functional/ConstraintIT.java
index 5817b03..27d84de 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/ConstraintIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/ConstraintIT.java
@@ -293,7 +293,7 @@ public class ConstraintIT extends AccumuloClusterHarness {
         throw new Exception("Unexpected constraints");
       }
 
-      HashMap<String,Integer> expected = new HashMap<String,Integer>();
+      HashMap<String,Integer> expected = new HashMap<>();
 
       expected.put("org.apache.accumulo.examples.simple.constraints.NumericValueConstraint", numericErrors);
       expected.put("org.apache.accumulo.examples.simple.constraints.AlphaNumKeyConstraint", 1);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/functional/CreateAndUseIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/CreateAndUseIT.java b/test/src/main/java/org/apache/accumulo/test/functional/CreateAndUseIT.java
index b2373e6..919ab30 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/CreateAndUseIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/CreateAndUseIT.java
@@ -52,7 +52,7 @@ public class CreateAndUseIT extends AccumuloClusterHarness {
 
   @BeforeClass
   public static void createData() throws Exception {
-    splits = new TreeSet<Text>();
+    splits = new TreeSet<>();
 
     for (int i = 1; i < 256; i++) {
       splits.add(new Text(String.format("%08x", i << 8)));
@@ -110,7 +110,7 @@ public class CreateAndUseIT extends AccumuloClusterHarness {
 
   @Test
   public void createTableAndBatchScan() throws Exception {
-    ArrayList<Range> ranges = new ArrayList<Range>();
+    ArrayList<Range> ranges = new ArrayList<>();
     for (int i = 1; i < 257; i++) {
       ranges.add(new Range(new Text(String.format("%08x", (i << 8) - 16))));
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/functional/DeleteRowsIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/DeleteRowsIT.java b/test/src/main/java/org/apache/accumulo/test/functional/DeleteRowsIT.java
index e4a8451..fd89caa 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/DeleteRowsIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/DeleteRowsIT.java
@@ -54,13 +54,13 @@ public class DeleteRowsIT extends AccumuloClusterHarness {
   private static final int ROWS_PER_TABLET = 10;
   private static final String[] LETTERS = new String[] {"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"};
-  static final SortedSet<Text> SPLITS = new TreeSet<Text>();
+  static final SortedSet<Text> SPLITS = new TreeSet<>();
   static {
     for (String alpha : LETTERS) {
       SPLITS.add(new Text(alpha));
     }
   }
-  static final List<String> ROWS = new ArrayList<String>(Arrays.asList(LETTERS));
+  static final List<String> ROWS = new ArrayList<>(Arrays.asList(LETTERS));
   static {
     // put data on first and last tablet
     ROWS.add("A");

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/functional/DeleteRowsSplitIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/DeleteRowsSplitIT.java b/test/src/main/java/org/apache/accumulo/test/functional/DeleteRowsSplitIT.java
index 068000d..2a6653d 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/DeleteRowsSplitIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/DeleteRowsSplitIT.java
@@ -54,8 +54,8 @@ public class DeleteRowsSplitIT extends AccumuloClusterHarness {
   private static final Logger log = LoggerFactory.getLogger(DeleteRowsSplitIT.class);
 
   private static final String LETTERS = "abcdefghijklmnopqrstuvwxyz";
-  static final SortedSet<Text> SPLITS = new TreeSet<Text>();
-  static final List<String> ROWS = new ArrayList<String>();
+  static final SortedSet<Text> SPLITS = new TreeSet<>();
+  static final List<String> ROWS = new ArrayList<>();
   static {
     for (byte b : LETTERS.getBytes(UTF_8)) {
       SPLITS.add(new Text(new byte[] {b}));
@@ -125,7 +125,7 @@ public class DeleteRowsSplitIT extends AccumuloClusterHarness {
   }
 
   private void generateRandomRange(Text start, Text end) {
-    List<String> bunch = new ArrayList<String>(ROWS);
+    List<String> bunch = new ArrayList<>(ROWS);
     Collections.shuffle(bunch);
     if (bunch.get(0).compareTo((bunch.get(1))) < 0) {
       start.set(bunch.get(0));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/functional/DeleteTableDuringSplitIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/DeleteTableDuringSplitIT.java b/test/src/main/java/org/apache/accumulo/test/functional/DeleteTableDuringSplitIT.java
index d2cf873..2c34537 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/DeleteTableDuringSplitIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/DeleteTableDuringSplitIT.java
@@ -53,13 +53,13 @@ public class DeleteTableDuringSplitIT extends AccumuloClusterHarness {
     for (String tableName : tableNames) {
       getConnector().tableOperations().create(tableName);
     }
-    final SortedSet<Text> splits = new TreeSet<Text>();
+    final SortedSet<Text> splits = new TreeSet<>();
     for (byte i = 0; i < 100; i++) {
       splits.add(new Text(new byte[] {0, 0, i}));
     }
 
-    List<Future<?>> results = new ArrayList<Future<?>>();
-    List<Runnable> tasks = new ArrayList<Runnable>();
+    List<Future<?>> results = new ArrayList<>();
+    List<Runnable> tasks = new ArrayList<>();
     SimpleThreadPool es = new SimpleThreadPool(batchSize * 2, "concurrent-api-requests");
     for (String tableName : tableNames) {
       final String finalName = tableName;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/functional/DurabilityIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/DurabilityIT.java b/test/src/main/java/org/apache/accumulo/test/functional/DurabilityIT.java
index 4078e69..00d715f 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/DurabilityIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/DurabilityIT.java
@@ -174,7 +174,7 @@ public class DurabilityIT extends ConfigurableMacBase {
   }
 
   private static Map<String,String> map(Iterable<Entry<String,String>> entries) {
-    Map<String,String> result = new HashMap<String,String>();
+    Map<String,String> result = new HashMap<>();
     for (Entry<String,String> entry : entries) {
       result.put(entry.getKey(), entry.getValue());
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/functional/FateStarvationIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/FateStarvationIT.java b/test/src/main/java/org/apache/accumulo/test/functional/FateStarvationIT.java
index b75a74e..30f4476 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/FateStarvationIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/FateStarvationIT.java
@@ -64,7 +64,7 @@ public class FateStarvationIT extends AccumuloClusterHarness {
 
     c.tableOperations().flush(tableName, null, null, true);
 
-    List<Text> splits = new ArrayList<Text>(TestIngest.getSplitPoints(0, 100000, 67));
+    List<Text> splits = new ArrayList<>(TestIngest.getSplitPoints(0, 100000, 67));
     Random rand = new Random();
 
     for (int i = 0; i < 100; i++) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/functional/FunctionalTestUtils.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/FunctionalTestUtils.java b/test/src/main/java/org/apache/accumulo/test/functional/FunctionalTestUtils.java
index 02e2fdf..829293e 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/FunctionalTestUtils.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/FunctionalTestUtils.java
@@ -69,7 +69,7 @@ public class FunctionalTestUtils {
     scanner.fetchColumnFamily(MetadataSchema.TabletsSection.DataFileColumnFamily.NAME);
     MetadataSchema.TabletsSection.TabletColumnFamily.PREV_ROW_COLUMN.fetch(scanner);
 
-    HashMap<Text,Integer> tabletFileCounts = new HashMap<Text,Integer>();
+    HashMap<Text,Integer> tabletFileCounts = new HashMap<>();
 
     for (Entry<Key,Value> entry : scanner) {
 
@@ -177,7 +177,7 @@ public class FunctionalTestUtils {
   }
 
   public static SortedSet<Text> splits(String[] splits) {
-    SortedSet<Text> result = new TreeSet<Text>();
+    SortedSet<Text> result = new TreeSet<>();
     for (String split : splits)
       result.add(new Text(split));
     return result;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/functional/HalfDeadTServerIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/HalfDeadTServerIT.java b/test/src/main/java/org/apache/accumulo/test/functional/HalfDeadTServerIT.java
index f6ecf20..76a8c5d 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/HalfDeadTServerIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/HalfDeadTServerIT.java
@@ -123,7 +123,7 @@ public class HalfDeadTServerIT extends ConfigurableMacBase {
     String classpath = System.getProperty("java.class.path");
     classpath = new File(cluster.getConfig().getDir(), "conf") + File.pathSeparator + classpath;
     String className = TabletServer.class.getName();
-    ArrayList<String> argList = new ArrayList<String>();
+    ArrayList<String> argList = new ArrayList<>();
     argList.addAll(Arrays.asList(javaBin, "-cp", classpath));
     argList.addAll(Arrays.asList(Main.class.getName(), className));
     ProcessBuilder builder = new ProcessBuilder(argList);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/functional/LargeRowIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/LargeRowIT.java b/test/src/main/java/org/apache/accumulo/test/functional/LargeRowIT.java
index 34d11fc..160b164 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/LargeRowIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/LargeRowIT.java
@@ -109,7 +109,7 @@ public class LargeRowIT extends AccumuloClusterHarness {
     Random r = new Random();
     byte rowData[] = new byte[ROW_SIZE];
     r.setSeed(SEED + 1);
-    TreeSet<Text> splitPoints = new TreeSet<Text>();
+    TreeSet<Text> splitPoints = new TreeSet<>();
     for (int i = 0; i < NUM_PRE_SPLITS; i++) {
       r.nextBytes(rowData);
       TestIngest.toPrintableChars(rowData);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/functional/LogicalTimeIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/LogicalTimeIT.java b/test/src/main/java/org/apache/accumulo/test/functional/LogicalTimeIT.java
index 1e7fef0..b033dbf 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/LogicalTimeIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/LogicalTimeIT.java
@@ -74,7 +74,7 @@ public class LogicalTimeIT extends AccumuloClusterHarness {
       throws Exception {
     log.info("table " + table);
     conn.tableOperations().create(table, new NewTableConfiguration().setTimeType(TimeType.LOGICAL));
-    TreeSet<Text> splitSet = new TreeSet<Text>();
+    TreeSet<Text> splitSet = new TreeSet<>();
     for (String split : splits) {
       splitSet.add(new Text(split));
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/functional/MaxOpenIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/MaxOpenIT.java b/test/src/main/java/org/apache/accumulo/test/functional/MaxOpenIT.java
index 6f08c1f..102afaf 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/MaxOpenIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/MaxOpenIT.java
@@ -118,7 +118,7 @@ public class MaxOpenIT extends AccumuloClusterHarness {
       FunctionalTestUtils.checkRFiles(c, tableName, NUM_TABLETS, NUM_TABLETS, i + 1, i + 1);
     }
 
-    List<Range> ranges = new ArrayList<Range>(NUM_TO_INGEST);
+    List<Range> ranges = new ArrayList<>(NUM_TO_INGEST);
 
     for (int i = 0; i < NUM_TO_INGEST; i++) {
       ranges.add(new Range(TestIngest.generateRow(i, 0)));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/functional/MergeIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/MergeIT.java b/test/src/main/java/org/apache/accumulo/test/functional/MergeIT.java
index c5a4afb..8c20673 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/MergeIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/MergeIT.java
@@ -57,7 +57,7 @@ public class MergeIT extends AccumuloClusterHarness {
   }
 
   SortedSet<Text> splits(String[] points) {
-    SortedSet<Text> result = new TreeSet<Text>();
+    SortedSet<Text> result = new TreeSet<>();
     for (String point : points)
       result.add(new Text(point));
     return result;
@@ -155,14 +155,14 @@ public class MergeIT extends AccumuloClusterHarness {
     System.out.println("Running merge test " + table + " " + Arrays.asList(splits) + " " + start + " " + end);
 
     conn.tableOperations().create(table, new NewTableConfiguration().setTimeType(TimeType.LOGICAL));
-    TreeSet<Text> splitSet = new TreeSet<Text>();
+    TreeSet<Text> splitSet = new TreeSet<>();
     for (String split : splits) {
       splitSet.add(new Text(split));
     }
     conn.tableOperations().addSplits(table, splitSet);
 
     BatchWriter bw = conn.createBatchWriter(table, null);
-    HashSet<String> expected = new HashSet<String>();
+    HashSet<String> expected = new HashSet<>();
     for (String row : inserts) {
       Mutation m = new Mutation(row);
       m.put("cf", "cq", row);
@@ -176,7 +176,7 @@ public class MergeIT extends AccumuloClusterHarness {
 
     Scanner scanner = conn.createScanner(table, Authorizations.EMPTY);
 
-    HashSet<String> observed = new HashSet<String>();
+    HashSet<String> observed = new HashSet<>();
     for (Entry<Key,Value> entry : scanner) {
       String row = entry.getKey().getRowData().toString();
       if (!observed.add(row)) {
@@ -188,8 +188,8 @@ public class MergeIT extends AccumuloClusterHarness {
       throw new Exception("data inconsistency " + table + " " + observed + " != " + expected);
     }
 
-    HashSet<Text> currentSplits = new HashSet<Text>(conn.tableOperations().listSplits(table));
-    HashSet<Text> ess = new HashSet<Text>();
+    HashSet<Text> currentSplits = new HashSet<>(conn.tableOperations().listSplits(table));
+    HashSet<Text> ess = new HashSet<>();
     for (String es : expectedSplits) {
       ess.add(new Text(es));
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/functional/MetadataIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/MetadataIT.java b/test/src/main/java/org/apache/accumulo/test/functional/MetadataIT.java
index aba0a24..883b8dc 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/MetadataIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/MetadataIT.java
@@ -71,14 +71,14 @@ public class MetadataIT extends AccumuloClusterHarness {
     rootScanner.setRange(MetadataSchema.TabletsSection.getRange());
     rootScanner.fetchColumnFamily(MetadataSchema.TabletsSection.DataFileColumnFamily.NAME);
 
-    Set<String> files1 = new HashSet<String>();
+    Set<String> files1 = new HashSet<>();
     for (Entry<Key,Value> entry : rootScanner)
       files1.add(entry.getKey().getColumnQualifier().toString());
 
     c.tableOperations().create(tableNames[1]);
     c.tableOperations().flush(MetadataTable.NAME, null, null, true);
 
-    Set<String> files2 = new HashSet<String>();
+    Set<String> files2 = new HashSet<>();
     for (Entry<Key,Value> entry : rootScanner)
       files2.add(entry.getKey().getColumnQualifier().toString());
 
@@ -88,7 +88,7 @@ public class MetadataIT extends AccumuloClusterHarness {
 
     c.tableOperations().compact(MetadataTable.NAME, null, null, false, true);
 
-    Set<String> files3 = new HashSet<String>();
+    Set<String> files3 = new HashSet<>();
     for (Entry<Key,Value> entry : rootScanner)
       files3.add(entry.getKey().getColumnQualifier().toString());
 
@@ -100,7 +100,7 @@ public class MetadataIT extends AccumuloClusterHarness {
   public void mergeMeta() throws Exception {
     Connector c = getConnector();
     String[] names = getUniqueNames(5);
-    SortedSet<Text> splits = new TreeSet<Text>();
+    SortedSet<Text> splits = new TreeSet<>();
     for (String id : "1 2 3 4 5".split(" ")) {
       splits.add(new Text(id));
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/functional/MetadataMaxFilesIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/MetadataMaxFilesIT.java b/test/src/main/java/org/apache/accumulo/test/functional/MetadataMaxFilesIT.java
index 3e8b421..6c4939f 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/MetadataMaxFilesIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/MetadataMaxFilesIT.java
@@ -63,7 +63,7 @@ public class MetadataMaxFilesIT extends ConfigurableMacBase {
   @Test
   public void test() throws Exception {
     Connector c = getConnector();
-    SortedSet<Text> splits = new TreeSet<Text>();
+    SortedSet<Text> splits = new TreeSet<>();
     for (int i = 0; i < 1000; i++) {
       splits.add(new Text(String.format("%03d", i)));
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/functional/NativeMapIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/NativeMapIT.java b/test/src/main/java/org/apache/accumulo/test/functional/NativeMapIT.java
index 9175379..2d594f5 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/NativeMapIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/NativeMapIT.java
@@ -313,7 +313,7 @@ public class NativeMapIT {
 
     NativeMap nm = new NativeMap();
 
-    TreeMap<Key,Value> tm = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm = new TreeMap<>();
 
     tm.put(new Key(new Text("fo")), new Value(new byte[] {'0'}));
     tm.put(new Key(new Text("foo")), new Value(new byte[] {'1'}));
@@ -451,14 +451,14 @@ public class NativeMapIT {
     // generate random data
     Random r = new Random(75);
 
-    ArrayList<Pair<Key,Value>> testData = new ArrayList<Pair<Key,Value>>();
+    ArrayList<Pair<Key,Value>> testData = new ArrayList<>();
 
     for (int i = 0; i < 100000; i++) {
 
       Key k = new Key(rlrf(r, 97), rlrf(r, 13), rlrf(r, 31), rlrf(r, 11), (r.nextLong() & 0x7fffffffffffffffl), false, false);
       Value v = new Value(rlrf(r, 511));
 
-      testData.add(new Pair<Key,Value>(k, v));
+      testData.add(new Pair<>(k, v));
     }
 
     // insert unsorted data

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/functional/PermissionsIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/PermissionsIT.java b/test/src/main/java/org/apache/accumulo/test/functional/PermissionsIT.java
index 8700891..2fc256b 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/PermissionsIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/PermissionsIT.java
@@ -126,7 +126,7 @@ public class PermissionsIT extends AccumuloClusterHarness {
   }
 
   static Map<String,String> map(Iterable<Entry<String,String>> i) {
-    Map<String,String> result = new HashMap<String,String>();
+    Map<String,String> result = new HashMap<>();
     for (Entry<String,String> e : i) {
       result.put(e.getKey(), e.getValue());
     }
@@ -609,8 +609,8 @@ public class PermissionsIT extends AccumuloClusterHarness {
         // test for bulk import permission would go here
         break;
       case ALTER_TABLE:
-        Map<String,Set<Text>> groups = new HashMap<String,Set<Text>>();
-        groups.put("tgroup", new HashSet<Text>(Arrays.asList(new Text("t1"), new Text("t2"))));
+        Map<String,Set<Text>> groups = new HashMap<>();
+        groups.put("tgroup", new HashSet<>(Arrays.asList(new Text("t1"), new Text("t2"))));
         try {
           test_user_conn.tableOperations().setLocalityGroups(tableName, groups);
           throw new IllegalStateException("User should not be able to set locality groups");
@@ -668,8 +668,8 @@ public class PermissionsIT extends AccumuloClusterHarness {
         // test for bulk import permission would go here
         break;
       case ALTER_TABLE:
-        Map<String,Set<Text>> groups = new HashMap<String,Set<Text>>();
-        groups.put("tgroup", new HashSet<Text>(Arrays.asList(new Text("t1"), new Text("t2"))));
+        Map<String,Set<Text>> groups = new HashMap<>();
+        groups.put("tgroup", new HashSet<>(Arrays.asList(new Text("t1"), new Text("t2"))));
         break;
       case DROP_TABLE:
         test_user_conn.tableOperations().delete(tableName);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/functional/ReadWriteIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ReadWriteIT.java b/test/src/main/java/org/apache/accumulo/test/functional/ReadWriteIT.java
index 8b091ca..30200ec 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/ReadWriteIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/ReadWriteIT.java
@@ -399,7 +399,7 @@ public class ReadWriteIT extends AccumuloClusterHarness {
     final Connector connector = getConnector();
     final String tableName = getUniqueNames(1)[0];
     connector.tableOperations().create(tableName);
-    Map<String,Set<Text>> groups = new TreeMap<String,Set<Text>>();
+    Map<String,Set<Text>> groups = new TreeMap<>();
     groups.put("g1", Collections.singleton(t("colf")));
     connector.tableOperations().setLocalityGroups(tableName, groups);
     ingest(connector, getCluster().getClientConfig(), getAdminPrincipal(), 2000, 1, 50, 0, tableName);
@@ -473,11 +473,11 @@ public class ReadWriteIT extends AccumuloClusterHarness {
   }
 
   private Map<String,Set<Text>> getGroups(String cfg) {
-    Map<String,Set<Text>> groups = new TreeMap<String,Set<Text>>();
+    Map<String,Set<Text>> groups = new TreeMap<>();
     if (cfg != null) {
       for (String group : cfg.split(";")) {
         String[] parts = group.split(":");
-        Set<Text> cols = new HashSet<Text>();
+        Set<Text> cols = new HashSet<>();
         for (String col : parts[1].split(",")) {
           cols.add(t(col));
         }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/functional/RowDeleteIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/RowDeleteIT.java b/test/src/main/java/org/apache/accumulo/test/functional/RowDeleteIT.java
index 75c66bd..74d76b8 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/RowDeleteIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/RowDeleteIT.java
@@ -62,7 +62,7 @@ public class RowDeleteIT extends AccumuloClusterHarness {
     Connector c = getConnector();
     String tableName = getUniqueNames(1)[0];
     c.tableOperations().create(tableName);
-    Map<String,Set<Text>> groups = new HashMap<String,Set<Text>>();
+    Map<String,Set<Text>> groups = new HashMap<>();
     groups.put("lg1", Collections.singleton(new Text("foo")));
     groups.put("dg", Collections.<Text> emptySet());
     c.tableOperations().setLocalityGroups(tableName, groups);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/functional/ScanIdIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ScanIdIT.java b/test/src/main/java/org/apache/accumulo/test/functional/ScanIdIT.java
index aa25b93..748423e 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/ScanIdIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/ScanIdIT.java
@@ -92,7 +92,7 @@ public class ScanIdIT extends AccumuloClusterHarness {
 
   private static final AtomicBoolean testInProgress = new AtomicBoolean(true);
 
-  private static final Map<Integer,Value> resultsByWorker = new ConcurrentHashMap<Integer,Value>();
+  private static final Map<Integer,Value> resultsByWorker = new ConcurrentHashMap<>();
 
   @Override
   protected int defaultTimeoutSeconds() {
@@ -146,7 +146,7 @@ public class ScanIdIT extends AccumuloClusterHarness {
     }
 
     // all scanner have reported at least 1 result, so check for unique scan ids.
-    Set<Long> scanIds = new HashSet<Long>();
+    Set<Long> scanIds = new HashSet<>();
 
     List<String> tservers = conn.instanceOperations().getTabletServers();
 
@@ -314,7 +314,7 @@ public class ScanIdIT extends AccumuloClusterHarness {
    */
   private SortedSet<Text> createSplits() {
 
-    SortedSet<Text> splits = new TreeSet<Text>();
+    SortedSet<Text> splits = new TreeSet<>();
 
     for (int split = 0; split < 10; split++) {
       splits.add(new Text(Integer.toString(split)));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/functional/ScanIteratorIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ScanIteratorIT.java b/test/src/main/java/org/apache/accumulo/test/functional/ScanIteratorIT.java
index eb6b5e3..a274dec 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/ScanIteratorIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/ScanIteratorIT.java
@@ -135,7 +135,7 @@ public class ScanIteratorIT extends AccumuloClusterHarness {
     setupIter(bscanner);
     verify(bscanner, 1, 999);
 
-    ArrayList<Range> ranges = new ArrayList<Range>();
+    ArrayList<Range> ranges = new ArrayList<>();
     ranges.add(new Range(new Text(String.format("%06d", 1))));
     ranges.add(new Range(new Text(String.format("%06d", 6)), new Text(String.format("%06d", 16))));
     ranges.add(new Range(new Text(String.format("%06d", 20))));
@@ -144,8 +144,8 @@ public class ScanIteratorIT extends AccumuloClusterHarness {
     ranges.add(new Range(new Text(String.format("%06d", 501)), new Text(String.format("%06d", 504))));
     ranges.add(new Range(new Text(String.format("%06d", 998)), new Text(String.format("%06d", 1000))));
 
-    HashSet<Integer> got = new HashSet<Integer>();
-    HashSet<Integer> expected = new HashSet<Integer>();
+    HashSet<Integer> got = new HashSet<>();
+    HashSet<Integer> expected = new HashSet<>();
     for (int i : new int[] {1, 7, 9, 11, 13, 15, 23, 57, 59, 61, 501, 503, 999}) {
       expected.add(i);
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/functional/ScanRangeIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ScanRangeIT.java b/test/src/main/java/org/apache/accumulo/test/functional/ScanRangeIT.java
index bd7555e..7ab96c4 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/ScanRangeIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/ScanRangeIT.java
@@ -54,7 +54,7 @@ public class ScanRangeIT extends AccumuloClusterHarness {
     c.tableOperations().create(table1);
     String table2 = tableNames[1];
     c.tableOperations().create(table2);
-    TreeSet<Text> splitRows = new TreeSet<Text>();
+    TreeSet<Text> splitRows = new TreeSet<>();
     int splits = 3;
     for (int i = (ROW_LIMIT / splits); i < ROW_LIMIT; i += (ROW_LIMIT / splits))
       splitRows.add(createRow(i));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/functional/SessionBlockVerifyIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/SessionBlockVerifyIT.java b/test/src/main/java/org/apache/accumulo/test/functional/SessionBlockVerifyIT.java
index 05f304b..ca59041 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/SessionBlockVerifyIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/SessionBlockVerifyIT.java
@@ -110,7 +110,7 @@ public class SessionBlockVerifyIT extends ScanSessionTimeOutIT {
 
     final Iterator<Entry<Key,Value>> slow = scanner.iterator();
 
-    final List<Future<Boolean>> callables = new ArrayList<Future<Boolean>>();
+    final List<Future<Boolean>> callables = new ArrayList<>();
     final CountDownLatch latch = new CountDownLatch(10);
     for (int i = 0; i < 10; i++) {
       Future<Boolean> callable = service.submit(new Callable<Boolean>() {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/functional/ShutdownIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ShutdownIT.java b/test/src/main/java/org/apache/accumulo/test/functional/ShutdownIT.java
index 9a2e42e..98e1031 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/ShutdownIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/ShutdownIT.java
@@ -78,7 +78,7 @@ public class ShutdownIT extends ConfigurableMacBase {
     for (int i = 0; i < 10; i++) {
       c.tableOperations().create("table" + i);
     }
-    final AtomicReference<Exception> ref = new AtomicReference<Exception>();
+    final AtomicReference<Exception> ref = new AtomicReference<>();
     Thread async = new Thread() {
       @Override
       public void run() {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/functional/SimpleBalancerFairnessIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/SimpleBalancerFairnessIT.java b/test/src/main/java/org/apache/accumulo/test/functional/SimpleBalancerFairnessIT.java
index 45cf06d..864ba06 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/SimpleBalancerFairnessIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/SimpleBalancerFairnessIT.java
@@ -99,7 +99,7 @@ public class SimpleBalancerFairnessIT extends ConfigurableMacBase {
     assertEquals("Unassigned tablets were not assigned within 30 seconds", 0, unassignedTablets);
 
     // Compute online tablets per tserver
-    List<Integer> counts = new ArrayList<Integer>();
+    List<Integer> counts = new ArrayList<>();
     for (TabletServerStatus server : stats.tServerInfo) {
       int count = 0;
       for (TableInfo table : server.tableMap.values()) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/functional/SplitRecoveryIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/SplitRecoveryIT.java b/test/src/main/java/org/apache/accumulo/test/functional/SplitRecoveryIT.java
index 80e5374..7010dc9 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/SplitRecoveryIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/SplitRecoveryIT.java
@@ -140,7 +140,7 @@ public class SplitRecoveryIT extends ConfigurableMacBase {
 
       String tdir = ServerConstants.getTablesDirs()[0] + "/" + extent.getTableId() + "/dir_" + i;
       MetadataTableUtil.addTablet(extent, tdir, context, TabletTime.LOGICAL_TIME_ID, zl);
-      SortedMap<FileRef,DataFileValue> mapFiles = new TreeMap<FileRef,DataFileValue>();
+      SortedMap<FileRef,DataFileValue> mapFiles = new TreeMap<>();
       mapFiles.put(new FileRef(tdir + "/" + RFile.EXTENSION + "_000_000"), new DataFileValue(1000017 + i, 10000 + i));
 
       if (i == extentToSplit) {
@@ -162,9 +162,9 @@ public class SplitRecoveryIT extends ConfigurableMacBase {
   private void splitPartiallyAndRecover(AccumuloServerContext context, KeyExtent extent, KeyExtent high, KeyExtent low, double splitRatio,
       SortedMap<FileRef,DataFileValue> mapFiles, Text midRow, String location, int steps, ZooLock zl) throws Exception {
 
-    SortedMap<FileRef,DataFileValue> lowDatafileSizes = new TreeMap<FileRef,DataFileValue>();
-    SortedMap<FileRef,DataFileValue> highDatafileSizes = new TreeMap<FileRef,DataFileValue>();
-    List<FileRef> highDatafilesToRemove = new ArrayList<FileRef>();
+    SortedMap<FileRef,DataFileValue> lowDatafileSizes = new TreeMap<>();
+    SortedMap<FileRef,DataFileValue> highDatafileSizes = new TreeMap<>();
+    List<FileRef> highDatafilesToRemove = new ArrayList<>();
 
     MetadataTableUtil.splitDatafiles(extent.getTableId(), midRow, splitRatio, new HashMap<FileRef,FileUtil.FileInfo>(), mapFiles, lowDatafileSizes,
         highDatafileSizes, highDatafilesToRemove);
@@ -211,13 +211,13 @@ public class SplitRecoveryIT extends ConfigurableMacBase {
     try (Scanner scanner = new ScannerImpl(context, MetadataTable.ID, Authorizations.EMPTY)) {
       scanner.setRange(extent.toMetadataRange());
 
-      HashSet<ColumnFQ> expectedColumns = new HashSet<ColumnFQ>();
+      HashSet<ColumnFQ> expectedColumns = new HashSet<>();
       expectedColumns.add(TabletsSection.ServerColumnFamily.DIRECTORY_COLUMN);
       expectedColumns.add(TabletsSection.TabletColumnFamily.PREV_ROW_COLUMN);
       expectedColumns.add(TabletsSection.ServerColumnFamily.TIME_COLUMN);
       expectedColumns.add(TabletsSection.ServerColumnFamily.LOCK_COLUMN);
 
-      HashSet<Text> expectedColumnFamilies = new HashSet<Text>();
+      HashSet<Text> expectedColumnFamilies = new HashSet<>();
       expectedColumnFamilies.add(DataFileColumnFamily.NAME);
       expectedColumnFamilies.add(TabletsSection.FutureLocationColumnFamily.NAME);
       expectedColumnFamilies.add(TabletsSection.CurrentLocationColumnFamily.NAME);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/functional/TabletIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/TabletIT.java b/test/src/main/java/org/apache/accumulo/test/functional/TabletIT.java
index d2b1416..8d52058 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/TabletIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/TabletIT.java
@@ -68,7 +68,7 @@ public class TabletIT extends AccumuloClusterHarness {
     Connector connector = getConnector();
 
     if (!readOnly) {
-      TreeSet<Text> keys = new TreeSet<Text>();
+      TreeSet<Text> keys = new TreeSet<>();
       for (int i = N / 100; i < N; i += N / 100) {
         keys.add(new Text(String.format("%05d", i)));
       }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/functional/TabletStateChangeIteratorIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/TabletStateChangeIteratorIT.java b/test/src/main/java/org/apache/accumulo/test/functional/TabletStateChangeIteratorIT.java
index b56b4a5..c64de25 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/TabletStateChangeIteratorIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/TabletStateChangeIteratorIT.java
@@ -172,7 +172,7 @@ public class TabletStateChangeIteratorIT extends SharedMiniClusterBase {
     Connector conn = getConnector();
     conn.tableOperations().create(t);
     conn.tableOperations().online(t, true);
-    SortedSet<Text> partitionKeys = new TreeSet<Text>();
+    SortedSet<Text> partitionKeys = new TreeSet<>();
     partitionKeys.add(new Text("some split"));
     conn.tableOperations().addSplits(t, partitionKeys);
     if (!online) {
@@ -199,7 +199,7 @@ public class TabletStateChangeIteratorIT extends SharedMiniClusterBase {
 
     @Override
     public Set<TServerInstance> onlineTabletServers() {
-      HashSet<TServerInstance> tservers = new HashSet<TServerInstance>();
+      HashSet<TServerInstance> tservers = new HashSet<>();
       for (String tserver : getConnector().instanceOperations().getTabletServers()) {
         try {
           String zPath = ZooUtil.getRoot(getConnector().getInstance()) + Constants.ZTSERVERS + "/" + tserver;
@@ -214,7 +214,7 @@ public class TabletStateChangeIteratorIT extends SharedMiniClusterBase {
 
     @Override
     public Set<String> onlineTables() {
-      HashSet<String> onlineTables = new HashSet<String>(getConnector().tableOperations().tableIdMap().values());
+      HashSet<String> onlineTables = new HashSet<>(getConnector().tableOperations().tableIdMap().values());
       return Sets.filter(onlineTables, new Predicate<String>() {
         @Override
         public boolean apply(String tableId) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/functional/VisibilityIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/VisibilityIT.java b/test/src/main/java/org/apache/accumulo/test/functional/VisibilityIT.java
index 3d6ad85..8285461 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/VisibilityIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/VisibilityIT.java
@@ -94,7 +94,7 @@ public class VisibilityIT extends AccumuloClusterHarness {
   }
 
   private static SortedSet<String> nss(String... labels) {
-    TreeSet<String> ts = new TreeSet<String>();
+    TreeSet<String> ts = new TreeSet<>();
 
     for (String s : labels) {
       ts.add(s);
@@ -153,7 +153,7 @@ public class VisibilityIT extends AccumuloClusterHarness {
     bw.addMutation(m1);
     bw.close();
 
-    Map<Set<String>,Set<String>> expected = new HashMap<Set<String>,Set<String>>();
+    Map<Set<String>,Set<String>> expected = new HashMap<>();
 
     expected.put(nss("A", "L"), nss("v5"));
     expected.put(nss("A", "M"), nss("v5"));
@@ -184,10 +184,10 @@ public class VisibilityIT extends AccumuloClusterHarness {
 
     all.add(prefix);
 
-    TreeSet<String> ss = new TreeSet<String>(suffix);
+    TreeSet<String> ss = new TreeSet<>(suffix);
 
     for (String s : suffix) {
-      TreeSet<String> ps = new TreeSet<String>(prefix);
+      TreeSet<String> ps = new TreeSet<>(prefix);
       ps.add(s);
       ss.remove(s);
 
@@ -196,7 +196,7 @@ public class VisibilityIT extends AccumuloClusterHarness {
   }
 
   private void queryData(Connector c, String tableName) throws Exception {
-    Map<Set<String>,Set<String>> expected = new HashMap<Set<String>,Set<String>>();
+    Map<Set<String>,Set<String>> expected = new HashMap<>();
     expected.put(nss(), nss("v1"));
     expected.put(nss("A"), nss("v2"));
     expected.put(nss("A", "L"), nss("v5"));
@@ -227,14 +227,14 @@ public class VisibilityIT extends AccumuloClusterHarness {
 
     c.securityOperations().changeUserAuthorizations(getAdminPrincipal(), new Authorizations(nbas(userAuths)));
 
-    ArrayList<Set<String>> combos = new ArrayList<Set<String>>();
+    ArrayList<Set<String>> combos = new ArrayList<>();
     uniqueCombos(combos, nss(), allAuths);
 
     for (Set<String> set1 : combos) {
-      Set<String> e = new TreeSet<String>();
+      Set<String> e = new TreeSet<>();
       for (Set<String> set2 : combos) {
 
-        set2 = new HashSet<String>(set2);
+        set2 = new HashSet<>(set2);
         set2.retainAll(userAuths);
 
         if (set1.containsAll(set2) && expected.containsKey(set2)) {
@@ -300,7 +300,7 @@ public class VisibilityIT extends AccumuloClusterHarness {
   }
 
   private void verify(Iterator<Entry<Key,Value>> iter, String... expected) throws Exception {
-    HashSet<String> valuesSeen = new HashSet<String>();
+    HashSet<String> valuesSeen = new HashSet<>();
 
     while (iter.hasNext()) {
       Entry<Key,Value> entry = iter.next();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/functional/WALSunnyDayIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/WALSunnyDayIT.java b/test/src/main/java/org/apache/accumulo/test/functional/WALSunnyDayIT.java
index 6f0bc7a..434a8f5 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/WALSunnyDayIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/WALSunnyDayIT.java
@@ -226,7 +226,7 @@ public class WALSunnyDayIT extends ConfigurableMacBase {
       if (TabletColumnFamily.PREV_ROW_COLUMN.hasColumns(key) && !logs.isEmpty()) {
         KeyExtent extent = new KeyExtent(key.getRow(), entry.getValue());
         result.put(extent, logs);
-        logs = new ArrayList<String>();
+        logs = new ArrayList<>();
       }
     }
     return result;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/functional/WriteLotsIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/WriteLotsIT.java b/test/src/main/java/org/apache/accumulo/test/functional/WriteLotsIT.java
index 38ea6f7..719dbdb 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/WriteLotsIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/WriteLotsIT.java
@@ -43,7 +43,7 @@ public class WriteLotsIT extends AccumuloClusterHarness {
     final Connector c = getConnector();
     final String tableName = getUniqueNames(1)[0];
     c.tableOperations().create(tableName);
-    final AtomicReference<Exception> ref = new AtomicReference<Exception>();
+    final AtomicReference<Exception> ref = new AtomicReference<>();
     final ClientConfiguration clientConfig = getCluster().getClientConfig();
     final int THREADS = 5;
     ThreadPoolExecutor tpe = new ThreadPoolExecutor(0, THREADS, 0, TimeUnit.SECONDS, new ArrayBlockingQueue<Runnable>(THREADS));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/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 44f2859..6c20cda 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
@@ -16,6 +16,7 @@
  */
 package org.apache.accumulo.test.functional;
 
+import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly;
 import static java.nio.charset.StandardCharsets.UTF_8;
 
 import java.util.HashMap;
@@ -24,7 +25,6 @@ import java.util.concurrent.TimeUnit;
 
 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;
@@ -51,7 +51,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.google.common.net.HostAndPort;
-import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly;
 
 /**
  * Tablet server that creates a lock in zookeeper, responds to one status request, and then hangs on subsequent requests. Exits with code zero if halted.
@@ -79,7 +78,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/b102e760/test/src/main/java/org/apache/accumulo/test/functional/ZooCacheIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ZooCacheIT.java b/test/src/main/java/org/apache/accumulo/test/functional/ZooCacheIT.java
index a531ee0..aa6e7a1 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/ZooCacheIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/ZooCacheIT.java
@@ -48,8 +48,8 @@ public class ZooCacheIT extends ConfigurableMacBase {
   @Test
   public void test() throws Exception {
     assertEquals(0, exec(CacheTestClean.class, pathName, testDir.getAbsolutePath()).waitFor());
-    final AtomicReference<Exception> ref = new AtomicReference<Exception>();
-    List<Thread> threads = new ArrayList<Thread>();
+    final AtomicReference<Exception> ref = new AtomicReference<>();
+    List<Thread> threads = new ArrayList<>();
     for (int i = 0; i < 3; i++) {
       Thread reader = new Thread() {
         @Override

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/functional/ZookeeperRestartIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ZookeeperRestartIT.java b/test/src/main/java/org/apache/accumulo/test/functional/ZookeeperRestartIT.java
index 5ece1ac..013edb0 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/ZookeeperRestartIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/ZookeeperRestartIT.java
@@ -46,7 +46,7 @@ public class ZookeeperRestartIT 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.INSTANCE_ZK_TIMEOUT.getKey(), "15s");
     cfg.setSiteConfig(siteConfig);
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloInputFormatIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloInputFormatIT.java b/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloInputFormatIT.java
index c855b39..cf002dd 100644
--- a/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloInputFormatIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloInputFormatIT.java
@@ -208,7 +208,7 @@ public class AccumuloInputFormatIT extends AccumuloClusterHarness {
 
     String table = getUniqueNames(1)[0];
     Authorizations auths = new Authorizations("foo");
-    Collection<Pair<Text,Text>> fetchColumns = Collections.singleton(new Pair<Text,Text>(new Text("foo"), new Text("bar")));
+    Collection<Pair<Text,Text>> fetchColumns = Collections.singleton(new Pair<>(new Text("foo"), new Text("bar")));
     boolean isolated = true, localIters = true;
     Level level = Level.WARN;
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloMultiTableInputFormatIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloMultiTableInputFormatIT.java b/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloMultiTableInputFormatIT.java
index fb3177a..44ef7d1 100644
--- a/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloMultiTableInputFormatIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloMultiTableInputFormatIT.java
@@ -111,7 +111,7 @@ public class AccumuloMultiTableInputFormatIT extends AccumuloClusterHarness {
       InputTableConfig tableConfig1 = new InputTableConfig();
       InputTableConfig tableConfig2 = new InputTableConfig();
 
-      Map<String,InputTableConfig> configMap = new HashMap<String,InputTableConfig>();
+      Map<String,InputTableConfig> configMap = new HashMap<>();
       configMap.put(table1, tableConfig1);
       configMap.put(table2, tableConfig2);
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloRowInputFormatIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloRowInputFormatIT.java b/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloRowInputFormatIT.java
index 98978dc..e81741a 100644
--- a/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloRowInputFormatIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloRowInputFormatIT.java
@@ -69,13 +69,13 @@ public class AccumuloRowInputFormatIT extends AccumuloClusterHarness {
 
   @BeforeClass
   public static void prepareRows() {
-    row1 = new ArrayList<Entry<Key,Value>>();
+    row1 = new ArrayList<>();
     row1.add(new KeyValue(new Key(ROW1, COLF1, "colq1"), "v1".getBytes()));
     row1.add(new KeyValue(new Key(ROW1, COLF1, "colq2"), "v2".getBytes()));
     row1.add(new KeyValue(new Key(ROW1, "colf2", "colq3"), "v3".getBytes()));
-    row2 = new ArrayList<Entry<Key,Value>>();
+    row2 = new ArrayList<>();
     row2.add(new KeyValue(new Key(ROW2, COLF1, "colq4"), "v4".getBytes()));
-    row3 = new ArrayList<Entry<Key,Value>>();
+    row3 = new ArrayList<>();
     row3.add(new KeyValue(new Key(ROW3, COLF1, "colq5"), "v5".getBytes()));
   }
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloInputFormatIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloInputFormatIT.java b/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloInputFormatIT.java
index 11e7d7c..a581099 100644
--- a/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloInputFormatIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloInputFormatIT.java
@@ -129,7 +129,7 @@ public class AccumuloInputFormatIT extends AccumuloClusterHarness {
     AccumuloInputFormat.setConnectorInfo(job, getAdminPrincipal(), getAdminToken());
 
     // split table
-    TreeSet<Text> splitsToAdd = new TreeSet<Text>();
+    TreeSet<Text> splitsToAdd = new TreeSet<>();
     for (int i = 0; i < 10000; i += 1000)
       splitsToAdd.add(new Text(String.format("%09d", i)));
     conn.tableOperations().addSplits(table, splitsToAdd);
@@ -141,7 +141,7 @@ public class AccumuloInputFormatIT extends AccumuloClusterHarness {
     assertEquals(actualSplits.size() + 1, splits.size()); // No ranges set on the job so it'll start with -inf
 
     // set ranges and get splits
-    List<Range> ranges = new ArrayList<Range>();
+    List<Range> ranges = new ArrayList<>();
     for (Text text : actualSplits)
       ranges.add(new Range(text));
     AccumuloInputFormat.setRanges(job, ranges);
@@ -160,7 +160,7 @@ public class AccumuloInputFormatIT extends AccumuloClusterHarness {
     assertEquals(actualSplits.size(), splits.size());
 
     // auto adjust ranges
-    ranges = new ArrayList<Range>();
+    ranges = new ArrayList<>();
     for (int i = 0; i < 5; i++)
       // overlapping ranges
       ranges.add(new Range(String.format("%09d", i), String.format("%09d", i + 2)));
@@ -402,7 +402,7 @@ public class AccumuloInputFormatIT extends AccumuloClusterHarness {
 
     String table = getUniqueNames(1)[0];
     Authorizations auths = new Authorizations("foo");
-    Collection<Pair<Text,Text>> fetchColumns = Collections.singleton(new Pair<Text,Text>(new Text("foo"), new Text("bar")));
+    Collection<Pair<Text,Text>> fetchColumns = Collections.singleton(new Pair<>(new Text("foo"), new Text("bar")));
     boolean isolated = true, localIters = true;
     Level level = Level.WARN;
 
@@ -506,7 +506,7 @@ public class AccumuloInputFormatIT extends AccumuloClusterHarness {
     @Override
     public List<InputSplit> getSplits(JobContext context) throws IOException {
       List<InputSplit> oldSplits = super.getSplits(context);
-      List<InputSplit> newSplits = new ArrayList<InputSplit>(oldSplits.size());
+      List<InputSplit> newSplits = new ArrayList<>(oldSplits.size());
 
       // Copy only the necessary information
       for (InputSplit oldSplit : oldSplits) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloMultiTableInputFormatIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloMultiTableInputFormatIT.java b/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloMultiTableInputFormatIT.java
index bd7ea42..350a183 100644
--- a/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloMultiTableInputFormatIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloMultiTableInputFormatIT.java
@@ -103,7 +103,7 @@ public class AccumuloMultiTableInputFormatIT extends AccumuloClusterHarness {
       InputTableConfig tableConfig1 = new InputTableConfig();
       InputTableConfig tableConfig2 = new InputTableConfig();
 
-      Map<String,InputTableConfig> configMap = new HashMap<String,InputTableConfig>();
+      Map<String,InputTableConfig> configMap = new HashMap<>();
       configMap.put(table1, tableConfig1);
       configMap.put(table2, tableConfig2);
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloRowInputFormatIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloRowInputFormatIT.java b/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloRowInputFormatIT.java
index 1275bf9..c03d462 100644
--- a/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloRowInputFormatIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloRowInputFormatIT.java
@@ -66,13 +66,13 @@ public class AccumuloRowInputFormatIT extends AccumuloClusterHarness {
 
   @BeforeClass
   public static void prepareRows() {
-    row1 = new ArrayList<Entry<Key,Value>>();
+    row1 = new ArrayList<>();
     row1.add(new KeyValue(new Key(ROW1, COLF1, "colq1"), "v1".getBytes()));
     row1.add(new KeyValue(new Key(ROW1, COLF1, "colq2"), "v2".getBytes()));
     row1.add(new KeyValue(new Key(ROW1, "colf2", "colq3"), "v3".getBytes()));
-    row2 = new ArrayList<Entry<Key,Value>>();
+    row2 = new ArrayList<>();
     row2.add(new KeyValue(new Key(ROW2, COLF1, "colq4"), "v4".getBytes()));
-    row3 = new ArrayList<Entry<Key,Value>>();
+    row3 = new ArrayList<>();
     row3.add(new KeyValue(new Key(ROW3, COLF1, "colq5"), "v5".getBytes()));
   }
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/performance/RollWALPerformanceIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/performance/RollWALPerformanceIT.java b/test/src/main/java/org/apache/accumulo/test/performance/RollWALPerformanceIT.java
index 6733e4b..827d6d8 100644
--- a/test/src/main/java/org/apache/accumulo/test/performance/RollWALPerformanceIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/performance/RollWALPerformanceIT.java
@@ -68,7 +68,7 @@ public class RollWALPerformanceIT extends ConfigurableMacBase {
     log.info("Splitting the table");
     final long SPLIT_COUNT = 100;
     final long distance = Long.MAX_VALUE / SPLIT_COUNT;
-    final SortedSet<Text> splits = new TreeSet<Text>();
+    final SortedSet<Text> splits = new TreeSet<>();
     for (int i = 1; i < SPLIT_COUNT; i++) {
       splits.add(new Text(String.format("%016x", i * distance)));
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/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 e74aa88..157d4a0 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 {
     String tid = "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());
       }


[23/32] accumulo git commit: ACCUMULO-4357 Remove unneeded code for readability

Posted by ct...@apache.org.
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/conf/TableConfiguration.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/conf/TableConfiguration.java b/server/base/src/main/java/org/apache/accumulo/server/conf/TableConfiguration.java
index d4712b9..6c53c5b 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/conf/TableConfiguration.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/conf/TableConfiguration.java
@@ -35,7 +35,7 @@ import com.google.common.base.Predicate;
 public class TableConfiguration extends ObservableConfiguration {
   private static final Logger log = LoggerFactory.getLogger(TableConfiguration.class);
 
-  private static final Map<PropCacheKey,ZooCache> propCaches = new java.util.HashMap<PropCacheKey,ZooCache>();
+  private static final Map<PropCacheKey,ZooCache> propCaches = new java.util.HashMap<>();
 
   private ZooCachePropertyAccessor propCacheAccessor = null;
   private final Instance instance;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/conf/ZooConfigurationFactory.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/conf/ZooConfigurationFactory.java b/server/base/src/main/java/org/apache/accumulo/server/conf/ZooConfigurationFactory.java
index 6c8ceca..0cfbff8 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/conf/ZooConfigurationFactory.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/conf/ZooConfigurationFactory.java
@@ -35,7 +35,7 @@ import org.apache.hadoop.fs.Path;
  * A factory for {@link ZooConfiguration} objects.
  */
 class ZooConfigurationFactory {
-  private static final Map<String,ZooConfiguration> instances = new HashMap<String,ZooConfiguration>();
+  private static final Map<String,ZooConfiguration> instances = new HashMap<>();
 
   /**
    * Gets a configuration object for the given instance with the given parent. Repeated calls will return the same object.

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/constraints/MetadataConstraints.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/constraints/MetadataConstraints.java b/server/base/src/main/java/org/apache/accumulo/server/constraints/MetadataConstraints.java
index fd5af14..7815a3d 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/constraints/MetadataConstraints.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/constraints/MetadataConstraints.java
@@ -64,12 +64,12 @@ public class MetadataConstraints implements Constraint {
     }
   }
 
-  private static final HashSet<ColumnFQ> validColumnQuals = new HashSet<ColumnFQ>(Arrays.asList(TabletsSection.TabletColumnFamily.PREV_ROW_COLUMN,
+  private static final HashSet<ColumnFQ> validColumnQuals = new HashSet<>(Arrays.asList(TabletsSection.TabletColumnFamily.PREV_ROW_COLUMN,
       TabletsSection.TabletColumnFamily.OLD_PREV_ROW_COLUMN, TabletsSection.ServerColumnFamily.DIRECTORY_COLUMN,
       TabletsSection.TabletColumnFamily.SPLIT_RATIO_COLUMN, TabletsSection.ServerColumnFamily.TIME_COLUMN, TabletsSection.ServerColumnFamily.LOCK_COLUMN,
       TabletsSection.ServerColumnFamily.FLUSH_COLUMN, TabletsSection.ServerColumnFamily.COMPACT_COLUMN));
 
-  private static final HashSet<Text> validColumnFams = new HashSet<Text>(Arrays.asList(TabletsSection.BulkFileColumnFamily.NAME, LogColumnFamily.NAME,
+  private static final HashSet<Text> validColumnFams = new HashSet<>(Arrays.asList(TabletsSection.BulkFileColumnFamily.NAME, LogColumnFamily.NAME,
       ScanFileColumnFamily.NAME, DataFileColumnFamily.NAME, TabletsSection.CurrentLocationColumnFamily.NAME, TabletsSection.LastLocationColumnFamily.NAME,
       TabletsSection.FutureLocationColumnFamily.NAME, ChoppedColumnFamily.NAME, ClonedColumnFamily.NAME));
 
@@ -86,7 +86,7 @@ public class MetadataConstraints implements Constraint {
 
   static private ArrayList<Short> addViolation(ArrayList<Short> lst, int violation) {
     if (lst == null)
-      lst = new ArrayList<Short>();
+      lst = new ArrayList<>();
     lst.add((short) violation);
     return lst;
   }
@@ -194,8 +194,8 @@ public class MetadataConstraints implements Constraint {
           // See ACCUMULO-1230.
           boolean isLocationMutation = false;
 
-          HashSet<Text> dataFiles = new HashSet<Text>();
-          HashSet<Text> loadedFiles = new HashSet<Text>();
+          HashSet<Text> dataFiles = new HashSet<>();
+          HashSet<Text> loadedFiles = new HashSet<>();
 
           String tidString = new String(columnUpdate.getValue(), UTF_8);
           int otherTidCount = 0;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/fs/PerTableVolumeChooser.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/fs/PerTableVolumeChooser.java b/server/base/src/main/java/org/apache/accumulo/server/fs/PerTableVolumeChooser.java
index e51df03..594a0a2 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/fs/PerTableVolumeChooser.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/fs/PerTableVolumeChooser.java
@@ -32,7 +32,7 @@ public class PerTableVolumeChooser implements VolumeChooser {
   private final VolumeChooser fallbackVolumeChooser = new RandomVolumeChooser();
   // TODO Add hint of expected size to construction, see ACCUMULO-3410
   /* Track VolumeChooser instances so they can keep state. */
-  private final ConcurrentHashMap<String,VolumeChooser> tableSpecificChooser = new ConcurrentHashMap<String,VolumeChooser>();
+  private final ConcurrentHashMap<String,VolumeChooser> tableSpecificChooser = new ConcurrentHashMap<>();
   // TODO has to be lazily initialized currently because of the reliance on HdfsZooInstance. see ACCUMULO-3411
   private volatile ServerConfigurationFactory serverConfs;
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/fs/PreferredVolumeChooser.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/fs/PreferredVolumeChooser.java b/server/base/src/main/java/org/apache/accumulo/server/fs/PreferredVolumeChooser.java
index 6bc225f..ec7c360 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/fs/PreferredVolumeChooser.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/fs/PreferredVolumeChooser.java
@@ -43,7 +43,7 @@ import com.google.common.base.Predicate;
  * to selecting from all of the options presented. Can be customized via the table property {@value #PREFERRED_VOLUMES_CUSTOM_KEY}, which should contain a comma
  * separated list of {@link Volume} URIs. Note that both the property name and the format of its value are specific to this particular implementation.
  */
-public class PreferredVolumeChooser extends RandomVolumeChooser implements VolumeChooser {
+public class PreferredVolumeChooser extends RandomVolumeChooser {
   private static final Logger log = LoggerFactory.getLogger(PreferredVolumeChooser.class);
 
   /**
@@ -77,7 +77,7 @@ public class PreferredVolumeChooser extends RandomVolumeChooser implements Volum
       serverConfs = localConf;
     }
     TableConfiguration tableConf = localConf.getTableConfiguration(env.getTableId());
-    final Map<String,String> props = new HashMap<String,String>();
+    final Map<String,String> props = new HashMap<>();
     tableConf.getProperties(props, PREFERRED_VOLUMES_FILTER);
     if (props.isEmpty()) {
       log.warn("No preferred volumes specified. Defaulting to randomly choosing from instance volumes");
@@ -93,12 +93,12 @@ public class PreferredVolumeChooser extends RandomVolumeChooser implements Volum
     // If the preferred volumes property was specified, split the returned string by the comma and add use it to filter the given options.
     Set<String> preferred = parsedPreferredVolumes.get(volumes);
     if (preferred == null) {
-      preferred = new HashSet<String>(Arrays.asList(StringUtils.split(volumes, ',')));
+      preferred = new HashSet<>(Arrays.asList(StringUtils.split(volumes, ',')));
       parsedPreferredVolumes.put(volumes, preferred);
     }
 
     // Only keep the options that are in the preferred set
-    final ArrayList<String> filteredOptions = new ArrayList<String>(Arrays.asList(options));
+    final ArrayList<String> filteredOptions = new ArrayList<>(Arrays.asList(options));
     filteredOptions.retainAll(preferred);
 
     // If there are no preferred volumes left, then warn the user and choose randomly from the instance volumes

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeManagerImpl.java b/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeManagerImpl.java
index 5317485..d9df424 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeManagerImpl.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeManagerImpl.java
@@ -65,7 +65,7 @@ public class VolumeManagerImpl implements VolumeManager {
 
   private static final Logger log = LoggerFactory.getLogger(VolumeManagerImpl.class);
 
-  private static final HashSet<String> WARNED_ABOUT_SYNCONCLOSE = new HashSet<String>();
+  private static final HashSet<String> WARNED_ABOUT_SYNCONCLOSE = new HashSet<>();
 
   private final Map<String,Volume> volumesByName;
   private final Multimap<URI,Volume> volumesByFileSystemUri;
@@ -326,7 +326,7 @@ public class VolumeManagerImpl implements VolumeManager {
   }
 
   public static VolumeManager get(AccumuloConfiguration conf, final Configuration hadoopConf) throws IOException {
-    final Map<String,Volume> volumes = new HashMap<String,Volume>();
+    final Map<String,Volume> volumes = new HashMap<>();
 
     // The "default" Volume for Accumulo (in case no volumes are specified)
     for (String volumeUriOrDir : VolumeConfiguration.getVolumeUris(conf, hadoopConf)) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeUtil.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeUtil.java b/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeUtil.java
index 0c3092b..192ae77 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeUtil.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeUtil.java
@@ -126,7 +126,7 @@ public class VolumeUtil {
     else
       switchedPath = le.filename;
 
-    ArrayList<String> switchedLogs = new ArrayList<String>();
+    ArrayList<String> switchedLogs = new ArrayList<>();
     String switchedLog = switchVolume(le.filename, FileType.WAL, replacements);
     if (switchedLog != null) {
       switchedLogs.add(switchedLog);
@@ -153,8 +153,8 @@ public class VolumeUtil {
     public SortedMap<FileRef,DataFileValue> datafiles;
 
     public TabletFiles() {
-      logEntries = new ArrayList<LogEntry>();
-      datafiles = new TreeMap<FileRef,DataFileValue>();
+      logEntries = new ArrayList<>();
+      datafiles = new TreeMap<>();
     }
 
     public TabletFiles(String dir, List<LogEntry> logEntries, SortedMap<FileRef,DataFileValue> datafiles) {
@@ -183,11 +183,11 @@ public class VolumeUtil {
     List<Pair<Path,Path>> replacements = ServerConstants.getVolumeReplacements();
     log.trace("Using volume replacements: " + replacements);
 
-    List<LogEntry> logsToRemove = new ArrayList<LogEntry>();
-    List<LogEntry> logsToAdd = new ArrayList<LogEntry>();
+    List<LogEntry> logsToRemove = new ArrayList<>();
+    List<LogEntry> logsToAdd = new ArrayList<>();
 
-    List<FileRef> filesToRemove = new ArrayList<FileRef>();
-    SortedMap<FileRef,DataFileValue> filesToAdd = new TreeMap<FileRef,DataFileValue>();
+    List<FileRef> filesToRemove = new ArrayList<>();
+    SortedMap<FileRef,DataFileValue> filesToAdd = new TreeMap<>();
 
     TabletFiles ret = new TabletFiles();
 
@@ -345,7 +345,7 @@ public class VolumeUtil {
   }
 
   private static HashSet<String> getFileNames(FileStatus[] filesStatuses) {
-    HashSet<String> names = new HashSet<String>();
+    HashSet<String> names = new HashSet<>();
     for (FileStatus fileStatus : filesStatuses)
       if (fileStatus.isDirectory())
         throw new IllegalArgumentException("expected " + fileStatus.getPath() + " to be a file");

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java b/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java
index 5a4cac1..0ccf51f 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java
@@ -155,9 +155,9 @@ public class Initialize implements KeywordExecutable {
     return zoo;
   }
 
-  private static HashMap<String,String> initialMetadataConf = new HashMap<String,String>();
-  private static HashMap<String,String> initialMetadataCombinerConf = new HashMap<String,String>();
-  private static HashMap<String,String> initialReplicationTableConf = new HashMap<String,String>();
+  private static HashMap<String,String> initialMetadataConf = new HashMap<>();
+  private static HashMap<String,String> initialMetadataCombinerConf = new HashMap<>();
+  private static HashMap<String,String> initialReplicationTableConf = new HashMap<>();
 
   static {
     initialMetadataConf.put(Property.TABLE_FILE_COMPRESSED_BLOCK_SIZE.getKey(), "32K");
@@ -575,7 +575,8 @@ public class Initialize implements KeywordExecutable {
       if (opts.clearInstanceName) {
         exists = false;
         break;
-      } else if (exists = zoo.exists(instanceNamePath)) {
+      } else if (zoo.exists(instanceNamePath)) {
+        exists = true;
         String decision = getConsoleReader().readLine("Instance name \"" + instanceName + "\" exists. Delete existing entry from zookeeper? [Y/N] : ");
         if (decision == null)
           System.exit(0);
@@ -696,10 +697,10 @@ public class Initialize implements KeywordExecutable {
 
     String[] volumeURIs = VolumeConfiguration.getVolumeUris(SiteConfiguration.getInstance());
 
-    HashSet<String> initializedDirs = new HashSet<String>();
+    HashSet<String> initializedDirs = new HashSet<>();
     initializedDirs.addAll(Arrays.asList(ServerConstants.checkBaseUris(volumeURIs, true)));
 
-    HashSet<String> uinitializedDirs = new HashSet<String>();
+    HashSet<String> uinitializedDirs = new HashSet<>();
     uinitializedDirs.addAll(Arrays.asList(volumeURIs));
     uinitializedDirs.removeAll(initializedDirs);
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/iterators/MetadataBulkLoadFilter.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/iterators/MetadataBulkLoadFilter.java b/server/base/src/main/java/org/apache/accumulo/server/iterators/MetadataBulkLoadFilter.java
index 772be32..3a76442 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/iterators/MetadataBulkLoadFilter.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/iterators/MetadataBulkLoadFilter.java
@@ -82,7 +82,7 @@ public class MetadataBulkLoadFilter extends Filter {
       throw new IOException("This iterator not intended for use at scan time");
     }
 
-    bulkTxStatusCache = new HashMap<Long,MetadataBulkLoadFilter.Status>();
+    bulkTxStatusCache = new HashMap<>();
     arbitrator = getArbitrator();
   }
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java b/server/base/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java
index 0c0cceb..46f5f8b 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java
@@ -205,15 +205,15 @@ public class LiveTServerSet implements Watcher {
       this.connection = connection;
       this.instance = instance;
     }
-  };
+  }
 
   // The set of active tservers with locks, indexed by their name in zookeeper
-  private Map<String,TServerInfo> current = new HashMap<String,TServerInfo>();
+  private Map<String,TServerInfo> current = new HashMap<>();
   // as above, indexed by TServerInstance
-  private Map<TServerInstance,TServerInfo> currentInstances = new HashMap<TServerInstance,TServerInfo>();
+  private Map<TServerInstance,TServerInfo> currentInstances = new HashMap<>();
 
   // The set of entries in zookeeper without locks, and the first time each was noticed
-  private Map<String,Long> locklessServers = new HashMap<String,Long>();
+  private Map<String,Long> locklessServers = new HashMap<>();
 
   public LiveTServerSet(ClientContext context, Listener cback) {
     this.cback = cback;
@@ -238,12 +238,12 @@ public class LiveTServerSet implements Watcher {
 
   public synchronized void scanServers() {
     try {
-      final Set<TServerInstance> updates = new HashSet<TServerInstance>();
-      final Set<TServerInstance> doomed = new HashSet<TServerInstance>();
+      final Set<TServerInstance> updates = new HashSet<>();
+      final Set<TServerInstance> doomed = new HashSet<>();
 
       final String path = ZooUtil.getRoot(context.getInstance()) + Constants.ZTSERVERS;
 
-      HashSet<String> all = new HashSet<String>(current.keySet());
+      HashSet<String> all = new HashSet<>(current.keySet());
       all.addAll(getZooCache().getChildren(path));
 
       locklessServers.keySet().retainAll(all);
@@ -332,8 +332,8 @@ public class LiveTServerSet implements Watcher {
 
           String server = event.getPath().substring(pos + 1);
 
-          final Set<TServerInstance> updates = new HashSet<TServerInstance>();
-          final Set<TServerInstance> doomed = new HashSet<TServerInstance>();
+          final Set<TServerInstance> updates = new HashSet<>();
+          final Set<TServerInstance> doomed = new HashSet<>();
 
           final String path = ZooUtil.getRoot(context.getInstance()) + Constants.ZTSERVERS;
 
@@ -359,7 +359,7 @@ public class LiveTServerSet implements Watcher {
   }
 
   public synchronized Set<TServerInstance> getCurrentServers() {
-    return new HashSet<TServerInstance>(currentInstances.keySet());
+    return new HashSet<>(currentInstances.keySet());
   }
 
   public synchronized int size() {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/master/balancer/ChaoticLoadBalancer.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/balancer/ChaoticLoadBalancer.java b/server/base/src/main/java/org/apache/accumulo/server/master/balancer/ChaoticLoadBalancer.java
index fd3dfd8..112fcc1 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/master/balancer/ChaoticLoadBalancer.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/master/balancer/ChaoticLoadBalancer.java
@@ -69,8 +69,8 @@ public class ChaoticLoadBalancer extends TabletBalancer {
       Map<KeyExtent,TServerInstance> assignments) {
     long total = assignments.size() + unassigned.size();
     long avg = (long) Math.ceil(((double) total) / current.size());
-    Map<TServerInstance,Long> toAssign = new HashMap<TServerInstance,Long>();
-    List<TServerInstance> tServerArray = new ArrayList<TServerInstance>();
+    Map<TServerInstance,Long> toAssign = new HashMap<>();
+    List<TServerInstance> tServerArray = new ArrayList<>();
     for (Entry<TServerInstance,TabletServerStatus> e : current.entrySet()) {
       long numTablets = 0;
       for (TableInfo ti : e.getValue().getTableMap().values()) {
@@ -105,8 +105,8 @@ public class ChaoticLoadBalancer extends TabletBalancer {
 
   @Override
   public long balance(SortedMap<TServerInstance,TabletServerStatus> current, Set<KeyExtent> migrations, List<TabletMigration> migrationsOut) {
-    Map<TServerInstance,Long> numTablets = new HashMap<TServerInstance,Long>();
-    List<TServerInstance> underCapacityTServer = new ArrayList<TServerInstance>();
+    Map<TServerInstance,Long> numTablets = new HashMap<>();
+    List<TServerInstance> underCapacityTServer = new ArrayList<>();
 
     if (!migrations.isEmpty()) {
       outstandingMigrations.migrations = migrations;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/master/balancer/DefaultLoadBalancer.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/balancer/DefaultLoadBalancer.java b/server/base/src/main/java/org/apache/accumulo/server/master/balancer/DefaultLoadBalancer.java
index 56b3839..c31eb37 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/master/balancer/DefaultLoadBalancer.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/master/balancer/DefaultLoadBalancer.java
@@ -53,7 +53,7 @@ public class DefaultLoadBalancer extends TabletBalancer {
   }
 
   List<TServerInstance> randomize(Set<TServerInstance> locations) {
-    List<TServerInstance> result = new ArrayList<TServerInstance>(locations);
+    List<TServerInstance> result = new ArrayList<>(locations);
     Collections.shuffle(result);
     return result;
   }
@@ -123,11 +123,11 @@ public class DefaultLoadBalancer extends TabletBalancer {
       if (current.size() < 2) {
         return false;
       }
-      final Map<String,Map<KeyExtent,TabletStats>> donerTabletStats = new HashMap<String,Map<KeyExtent,TabletStats>>();
+      final Map<String,Map<KeyExtent,TabletStats>> donerTabletStats = new HashMap<>();
 
       // Sort by total number of online tablets, per server
       int total = 0;
-      ArrayList<ServerCounts> totals = new ArrayList<ServerCounts>();
+      ArrayList<ServerCounts> totals = new ArrayList<>();
       for (Entry<TServerInstance,TabletServerStatus> entry : current.entrySet()) {
         int serverTotal = 0;
         if (entry.getValue() != null && entry.getValue().tableMap != null) {
@@ -197,7 +197,7 @@ public class DefaultLoadBalancer extends TabletBalancer {
    */
   List<TabletMigration> move(ServerCounts tooMuch, ServerCounts tooLittle, int count, Map<String,Map<KeyExtent,TabletStats>> donerTabletStats) {
 
-    List<TabletMigration> result = new ArrayList<TabletMigration>();
+    List<TabletMigration> result = new ArrayList<>();
     if (count == 0)
       return result;
 
@@ -235,7 +235,7 @@ public class DefaultLoadBalancer extends TabletBalancer {
       Map<KeyExtent,TabletStats> onlineTabletsForTable = donerTabletStats.get(table);
       try {
         if (onlineTabletsForTable == null) {
-          onlineTabletsForTable = new HashMap<KeyExtent,TabletStats>();
+          onlineTabletsForTable = new HashMap<>();
           List<TabletStats> stats = getOnlineTabletsForTable(tooMuch.server, table);
           if (null == stats) {
             log.warn("Unable to find tablets to move");
@@ -271,7 +271,7 @@ public class DefaultLoadBalancer extends TabletBalancer {
   }
 
   static Map<String,Integer> tabletCountsPerTable(TabletServerStatus status) {
-    Map<String,Integer> result = new HashMap<String,Integer>();
+    Map<String,Integer> result = new HashMap<>();
     if (status != null && status.tableMap != null) {
       Map<String,TableInfo> tableMap = status.tableMap;
       for (Entry<String,TableInfo> entry : tableMap.entrySet()) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/master/balancer/GroupBalancer.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/balancer/GroupBalancer.java b/server/base/src/main/java/org/apache/accumulo/server/master/balancer/GroupBalancer.java
index b2b2ed5..1838536 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/master/balancer/GroupBalancer.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/master/balancer/GroupBalancer.java
@@ -145,7 +145,7 @@ public abstract class GroupBalancer extends TabletBalancer {
         }
       }
 
-      tabletsByGroup.add(new ComparablePair<String,KeyExtent>(partitioner.apply(entry.getKey()), entry.getKey()));
+      tabletsByGroup.add(new ComparablePair<>(partitioner.apply(entry.getKey()), entry.getKey()));
     }
 
     Collections.sort(tabletsByGroup);
@@ -528,7 +528,7 @@ public abstract class GroupBalancer extends TabletBalancer {
             if (srcTgi.getExtras().size() <= maxExtraGroups) {
               serversToRemove.add(srcTgi.getTserverInstance());
             } else {
-              serversGroupsToRemove.add(new Pair<String,TServerInstance>(group, srcTgi.getTserverInstance()));
+              serversGroupsToRemove.add(new Pair<>(group, srcTgi.getTserverInstance()));
             }
 
             if (destTgi.getExtras().size() >= maxExtraGroups || moves.size() >= getMaxMigrations()) {
@@ -593,7 +593,7 @@ public abstract class GroupBalancer extends TabletBalancer {
             moves.move(group, 1, srcTgi, destTgi);
 
             if (num == 2) {
-              serversToRemove.add(new Pair<String,TserverGroupInfo>(group, srcTgi));
+              serversToRemove.add(new Pair<>(group, srcTgi));
             }
 
             if (destTgi.getExtras().size() >= maxExtraGroups || moves.size() >= getMaxMigrations()) {
@@ -655,7 +655,7 @@ public abstract class GroupBalancer extends TabletBalancer {
             if (srcTgi.getExtras().size() <= expectedExtra) {
               emptyServers.add(srcTgi.getTserverInstance());
             } else if (srcTgi.getExtras().get(group) == null) {
-              emptyServerGroups.add(new Pair<String,TServerInstance>(group, srcTgi.getTserverInstance()));
+              emptyServerGroups.add(new Pair<>(group, srcTgi.getTserverInstance()));
             }
 
             if (destTgi.getExtras().size() >= expectedExtra || moves.size() >= getMaxMigrations()) {
@@ -761,7 +761,7 @@ public abstract class GroupBalancer extends TabletBalancer {
         }
       }
 
-      return new Pair<KeyExtent,Location>(extent, loc);
+      return new Pair<>(extent, loc);
     }
 
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancer.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancer.java b/server/base/src/main/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancer.java
index 0506b5c..0fd217c 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancer.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancer.java
@@ -89,7 +89,7 @@ public class HostRegexTableLoadBalancer extends TableLoadBalancer implements Con
   private volatile long lastOOBCheck = System.currentTimeMillis();
   private volatile long lastPoolRecheck = 0;
   private boolean isIpBasedRegex = false;
-  private Map<String,SortedMap<TServerInstance,TabletServerStatus>> pools = new HashMap<String,SortedMap<TServerInstance,TabletServerStatus>>();
+  private Map<String,SortedMap<TServerInstance,TabletServerStatus>> pools = new HashMap<>();
   private int maxTServerMigrations = HOST_BALANCER_REGEX_MAX_MIGRATIONS_DEFAULT;
 
   /**
@@ -103,13 +103,13 @@ public class HostRegexTableLoadBalancer extends TableLoadBalancer implements Con
   protected synchronized Map<String,SortedMap<TServerInstance,TabletServerStatus>> splitCurrentByRegex(SortedMap<TServerInstance,TabletServerStatus> current) {
     if ((System.currentTimeMillis() - lastPoolRecheck) > poolRecheckMillis) {
       LOG.debug("Performing pool recheck - regrouping tablet servers based on regular expressions");
-      Map<String,SortedMap<TServerInstance,TabletServerStatus>> newPools = new HashMap<String,SortedMap<TServerInstance,TabletServerStatus>>();
+      Map<String,SortedMap<TServerInstance,TabletServerStatus>> newPools = new HashMap<>();
       for (Entry<TServerInstance,TabletServerStatus> e : current.entrySet()) {
         List<String> poolNames = getPoolNamesForHost(e.getKey().host());
         for (String pool : poolNames) {
           SortedMap<TServerInstance,TabletServerStatus> np = newPools.get(pool);
           if (null == np) {
-            np = new TreeMap<TServerInstance,TabletServerStatus>(current.comparator());
+            np = new TreeMap<>(current.comparator());
             newPools.put(pool, np);
           }
           np.put(e.getKey(), e.getValue());
@@ -265,18 +265,18 @@ public class HostRegexTableLoadBalancer extends TableLoadBalancer implements Con
 
     Map<String,SortedMap<TServerInstance,TabletServerStatus>> pools = splitCurrentByRegex(current);
     // group the unassigned into tables
-    Map<String,Map<KeyExtent,TServerInstance>> groupedUnassigned = new HashMap<String,Map<KeyExtent,TServerInstance>>();
+    Map<String,Map<KeyExtent,TServerInstance>> groupedUnassigned = new HashMap<>();
     for (Entry<KeyExtent,TServerInstance> e : unassigned.entrySet()) {
       Map<KeyExtent,TServerInstance> tableUnassigned = groupedUnassigned.get(e.getKey().getTableId());
       if (tableUnassigned == null) {
-        tableUnassigned = new HashMap<KeyExtent,TServerInstance>();
+        tableUnassigned = new HashMap<>();
         groupedUnassigned.put(e.getKey().getTableId(), tableUnassigned);
       }
       tableUnassigned.put(e.getKey(), e.getValue());
     }
     // Send a view of the current servers to the tables tablet balancer
     for (Entry<String,Map<KeyExtent,TServerInstance>> e : groupedUnassigned.entrySet()) {
-      Map<KeyExtent,TServerInstance> newAssignments = new HashMap<KeyExtent,TServerInstance>();
+      Map<KeyExtent,TServerInstance> newAssignments = new HashMap<>();
       String tableName = tableIdToTableName.get(e.getKey());
       String poolName = getPoolNameForTable(tableName);
       SortedMap<TServerInstance,TabletServerStatus> currentView = pools.get(poolName);
@@ -377,7 +377,7 @@ public class HostRegexTableLoadBalancer extends TableLoadBalancer implements Con
             this.poolRecheckMillis);
         continue;
       }
-      ArrayList<TabletMigration> newMigrations = new ArrayList<TabletMigration>();
+      ArrayList<TabletMigration> newMigrations = new ArrayList<>();
       long tableBalanceTime = getBalancerForTable(s).balance(currentView, migrations, newMigrations);
       if (tableBalanceTime < minBalanceTime) {
         minBalanceTime = tableBalanceTime;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/master/balancer/TableLoadBalancer.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/balancer/TableLoadBalancer.java b/server/base/src/main/java/org/apache/accumulo/server/master/balancer/TableLoadBalancer.java
index 4bae545..de3f4f7 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/master/balancer/TableLoadBalancer.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/master/balancer/TableLoadBalancer.java
@@ -43,7 +43,7 @@ public class TableLoadBalancer extends TabletBalancer {
 
   private static final Logger log = LoggerFactory.getLogger(TableLoadBalancer.class);
 
-  Map<String,TabletBalancer> perTableBalancers = new HashMap<String,TabletBalancer>();
+  Map<String,TabletBalancer> perTableBalancers = new HashMap<>();
 
   private TabletBalancer constructNewBalancerForTable(String clazzName, String table) throws Exception {
     String context = null;
@@ -114,17 +114,17 @@ public class TableLoadBalancer extends TabletBalancer {
   public void getAssignments(SortedMap<TServerInstance,TabletServerStatus> current, Map<KeyExtent,TServerInstance> unassigned,
       Map<KeyExtent,TServerInstance> assignments) {
     // separate the unassigned into tables
-    Map<String,Map<KeyExtent,TServerInstance>> groupedUnassigned = new HashMap<String,Map<KeyExtent,TServerInstance>>();
+    Map<String,Map<KeyExtent,TServerInstance>> groupedUnassigned = new HashMap<>();
     for (Entry<KeyExtent,TServerInstance> e : unassigned.entrySet()) {
       Map<KeyExtent,TServerInstance> tableUnassigned = groupedUnassigned.get(e.getKey().getTableId());
       if (tableUnassigned == null) {
-        tableUnassigned = new HashMap<KeyExtent,TServerInstance>();
+        tableUnassigned = new HashMap<>();
         groupedUnassigned.put(e.getKey().getTableId(), tableUnassigned);
       }
       tableUnassigned.put(e.getKey(), e.getValue());
     }
     for (Entry<String,Map<KeyExtent,TServerInstance>> e : groupedUnassigned.entrySet()) {
-      Map<KeyExtent,TServerInstance> newAssignments = new HashMap<KeyExtent,TServerInstance>();
+      Map<KeyExtent,TServerInstance> newAssignments = new HashMap<>();
       getBalancerForTable(e.getKey()).getAssignments(current, e.getValue(), newAssignments);
       assignments.putAll(newAssignments);
     }
@@ -152,7 +152,7 @@ public class TableLoadBalancer extends TabletBalancer {
     if (t == null)
       return minBalanceTime;
     for (String s : t.tableIdMap().values()) {
-      ArrayList<TabletMigration> newMigrations = new ArrayList<TabletMigration>();
+      ArrayList<TabletMigration> newMigrations = new ArrayList<>();
       long tableBalanceTime = getBalancerForTable(s).balance(current, migrations, newMigrations);
       if (tableBalanceTime < minBalanceTime)
         minBalanceTime = tableBalanceTime;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/master/balancer/TabletBalancer.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/balancer/TabletBalancer.java b/server/base/src/main/java/org/apache/accumulo/server/master/balancer/TabletBalancer.java
index a199288..a160bb0 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/master/balancer/TabletBalancer.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/master/balancer/TabletBalancer.java
@@ -213,7 +213,7 @@ public abstract class TabletBalancer {
    * @return A list of TabletMigration object that passed sanity checks.
    */
   public static List<TabletMigration> checkMigrationSanity(Set<TServerInstance> current, List<TabletMigration> migrations) {
-    List<TabletMigration> result = new ArrayList<TabletMigration>(migrations.size());
+    List<TabletMigration> result = new ArrayList<>(migrations.size());
     for (TabletMigration m : migrations) {
       if (m.tablet == null) {
         log.warn("Balancer gave back a null tablet " + m);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/master/state/DeadServerList.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/state/DeadServerList.java b/server/base/src/main/java/org/apache/accumulo/server/master/state/DeadServerList.java
index 3cd2517..0be5f45 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/master/state/DeadServerList.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/master/state/DeadServerList.java
@@ -46,7 +46,7 @@ public class DeadServerList {
   }
 
   public List<DeadServer> getList() {
-    List<DeadServer> result = new ArrayList<DeadServer>();
+    List<DeadServer> result = new ArrayList<>();
     IZooReaderWriter zoo = ZooReaderWriter.getInstance();
     try {
       List<String> children = zoo.getChildren(path);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/master/state/MetaDataTableScanner.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/state/MetaDataTableScanner.java b/server/base/src/main/java/org/apache/accumulo/server/master/state/MetaDataTableScanner.java
index 536e1a5..14486a6 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/master/state/MetaDataTableScanner.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/master/state/MetaDataTableScanner.java
@@ -137,7 +137,7 @@ public class MetaDataTableScanner implements ClosableIterator<TabletLocationStat
     TServerInstance current = null;
     TServerInstance last = null;
     long lastTimestamp = 0;
-    List<Collection<String>> walogs = new ArrayList<Collection<String>>();
+    List<Collection<String>> walogs = new ArrayList<>();
     boolean chopped = false;
 
     for (Entry<Key,Value> entry : decodedRow.entrySet()) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/master/state/TabletServerState.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/state/TabletServerState.java b/server/base/src/main/java/org/apache/accumulo/server/master/state/TabletServerState.java
index 942eabf..d618d8b 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/master/state/TabletServerState.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/master/state/TabletServerState.java
@@ -45,8 +45,8 @@ public enum TabletServerState {
   private static HashSet<TabletServerState> badStates;
 
   static {
-    mapping = new HashMap<Byte,TabletServerState>(TabletServerState.values().length);
-    badStates = new HashSet<TabletServerState>();
+    mapping = new HashMap<>(TabletServerState.values().length);
+    badStates = new HashSet<>();
     for (TabletServerState state : TabletServerState.values()) {
       mapping.put(state.id, state);
       if (state.id > 99)

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/master/state/TabletStateChangeIterator.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/state/TabletStateChangeIterator.java b/server/base/src/main/java/org/apache/accumulo/server/master/state/TabletStateChangeIterator.java
index 26d98a8..973bbd2 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/master/state/TabletStateChangeIterator.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/master/state/TabletStateChangeIterator.java
@@ -90,7 +90,7 @@ public class TabletStateChangeIterator extends SkippingIterator {
     if (migrations == null)
       return Collections.emptySet();
     try {
-      Set<KeyExtent> result = new HashSet<KeyExtent>();
+      Set<KeyExtent> result = new HashSet<>();
       DataInputBuffer buffer = new DataInputBuffer();
       byte[] data = Base64.decodeBase64(migrations.getBytes(UTF_8));
       buffer.reset(data, data.length);
@@ -108,7 +108,7 @@ public class TabletStateChangeIterator extends SkippingIterator {
   private Set<String> parseTables(String tables) {
     if (tables == null)
       return null;
-    Set<String> result = new HashSet<String>();
+    Set<String> result = new HashSet<>();
     for (String table : tables.split(","))
       result.add(table);
     return result;
@@ -118,7 +118,7 @@ public class TabletStateChangeIterator extends SkippingIterator {
     if (servers == null)
       return null;
     // parse "host:port[INSTANCE]"
-    Set<TServerInstance> result = new HashSet<TServerInstance>();
+    Set<TServerInstance> result = new HashSet<>();
     if (servers.length() > 0) {
       for (String part : servers.split(",")) {
         String parts[] = part.split("\\[", 2);
@@ -136,7 +136,7 @@ public class TabletStateChangeIterator extends SkippingIterator {
     if (merges == null)
       return null;
     try {
-      Map<String,MergeInfo> result = new HashMap<String,MergeInfo>();
+      Map<String,MergeInfo> result = new HashMap<>();
       DataInputBuffer buffer = new DataInputBuffer();
       byte[] data = Base64.decodeBase64(merges.getBytes(UTF_8));
       buffer.reset(data, data.length);
@@ -215,7 +215,7 @@ public class TabletStateChangeIterator extends SkippingIterator {
 
   public static void setCurrentServers(IteratorSetting cfg, Set<TServerInstance> goodServers) {
     if (goodServers != null) {
-      List<String> servers = new ArrayList<String>();
+      List<String> servers = new ArrayList<>();
       for (TServerInstance server : goodServers)
         servers.add(server.toString());
       cfg.addOption(SERVERS_OPTION, Joiner.on(",").join(servers));
@@ -262,7 +262,7 @@ public class TabletStateChangeIterator extends SkippingIterator {
 
   public static void setShuttingDown(IteratorSetting cfg, Set<TServerInstance> servers) {
     if (servers != null) {
-      List<String> serverList = new ArrayList<String>();
+      List<String> serverList = new ArrayList<>();
       for (TServerInstance server : servers) {
         serverList.add(server.toString());
       }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/master/state/ZooTabletStateStore.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/state/ZooTabletStateStore.java b/server/base/src/main/java/org/apache/accumulo/server/master/state/ZooTabletStateStore.java
index 720046f..8f92db5 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/master/state/ZooTabletStateStore.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/master/state/ZooTabletStateStore.java
@@ -84,7 +84,7 @@ public class ZooTabletStateStore extends TabletStateStore {
             currentSession = parse(current);
             futureSession = null;
           }
-          List<Collection<String>> logs = new ArrayList<Collection<String>>();
+          List<Collection<String>> logs = new ArrayList<>();
           for (String entry : store.getChildren(RootTable.ZROOT_TABLET_WALOGS)) {
             byte[] logInfo = store.get(RootTable.ZROOT_TABLET_WALOGS + "/" + entry);
             if (logInfo != null) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/master/tableOps/UserCompactionConfig.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/tableOps/UserCompactionConfig.java b/server/base/src/main/java/org/apache/accumulo/server/master/tableOps/UserCompactionConfig.java
index 02c6ac3..def0696 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/master/tableOps/UserCompactionConfig.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/master/tableOps/UserCompactionConfig.java
@@ -89,7 +89,7 @@ public class UserCompactionConfig implements Writable {
     }
 
     int num = in.readInt();
-    iterators = new ArrayList<IteratorSetting>(num);
+    iterators = new ArrayList<>(num);
 
     for (int i = 0; i < num; i++) {
       iterators.add(new IteratorSetting(in));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/metrics/AbstractMetricsImpl.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/metrics/AbstractMetricsImpl.java b/server/base/src/main/java/org/apache/accumulo/server/metrics/AbstractMetricsImpl.java
index 42d2d00..24a9750 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/metrics/AbstractMetricsImpl.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/metrics/AbstractMetricsImpl.java
@@ -93,7 +93,7 @@ public abstract class AbstractMetricsImpl implements Metrics {
 
   static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(AbstractMetricsImpl.class);
 
-  private static ConcurrentHashMap<String,Metric> registry = new ConcurrentHashMap<String,Metric>();
+  private static ConcurrentHashMap<String,Metric> registry = new ConcurrentHashMap<>();
 
   private boolean currentlyLogging = false;
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/monitor/LogService.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/monitor/LogService.java b/server/base/src/main/java/org/apache/accumulo/server/monitor/LogService.java
index fce1ca9..d59267a 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/monitor/LogService.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/monitor/LogService.java
@@ -181,7 +181,7 @@ public class LogService extends org.apache.log4j.AppenderSkeleton {
   }
 
   synchronized public List<DedupedLogEvent> getEvents() {
-    return new ArrayList<DedupedLogEvent>(events.values());
+    return new ArrayList<>(events.values());
   }
 
   synchronized public void clear() {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/problems/ProblemReports.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/problems/ProblemReports.java b/server/base/src/main/java/org/apache/accumulo/server/problems/ProblemReports.java
index d44efb1..82e9f5b 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/problems/ProblemReports.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/problems/ProblemReports.java
@@ -305,12 +305,12 @@ public class ProblemReports implements Iterable<ProblemReport> {
 
   public Map<String,Map<ProblemType,Integer>> summarize() {
 
-    TreeMap<String,Map<ProblemType,Integer>> summary = new TreeMap<String,Map<ProblemType,Integer>>();
+    TreeMap<String,Map<ProblemType,Integer>> summary = new TreeMap<>();
 
     for (ProblemReport pr : this) {
       Map<ProblemType,Integer> tableProblems = summary.get(pr.getTableName());
       if (tableProblems == null) {
-        tableProblems = new EnumMap<ProblemType,Integer>(ProblemType.class);
+        tableProblems = new EnumMap<>(ProblemType.class);
         summary.put(pr.getTableName(), tableProblems);
       }
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/replication/StatusCombiner.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/replication/StatusCombiner.java b/server/base/src/main/java/org/apache/accumulo/server/replication/StatusCombiner.java
index aacf64d..84e4742 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/replication/StatusCombiner.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/replication/StatusCombiner.java
@@ -45,7 +45,7 @@ import com.google.protobuf.InvalidProtocolBufferException;
 public class StatusCombiner extends TypedValueCombiner<Status> {
   private static final Logger log = LoggerFactory.getLogger(StatusCombiner.class);
 
-  public static class StatusEncoder extends AbstractEncoder<Status> implements Encoder<Status> {
+  public static class StatusEncoder extends AbstractEncoder<Status> {
     private static final Logger log = LoggerFactory.getLogger(StatusEncoder.class);
 
     @Override

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/rpc/RpcWrapper.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/rpc/RpcWrapper.java b/server/base/src/main/java/org/apache/accumulo/server/rpc/RpcWrapper.java
index ec68166..b942913 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/rpc/RpcWrapper.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/rpc/RpcWrapper.java
@@ -106,7 +106,7 @@ public class RpcWrapper {
     isOnewayMethod.setAccessible(true);
 
     try {
-      final Set<String> onewayMethods = new HashSet<String>();
+      final Set<String> onewayMethods = new HashSet<>();
       for (Entry<String,?> entry : processorView.entrySet()) {
         try {
           if ((Boolean) isOnewayMethod.invoke(entry.getValue())) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/rpc/TCredentialsUpdatingWrapper.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/rpc/TCredentialsUpdatingWrapper.java b/server/base/src/main/java/org/apache/accumulo/server/rpc/TCredentialsUpdatingWrapper.java
index 698cf9e..54f61dd 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/rpc/TCredentialsUpdatingWrapper.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/rpc/TCredentialsUpdatingWrapper.java
@@ -29,7 +29,7 @@ import org.apache.accumulo.core.conf.AccumuloConfiguration;
 public class TCredentialsUpdatingWrapper {
 
   public static <T> T service(final T instance, final Class<? extends T> originalClass, AccumuloConfiguration conf) {
-    InvocationHandler handler = new TCredentialsUpdatingInvocationHandler<T>(instance, conf);
+    InvocationHandler handler = new TCredentialsUpdatingInvocationHandler<>(instance, conf);
 
     @SuppressWarnings("unchecked")
     T proxiedInstance = (T) Proxy.newProxyInstance(originalClass.getClassLoader(), originalClass.getInterfaces(), handler);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/rpc/TServerUtils.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/rpc/TServerUtils.java b/server/base/src/main/java/org/apache/accumulo/server/rpc/TServerUtils.java
index f874353..49995d6 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/rpc/TServerUtils.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/rpc/TServerUtils.java
@@ -71,7 +71,7 @@ public class TServerUtils {
   /**
    * Static instance, passed to {@link ClientInfoProcessorFactory}, which will contain the client address of any incoming RPC.
    */
-  public static final ThreadLocal<String> clientAddress = new ThreadLocal<String>();
+  public static final ThreadLocal<String> clientAddress = new ThreadLocal<>();
 
   /**
    *
@@ -339,7 +339,7 @@ public class TServerUtils {
 
       // Be nice for the user and automatically remove protocols that might not exist in their JVM. Keeps us from forcing config alterations too
       // e.g. TLSv1.1 and TLSv1.2 don't exist in JDK6
-      Set<String> socketEnabledProtocols = new HashSet<String>(Arrays.asList(sslServerSock.getEnabledProtocols()));
+      Set<String> socketEnabledProtocols = new HashSet<>(Arrays.asList(sslServerSock.getEnabledProtocols()));
       // Keep only the enabled protocols that were specified by the configuration
       socketEnabledProtocols.retainAll(Arrays.asList(protocols));
       if (socketEnabledProtocols.isEmpty()) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/rpc/UGIAssumingProcessor.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/rpc/UGIAssumingProcessor.java b/server/base/src/main/java/org/apache/accumulo/server/rpc/UGIAssumingProcessor.java
index 48d18f4..27f15c7 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/rpc/UGIAssumingProcessor.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/rpc/UGIAssumingProcessor.java
@@ -40,8 +40,8 @@ import org.slf4j.LoggerFactory;
 public class UGIAssumingProcessor implements TProcessor {
   private static final Logger log = LoggerFactory.getLogger(UGIAssumingProcessor.class);
 
-  public static final ThreadLocal<String> rpcPrincipal = new ThreadLocal<String>();
-  public static final ThreadLocal<SaslMechanism> rpcMechanism = new ThreadLocal<SaslMechanism>();
+  public static final ThreadLocal<String> rpcPrincipal = new ThreadLocal<>();
+  public static final ThreadLocal<SaslMechanism> rpcMechanism = new ThreadLocal<>();
 
   private final TProcessor wrapped;
   private final UserGroupInformation loginUser;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/security/AuditedSecurityOperation.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/security/AuditedSecurityOperation.java b/server/base/src/main/java/org/apache/accumulo/server/security/AuditedSecurityOperation.java
index 7fc9d81..e5ca006 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/security/AuditedSecurityOperation.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/security/AuditedSecurityOperation.java
@@ -130,7 +130,7 @@ public class AuditedSecurityOperation extends SecurityOperation {
   private static final int MAX_ELEMENTS_TO_LOG = 10;
 
   private static List<String> truncate(Collection<?> list) {
-    List<String> result = new ArrayList<String>();
+    List<String> result = new ArrayList<>();
     int i = 0;
     for (Object obj : list) {
       if (i++ > MAX_ELEMENTS_TO_LOG) {
@@ -173,7 +173,7 @@ public class AuditedSecurityOperation extends SecurityOperation {
       @SuppressWarnings({"unchecked", "rawtypes"})
       Map<KeyExtent,List<Range>> convertedBatch = Translator.translate(tbatch, new Translator.TKeyExtentTranslator(), new Translator.ListTranslator(
           new Translator.TRangeTranslator()));
-      Map<KeyExtent,List<String>> truncated = new HashMap<KeyExtent,List<String>>();
+      Map<KeyExtent,List<String>> truncated = new HashMap<>();
       for (Entry<KeyExtent,List<Range>> entry : convertedBatch.entrySet()) {
         truncated.put(entry.getKey(), truncate(entry.getValue()));
       }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/security/delegation/AuthenticationTokenSecretManager.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/security/delegation/AuthenticationTokenSecretManager.java b/server/base/src/main/java/org/apache/accumulo/server/security/delegation/AuthenticationTokenSecretManager.java
index 99a088a..a648cb5 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/security/delegation/AuthenticationTokenSecretManager.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/security/delegation/AuthenticationTokenSecretManager.java
@@ -58,7 +58,7 @@ public class AuthenticationTokenSecretManager extends SecretManager<Authenticati
 
   private final Instance instance;
   private final long tokenMaxLifetime;
-  private final ConcurrentHashMap<Integer,AuthenticationKey> allKeys = new ConcurrentHashMap<Integer,AuthenticationKey>();
+  private final ConcurrentHashMap<Integer,AuthenticationKey> allKeys = new ConcurrentHashMap<>();
   private AuthenticationKey currentKey;
 
   /**
@@ -168,7 +168,7 @@ public class AuthenticationTokenSecretManager extends SecretManager<Authenticati
     }
     // The use of the ServiceLoader inside Token doesn't work to automatically get the Identifier
     // Explicitly returning the identifier also saves an extra deserialization
-    Token<AuthenticationTokenIdentifier> token = new Token<AuthenticationTokenIdentifier>(id.getBytes(), password, id.getKind(), new Text(svcName.toString()));
+    Token<AuthenticationTokenIdentifier> token = new Token<>(id.getBytes(), password, id.getKind(), new Text(svcName.toString()));
     return Maps.immutableEntry(token, id);
   }
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/security/handler/InsecureAuthenticator.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/security/handler/InsecureAuthenticator.java b/server/base/src/main/java/org/apache/accumulo/server/security/handler/InsecureAuthenticator.java
index a57608c..8170ea3 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/security/handler/InsecureAuthenticator.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/security/handler/InsecureAuthenticator.java
@@ -73,7 +73,7 @@ public class InsecureAuthenticator implements Authenticator {
 
   @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(NullToken.class);
     return cs;
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKAuthenticator.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKAuthenticator.java b/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKAuthenticator.java
index a1616c1..6623fc6 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKAuthenticator.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKAuthenticator.java
@@ -103,7 +103,7 @@ public final class ZKAuthenticator implements Authenticator {
 
   @Override
   public Set<String> listUsers() {
-    return new TreeSet<String>(zooCache.getChildren(ZKUserPath));
+    return new TreeSet<>(zooCache.getChildren(ZKUserPath));
   }
 
   @Override
@@ -200,7 +200,7 @@ public final class ZKAuthenticator implements Authenticator {
 
   @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/b102e760/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKAuthorizor.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKAuthorizor.java b/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKAuthorizor.java
index 2d7f7bb..2803627 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKAuthorizor.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKAuthorizor.java
@@ -86,10 +86,10 @@ public class ZKAuthorizor implements Authorizor {
     IZooReaderWriter zoo = ZooReaderWriter.getInstance();
 
     // create the root user with all system privileges, no table privileges, and no record-level authorizations
-    Set<SystemPermission> rootPerms = new TreeSet<SystemPermission>();
+    Set<SystemPermission> rootPerms = new TreeSet<>();
     for (SystemPermission p : SystemPermission.values())
       rootPerms.add(p);
-    Map<String,Set<TablePermission>> tablePerms = new HashMap<String,Set<TablePermission>>();
+    Map<String,Set<TablePermission>> tablePerms = new HashMap<>();
     // Allow the root user to flush the metadata tables
     tablePerms.put(MetadataTable.ID, Collections.singleton(TablePermission.ALTER_TABLE));
     tablePerms.put(RootTable.ID, Collections.singleton(TablePermission.ALTER_TABLE));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKPermHandler.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKPermHandler.java b/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKPermHandler.java
index 06433c4..cf43aee 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKPermHandler.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKPermHandler.java
@@ -180,7 +180,7 @@ public class ZKPermHandler implements PermissionHandler {
       byte[] permBytes = zooCache.get(ZKUserPath + "/" + user + ZKUserSysPerms);
       Set<SystemPermission> perms;
       if (permBytes == null) {
-        perms = new TreeSet<SystemPermission>();
+        perms = new TreeSet<>();
       } else {
         perms = ZKSecurityTool.convertSystemPermissions(permBytes);
       }
@@ -208,7 +208,7 @@ public class ZKPermHandler implements PermissionHandler {
     if (serializedPerms != null)
       tablePerms = ZKSecurityTool.convertTablePermissions(serializedPerms);
     else
-      tablePerms = new TreeSet<TablePermission>();
+      tablePerms = new TreeSet<>();
 
     try {
       if (tablePerms.add(permission)) {
@@ -234,7 +234,7 @@ public class ZKPermHandler implements PermissionHandler {
     if (serializedPerms != null)
       namespacePerms = ZKSecurityTool.convertNamespacePermissions(serializedPerms);
     else
-      namespacePerms = new TreeSet<NamespacePermission>();
+      namespacePerms = new TreeSet<>();
 
     try {
       if (namespacePerms.add(permission)) {
@@ -377,15 +377,15 @@ public class ZKPermHandler implements PermissionHandler {
     IZooReaderWriter zoo = ZooReaderWriter.getInstance();
 
     // create the root user with all system privileges, no table privileges, and no record-level authorizations
-    Set<SystemPermission> rootPerms = new TreeSet<SystemPermission>();
+    Set<SystemPermission> rootPerms = new TreeSet<>();
     for (SystemPermission p : SystemPermission.values())
       rootPerms.add(p);
-    Map<String,Set<TablePermission>> tablePerms = new HashMap<String,Set<TablePermission>>();
+    Map<String,Set<TablePermission>> tablePerms = new HashMap<>();
     // Allow the root user to flush the system tables
     tablePerms.put(RootTable.ID, Collections.singleton(TablePermission.ALTER_TABLE));
     tablePerms.put(MetadataTable.ID, Collections.singleton(TablePermission.ALTER_TABLE));
     // essentially the same but on the system namespace, the ALTER_TABLE permission is now redundant
-    Map<String,Set<NamespacePermission>> namespacePerms = new HashMap<String,Set<NamespacePermission>>();
+    Map<String,Set<NamespacePermission>> namespacePerms = new HashMap<>();
     namespacePerms.put(Namespaces.ACCUMULO_NAMESPACE_ID, Collections.singleton(NamespacePermission.ALTER_NAMESPACE));
     namespacePerms.put(Namespaces.ACCUMULO_NAMESPACE_ID, Collections.singleton(NamespacePermission.ALTER_TABLE));
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKSecurityTool.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKSecurityTool.java b/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKSecurityTool.java
index 6401190..a3da0d8 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKSecurityTool.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKSecurityTool.java
@@ -120,7 +120,7 @@ class ZKSecurityTool {
   public static Set<SystemPermission> convertSystemPermissions(byte[] systempermissions) {
     ByteArrayInputStream bytes = new ByteArrayInputStream(systempermissions);
     DataInputStream in = new DataInputStream(bytes);
-    Set<SystemPermission> toReturn = new HashSet<SystemPermission>();
+    Set<SystemPermission> toReturn = new HashSet<>();
     try {
       while (in.available() > 0)
         toReturn.add(SystemPermission.getPermissionById(in.readByte()));
@@ -145,7 +145,7 @@ class ZKSecurityTool {
   }
 
   public static Set<TablePermission> convertTablePermissions(byte[] tablepermissions) {
-    Set<TablePermission> toReturn = new HashSet<TablePermission>();
+    Set<TablePermission> toReturn = new HashSet<>();
     for (byte b : tablepermissions)
       toReturn.add(TablePermission.getPermissionById(b));
     return toReturn;
@@ -165,7 +165,7 @@ class ZKSecurityTool {
   }
 
   public static Set<NamespacePermission> convertNamespacePermissions(byte[] namespacepermissions) {
-    Set<NamespacePermission> toReturn = new HashSet<NamespacePermission>();
+    Set<NamespacePermission> toReturn = new HashSet<>();
     for (byte b : namespacepermissions)
       toReturn.add(NamespacePermission.getPermissionById(b));
     return toReturn;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java b/server/base/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java
index 176b247..01faacd 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java
@@ -51,7 +51,7 @@ public class LargestFirstMemoryManager implements MemoryManager {
   // The fraction of memory that needs to be used before we begin flushing.
   private double compactionThreshold;
   private long maxObserved;
-  private final HashMap<String,Long> mincIdleThresholds = new HashMap<String,Long>();
+  private final HashMap<String,Long> mincIdleThresholds = new HashMap<>();
   private ServerConfiguration config = null;
 
   private static class TabletInfo {
@@ -71,7 +71,7 @@ public class LargestFirstMemoryManager implements MemoryManager {
   // A little map that will hold the "largest" N tablets, where largest is a result of the timeMemoryLoad function
   private static class LargestMap {
     final int max;
-    final TreeMap<Long,List<TabletInfo>> map = new TreeMap<Long,List<TabletInfo>>();
+    final TreeMap<Long,List<TabletInfo>> map = new TreeMap<>();
 
     LargestMap(int n) {
       max = n;
@@ -98,7 +98,7 @@ public class LargestFirstMemoryManager implements MemoryManager {
       if (lst != null) {
         lst.add(value);
       } else {
-        lst = new ArrayList<TabletInfo>();
+        lst = new ArrayList<>();
         lst.add(value);
         map.put(key, lst);
       }
@@ -159,7 +159,7 @@ public class LargestFirstMemoryManager implements MemoryManager {
 
     mincIdleThresholds.clear();
     final MemoryManagementActions result = new MemoryManagementActions();
-    result.tabletsToMinorCompact = new ArrayList<KeyExtent>();
+    result.tabletsToMinorCompact = new ArrayList<>();
 
     LargestMap largestMemTablets = new LargestMap(maxMinCs);
     final LargestMap largestIdleMemTablets = new LargestMap(maxConcurrentMincs);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/util/Admin.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/Admin.java b/server/base/src/main/java/org/apache/accumulo/server/util/Admin.java
index df18fbf..ea2f458 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/Admin.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/Admin.java
@@ -90,13 +90,13 @@ public class Admin implements KeywordExecutable {
   @Parameters(commandDescription = "stop the tablet server on the given hosts")
   static class StopCommand {
     @Parameter(description = "<host> {<host> ... }")
-    List<String> args = new ArrayList<String>();
+    List<String> args = new ArrayList<>();
   }
 
   @Parameters(commandDescription = "Ping tablet servers.  If no arguments, pings all.")
   static class PingCommand {
     @Parameter(description = "{<host> ... }")
-    List<String> args = new ArrayList<String>();
+    List<String> args = new ArrayList<>();
   }
 
   @Parameters(commandDescription = "print tablets that are offline in online tables")
@@ -139,7 +139,7 @@ public class Admin implements KeywordExecutable {
     @Parameter(names = {"-n", "--namespaces"}, description = "print the namespace configuration")
     boolean namespaceConfiguration = false;
     @Parameter(names = {"-t", "--tables"}, description = "print per-table configuration")
-    List<String> tables = new ArrayList<String>();
+    List<String> tables = new ArrayList<>();
     @Parameter(names = {"-u", "--users"}, description = "print users and their authorizations and permissions")
     boolean users = false;
   }
@@ -518,7 +518,7 @@ public class Admin implements KeywordExecutable {
     File namespaceScript = new File(outputDirectory, namespace + NS_FILE_SUFFIX);
     FileWriter nsWriter = new FileWriter(namespaceScript);
     nsWriter.write(createNsFormat.format(new String[] {namespace}));
-    TreeMap<String,String> props = new TreeMap<String,String>();
+    TreeMap<String,String> props = new TreeMap<>();
     for (Entry<String,String> p : connector.namespaceOperations().getProperties(namespace)) {
       props.put(p.getKey(), p.getValue());
     }
@@ -565,14 +565,14 @@ public class Admin implements KeywordExecutable {
 
   private void printSystemConfiguration(Connector connector, File outputDirectory) throws IOException, AccumuloException, AccumuloSecurityException {
     Configuration conf = new Configuration(false);
-    TreeMap<String,String> site = new TreeMap<String,String>(siteConfig);
+    TreeMap<String,String> site = new TreeMap<>(siteConfig);
     for (Entry<String,String> prop : site.entrySet()) {
       String defaultValue = getDefaultConfigValue(prop.getKey());
       if (!prop.getValue().equals(defaultValue) && !systemConfig.containsKey(prop.getKey())) {
         conf.set(prop.getKey(), prop.getValue());
       }
     }
-    TreeMap<String,String> system = new TreeMap<String,String>(systemConfig);
+    TreeMap<String,String> system = new TreeMap<>(systemConfig);
     for (Entry<String,String> prop : system.entrySet()) {
       String defaultValue = getDefaultConfigValue(prop.getKey());
       if (!prop.getValue().equals(defaultValue)) {
@@ -593,7 +593,7 @@ public class Admin implements KeywordExecutable {
     File tableBackup = new File(outputDirectory, tableName + ".cfg");
     FileWriter writer = new FileWriter(tableBackup);
     writer.write(createTableFormat.format(new String[] {tableName}));
-    TreeMap<String,String> props = new TreeMap<String,String>();
+    TreeMap<String,String> props = new TreeMap<>();
     for (Entry<String,String> p : connector.tableOperations().getProperties(tableName)) {
       props.put(p.getKey(), p.getValue());
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/util/ChangeSecret.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/ChangeSecret.java b/server/base/src/main/java/org/apache/accumulo/server/util/ChangeSecret.java
index a9ecf47..43863b5 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/ChangeSecret.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/ChangeSecret.java
@@ -54,7 +54,7 @@ public class ChangeSecret {
 
   public static void main(String[] args) throws Exception {
     Opts opts = new Opts();
-    List<String> argsList = new ArrayList<String>(args.length + 2);
+    List<String> argsList = new ArrayList<>(args.length + 2);
     argsList.add("--old");
     argsList.add("--new");
     argsList.addAll(Arrays.asList(args));
@@ -90,7 +90,7 @@ public class ChangeSecret {
   private static boolean verifyAccumuloIsDown(Instance inst, String oldPassword) {
     ZooReader zooReader = new ZooReaderWriter(inst.getZooKeepers(), inst.getZooKeepersSessionTimeOut(), oldPassword);
     String root = ZooUtil.getRoot(inst);
-    final List<String> ephemerals = new ArrayList<String>();
+    final List<String> ephemerals = new ArrayList<>();
     recurse(zooReader, root, new Visitor() {
       @Override
       public void visit(ZooReader zoo, String path) throws Exception {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/util/CheckForMetadataProblems.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/CheckForMetadataProblems.java b/server/base/src/main/java/org/apache/accumulo/server/util/CheckForMetadataProblems.java
index 867cd67..4f69c72 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/CheckForMetadataProblems.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/CheckForMetadataProblems.java
@@ -90,7 +90,7 @@ public class CheckForMetadataProblems {
 
   public static void checkMetadataAndRootTableEntries(String tableNameToCheck, ClientOpts opts, VolumeManager fs) throws Exception {
     System.out.println("Checking table: " + tableNameToCheck);
-    Map<String,TreeSet<KeyExtent>> tables = new HashMap<String,TreeSet<KeyExtent>>();
+    Map<String,TreeSet<KeyExtent>> tables = new HashMap<>();
 
     Scanner scanner;
 
@@ -124,7 +124,7 @@ public class CheckForMetadataProblems {
 
         tables.clear();
 
-        tablets = new TreeSet<KeyExtent>();
+        tablets = new TreeSet<>();
         tables.put(tableName, tablets);
       }
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/util/DeleteZooInstance.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/DeleteZooInstance.java b/server/base/src/main/java/org/apache/accumulo/server/util/DeleteZooInstance.java
index ba27733..0c4578c 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/DeleteZooInstance.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/DeleteZooInstance.java
@@ -60,8 +60,8 @@ public class DeleteZooInstance {
 
     IZooReaderWriter zk = ZooReaderWriter.getInstance();
     // try instance name:
-    Set<String> instances = new HashSet<String>(zk.getChildren(Constants.ZROOT + Constants.ZINSTANCES));
-    Set<String> uuids = new HashSet<String>(zk.getChildren(Constants.ZROOT));
+    Set<String> instances = new HashSet<>(zk.getChildren(Constants.ZROOT + Constants.ZINSTANCES));
+    Set<String> uuids = new HashSet<>(zk.getChildren(Constants.ZROOT));
     uuids.remove("instances");
     if (instances.contains(opts.instance)) {
       String path = Constants.ZROOT + Constants.ZINSTANCES + "/" + opts.instance;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/util/FileSystemMonitor.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/FileSystemMonitor.java b/server/base/src/main/java/org/apache/accumulo/server/util/FileSystemMonitor.java
index 11d0e0f..5e9959c 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/FileSystemMonitor.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/FileSystemMonitor.java
@@ -56,7 +56,7 @@ public class FileSystemMonitor {
       mountPoint = tokens[1].trim();
       filesystemType = tokens[2].trim().toLowerCase();
 
-      options = new HashSet<String>(Arrays.asList(tokens[3].split(",")));
+      options = new HashSet<>(Arrays.asList(tokens[3].split(",")));
     }
 
     @Override
@@ -80,7 +80,7 @@ public class FileSystemMonitor {
   }
 
   static List<Mount> getMountsFromFile(BufferedReader br) throws IOException {
-    List<Mount> mounts = new ArrayList<Mount>();
+    List<Mount> mounts = new ArrayList<>();
     String line;
     while ((line = br.readLine()) != null) {
       Mount mount = new Mount(line);
@@ -94,7 +94,7 @@ public class FileSystemMonitor {
     return mounts;
   }
 
-  private Map<String,Boolean> readWriteFilesystems = new HashMap<String,Boolean>();
+  private Map<String,Boolean> readWriteFilesystems = new HashMap<>();
 
   public FileSystemMonitor(final String procFile, long period) throws IOException {
     List<Mount> mounts = parse(procFile);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/util/FileUtil.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/FileUtil.java b/server/base/src/main/java/org/apache/accumulo/server/util/FileUtil.java
index 491a830..a686bae 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/FileUtil.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/FileUtil.java
@@ -109,7 +109,7 @@ public class FileUtil {
 
   public static Collection<String> reduceFiles(AccumuloConfiguration acuConf, Configuration conf, VolumeManager fs, Text prevEndRow, Text endRow,
       Collection<String> mapFiles, int maxFiles, Path tmpDir, int pass) throws IOException {
-    ArrayList<String> paths = new ArrayList<String>(mapFiles);
+    ArrayList<String> paths = new ArrayList<>(mapFiles);
 
     if (paths.size() <= maxFiles)
       return paths;
@@ -118,7 +118,7 @@ public class FileUtil {
 
     int start = 0;
 
-    ArrayList<String> outFiles = new ArrayList<String>();
+    ArrayList<String> outFiles = new ArrayList<>();
 
     int count = 0;
 
@@ -134,7 +134,7 @@ public class FileUtil {
       FileSystem ns = fs.getVolumeByPath(new Path(newMapFile)).getFileSystem();
       FileSKVWriter writer = new RFileOperations().newWriterBuilder().forFile(newMapFile.toString(), ns, ns.getConf()).withTableConfiguration(acuConf).build();
       writer.startDefaultLocalityGroup();
-      List<SortedKeyValueIterator<Key,Value>> iters = new ArrayList<SortedKeyValueIterator<Key,Value>>(inFiles.size());
+      List<SortedKeyValueIterator<Key,Value>> iters = new ArrayList<>(inFiles.size());
 
       FileSKVIterator reader = null;
       try {
@@ -202,7 +202,7 @@ public class FileUtil {
     Path tmpDir = null;
 
     int maxToOpen = acuconf.getCount(Property.TSERV_TABLET_SPLIT_FINDMIDPOINT_MAXOPEN);
-    ArrayList<FileSKVIterator> readers = new ArrayList<FileSKVIterator>(mapFiles.size());
+    ArrayList<FileSKVIterator> readers = new ArrayList<>(mapFiles.size());
 
     try {
       if (mapFiles.size() > maxToOpen) {
@@ -275,7 +275,7 @@ public class FileUtil {
     Path tmpDir = null;
 
     int maxToOpen = acuConf.getCount(Property.TSERV_TABLET_SPLIT_FINDMIDPOINT_MAXOPEN);
-    ArrayList<FileSKVIterator> readers = new ArrayList<FileSKVIterator>(mapFiles.size());
+    ArrayList<FileSKVIterator> readers = new ArrayList<>(mapFiles.size());
 
     try {
       if (mapFiles.size() > maxToOpen) {
@@ -319,7 +319,7 @@ public class FileUtil {
         mmfi.next();
 
       // read half of the keys in the index
-      TreeMap<Double,Key> ret = new TreeMap<Double,Key>();
+      TreeMap<Double,Key> ret = new TreeMap<>();
       Key lastKey = null;
       long keysRead = 0;
 
@@ -436,7 +436,7 @@ public class FileUtil {
 
   public static Map<FileRef,FileInfo> tryToGetFirstAndLastRows(VolumeManager fs, AccumuloConfiguration acuConf, Set<FileRef> mapfiles) {
 
-    HashMap<FileRef,FileInfo> mapFilesInfo = new HashMap<FileRef,FileInfo>();
+    HashMap<FileRef,FileInfo> mapFilesInfo = new HashMap<>();
 
     long t1 = System.currentTimeMillis();
 
@@ -517,7 +517,7 @@ public class FileUtil {
       VolumeManager fs) throws IOException {
 
     long totalIndexEntries = 0;
-    Map<KeyExtent,MLong> counts = new TreeMap<KeyExtent,MLong>();
+    Map<KeyExtent,MLong> counts = new TreeMap<>();
     for (KeyExtent keyExtent : extents)
       counts.put(keyExtent, new MLong(0));
 
@@ -548,7 +548,7 @@ public class FileUtil {
       }
     }
 
-    Map<KeyExtent,Long> results = new TreeMap<KeyExtent,Long>();
+    Map<KeyExtent,Long> results = new TreeMap<>();
     for (KeyExtent keyExtent : extents) {
       double numEntries = counts.get(keyExtent).l;
       if (numEntries == 0)
@@ -560,7 +560,7 @@ public class FileUtil {
   }
 
   public static Collection<String> toPathStrings(Collection<FileRef> refs) {
-    ArrayList<String> ret = new ArrayList<String>();
+    ArrayList<String> ret = new ArrayList<>();
     for (FileRef fileRef : refs) {
       ret.add(fileRef.path().toString());
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/util/ListInstances.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/ListInstances.java b/server/base/src/main/java/org/apache/accumulo/server/util/ListInstances.java
index 9dc1251..0674bea 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/ListInstances.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/ListInstances.java
@@ -172,7 +172,7 @@ public class ListInstances {
 
     String instancesPath = Constants.ZROOT + Constants.ZINSTANCES;
 
-    TreeMap<String,UUID> tm = new TreeMap<String,UUID>();
+    TreeMap<String,UUID> tm = new TreeMap<>();
 
     List<String> names;
 
@@ -198,7 +198,7 @@ public class ListInstances {
   }
 
   private static TreeSet<UUID> getInstanceIDs(ZooReader zk, boolean printErrors) {
-    TreeSet<UUID> ts = new TreeSet<UUID>();
+    TreeSet<UUID> ts = new TreeSet<>();
 
     try {
       List<String> children = zk.getChildren(Constants.ZROOT);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/util/ListVolumesUsed.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/ListVolumesUsed.java b/server/base/src/main/java/org/apache/accumulo/server/util/ListVolumesUsed.java
index 9ad461b..3e30aaf 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/ListVolumesUsed.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/ListVolumesUsed.java
@@ -67,10 +67,10 @@ public class ListVolumesUsed {
 
   private static void listZookeeper() throws Exception {
     System.out.println("Listing volumes referenced in zookeeper");
-    TreeSet<String> volumes = new TreeSet<String>();
+    TreeSet<String> volumes = new TreeSet<>();
 
     volumes.add(getTableURI(MetadataTableUtil.getRootTabletDir()));
-    ArrayList<LogEntry> result = new ArrayList<LogEntry>();
+    ArrayList<LogEntry> result = new ArrayList<>();
     MetadataTableUtil.getRootLogEntries(result);
     for (LogEntry logEntry : result) {
       getLogURIs(volumes, logEntry);
@@ -92,7 +92,7 @@ public class ListVolumesUsed {
     scanner.fetchColumnFamily(MetadataSchema.TabletsSection.LogColumnFamily.NAME);
     MetadataSchema.TabletsSection.ServerColumnFamily.DIRECTORY_COLUMN.fetch(scanner);
 
-    TreeSet<String> volumes = new TreeSet<String>();
+    TreeSet<String> volumes = new TreeSet<>();
 
     for (Entry<Key,Value> entry : scanner) {
       if (entry.getKey().getColumnFamily().equals(MetadataSchema.TabletsSection.DataFileColumnFamily.NAME)) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/util/LocalityCheck.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/LocalityCheck.java b/server/base/src/main/java/org/apache/accumulo/server/util/LocalityCheck.java
index 5d49fa7..2e43505 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/LocalityCheck.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/LocalityCheck.java
@@ -53,9 +53,9 @@ public class LocalityCheck {
     scanner.fetchColumnFamily(DataFileColumnFamily.NAME);
     scanner.setRange(MetadataSchema.TabletsSection.getRange());
 
-    Map<String,Long> totalBlocks = new HashMap<String,Long>();
-    Map<String,Long> localBlocks = new HashMap<String,Long>();
-    ArrayList<String> files = new ArrayList<String>();
+    Map<String,Long> totalBlocks = new HashMap<>();
+    Map<String,Long> localBlocks = new HashMap<>();
+    ArrayList<String> files = new ArrayList<>();
 
     for (Entry<Key,Value> entry : scanner) {
       Key key = entry.getKey();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/util/LoginProperties.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/LoginProperties.java b/server/base/src/main/java/org/apache/accumulo/server/util/LoginProperties.java
index 8ffe586..7c102e6 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/LoginProperties.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/LoginProperties.java
@@ -46,7 +46,7 @@ public class LoginProperties implements KeywordExecutable {
     Authenticator authenticator = AccumuloVFSClassLoader.getClassLoader().loadClass(config.get(Property.INSTANCE_SECURITY_AUTHENTICATOR))
         .asSubclass(Authenticator.class).newInstance();
 
-    List<Set<TokenProperty>> tokenProps = new ArrayList<Set<TokenProperty>>();
+    List<Set<TokenProperty>> tokenProps = new ArrayList<>();
 
     for (Class<? extends AuthenticationToken> tokenType : authenticator.getSupportedTokenTypes()) {
       tokenProps.add(tokenType.newInstance().getProperties());

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/util/MasterMetadataUtil.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/MasterMetadataUtil.java b/server/base/src/main/java/org/apache/accumulo/server/util/MasterMetadataUtil.java
index 5aa61bc..1bdd255 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/MasterMetadataUtil.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/MasterMetadataUtil.java
@@ -161,11 +161,11 @@ public class MasterMetadataUtil {
       } else {
         log.info("Finishing incomplete split " + metadataEntry + " " + metadataPrevEndRow);
 
-        List<FileRef> highDatafilesToRemove = new ArrayList<FileRef>();
+        List<FileRef> highDatafilesToRemove = new ArrayList<>();
 
-        SortedMap<FileRef,DataFileValue> origDatafileSizes = new TreeMap<FileRef,DataFileValue>();
-        SortedMap<FileRef,DataFileValue> highDatafileSizes = new TreeMap<FileRef,DataFileValue>();
-        SortedMap<FileRef,DataFileValue> lowDatafileSizes = new TreeMap<FileRef,DataFileValue>();
+        SortedMap<FileRef,DataFileValue> origDatafileSizes = new TreeMap<>();
+        SortedMap<FileRef,DataFileValue> highDatafileSizes = new TreeMap<>();
+        SortedMap<FileRef,DataFileValue> lowDatafileSizes = new TreeMap<>();
 
         try (Scanner scanner3 = new ScannerImpl(context, MetadataTable.ID, Authorizations.EMPTY)) {
           Key rowKey = new Key(metadataEntry);


[22/32] accumulo git commit: ACCUMULO-4357 Remove unneeded code for readability

Posted by ct...@apache.org.
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java b/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java
index 416a296..b38083f 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java
@@ -105,8 +105,8 @@ public class MetadataTableUtil {
 
   private static final Text EMPTY_TEXT = new Text();
   private static final byte[] EMPTY_BYTES = new byte[0];
-  private static Map<Credentials,Writer> root_tables = new HashMap<Credentials,Writer>();
-  private static Map<Credentials,Writer> metadata_tables = new HashMap<Credentials,Writer>();
+  private static Map<Credentials,Writer> root_tables = new HashMap<>();
+  private static Map<Credentials,Writer> metadata_tables = new HashMap<>();
   private static final Logger log = LoggerFactory.getLogger(MetadataTableUtil.class);
 
   private MetadataTableUtil() {}
@@ -278,7 +278,7 @@ public class MetadataTableUtil {
   }
 
   public static SortedMap<FileRef,DataFileValue> getDataFileSizes(KeyExtent extent, ClientContext context) throws IOException {
-    TreeMap<FileRef,DataFileValue> sizes = new TreeMap<FileRef,DataFileValue>();
+    TreeMap<FileRef,DataFileValue> sizes = new TreeMap<>();
 
     try (Scanner mdScanner = new ScannerImpl(context, MetadataTable.ID, Authorizations.EMPTY)) {
       mdScanner.fetchColumnFamily(DataFileColumnFamily.NAME);
@@ -503,8 +503,8 @@ public class MetadataTableUtil {
 
   public static Pair<List<LogEntry>,SortedMap<FileRef,DataFileValue>> getFileAndLogEntries(ClientContext context, KeyExtent extent) throws KeeperException,
       InterruptedException, IOException {
-    ArrayList<LogEntry> result = new ArrayList<LogEntry>();
-    TreeMap<FileRef,DataFileValue> sizes = new TreeMap<FileRef,DataFileValue>();
+    ArrayList<LogEntry> result = new ArrayList<>();
+    TreeMap<FileRef,DataFileValue> sizes = new TreeMap<>();
 
     VolumeManager fs = VolumeManagerImpl.get();
     if (extent.isRootTablet()) {
@@ -548,7 +548,7 @@ public class MetadataTableUtil {
 
   public static List<LogEntry> getLogEntries(ClientContext context, KeyExtent extent) throws IOException, KeeperException, InterruptedException {
     log.info("Scanning logging entries for " + extent);
-    ArrayList<LogEntry> result = new ArrayList<LogEntry>();
+    ArrayList<LogEntry> result = new ArrayList<>();
     if (extent.equals(RootTable.EXTENT)) {
       log.info("Getting logs for root tablet from zookeeper");
       getRootLogEntries(result);
@@ -757,7 +757,7 @@ public class MetadataTableUtil {
     while (cloneIter.hasNext()) {
       Map<Key,Value> cloneTablet = cloneIter.next();
       Text cloneEndRow = new KeyExtent(cloneTablet.keySet().iterator().next().getRow(), (Text) null).getEndRow();
-      HashSet<String> cloneFiles = new HashSet<String>();
+      HashSet<String> cloneFiles = new HashSet<>();
 
       boolean cloneSuccessful = false;
       for (Entry<Key,Value> entry : cloneTablet.entrySet()) {
@@ -770,7 +770,7 @@ public class MetadataTableUtil {
       if (!cloneSuccessful)
         getFiles(cloneFiles, cloneTablet, null);
 
-      List<Map<Key,Value>> srcTablets = new ArrayList<Map<Key,Value>>();
+      List<Map<Key,Value>> srcTablets = new ArrayList<>();
       Map<Key,Value> srcTablet = srcIter.next();
       srcTablets.add(srcTablet);
 
@@ -780,7 +780,7 @@ public class MetadataTableUtil {
       if (cmp < 0)
         throw new TabletIterator.TabletDeletedException("Tablets deleted from src during clone : " + cloneEndRow + " " + srcEndRow);
 
-      HashSet<String> srcFiles = new HashSet<String>();
+      HashSet<String> srcFiles = new HashSet<>();
       if (!cloneSuccessful)
         getFiles(srcFiles, srcTablet, srcTableId);
 
@@ -905,7 +905,7 @@ public class MetadataTableUtil {
   }
 
   public static List<FileRef> getBulkFilesLoaded(Connector conn, KeyExtent extent, long tid) throws IOException {
-    List<FileRef> result = new ArrayList<FileRef>();
+    List<FileRef> result = new ArrayList<>();
     try (Scanner mscanner = new IsolatedScanner(conn.createScanner(extent.isMeta() ? RootTable.NAME : MetadataTable.NAME, Authorizations.EMPTY))) {
       VolumeManager fs = VolumeManagerImpl.get();
       mscanner.setRange(extent.toMetadataRange());
@@ -1032,11 +1032,11 @@ public class MetadataTableUtil {
   }
 
   public static SortedMap<Text,SortedMap<ColumnFQ,Value>> getTabletEntries(SortedMap<Key,Value> tabletKeyValues, List<ColumnFQ> columns) {
-    TreeMap<Text,SortedMap<ColumnFQ,Value>> tabletEntries = new TreeMap<Text,SortedMap<ColumnFQ,Value>>();
+    TreeMap<Text,SortedMap<ColumnFQ,Value>> tabletEntries = new TreeMap<>();
 
     HashSet<ColumnFQ> colSet = null;
     if (columns != null) {
-      colSet = new HashSet<ColumnFQ>(columns);
+      colSet = new HashSet<>(columns);
     }
 
     for (Entry<Key,Value> entry : tabletKeyValues.entrySet()) {
@@ -1049,7 +1049,7 @@ public class MetadataTableUtil {
 
       SortedMap<ColumnFQ,Value> colVals = tabletEntries.get(row);
       if (colVals == null) {
-        colVals = new TreeMap<ColumnFQ,Value>();
+        colVals = new TreeMap<>();
         tabletEntries.put(row, colVals);
       }
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/util/RemoveEntriesForMissingFiles.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/RemoveEntriesForMissingFiles.java b/server/base/src/main/java/org/apache/accumulo/server/util/RemoveEntriesForMissingFiles.java
index ae59164..e3f531d 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/RemoveEntriesForMissingFiles.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/RemoveEntriesForMissingFiles.java
@@ -124,7 +124,7 @@ public class RemoveEntriesForMissingFiles {
 
     @SuppressWarnings({"rawtypes"})
     Map cache = new LRUMap(100000);
-    Set<Path> processing = new HashSet<Path>();
+    Set<Path> processing = new HashSet<>();
     ExecutorService threadPool = Executors.newFixedThreadPool(16);
 
     System.out.printf("Scanning : %s %s\n", table, range);
@@ -136,7 +136,7 @@ public class RemoveEntriesForMissingFiles {
     metadata.fetchColumnFamily(DataFileColumnFamily.NAME);
     int count = 0;
     AtomicInteger missing = new AtomicInteger(0);
-    AtomicReference<Exception> exceptionRef = new AtomicReference<Exception>(null);
+    AtomicReference<Exception> exceptionRef = new AtomicReference<>(null);
     BatchWriter writer = null;
 
     if (fix)

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/util/ReplicationTableUtil.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/ReplicationTableUtil.java b/server/base/src/main/java/org/apache/accumulo/server/util/ReplicationTableUtil.java
index a400e4f..f234593 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/ReplicationTableUtil.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/ReplicationTableUtil.java
@@ -59,7 +59,7 @@ import org.slf4j.LoggerFactory;
  */
 public class ReplicationTableUtil {
 
-  private static Map<Credentials,Writer> writers = new HashMap<Credentials,Writer>();
+  private static Map<Credentials,Writer> writers = new HashMap<>();
   private static final Logger log = LoggerFactory.getLogger(ReplicationTableUtil.class);
 
   public static final String COMBINER_NAME = "replcombiner";

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/util/RestoreZookeeper.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/RestoreZookeeper.java b/server/base/src/main/java/org/apache/accumulo/server/util/RestoreZookeeper.java
index d4e79d76..8da1ce9 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/RestoreZookeeper.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/RestoreZookeeper.java
@@ -43,7 +43,7 @@ public class RestoreZookeeper {
 
   private static class Restore extends DefaultHandler {
     IZooReaderWriter zk = null;
-    Stack<String> cwd = new Stack<String>();
+    Stack<String> cwd = new Stack<>();
     boolean overwrite = false;
 
     Restore(IZooReaderWriter zk, boolean overwrite) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/util/TableDiskUsage.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/TableDiskUsage.java b/server/base/src/main/java/org/apache/accumulo/server/util/TableDiskUsage.java
index 1a630a9..84d76cb 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/TableDiskUsage.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/TableDiskUsage.java
@@ -58,10 +58,10 @@ public class TableDiskUsage {
 
   private static final Logger log = LoggerFactory.getLogger(TableDiskUsage.class);
   private int nextInternalId = 0;
-  private Map<String,Integer> internalIds = new HashMap<String,Integer>();
-  private Map<Integer,String> externalIds = new HashMap<Integer,String>();
-  private Map<String,Integer[]> tableFiles = new HashMap<String,Integer[]>();
-  private Map<String,Long> fileSizes = new HashMap<String,Long>();
+  private Map<String,Integer> internalIds = new HashMap<>();
+  private Map<Integer,String> externalIds = new HashMap<>();
+  private Map<String,Integer[]> tableFiles = new HashMap<>();
+  private Map<String,Long> fileSizes = new HashMap<>();
 
   void addTable(String tableId) {
     if (internalIds.containsKey(tableId))
@@ -100,7 +100,7 @@ public class TableDiskUsage {
   Map<List<String>,Long> calculateUsage() {
 
     // Bitset of tables that contain a file and total usage by all files that share that usage
-    Map<List<Integer>,Long> usage = new HashMap<List<Integer>,Long>();
+    Map<List<Integer>,Long> usage = new HashMap<>();
 
     if (log.isTraceEnabled()) {
       log.trace("fileSizes " + fileSizes);
@@ -123,10 +123,10 @@ public class TableDiskUsage {
 
     }
 
-    Map<List<String>,Long> externalUsage = new HashMap<List<String>,Long>();
+    Map<List<String>,Long> externalUsage = new HashMap<>();
 
     for (Entry<List<Integer>,Long> entry : usage.entrySet()) {
-      List<String> externalKey = new ArrayList<String>();
+      List<String> externalKey = new ArrayList<>();
       List<Integer> key = entry.getKey();
       // table bitset
       for (int i = 0; i < key.size(); i++)
@@ -164,9 +164,9 @@ public class TableDiskUsage {
     for (String tableId : tableIds)
       tdu.addTable(tableId);
 
-    HashSet<String> tablesReferenced = new HashSet<String>(tableIds);
-    HashSet<String> emptyTableIds = new HashSet<String>();
-    HashSet<String> nameSpacesReferenced = new HashSet<String>();
+    HashSet<String> tablesReferenced = new HashSet<>(tableIds);
+    HashSet<String> emptyTableIds = new HashSet<>();
+    HashSet<String> nameSpacesReferenced = new HashSet<>();
 
     // For each table ID
     for (String tableId : tableIds) {
@@ -222,11 +222,11 @@ public class TableDiskUsage {
     }
 
     // Invert tableId->tableName
-    HashMap<String,String> reverseTableIdMap = new HashMap<String,String>();
+    HashMap<String,String> reverseTableIdMap = new HashMap<>();
     for (Entry<String,String> entry : conn.tableOperations().tableIdMap().entrySet())
       reverseTableIdMap.put(entry.getValue(), entry.getKey());
 
-    TreeMap<TreeSet<String>,Long> usage = new TreeMap<TreeSet<String>,Long>(new Comparator<TreeSet<String>>() {
+    TreeMap<TreeSet<String>,Long> usage = new TreeMap<>(new Comparator<TreeSet<String>>() {
 
       @Override
       public int compare(TreeSet<String> o1, TreeSet<String> o2) {
@@ -257,7 +257,7 @@ public class TableDiskUsage {
     });
 
     for (Entry<List<String>,Long> entry : tdu.calculateUsage().entrySet()) {
-      TreeSet<String> tableNames = new TreeSet<String>();
+      TreeSet<String> tableNames = new TreeSet<>();
       // Convert size shared by each table id into size shared by each table name
       for (String tableId : entry.getKey())
         tableNames.add(reverseTableIdMap.get(tableId));
@@ -267,7 +267,7 @@ public class TableDiskUsage {
     }
 
     if (!emptyTableIds.isEmpty()) {
-      TreeSet<String> emptyTables = new TreeSet<String>();
+      TreeSet<String> emptyTables = new TreeSet<>();
       for (String tableId : emptyTableIds) {
         emptyTables.add(reverseTableIdMap.get(tableId));
       }
@@ -280,7 +280,7 @@ public class TableDiskUsage {
   public static void printDiskUsage(AccumuloConfiguration acuConf, Collection<String> tables, VolumeManager fs, Connector conn, Printer printer,
       boolean humanReadable) throws TableNotFoundException, IOException {
 
-    HashSet<String> tableIds = new HashSet<String>();
+    HashSet<String> tableIds = new HashSet<>();
 
     // Get table IDs for all tables requested to be 'du'
     for (String tableName : tables) {
@@ -302,7 +302,7 @@ public class TableDiskUsage {
 
   static class Opts extends ClientOpts {
     @Parameter(description = " <table> { <table> ... } ")
-    List<String> tables = new ArrayList<String>();
+    List<String> tables = new ArrayList<>();
   }
 
   public static void main(String[] args) throws Exception {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/util/TableInfoUtil.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/TableInfoUtil.java b/server/base/src/main/java/org/apache/accumulo/server/util/TableInfoUtil.java
index 6aa937f..d804e1c 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/TableInfoUtil.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/TableInfoUtil.java
@@ -71,7 +71,7 @@ public class TableInfoUtil {
   }
 
   public static Map<String,Double> summarizeTableStats(MasterMonitorInfo mmi) {
-    Map<String,Double> compactingByTable = new HashMap<String,Double>();
+    Map<String,Double> compactingByTable = new HashMap<>();
     if (mmi != null && mmi.tServerInfo != null) {
       for (TabletServerStatus status : mmi.tServerInfo) {
         if (status != null && status.tableMap != null) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/util/TabletIterator.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/TabletIterator.java b/server/base/src/main/java/org/apache/accumulo/server/util/TabletIterator.java
index 43345f2..9569f49 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/TabletIterator.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/TabletIterator.java
@@ -190,7 +190,7 @@ public class TabletIterator implements Iterator<Map<Key,Value>> {
 
     Text curMetaDataRow = null;
 
-    TreeMap<Key,Value> tm = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm = new TreeMap<>();
 
     boolean sawPrevEndRow = false;
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/util/VerifyTabletAssignments.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/VerifyTabletAssignments.java b/server/base/src/main/java/org/apache/accumulo/server/util/VerifyTabletAssignments.java
index 87c781a..bf072f3 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/VerifyTabletAssignments.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/VerifyTabletAssignments.java
@@ -87,14 +87,14 @@ public class VerifyTabletAssignments {
     else
       System.out.println("Checking table " + tableName + " again, failures " + check.size());
 
-    TreeMap<KeyExtent,String> tabletLocations = new TreeMap<KeyExtent,String>();
+    TreeMap<KeyExtent,String> tabletLocations = new TreeMap<>();
 
     String tableId = Tables.getNameToIdMap(context.getInstance()).get(tableName);
     MetadataServicer.forTableId(context, tableId).getTabletLocations(tabletLocations);
 
-    final HashSet<KeyExtent> failures = new HashSet<KeyExtent>();
+    final HashSet<KeyExtent> failures = new HashSet<>();
 
-    Map<HostAndPort,List<KeyExtent>> extentsPerServer = new TreeMap<HostAndPort,List<KeyExtent>>();
+    Map<HostAndPort,List<KeyExtent>> extentsPerServer = new TreeMap<>();
 
     for (Entry<KeyExtent,String> entry : tabletLocations.entrySet()) {
       KeyExtent keyExtent = entry.getKey();
@@ -108,7 +108,7 @@ public class VerifyTabletAssignments {
         final HostAndPort parsedLoc = HostAndPort.fromString(loc);
         List<KeyExtent> extentList = extentsPerServer.get(parsedLoc);
         if (extentList == null) {
-          extentList = new ArrayList<KeyExtent>();
+          extentList = new ArrayList<>();
           extentsPerServer.put(parsedLoc, extentList);
         }
 
@@ -156,7 +156,7 @@ public class VerifyTabletAssignments {
       throws ThriftSecurityException, TException, NoSuchScanIDException {
     TabletClientService.Iface client = ThriftUtil.getTServerClient(entry.getKey(), context);
 
-    Map<TKeyExtent,List<TRange>> batch = new TreeMap<TKeyExtent,List<TRange>>();
+    Map<TKeyExtent,List<TRange>> batch = new TreeMap<>();
 
     for (KeyExtent keyExtent : entry.getValue()) {
       Text row = keyExtent.getEndRow();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/zookeeper/DistributedWorkQueue.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/zookeeper/DistributedWorkQueue.java b/server/base/src/main/java/org/apache/accumulo/server/zookeeper/DistributedWorkQueue.java
index 0f298b4..4faa7ad 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/zookeeper/DistributedWorkQueue.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/zookeeper/DistributedWorkQueue.java
@@ -233,7 +233,7 @@ public class DistributedWorkQueue {
   }
 
   public List<String> getWorkQueued() throws KeeperException, InterruptedException {
-    ArrayList<String> children = new ArrayList<String>(zoo.getChildren(path));
+    ArrayList<String> children = new ArrayList<>(zoo.getChildren(path));
     children.remove(LOCKS_NODE);
     return children;
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/test/java/org/apache/accumulo/server/ServerConstantsTest.java
----------------------------------------------------------------------
diff --git a/server/base/src/test/java/org/apache/accumulo/server/ServerConstantsTest.java b/server/base/src/test/java/org/apache/accumulo/server/ServerConstantsTest.java
index 05f0a47..15c23be 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/ServerConstantsTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/ServerConstantsTest.java
@@ -94,7 +94,7 @@ public class ServerConstantsTest {
 
     LocalFileSystem fs = FileSystem.getLocal(new Configuration());
 
-    ArrayList<String> accumuloPaths = new ArrayList<String>();
+    ArrayList<String> accumuloPaths = new ArrayList<>();
 
     for (int i = 0; i < uuids.size(); i++) {
       String volume = "v" + i;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/test/java/org/apache/accumulo/server/client/BulkImporterTest.java
----------------------------------------------------------------------
diff --git a/server/base/src/test/java/org/apache/accumulo/server/client/BulkImporterTest.java b/server/base/src/test/java/org/apache/accumulo/server/client/BulkImporterTest.java
index 09ee6e0..cb2bd75 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/client/BulkImporterTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/client/BulkImporterTest.java
@@ -51,7 +51,7 @@ import org.junit.Test;
 
 public class BulkImporterTest {
 
-  static final SortedSet<KeyExtent> fakeMetaData = new TreeSet<KeyExtent>();
+  static final SortedSet<KeyExtent> fakeMetaData = new TreeSet<>();
   static final String tableId = "1";
 
   static {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/test/java/org/apache/accumulo/server/conf/NamespaceConfigurationTest.java
----------------------------------------------------------------------
diff --git a/server/base/src/test/java/org/apache/accumulo/server/conf/NamespaceConfigurationTest.java b/server/base/src/test/java/org/apache/accumulo/server/conf/NamespaceConfigurationTest.java
index 742ebb2..071e9c0 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/conf/NamespaceConfigurationTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/conf/NamespaceConfigurationTest.java
@@ -118,10 +118,10 @@ public class NamespaceConfigurationTest {
   @Test
   public void testGetProperties() {
     Predicate<String> all = Predicates.alwaysTrue();
-    Map<String,String> props = new java.util.HashMap<String,String>();
+    Map<String,String> props = new java.util.HashMap<>();
     parent.getProperties(props, all);
     replay(parent);
-    List<String> children = new java.util.ArrayList<String>();
+    List<String> children = new java.util.ArrayList<>();
     children.add("foo");
     children.add("ding");
     expect(zc.getChildren(ZooUtil.getRoot(iid) + Constants.ZNAMESPACES + "/" + NSID + Constants.ZNAMESPACE_CONF)).andReturn(children);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/test/java/org/apache/accumulo/server/conf/TableConfigurationTest.java
----------------------------------------------------------------------
diff --git a/server/base/src/test/java/org/apache/accumulo/server/conf/TableConfigurationTest.java b/server/base/src/test/java/org/apache/accumulo/server/conf/TableConfigurationTest.java
index 1eb933a..34d6905 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/conf/TableConfigurationTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/conf/TableConfigurationTest.java
@@ -102,10 +102,10 @@ public class TableConfigurationTest {
   @Test
   public void testGetProperties() {
     Predicate<String> all = Predicates.alwaysTrue();
-    Map<String,String> props = new java.util.HashMap<String,String>();
+    Map<String,String> props = new java.util.HashMap<>();
     parent.getProperties(props, all);
     replay(parent);
-    List<String> children = new java.util.ArrayList<String>();
+    List<String> children = new java.util.ArrayList<>();
     children.add("foo");
     children.add("ding");
     expect(zc.getChildren(ZooUtil.getRoot(iid) + Constants.ZTABLES + "/" + TID + Constants.ZTABLE_CONF)).andReturn(children);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/test/java/org/apache/accumulo/server/conf/ZooCachePropertyAccessorTest.java
----------------------------------------------------------------------
diff --git a/server/base/src/test/java/org/apache/accumulo/server/conf/ZooCachePropertyAccessorTest.java b/server/base/src/test/java/org/apache/accumulo/server/conf/ZooCachePropertyAccessorTest.java
index e90e921..9bd7b90 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/conf/ZooCachePropertyAccessorTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/conf/ZooCachePropertyAccessorTest.java
@@ -105,7 +105,7 @@ public class ZooCachePropertyAccessorTest {
 
   @Test
   public void testGetProperties() {
-    Map<String,String> props = new java.util.HashMap<String,String>();
+    Map<String,String> props = new java.util.HashMap<>();
     AccumuloConfiguration parent = createMock(AccumuloConfiguration.class);
     @SuppressWarnings("unchecked")
     Predicate<String> filter = createMock(Predicate.class);
@@ -113,7 +113,7 @@ public class ZooCachePropertyAccessorTest {
     replay(parent);
     String child1 = "child1";
     String child2 = "child2";
-    List<String> children = new java.util.ArrayList<String>();
+    List<String> children = new java.util.ArrayList<>();
     children.add(child1);
     children.add(child2);
     expect(zc.getChildren(PATH)).andReturn(children);
@@ -132,7 +132,7 @@ public class ZooCachePropertyAccessorTest {
 
   @Test
   public void testGetProperties_NoChildren() {
-    Map<String,String> props = new java.util.HashMap<String,String>();
+    Map<String,String> props = new java.util.HashMap<>();
     AccumuloConfiguration parent = createMock(AccumuloConfiguration.class);
     @SuppressWarnings("unchecked")
     Predicate<String> filter = createMock(Predicate.class);
@@ -147,14 +147,14 @@ public class ZooCachePropertyAccessorTest {
 
   @Test
   public void testGetProperties_Filter() {
-    Map<String,String> props = new java.util.HashMap<String,String>();
+    Map<String,String> props = new java.util.HashMap<>();
     AccumuloConfiguration parent = createMock(AccumuloConfiguration.class);
     @SuppressWarnings("unchecked")
     Predicate<String> filter = createMock(Predicate.class);
     parent.getProperties(props, filter);
     replay(parent);
     String child1 = "child1";
-    List<String> children = new java.util.ArrayList<String>();
+    List<String> children = new java.util.ArrayList<>();
     children.add(child1);
     expect(zc.getChildren(PATH)).andReturn(children);
     replay(zc);
@@ -167,7 +167,7 @@ public class ZooCachePropertyAccessorTest {
 
   @Test
   public void testGetProperties_ParentFilter() {
-    Map<String,String> props = new java.util.HashMap<String,String>();
+    Map<String,String> props = new java.util.HashMap<>();
     AccumuloConfiguration parent = createMock(AccumuloConfiguration.class);
     @SuppressWarnings("unchecked")
     Predicate<String> filter = createMock(Predicate.class);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/test/java/org/apache/accumulo/server/fs/FileRefTest.java
----------------------------------------------------------------------
diff --git a/server/base/src/test/java/org/apache/accumulo/server/fs/FileRefTest.java b/server/base/src/test/java/org/apache/accumulo/server/fs/FileRefTest.java
index 402f689..14ca20c 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/fs/FileRefTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/fs/FileRefTest.java
@@ -60,7 +60,7 @@ public class FileRefTest {
     Assert.assertNotEquals(new FileRef("hdfs://1.2.3.4/accumulo/tables/2a/t-0003/C0005.rf"), new FileRef("hdfs://nn1/accumulo/tables/2a/t-0003/C0004.rf"));
     Assert.assertNotEquals(new FileRef("hdfs://nn1/accumulo/tables/2a/t-0003/C0005.rf"), new FileRef("hdfs://nn1/accumulo/tables/2a/t-0003/C0004.rf"));
 
-    HashMap<FileRef,String> refMap = new HashMap<FileRef,String>();
+    HashMap<FileRef,String> refMap = new HashMap<>();
     refMap.put(new FileRef("hdfs://1.2.3.4/accumulo/tables/2a/t-0003/C0004.rf"), "7");
     refMap.put(new FileRef("hdfs://nn1/accumulo/tables/2a/t-0003/C0005.rf"), "8");
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/test/java/org/apache/accumulo/server/fs/VolumeUtilTest.java
----------------------------------------------------------------------
diff --git a/server/base/src/test/java/org/apache/accumulo/server/fs/VolumeUtilTest.java b/server/base/src/test/java/org/apache/accumulo/server/fs/VolumeUtilTest.java
index 9fcd3e0..d04b124 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/fs/VolumeUtilTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/fs/VolumeUtilTest.java
@@ -42,10 +42,10 @@ public class VolumeUtilTest {
 
   @Test
   public void testSwitchVolume() {
-    List<Pair<Path,Path>> replacements = new ArrayList<Pair<Path,Path>>();
-    replacements.add(new Pair<Path,Path>(new Path("hdfs://nn1/accumulo"), new Path("viewfs:/a/accumulo")));
-    replacements.add(new Pair<Path,Path>(new Path("hdfs://nn1:9000/accumulo"), new Path("viewfs:/a/accumulo")));
-    replacements.add(new Pair<Path,Path>(new Path("hdfs://nn2/accumulo"), new Path("viewfs:/b/accumulo")));
+    List<Pair<Path,Path>> replacements = new ArrayList<>();
+    replacements.add(new Pair<>(new Path("hdfs://nn1/accumulo"), new Path("viewfs:/a/accumulo")));
+    replacements.add(new Pair<>(new Path("hdfs://nn1:9000/accumulo"), new Path("viewfs:/a/accumulo")));
+    replacements.add(new Pair<>(new Path("hdfs://nn2/accumulo"), new Path("viewfs:/b/accumulo")));
 
     Assert.assertEquals("viewfs:/a/accumulo/tables/t-00000/C000.rf",
         VolumeUtil.switchVolume("hdfs://nn1/accumulo/tables/t-00000/C000.rf", FileType.TABLE, replacements));
@@ -57,9 +57,9 @@ public class VolumeUtilTest {
     Assert.assertNull(VolumeUtil.switchVolume("file:/nn1/a/accumulo/tables/t-00000/C000.rf", FileType.TABLE, replacements));
 
     replacements.clear();
-    replacements.add(new Pair<Path,Path>(new Path("hdfs://nn1/d1/accumulo"), new Path("viewfs:/a/accumulo")));
-    replacements.add(new Pair<Path,Path>(new Path("hdfs://nn1:9000/d1/accumulo"), new Path("viewfs:/a/accumulo")));
-    replacements.add(new Pair<Path,Path>(new Path("hdfs://nn2/d2/accumulo"), new Path("viewfs:/b/accumulo")));
+    replacements.add(new Pair<>(new Path("hdfs://nn1/d1/accumulo"), new Path("viewfs:/a/accumulo")));
+    replacements.add(new Pair<>(new Path("hdfs://nn1:9000/d1/accumulo"), new Path("viewfs:/a/accumulo")));
+    replacements.add(new Pair<>(new Path("hdfs://nn2/d2/accumulo"), new Path("viewfs:/b/accumulo")));
 
     Assert.assertEquals("viewfs:/a/accumulo/tables/t-00000/C000.rf",
         VolumeUtil.switchVolume("hdfs://nn1/d1/accumulo/tables/t-00000/C000.rf", FileType.TABLE, replacements));
@@ -74,10 +74,10 @@ public class VolumeUtilTest {
 
   @Test
   public void testSwitchVolumesDifferentSourceDepths() {
-    List<Pair<Path,Path>> replacements = new ArrayList<Pair<Path,Path>>();
-    replacements.add(new Pair<Path,Path>(new Path("hdfs://nn1/accumulo"), new Path("viewfs:/a")));
-    replacements.add(new Pair<Path,Path>(new Path("hdfs://nn1:9000/accumulo"), new Path("viewfs:/a")));
-    replacements.add(new Pair<Path,Path>(new Path("hdfs://nn2/accumulo"), new Path("viewfs:/b")));
+    List<Pair<Path,Path>> replacements = new ArrayList<>();
+    replacements.add(new Pair<>(new Path("hdfs://nn1/accumulo"), new Path("viewfs:/a")));
+    replacements.add(new Pair<>(new Path("hdfs://nn1:9000/accumulo"), new Path("viewfs:/a")));
+    replacements.add(new Pair<>(new Path("hdfs://nn2/accumulo"), new Path("viewfs:/b")));
 
     Assert
         .assertEquals("viewfs:/a/tables/t-00000/C000.rf", VolumeUtil.switchVolume("hdfs://nn1/accumulo/tables/t-00000/C000.rf", FileType.TABLE, replacements));
@@ -89,9 +89,9 @@ public class VolumeUtilTest {
     Assert.assertNull(VolumeUtil.switchVolume("file:/nn1/a/accumulo/tables/t-00000/C000.rf", FileType.TABLE, replacements));
 
     replacements.clear();
-    replacements.add(new Pair<Path,Path>(new Path("hdfs://nn1/d1/accumulo"), new Path("viewfs:/a")));
-    replacements.add(new Pair<Path,Path>(new Path("hdfs://nn1:9000/d1/accumulo"), new Path("viewfs:/a")));
-    replacements.add(new Pair<Path,Path>(new Path("hdfs://nn2/d2/accumulo"), new Path("viewfs:/b")));
+    replacements.add(new Pair<>(new Path("hdfs://nn1/d1/accumulo"), new Path("viewfs:/a")));
+    replacements.add(new Pair<>(new Path("hdfs://nn1:9000/d1/accumulo"), new Path("viewfs:/a")));
+    replacements.add(new Pair<>(new Path("hdfs://nn2/d2/accumulo"), new Path("viewfs:/b")));
 
     Assert.assertEquals("viewfs:/a/tables/t-00000/C000.rf",
         VolumeUtil.switchVolume("hdfs://nn1/d1/accumulo/tables/t-00000/C000.rf", FileType.TABLE, replacements));
@@ -106,10 +106,10 @@ public class VolumeUtilTest {
 
   @Test
   public void testSwitchVolumesDifferentTargetDepths() {
-    List<Pair<Path,Path>> replacements = new ArrayList<Pair<Path,Path>>();
-    replacements.add(new Pair<Path,Path>(new Path("hdfs://nn1/accumulo"), new Path("viewfs:/path1/path2")));
-    replacements.add(new Pair<Path,Path>(new Path("hdfs://nn1:9000/accumulo"), new Path("viewfs:/path1/path2")));
-    replacements.add(new Pair<Path,Path>(new Path("hdfs://nn2/accumulo"), new Path("viewfs:/path3")));
+    List<Pair<Path,Path>> replacements = new ArrayList<>();
+    replacements.add(new Pair<>(new Path("hdfs://nn1/accumulo"), new Path("viewfs:/path1/path2")));
+    replacements.add(new Pair<>(new Path("hdfs://nn1:9000/accumulo"), new Path("viewfs:/path1/path2")));
+    replacements.add(new Pair<>(new Path("hdfs://nn2/accumulo"), new Path("viewfs:/path3")));
 
     Assert.assertEquals("viewfs:/path1/path2/tables/t-00000/C000.rf",
         VolumeUtil.switchVolume("hdfs://nn1/accumulo/tables/t-00000/C000.rf", FileType.TABLE, replacements));
@@ -121,9 +121,9 @@ public class VolumeUtilTest {
     Assert.assertNull(VolumeUtil.switchVolume("file:/nn1/a/accumulo/tables/t-00000/C000.rf", FileType.TABLE, replacements));
 
     replacements.clear();
-    replacements.add(new Pair<Path,Path>(new Path("hdfs://nn1/d1/accumulo"), new Path("viewfs:/path1/path2")));
-    replacements.add(new Pair<Path,Path>(new Path("hdfs://nn1:9000/d1/accumulo"), new Path("viewfs:/path1/path2")));
-    replacements.add(new Pair<Path,Path>(new Path("hdfs://nn2/d2/accumulo"), new Path("viewfs:/path3")));
+    replacements.add(new Pair<>(new Path("hdfs://nn1/d1/accumulo"), new Path("viewfs:/path1/path2")));
+    replacements.add(new Pair<>(new Path("hdfs://nn1:9000/d1/accumulo"), new Path("viewfs:/path1/path2")));
+    replacements.add(new Pair<>(new Path("hdfs://nn2/d2/accumulo"), new Path("viewfs:/path3")));
 
     Assert.assertEquals("viewfs:/path1/path2/tables/t-00000/C000.rf",
         VolumeUtil.switchVolume("hdfs://nn1/d1/accumulo/tables/t-00000/C000.rf", FileType.TABLE, replacements));
@@ -199,9 +199,9 @@ public class VolumeUtilTest {
 
   @Test
   public void testRootTableReplacement() throws IOException {
-    List<Pair<Path,Path>> replacements = new ArrayList<Pair<Path,Path>>();
-    replacements.add(new Pair<Path,Path>(new Path("file:/foo/v1"), new Path("file:/foo/v8")));
-    replacements.add(new Pair<Path,Path>(new Path("file:/foo/v2"), new Path("file:/foo/v9")));
+    List<Pair<Path,Path>> replacements = new ArrayList<>();
+    replacements.add(new Pair<>(new Path("file:/foo/v1"), new Path("file:/foo/v8")));
+    replacements.add(new Pair<>(new Path("file:/foo/v2"), new Path("file:/foo/v9")));
 
     FileType ft = FileType.TABLE;
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/test/java/org/apache/accumulo/server/iterators/MetadataBulkLoadFilterTest.java
----------------------------------------------------------------------
diff --git a/server/base/src/test/java/org/apache/accumulo/server/iterators/MetadataBulkLoadFilterTest.java b/server/base/src/test/java/org/apache/accumulo/server/iterators/MetadataBulkLoadFilterTest.java
index 04bcbde..a9a1f7b 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/iterators/MetadataBulkLoadFilterTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/iterators/MetadataBulkLoadFilterTest.java
@@ -78,8 +78,8 @@ public class MetadataBulkLoadFilterTest {
 
   @Test
   public void testBasic() throws IOException {
-    TreeMap<Key,Value> tm1 = new TreeMap<Key,Value>();
-    TreeMap<Key,Value> expected = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm1 = new TreeMap<>();
+    TreeMap<Key,Value> expected = new TreeMap<>();
 
     // following should not be deleted by filter
     put(tm1, "2;m", TabletsSection.ServerColumnFamily.DIRECTORY_COLUMN, "/t1");
@@ -117,7 +117,7 @@ public class MetadataBulkLoadFilterTest {
 
     iter.seek(new Range(), new ArrayList<ByteSequence>(), false);
 
-    TreeMap<Key,Value> actual = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> actual = new TreeMap<>();
 
     while (iter.hasTop()) {
       actual.put(iter.getTopKey(), iter.getTopValue());

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/test/java/org/apache/accumulo/server/master/balancer/ChaoticLoadBalancerTest.java
----------------------------------------------------------------------
diff --git a/server/base/src/test/java/org/apache/accumulo/server/master/balancer/ChaoticLoadBalancerTest.java b/server/base/src/test/java/org/apache/accumulo/server/master/balancer/ChaoticLoadBalancerTest.java
index 7101910..2697d75 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/master/balancer/ChaoticLoadBalancerTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/master/balancer/ChaoticLoadBalancerTest.java
@@ -44,11 +44,11 @@ import com.google.common.net.HostAndPort;
 public class ChaoticLoadBalancerTest {
 
   class FakeTServer {
-    List<KeyExtent> extents = new ArrayList<KeyExtent>();
+    List<KeyExtent> extents = new ArrayList<>();
 
     TabletServerStatus getStatus(TServerInstance server) {
       TabletServerStatus result = new TabletServerStatus();
-      result.tableMap = new HashMap<String,TableInfo>();
+      result.tableMap = new HashMap<>();
       for (KeyExtent extent : extents) {
         String table = extent.getTableId();
         TableInfo info = result.tableMap.get(table);
@@ -63,13 +63,13 @@ public class ChaoticLoadBalancerTest {
     }
   }
 
-  Map<TServerInstance,FakeTServer> servers = new HashMap<TServerInstance,FakeTServer>();
+  Map<TServerInstance,FakeTServer> servers = new HashMap<>();
 
   class TestChaoticLoadBalancer extends ChaoticLoadBalancer {
 
     @Override
     public List<TabletStats> getOnlineTabletsForTable(TServerInstance tserver, String table) throws ThriftSecurityException, TException {
-      List<TabletStats> result = new ArrayList<TabletStats>();
+      List<TabletStats> result = new ArrayList<>();
       for (KeyExtent extent : servers.get(tserver).extents) {
         if (extent.getTableId().equals(table)) {
           result.add(new TabletStats(extent.toThrift(), null, null, null, 0l, 0., 0., 0));
@@ -85,7 +85,7 @@ public class ChaoticLoadBalancerTest {
     servers.put(new TServerInstance(HostAndPort.fromParts("127.0.0.1", 1234), "a"), new FakeTServer());
     servers.put(new TServerInstance(HostAndPort.fromParts("127.0.0.1", 1235), "b"), new FakeTServer());
     servers.put(new TServerInstance(HostAndPort.fromParts("127.0.0.1", 1236), "c"), new FakeTServer());
-    Map<KeyExtent,TServerInstance> metadataTable = new TreeMap<KeyExtent,TServerInstance>();
+    Map<KeyExtent,TServerInstance> metadataTable = new TreeMap<>();
     String table = "t1";
     metadataTable.put(makeExtent(table, null, null), null);
     table = "t2";
@@ -101,19 +101,19 @@ public class ChaoticLoadBalancerTest {
 
     TestChaoticLoadBalancer balancer = new TestChaoticLoadBalancer();
 
-    SortedMap<TServerInstance,TabletServerStatus> current = new TreeMap<TServerInstance,TabletServerStatus>();
+    SortedMap<TServerInstance,TabletServerStatus> current = new TreeMap<>();
     for (Entry<TServerInstance,FakeTServer> entry : servers.entrySet()) {
       current.put(entry.getKey(), entry.getValue().getStatus(entry.getKey()));
     }
 
-    Map<KeyExtent,TServerInstance> assignments = new HashMap<KeyExtent,TServerInstance>();
+    Map<KeyExtent,TServerInstance> assignments = new HashMap<>();
     balancer.getAssignments(getAssignments(servers), metadataTable, assignments);
 
     assertEquals(assignments.size(), metadataTable.size());
   }
 
   SortedMap<TServerInstance,TabletServerStatus> getAssignments(Map<TServerInstance,FakeTServer> servers) {
-    SortedMap<TServerInstance,TabletServerStatus> result = new TreeMap<TServerInstance,TabletServerStatus>();
+    SortedMap<TServerInstance,TabletServerStatus> result = new TreeMap<>();
     for (Entry<TServerInstance,FakeTServer> entry : servers.entrySet()) {
       result.put(entry.getKey(), entry.getValue().getStatus(entry.getKey()));
     }
@@ -147,7 +147,7 @@ public class ChaoticLoadBalancerTest {
     Set<KeyExtent> migrations = Collections.emptySet();
 
     // Just want to make sure it gets some migrations, randomness prevents guarantee of a defined amount, or even expected amount
-    List<TabletMigration> migrationsOut = new ArrayList<TabletMigration>();
+    List<TabletMigration> migrationsOut = new ArrayList<>();
     while (migrationsOut.size() != 0) {
       balancer.balance(getAssignments(servers), migrations, migrationsOut);
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/test/java/org/apache/accumulo/server/master/balancer/DefaultLoadBalancerTest.java
----------------------------------------------------------------------
diff --git a/server/base/src/test/java/org/apache/accumulo/server/master/balancer/DefaultLoadBalancerTest.java b/server/base/src/test/java/org/apache/accumulo/server/master/balancer/DefaultLoadBalancerTest.java
index 20d85fe..e0bd2d1 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/master/balancer/DefaultLoadBalancerTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/master/balancer/DefaultLoadBalancerTest.java
@@ -48,11 +48,11 @@ import com.google.common.net.HostAndPort;
 public class DefaultLoadBalancerTest {
 
   class FakeTServer {
-    List<KeyExtent> extents = new ArrayList<KeyExtent>();
+    List<KeyExtent> extents = new ArrayList<>();
 
     TabletServerStatus getStatus(TServerInstance server) {
       TabletServerStatus result = new TabletServerStatus();
-      result.tableMap = new HashMap<String,TableInfo>();
+      result.tableMap = new HashMap<>();
       for (KeyExtent extent : extents) {
         String table = extent.getTableId();
         TableInfo info = result.tableMap.get(table);
@@ -67,14 +67,14 @@ public class DefaultLoadBalancerTest {
     }
   }
 
-  Map<TServerInstance,FakeTServer> servers = new HashMap<TServerInstance,FakeTServer>();
-  Map<KeyExtent,TServerInstance> last = new HashMap<KeyExtent,TServerInstance>();
+  Map<TServerInstance,FakeTServer> servers = new HashMap<>();
+  Map<KeyExtent,TServerInstance> last = new HashMap<>();
 
   class TestDefaultLoadBalancer extends DefaultLoadBalancer {
 
     @Override
     public List<TabletStats> getOnlineTabletsForTable(TServerInstance tserver, String table) throws ThriftSecurityException, TException {
-      List<TabletStats> result = new ArrayList<TabletStats>();
+      List<TabletStats> result = new ArrayList<>();
       for (KeyExtent extent : servers.get(tserver).extents) {
         if (extent.getTableId().equals(table)) {
           result.add(new TabletStats(extent.toThrift(), null, null, null, 0l, 0., 0., 0));
@@ -95,7 +95,7 @@ public class DefaultLoadBalancerTest {
     servers.put(new TServerInstance(HostAndPort.fromParts("127.0.0.1", 1234), "a"), new FakeTServer());
     servers.put(new TServerInstance(HostAndPort.fromParts("127.0.0.2", 1234), "b"), new FakeTServer());
     servers.put(new TServerInstance(HostAndPort.fromParts("127.0.0.3", 1234), "c"), new FakeTServer());
-    List<KeyExtent> metadataTable = new ArrayList<KeyExtent>();
+    List<KeyExtent> metadataTable = new ArrayList<>();
     String table = "t1";
     metadataTable.add(makeExtent(table, null, null));
     table = "t2";
@@ -112,14 +112,14 @@ public class DefaultLoadBalancerTest {
 
     TestDefaultLoadBalancer balancer = new TestDefaultLoadBalancer();
 
-    SortedMap<TServerInstance,TabletServerStatus> current = new TreeMap<TServerInstance,TabletServerStatus>();
+    SortedMap<TServerInstance,TabletServerStatus> current = new TreeMap<>();
     for (Entry<TServerInstance,FakeTServer> entry : servers.entrySet()) {
       current.put(entry.getKey(), entry.getValue().getStatus(entry.getKey()));
     }
     assignTablets(metadataTable, servers, current, balancer);
 
     // Verify that the counts on the tables are correct
-    Map<String,Integer> expectedCounts = new HashMap<String,Integer>();
+    Map<String,Integer> expectedCounts = new HashMap<>();
     expectedCounts.put("t1", 1);
     expectedCounts.put("t2", 1);
     expectedCounts.put("t3", 2);
@@ -131,7 +131,7 @@ public class DefaultLoadBalancerTest {
     }
 
     // Nothing should happen, we are balanced
-    ArrayList<TabletMigration> out = new ArrayList<TabletMigration>();
+    ArrayList<TabletMigration> out = new ArrayList<>();
     balancer.getMigrations(current, out);
     assertEquals(out.size(), 0);
 
@@ -158,7 +158,7 @@ public class DefaultLoadBalancerTest {
   }
 
   SortedMap<TServerInstance,TabletServerStatus> getAssignments(Map<TServerInstance,FakeTServer> servers) {
-    SortedMap<TServerInstance,TabletServerStatus> result = new TreeMap<TServerInstance,TabletServerStatus>();
+    SortedMap<TServerInstance,TabletServerStatus> result = new TreeMap<>();
     for (Entry<TServerInstance,FakeTServer> entry : servers.entrySet()) {
       result.put(entry.getKey(), entry.getValue().getStatus(entry.getKey()));
     }
@@ -192,7 +192,7 @@ public class DefaultLoadBalancerTest {
     int moved = 0;
     // balance until we can't balance no more!
     while (true) {
-      List<TabletMigration> migrationsOut = new ArrayList<TabletMigration>();
+      List<TabletMigration> migrationsOut = new ArrayList<>();
       balancer.balance(getAssignments(servers), migrations, migrationsOut);
       if (migrationsOut.size() == 0)
         break;
@@ -217,7 +217,7 @@ public class DefaultLoadBalancerTest {
       servers.put(tsi, fakeTServer);
     }
     // put 60 tablets on 25 of them
-    List<Entry<TServerInstance,FakeTServer>> shortList = new ArrayList<Entry<TServerInstance,FakeTServer>>(servers.entrySet());
+    List<Entry<TServerInstance,FakeTServer>> shortList = new ArrayList<>(servers.entrySet());
     Entry<TServerInstance,FakeTServer> shortServer = shortList.remove(0);
     int c = 0;
     for (int i = 0; i < 60; i++) {
@@ -235,7 +235,7 @@ public class DefaultLoadBalancerTest {
     int moved = 0;
     // balance until we can't balance no more!
     while (true) {
-      List<TabletMigration> migrationsOut = new ArrayList<TabletMigration>();
+      List<TabletMigration> migrationsOut = new ArrayList<>();
       balancer.balance(getAssignments(servers), migrations, migrationsOut);
       if (migrationsOut.size() == 0)
         break;
@@ -264,7 +264,7 @@ public class DefaultLoadBalancerTest {
 
     if (expectedCounts != null) {
       for (FakeTServer server : servers.values()) {
-        Map<String,Integer> counts = new HashMap<String,Integer>();
+        Map<String,Integer> counts = new HashMap<>();
         for (KeyExtent extent : server.extents) {
           String t = extent.getTableId();
           if (counts.get(t) == null)

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/test/java/org/apache/accumulo/server/master/balancer/GroupBalancerTest.java
----------------------------------------------------------------------
diff --git a/server/base/src/test/java/org/apache/accumulo/server/master/balancer/GroupBalancerTest.java b/server/base/src/test/java/org/apache/accumulo/server/master/balancer/GroupBalancerTest.java
index 65b43cc..f6c4e0d 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/master/balancer/GroupBalancerTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/master/balancer/GroupBalancerTest.java
@@ -84,7 +84,7 @@ public class GroupBalancerTest {
 
             @Override
             public Pair<KeyExtent,Location> apply(final Entry<KeyExtent,TServerInstance> input) {
-              return new Pair<KeyExtent,Location>(input.getKey(), new Location(input.getValue()));
+              return new Pair<>(input.getKey(), new Location(input.getValue()));
             }
           });
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/test/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancerReconfigurationTest.java
----------------------------------------------------------------------
diff --git a/server/base/src/test/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancerReconfigurationTest.java b/server/base/src/test/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancerReconfigurationTest.java
index eff9a11..504b39b 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancerReconfigurationTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancerReconfigurationTest.java
@@ -70,8 +70,8 @@ public class HostRegexTableLoadBalancerReconfigurationTest extends BaseHostRegex
         Assert.fail("tablet not in bounds: " + e.getKey() + " -> " + e.getValue().host());
       }
     }
-    Set<KeyExtent> migrations = new HashSet<KeyExtent>();
-    List<TabletMigration> migrationsOut = new ArrayList<TabletMigration>();
+    Set<KeyExtent> migrations = new HashSet<>();
+    List<TabletMigration> migrationsOut = new ArrayList<>();
     // Wait to trigger the out of bounds check which will call our version of getOnlineTabletsForTable
     UtilWaitThread.sleep(11000);
     this.balance(Collections.unmodifiableSortedMap(allTabletServers), migrations, migrationsOut);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/test/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancerTest.java
----------------------------------------------------------------------
diff --git a/server/base/src/test/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancerTest.java b/server/base/src/test/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancerTest.java
index 868ac0a..c0ccc48 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancerTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancerTest.java
@@ -325,7 +325,7 @@ public class HostRegexTableLoadBalancerTest extends BaseHostRegexTableLoadBalanc
     }
     SortedMap<TServerInstance,TabletServerStatus> current = createCurrent(15);
     // Remove the BAR tablet servers from current
-    List<TServerInstance> removals = new ArrayList<TServerInstance>();
+    List<TServerInstance> removals = new ArrayList<>();
     for (Entry<TServerInstance,TabletServerStatus> e : current.entrySet()) {
       if (e.getKey().host().equals("192.168.0.6") || e.getKey().host().equals("192.168.0.7") || e.getKey().host().equals("192.168.0.8")
           || e.getKey().host().equals("192.168.0.9") || e.getKey().host().equals("192.168.0.10")) {
@@ -350,8 +350,8 @@ public class HostRegexTableLoadBalancerTest extends BaseHostRegexTableLoadBalanc
     init((ServerConfiguration) factory);
     // Wait to trigger the out of bounds check which will call our version of getOnlineTabletsForTable
     UtilWaitThread.sleep(11000);
-    Set<KeyExtent> migrations = new HashSet<KeyExtent>();
-    List<TabletMigration> migrationsOut = new ArrayList<TabletMigration>();
+    Set<KeyExtent> migrations = new HashSet<>();
+    List<TabletMigration> migrationsOut = new ArrayList<>();
     this.balance(createCurrent(15), migrations, migrationsOut);
     Assert.assertEquals(2, migrationsOut.size());
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/test/java/org/apache/accumulo/server/master/balancer/TableLoadBalancerTest.java
----------------------------------------------------------------------
diff --git a/server/base/src/test/java/org/apache/accumulo/server/master/balancer/TableLoadBalancerTest.java b/server/base/src/test/java/org/apache/accumulo/server/master/balancer/TableLoadBalancerTest.java
index 7caa60b..f34cc3d 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/master/balancer/TableLoadBalancerTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/master/balancer/TableLoadBalancerTest.java
@@ -58,7 +58,7 @@ public class TableLoadBalancerTest {
 
   static private TabletServerStatus status(Object... config) {
     TabletServerStatus result = new TabletServerStatus();
-    result.tableMap = new HashMap<String,TableInfo>();
+    result.tableMap = new HashMap<>();
     String tablename = null;
     for (Object c : config) {
       if (c instanceof String) {
@@ -77,7 +77,7 @@ public class TableLoadBalancerTest {
   static SortedMap<TServerInstance,TabletServerStatus> state;
 
   static List<TabletStats> generateFakeTablets(TServerInstance tserver, String tableId) {
-    List<TabletStats> result = new ArrayList<TabletStats>();
+    List<TabletStats> result = new ArrayList<>();
     TabletServerStatus tableInfo = state.get(tserver);
     // generate some fake tablets
     for (int i = 0; i < tableInfo.tableMap.get(tableId).onlineTablets; i++) {
@@ -155,12 +155,12 @@ public class TableLoadBalancerTest {
     };
 
     String t1Id = TABLE_ID_MAP.get("t1"), t2Id = TABLE_ID_MAP.get("t2"), t3Id = TABLE_ID_MAP.get("t3");
-    state = new TreeMap<TServerInstance,TabletServerStatus>();
+    state = new TreeMap<>();
     TServerInstance svr = mkts("10.0.0.1", "0x01020304");
     state.put(svr, status(t1Id, 10, t2Id, 10, t3Id, 10));
 
     Set<KeyExtent> migrations = Collections.emptySet();
-    List<TabletMigration> migrationsOut = new ArrayList<TabletMigration>();
+    List<TabletMigration> migrationsOut = new ArrayList<>();
     TableLoadBalancer tls = new TableLoadBalancer();
     tls.init(confFactory);
     tls.balance(state, migrations, migrationsOut);
@@ -171,7 +171,7 @@ public class TableLoadBalancerTest {
     tls.init(confFactory);
     tls.balance(state, migrations, migrationsOut);
     int count = 0;
-    Map<String,Integer> movedByTable = new HashMap<String,Integer>();
+    Map<String,Integer> movedByTable = new HashMap<>();
     movedByTable.put(t1Id, Integer.valueOf(0));
     movedByTable.put(t2Id, Integer.valueOf(0));
     movedByTable.put(t3Id, Integer.valueOf(0));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/test/java/org/apache/accumulo/server/master/state/TabletLocationStateTest.java
----------------------------------------------------------------------
diff --git a/server/base/src/test/java/org/apache/accumulo/server/master/state/TabletLocationStateTest.java b/server/base/src/test/java/org/apache/accumulo/server/master/state/TabletLocationStateTest.java
index 0a0afd1..f270fe4 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/master/state/TabletLocationStateTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/master/state/TabletLocationStateTest.java
@@ -35,8 +35,8 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 
 public class TabletLocationStateTest {
-  private static final Collection<String> innerWalogs = new java.util.HashSet<String>();
-  private static final Collection<Collection<String>> walogs = new java.util.HashSet<Collection<String>>();
+  private static final Collection<String> innerWalogs = new java.util.HashSet<>();
+  private static final Collection<Collection<String>> walogs = new java.util.HashSet<>();
 
   @BeforeClass
   public static void setUpClass() {
@@ -137,7 +137,7 @@ public class TabletLocationStateTest {
 
   @Test
   public void testGetState_Assigned() throws Exception {
-    Set<TServerInstance> liveServers = new java.util.HashSet<TServerInstance>();
+    Set<TServerInstance> liveServers = new java.util.HashSet<>();
     liveServers.add(future);
     tls = new TabletLocationState(keyExtent, future, null, last, walogs, true);
     assertEquals(TabletState.ASSIGNED, tls.getState(liveServers));
@@ -145,7 +145,7 @@ public class TabletLocationStateTest {
 
   @Test
   public void testGetState_Hosted() throws Exception {
-    Set<TServerInstance> liveServers = new java.util.HashSet<TServerInstance>();
+    Set<TServerInstance> liveServers = new java.util.HashSet<>();
     liveServers.add(current);
     tls = new TabletLocationState(keyExtent, null, current, last, walogs, true);
     assertEquals(TabletState.HOSTED, tls.getState(liveServers));
@@ -153,7 +153,7 @@ public class TabletLocationStateTest {
 
   @Test
   public void testGetState_Dead1() throws Exception {
-    Set<TServerInstance> liveServers = new java.util.HashSet<TServerInstance>();
+    Set<TServerInstance> liveServers = new java.util.HashSet<>();
     liveServers.add(current);
     tls = new TabletLocationState(keyExtent, future, null, last, walogs, true);
     assertEquals(TabletState.ASSIGNED_TO_DEAD_SERVER, tls.getState(liveServers));
@@ -161,7 +161,7 @@ public class TabletLocationStateTest {
 
   @Test
   public void testGetState_Dead2() throws Exception {
-    Set<TServerInstance> liveServers = new java.util.HashSet<TServerInstance>();
+    Set<TServerInstance> liveServers = new java.util.HashSet<>();
     liveServers.add(future);
     tls = new TabletLocationState(keyExtent, null, current, last, walogs, true);
     assertEquals(TabletState.ASSIGNED_TO_DEAD_SERVER, tls.getState(liveServers));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/test/java/org/apache/accumulo/server/problems/ProblemReportingIteratorTest.java
----------------------------------------------------------------------
diff --git a/server/base/src/test/java/org/apache/accumulo/server/problems/ProblemReportingIteratorTest.java b/server/base/src/test/java/org/apache/accumulo/server/problems/ProblemReportingIteratorTest.java
index 1bcf165..ac91bdf 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/problems/ProblemReportingIteratorTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/problems/ProblemReportingIteratorTest.java
@@ -81,7 +81,7 @@ public class ProblemReportingIteratorTest {
   @Test
   public void testSeek() throws Exception {
     Range r = EasyMock.createMock(Range.class);
-    Collection<ByteSequence> f = new java.util.HashSet<ByteSequence>();
+    Collection<ByteSequence> f = new java.util.HashSet<>();
     ii.seek(r, f, true);
     replay(ii);
     pri.seek(r, f, true);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/test/java/org/apache/accumulo/server/rpc/RpcWrapperTest.java
----------------------------------------------------------------------
diff --git a/server/base/src/test/java/org/apache/accumulo/server/rpc/RpcWrapperTest.java b/server/base/src/test/java/org/apache/accumulo/server/rpc/RpcWrapperTest.java
index 39d3705..d32178e 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/rpc/RpcWrapperTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/rpc/RpcWrapperTest.java
@@ -22,7 +22,6 @@ import java.util.Map;
 import java.util.Set;
 
 import org.apache.accumulo.core.trace.wrappers.RpcServerInvocationHandler;
-import org.apache.accumulo.server.rpc.RpcWrapper;
 import org.apache.thrift.ProcessFunction;
 import org.apache.thrift.TBase;
 import org.apache.thrift.TException;
@@ -49,12 +48,12 @@ public class RpcWrapperTest {
    * @return A ProcessFunction.
    */
   private fake_proc<FakeService> createProcessFunction(String methodName, boolean isOneway) {
-    return new fake_proc<FakeService>(methodName, isOneway);
+    return new fake_proc<>(methodName, isOneway);
   }
 
   @Test
   public void testSomeOnewayMethods() {
-    Map<String,ProcessFunction<FakeService,?>> procs = new HashMap<String,ProcessFunction<FakeService,?>>();
+    Map<String,ProcessFunction<FakeService,?>> procs = new HashMap<>();
     procs.put("foo", createProcessFunction("foo", true));
     procs.put("foobar", createProcessFunction("foobar", false));
     procs.put("bar", createProcessFunction("bar", true));
@@ -66,7 +65,7 @@ public class RpcWrapperTest {
 
   @Test
   public void testNoOnewayMethods() {
-    Map<String,ProcessFunction<FakeService,?>> procs = new HashMap<String,ProcessFunction<FakeService,?>>();
+    Map<String,ProcessFunction<FakeService,?>> procs = new HashMap<>();
     procs.put("foo", createProcessFunction("foo", false));
     procs.put("foobar", createProcessFunction("foobar", false));
     procs.put("bar", createProcessFunction("bar", false));
@@ -78,7 +77,7 @@ public class RpcWrapperTest {
 
   @Test
   public void testAllOnewayMethods() {
-    Map<String,ProcessFunction<FakeService,?>> procs = new HashMap<String,ProcessFunction<FakeService,?>>();
+    Map<String,ProcessFunction<FakeService,?>> procs = new HashMap<>();
     procs.put("foo", createProcessFunction("foo", true));
     procs.put("foobar", createProcessFunction("foobar", true));
     procs.put("bar", createProcessFunction("bar", true));
@@ -196,7 +195,7 @@ public class RpcWrapperTest {
     public long barfoo() {
       return 0;
     }
-  };
+  }
 
   /**
    * A fake ProcessFunction implementation for testing that allows injection of method name and oneway.

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/test/java/org/apache/accumulo/server/rpc/TCredentialsUpdatingInvocationHandlerTest.java
----------------------------------------------------------------------
diff --git a/server/base/src/test/java/org/apache/accumulo/server/rpc/TCredentialsUpdatingInvocationHandlerTest.java b/server/base/src/test/java/org/apache/accumulo/server/rpc/TCredentialsUpdatingInvocationHandlerTest.java
index c4340c6..52eee25 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/rpc/TCredentialsUpdatingInvocationHandlerTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/rpc/TCredentialsUpdatingInvocationHandlerTest.java
@@ -63,7 +63,7 @@ public class TCredentialsUpdatingInvocationHandlerTest {
       }
     };
 
-    proxy = new TCredentialsUpdatingInvocationHandler<Object>(new Object(), conf);
+    proxy = new TCredentialsUpdatingInvocationHandler<>(new Object(), conf);
   }
 
   @After
@@ -123,7 +123,7 @@ public class TCredentialsUpdatingInvocationHandlerTest {
     final String proxyServer = "proxy";
     cc.set(Property.INSTANCE_RPC_SASL_PROXYUSERS.getKey() + proxyServer + ".users", "*");
     cc.set(Property.INSTANCE_RPC_SASL_PROXYUSERS.getKey() + proxyServer + ".hosts", "*");
-    proxy = new TCredentialsUpdatingInvocationHandler<Object>(new Object(), conf);
+    proxy = new TCredentialsUpdatingInvocationHandler<>(new Object(), conf);
     TCredentials tcreds = new TCredentials("client", KerberosToken.class.getName(), ByteBuffer.allocate(0), UUID.randomUUID().toString());
     UGIAssumingProcessor.rpcPrincipal.set(proxyServer);
     proxy.updateArgs(new Object[] {new Object(), tcreds});
@@ -134,7 +134,7 @@ public class TCredentialsUpdatingInvocationHandlerTest {
     final String proxyServer = "proxy";
     cc.set(Property.INSTANCE_RPC_SASL_ALLOWED_USER_IMPERSONATION, proxyServer + ":*");
     cc.set(Property.INSTANCE_RPC_SASL_ALLOWED_HOST_IMPERSONATION, "*");
-    proxy = new TCredentialsUpdatingInvocationHandler<Object>(new Object(), conf);
+    proxy = new TCredentialsUpdatingInvocationHandler<>(new Object(), conf);
     TCredentials tcreds = new TCredentials("client", KerberosToken.class.getName(), ByteBuffer.allocate(0), UUID.randomUUID().toString());
     UGIAssumingProcessor.rpcPrincipal.set(proxyServer);
     proxy.updateArgs(new Object[] {new Object(), tcreds});
@@ -146,7 +146,7 @@ public class TCredentialsUpdatingInvocationHandlerTest {
     final String proxyServer = "proxy";
     cc.set(Property.INSTANCE_RPC_SASL_PROXYUSERS.getKey() + proxyServer + ".users", "client1,client2");
     cc.set(Property.INSTANCE_RPC_SASL_PROXYUSERS.getKey() + proxyServer + ".hosts", "*");
-    proxy = new TCredentialsUpdatingInvocationHandler<Object>(new Object(), conf);
+    proxy = new TCredentialsUpdatingInvocationHandler<>(new Object(), conf);
     TCredentials tcreds = new TCredentials("client1", KerberosToken.class.getName(), ByteBuffer.allocate(0), UUID.randomUUID().toString());
     UGIAssumingProcessor.rpcPrincipal.set(proxyServer);
     proxy.updateArgs(new Object[] {new Object(), tcreds});
@@ -159,7 +159,7 @@ public class TCredentialsUpdatingInvocationHandlerTest {
     final String proxyServer = "proxy";
     cc.set(Property.INSTANCE_RPC_SASL_ALLOWED_USER_IMPERSONATION, proxyServer + ":client1,client2");
     cc.set(Property.INSTANCE_RPC_SASL_ALLOWED_HOST_IMPERSONATION, "*");
-    proxy = new TCredentialsUpdatingInvocationHandler<Object>(new Object(), conf);
+    proxy = new TCredentialsUpdatingInvocationHandler<>(new Object(), conf);
     TCredentials tcreds = new TCredentials("client1", KerberosToken.class.getName(), ByteBuffer.allocate(0), UUID.randomUUID().toString());
     UGIAssumingProcessor.rpcPrincipal.set(proxyServer);
     proxy.updateArgs(new Object[] {new Object(), tcreds});
@@ -174,7 +174,7 @@ public class TCredentialsUpdatingInvocationHandlerTest {
     // let "otherproxy" impersonate, but not "proxy"
     cc.set(Property.INSTANCE_RPC_SASL_PROXYUSERS.getKey() + "otherproxy" + ".users", "*");
     cc.set(Property.INSTANCE_RPC_SASL_PROXYUSERS.getKey() + "otherproxy" + ".hosts", "*");
-    proxy = new TCredentialsUpdatingInvocationHandler<Object>(new Object(), conf);
+    proxy = new TCredentialsUpdatingInvocationHandler<>(new Object(), conf);
     TCredentials tcreds = new TCredentials("client", KerberosToken.class.getName(), ByteBuffer.allocate(0), UUID.randomUUID().toString());
     UGIAssumingProcessor.rpcPrincipal.set(proxyServer);
     proxy.updateArgs(new Object[] {new Object(), tcreds});
@@ -186,7 +186,7 @@ public class TCredentialsUpdatingInvocationHandlerTest {
     // let "otherproxy" impersonate, but not "proxy"
     cc.set(Property.INSTANCE_RPC_SASL_ALLOWED_USER_IMPERSONATION, "otherproxy:*");
     cc.set(Property.INSTANCE_RPC_SASL_ALLOWED_HOST_IMPERSONATION, "*");
-    proxy = new TCredentialsUpdatingInvocationHandler<Object>(new Object(), conf);
+    proxy = new TCredentialsUpdatingInvocationHandler<>(new Object(), conf);
     TCredentials tcreds = new TCredentials("client", KerberosToken.class.getName(), ByteBuffer.allocate(0), UUID.randomUUID().toString());
     UGIAssumingProcessor.rpcPrincipal.set(proxyServer);
     proxy.updateArgs(new Object[] {new Object(), tcreds});
@@ -201,7 +201,7 @@ public class TCredentialsUpdatingInvocationHandlerTest {
     cc.set(Property.INSTANCE_RPC_SASL_PROXYUSERS.getKey() + "otherproxy1" + ".hosts", "*");
     cc.set(Property.INSTANCE_RPC_SASL_PROXYUSERS.getKey() + "otherproxy2" + ".users", "client1,client2");
     cc.set(Property.INSTANCE_RPC_SASL_PROXYUSERS.getKey() + "otherproxy2" + ".hosts", "*");
-    proxy = new TCredentialsUpdatingInvocationHandler<Object>(new Object(), conf);
+    proxy = new TCredentialsUpdatingInvocationHandler<>(new Object(), conf);
     TCredentials tcreds = new TCredentials("client1", KerberosToken.class.getName(), ByteBuffer.allocate(0), UUID.randomUUID().toString());
     UGIAssumingProcessor.rpcPrincipal.set(proxyServer);
     proxy.updateArgs(new Object[] {new Object(), tcreds});
@@ -213,7 +213,7 @@ public class TCredentialsUpdatingInvocationHandlerTest {
     // let "otherproxy" impersonate, but not "proxy"
     cc.set(Property.INSTANCE_RPC_SASL_ALLOWED_USER_IMPERSONATION, "otherproxy1:*;otherproxy2:client1,client2");
     cc.set(Property.INSTANCE_RPC_SASL_ALLOWED_HOST_IMPERSONATION, "*;*");
-    proxy = new TCredentialsUpdatingInvocationHandler<Object>(new Object(), conf);
+    proxy = new TCredentialsUpdatingInvocationHandler<>(new Object(), conf);
     TCredentials tcreds = new TCredentials("client1", KerberosToken.class.getName(), ByteBuffer.allocate(0), UUID.randomUUID().toString());
     UGIAssumingProcessor.rpcPrincipal.set(proxyServer);
     proxy.updateArgs(new Object[] {new Object(), tcreds});
@@ -225,7 +225,7 @@ public class TCredentialsUpdatingInvocationHandlerTest {
     final String proxyServer = "proxy", client = "client", host = "host.domain.com";
     cc.set(Property.INSTANCE_RPC_SASL_PROXYUSERS.getKey() + proxyServer + ".users", client);
     cc.set(Property.INSTANCE_RPC_SASL_PROXYUSERS.getKey() + proxyServer + ".hosts", host);
-    proxy = new TCredentialsUpdatingInvocationHandler<Object>(new Object(), conf);
+    proxy = new TCredentialsUpdatingInvocationHandler<>(new Object(), conf);
     TCredentials tcreds = new TCredentials("client", KerberosToken.class.getName(), ByteBuffer.allocate(0), UUID.randomUUID().toString());
     UGIAssumingProcessor.rpcPrincipal.set(proxyServer);
     TServerUtils.clientAddress.set(host);
@@ -237,7 +237,7 @@ public class TCredentialsUpdatingInvocationHandlerTest {
     final String proxyServer = "proxy", client = "client", host = "host.domain.com";
     cc.set(Property.INSTANCE_RPC_SASL_ALLOWED_USER_IMPERSONATION, proxyServer + ":" + client);
     cc.set(Property.INSTANCE_RPC_SASL_ALLOWED_HOST_IMPERSONATION, host);
-    proxy = new TCredentialsUpdatingInvocationHandler<Object>(new Object(), conf);
+    proxy = new TCredentialsUpdatingInvocationHandler<>(new Object(), conf);
     TCredentials tcreds = new TCredentials("client", KerberosToken.class.getName(), ByteBuffer.allocate(0), UUID.randomUUID().toString());
     UGIAssumingProcessor.rpcPrincipal.set(proxyServer);
     TServerUtils.clientAddress.set(host);
@@ -250,7 +250,7 @@ public class TCredentialsUpdatingInvocationHandlerTest {
     final String proxyServer = "proxy", client = "client", host = "host.domain.com";
     cc.set(Property.INSTANCE_RPC_SASL_PROXYUSERS.getKey() + proxyServer + ".users", client);
     cc.set(Property.INSTANCE_RPC_SASL_PROXYUSERS.getKey() + proxyServer + ".hosts", host);
-    proxy = new TCredentialsUpdatingInvocationHandler<Object>(new Object(), conf);
+    proxy = new TCredentialsUpdatingInvocationHandler<>(new Object(), conf);
     TCredentials tcreds = new TCredentials("client", KerberosToken.class.getName(), ByteBuffer.allocate(0), UUID.randomUUID().toString());
     UGIAssumingProcessor.rpcPrincipal.set(proxyServer);
     // The RPC came from a different host than is allowed
@@ -263,7 +263,7 @@ public class TCredentialsUpdatingInvocationHandlerTest {
     final String proxyServer = "proxy", client = "client", host = "host.domain.com";
     cc.set(Property.INSTANCE_RPC_SASL_ALLOWED_USER_IMPERSONATION, proxyServer + ":" + client);
     cc.set(Property.INSTANCE_RPC_SASL_ALLOWED_HOST_IMPERSONATION, host);
-    proxy = new TCredentialsUpdatingInvocationHandler<Object>(new Object(), conf);
+    proxy = new TCredentialsUpdatingInvocationHandler<>(new Object(), conf);
     TCredentials tcreds = new TCredentials("client", KerberosToken.class.getName(), ByteBuffer.allocate(0), UUID.randomUUID().toString());
     UGIAssumingProcessor.rpcPrincipal.set(proxyServer);
     // The RPC came from a different host than is allowed

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/test/java/org/apache/accumulo/server/security/handler/ZKAuthenticatorTest.java
----------------------------------------------------------------------
diff --git a/server/base/src/test/java/org/apache/accumulo/server/security/handler/ZKAuthenticatorTest.java b/server/base/src/test/java/org/apache/accumulo/server/security/handler/ZKAuthenticatorTest.java
index 827e772..1b0970d 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/security/handler/ZKAuthenticatorTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/security/handler/ZKAuthenticatorTest.java
@@ -55,7 +55,7 @@ public class ZKAuthenticatorTest extends TestCase {
   }
 
   public void testSystemConversion() {
-    Set<SystemPermission> perms = new TreeSet<SystemPermission>();
+    Set<SystemPermission> perms = new TreeSet<>();
     for (SystemPermission s : SystemPermission.values())
       perms.add(s);
 
@@ -66,7 +66,7 @@ public class ZKAuthenticatorTest extends TestCase {
   }
 
   public void testTableConversion() {
-    Set<TablePermission> perms = new TreeSet<TablePermission>();
+    Set<TablePermission> perms = new TreeSet<>();
     for (TablePermission s : TablePermission.values())
       perms.add(s);
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/test/java/org/apache/accumulo/server/tablets/LogicalTimeTest.java
----------------------------------------------------------------------
diff --git a/server/base/src/test/java/org/apache/accumulo/server/tablets/LogicalTimeTest.java b/server/base/src/test/java/org/apache/accumulo/server/tablets/LogicalTimeTest.java
index b491f0e..1076249 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/tablets/LogicalTimeTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/tablets/LogicalTimeTest.java
@@ -57,7 +57,7 @@ public class LogicalTimeTest {
 
   @Test
   public void testSetUpdateTimes() {
-    List<Mutation> ms = new java.util.ArrayList<Mutation>();
+    List<Mutation> ms = new java.util.ArrayList<>();
     ServerMutation m = createMock(ServerMutation.class);
     ServerMutation m2 = createMock(ServerMutation.class);
     m.setSystemTimestamp(1235L);
@@ -74,7 +74,7 @@ public class LogicalTimeTest {
 
   @Test
   public void testSetUpdateTimes_NoMutations() {
-    List<Mutation> ms = new java.util.ArrayList<Mutation>();
+    List<Mutation> ms = new java.util.ArrayList<>();
     assertEquals(TIME, ltime.setUpdateTimes(ms));
   }
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/test/java/org/apache/accumulo/server/tablets/MillisTimeTest.java
----------------------------------------------------------------------
diff --git a/server/base/src/test/java/org/apache/accumulo/server/tablets/MillisTimeTest.java b/server/base/src/test/java/org/apache/accumulo/server/tablets/MillisTimeTest.java
index 3ee220e..49f5913 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/tablets/MillisTimeTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/tablets/MillisTimeTest.java
@@ -59,7 +59,7 @@ public class MillisTimeTest {
 
   @Test
   public void testSetUpdateTimes() {
-    List<Mutation> ms = new java.util.ArrayList<Mutation>();
+    List<Mutation> ms = new java.util.ArrayList<>();
     ServerMutation m = createMock(ServerMutation.class);
     m.setSystemTimestamp(anyLong());
     replay(m);
@@ -71,7 +71,7 @@ public class MillisTimeTest {
 
   @Test
   public void testSetUpdateTimes_NoMutations() {
-    List<Mutation> ms = new java.util.ArrayList<Mutation>();
+    List<Mutation> ms = new java.util.ArrayList<>();
     assertEquals(TIME, mtime.setUpdateTimes(ms));
   }
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/test/java/org/apache/accumulo/server/util/DefaultMapTest.java
----------------------------------------------------------------------
diff --git a/server/base/src/test/java/org/apache/accumulo/server/util/DefaultMapTest.java b/server/base/src/test/java/org/apache/accumulo/server/util/DefaultMapTest.java
index 9ca2596..88aaa71 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/util/DefaultMapTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/util/DefaultMapTest.java
@@ -38,7 +38,7 @@ public class DefaultMapTest {
     assertNotNull(canConstruct);
     assertEquals(new AtomicInteger(0).get(), canConstruct.get());
 
-    DefaultMap<String,String> map = new DefaultMap<String,String>("");
+    DefaultMap<String,String> map = new DefaultMap<>("");
     assertEquals(map.get("foo"), "");
     map.put("foo", "bar");
     assertEquals(map.get("foo"), "bar");

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/test/java/org/apache/accumulo/server/util/FileSystemMonitorTest.java
----------------------------------------------------------------------
diff --git a/server/base/src/test/java/org/apache/accumulo/server/util/FileSystemMonitorTest.java b/server/base/src/test/java/org/apache/accumulo/server/util/FileSystemMonitorTest.java
index 7387035..95167d6 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/util/FileSystemMonitorTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/util/FileSystemMonitorTest.java
@@ -74,7 +74,7 @@ public class FileSystemMonitorTest {
     List<Mount> mounts = FileSystemMonitor.getMountsFromFile(reader);
     log.info("Filtered mount points: " + mounts);
     assertEquals(2, mounts.size());
-    Set<String> expectedCheckedMountPoints = new HashSet<String>();
+    Set<String> expectedCheckedMountPoints = new HashSet<>();
     expectedCheckedMountPoints.add("/");
     expectedCheckedMountPoints.add("/grid/0");
     for (Mount mount : mounts) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/test/java/org/apache/accumulo/server/util/FileUtilTest.java
----------------------------------------------------------------------
diff --git a/server/base/src/test/java/org/apache/accumulo/server/util/FileUtilTest.java b/server/base/src/test/java/org/apache/accumulo/server/util/FileUtilTest.java
index 7bded1a..a826acf 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/util/FileUtilTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/util/FileUtilTest.java
@@ -66,7 +66,7 @@ public class FileUtilTest {
 
   @Test
   public void testToPathStrings() {
-    Collection<FileRef> c = new java.util.ArrayList<FileRef>();
+    Collection<FileRef> c = new java.util.ArrayList<>();
     FileRef r1 = createMock(FileRef.class);
     expect(r1.path()).andReturn(new Path("/foo"));
     replay(r1);
@@ -91,7 +91,7 @@ public class FileUtilTest {
     assertTrue(tmp1.mkdirs() || tmp1.isDirectory());
     Path tmpPath1 = new Path(tmp1.toURI());
 
-    HashMap<Property,String> testProps = new HashMap<Property,String>();
+    HashMap<Property,String> testProps = new HashMap<>();
     testProps.put(Property.INSTANCE_DFS_DIR, accumuloDir.getAbsolutePath());
 
     AccumuloConfiguration testConf = new FileUtilTestConfiguration(testProps);
@@ -118,7 +118,7 @@ public class FileUtilTest {
     assertTrue(tmp2.mkdirs() || tmp2.isDirectory());
     Path tmpPath1 = new Path(tmp1.toURI()), tmpPath2 = new Path(tmp2.toURI());
 
-    HashMap<Property,String> testProps = new HashMap<Property,String>();
+    HashMap<Property,String> testProps = new HashMap<>();
     testProps.put(Property.INSTANCE_VOLUMES, v1.toURI().toString() + "," + v2.toURI().toString());
 
     AccumuloConfiguration testConf = new FileUtilTestConfiguration(testProps);
@@ -150,7 +150,7 @@ public class FileUtilTest {
     assertTrue(tmp2.mkdirs() || tmp2.isDirectory());
     Path tmpPath1 = new Path(tmp1.toURI()), tmpPath2 = new Path(tmp2.toURI());
 
-    HashMap<Property,String> testProps = new HashMap<Property,String>();
+    HashMap<Property,String> testProps = new HashMap<>();
     testProps.put(Property.INSTANCE_VOLUMES, v1.toURI().toString() + "," + v2.toURI().toString());
 
     AccumuloConfiguration testConf = new FileUtilTestConfiguration(testProps);
@@ -178,7 +178,7 @@ public class FileUtilTest {
     assertTrue(tmp2.mkdirs() || tmp2.isDirectory());
     Path tmpPath1 = new Path(tmp1.toURI()), tmpPath2 = new Path(tmp2.toURI());
 
-    HashMap<Property,String> testProps = new HashMap<Property,String>();
+    HashMap<Property,String> testProps = new HashMap<>();
     testProps.put(Property.INSTANCE_VOLUMES, v1.toURI().toString() + "," + v2.toURI().toString());
 
     AccumuloConfiguration testConf = new FileUtilTestConfiguration(testProps);
@@ -207,7 +207,7 @@ public class FileUtilTest {
     assertTrue(tmp2.mkdirs() || tmp2.isDirectory());
     Path tmpPath1 = new Path(tmp1.toURI()), tmpPath2 = new Path(tmp2.toURI());
 
-    HashMap<Property,String> testProps = new HashMap<Property,String>();
+    HashMap<Property,String> testProps = new HashMap<>();
     testProps.put(Property.INSTANCE_VOLUMES, v1.toURI().toString() + "," + v2.toURI().toString());
 
     AccumuloConfiguration testConf = new FileUtilTestConfiguration(testProps);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/test/java/org/apache/accumulo/server/util/ReplicationTableUtilTest.java
----------------------------------------------------------------------
diff --git a/server/base/src/test/java/org/apache/accumulo/server/util/ReplicationTableUtilTest.java b/server/base/src/test/java/org/apache/accumulo/server/util/ReplicationTableUtilTest.java
index 828732d..e135c36 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/util/ReplicationTableUtilTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/util/ReplicationTableUtilTest.java
@@ -65,7 +65,7 @@ public class ReplicationTableUtilTest {
   public void properPathInRow() throws Exception {
     Writer writer = EasyMock.createNiceMock(Writer.class);
     writer.update(EasyMock.anyObject(Mutation.class));
-    final List<Mutation> mutations = new ArrayList<Mutation>();
+    final List<Mutation> mutations = new ArrayList<>();
 
     // Mock a Writer to just add the mutation to a list
     EasyMock.expectLastCall().andAnswer(new IAnswer<Object>() {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/test/java/org/apache/accumulo/server/util/TServerUtilsTest.java
----------------------------------------------------------------------
diff --git a/server/base/src/test/java/org/apache/accumulo/server/util/TServerUtilsTest.java b/server/base/src/test/java/org/apache/accumulo/server/util/TServerUtilsTest.java
index 03d4aaa..37d127a 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/util/TServerUtilsTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/util/TServerUtilsTest.java
@@ -344,7 +344,7 @@ public class TServerUtilsTest {
     AccumuloServerContext ctx = new AccumuloServerContext(factory);
     ClientServiceHandler clientHandler = new ClientServiceHandler(ctx, null, null);
     Iface rpcProxy = RpcWrapper.service(clientHandler, new Processor<Iface>(clientHandler));
-    Processor<Iface> processor = new Processor<Iface>(rpcProxy);
+    Processor<Iface> processor = new Processor<>(rpcProxy);
     // "localhost" explicitly to make sure we can always bind to that interface (avoids DNS misconfiguration)
     String hostname = "localhost";
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionAlgorithm.java
----------------------------------------------------------------------
diff --git a/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionAlgorithm.java b/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionAlgorithm.java
index 9f94622..1e15324 100644
--- a/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionAlgorithm.java
+++ b/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionAlgorithm.java
@@ -81,7 +81,7 @@ public class GarbageCollectionAlgorithm {
     }
 
     if (containsEmpty) {
-      ArrayList<String> tmp = new ArrayList<String>();
+      ArrayList<String> tmp = new ArrayList<>();
       for (String token : tokens) {
         if (!token.equals("")) {
           tmp.add(token);
@@ -112,7 +112,7 @@ public class GarbageCollectionAlgorithm {
 
   private SortedMap<String,String> makeRelative(Collection<String> candidates) {
 
-    SortedMap<String,String> ret = new TreeMap<String,String>();
+    SortedMap<String,String> ret = new TreeMap<>();
 
     for (String candidate : candidates) {
       String relPath;
@@ -243,7 +243,7 @@ public class GarbageCollectionAlgorithm {
   }
 
   private void cleanUpDeletedTableDirs(GarbageCollectionEnvironment gce, SortedMap<String,String> candidateMap) throws IOException {
-    HashSet<String> tableIdsWithDeletes = new HashSet<String>();
+    HashSet<String> tableIdsWithDeletes = new HashSet<>();
 
     // find the table ids that had dirs deleted
     for (String delete : candidateMap.keySet()) {
@@ -305,7 +305,7 @@ public class GarbageCollectionAlgorithm {
 
     boolean outOfMemory = true;
     while (outOfMemory) {
-      List<String> candidates = new ArrayList<String>();
+      List<String> candidates = new ArrayList<>();
 
       outOfMemory = getCandidates(gce, lastCandidate, candidates);
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
----------------------------------------------------------------------
diff --git a/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java b/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
index c3efe5a..1593c75 100644
--- a/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
+++ b/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
@@ -719,9 +719,9 @@ public class SimpleGarbageCollector extends AccumuloServerContext implements Ifa
     final Processor<Iface> processor;
     if (ThriftServerType.SASL == getThriftServerType()) {
       Iface tcProxy = TCredentialsUpdatingWrapper.service(rpcProxy, getClass(), getConfiguration());
-      processor = new Processor<Iface>(tcProxy);
+      processor = new Processor<>(tcProxy);
     } else {
-      processor = new Processor<Iface>(rpcProxy);
+      processor = new Processor<>(rpcProxy);
     }
     int port[] = getConfiguration().getPort(Property.GC_PORT);
     HostAndPort[] addresses = TServerUtils.getHostAndPorts(this.opts.getAddress(), port);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/gc/src/test/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogsTest.java
----------------------------------------------------------------------
diff --git a/server/gc/src/test/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogsTest.java b/server/gc/src/test/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogsTest.java
index 60d6026..691d02d 100644
--- a/server/gc/src/test/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogsTest.java
+++ b/server/gc/src/test/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogsTest.java
@@ -88,7 +88,7 @@ public class GarbageCollectWriteAheadLogsTest {
     EasyMock.expect(tserverSet.getCurrentServers()).andReturn(Collections.singleton(server1));
 
     EasyMock.expect(marker.getAllMarkers()).andReturn(markers).once();
-    EasyMock.expect(marker.state(server1, id)).andReturn(new Pair<WalState,Path>(WalState.UNREFERENCED, path));
+    EasyMock.expect(marker.state(server1, id)).andReturn(new Pair<>(WalState.UNREFERENCED, path));
     EasyMock.expect(fs.deleteRecursively(path)).andReturn(true).once();
     marker.removeWalMarker(server1, id);
     EasyMock.expectLastCall().once();
@@ -114,7 +114,7 @@ public class GarbageCollectWriteAheadLogsTest {
 
     EasyMock.expect(tserverSet.getCurrentServers()).andReturn(Collections.singleton(server1));
     EasyMock.expect(marker.getAllMarkers()).andReturn(markers).once();
-    EasyMock.expect(marker.state(server1, id)).andReturn(new Pair<WalState,Path>(WalState.CLOSED, path));
+    EasyMock.expect(marker.state(server1, id)).andReturn(new Pair<>(WalState.CLOSED, path));
     EasyMock.replay(context, marker, tserverSet, fs);
     GarbageCollectWriteAheadLogs gc = new GarbageCollectWriteAheadLogs(context, fs, false, tserverSet, marker, tabletOnServer1List) {
       @Override
@@ -215,7 +215,7 @@ public class GarbageCollectWriteAheadLogsTest {
 
     EasyMock.expect(tserverSet.getCurrentServers()).andReturn(Collections.singleton(server1));
     EasyMock.expect(marker.getAllMarkers()).andReturn(markers).once();
-    EasyMock.expect(marker.state(server1, id)).andReturn(new Pair<WalState,Path>(WalState.UNREFERENCED, path));
+    EasyMock.expect(marker.state(server1, id)).andReturn(new Pair<>(WalState.UNREFERENCED, path));
     EasyMock.expect(context.getConnector()).andReturn(conn);
 
     EasyMock.expect(conn.createScanner(ReplicationTable.NAME, Authorizations.EMPTY)).andReturn(rscanner);


[24/32] accumulo git commit: ACCUMULO-4357 Remove unneeded code for readability

Posted by ct...@apache.org.
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/examples/simple/src/main/java/org/apache/accumulo/examples/simple/reservations/ARS.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/reservations/ARS.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/reservations/ARS.java
index d99f7af..eff8e21 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/reservations/ARS.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/reservations/ARS.java
@@ -220,7 +220,7 @@ public class ARS {
       scanner.setRange(new Range(row));
       scanner.fetchColumnFamily(new Text("res"));
 
-      List<String> reservations = new ArrayList<String>();
+      List<String> reservations = new ArrayList<>();
 
       for (Entry<Key,Value> entry : scanner) {
         String val = entry.getValue().toString();
@@ -246,7 +246,7 @@ public class ARS {
         // start up multiple threads all trying to reserve the same resource, no more than one should succeed
 
         final ARS fars = ars;
-        ArrayList<Thread> threads = new ArrayList<Thread>();
+        ArrayList<Thread> threads = new ArrayList<>();
         for (int i = 3; i < tokens.length; i++) {
           final int whoIndex = i;
           Runnable reservationTask = new Runnable() {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shard/ContinuousQuery.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shard/ContinuousQuery.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shard/ContinuousQuery.java
index 6f0ceac..604c851 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shard/ContinuousQuery.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shard/ContinuousQuery.java
@@ -98,8 +98,8 @@ public class ContinuousQuery {
 
     Text currentRow = null;
 
-    ArrayList<Text> words = new ArrayList<Text>();
-    ArrayList<Text[]> ret = new ArrayList<Text[]>();
+    ArrayList<Text> words = new ArrayList<>();
+    ArrayList<Text[]> ret = new ArrayList<>();
 
     Random rand = new Random();
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shard/Index.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shard/Index.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shard/Index.java
index bc76c03..ba1e32e 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shard/Index.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shard/Index.java
@@ -53,7 +53,7 @@ public class Index {
 
     Mutation m = new Mutation(partition);
 
-    HashSet<String> tokensSeen = new HashSet<String>();
+    HashSet<String> tokensSeen = new HashSet<>();
 
     for (String token : tokens) {
       token = token.toLowerCase();
@@ -98,7 +98,7 @@ public class Index {
     @Parameter(names = "--partitions", required = true, description = "the number of shards to create")
     int partitions;
     @Parameter(required = true, description = "<file> { <file> ... }")
-    List<String> files = new ArrayList<String>();
+    List<String> files = new ArrayList<>();
   }
 
   public static void main(String[] args) throws Exception {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shard/Query.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shard/Query.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shard/Query.java
index 72a6384..13adcca 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shard/Query.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shard/Query.java
@@ -46,7 +46,7 @@ public class Query {
 
   static class Opts extends ClientOnRequiredTable {
     @Parameter(description = " term { <term> ... }")
-    List<String> terms = new ArrayList<String>();
+    List<String> terms = new ArrayList<>();
 
     @Parameter(names = {"--sample"}, description = "Do queries against sample, useful when sample is built using column qualifier")
     private boolean useSample = false;
@@ -76,7 +76,7 @@ public class Query {
     IntersectingIterator.setColumnFamilies(ii, columns);
     bs.addScanIterator(ii);
     bs.setRanges(Collections.singleton(new Range()));
-    List<String> result = new ArrayList<String>();
+    List<String> result = new ArrayList<>();
     for (Entry<Key,Value> entry : bs) {
       result.add(entry.getKey().getColumnQualifier().toString());
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shell/DebugCommand.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shell/DebugCommand.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shell/DebugCommand.java
index e429f62..4395fe7 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shell/DebugCommand.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shell/DebugCommand.java
@@ -27,7 +27,7 @@ public class DebugCommand extends Command {
 
   @Override
   public int execute(String fullCommand, CommandLine cl, Shell shellState) throws Exception {
-    Set<String> lines = new TreeSet<String>();
+    Set<String> lines = new TreeSet<>();
     lines.add("This is a test");
     shellState.printLines(lines.iterator(), true);
     return 0;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/examples/simple/src/test/java/org/apache/accumulo/examples/simple/filedata/ChunkCombinerTest.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/test/java/org/apache/accumulo/examples/simple/filedata/ChunkCombinerTest.java b/examples/simple/src/test/java/org/apache/accumulo/examples/simple/filedata/ChunkCombinerTest.java
index 9efd68b..40f4bb9 100644
--- a/examples/simple/src/test/java/org/apache/accumulo/examples/simple/filedata/ChunkCombinerTest.java
+++ b/examples/simple/src/test/java/org/apache/accumulo/examples/simple/filedata/ChunkCombinerTest.java
@@ -135,22 +135,22 @@ public class ChunkCombinerTest extends TestCase {
 
   @Override
   protected void setUp() {
-    row1 = new TreeMap<Key,Value>();
-    row2 = new TreeMap<Key,Value>();
-    row3 = new TreeMap<Key,Value>();
-    allRows = new TreeMap<Key,Value>();
+    row1 = new TreeMap<>();
+    row2 = new TreeMap<>();
+    row3 = new TreeMap<>();
+    allRows = new TreeMap<>();
 
-    cRow1 = new TreeMap<Key,Value>();
-    cRow2 = new TreeMap<Key,Value>();
-    cRow3 = new TreeMap<Key,Value>();
-    allCRows = new TreeMap<Key,Value>();
+    cRow1 = new TreeMap<>();
+    cRow2 = new TreeMap<>();
+    cRow3 = new TreeMap<>();
+    allCRows = new TreeMap<>();
 
-    cOnlyRow1 = new TreeMap<Key,Value>();
-    cOnlyRow2 = new TreeMap<Key,Value>();
-    cOnlyRow3 = new TreeMap<Key,Value>();
-    allCOnlyRows = new TreeMap<Key,Value>();
+    cOnlyRow1 = new TreeMap<>();
+    cOnlyRow2 = new TreeMap<>();
+    cOnlyRow3 = new TreeMap<>();
+    allCOnlyRows = new TreeMap<>();
 
-    badrow = new TreeMap<Key,Value>();
+    badrow = new TreeMap<>();
 
     String refs = FileDataIngest.REFS_CF.toString();
     String fileext = FileDataIngest.REFS_FILE_EXT;
@@ -218,7 +218,7 @@ public class ChunkCombinerTest extends TestCase {
     allCOnlyRows.putAll(cOnlyRow3);
   }
 
-  private static final Collection<ByteSequence> emptyColfs = new HashSet<ByteSequence>();
+  private static final Collection<ByteSequence> emptyColfs = new HashSet<>();
 
   public void test1() throws IOException {
     runTest(false, allRows, allCRows, emptyColfs);
@@ -241,7 +241,7 @@ public class ChunkCombinerTest extends TestCase {
     iter = iter.deepCopy(null);
     iter.seek(new Range(), cols, true);
 
-    TreeMap<Key,Value> seen = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> seen = new TreeMap<>();
 
     while (iter.hasTop()) {
       assertFalse("already contains " + iter.getTopKey(), seen.containsKey(iter.getTopKey()));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/examples/simple/src/test/java/org/apache/accumulo/examples/simple/filedata/ChunkInputStreamTest.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/test/java/org/apache/accumulo/examples/simple/filedata/ChunkInputStreamTest.java b/examples/simple/src/test/java/org/apache/accumulo/examples/simple/filedata/ChunkInputStreamTest.java
index 4f249fb..2796d47 100644
--- a/examples/simple/src/test/java/org/apache/accumulo/examples/simple/filedata/ChunkInputStreamTest.java
+++ b/examples/simple/src/test/java/org/apache/accumulo/examples/simple/filedata/ChunkInputStreamTest.java
@@ -43,7 +43,7 @@ public class ChunkInputStreamTest {
 
   @Before
   public void setupData() {
-    data = new ArrayList<Entry<Key,Value>>();
+    data = new ArrayList<>();
     addData(data, "a", "refs", "id\0ext", "A&B", "ext");
     addData(data, "a", "refs", "id\0name", "A&B", "name");
     addData(data, "a", "~chunk", 100, 0, "A&B", "asdfjkl;");
@@ -61,7 +61,7 @@ public class ChunkInputStreamTest {
     addData(data, "d", "~chunk", 100, 0, "A&B", "");
     addData(data, "e", "~chunk", 100, 0, "A&B", "asdfjkl;");
     addData(data, "e", "~chunk", 100, 1, "A&B", "");
-    baddata = new ArrayList<Entry<Key,Value>>();
+    baddata = new ArrayList<>();
     addData(baddata, "a", "~chunk", 100, 0, "A", "asdfjkl;");
     addData(baddata, "b", "~chunk", 100, 0, "B", "asdfjkl;");
     addData(baddata, "b", "~chunk", 100, 2, "C", "");
@@ -75,7 +75,7 @@ public class ChunkInputStreamTest {
     addData(baddata, "e", "~chunk", 100, 2, "I", "asdfjkl;");
     addData(baddata, "f", "~chunk", 100, 2, "K", "asdfjkl;");
     addData(baddata, "g", "~chunk", 100, 0, "L", "");
-    multidata = new ArrayList<Entry<Key,Value>>();
+    multidata = new ArrayList<>();
     addData(multidata, "a", "~chunk", 100, 0, "A&B", "asdfjkl;");
     addData(multidata, "a", "~chunk", 100, 1, "A&B", "");
     addData(multidata, "a", "~chunk", 200, 0, "B&C", "asdfjkl;");
@@ -99,8 +99,8 @@ public class ChunkInputStreamTest {
   @Test
   public void testExceptionOnMultipleSetSourceWithoutClose() throws IOException {
     ChunkInputStream cis = new ChunkInputStream();
-    PeekingIterator<Entry<Key,Value>> pi = new PeekingIterator<Entry<Key,Value>>(data.iterator());
-    pi = new PeekingIterator<Entry<Key,Value>>(data.iterator());
+    PeekingIterator<Entry<Key,Value>> pi = new PeekingIterator<>(data.iterator());
+    pi = new PeekingIterator<>(data.iterator());
     cis.setSource(pi);
     try {
       cis.setSource(pi);
@@ -114,7 +114,7 @@ public class ChunkInputStreamTest {
   @Test
   public void testExceptionOnGetVisBeforeClose() throws IOException {
     ChunkInputStream cis = new ChunkInputStream();
-    PeekingIterator<Entry<Key,Value>> pi = new PeekingIterator<Entry<Key,Value>>(data.iterator());
+    PeekingIterator<Entry<Key,Value>> pi = new PeekingIterator<>(data.iterator());
 
     cis.setSource(pi);
     try {
@@ -132,7 +132,7 @@ public class ChunkInputStreamTest {
     ChunkInputStream cis = new ChunkInputStream();
     byte[] b = new byte[5];
 
-    PeekingIterator<Entry<Key,Value>> pi = new PeekingIterator<Entry<Key,Value>>(data.iterator());
+    PeekingIterator<Entry<Key,Value>> pi = new PeekingIterator<>(data.iterator());
 
     cis.setSource(pi);
     int read;
@@ -184,7 +184,7 @@ public class ChunkInputStreamTest {
     ChunkInputStream cis = new ChunkInputStream();
     byte[] b = new byte[20];
     int read;
-    PeekingIterator<Entry<Key,Value>> pi = new PeekingIterator<Entry<Key,Value>>(data.iterator());
+    PeekingIterator<Entry<Key,Value>> pi = new PeekingIterator<>(data.iterator());
 
     cis.setSource(pi);
     assertEquals(read = cis.read(b), 8);
@@ -243,7 +243,7 @@ public class ChunkInputStreamTest {
     ChunkInputStream cis = new ChunkInputStream();
     byte[] b = new byte[20];
     int read;
-    PeekingIterator<Entry<Key,Value>> pi = new PeekingIterator<Entry<Key,Value>>(baddata.iterator());
+    PeekingIterator<Entry<Key,Value>> pi = new PeekingIterator<>(baddata.iterator());
 
     cis.setSource(pi);
     assumeExceptionOnRead(cis, b);
@@ -289,7 +289,7 @@ public class ChunkInputStreamTest {
 
     assertFalse(pi.hasNext());
 
-    pi = new PeekingIterator<Entry<Key,Value>>(baddata.iterator());
+    pi = new PeekingIterator<>(baddata.iterator());
     cis.setSource(pi);
     assumeExceptionOnClose(cis);
   }
@@ -299,7 +299,7 @@ public class ChunkInputStreamTest {
     ChunkInputStream cis = new ChunkInputStream();
     byte[] b = new byte[20];
     int read;
-    PeekingIterator<Entry<Key,Value>> pi = new PeekingIterator<Entry<Key,Value>>(baddata.iterator());
+    PeekingIterator<Entry<Key,Value>> pi = new PeekingIterator<>(baddata.iterator());
 
     cis.setSource(pi);
     assumeExceptionOnRead(cis, b);
@@ -340,7 +340,7 @@ public class ChunkInputStreamTest {
 
     assertFalse(pi.hasNext());
 
-    pi = new PeekingIterator<Entry<Key,Value>>(baddata.iterator());
+    pi = new PeekingIterator<>(baddata.iterator());
     cis.setSource(pi);
     assumeExceptionOnClose(cis);
   }
@@ -350,7 +350,7 @@ public class ChunkInputStreamTest {
     ChunkInputStream cis = new ChunkInputStream();
     byte[] b = new byte[20];
     int read;
-    PeekingIterator<Entry<Key,Value>> pi = new PeekingIterator<Entry<Key,Value>>(multidata.iterator());
+    PeekingIterator<Entry<Key,Value>> pi = new PeekingIterator<>(multidata.iterator());
 
     b = new byte[20];
 
@@ -377,7 +377,7 @@ public class ChunkInputStreamTest {
   @Test
   public void testSingleByteRead() throws IOException {
     ChunkInputStream cis = new ChunkInputStream();
-    PeekingIterator<Entry<Key,Value>> pi = new PeekingIterator<Entry<Key,Value>>(data.iterator());
+    PeekingIterator<Entry<Key,Value>> pi = new PeekingIterator<>(data.iterator());
 
     cis.setSource(pi);
     assertEquals((byte) 'a', (byte) cis.read());

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/fate/src/main/java/org/apache/accumulo/fate/AdminUtil.java
----------------------------------------------------------------------
diff --git a/fate/src/main/java/org/apache/accumulo/fate/AdminUtil.java b/fate/src/main/java/org/apache/accumulo/fate/AdminUtil.java
index 8532e92..f6aa811 100644
--- a/fate/src/main/java/org/apache/accumulo/fate/AdminUtil.java
+++ b/fate/src/main/java/org/apache/accumulo/fate/AdminUtil.java
@@ -68,15 +68,15 @@ public class AdminUtil<T> {
 
   public void print(ReadOnlyTStore<T> zs, IZooReaderWriter zk, String lockPath, Formatter fmt, Set<Long> filterTxid, EnumSet<TStatus> filterStatus)
       throws KeeperException, InterruptedException {
-    Map<Long,List<String>> heldLocks = new HashMap<Long,List<String>>();
-    Map<Long,List<String>> waitingLocks = new HashMap<Long,List<String>>();
+    Map<Long,List<String>> heldLocks = new HashMap<>();
+    Map<Long,List<String>> waitingLocks = new HashMap<>();
 
     List<String> lockedIds = zk.getChildren(lockPath);
 
     for (String id : lockedIds) {
       try {
         List<String> lockNodes = zk.getChildren(lockPath + "/" + id);
-        lockNodes = new ArrayList<String>(lockNodes);
+        lockNodes = new ArrayList<>(lockNodes);
         Collections.sort(lockNodes);
 
         int pos = 0;
@@ -104,7 +104,7 @@ public class AdminUtil<T> {
 
             List<String> tables = locks.get(Long.parseLong(lda[1], 16));
             if (tables == null) {
-              tables = new ArrayList<String>();
+              tables = new ArrayList<>();
               locks.put(Long.parseLong(lda[1], 16), tables);
             }
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/fate/src/main/java/org/apache/accumulo/fate/AgeOffStore.java
----------------------------------------------------------------------
diff --git a/fate/src/main/java/org/apache/accumulo/fate/AgeOffStore.java b/fate/src/main/java/org/apache/accumulo/fate/AgeOffStore.java
index 83b726b..376dad4 100644
--- a/fate/src/main/java/org/apache/accumulo/fate/AgeOffStore.java
+++ b/fate/src/main/java/org/apache/accumulo/fate/AgeOffStore.java
@@ -70,7 +70,7 @@ public class AgeOffStore<T> implements TStore<T> {
   }
 
   public void ageOff() {
-    HashSet<Long> oldTxs = new HashSet<Long>();
+    HashSet<Long> oldTxs = new HashSet<>();
 
     synchronized (this) {
       long time = timeSource.currentTimeMillis();
@@ -114,7 +114,7 @@ public class AgeOffStore<T> implements TStore<T> {
     this.store = store;
     this.ageOffTime = ageOffTime;
     this.timeSource = timeSource;
-    candidates = new HashMap<Long,Long>();
+    candidates = new HashMap<>();
 
     minTime = Long.MAX_VALUE;
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/fate/src/main/java/org/apache/accumulo/fate/ReadOnlyStore.java
----------------------------------------------------------------------
diff --git a/fate/src/main/java/org/apache/accumulo/fate/ReadOnlyStore.java b/fate/src/main/java/org/apache/accumulo/fate/ReadOnlyStore.java
index cf2683b..5d5aeab 100644
--- a/fate/src/main/java/org/apache/accumulo/fate/ReadOnlyStore.java
+++ b/fate/src/main/java/org/apache/accumulo/fate/ReadOnlyStore.java
@@ -86,7 +86,7 @@ public class ReadOnlyStore<T> implements ReadOnlyTStore<T> {
 
   @Override
   public ReadOnlyRepo<T> top(long tid) {
-    return new ReadOnlyRepoWrapper<T>(store.top(tid));
+    return new ReadOnlyRepoWrapper<>(store.top(tid));
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
----------------------------------------------------------------------
diff --git a/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java b/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
index 36a88e3..2a68f44 100644
--- a/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
+++ b/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
@@ -97,8 +97,8 @@ public class ZooStore<T> implements TStore<T> {
 
     this.path = path;
     this.zk = zk;
-    this.reserved = new HashSet<Long>();
-    this.defered = new HashMap<Long,Long>();
+    this.reserved = new HashSet<>();
+    this.defered = new HashMap<>();
     this.idgenerator = new SecureRandom();
 
     zk.putPersistentData(path, new byte[0], NodeExistsPolicy.SKIP);
@@ -130,7 +130,7 @@ public class ZooStore<T> implements TStore<T> {
           events = statusChangeEvents;
         }
 
-        List<String> txdirs = new ArrayList<String>(zk.getChildren(path));
+        List<String> txdirs = new ArrayList<>(zk.getChildren(path));
         Collections.sort(txdirs);
 
         synchronized (this) {
@@ -287,7 +287,7 @@ public class ZooStore<T> implements TStore<T> {
   private String findTop(String txpath) throws KeeperException, InterruptedException {
     List<String> ops = zk.getChildren(txpath);
 
-    ops = new ArrayList<String>(ops);
+    ops = new ArrayList<>(ops);
 
     String max = "";
 
@@ -448,7 +448,7 @@ public class ZooStore<T> implements TStore<T> {
   @Override
   public List<Long> list() {
     try {
-      ArrayList<Long> l = new ArrayList<Long>();
+      ArrayList<Long> l = new ArrayList<>();
       List<String> transactions = zk.getChildren(path);
       for (String txid : transactions) {
         l.add(parseTid(txid));
@@ -473,7 +473,7 @@ public class ZooStore<T> implements TStore<T> {
         throw new RuntimeException(e1);
       }
 
-      ops = new ArrayList<String>(ops);
+      ops = new ArrayList<>(ops);
       Collections.sort(ops, Collections.reverseOrder());
 
       ArrayList<ReadOnlyRepo<T>> dops = new ArrayList<>();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/fate/src/main/java/org/apache/accumulo/fate/zookeeper/DistributedReadWriteLock.java
----------------------------------------------------------------------
diff --git a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/DistributedReadWriteLock.java b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/DistributedReadWriteLock.java
index 624ce5d..fe31011 100644
--- a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/DistributedReadWriteLock.java
+++ b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/DistributedReadWriteLock.java
@@ -37,7 +37,7 @@ public class DistributedReadWriteLock implements java.util.concurrent.locks.Read
 
   static enum LockType {
     READ, WRITE,
-  };
+  }
 
   // serializer for lock type and user data
   static class ParsedLock {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/fate/src/main/java/org/apache/accumulo/fate/zookeeper/TransactionWatcher.java
----------------------------------------------------------------------
diff --git a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/TransactionWatcher.java b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/TransactionWatcher.java
index dda7db9..b10ddea 100644
--- a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/TransactionWatcher.java
+++ b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/TransactionWatcher.java
@@ -33,7 +33,7 @@ public class TransactionWatcher {
   }
 
   private static final Logger log = LoggerFactory.getLogger(TransactionWatcher.class);
-  final private Map<Long,AtomicInteger> counts = new HashMap<Long,AtomicInteger>();
+  final private Map<Long,AtomicInteger> counts = new HashMap<>();
   final private Arbitrator arbitrator;
 
   public TransactionWatcher(Arbitrator arbitrator) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooCache.java
----------------------------------------------------------------------
diff --git a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooCache.java b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooCache.java
index 2526aad..bec3d64 100644
--- a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooCache.java
+++ b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooCache.java
@@ -148,9 +148,9 @@ public class ZooCache {
    */
   public ZooCache(ZooReader reader, Watcher watcher) {
     this.zReader = reader;
-    this.cache = new HashMap<String,byte[]>();
-    this.statCache = new HashMap<String,Stat>();
-    this.childrenCache = new HashMap<String,List<String>>();
+    this.cache = new HashMap<>();
+    this.statCache = new HashMap<>();
+    this.childrenCache = new HashMap<>();
     this.externalWatcher = watcher;
   }
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooCacheFactory.java
----------------------------------------------------------------------
diff --git a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooCacheFactory.java b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooCacheFactory.java
index 1475928..9fecf2e 100644
--- a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooCacheFactory.java
+++ b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooCacheFactory.java
@@ -26,7 +26,7 @@ import org.apache.zookeeper.Watcher;
  */
 public class ZooCacheFactory {
   // TODO: make this better - LRU, soft references, ...
-  private static Map<String,ZooCache> instances = new HashMap<String,ZooCache>();
+  private static Map<String,ZooCache> instances = new HashMap<>();
 
   /**
    * Gets a {@link ZooCache}. The same object may be returned for multiple calls with the same arguments.

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooLock.java
----------------------------------------------------------------------
diff --git a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooLock.java b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooLock.java
index 992a444..90fb4aa 100644
--- a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooLock.java
+++ b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooLock.java
@@ -404,7 +404,7 @@ public class ZooLock implements Watcher {
       return false;
     }
 
-    children = new ArrayList<String>(children);
+    children = new ArrayList<>(children);
     Collections.sort(children);
 
     String lockNode = children.get(0);
@@ -437,7 +437,7 @@ public class ZooLock implements Watcher {
       return null;
     }
 
-    children = new ArrayList<String>(children);
+    children = new ArrayList<>(children);
     Collections.sort(children);
 
     String lockNode = children.get(0);
@@ -456,7 +456,7 @@ public class ZooLock implements Watcher {
       return 0;
     }
 
-    children = new ArrayList<String>(children);
+    children = new ArrayList<>(children);
     Collections.sort(children);
 
     String lockNode = children.get(0);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooQueueLock.java
----------------------------------------------------------------------
diff --git a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooQueueLock.java b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooQueueLock.java
index 1b22dc9..25c735b 100644
--- a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooQueueLock.java
+++ b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooQueueLock.java
@@ -68,7 +68,7 @@ public class ZooQueueLock implements QueueLock {
 
   @Override
   public SortedMap<Long,byte[]> getEarlierEntries(long entry) {
-    SortedMap<Long,byte[]> result = new TreeMap<Long,byte[]>();
+    SortedMap<Long,byte[]> result = new TreeMap<>();
     try {
       List<String> children = Collections.emptyList();
       try {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
----------------------------------------------------------------------
diff --git a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
index 837785f..b9fedac 100644
--- a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
+++ b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
@@ -51,7 +51,7 @@ public class ZooSession {
     ZooKeeper zooKeeper;
   }
 
-  private static Map<String,ZooSessionInfo> sessions = new HashMap<String,ZooSessionInfo>();
+  private static Map<String,ZooSessionInfo> sessions = new HashMap<>();
 
   private static String sessionKey(String keepers, int timeout, String scheme, byte[] auth) {
     return keepers + ":" + timeout + ":" + (scheme == null ? "" : scheme) + ":" + (auth == null ? "" : new String(auth, UTF_8));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooUtil.java
----------------------------------------------------------------------
diff --git a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooUtil.java b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooUtil.java
index 4c4aa13..6ea10d0 100644
--- a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooUtil.java
+++ b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooUtil.java
@@ -161,9 +161,9 @@ public class ZooUtil {
   private static final RetryFactory RETRY_FACTORY;
 
   static {
-    PRIVATE = new ArrayList<ACL>();
+    PRIVATE = new ArrayList<>();
     PRIVATE.addAll(Ids.CREATOR_ALL_ACL);
-    PUBLIC = new ArrayList<ACL>();
+    PUBLIC = new ArrayList<>();
     PUBLIC.addAll(PRIVATE);
     PUBLIC.add(new ACL(Perms.READ, Ids.ANYONE_ID_UNSAFE));
     RETRY_FACTORY = RetryFactory.DEFAULT_INSTANCE;
@@ -483,7 +483,7 @@ public class ZooUtil {
       return null;
     }
 
-    children = new ArrayList<String>(children);
+    children = new ArrayList<>(children);
     Collections.sort(children);
 
     String lockNode = children.get(0);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/fate/src/test/java/org/apache/accumulo/fate/AgeOffStoreTest.java
----------------------------------------------------------------------
diff --git a/fate/src/test/java/org/apache/accumulo/fate/AgeOffStoreTest.java b/fate/src/test/java/org/apache/accumulo/fate/AgeOffStoreTest.java
index 2c3b813..9549bd8 100644
--- a/fate/src/test/java/org/apache/accumulo/fate/AgeOffStoreTest.java
+++ b/fate/src/test/java/org/apache/accumulo/fate/AgeOffStoreTest.java
@@ -43,8 +43,8 @@ public class AgeOffStoreTest {
   public void testBasic() {
 
     TestTimeSource tts = new TestTimeSource();
-    SimpleStore<String> sstore = new SimpleStore<String>();
-    AgeOffStore<String> aoStore = new AgeOffStore<String>(sstore, 10, tts);
+    SimpleStore<String> sstore = new SimpleStore<>();
+    AgeOffStore<String> aoStore = new AgeOffStore<>(sstore, 10, tts);
 
     aoStore.ageOff();
 
@@ -73,22 +73,22 @@ public class AgeOffStoreTest {
 
     aoStore.ageOff();
 
-    Assert.assertEquals(new HashSet<Long>(Arrays.asList(txid1, txid2, txid3, txid4)), new HashSet<Long>(aoStore.list()));
-    Assert.assertEquals(4, new HashSet<Long>(aoStore.list()).size());
+    Assert.assertEquals(new HashSet<>(Arrays.asList(txid1, txid2, txid3, txid4)), new HashSet<>(aoStore.list()));
+    Assert.assertEquals(4, new HashSet<>(aoStore.list()).size());
 
     tts.time = 15;
 
     aoStore.ageOff();
 
-    Assert.assertEquals(new HashSet<Long>(Arrays.asList(txid1, txid3, txid4)), new HashSet<Long>(aoStore.list()));
-    Assert.assertEquals(3, new HashSet<Long>(aoStore.list()).size());
+    Assert.assertEquals(new HashSet<>(Arrays.asList(txid1, txid3, txid4)), new HashSet<>(aoStore.list()));
+    Assert.assertEquals(3, new HashSet<>(aoStore.list()).size());
 
     tts.time = 30;
 
     aoStore.ageOff();
 
-    Assert.assertEquals(new HashSet<Long>(Arrays.asList(txid1)), new HashSet<Long>(aoStore.list()));
-    Assert.assertEquals(1, new HashSet<Long>(aoStore.list()).size());
+    Assert.assertEquals(new HashSet<>(Arrays.asList(txid1)), new HashSet<>(aoStore.list()));
+    Assert.assertEquals(1, new HashSet<>(aoStore.list()).size());
   }
 
   @Test
@@ -96,7 +96,7 @@ public class AgeOffStoreTest {
     // test age off when source store starts off non empty
 
     TestTimeSource tts = new TestTimeSource();
-    SimpleStore<String> sstore = new SimpleStore<String>();
+    SimpleStore<String> sstore = new SimpleStore<>();
     Long txid1 = sstore.create();
     sstore.reserve(txid1);
     sstore.setStatus(txid1, TStatus.IN_PROGRESS);
@@ -116,22 +116,22 @@ public class AgeOffStoreTest {
 
     Long txid4 = sstore.create();
 
-    AgeOffStore<String> aoStore = new AgeOffStore<String>(sstore, 10, tts);
+    AgeOffStore<String> aoStore = new AgeOffStore<>(sstore, 10, tts);
 
-    Assert.assertEquals(new HashSet<Long>(Arrays.asList(txid1, txid2, txid3, txid4)), new HashSet<Long>(aoStore.list()));
-    Assert.assertEquals(4, new HashSet<Long>(aoStore.list()).size());
+    Assert.assertEquals(new HashSet<>(Arrays.asList(txid1, txid2, txid3, txid4)), new HashSet<>(aoStore.list()));
+    Assert.assertEquals(4, new HashSet<>(aoStore.list()).size());
 
     aoStore.ageOff();
 
-    Assert.assertEquals(new HashSet<Long>(Arrays.asList(txid1, txid2, txid3, txid4)), new HashSet<Long>(aoStore.list()));
-    Assert.assertEquals(4, new HashSet<Long>(aoStore.list()).size());
+    Assert.assertEquals(new HashSet<>(Arrays.asList(txid1, txid2, txid3, txid4)), new HashSet<>(aoStore.list()));
+    Assert.assertEquals(4, new HashSet<>(aoStore.list()).size());
 
     tts.time = 15;
 
     aoStore.ageOff();
 
-    Assert.assertEquals(new HashSet<Long>(Arrays.asList(txid1)), new HashSet<Long>(aoStore.list()));
-    Assert.assertEquals(1, new HashSet<Long>(aoStore.list()).size());
+    Assert.assertEquals(new HashSet<>(Arrays.asList(txid1)), new HashSet<>(aoStore.list()));
+    Assert.assertEquals(1, new HashSet<>(aoStore.list()).size());
 
     aoStore.reserve(txid1);
     aoStore.setStatus(txid1, TStatus.FAILED_IN_PROGRESS);
@@ -141,8 +141,8 @@ public class AgeOffStoreTest {
 
     aoStore.ageOff();
 
-    Assert.assertEquals(new HashSet<Long>(Arrays.asList(txid1)), new HashSet<Long>(aoStore.list()));
-    Assert.assertEquals(1, new HashSet<Long>(aoStore.list()).size());
+    Assert.assertEquals(new HashSet<>(Arrays.asList(txid1)), new HashSet<>(aoStore.list()));
+    Assert.assertEquals(1, new HashSet<>(aoStore.list()).size());
 
     aoStore.reserve(txid1);
     aoStore.setStatus(txid1, TStatus.FAILED);
@@ -150,13 +150,13 @@ public class AgeOffStoreTest {
 
     aoStore.ageOff();
 
-    Assert.assertEquals(new HashSet<Long>(Arrays.asList(txid1)), new HashSet<Long>(aoStore.list()));
-    Assert.assertEquals(1, new HashSet<Long>(aoStore.list()).size());
+    Assert.assertEquals(new HashSet<>(Arrays.asList(txid1)), new HashSet<>(aoStore.list()));
+    Assert.assertEquals(1, new HashSet<>(aoStore.list()).size());
 
     tts.time = 42;
 
     aoStore.ageOff();
 
-    Assert.assertEquals(0, new HashSet<Long>(aoStore.list()).size());
+    Assert.assertEquals(0, new HashSet<>(aoStore.list()).size());
   }
 }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/fate/src/test/java/org/apache/accumulo/fate/ReadOnlyStoreTest.java
----------------------------------------------------------------------
diff --git a/fate/src/test/java/org/apache/accumulo/fate/ReadOnlyStoreTest.java b/fate/src/test/java/org/apache/accumulo/fate/ReadOnlyStoreTest.java
index eea5f1b..e8f0cee 100644
--- a/fate/src/test/java/org/apache/accumulo/fate/ReadOnlyStoreTest.java
+++ b/fate/src/test/java/org/apache/accumulo/fate/ReadOnlyStoreTest.java
@@ -51,7 +51,7 @@ public class ReadOnlyStoreTest {
     EasyMock.replay(repo);
     EasyMock.replay(mock);
 
-    ReadOnlyTStore<String> store = new ReadOnlyStore<String>(mock);
+    ReadOnlyTStore<String> store = new ReadOnlyStore<>(mock);
     Assert.assertEquals(0xdeadbeefl, store.reserve());
     store.reserve(0xdeadbeefl);
     ReadOnlyRepo<String> top = store.top(0xdeadbeefl);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/fate/src/test/java/org/apache/accumulo/fate/SimpleStore.java
----------------------------------------------------------------------
diff --git a/fate/src/test/java/org/apache/accumulo/fate/SimpleStore.java b/fate/src/test/java/org/apache/accumulo/fate/SimpleStore.java
index ab03525..3277270 100644
--- a/fate/src/test/java/org/apache/accumulo/fate/SimpleStore.java
+++ b/fate/src/test/java/org/apache/accumulo/fate/SimpleStore.java
@@ -33,8 +33,8 @@ import org.apache.commons.lang.NotImplementedException;
 public class SimpleStore<T> implements TStore<T> {
 
   private long nextId = 1;
-  private Map<Long,TStatus> statuses = new HashMap<Long,TStore.TStatus>();
-  private Set<Long> reserved = new HashSet<Long>();
+  private Map<Long,TStatus> statuses = new HashMap<>();
+  private Set<Long> reserved = new HashSet<>();
 
   @Override
   public long create() {
@@ -120,7 +120,7 @@ public class SimpleStore<T> implements TStore<T> {
 
   @Override
   public List<Long> list() {
-    return new ArrayList<Long>(statuses.keySet());
+    return new ArrayList<>(statuses.keySet());
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/fate/src/test/java/org/apache/accumulo/fate/zookeeper/DistributedReadWriteLockTest.java
----------------------------------------------------------------------
diff --git a/fate/src/test/java/org/apache/accumulo/fate/zookeeper/DistributedReadWriteLockTest.java b/fate/src/test/java/org/apache/accumulo/fate/zookeeper/DistributedReadWriteLockTest.java
index 0b04bd1..486a4c6 100644
--- a/fate/src/test/java/org/apache/accumulo/fate/zookeeper/DistributedReadWriteLockTest.java
+++ b/fate/src/test/java/org/apache/accumulo/fate/zookeeper/DistributedReadWriteLockTest.java
@@ -34,11 +34,11 @@ public class DistributedReadWriteLockTest {
   public static class MockQueueLock implements QueueLock {
 
     long next = 0L;
-    final SortedMap<Long,byte[]> locks = new TreeMap<Long,byte[]>();
+    final SortedMap<Long,byte[]> locks = new TreeMap<>();
 
     @Override
     synchronized public SortedMap<Long,byte[]> getEarlierEntries(long entry) {
-      SortedMap<Long,byte[]> result = new TreeMap<Long,byte[]>();
+      SortedMap<Long,byte[]> result = new TreeMap<>();
       result.putAll(locks.headMap(entry + 1));
       return result;
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/fate/src/test/java/org/apache/accumulo/fate/zookeeper/TransactionWatcherTest.java
----------------------------------------------------------------------
diff --git a/fate/src/test/java/org/apache/accumulo/fate/zookeeper/TransactionWatcherTest.java b/fate/src/test/java/org/apache/accumulo/fate/zookeeper/TransactionWatcherTest.java
index 0e4e329..6779f6c 100644
--- a/fate/src/test/java/org/apache/accumulo/fate/zookeeper/TransactionWatcherTest.java
+++ b/fate/src/test/java/org/apache/accumulo/fate/zookeeper/TransactionWatcherTest.java
@@ -28,13 +28,13 @@ import org.junit.Test;
 public class TransactionWatcherTest {
 
   static class SimpleArbitrator implements TransactionWatcher.Arbitrator {
-    Map<String,List<Long>> started = new HashMap<String,List<Long>>();
-    Map<String,List<Long>> cleanedUp = new HashMap<String,List<Long>>();
+    Map<String,List<Long>> started = new HashMap<>();
+    Map<String,List<Long>> cleanedUp = new HashMap<>();
 
     public synchronized void start(String txType, Long txid) throws Exception {
       List<Long> txids = started.get(txType);
       if (txids == null)
-        txids = new ArrayList<Long>();
+        txids = new ArrayList<>();
       if (txids.contains(txid))
         throw new Exception("transaction already started");
       txids.add(txid);
@@ -42,7 +42,7 @@ public class TransactionWatcherTest {
 
       txids = cleanedUp.get(txType);
       if (txids == null)
-        txids = new ArrayList<Long>();
+        txids = new ArrayList<>();
       if (txids.contains(txid))
         throw new IllegalStateException("transaction was started but not cleaned up");
       txids.add(txid);
@@ -124,7 +124,7 @@ public class TransactionWatcherTest {
       });
       Assert.fail("work against stopped transaction should fail");
     } catch (Exception ex) {
-      ;
+
     }
     final long txid2 = 9;
     sa.start(txType, txid2);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/maven-plugin/src/main/java/org/apache/accumulo/maven/plugin/AbstractAccumuloMojo.java
----------------------------------------------------------------------
diff --git a/maven-plugin/src/main/java/org/apache/accumulo/maven/plugin/AbstractAccumuloMojo.java b/maven-plugin/src/main/java/org/apache/accumulo/maven/plugin/AbstractAccumuloMojo.java
index 2028a2e..37eeb4d 100644
--- a/maven-plugin/src/main/java/org/apache/accumulo/maven/plugin/AbstractAccumuloMojo.java
+++ b/maven-plugin/src/main/java/org/apache/accumulo/maven/plugin/AbstractAccumuloMojo.java
@@ -43,7 +43,7 @@ public abstract class AbstractAccumuloMojo extends AbstractMojo {
   }
 
   void configureMiniClasspath(MiniAccumuloConfigImpl macConfig, String miniClasspath) throws MalformedURLException {
-    ArrayList<String> classpathItems = new ArrayList<String>();
+    ArrayList<String> classpathItems = new ArrayList<>();
     if (miniClasspath == null && project != null) {
       classpathItems.add(project.getBuild().getOutputDirectory());
       classpathItems.add(project.getBuild().getTestOutputDirectory());

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/minicluster/src/main/java/org/apache/accumulo/cluster/standalone/StandaloneClusterControl.java
----------------------------------------------------------------------
diff --git a/minicluster/src/main/java/org/apache/accumulo/cluster/standalone/StandaloneClusterControl.java b/minicluster/src/main/java/org/apache/accumulo/cluster/standalone/StandaloneClusterControl.java
index 3edf60d..febc94c 100644
--- a/minicluster/src/main/java/org/apache/accumulo/cluster/standalone/StandaloneClusterControl.java
+++ b/minicluster/src/main/java/org/apache/accumulo/cluster/standalone/StandaloneClusterControl.java
@@ -377,7 +377,7 @@ public class StandaloneClusterControl implements ClusterControl {
   protected List<String> getHosts(File f) throws IOException {
     BufferedReader reader = new BufferedReader(new FileReader(f));
     try {
-      List<String> hosts = new ArrayList<String>();
+      List<String> hosts = new ArrayList<>();
       String line = null;
       while ((line = reader.readLine()) != null) {
         line = line.trim();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloRunner.java
----------------------------------------------------------------------
diff --git a/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloRunner.java b/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloRunner.java
index 78af6a0..4745e0a 100644
--- a/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloRunner.java
+++ b/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloRunner.java
@@ -184,7 +184,7 @@ public class MiniAccumuloRunner {
     if (opts.prop.containsKey(SHUTDOWN_PORT_PROP))
       shutdownPort = Integer.parseInt(opts.prop.getProperty(SHUTDOWN_PORT_PROP));
 
-    Map<String,String> siteConfig = new HashMap<String,String>();
+    Map<String,String> siteConfig = new HashMap<>();
     for (Map.Entry<Object,Object> entry : opts.prop.entrySet()) {
       String key = (String) entry.getKey();
       if (key.startsWith("site."))

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterControl.java
----------------------------------------------------------------------
diff --git a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterControl.java b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterControl.java
index 80c4edc..8cc7950 100644
--- a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterControl.java
+++ b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterControl.java
@@ -56,7 +56,7 @@ public class MiniAccumuloClusterControl implements ClusterControl {
   Process gcProcess = null;
   Process monitor = null;
   Process tracer = null;
-  final List<Process> tabletServerProcesses = new ArrayList<Process>();
+  final List<Process> tabletServerProcesses = new ArrayList<>();
 
   public MiniAccumuloClusterControl(MiniAccumuloClusterImpl cluster) {
     requireNonNull(cluster);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
----------------------------------------------------------------------
diff --git a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
index 772ba69..fd017be 100644
--- a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
+++ b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
@@ -169,7 +169,7 @@ public class MiniAccumuloClusterImpl implements AccumuloCluster {
 
   private boolean initialized = false;
 
-  private Set<Pair<ServerType,Integer>> debugPorts = new HashSet<Pair<ServerType,Integer>>();
+  private Set<Pair<ServerType,Integer>> debugPorts = new HashSet<>();
 
   private File zooCfgFile;
   private String dfsUri;
@@ -178,11 +178,11 @@ public class MiniAccumuloClusterImpl implements AccumuloCluster {
     return logWriters;
   }
 
-  private List<LogWriter> logWriters = new ArrayList<MiniAccumuloClusterImpl.LogWriter>();
+  private List<LogWriter> logWriters = new ArrayList<>();
 
   private MiniAccumuloConfigImpl config;
   private MiniDFSCluster miniDFS = null;
-  private List<Process> cleanup = new ArrayList<Process>();
+  private List<Process> cleanup = new ArrayList<>();
 
   private ExecutorService executor;
 
@@ -197,7 +197,7 @@ public class MiniAccumuloClusterImpl implements AccumuloCluster {
   }
 
   public Process exec(Class<?> clazz, List<String> jvmArgs, String... args) throws IOException {
-    ArrayList<String> jvmArgs2 = new ArrayList<String>(1 + (jvmArgs == null ? 0 : jvmArgs.size()));
+    ArrayList<String> jvmArgs2 = new ArrayList<>(1 + (jvmArgs == null ? 0 : jvmArgs.size()));
     jvmArgs2.add("-Xmx" + config.getDefaultMemory());
     if (jvmArgs != null)
       jvmArgs2.addAll(jvmArgs);
@@ -231,7 +231,7 @@ public class MiniAccumuloClusterImpl implements AccumuloCluster {
   private String getClasspath() throws IOException {
 
     try {
-      ArrayList<ClassLoader> classloaders = new ArrayList<ClassLoader>();
+      ArrayList<ClassLoader> classloaders = new ArrayList<>();
 
       ClassLoader cl = this.getClass().getClassLoader();
 
@@ -289,7 +289,7 @@ public class MiniAccumuloClusterImpl implements AccumuloCluster {
 
     String className = clazz.getName();
 
-    ArrayList<String> argList = new ArrayList<String>();
+    ArrayList<String> argList = new ArrayList<>();
     argList.addAll(Arrays.asList(javaBin, "-Dproc=" + clazz.getSimpleName(), "-cp", classpath));
     argList.addAll(extraJvmOpts);
     for (Entry<String,String> sysProp : config.getSystemProperties().entrySet()) {
@@ -344,13 +344,13 @@ public class MiniAccumuloClusterImpl implements AccumuloCluster {
 
   Process _exec(Class<?> clazz, ServerType serverType, String... args) throws IOException {
 
-    List<String> jvmOpts = new ArrayList<String>();
+    List<String> jvmOpts = new ArrayList<>();
     jvmOpts.add("-Xmx" + config.getMemory(serverType));
 
     if (config.isJDWPEnabled()) {
       Integer port = PortUtils.getRandomFreePort();
       jvmOpts.addAll(buildRemoteDebugParams(port));
-      debugPorts.add(new Pair<ServerType,Integer>(serverType, port));
+      debugPorts.add(new Pair<>(serverType, port));
     }
     return _exec(clazz, jvmOpts, args);
   }
@@ -649,7 +649,7 @@ public class MiniAccumuloClusterImpl implements AccumuloCluster {
   }
 
   List<ProcessReference> references(Process... procs) {
-    List<ProcessReference> result = new ArrayList<ProcessReference>();
+    List<ProcessReference> result = new ArrayList<>();
     for (Process proc : procs) {
       result.add(new ProcessReference(proc));
     }
@@ -657,7 +657,7 @@ public class MiniAccumuloClusterImpl implements AccumuloCluster {
   }
 
   public Map<ServerType,Collection<ProcessReference>> getProcesses() {
-    Map<ServerType,Collection<ProcessReference>> result = new HashMap<ServerType,Collection<ProcessReference>>();
+    Map<ServerType,Collection<ProcessReference>> result = new HashMap<>();
     MiniAccumuloClusterControl control = getClusterControl();
     result.put(ServerType.MASTER, references(control.masterProcess));
     result.put(ServerType.TABLET_SERVER, references(control.tabletServerProcesses.toArray(new Process[0])));
@@ -771,7 +771,7 @@ public class MiniAccumuloClusterImpl implements AccumuloCluster {
   }
 
   int stopProcessWithTimeout(final Process proc, long timeout, TimeUnit unit) throws InterruptedException, ExecutionException, TimeoutException {
-    FutureTask<Integer> future = new FutureTask<Integer>(new Callable<Integer>() {
+    FutureTask<Integer> future = new FutureTask<>(new Callable<Integer>() {
       @Override
       public Integer call() throws InterruptedException {
         proc.destroy();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java
----------------------------------------------------------------------
diff --git a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java
index 5939d2f..8e35705 100644
--- a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java
+++ b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java
@@ -47,12 +47,12 @@ public class MiniAccumuloConfigImpl {
 
   private File dir = null;
   private String rootPassword = null;
-  private Map<String,String> siteConfig = new HashMap<String,String>();
-  private Map<String,String> configuredSiteConig = new HashMap<String,String>();
+  private Map<String,String> siteConfig = new HashMap<>();
+  private Map<String,String> configuredSiteConig = new HashMap<>();
   private int numTservers = 2;
-  private Map<ServerType,Long> memoryConfig = new HashMap<ServerType,Long>();
+  private Map<ServerType,Long> memoryConfig = new HashMap<>();
   private boolean jdwpEnabled = false;
-  private Map<String,String> systemProperties = new HashMap<String,String>();
+  private Map<String,String> systemProperties = new HashMap<>();
 
   private String instanceName = "miniInstance";
   private String rootUserName = "root";
@@ -284,8 +284,8 @@ public class MiniAccumuloConfigImpl {
   }
 
   private MiniAccumuloConfigImpl _setSiteConfig(Map<String,String> siteConfig) {
-    this.siteConfig = new HashMap<String,String>(siteConfig);
-    this.configuredSiteConig = new HashMap<String,String>(siteConfig);
+    this.siteConfig = new HashMap<>(siteConfig);
+    this.configuredSiteConig = new HashMap<>(siteConfig);
     return this;
   }
 
@@ -378,11 +378,11 @@ public class MiniAccumuloConfigImpl {
    * @return a copy of the site config
    */
   public Map<String,String> getSiteConfig() {
-    return new HashMap<String,String>(siteConfig);
+    return new HashMap<>(siteConfig);
   }
 
   public Map<String,String> getConfiguredSiteConfig() {
-    return new HashMap<String,String>(configuredSiteConig);
+    return new HashMap<>(configuredSiteConig);
   }
 
   /**
@@ -547,7 +547,7 @@ public class MiniAccumuloConfigImpl {
    * @since 1.6.0
    */
   public void setSystemProperties(Map<String,String> systemProperties) {
-    this.systemProperties = new HashMap<String,String>(systemProperties);
+    this.systemProperties = new HashMap<>(systemProperties);
   }
 
   /**
@@ -556,7 +556,7 @@ public class MiniAccumuloConfigImpl {
    * @since 1.6.0
    */
   public Map<String,String> getSystemProperties() {
-    return new HashMap<String,String>(systemProperties);
+    return new HashMap<>(systemProperties);
   }
 
   /**
@@ -662,7 +662,7 @@ public class MiniAccumuloConfigImpl {
       throw e1;
     }
 
-    Map<String,String> siteConfigMap = new HashMap<String,String>();
+    Map<String,String> siteConfigMap = new HashMap<>();
     for (Entry<String,String> e : accumuloConf) {
       siteConfigMap.put(e.getKey(), e.getValue());
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/minicluster/src/test/java/org/apache/accumulo/minicluster/MiniAccumuloClusterTest.java
----------------------------------------------------------------------
diff --git a/minicluster/src/test/java/org/apache/accumulo/minicluster/MiniAccumuloClusterTest.java b/minicluster/src/test/java/org/apache/accumulo/minicluster/MiniAccumuloClusterTest.java
index 7c62384..f691bf6 100644
--- a/minicluster/src/test/java/org/apache/accumulo/minicluster/MiniAccumuloClusterTest.java
+++ b/minicluster/src/test/java/org/apache/accumulo/minicluster/MiniAccumuloClusterTest.java
@@ -69,7 +69,7 @@ public class MiniAccumuloClusterTest {
 
     MiniAccumuloConfig config = new MiniAccumuloConfig(testDir, "superSecret").setJDWPEnabled(true);
     config.setZooKeeperPort(0);
-    HashMap<String,String> site = new HashMap<String,String>();
+    HashMap<String,String> site = new HashMap<>();
     site.put(Property.TSERV_WORKQ_THREADS.getKey(), "2");
     config.setSiteConfig(site);
     accumulo = new MiniAccumuloCluster(config);
@@ -216,7 +216,7 @@ public class MiniAccumuloClusterTest {
   public void testConfig() {
     // ensure what user passed in is what comes back
     Assert.assertEquals(0, accumulo.getConfig().getZooKeeperPort());
-    HashMap<String,String> site = new HashMap<String,String>();
+    HashMap<String,String> site = new HashMap<>();
     site.put(Property.TSERV_WORKQ_THREADS.getKey(), "2");
     Assert.assertEquals(site, accumulo.getConfig().getSiteConfig());
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/minicluster/src/test/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImplTest.java
----------------------------------------------------------------------
diff --git a/minicluster/src/test/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImplTest.java b/minicluster/src/test/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImplTest.java
index dc616df..ba12f53 100644
--- a/minicluster/src/test/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImplTest.java
+++ b/minicluster/src/test/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImplTest.java
@@ -66,7 +66,7 @@ public class MiniAccumuloConfigImplTest {
   public void testSiteConfig() {
 
     // constructor site config overrides default props
-    Map<String,String> siteConfig = new HashMap<String,String>();
+    Map<String,String> siteConfig = new HashMap<>();
     siteConfig.put(Property.INSTANCE_DFS_URI.getKey(), "hdfs://");
     MiniAccumuloConfigImpl config = new MiniAccumuloConfigImpl(tempFolder.getRoot(), "password").setSiteConfig(siteConfig).initialize();
     assertEquals("hdfs://", config.getSiteConfig().get(Property.INSTANCE_DFS_URI.getKey()));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/proxy/src/main/java/org/apache/accumulo/proxy/Proxy.java
----------------------------------------------------------------------
diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/Proxy.java b/proxy/src/main/java/org/apache/accumulo/proxy/Proxy.java
index 5f3b991..a3d185d 100644
--- a/proxy/src/main/java/org/apache/accumulo/proxy/Proxy.java
+++ b/proxy/src/main/java/org/apache/accumulo/proxy/Proxy.java
@@ -204,7 +204,7 @@ public class Proxy implements KeywordExecutable {
     AccumuloProxy.Iface wrappedImpl = RpcWrapper.service(impl, new AccumuloProxy.Processor<AccumuloProxy.Iface>(impl));
 
     // Create the processor from the implementation
-    TProcessor processor = new AccumuloProxy.Processor<AccumuloProxy.Iface>(wrappedImpl);
+    TProcessor processor = new AccumuloProxy.Processor<>(wrappedImpl);
 
     // Get the type of thrift server to instantiate
     final String serverTypeStr = properties.getProperty(THRIFT_SERVER_TYPE, THRIFT_SERVER_TYPE_DEFAULT);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java
----------------------------------------------------------------------
diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java b/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java
index 7e2c312..a62e1a1 100644
--- a/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java
+++ b/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java
@@ -364,7 +364,7 @@ public class ProxyServer implements AccumuloProxy.Iface {
       org.apache.accumulo.proxy.thrift.AccumuloSecurityException, org.apache.accumulo.proxy.thrift.TableNotFoundException, TException {
 
     try {
-      SortedSet<Text> sorted = new TreeSet<Text>();
+      SortedSet<Text> sorted = new TreeSet<>();
       for (ByteBuffer split : splits) {
         sorted.add(ByteBufferUtil.toText(split));
       }
@@ -420,7 +420,7 @@ public class ProxyServer implements AccumuloProxy.Iface {
   }
 
   private List<IteratorSetting> getIteratorSettings(List<org.apache.accumulo.proxy.thrift.IteratorSetting> iterators) {
-    List<IteratorSetting> result = new ArrayList<IteratorSetting>();
+    List<IteratorSetting> result = new ArrayList<>();
     if (iterators != null) {
       for (org.apache.accumulo.proxy.thrift.IteratorSetting is : iterators) {
         result.add(getIteratorSetting(is));
@@ -493,9 +493,9 @@ public class ProxyServer implements AccumuloProxy.Iface {
       org.apache.accumulo.proxy.thrift.AccumuloSecurityException, org.apache.accumulo.proxy.thrift.TableNotFoundException, TException {
     try {
       Map<String,Set<Text>> groups = getConnector(login).tableOperations().getLocalityGroups(tableName);
-      Map<String,Set<String>> ret = new HashMap<String,Set<String>>();
+      Map<String,Set<String>> ret = new HashMap<>();
       for (Entry<String,Set<Text>> entry : groups.entrySet()) {
-        Set<String> value = new HashSet<String>();
+        Set<String> value = new HashSet<>();
         ret.put(entry.getKey(), value);
         for (Text val : entry.getValue()) {
           value.add(val.toString());
@@ -534,7 +534,7 @@ public class ProxyServer implements AccumuloProxy.Iface {
   public Map<String,String> getTableProperties(ByteBuffer login, String tableName) throws org.apache.accumulo.proxy.thrift.AccumuloException,
       org.apache.accumulo.proxy.thrift.AccumuloSecurityException, org.apache.accumulo.proxy.thrift.TableNotFoundException, TException {
     try {
-      Map<String,String> ret = new HashMap<String,String>();
+      Map<String,String> ret = new HashMap<>();
 
       for (Map.Entry<String,String> entry : getConnector(login).tableOperations().getProperties(tableName)) {
         ret.put(entry.getKey(), entry.getValue());
@@ -551,7 +551,7 @@ public class ProxyServer implements AccumuloProxy.Iface {
       org.apache.accumulo.proxy.thrift.AccumuloSecurityException, org.apache.accumulo.proxy.thrift.TableNotFoundException, TException {
     try {
       Collection<Text> splits = getConnector(login).tableOperations().listSplits(tableName, maxSplits);
-      List<ByteBuffer> ret = new ArrayList<ByteBuffer>();
+      List<ByteBuffer> ret = new ArrayList<>();
       for (Text split : splits) {
         ret.add(TextUtil.getByteBuffer(split));
       }
@@ -651,7 +651,7 @@ public class ProxyServer implements AccumuloProxy.Iface {
       throws org.apache.accumulo.proxy.thrift.AccumuloException, org.apache.accumulo.proxy.thrift.AccumuloSecurityException,
       org.apache.accumulo.proxy.thrift.TableNotFoundException, TException {
     try {
-      Map<String,Set<Text>> groups = new HashMap<String,Set<Text>>();
+      Map<String,Set<Text>> groups = new HashMap<>();
       for (Entry<String,Set<String>> groupEntry : groupStrings.entrySet()) {
         groups.put(groupEntry.getKey(), new HashSet<Text>());
         for (String val : groupEntry.getValue()) {
@@ -688,10 +688,10 @@ public class ProxyServer implements AccumuloProxy.Iface {
       org.apache.accumulo.proxy.thrift.AccumuloSecurityException, org.apache.accumulo.proxy.thrift.TableNotFoundException, TException {
     try {
       List<org.apache.accumulo.core.client.admin.DiskUsage> diskUsages = getConnector(login).tableOperations().getDiskUsage(tables);
-      List<DiskUsage> retUsages = new ArrayList<DiskUsage>();
+      List<DiskUsage> retUsages = new ArrayList<>();
       for (org.apache.accumulo.core.client.admin.DiskUsage diskUsage : diskUsages) {
         DiskUsage usage = new DiskUsage();
-        usage.setTables(new ArrayList<String>(diskUsage.getTables()));
+        usage.setTables(new ArrayList<>(diskUsage.getTables()));
         usage.setUsage(diskUsage.getUsage());
         retUsages.add(usage);
       }
@@ -736,7 +736,7 @@ public class ProxyServer implements AccumuloProxy.Iface {
   @Override
   public List<org.apache.accumulo.proxy.thrift.ActiveScan> getActiveScans(ByteBuffer login, String tserver)
       throws org.apache.accumulo.proxy.thrift.AccumuloException, org.apache.accumulo.proxy.thrift.AccumuloSecurityException, TException {
-    List<org.apache.accumulo.proxy.thrift.ActiveScan> result = new ArrayList<org.apache.accumulo.proxy.thrift.ActiveScan>();
+    List<org.apache.accumulo.proxy.thrift.ActiveScan> result = new ArrayList<>();
     try {
       List<ActiveScan> activeScans = getConnector(login).instanceOperations().getActiveScans(tserver);
       for (ActiveScan scan : activeScans) {
@@ -751,7 +751,7 @@ public class ProxyServer implements AccumuloProxy.Iface {
         TabletId e = scan.getTablet();
         pscan.extent = new org.apache.accumulo.proxy.thrift.KeyExtent(e.getTableId().toString(), TextUtil.getByteBuffer(e.getEndRow()),
             TextUtil.getByteBuffer(e.getPrevEndRow()));
-        pscan.columns = new ArrayList<org.apache.accumulo.proxy.thrift.Column>();
+        pscan.columns = new ArrayList<>();
         if (scan.getColumns() != null) {
           for (Column c : scan.getColumns()) {
             org.apache.accumulo.proxy.thrift.Column column = new org.apache.accumulo.proxy.thrift.Column();
@@ -761,7 +761,7 @@ public class ProxyServer implements AccumuloProxy.Iface {
             pscan.columns.add(column);
           }
         }
-        pscan.iterators = new ArrayList<org.apache.accumulo.proxy.thrift.IteratorSetting>();
+        pscan.iterators = new ArrayList<>();
         for (String iteratorString : scan.getSsiList()) {
           String[] parts = iteratorString.split("[=,]");
           if (parts.length == 3) {
@@ -773,7 +773,7 @@ public class ProxyServer implements AccumuloProxy.Iface {
             pscan.iterators.add(settings);
           }
         }
-        pscan.authorizations = new ArrayList<ByteBuffer>();
+        pscan.authorizations = new ArrayList<>();
         if (scan.getAuthorizations() != null) {
           for (byte[] a : scan.getAuthorizations()) {
             pscan.authorizations.add(ByteBuffer.wrap(a));
@@ -793,7 +793,7 @@ public class ProxyServer implements AccumuloProxy.Iface {
       throws org.apache.accumulo.proxy.thrift.AccumuloException, org.apache.accumulo.proxy.thrift.AccumuloSecurityException, TException {
 
     try {
-      List<org.apache.accumulo.proxy.thrift.ActiveCompaction> result = new ArrayList<org.apache.accumulo.proxy.thrift.ActiveCompaction>();
+      List<org.apache.accumulo.proxy.thrift.ActiveCompaction> result = new ArrayList<>();
       List<ActiveCompaction> active = getConnector(login).instanceOperations().getActiveCompactions(tserver);
       for (ActiveCompaction comp : active) {
         org.apache.accumulo.proxy.thrift.ActiveCompaction pcomp = new org.apache.accumulo.proxy.thrift.ActiveCompaction();
@@ -803,7 +803,7 @@ public class ProxyServer implements AccumuloProxy.Iface {
         TabletId e = comp.getTablet();
         pcomp.extent = new org.apache.accumulo.proxy.thrift.KeyExtent(e.getTableId().toString(), TextUtil.getByteBuffer(e.getEndRow()),
             TextUtil.getByteBuffer(e.getPrevEndRow()));
-        pcomp.inputFiles = new ArrayList<String>();
+        pcomp.inputFiles = new ArrayList<>();
         if (comp.getInputFiles() != null) {
           pcomp.inputFiles.addAll(comp.getInputFiles());
         }
@@ -812,7 +812,7 @@ public class ProxyServer implements AccumuloProxy.Iface {
         pcomp.reason = CompactionReason.valueOf(comp.getReason().toString());
         pcomp.type = CompactionType.valueOf(comp.getType().toString());
 
-        pcomp.iterators = new ArrayList<org.apache.accumulo.proxy.thrift.IteratorSetting>();
+        pcomp.iterators = new ArrayList<>();
         if (comp.getIterators() != null) {
           for (IteratorSetting setting : comp.getIterators()) {
             org.apache.accumulo.proxy.thrift.IteratorSetting psetting = new org.apache.accumulo.proxy.thrift.IteratorSetting(setting.getPriority(),
@@ -875,7 +875,7 @@ public class ProxyServer implements AccumuloProxy.Iface {
   public void changeUserAuthorizations(ByteBuffer login, String user, Set<ByteBuffer> authorizations)
       throws org.apache.accumulo.proxy.thrift.AccumuloException, org.apache.accumulo.proxy.thrift.AccumuloSecurityException, TException {
     try {
-      Set<String> auths = new HashSet<String>();
+      Set<String> auths = new HashSet<>();
       for (ByteBuffer auth : authorizations) {
         auths.add(ByteBufferUtil.toString(auth));
       }
@@ -1035,7 +1035,7 @@ public class ProxyServer implements AccumuloProxy.Iface {
   }
 
   private Authorizations getAuthorizations(Set<ByteBuffer> authorizations) {
-    List<String> auths = new ArrayList<String>();
+    List<String> auths = new ArrayList<>();
     for (ByteBuffer bbauth : authorizations) {
       auths.add(ByteBufferUtil.toString(bbauth));
     }
@@ -1117,7 +1117,7 @@ public class ProxyServer implements AccumuloProxy.Iface {
           }
         }
 
-        ArrayList<Range> ranges = new ArrayList<Range>();
+        ArrayList<Range> ranges = new ArrayList<>();
 
         if (opts.ranges == null) {
           ranges.add(new Range());
@@ -1265,7 +1265,7 @@ public class ProxyServer implements AccumuloProxy.Iface {
     if (bwpe.exception != null)
       return;
 
-    HashMap<Text,ColumnVisibility> vizMap = new HashMap<Text,ColumnVisibility>();
+    HashMap<Text,ColumnVisibility> vizMap = new HashMap<>();
 
     for (Map.Entry<ByteBuffer,List<ColumnUpdate>> entry : cells.entrySet()) {
       Mutation m = new Mutation(ByteBufferUtil.toBytes(entry.getKey()));
@@ -1524,7 +1524,7 @@ public class ProxyServer implements AccumuloProxy.Iface {
       org.apache.accumulo.proxy.thrift.TableNotFoundException, TException {
     try {
       Map<String,EnumSet<IteratorScope>> iterMap = getConnector(login).tableOperations().listIterators(tableName);
-      Map<String,Set<org.apache.accumulo.proxy.thrift.IteratorScope>> result = new HashMap<String,Set<org.apache.accumulo.proxy.thrift.IteratorScope>>();
+      Map<String,Set<org.apache.accumulo.proxy.thrift.IteratorScope>> result = new HashMap<>();
       for (Map.Entry<String,EnumSet<IteratorScope>> entry : iterMap.entrySet()) {
         result.put(entry.getKey(), getProxyIteratorScopes(entry.getValue()));
       }
@@ -1552,7 +1552,7 @@ public class ProxyServer implements AccumuloProxy.Iface {
       org.apache.accumulo.proxy.thrift.TableNotFoundException, TException {
     try {
       Set<Range> ranges = getConnector(login).tableOperations().splitRangeByTablets(tableName, getRange(range), maxSplits);
-      Set<org.apache.accumulo.proxy.thrift.Range> result = new HashSet<org.apache.accumulo.proxy.thrift.Range>();
+      Set<org.apache.accumulo.proxy.thrift.Range> result = new HashSet<>();
       for (Range r : ranges) {
         result.add(getRange(r));
       }
@@ -1939,9 +1939,9 @@ public class ProxyServer implements AccumuloProxy.Iface {
     }
 
     try {
-      HashMap<Text,ColumnVisibility> vizMap = new HashMap<Text,ColumnVisibility>();
+      HashMap<Text,ColumnVisibility> vizMap = new HashMap<>();
 
-      ArrayList<ConditionalMutation> cmuts = new ArrayList<ConditionalMutation>(updates.size());
+      ArrayList<ConditionalMutation> cmuts = new ArrayList<>(updates.size());
       for (Entry<ByteBuffer,ConditionalUpdates> cu : updates.entrySet()) {
         ConditionalMutation cmut = new ConditionalMutation(ByteBufferUtil.toBytes(cu.getKey()));
 
@@ -1973,7 +1973,7 @@ public class ProxyServer implements AccumuloProxy.Iface {
 
       Iterator<Result> results = cw.write(cmuts.iterator());
 
-      HashMap<ByteBuffer,ConditionalStatus> resultMap = new HashMap<ByteBuffer,ConditionalStatus>();
+      HashMap<ByteBuffer,ConditionalStatus> resultMap = new HashMap<>();
 
       while (results.hasNext()) {
         Result result = results.next();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/proxy/src/test/java/org/apache/accumulo/proxy/ProxyServerTest.java
----------------------------------------------------------------------
diff --git a/proxy/src/test/java/org/apache/accumulo/proxy/ProxyServerTest.java b/proxy/src/test/java/org/apache/accumulo/proxy/ProxyServerTest.java
index 07fdc45..2f64445 100644
--- a/proxy/src/test/java/org/apache/accumulo/proxy/ProxyServerTest.java
+++ b/proxy/src/test/java/org/apache/accumulo/proxy/ProxyServerTest.java
@@ -48,7 +48,7 @@ public class ProxyServerTest {
 
     final ByteBuffer login = ByteBuffer.wrap("my_login".getBytes(UTF_8));
     final String tableName = "table1";
-    final Map<ByteBuffer,List<ColumnUpdate>> cells = new HashMap<ByteBuffer,List<ColumnUpdate>>();
+    final Map<ByteBuffer,List<ColumnUpdate>> cells = new HashMap<>();
 
     EasyMock.expect(server.getWriter(login, tableName, null)).andReturn(bwpe);
     server.addCellsToWriter(cells, bwpe);
@@ -83,7 +83,7 @@ public class ProxyServerTest {
 
     final ByteBuffer login = ByteBuffer.wrap("my_login".getBytes(UTF_8));
     final String tableName = "table1";
-    final Map<ByteBuffer,List<ColumnUpdate>> cells = new HashMap<ByteBuffer,List<ColumnUpdate>>();
+    final Map<ByteBuffer,List<ColumnUpdate>> cells = new HashMap<>();
 
     EasyMock.expect(server.getWriter(login, tableName, null)).andReturn(bwpe);
     server.addCellsToWriter(cells, bwpe);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/Accumulo.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/Accumulo.java b/server/base/src/main/java/org/apache/accumulo/server/Accumulo.java
index 302b6f9..3cfd759 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/Accumulo.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/Accumulo.java
@@ -182,7 +182,7 @@ public class Accumulo {
       throw new RuntimeException("This version of accumulo (" + codeVersion + ") is not compatible with files stored using data version " + dataVersion);
     }
 
-    TreeMap<String,String> sortedProps = new TreeMap<String,String>();
+    TreeMap<String,String> sortedProps = new TreeMap<>();
     for (Entry<String,String> entry : conf)
       sortedProps.put(entry.getKey(), entry.getValue());
 
@@ -313,8 +313,8 @@ public class Accumulo {
    */
   public static void abortIfFateTransactions() {
     try {
-      final ReadOnlyTStore<Accumulo> fate = new ReadOnlyStore<Accumulo>(new ZooStore<Accumulo>(
-          ZooUtil.getRoot(HdfsZooInstance.getInstance()) + Constants.ZFATE, ZooReaderWriter.getInstance()));
+      final ReadOnlyTStore<Accumulo> fate = new ReadOnlyStore<>(new ZooStore<Accumulo>(ZooUtil.getRoot(HdfsZooInstance.getInstance()) + Constants.ZFATE,
+          ZooReaderWriter.getInstance()));
       if (!(fate.list().isEmpty())) {
         throw new AccumuloException("Aborting upgrade because there are outstanding FATE transactions from a previous Accumulo version. "
             + "Please see the README document for instructions on what to do under your previous version.");

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/GarbageCollectionLogger.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/GarbageCollectionLogger.java b/server/base/src/main/java/org/apache/accumulo/server/GarbageCollectionLogger.java
index 993f0ea..a275df7 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/GarbageCollectionLogger.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/GarbageCollectionLogger.java
@@ -30,7 +30,7 @@ import org.slf4j.LoggerFactory;
 public class GarbageCollectionLogger {
   private static final Logger log = LoggerFactory.getLogger(GarbageCollectionLogger.class);
 
-  private final HashMap<String,Long> prevGcTime = new HashMap<String,Long>();
+  private final HashMap<String,Long> prevGcTime = new HashMap<>();
   private long lastMemorySize = 0;
   private long gcTimeIncreasedCount = 0;
   private static long lastMemoryCheckTime = 0;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/ServerConstants.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/ServerConstants.java b/server/base/src/main/java/org/apache/accumulo/server/ServerConstants.java
index c268e83..8c64d50 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/ServerConstants.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/ServerConstants.java
@@ -96,7 +96,7 @@ public class ServerConstants {
     String firstDir = null;
     String firstIid = null;
     Integer firstVersion = null;
-    ArrayList<String> baseDirsList = new ArrayList<String>();
+    ArrayList<String> baseDirsList = new ArrayList<>();
     for (String baseDir : configuredBaseDirs) {
       Path path = new Path(baseDir, INSTANCE_ID_DIR);
       String currentIid;
@@ -177,7 +177,7 @@ public class ServerConstants {
         return Collections.emptyList();
 
       String[] pairs = replacements.split(",");
-      List<Pair<Path,Path>> ret = new ArrayList<Pair<Path,Path>>();
+      List<Pair<Path,Path>> ret = new ArrayList<>();
 
       for (String pair : pairs) {
 
@@ -203,10 +203,10 @@ public class ServerConstants {
           throw new IllegalArgumentException(Property.INSTANCE_VOLUMES_REPLACEMENTS.getKey() + " contains " + uris[1] + " which has a syntax error", e);
         }
 
-        ret.add(new Pair<Path,Path>(p1, p2));
+        ret.add(new Pair<>(p1, p2));
       }
 
-      HashSet<Path> baseDirs = new HashSet<Path>();
+      HashSet<Path> baseDirs = new HashSet<>();
       for (String baseDir : getBaseUris()) {
         // normalize using path
         baseDirs.add(new Path(baseDir));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/client/BulkImporter.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/client/BulkImporter.java b/server/base/src/main/java/org/apache/accumulo/server/client/BulkImporter.java
index e27ce52..c9af520 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/client/BulkImporter.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/client/BulkImporter.java
@@ -82,7 +82,7 @@ public class BulkImporter {
   public static List<String> bulkLoad(ClientContext context, long tid, String tableId, List<String> files, String errorDir, boolean setTime)
       throws IOException, AccumuloException, AccumuloSecurityException, ThriftTableOperationException {
     AssignmentStats stats = new BulkImporter(context, tid, tableId, setTime).importFiles(files, new Path(errorDir));
-    List<String> result = new ArrayList<String>();
+    List<String> result = new ArrayList<>();
     for (Path p : stats.completeFailures.keySet()) {
       result.add(p.toString());
     }
@@ -113,14 +113,14 @@ public class BulkImporter {
     int numThreads = context.getConfiguration().getCount(Property.TSERV_BULK_PROCESS_THREADS);
     int numAssignThreads = context.getConfiguration().getCount(Property.TSERV_BULK_ASSIGNMENT_THREADS);
 
-    timer = new StopWatch<Timers>(Timers.class);
+    timer = new StopWatch<>(Timers.class);
     timer.start(Timers.TOTAL);
 
     Configuration conf = CachedConfiguration.getInstance();
     VolumeManagerImpl.get(context.getConfiguration());
     final VolumeManager fs = VolumeManagerImpl.get(context.getConfiguration());
 
-    Set<Path> paths = new HashSet<Path>();
+    Set<Path> paths = new HashSet<>();
     for (String file : files) {
       paths.add(new Path(file));
     }
@@ -172,7 +172,7 @@ public class BulkImporter {
       Map<Path,List<KeyExtent>> assignmentFailures = assignMapFiles(context, conf, fs, tableId, assignments, paths, numAssignThreads, numThreads);
       assignmentStats.assignmentsFailed(assignmentFailures);
 
-      Map<Path,Integer> failureCount = new TreeMap<Path,Integer>();
+      Map<Path,Integer> failureCount = new TreeMap<>();
 
       for (Entry<Path,List<KeyExtent>> entry : assignmentFailures.entrySet())
         failureCount.put(entry.getKey(), 1);
@@ -199,7 +199,7 @@ public class BulkImporter {
         for (Entry<Path,List<KeyExtent>> entry : assignmentFailures.entrySet()) {
           Iterator<KeyExtent> keListIter = entry.getValue().iterator();
 
-          List<TabletLocation> tabletsToAssignMapFileTo = new ArrayList<TabletLocation>();
+          List<TabletLocation> tabletsToAssignMapFileTo = new ArrayList<>();
 
           while (keListIter.hasNext()) {
             KeyExtent ke = keListIter.next();
@@ -273,7 +273,7 @@ public class BulkImporter {
 
       totalTime += timer.get(t);
     }
-    List<String> files = new ArrayList<String>();
+    List<String> files = new ArrayList<>();
     for (Path path : paths) {
       files.add(path.getName());
     }
@@ -326,7 +326,7 @@ public class BulkImporter {
   }
 
   private static List<KeyExtent> extentsOf(List<TabletLocation> locations) {
-    List<KeyExtent> result = new ArrayList<KeyExtent>(locations.size());
+    List<KeyExtent> result = new ArrayList<>(locations.size());
     for (TabletLocation tl : locations)
       result.add(tl.tablet_extent);
     return result;
@@ -336,7 +336,7 @@ public class BulkImporter {
       Map<Path,List<TabletLocation>> assignments, Collection<Path> paths, int numThreads) {
 
     long t1 = System.currentTimeMillis();
-    final Map<Path,Long> mapFileSizes = new TreeMap<Path,Long>();
+    final Map<Path,Long> mapFileSizes = new TreeMap<>();
 
     try {
       for (Path path : paths) {
@@ -376,13 +376,13 @@ public class BulkImporter {
 
           if (estimatedSizes == null) {
             // estimation failed, do a simple estimation
-            estimatedSizes = new TreeMap<KeyExtent,Long>();
+            estimatedSizes = new TreeMap<>();
             long estSize = (long) (mapFileSizes.get(entry.getKey()) / (double) entry.getValue().size());
             for (TabletLocation tl : entry.getValue())
               estimatedSizes.put(tl.tablet_extent, estSize);
           }
 
-          List<AssignmentInfo> assignmentInfoList = new ArrayList<AssignmentInfo>(estimatedSizes.size());
+          List<AssignmentInfo> assignmentInfoList = new ArrayList<>(estimatedSizes.size());
 
           for (Entry<KeyExtent,Long> entry2 : estimatedSizes.entrySet())
             assignmentInfoList.add(new AssignmentInfo(entry2.getKey(), entry2.getValue()));
@@ -413,7 +413,7 @@ public class BulkImporter {
   }
 
   private static Map<KeyExtent,String> locationsOf(Map<Path,List<TabletLocation>> assignments) {
-    Map<KeyExtent,String> result = new HashMap<KeyExtent,String>();
+    Map<KeyExtent,String> result = new HashMap<>();
     for (List<TabletLocation> entry : assignments.values()) {
       for (TabletLocation tl : entry) {
         result.put(tl.tablet_extent, tl.tablet_location);
@@ -455,7 +455,7 @@ public class BulkImporter {
           for (PathSize pathSize : mapFiles) {
             List<KeyExtent> existingFailures = assignmentFailures.get(pathSize.path);
             if (existingFailures == null) {
-              existingFailures = new ArrayList<KeyExtent>();
+              existingFailures = new ArrayList<>();
               assignmentFailures.put(pathSize.path, existingFailures);
             }
 
@@ -469,7 +469,7 @@ public class BulkImporter {
 
     @Override
     public void run() {
-      HashSet<Path> uniqMapFiles = new HashSet<Path>();
+      HashSet<Path> uniqMapFiles = new HashSet<>();
       for (List<PathSize> mapFiles : assignmentsPerTablet.values())
         for (PathSize ps : mapFiles)
           uniqMapFiles.add(ps.path);
@@ -506,7 +506,7 @@ public class BulkImporter {
   private Map<Path,List<KeyExtent>> assignMapFiles(String tableName, Map<Path,List<AssignmentInfo>> assignments, Map<KeyExtent,String> locations, int numThreads) {
 
     // group assignments by tablet
-    Map<KeyExtent,List<PathSize>> assignmentsPerTablet = new TreeMap<KeyExtent,List<PathSize>>();
+    Map<KeyExtent,List<PathSize>> assignmentsPerTablet = new TreeMap<>();
     for (Entry<Path,List<AssignmentInfo>> entry : assignments.entrySet()) {
       Path mapFile = entry.getKey();
       List<AssignmentInfo> tabletsToAssignMapFileTo = entry.getValue();
@@ -514,7 +514,7 @@ public class BulkImporter {
       for (AssignmentInfo ai : tabletsToAssignMapFileTo) {
         List<PathSize> mapFiles = assignmentsPerTablet.get(ai.ke);
         if (mapFiles == null) {
-          mapFiles = new ArrayList<PathSize>();
+          mapFiles = new ArrayList<>();
           assignmentsPerTablet.put(ai.ke, mapFiles);
         }
 
@@ -526,7 +526,7 @@ public class BulkImporter {
 
     Map<Path,List<KeyExtent>> assignmentFailures = Collections.synchronizedMap(new TreeMap<Path,List<KeyExtent>>());
 
-    TreeMap<String,Map<KeyExtent,List<PathSize>>> assignmentsPerTabletServer = new TreeMap<String,Map<KeyExtent,List<PathSize>>>();
+    TreeMap<String,Map<KeyExtent,List<PathSize>>> assignmentsPerTabletServer = new TreeMap<>();
 
     for (Entry<KeyExtent,List<PathSize>> entry : assignmentsPerTablet.entrySet()) {
       KeyExtent ke = entry.getKey();
@@ -537,7 +537,7 @@ public class BulkImporter {
           synchronized (assignmentFailures) {
             List<KeyExtent> failures = assignmentFailures.get(pathSize.path);
             if (failures == null) {
-              failures = new ArrayList<KeyExtent>();
+              failures = new ArrayList<>();
               assignmentFailures.put(pathSize.path, failures);
             }
 
@@ -552,7 +552,7 @@ public class BulkImporter {
 
       Map<KeyExtent,List<PathSize>> apt = assignmentsPerTabletServer.get(location);
       if (apt == null) {
-        apt = new TreeMap<KeyExtent,List<PathSize>>();
+        apt = new TreeMap<>();
         assignmentsPerTabletServer.put(location, apt);
       }
 
@@ -586,9 +586,9 @@ public class BulkImporter {
       long timeInMillis = context.getConfiguration().getTimeInMillis(Property.TSERV_BULK_TIMEOUT);
       TabletClientService.Iface client = ThriftUtil.getTServerClient(location, context, timeInMillis);
       try {
-        HashMap<KeyExtent,Map<String,org.apache.accumulo.core.data.thrift.MapFileInfo>> files = new HashMap<KeyExtent,Map<String,org.apache.accumulo.core.data.thrift.MapFileInfo>>();
+        HashMap<KeyExtent,Map<String,org.apache.accumulo.core.data.thrift.MapFileInfo>> files = new HashMap<>();
         for (Entry<KeyExtent,List<PathSize>> entry : assignmentsPerTablet.entrySet()) {
-          HashMap<String,org.apache.accumulo.core.data.thrift.MapFileInfo> tabletFiles = new HashMap<String,org.apache.accumulo.core.data.thrift.MapFileInfo>();
+          HashMap<String,org.apache.accumulo.core.data.thrift.MapFileInfo> tabletFiles = new HashMap<>();
           files.put(entry.getKey(), tabletFiles);
 
           for (PathSize pathSize : entry.getValue()) {
@@ -637,7 +637,7 @@ public class BulkImporter {
 
   public static List<TabletLocation> findOverlappingTablets(ClientContext context, VolumeManager vm, TabletLocator locator, Path file, Text startRow,
       Text endRow) throws Exception {
-    List<TabletLocation> result = new ArrayList<TabletLocation>();
+    List<TabletLocation> result = new ArrayList<>();
     Collection<ByteSequence> columnFamilies = Collections.emptyList();
     String filename = file.toString();
     // log.debug(filename + " finding overlapping tablets " + startRow + " -> " + endRow);
@@ -680,7 +680,7 @@ public class BulkImporter {
     private Set<Path> failedFailures = null;
 
     AssignmentStats(int fileCount) {
-      counts = new HashMap<KeyExtent,Integer>();
+      counts = new HashMap<>();
       numUniqueMapFiles = fileCount;
     }
 
@@ -751,7 +751,7 @@ public class BulkImporter {
       stddev = stddev / counts.size();
       stddev = Math.sqrt(stddev);
 
-      Set<KeyExtent> failedTablets = new HashSet<KeyExtent>();
+      Set<KeyExtent> failedTablets = new HashSet<>();
       for (List<KeyExtent> ft : completeFailures.values())
         failedTablets.addAll(ft);
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/client/ClientServiceHandler.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/client/ClientServiceHandler.java b/server/base/src/main/java/org/apache/accumulo/server/client/ClientServiceHandler.java
index c306e85..3beb1e0 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/client/ClientServiceHandler.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/client/ClientServiceHandler.java
@@ -262,7 +262,7 @@ public class ClientServiceHandler implements ClientService.Iface {
     security.authenticateUser(credentials, credentials);
     conf.invalidateCache();
 
-    Map<String,String> result = new HashMap<String,String>();
+    Map<String,String> result = new HashMap<>();
     for (Entry<String,String> entry : conf) {
       String key = entry.getKey();
       if (!Property.isSensitive(key))
@@ -421,7 +421,7 @@ public class ClientServiceHandler implements ClientService.Iface {
   @Override
   public List<TDiskUsage> getDiskUsage(Set<String> tables, TCredentials credentials) throws ThriftTableOperationException, ThriftSecurityException, TException {
     try {
-      HashSet<String> tableIds = new HashSet<String>();
+      HashSet<String> tableIds = new HashSet<>();
 
       for (String table : tables) {
         // ensure that table table exists
@@ -435,9 +435,9 @@ public class ClientServiceHandler implements ClientService.Iface {
       // use the same set of tableIds that were validated above to avoid race conditions
       Map<TreeSet<String>,Long> diskUsage = TableDiskUsage.getDiskUsage(context.getServerConfigurationFactory().getConfiguration(), tableIds, fs,
           context.getConnector());
-      List<TDiskUsage> retUsages = new ArrayList<TDiskUsage>();
+      List<TDiskUsage> retUsages = new ArrayList<>();
       for (Map.Entry<TreeSet<String>,Long> usageItem : diskUsage.entrySet()) {
-        retUsages.add(new TDiskUsage(new ArrayList<String>(usageItem.getKey()), usageItem.getValue()));
+        retUsages.add(new TDiskUsage(new ArrayList<>(usageItem.getKey()), usageItem.getValue()));
       }
       return retUsages;
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/conf/NamespaceConfiguration.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/conf/NamespaceConfiguration.java b/server/base/src/main/java/org/apache/accumulo/server/conf/NamespaceConfiguration.java
index 3d19723..1ca083e 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/conf/NamespaceConfiguration.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/conf/NamespaceConfiguration.java
@@ -38,7 +38,7 @@ import com.google.common.base.Predicate;
 public class NamespaceConfiguration extends ObservableConfiguration {
   private static final Logger log = LoggerFactory.getLogger(NamespaceConfiguration.class);
 
-  private static final Map<PropCacheKey,ZooCache> propCaches = new java.util.HashMap<PropCacheKey,ZooCache>();
+  private static final Map<PropCacheKey,ZooCache> propCaches = new java.util.HashMap<>();
 
   private final AccumuloConfiguration parent;
   private ZooCachePropertyAccessor propCacheAccessor = null;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/conf/ServerConfigurationFactory.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/conf/ServerConfigurationFactory.java b/server/base/src/main/java/org/apache/accumulo/server/conf/ServerConfigurationFactory.java
index 2995fc8..5cea8b5 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/conf/ServerConfigurationFactory.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/conf/ServerConfigurationFactory.java
@@ -34,9 +34,9 @@ import org.apache.accumulo.fate.zookeeper.ZooCacheFactory;
  */
 public class ServerConfigurationFactory extends ServerConfiguration {
 
-  private static final Map<String,Map<String,TableConfiguration>> tableConfigs = new HashMap<String,Map<String,TableConfiguration>>(1);
-  private static final Map<String,Map<String,NamespaceConfiguration>> namespaceConfigs = new HashMap<String,Map<String,NamespaceConfiguration>>(1);
-  private static final Map<String,Map<String,NamespaceConfiguration>> tableParentConfigs = new HashMap<String,Map<String,NamespaceConfiguration>>(1);
+  private static final Map<String,Map<String,TableConfiguration>> tableConfigs = new HashMap<>(1);
+  private static final Map<String,Map<String,NamespaceConfiguration>> namespaceConfigs = new HashMap<>(1);
+  private static final Map<String,Map<String,NamespaceConfiguration>> tableParentConfigs = new HashMap<>(1);
 
   private static void addInstanceToCaches(String iid) {
     synchronized (tableConfigs) {


[02/32] accumulo git commit: ACCUMULO-4357 Remove unneeded code for readability

Posted by ct...@apache.org.
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/examples/simple/dirlist/CountIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/examples/simple/dirlist/CountIT.java b/test/src/main/java/org/apache/accumulo/test/examples/simple/dirlist/CountIT.java
index 8853733..93708a6 100644
--- a/test/src/main/java/org/apache/accumulo/test/examples/simple/dirlist/CountIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/examples/simple/dirlist/CountIT.java
@@ -84,11 +84,11 @@ public class CountIT extends ConfigurableMacBase {
     FileCount fc = new FileCount(opts, scanOpts, bwOpts);
     fc.run();
 
-    ArrayList<Pair<String,String>> expected = new ArrayList<Pair<String,String>>();
-    expected.add(new Pair<String,String>(QueryUtil.getRow("").toString(), "1,0,3,3"));
-    expected.add(new Pair<String,String>(QueryUtil.getRow("/local").toString(), "2,1,2,3"));
-    expected.add(new Pair<String,String>(QueryUtil.getRow("/local/user1").toString(), "0,2,0,2"));
-    expected.add(new Pair<String,String>(QueryUtil.getRow("/local/user2").toString(), "0,0,0,0"));
+    ArrayList<Pair<String,String>> expected = new ArrayList<>();
+    expected.add(new Pair<>(QueryUtil.getRow("").toString(), "1,0,3,3"));
+    expected.add(new Pair<>(QueryUtil.getRow("/local").toString(), "2,1,2,3"));
+    expected.add(new Pair<>(QueryUtil.getRow("/local/user1").toString(), "0,2,0,2"));
+    expected.add(new Pair<>(QueryUtil.getRow("/local/user2").toString(), "0,0,0,0"));
 
     int i = 0;
     for (Entry<Key,Value> e : scanner) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/examples/simple/filedata/ChunkInputFormatIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/examples/simple/filedata/ChunkInputFormatIT.java b/test/src/main/java/org/apache/accumulo/test/examples/simple/filedata/ChunkInputFormatIT.java
index 69d30af..cb53ec0 100644
--- a/test/src/main/java/org/apache/accumulo/test/examples/simple/filedata/ChunkInputFormatIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/examples/simple/filedata/ChunkInputFormatIT.java
@@ -78,7 +78,7 @@ public class ChunkInputFormatIT extends AccumuloClusterHarness {
   public static void setupClass() {
     System.setProperty("hadoop.tmp.dir", System.getProperty("user.dir") + "/target/hadoop-tmp");
 
-    data = new ArrayList<Entry<Key,Value>>();
+    data = new ArrayList<>();
     ChunkInputStreamIT.addData(data, "a", "refs", "ida\0ext", "A&B", "ext");
     ChunkInputStreamIT.addData(data, "a", "refs", "ida\0name", "A&B", "name");
     ChunkInputStreamIT.addData(data, "a", "~chunk", 100, 0, "A&B", "asdfjkl;");
@@ -90,7 +90,7 @@ public class ChunkInputFormatIT extends AccumuloClusterHarness {
     ChunkInputStreamIT.addData(data, "b", "~chunk", 100, 1, "A&B", "");
     ChunkInputStreamIT.addData(data, "b", "~chunk", 100, 1, "B&C", "");
     ChunkInputStreamIT.addData(data, "b", "~chunk", 100, 1, "D", "");
-    baddata = new ArrayList<Entry<Key,Value>>();
+    baddata = new ArrayList<>();
     ChunkInputStreamIT.addData(baddata, "c", "refs", "ida\0ext", "A&B", "ext");
     ChunkInputStreamIT.addData(baddata, "c", "refs", "ida\0name", "A&B", "name");
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/examples/simple/filedata/ChunkInputStreamIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/examples/simple/filedata/ChunkInputStreamIT.java b/test/src/main/java/org/apache/accumulo/test/examples/simple/filedata/ChunkInputStreamIT.java
index 47db6dd..5b956d7 100644
--- a/test/src/main/java/org/apache/accumulo/test/examples/simple/filedata/ChunkInputStreamIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/examples/simple/filedata/ChunkInputStreamIT.java
@@ -66,7 +66,7 @@ public class ChunkInputStreamIT extends AccumuloClusterHarness {
 
   @Before
   public void setupData() {
-    data = new ArrayList<Entry<Key,Value>>();
+    data = new ArrayList<>();
     addData(data, "a", "refs", "id\0ext", "A&B", "ext");
     addData(data, "a", "refs", "id\0name", "A&B", "name");
     addData(data, "a", "~chunk", 100, 0, "A&B", "asdfjkl;");
@@ -84,7 +84,7 @@ public class ChunkInputStreamIT extends AccumuloClusterHarness {
     addData(data, "d", "~chunk", 100, 0, "A&B", "");
     addData(data, "e", "~chunk", 100, 0, "A&B", "asdfjkl;");
     addData(data, "e", "~chunk", 100, 1, "A&B", "");
-    baddata = new ArrayList<Entry<Key,Value>>();
+    baddata = new ArrayList<>();
     addData(baddata, "a", "~chunk", 100, 0, "A", "asdfjkl;");
     addData(baddata, "b", "~chunk", 100, 0, "B", "asdfjkl;");
     addData(baddata, "b", "~chunk", 100, 2, "C", "");
@@ -98,7 +98,7 @@ public class ChunkInputStreamIT extends AccumuloClusterHarness {
     addData(baddata, "e", "~chunk", 100, 2, "I", "asdfjkl;");
     addData(baddata, "f", "~chunk", 100, 2, "K", "asdfjkl;");
     addData(baddata, "g", "~chunk", 100, 0, "L", "");
-    multidata = new ArrayList<Entry<Key,Value>>();
+    multidata = new ArrayList<>();
     addData(multidata, "a", "~chunk", 100, 0, "A&B", "asdfjkl;");
     addData(multidata, "a", "~chunk", 100, 1, "A&B", "");
     addData(multidata, "a", "~chunk", 200, 0, "B&C", "asdfjkl;");
@@ -137,7 +137,7 @@ public class ChunkInputStreamIT extends AccumuloClusterHarness {
     ChunkInputStream cis = new ChunkInputStream();
     byte[] b = new byte[20];
     int read;
-    PeekingIterator<Entry<Key,Value>> pi = new PeekingIterator<Entry<Key,Value>>(scan.iterator());
+    PeekingIterator<Entry<Key,Value>> pi = new PeekingIterator<>(scan.iterator());
 
     cis.setSource(pi);
     assertEquals(read = cis.read(b), 8);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/functional/AddSplitIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/AddSplitIT.java b/test/src/main/java/org/apache/accumulo/test/functional/AddSplitIT.java
index ddaca1e..0558c7f 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/AddSplitIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/AddSplitIT.java
@@ -57,7 +57,7 @@ public class AddSplitIT extends AccumuloClusterHarness {
 
     insertData(tableName, 1l);
 
-    TreeSet<Text> splits = new TreeSet<Text>();
+    TreeSet<Text> splits = new TreeSet<>();
     splits.add(new Text(String.format("%09d", 333)));
     splits.add(new Text(String.format("%09d", 666)));
 
@@ -67,7 +67,7 @@ public class AddSplitIT extends AccumuloClusterHarness {
 
     Collection<Text> actualSplits = c.tableOperations().listSplits(tableName);
 
-    if (!splits.equals(new TreeSet<Text>(actualSplits))) {
+    if (!splits.equals(new TreeSet<>(actualSplits))) {
       throw new Exception(splits + " != " + actualSplits);
     }
 
@@ -87,7 +87,7 @@ public class AddSplitIT extends AccumuloClusterHarness {
 
     actualSplits = c.tableOperations().listSplits(tableName);
 
-    if (!splits.equals(new TreeSet<Text>(actualSplits))) {
+    if (!splits.equals(new TreeSet<>(actualSplits))) {
       throw new Exception(splits + " != " + actualSplits);
     }
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/functional/BalanceAfterCommsFailureIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/BalanceAfterCommsFailureIT.java b/test/src/main/java/org/apache/accumulo/test/functional/BalanceAfterCommsFailureIT.java
index ae470f6..525d9f9 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/BalanceAfterCommsFailureIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/BalanceAfterCommsFailureIT.java
@@ -65,7 +65,7 @@ public class BalanceAfterCommsFailureIT extends ConfigurableMacBase {
     Connector c = this.getConnector();
     c.tableOperations().create("test");
     Collection<ProcessReference> tservers = getCluster().getProcesses().get(ServerType.TABLET_SERVER);
-    ArrayList<Integer> tserverPids = new ArrayList<Integer>(tservers.size());
+    ArrayList<Integer> tserverPids = new ArrayList<>(tservers.size());
     for (ProcessReference tserver : tservers) {
       Process p = tserver.getProcess();
       if (!p.getClass().getName().equals("java.lang.UNIXProcess")) {
@@ -85,7 +85,7 @@ public class BalanceAfterCommsFailureIT extends ConfigurableMacBase {
     for (int pid : tserverPids) {
       assertEquals(0, Runtime.getRuntime().exec(new String[] {"kill", "-SIGCONT", Integer.toString(pid)}).waitFor());
     }
-    SortedSet<Text> splits = new TreeSet<Text>();
+    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));
     }
@@ -120,7 +120,7 @@ public class BalanceAfterCommsFailureIT extends ConfigurableMacBase {
 
     assertEquals("Unassigned tablets were not assigned within 30 seconds", 0, unassignedTablets);
 
-    List<Integer> counts = new ArrayList<Integer>();
+    List<Integer> counts = new ArrayList<>();
     for (TabletServerStatus server : stats.tServerInfo) {
       int count = 0;
       for (TableInfo table : server.tableMap.values()) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/functional/BalanceInPresenceOfOfflineTableIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/BalanceInPresenceOfOfflineTableIT.java b/test/src/main/java/org/apache/accumulo/test/functional/BalanceInPresenceOfOfflineTableIT.java
index 623d79b..2fe5602 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/BalanceInPresenceOfOfflineTableIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/BalanceInPresenceOfOfflineTableIT.java
@@ -93,7 +93,7 @@ public class BalanceInPresenceOfOfflineTableIT extends AccumuloClusterHarness {
     Assume.assumeTrue("Not enough tservers to run test", conn.instanceOperations().getTabletServers().size() >= 2);
 
     // set up splits
-    final SortedSet<Text> splits = new TreeSet<Text>();
+    final SortedSet<Text> splits = new TreeSet<>();
     for (int i = 0; i < NUM_SPLITS; i++) {
       splits.add(new Text(String.format("%08x", i * 1000)));
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/functional/BatchScanSplitIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/BatchScanSplitIT.java b/test/src/main/java/org/apache/accumulo/test/functional/BatchScanSplitIT.java
index 7d36cd2..48ce3fe 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/BatchScanSplitIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/BatchScanSplitIT.java
@@ -89,8 +89,8 @@ public class BatchScanSplitIT extends AccumuloClusterHarness {
     System.out.println("splits : " + splits);
 
     Random random = new Random(19011230);
-    HashMap<Text,Value> expected = new HashMap<Text,Value>();
-    ArrayList<Range> ranges = new ArrayList<Range>();
+    HashMap<Text,Value> expected = new HashMap<>();
+    ArrayList<Range> ranges = new ArrayList<>();
     for (int i = 0; i < 100; i++) {
       int r = random.nextInt(numRows);
       Text row = new Text(String.format("%09x", r));
@@ -100,7 +100,7 @@ public class BatchScanSplitIT extends AccumuloClusterHarness {
 
     // logger.setLevel(Level.TRACE);
 
-    HashMap<Text,Value> found = new HashMap<Text,Value>();
+    HashMap<Text,Value> found = new HashMap<>();
 
     for (int i = 0; i < 20; i++) {
       BatchScanner bs = getConnector().createBatchScanner(tableName, Authorizations.EMPTY, 4);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/functional/BatchWriterFlushIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/BatchWriterFlushIT.java b/test/src/main/java/org/apache/accumulo/test/functional/BatchWriterFlushIT.java
index 967ac24..9b50306 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/BatchWriterFlushIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/BatchWriterFlushIT.java
@@ -180,7 +180,7 @@ public class BatchWriterFlushIT extends AccumuloClusterHarness {
     String tableName = tableNames[0];
     c.tableOperations().create(tableName);
     for (int x = 0; x < NUM_THREADS; x++) {
-      c.tableOperations().addSplits(tableName, new TreeSet<Text>(Collections.singleton(new Text(Integer.toString(x * NUM_TO_FLUSH)))));
+      c.tableOperations().addSplits(tableName, new TreeSet<>(Collections.singleton(new Text(Integer.toString(x * NUM_TO_FLUSH)))));
     }
     c.instanceOperations().waitForBalance();
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/functional/BinaryIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/BinaryIT.java b/test/src/main/java/org/apache/accumulo/test/functional/BinaryIT.java
index 85716d5..f8732d5 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/BinaryIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/BinaryIT.java
@@ -47,7 +47,7 @@ public class BinaryIT extends AccumuloClusterHarness {
     String tableName = getUniqueNames(1)[0];
     Connector c = getConnector();
     c.tableOperations().create(tableName);
-    SortedSet<Text> splits = new TreeSet<Text>();
+    SortedSet<Text> splits = new TreeSet<>();
     splits.add(new Text("8"));
     splits.add(new Text("256"));
     c.tableOperations().addSplits(tableName, splits);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/functional/BloomFilterIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/BloomFilterIT.java b/test/src/main/java/org/apache/accumulo/test/functional/BloomFilterIT.java
index fbbe542..1c6fc9f 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/BloomFilterIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/BloomFilterIT.java
@@ -169,8 +169,8 @@ public class BloomFilterIT extends AccumuloClusterHarness {
   private long query(Connector c, String table, int depth, long start, long end, int num, int step) throws Exception {
     Random r = new Random(42);
 
-    HashSet<Long> expected = new HashSet<Long>();
-    List<Range> ranges = new ArrayList<Range>(num);
+    HashSet<Long> expected = new HashSet<>();
+    List<Range> ranges = new ArrayList<>(num);
     Text key = new Text();
     Text row = new Text("row"), cq = new Text("cq"), cf = new Text("cf");
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/functional/BulkFileIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/BulkFileIT.java b/test/src/main/java/org/apache/accumulo/test/functional/BulkFileIT.java
index bf248e6..ec8ce2d 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/BulkFileIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/BulkFileIT.java
@@ -60,7 +60,7 @@ public class BulkFileIT extends AccumuloClusterHarness {
     Connector c = getConnector();
     String tableName = getUniqueNames(1)[0];
     c.tableOperations().create(tableName);
-    SortedSet<Text> splits = new TreeSet<Text>();
+    SortedSet<Text> splits = new TreeSet<>();
     for (String split : "0333 0666 0999 1333 1666".split(" "))
       splits.add(new Text(split));
     c.tableOperations().addSplits(tableName, splits);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/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 7935aa4..0988795 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
@@ -53,7 +53,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/b102e760/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 5d05a71..50a0b0e 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
@@ -59,7 +59,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();
 
@@ -69,7 +69,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/b102e760/test/src/main/java/org/apache/accumulo/test/functional/ChaoticBalancerIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ChaoticBalancerIT.java b/test/src/main/java/org/apache/accumulo/test/functional/ChaoticBalancerIT.java
index 4055c3a..21d6351 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/ChaoticBalancerIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/ChaoticBalancerIT.java
@@ -58,7 +58,7 @@ public class ChaoticBalancerIT extends AccumuloClusterHarness {
     c.tableOperations().create(tableName);
     c.tableOperations().setProperty(tableName, Property.TABLE_LOAD_BALANCER.getKey(), ChaoticLoadBalancer.class.getName());
     c.tableOperations().setProperty(tableName, Property.TABLE_SPLIT_THRESHOLD.getKey(), "10K");
-    SortedSet<Text> splits = new TreeSet<Text>();
+    SortedSet<Text> splits = new TreeSet<>();
     for (int i = 0; i < 100; i++) {
       splits.add(new Text(String.format("%03d", i)));
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/functional/CloneTestIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/CloneTestIT.java b/test/src/main/java/org/apache/accumulo/test/functional/CloneTestIT.java
index b3d0ab5..64cdc34 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/CloneTestIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/CloneTestIT.java
@@ -83,10 +83,10 @@ public class CloneTestIT extends AccumuloClusterHarness {
 
     BatchWriter bw = writeData(table1, c);
 
-    Map<String,String> props = new HashMap<String,String>();
+    Map<String,String> props = new HashMap<>();
     props.put(Property.TABLE_FILE_COMPRESSED_BLOCK_SIZE.getKey(), "500K");
 
-    Set<String> exclude = new HashSet<String>();
+    Set<String> exclude = new HashSet<>();
     exclude.add(Property.TABLE_FILE_MAX.getKey());
 
     c.tableOperations().clone(table1, table2, true, props, exclude);
@@ -101,7 +101,7 @@ public class CloneTestIT extends AccumuloClusterHarness {
 
     checkMetadata(table2, c);
 
-    HashMap<String,String> tableProps = new HashMap<String,String>();
+    HashMap<String,String> tableProps = new HashMap<>();
     for (Entry<String,String> prop : c.tableOperations().getProperties(table2)) {
       tableProps.put(prop.getKey(), prop.getValue());
     }
@@ -118,13 +118,13 @@ public class CloneTestIT extends AccumuloClusterHarness {
   private void checkData(String table2, Connector c) throws TableNotFoundException {
     Scanner scanner = c.createScanner(table2, Authorizations.EMPTY);
 
-    HashMap<String,String> expected = new HashMap<String,String>();
+    HashMap<String,String> expected = new HashMap<>();
     expected.put("001:x", "9");
     expected.put("001:y", "7");
     expected.put("008:x", "3");
     expected.put("008:y", "4");
 
-    HashMap<String,String> actual = new HashMap<String,String>();
+    HashMap<String,String> actual = new HashMap<>();
 
     for (Entry<Key,Value> entry : scanner)
       actual.put(entry.getKey().getRowData().toString() + ":" + entry.getKey().getColumnQualifierData().toString(), entry.getValue().toString());
@@ -229,10 +229,10 @@ public class CloneTestIT extends AccumuloClusterHarness {
 
     BatchWriter bw = writeData(table1, c);
 
-    Map<String,String> props = new HashMap<String,String>();
+    Map<String,String> props = new HashMap<>();
     props.put(Property.TABLE_FILE_COMPRESSED_BLOCK_SIZE.getKey(), "500K");
 
-    Set<String> exclude = new HashSet<String>();
+    Set<String> exclude = new HashSet<>();
     exclude.add(Property.TABLE_FILE_MAX.getKey());
 
     c.tableOperations().clone(table1, table2, true, props, exclude);
@@ -260,8 +260,8 @@ public class CloneTestIT extends AccumuloClusterHarness {
   public void testCloneWithSplits() throws Exception {
     Connector conn = getConnector();
 
-    List<Mutation> mutations = new ArrayList<Mutation>();
-    TreeSet<Text> splits = new TreeSet<Text>();
+    List<Mutation> mutations = new ArrayList<>();
+    TreeSet<Text> splits = new TreeSet<>();
     for (int i = 0; i < 10; i++) {
       splits.add(new Text(Integer.toString(i)));
       Mutation m = new Mutation(Integer.toString(i));
@@ -284,7 +284,7 @@ public class CloneTestIT extends AccumuloClusterHarness {
     conn.tableOperations().deleteRows(tables[1], new Text("4"), new Text("8"));
 
     List<String> rows = Arrays.asList("0", "1", "2", "3", "4", "9");
-    List<String> actualRows = new ArrayList<String>();
+    List<String> actualRows = new ArrayList<>();
     for (Entry<Key,Value> entry : conn.createScanner(tables[1], Authorizations.EMPTY)) {
       actualRows.add(entry.getKey().getRow().toString());
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/functional/ConfigurableCompactionIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ConfigurableCompactionIT.java b/test/src/main/java/org/apache/accumulo/test/functional/ConfigurableCompactionIT.java
index 84c7206..d812914 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/ConfigurableCompactionIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/ConfigurableCompactionIT.java
@@ -109,7 +109,7 @@ public class ConfigurableCompactionIT extends ConfigurableMacBase {
     // EfgCompactionStrat will only compact a tablet w/ end row of 'efg'. No other tablets are compacted.
     c.tableOperations().setProperty(tableName, Property.TABLE_COMPACTION_STRATEGY.getKey(), "org.apache.accumulo.test.EfgCompactionStrat");
 
-    c.tableOperations().addSplits(tableName, new TreeSet<Text>(Arrays.asList(new Text("efg"))));
+    c.tableOperations().addSplits(tableName, new TreeSet<>(Arrays.asList(new Text("efg"))));
 
     for (char ch = 'a'; ch < 'l'; ch++)
       writeFlush(c, tableName, ch + "");

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/functional/ConstraintIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ConstraintIT.java b/test/src/main/java/org/apache/accumulo/test/functional/ConstraintIT.java
index 5817b03..27d84de 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/ConstraintIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/ConstraintIT.java
@@ -293,7 +293,7 @@ public class ConstraintIT extends AccumuloClusterHarness {
         throw new Exception("Unexpected constraints");
       }
 
-      HashMap<String,Integer> expected = new HashMap<String,Integer>();
+      HashMap<String,Integer> expected = new HashMap<>();
 
       expected.put("org.apache.accumulo.examples.simple.constraints.NumericValueConstraint", numericErrors);
       expected.put("org.apache.accumulo.examples.simple.constraints.AlphaNumKeyConstraint", 1);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/functional/CreateAndUseIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/CreateAndUseIT.java b/test/src/main/java/org/apache/accumulo/test/functional/CreateAndUseIT.java
index b2373e6..919ab30 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/CreateAndUseIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/CreateAndUseIT.java
@@ -52,7 +52,7 @@ public class CreateAndUseIT extends AccumuloClusterHarness {
 
   @BeforeClass
   public static void createData() throws Exception {
-    splits = new TreeSet<Text>();
+    splits = new TreeSet<>();
 
     for (int i = 1; i < 256; i++) {
       splits.add(new Text(String.format("%08x", i << 8)));
@@ -110,7 +110,7 @@ public class CreateAndUseIT extends AccumuloClusterHarness {
 
   @Test
   public void createTableAndBatchScan() throws Exception {
-    ArrayList<Range> ranges = new ArrayList<Range>();
+    ArrayList<Range> ranges = new ArrayList<>();
     for (int i = 1; i < 257; i++) {
       ranges.add(new Range(new Text(String.format("%08x", (i << 8) - 16))));
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/functional/DeleteRowsIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/DeleteRowsIT.java b/test/src/main/java/org/apache/accumulo/test/functional/DeleteRowsIT.java
index e4a8451..fd89caa 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/DeleteRowsIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/DeleteRowsIT.java
@@ -54,13 +54,13 @@ public class DeleteRowsIT extends AccumuloClusterHarness {
   private static final int ROWS_PER_TABLET = 10;
   private static final String[] LETTERS = new String[] {"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"};
-  static final SortedSet<Text> SPLITS = new TreeSet<Text>();
+  static final SortedSet<Text> SPLITS = new TreeSet<>();
   static {
     for (String alpha : LETTERS) {
       SPLITS.add(new Text(alpha));
     }
   }
-  static final List<String> ROWS = new ArrayList<String>(Arrays.asList(LETTERS));
+  static final List<String> ROWS = new ArrayList<>(Arrays.asList(LETTERS));
   static {
     // put data on first and last tablet
     ROWS.add("A");

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/functional/DeleteRowsSplitIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/DeleteRowsSplitIT.java b/test/src/main/java/org/apache/accumulo/test/functional/DeleteRowsSplitIT.java
index 068000d..2a6653d 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/DeleteRowsSplitIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/DeleteRowsSplitIT.java
@@ -54,8 +54,8 @@ public class DeleteRowsSplitIT extends AccumuloClusterHarness {
   private static final Logger log = LoggerFactory.getLogger(DeleteRowsSplitIT.class);
 
   private static final String LETTERS = "abcdefghijklmnopqrstuvwxyz";
-  static final SortedSet<Text> SPLITS = new TreeSet<Text>();
-  static final List<String> ROWS = new ArrayList<String>();
+  static final SortedSet<Text> SPLITS = new TreeSet<>();
+  static final List<String> ROWS = new ArrayList<>();
   static {
     for (byte b : LETTERS.getBytes(UTF_8)) {
       SPLITS.add(new Text(new byte[] {b}));
@@ -125,7 +125,7 @@ public class DeleteRowsSplitIT extends AccumuloClusterHarness {
   }
 
   private void generateRandomRange(Text start, Text end) {
-    List<String> bunch = new ArrayList<String>(ROWS);
+    List<String> bunch = new ArrayList<>(ROWS);
     Collections.shuffle(bunch);
     if (bunch.get(0).compareTo((bunch.get(1))) < 0) {
       start.set(bunch.get(0));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/functional/DeleteTableDuringSplitIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/DeleteTableDuringSplitIT.java b/test/src/main/java/org/apache/accumulo/test/functional/DeleteTableDuringSplitIT.java
index d2cf873..2c34537 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/DeleteTableDuringSplitIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/DeleteTableDuringSplitIT.java
@@ -53,13 +53,13 @@ public class DeleteTableDuringSplitIT extends AccumuloClusterHarness {
     for (String tableName : tableNames) {
       getConnector().tableOperations().create(tableName);
     }
-    final SortedSet<Text> splits = new TreeSet<Text>();
+    final SortedSet<Text> splits = new TreeSet<>();
     for (byte i = 0; i < 100; i++) {
       splits.add(new Text(new byte[] {0, 0, i}));
     }
 
-    List<Future<?>> results = new ArrayList<Future<?>>();
-    List<Runnable> tasks = new ArrayList<Runnable>();
+    List<Future<?>> results = new ArrayList<>();
+    List<Runnable> tasks = new ArrayList<>();
     SimpleThreadPool es = new SimpleThreadPool(batchSize * 2, "concurrent-api-requests");
     for (String tableName : tableNames) {
       final String finalName = tableName;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/functional/DurabilityIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/DurabilityIT.java b/test/src/main/java/org/apache/accumulo/test/functional/DurabilityIT.java
index 4078e69..00d715f 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/DurabilityIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/DurabilityIT.java
@@ -174,7 +174,7 @@ public class DurabilityIT extends ConfigurableMacBase {
   }
 
   private static Map<String,String> map(Iterable<Entry<String,String>> entries) {
-    Map<String,String> result = new HashMap<String,String>();
+    Map<String,String> result = new HashMap<>();
     for (Entry<String,String> entry : entries) {
       result.put(entry.getKey(), entry.getValue());
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/functional/FateStarvationIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/FateStarvationIT.java b/test/src/main/java/org/apache/accumulo/test/functional/FateStarvationIT.java
index b75a74e..30f4476 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/FateStarvationIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/FateStarvationIT.java
@@ -64,7 +64,7 @@ public class FateStarvationIT extends AccumuloClusterHarness {
 
     c.tableOperations().flush(tableName, null, null, true);
 
-    List<Text> splits = new ArrayList<Text>(TestIngest.getSplitPoints(0, 100000, 67));
+    List<Text> splits = new ArrayList<>(TestIngest.getSplitPoints(0, 100000, 67));
     Random rand = new Random();
 
     for (int i = 0; i < 100; i++) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/functional/FunctionalTestUtils.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/FunctionalTestUtils.java b/test/src/main/java/org/apache/accumulo/test/functional/FunctionalTestUtils.java
index 02e2fdf..829293e 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/FunctionalTestUtils.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/FunctionalTestUtils.java
@@ -69,7 +69,7 @@ public class FunctionalTestUtils {
     scanner.fetchColumnFamily(MetadataSchema.TabletsSection.DataFileColumnFamily.NAME);
     MetadataSchema.TabletsSection.TabletColumnFamily.PREV_ROW_COLUMN.fetch(scanner);
 
-    HashMap<Text,Integer> tabletFileCounts = new HashMap<Text,Integer>();
+    HashMap<Text,Integer> tabletFileCounts = new HashMap<>();
 
     for (Entry<Key,Value> entry : scanner) {
 
@@ -177,7 +177,7 @@ public class FunctionalTestUtils {
   }
 
   public static SortedSet<Text> splits(String[] splits) {
-    SortedSet<Text> result = new TreeSet<Text>();
+    SortedSet<Text> result = new TreeSet<>();
     for (String split : splits)
       result.add(new Text(split));
     return result;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/functional/HalfDeadTServerIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/HalfDeadTServerIT.java b/test/src/main/java/org/apache/accumulo/test/functional/HalfDeadTServerIT.java
index f6ecf20..76a8c5d 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/HalfDeadTServerIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/HalfDeadTServerIT.java
@@ -123,7 +123,7 @@ public class HalfDeadTServerIT extends ConfigurableMacBase {
     String classpath = System.getProperty("java.class.path");
     classpath = new File(cluster.getConfig().getDir(), "conf") + File.pathSeparator + classpath;
     String className = TabletServer.class.getName();
-    ArrayList<String> argList = new ArrayList<String>();
+    ArrayList<String> argList = new ArrayList<>();
     argList.addAll(Arrays.asList(javaBin, "-cp", classpath));
     argList.addAll(Arrays.asList(Main.class.getName(), className));
     ProcessBuilder builder = new ProcessBuilder(argList);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/functional/LargeRowIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/LargeRowIT.java b/test/src/main/java/org/apache/accumulo/test/functional/LargeRowIT.java
index 34d11fc..160b164 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/LargeRowIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/LargeRowIT.java
@@ -109,7 +109,7 @@ public class LargeRowIT extends AccumuloClusterHarness {
     Random r = new Random();
     byte rowData[] = new byte[ROW_SIZE];
     r.setSeed(SEED + 1);
-    TreeSet<Text> splitPoints = new TreeSet<Text>();
+    TreeSet<Text> splitPoints = new TreeSet<>();
     for (int i = 0; i < NUM_PRE_SPLITS; i++) {
       r.nextBytes(rowData);
       TestIngest.toPrintableChars(rowData);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/functional/LogicalTimeIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/LogicalTimeIT.java b/test/src/main/java/org/apache/accumulo/test/functional/LogicalTimeIT.java
index 1e7fef0..b033dbf 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/LogicalTimeIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/LogicalTimeIT.java
@@ -74,7 +74,7 @@ public class LogicalTimeIT extends AccumuloClusterHarness {
       throws Exception {
     log.info("table " + table);
     conn.tableOperations().create(table, new NewTableConfiguration().setTimeType(TimeType.LOGICAL));
-    TreeSet<Text> splitSet = new TreeSet<Text>();
+    TreeSet<Text> splitSet = new TreeSet<>();
     for (String split : splits) {
       splitSet.add(new Text(split));
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/functional/MaxOpenIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/MaxOpenIT.java b/test/src/main/java/org/apache/accumulo/test/functional/MaxOpenIT.java
index 6f08c1f..102afaf 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/MaxOpenIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/MaxOpenIT.java
@@ -118,7 +118,7 @@ public class MaxOpenIT extends AccumuloClusterHarness {
       FunctionalTestUtils.checkRFiles(c, tableName, NUM_TABLETS, NUM_TABLETS, i + 1, i + 1);
     }
 
-    List<Range> ranges = new ArrayList<Range>(NUM_TO_INGEST);
+    List<Range> ranges = new ArrayList<>(NUM_TO_INGEST);
 
     for (int i = 0; i < NUM_TO_INGEST; i++) {
       ranges.add(new Range(TestIngest.generateRow(i, 0)));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/functional/MergeIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/MergeIT.java b/test/src/main/java/org/apache/accumulo/test/functional/MergeIT.java
index c5a4afb..8c20673 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/MergeIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/MergeIT.java
@@ -57,7 +57,7 @@ public class MergeIT extends AccumuloClusterHarness {
   }
 
   SortedSet<Text> splits(String[] points) {
-    SortedSet<Text> result = new TreeSet<Text>();
+    SortedSet<Text> result = new TreeSet<>();
     for (String point : points)
       result.add(new Text(point));
     return result;
@@ -155,14 +155,14 @@ public class MergeIT extends AccumuloClusterHarness {
     System.out.println("Running merge test " + table + " " + Arrays.asList(splits) + " " + start + " " + end);
 
     conn.tableOperations().create(table, new NewTableConfiguration().setTimeType(TimeType.LOGICAL));
-    TreeSet<Text> splitSet = new TreeSet<Text>();
+    TreeSet<Text> splitSet = new TreeSet<>();
     for (String split : splits) {
       splitSet.add(new Text(split));
     }
     conn.tableOperations().addSplits(table, splitSet);
 
     BatchWriter bw = conn.createBatchWriter(table, null);
-    HashSet<String> expected = new HashSet<String>();
+    HashSet<String> expected = new HashSet<>();
     for (String row : inserts) {
       Mutation m = new Mutation(row);
       m.put("cf", "cq", row);
@@ -176,7 +176,7 @@ public class MergeIT extends AccumuloClusterHarness {
 
     Scanner scanner = conn.createScanner(table, Authorizations.EMPTY);
 
-    HashSet<String> observed = new HashSet<String>();
+    HashSet<String> observed = new HashSet<>();
     for (Entry<Key,Value> entry : scanner) {
       String row = entry.getKey().getRowData().toString();
       if (!observed.add(row)) {
@@ -188,8 +188,8 @@ public class MergeIT extends AccumuloClusterHarness {
       throw new Exception("data inconsistency " + table + " " + observed + " != " + expected);
     }
 
-    HashSet<Text> currentSplits = new HashSet<Text>(conn.tableOperations().listSplits(table));
-    HashSet<Text> ess = new HashSet<Text>();
+    HashSet<Text> currentSplits = new HashSet<>(conn.tableOperations().listSplits(table));
+    HashSet<Text> ess = new HashSet<>();
     for (String es : expectedSplits) {
       ess.add(new Text(es));
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/functional/MetadataIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/MetadataIT.java b/test/src/main/java/org/apache/accumulo/test/functional/MetadataIT.java
index aba0a24..883b8dc 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/MetadataIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/MetadataIT.java
@@ -71,14 +71,14 @@ public class MetadataIT extends AccumuloClusterHarness {
     rootScanner.setRange(MetadataSchema.TabletsSection.getRange());
     rootScanner.fetchColumnFamily(MetadataSchema.TabletsSection.DataFileColumnFamily.NAME);
 
-    Set<String> files1 = new HashSet<String>();
+    Set<String> files1 = new HashSet<>();
     for (Entry<Key,Value> entry : rootScanner)
       files1.add(entry.getKey().getColumnQualifier().toString());
 
     c.tableOperations().create(tableNames[1]);
     c.tableOperations().flush(MetadataTable.NAME, null, null, true);
 
-    Set<String> files2 = new HashSet<String>();
+    Set<String> files2 = new HashSet<>();
     for (Entry<Key,Value> entry : rootScanner)
       files2.add(entry.getKey().getColumnQualifier().toString());
 
@@ -88,7 +88,7 @@ public class MetadataIT extends AccumuloClusterHarness {
 
     c.tableOperations().compact(MetadataTable.NAME, null, null, false, true);
 
-    Set<String> files3 = new HashSet<String>();
+    Set<String> files3 = new HashSet<>();
     for (Entry<Key,Value> entry : rootScanner)
       files3.add(entry.getKey().getColumnQualifier().toString());
 
@@ -100,7 +100,7 @@ public class MetadataIT extends AccumuloClusterHarness {
   public void mergeMeta() throws Exception {
     Connector c = getConnector();
     String[] names = getUniqueNames(5);
-    SortedSet<Text> splits = new TreeSet<Text>();
+    SortedSet<Text> splits = new TreeSet<>();
     for (String id : "1 2 3 4 5".split(" ")) {
       splits.add(new Text(id));
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/functional/MetadataMaxFilesIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/MetadataMaxFilesIT.java b/test/src/main/java/org/apache/accumulo/test/functional/MetadataMaxFilesIT.java
index 3e8b421..6c4939f 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/MetadataMaxFilesIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/MetadataMaxFilesIT.java
@@ -63,7 +63,7 @@ public class MetadataMaxFilesIT extends ConfigurableMacBase {
   @Test
   public void test() throws Exception {
     Connector c = getConnector();
-    SortedSet<Text> splits = new TreeSet<Text>();
+    SortedSet<Text> splits = new TreeSet<>();
     for (int i = 0; i < 1000; i++) {
       splits.add(new Text(String.format("%03d", i)));
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/functional/NativeMapIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/NativeMapIT.java b/test/src/main/java/org/apache/accumulo/test/functional/NativeMapIT.java
index 9175379..2d594f5 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/NativeMapIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/NativeMapIT.java
@@ -313,7 +313,7 @@ public class NativeMapIT {
 
     NativeMap nm = new NativeMap();
 
-    TreeMap<Key,Value> tm = new TreeMap<Key,Value>();
+    TreeMap<Key,Value> tm = new TreeMap<>();
 
     tm.put(new Key(new Text("fo")), new Value(new byte[] {'0'}));
     tm.put(new Key(new Text("foo")), new Value(new byte[] {'1'}));
@@ -451,14 +451,14 @@ public class NativeMapIT {
     // generate random data
     Random r = new Random(75);
 
-    ArrayList<Pair<Key,Value>> testData = new ArrayList<Pair<Key,Value>>();
+    ArrayList<Pair<Key,Value>> testData = new ArrayList<>();
 
     for (int i = 0; i < 100000; i++) {
 
       Key k = new Key(rlrf(r, 97), rlrf(r, 13), rlrf(r, 31), rlrf(r, 11), (r.nextLong() & 0x7fffffffffffffffl), false, false);
       Value v = new Value(rlrf(r, 511));
 
-      testData.add(new Pair<Key,Value>(k, v));
+      testData.add(new Pair<>(k, v));
     }
 
     // insert unsorted data

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/functional/PermissionsIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/PermissionsIT.java b/test/src/main/java/org/apache/accumulo/test/functional/PermissionsIT.java
index 8700891..2fc256b 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/PermissionsIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/PermissionsIT.java
@@ -126,7 +126,7 @@ public class PermissionsIT extends AccumuloClusterHarness {
   }
 
   static Map<String,String> map(Iterable<Entry<String,String>> i) {
-    Map<String,String> result = new HashMap<String,String>();
+    Map<String,String> result = new HashMap<>();
     for (Entry<String,String> e : i) {
       result.put(e.getKey(), e.getValue());
     }
@@ -609,8 +609,8 @@ public class PermissionsIT extends AccumuloClusterHarness {
         // test for bulk import permission would go here
         break;
       case ALTER_TABLE:
-        Map<String,Set<Text>> groups = new HashMap<String,Set<Text>>();
-        groups.put("tgroup", new HashSet<Text>(Arrays.asList(new Text("t1"), new Text("t2"))));
+        Map<String,Set<Text>> groups = new HashMap<>();
+        groups.put("tgroup", new HashSet<>(Arrays.asList(new Text("t1"), new Text("t2"))));
         try {
           test_user_conn.tableOperations().setLocalityGroups(tableName, groups);
           throw new IllegalStateException("User should not be able to set locality groups");
@@ -668,8 +668,8 @@ public class PermissionsIT extends AccumuloClusterHarness {
         // test for bulk import permission would go here
         break;
       case ALTER_TABLE:
-        Map<String,Set<Text>> groups = new HashMap<String,Set<Text>>();
-        groups.put("tgroup", new HashSet<Text>(Arrays.asList(new Text("t1"), new Text("t2"))));
+        Map<String,Set<Text>> groups = new HashMap<>();
+        groups.put("tgroup", new HashSet<>(Arrays.asList(new Text("t1"), new Text("t2"))));
         break;
       case DROP_TABLE:
         test_user_conn.tableOperations().delete(tableName);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/functional/ReadWriteIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ReadWriteIT.java b/test/src/main/java/org/apache/accumulo/test/functional/ReadWriteIT.java
index 8b091ca..30200ec 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/ReadWriteIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/ReadWriteIT.java
@@ -399,7 +399,7 @@ public class ReadWriteIT extends AccumuloClusterHarness {
     final Connector connector = getConnector();
     final String tableName = getUniqueNames(1)[0];
     connector.tableOperations().create(tableName);
-    Map<String,Set<Text>> groups = new TreeMap<String,Set<Text>>();
+    Map<String,Set<Text>> groups = new TreeMap<>();
     groups.put("g1", Collections.singleton(t("colf")));
     connector.tableOperations().setLocalityGroups(tableName, groups);
     ingest(connector, getCluster().getClientConfig(), getAdminPrincipal(), 2000, 1, 50, 0, tableName);
@@ -473,11 +473,11 @@ public class ReadWriteIT extends AccumuloClusterHarness {
   }
 
   private Map<String,Set<Text>> getGroups(String cfg) {
-    Map<String,Set<Text>> groups = new TreeMap<String,Set<Text>>();
+    Map<String,Set<Text>> groups = new TreeMap<>();
     if (cfg != null) {
       for (String group : cfg.split(";")) {
         String[] parts = group.split(":");
-        Set<Text> cols = new HashSet<Text>();
+        Set<Text> cols = new HashSet<>();
         for (String col : parts[1].split(",")) {
           cols.add(t(col));
         }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/functional/RowDeleteIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/RowDeleteIT.java b/test/src/main/java/org/apache/accumulo/test/functional/RowDeleteIT.java
index 75c66bd..74d76b8 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/RowDeleteIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/RowDeleteIT.java
@@ -62,7 +62,7 @@ public class RowDeleteIT extends AccumuloClusterHarness {
     Connector c = getConnector();
     String tableName = getUniqueNames(1)[0];
     c.tableOperations().create(tableName);
-    Map<String,Set<Text>> groups = new HashMap<String,Set<Text>>();
+    Map<String,Set<Text>> groups = new HashMap<>();
     groups.put("lg1", Collections.singleton(new Text("foo")));
     groups.put("dg", Collections.<Text> emptySet());
     c.tableOperations().setLocalityGroups(tableName, groups);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/functional/ScanIdIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ScanIdIT.java b/test/src/main/java/org/apache/accumulo/test/functional/ScanIdIT.java
index aa25b93..748423e 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/ScanIdIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/ScanIdIT.java
@@ -92,7 +92,7 @@ public class ScanIdIT extends AccumuloClusterHarness {
 
   private static final AtomicBoolean testInProgress = new AtomicBoolean(true);
 
-  private static final Map<Integer,Value> resultsByWorker = new ConcurrentHashMap<Integer,Value>();
+  private static final Map<Integer,Value> resultsByWorker = new ConcurrentHashMap<>();
 
   @Override
   protected int defaultTimeoutSeconds() {
@@ -146,7 +146,7 @@ public class ScanIdIT extends AccumuloClusterHarness {
     }
 
     // all scanner have reported at least 1 result, so check for unique scan ids.
-    Set<Long> scanIds = new HashSet<Long>();
+    Set<Long> scanIds = new HashSet<>();
 
     List<String> tservers = conn.instanceOperations().getTabletServers();
 
@@ -314,7 +314,7 @@ public class ScanIdIT extends AccumuloClusterHarness {
    */
   private SortedSet<Text> createSplits() {
 
-    SortedSet<Text> splits = new TreeSet<Text>();
+    SortedSet<Text> splits = new TreeSet<>();
 
     for (int split = 0; split < 10; split++) {
       splits.add(new Text(Integer.toString(split)));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/functional/ScanIteratorIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ScanIteratorIT.java b/test/src/main/java/org/apache/accumulo/test/functional/ScanIteratorIT.java
index eb6b5e3..a274dec 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/ScanIteratorIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/ScanIteratorIT.java
@@ -135,7 +135,7 @@ public class ScanIteratorIT extends AccumuloClusterHarness {
     setupIter(bscanner);
     verify(bscanner, 1, 999);
 
-    ArrayList<Range> ranges = new ArrayList<Range>();
+    ArrayList<Range> ranges = new ArrayList<>();
     ranges.add(new Range(new Text(String.format("%06d", 1))));
     ranges.add(new Range(new Text(String.format("%06d", 6)), new Text(String.format("%06d", 16))));
     ranges.add(new Range(new Text(String.format("%06d", 20))));
@@ -144,8 +144,8 @@ public class ScanIteratorIT extends AccumuloClusterHarness {
     ranges.add(new Range(new Text(String.format("%06d", 501)), new Text(String.format("%06d", 504))));
     ranges.add(new Range(new Text(String.format("%06d", 998)), new Text(String.format("%06d", 1000))));
 
-    HashSet<Integer> got = new HashSet<Integer>();
-    HashSet<Integer> expected = new HashSet<Integer>();
+    HashSet<Integer> got = new HashSet<>();
+    HashSet<Integer> expected = new HashSet<>();
     for (int i : new int[] {1, 7, 9, 11, 13, 15, 23, 57, 59, 61, 501, 503, 999}) {
       expected.add(i);
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/functional/ScanRangeIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ScanRangeIT.java b/test/src/main/java/org/apache/accumulo/test/functional/ScanRangeIT.java
index bd7555e..7ab96c4 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/ScanRangeIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/ScanRangeIT.java
@@ -54,7 +54,7 @@ public class ScanRangeIT extends AccumuloClusterHarness {
     c.tableOperations().create(table1);
     String table2 = tableNames[1];
     c.tableOperations().create(table2);
-    TreeSet<Text> splitRows = new TreeSet<Text>();
+    TreeSet<Text> splitRows = new TreeSet<>();
     int splits = 3;
     for (int i = (ROW_LIMIT / splits); i < ROW_LIMIT; i += (ROW_LIMIT / splits))
       splitRows.add(createRow(i));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/functional/SessionBlockVerifyIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/SessionBlockVerifyIT.java b/test/src/main/java/org/apache/accumulo/test/functional/SessionBlockVerifyIT.java
index 05f304b..ca59041 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/SessionBlockVerifyIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/SessionBlockVerifyIT.java
@@ -110,7 +110,7 @@ public class SessionBlockVerifyIT extends ScanSessionTimeOutIT {
 
     final Iterator<Entry<Key,Value>> slow = scanner.iterator();
 
-    final List<Future<Boolean>> callables = new ArrayList<Future<Boolean>>();
+    final List<Future<Boolean>> callables = new ArrayList<>();
     final CountDownLatch latch = new CountDownLatch(10);
     for (int i = 0; i < 10; i++) {
       Future<Boolean> callable = service.submit(new Callable<Boolean>() {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/functional/ShutdownIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ShutdownIT.java b/test/src/main/java/org/apache/accumulo/test/functional/ShutdownIT.java
index 9a2e42e..98e1031 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/ShutdownIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/ShutdownIT.java
@@ -78,7 +78,7 @@ public class ShutdownIT extends ConfigurableMacBase {
     for (int i = 0; i < 10; i++) {
       c.tableOperations().create("table" + i);
     }
-    final AtomicReference<Exception> ref = new AtomicReference<Exception>();
+    final AtomicReference<Exception> ref = new AtomicReference<>();
     Thread async = new Thread() {
       @Override
       public void run() {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/functional/SimpleBalancerFairnessIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/SimpleBalancerFairnessIT.java b/test/src/main/java/org/apache/accumulo/test/functional/SimpleBalancerFairnessIT.java
index 45cf06d..864ba06 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/SimpleBalancerFairnessIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/SimpleBalancerFairnessIT.java
@@ -99,7 +99,7 @@ public class SimpleBalancerFairnessIT extends ConfigurableMacBase {
     assertEquals("Unassigned tablets were not assigned within 30 seconds", 0, unassignedTablets);
 
     // Compute online tablets per tserver
-    List<Integer> counts = new ArrayList<Integer>();
+    List<Integer> counts = new ArrayList<>();
     for (TabletServerStatus server : stats.tServerInfo) {
       int count = 0;
       for (TableInfo table : server.tableMap.values()) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/functional/SplitRecoveryIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/SplitRecoveryIT.java b/test/src/main/java/org/apache/accumulo/test/functional/SplitRecoveryIT.java
index 80e5374..7010dc9 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/SplitRecoveryIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/SplitRecoveryIT.java
@@ -140,7 +140,7 @@ public class SplitRecoveryIT extends ConfigurableMacBase {
 
       String tdir = ServerConstants.getTablesDirs()[0] + "/" + extent.getTableId() + "/dir_" + i;
       MetadataTableUtil.addTablet(extent, tdir, context, TabletTime.LOGICAL_TIME_ID, zl);
-      SortedMap<FileRef,DataFileValue> mapFiles = new TreeMap<FileRef,DataFileValue>();
+      SortedMap<FileRef,DataFileValue> mapFiles = new TreeMap<>();
       mapFiles.put(new FileRef(tdir + "/" + RFile.EXTENSION + "_000_000"), new DataFileValue(1000017 + i, 10000 + i));
 
       if (i == extentToSplit) {
@@ -162,9 +162,9 @@ public class SplitRecoveryIT extends ConfigurableMacBase {
   private void splitPartiallyAndRecover(AccumuloServerContext context, KeyExtent extent, KeyExtent high, KeyExtent low, double splitRatio,
       SortedMap<FileRef,DataFileValue> mapFiles, Text midRow, String location, int steps, ZooLock zl) throws Exception {
 
-    SortedMap<FileRef,DataFileValue> lowDatafileSizes = new TreeMap<FileRef,DataFileValue>();
-    SortedMap<FileRef,DataFileValue> highDatafileSizes = new TreeMap<FileRef,DataFileValue>();
-    List<FileRef> highDatafilesToRemove = new ArrayList<FileRef>();
+    SortedMap<FileRef,DataFileValue> lowDatafileSizes = new TreeMap<>();
+    SortedMap<FileRef,DataFileValue> highDatafileSizes = new TreeMap<>();
+    List<FileRef> highDatafilesToRemove = new ArrayList<>();
 
     MetadataTableUtil.splitDatafiles(extent.getTableId(), midRow, splitRatio, new HashMap<FileRef,FileUtil.FileInfo>(), mapFiles, lowDatafileSizes,
         highDatafileSizes, highDatafilesToRemove);
@@ -211,13 +211,13 @@ public class SplitRecoveryIT extends ConfigurableMacBase {
     try (Scanner scanner = new ScannerImpl(context, MetadataTable.ID, Authorizations.EMPTY)) {
       scanner.setRange(extent.toMetadataRange());
 
-      HashSet<ColumnFQ> expectedColumns = new HashSet<ColumnFQ>();
+      HashSet<ColumnFQ> expectedColumns = new HashSet<>();
       expectedColumns.add(TabletsSection.ServerColumnFamily.DIRECTORY_COLUMN);
       expectedColumns.add(TabletsSection.TabletColumnFamily.PREV_ROW_COLUMN);
       expectedColumns.add(TabletsSection.ServerColumnFamily.TIME_COLUMN);
       expectedColumns.add(TabletsSection.ServerColumnFamily.LOCK_COLUMN);
 
-      HashSet<Text> expectedColumnFamilies = new HashSet<Text>();
+      HashSet<Text> expectedColumnFamilies = new HashSet<>();
       expectedColumnFamilies.add(DataFileColumnFamily.NAME);
       expectedColumnFamilies.add(TabletsSection.FutureLocationColumnFamily.NAME);
       expectedColumnFamilies.add(TabletsSection.CurrentLocationColumnFamily.NAME);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/functional/TabletIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/TabletIT.java b/test/src/main/java/org/apache/accumulo/test/functional/TabletIT.java
index d2b1416..8d52058 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/TabletIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/TabletIT.java
@@ -68,7 +68,7 @@ public class TabletIT extends AccumuloClusterHarness {
     Connector connector = getConnector();
 
     if (!readOnly) {
-      TreeSet<Text> keys = new TreeSet<Text>();
+      TreeSet<Text> keys = new TreeSet<>();
       for (int i = N / 100; i < N; i += N / 100) {
         keys.add(new Text(String.format("%05d", i)));
       }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/functional/TabletStateChangeIteratorIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/TabletStateChangeIteratorIT.java b/test/src/main/java/org/apache/accumulo/test/functional/TabletStateChangeIteratorIT.java
index b56b4a5..c64de25 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/TabletStateChangeIteratorIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/TabletStateChangeIteratorIT.java
@@ -172,7 +172,7 @@ public class TabletStateChangeIteratorIT extends SharedMiniClusterBase {
     Connector conn = getConnector();
     conn.tableOperations().create(t);
     conn.tableOperations().online(t, true);
-    SortedSet<Text> partitionKeys = new TreeSet<Text>();
+    SortedSet<Text> partitionKeys = new TreeSet<>();
     partitionKeys.add(new Text("some split"));
     conn.tableOperations().addSplits(t, partitionKeys);
     if (!online) {
@@ -199,7 +199,7 @@ public class TabletStateChangeIteratorIT extends SharedMiniClusterBase {
 
     @Override
     public Set<TServerInstance> onlineTabletServers() {
-      HashSet<TServerInstance> tservers = new HashSet<TServerInstance>();
+      HashSet<TServerInstance> tservers = new HashSet<>();
       for (String tserver : getConnector().instanceOperations().getTabletServers()) {
         try {
           String zPath = ZooUtil.getRoot(getConnector().getInstance()) + Constants.ZTSERVERS + "/" + tserver;
@@ -214,7 +214,7 @@ public class TabletStateChangeIteratorIT extends SharedMiniClusterBase {
 
     @Override
     public Set<String> onlineTables() {
-      HashSet<String> onlineTables = new HashSet<String>(getConnector().tableOperations().tableIdMap().values());
+      HashSet<String> onlineTables = new HashSet<>(getConnector().tableOperations().tableIdMap().values());
       return Sets.filter(onlineTables, new Predicate<String>() {
         @Override
         public boolean apply(String tableId) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/functional/VisibilityIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/VisibilityIT.java b/test/src/main/java/org/apache/accumulo/test/functional/VisibilityIT.java
index 3d6ad85..8285461 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/VisibilityIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/VisibilityIT.java
@@ -94,7 +94,7 @@ public class VisibilityIT extends AccumuloClusterHarness {
   }
 
   private static SortedSet<String> nss(String... labels) {
-    TreeSet<String> ts = new TreeSet<String>();
+    TreeSet<String> ts = new TreeSet<>();
 
     for (String s : labels) {
       ts.add(s);
@@ -153,7 +153,7 @@ public class VisibilityIT extends AccumuloClusterHarness {
     bw.addMutation(m1);
     bw.close();
 
-    Map<Set<String>,Set<String>> expected = new HashMap<Set<String>,Set<String>>();
+    Map<Set<String>,Set<String>> expected = new HashMap<>();
 
     expected.put(nss("A", "L"), nss("v5"));
     expected.put(nss("A", "M"), nss("v5"));
@@ -184,10 +184,10 @@ public class VisibilityIT extends AccumuloClusterHarness {
 
     all.add(prefix);
 
-    TreeSet<String> ss = new TreeSet<String>(suffix);
+    TreeSet<String> ss = new TreeSet<>(suffix);
 
     for (String s : suffix) {
-      TreeSet<String> ps = new TreeSet<String>(prefix);
+      TreeSet<String> ps = new TreeSet<>(prefix);
       ps.add(s);
       ss.remove(s);
 
@@ -196,7 +196,7 @@ public class VisibilityIT extends AccumuloClusterHarness {
   }
 
   private void queryData(Connector c, String tableName) throws Exception {
-    Map<Set<String>,Set<String>> expected = new HashMap<Set<String>,Set<String>>();
+    Map<Set<String>,Set<String>> expected = new HashMap<>();
     expected.put(nss(), nss("v1"));
     expected.put(nss("A"), nss("v2"));
     expected.put(nss("A", "L"), nss("v5"));
@@ -227,14 +227,14 @@ public class VisibilityIT extends AccumuloClusterHarness {
 
     c.securityOperations().changeUserAuthorizations(getAdminPrincipal(), new Authorizations(nbas(userAuths)));
 
-    ArrayList<Set<String>> combos = new ArrayList<Set<String>>();
+    ArrayList<Set<String>> combos = new ArrayList<>();
     uniqueCombos(combos, nss(), allAuths);
 
     for (Set<String> set1 : combos) {
-      Set<String> e = new TreeSet<String>();
+      Set<String> e = new TreeSet<>();
       for (Set<String> set2 : combos) {
 
-        set2 = new HashSet<String>(set2);
+        set2 = new HashSet<>(set2);
         set2.retainAll(userAuths);
 
         if (set1.containsAll(set2) && expected.containsKey(set2)) {
@@ -300,7 +300,7 @@ public class VisibilityIT extends AccumuloClusterHarness {
   }
 
   private void verify(Iterator<Entry<Key,Value>> iter, String... expected) throws Exception {
-    HashSet<String> valuesSeen = new HashSet<String>();
+    HashSet<String> valuesSeen = new HashSet<>();
 
     while (iter.hasNext()) {
       Entry<Key,Value> entry = iter.next();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/functional/WALSunnyDayIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/WALSunnyDayIT.java b/test/src/main/java/org/apache/accumulo/test/functional/WALSunnyDayIT.java
index 6f0bc7a..434a8f5 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/WALSunnyDayIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/WALSunnyDayIT.java
@@ -226,7 +226,7 @@ public class WALSunnyDayIT extends ConfigurableMacBase {
       if (TabletColumnFamily.PREV_ROW_COLUMN.hasColumns(key) && !logs.isEmpty()) {
         KeyExtent extent = new KeyExtent(key.getRow(), entry.getValue());
         result.put(extent, logs);
-        logs = new ArrayList<String>();
+        logs = new ArrayList<>();
       }
     }
     return result;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/functional/WriteLotsIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/WriteLotsIT.java b/test/src/main/java/org/apache/accumulo/test/functional/WriteLotsIT.java
index 38ea6f7..719dbdb 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/WriteLotsIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/WriteLotsIT.java
@@ -43,7 +43,7 @@ public class WriteLotsIT extends AccumuloClusterHarness {
     final Connector c = getConnector();
     final String tableName = getUniqueNames(1)[0];
     c.tableOperations().create(tableName);
-    final AtomicReference<Exception> ref = new AtomicReference<Exception>();
+    final AtomicReference<Exception> ref = new AtomicReference<>();
     final ClientConfiguration clientConfig = getCluster().getClientConfig();
     final int THREADS = 5;
     ThreadPoolExecutor tpe = new ThreadPoolExecutor(0, THREADS, 0, TimeUnit.SECONDS, new ArrayBlockingQueue<Runnable>(THREADS));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/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 44f2859..6c20cda 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
@@ -16,6 +16,7 @@
  */
 package org.apache.accumulo.test.functional;
 
+import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly;
 import static java.nio.charset.StandardCharsets.UTF_8;
 
 import java.util.HashMap;
@@ -24,7 +25,6 @@ import java.util.concurrent.TimeUnit;
 
 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;
@@ -51,7 +51,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.google.common.net.HostAndPort;
-import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly;
 
 /**
  * Tablet server that creates a lock in zookeeper, responds to one status request, and then hangs on subsequent requests. Exits with code zero if halted.
@@ -79,7 +78,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/b102e760/test/src/main/java/org/apache/accumulo/test/functional/ZooCacheIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ZooCacheIT.java b/test/src/main/java/org/apache/accumulo/test/functional/ZooCacheIT.java
index a531ee0..aa6e7a1 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/ZooCacheIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/ZooCacheIT.java
@@ -48,8 +48,8 @@ public class ZooCacheIT extends ConfigurableMacBase {
   @Test
   public void test() throws Exception {
     assertEquals(0, exec(CacheTestClean.class, pathName, testDir.getAbsolutePath()).waitFor());
-    final AtomicReference<Exception> ref = new AtomicReference<Exception>();
-    List<Thread> threads = new ArrayList<Thread>();
+    final AtomicReference<Exception> ref = new AtomicReference<>();
+    List<Thread> threads = new ArrayList<>();
     for (int i = 0; i < 3; i++) {
       Thread reader = new Thread() {
         @Override

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/functional/ZookeeperRestartIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ZookeeperRestartIT.java b/test/src/main/java/org/apache/accumulo/test/functional/ZookeeperRestartIT.java
index 5ece1ac..013edb0 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/ZookeeperRestartIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/ZookeeperRestartIT.java
@@ -46,7 +46,7 @@ public class ZookeeperRestartIT 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.INSTANCE_ZK_TIMEOUT.getKey(), "15s");
     cfg.setSiteConfig(siteConfig);
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloInputFormatIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloInputFormatIT.java b/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloInputFormatIT.java
index c855b39..cf002dd 100644
--- a/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloInputFormatIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloInputFormatIT.java
@@ -208,7 +208,7 @@ public class AccumuloInputFormatIT extends AccumuloClusterHarness {
 
     String table = getUniqueNames(1)[0];
     Authorizations auths = new Authorizations("foo");
-    Collection<Pair<Text,Text>> fetchColumns = Collections.singleton(new Pair<Text,Text>(new Text("foo"), new Text("bar")));
+    Collection<Pair<Text,Text>> fetchColumns = Collections.singleton(new Pair<>(new Text("foo"), new Text("bar")));
     boolean isolated = true, localIters = true;
     Level level = Level.WARN;
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloMultiTableInputFormatIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloMultiTableInputFormatIT.java b/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloMultiTableInputFormatIT.java
index fb3177a..44ef7d1 100644
--- a/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloMultiTableInputFormatIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloMultiTableInputFormatIT.java
@@ -111,7 +111,7 @@ public class AccumuloMultiTableInputFormatIT extends AccumuloClusterHarness {
       InputTableConfig tableConfig1 = new InputTableConfig();
       InputTableConfig tableConfig2 = new InputTableConfig();
 
-      Map<String,InputTableConfig> configMap = new HashMap<String,InputTableConfig>();
+      Map<String,InputTableConfig> configMap = new HashMap<>();
       configMap.put(table1, tableConfig1);
       configMap.put(table2, tableConfig2);
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloRowInputFormatIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloRowInputFormatIT.java b/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloRowInputFormatIT.java
index 98978dc..e81741a 100644
--- a/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloRowInputFormatIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloRowInputFormatIT.java
@@ -69,13 +69,13 @@ public class AccumuloRowInputFormatIT extends AccumuloClusterHarness {
 
   @BeforeClass
   public static void prepareRows() {
-    row1 = new ArrayList<Entry<Key,Value>>();
+    row1 = new ArrayList<>();
     row1.add(new KeyValue(new Key(ROW1, COLF1, "colq1"), "v1".getBytes()));
     row1.add(new KeyValue(new Key(ROW1, COLF1, "colq2"), "v2".getBytes()));
     row1.add(new KeyValue(new Key(ROW1, "colf2", "colq3"), "v3".getBytes()));
-    row2 = new ArrayList<Entry<Key,Value>>();
+    row2 = new ArrayList<>();
     row2.add(new KeyValue(new Key(ROW2, COLF1, "colq4"), "v4".getBytes()));
-    row3 = new ArrayList<Entry<Key,Value>>();
+    row3 = new ArrayList<>();
     row3.add(new KeyValue(new Key(ROW3, COLF1, "colq5"), "v5".getBytes()));
   }
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloInputFormatIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloInputFormatIT.java b/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloInputFormatIT.java
index 11e7d7c..a581099 100644
--- a/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloInputFormatIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloInputFormatIT.java
@@ -129,7 +129,7 @@ public class AccumuloInputFormatIT extends AccumuloClusterHarness {
     AccumuloInputFormat.setConnectorInfo(job, getAdminPrincipal(), getAdminToken());
 
     // split table
-    TreeSet<Text> splitsToAdd = new TreeSet<Text>();
+    TreeSet<Text> splitsToAdd = new TreeSet<>();
     for (int i = 0; i < 10000; i += 1000)
       splitsToAdd.add(new Text(String.format("%09d", i)));
     conn.tableOperations().addSplits(table, splitsToAdd);
@@ -141,7 +141,7 @@ public class AccumuloInputFormatIT extends AccumuloClusterHarness {
     assertEquals(actualSplits.size() + 1, splits.size()); // No ranges set on the job so it'll start with -inf
 
     // set ranges and get splits
-    List<Range> ranges = new ArrayList<Range>();
+    List<Range> ranges = new ArrayList<>();
     for (Text text : actualSplits)
       ranges.add(new Range(text));
     AccumuloInputFormat.setRanges(job, ranges);
@@ -160,7 +160,7 @@ public class AccumuloInputFormatIT extends AccumuloClusterHarness {
     assertEquals(actualSplits.size(), splits.size());
 
     // auto adjust ranges
-    ranges = new ArrayList<Range>();
+    ranges = new ArrayList<>();
     for (int i = 0; i < 5; i++)
       // overlapping ranges
       ranges.add(new Range(String.format("%09d", i), String.format("%09d", i + 2)));
@@ -402,7 +402,7 @@ public class AccumuloInputFormatIT extends AccumuloClusterHarness {
 
     String table = getUniqueNames(1)[0];
     Authorizations auths = new Authorizations("foo");
-    Collection<Pair<Text,Text>> fetchColumns = Collections.singleton(new Pair<Text,Text>(new Text("foo"), new Text("bar")));
+    Collection<Pair<Text,Text>> fetchColumns = Collections.singleton(new Pair<>(new Text("foo"), new Text("bar")));
     boolean isolated = true, localIters = true;
     Level level = Level.WARN;
 
@@ -506,7 +506,7 @@ public class AccumuloInputFormatIT extends AccumuloClusterHarness {
     @Override
     public List<InputSplit> getSplits(JobContext context) throws IOException {
       List<InputSplit> oldSplits = super.getSplits(context);
-      List<InputSplit> newSplits = new ArrayList<InputSplit>(oldSplits.size());
+      List<InputSplit> newSplits = new ArrayList<>(oldSplits.size());
 
       // Copy only the necessary information
       for (InputSplit oldSplit : oldSplits) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloMultiTableInputFormatIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloMultiTableInputFormatIT.java b/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloMultiTableInputFormatIT.java
index bd7ea42..350a183 100644
--- a/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloMultiTableInputFormatIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloMultiTableInputFormatIT.java
@@ -103,7 +103,7 @@ public class AccumuloMultiTableInputFormatIT extends AccumuloClusterHarness {
       InputTableConfig tableConfig1 = new InputTableConfig();
       InputTableConfig tableConfig2 = new InputTableConfig();
 
-      Map<String,InputTableConfig> configMap = new HashMap<String,InputTableConfig>();
+      Map<String,InputTableConfig> configMap = new HashMap<>();
       configMap.put(table1, tableConfig1);
       configMap.put(table2, tableConfig2);
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloRowInputFormatIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloRowInputFormatIT.java b/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloRowInputFormatIT.java
index 1275bf9..c03d462 100644
--- a/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloRowInputFormatIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloRowInputFormatIT.java
@@ -66,13 +66,13 @@ public class AccumuloRowInputFormatIT extends AccumuloClusterHarness {
 
   @BeforeClass
   public static void prepareRows() {
-    row1 = new ArrayList<Entry<Key,Value>>();
+    row1 = new ArrayList<>();
     row1.add(new KeyValue(new Key(ROW1, COLF1, "colq1"), "v1".getBytes()));
     row1.add(new KeyValue(new Key(ROW1, COLF1, "colq2"), "v2".getBytes()));
     row1.add(new KeyValue(new Key(ROW1, "colf2", "colq3"), "v3".getBytes()));
-    row2 = new ArrayList<Entry<Key,Value>>();
+    row2 = new ArrayList<>();
     row2.add(new KeyValue(new Key(ROW2, COLF1, "colq4"), "v4".getBytes()));
-    row3 = new ArrayList<Entry<Key,Value>>();
+    row3 = new ArrayList<>();
     row3.add(new KeyValue(new Key(ROW3, COLF1, "colq5"), "v5".getBytes()));
   }
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/test/src/main/java/org/apache/accumulo/test/performance/RollWALPerformanceIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/performance/RollWALPerformanceIT.java b/test/src/main/java/org/apache/accumulo/test/performance/RollWALPerformanceIT.java
index 6733e4b..827d6d8 100644
--- a/test/src/main/java/org/apache/accumulo/test/performance/RollWALPerformanceIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/performance/RollWALPerformanceIT.java
@@ -68,7 +68,7 @@ public class RollWALPerformanceIT extends ConfigurableMacBase {
     log.info("Splitting the table");
     final long SPLIT_COUNT = 100;
     final long distance = Long.MAX_VALUE / SPLIT_COUNT;
-    final SortedSet<Text> splits = new TreeSet<Text>();
+    final SortedSet<Text> splits = new TreeSet<>();
     for (int i = 1; i < SPLIT_COUNT; i++) {
       splits.add(new Text(String.format("%016x", i * distance)));
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/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 e74aa88..157d4a0 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 {
     String tid = "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());
       }