accumulo-commits mailing list archives

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


Mime
View raw message