accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [22/32] accumulo git commit: ACCUMULO-4357 Remove unneeded code for readability
Date Fri, 01 Jul 2016 01:59:19 GMT
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);


Mime
View raw message