accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [43/48] accumulo git commit: ACCUMULO-4514 Remove unnecessary code
Date Fri, 04 Nov 2016 22:17:20 GMT
http://git-wip-us.apache.org/repos/asf/accumulo/blob/717febbf/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 6f66c60..6b91531 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
@@ -83,13 +83,13 @@ public class MockTable {
     }
   };
 
-  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/717febbf/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 0da8bd1..ffb9bc5 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
@@ -79,7 +79,7 @@ class MockTableOperations extends TableOperationsHelper {
 
   @Override
   public SortedSet<String> list() {
-    return new TreeSet<String>(acu.tables.keySet());
+    return new TreeSet<>(acu.tables.keySet());
   }
 
   @Override
@@ -204,7 +204,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) {
@@ -354,7 +354,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))
@@ -370,8 +370,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;
   }
@@ -396,7 +396,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/717febbf/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 1c0c6a9..d2a49df 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
@@ -44,7 +44,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/717febbf/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/717febbf/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/717febbf/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/717febbf/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 9ff4185..25d4c60 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
@@ -117,7 +117,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);
   }
@@ -150,7 +150,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();
   }
@@ -176,7 +176,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/717febbf/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/717febbf/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/717febbf/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/717febbf/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/717febbf/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 96adaeb..358a1aa 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
@@ -763,8 +763,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)) {
@@ -789,7 +789,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());
@@ -944,7 +944,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/717febbf/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/717febbf/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/717febbf/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/717febbf/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/717febbf/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/717febbf/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 1d15ef4..1083684 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
@@ -322,7 +322,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);
@@ -972,7 +972,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);
@@ -1012,7 +1012,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/717febbf/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/717febbf/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 d2ae00b..c6329ee 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
@@ -55,7 +55,7 @@ import org.apache.hadoop.io.WritableComparable;
 
 public class KeyExtent implements WritableComparable<KeyExtent> {
 
-  private static final WeakHashMap<Text,WeakReference<Text>> tableIds = new WeakHashMap<Text,WeakReference<Text>>();
+  private static final WeakHashMap<Text,WeakReference<Text>> tableIds = new WeakHashMap<>();
 
   private static Text dedupeTableId(Text tableId) {
     synchronized (tableIds) {
@@ -68,7 +68,7 @@ public class KeyExtent implements WritableComparable<KeyExtent> {
       }
 
       tableId = new Text(tableId);
-      tableIds.put(tableId, new WeakReference<Text>(tableId));
+      tableIds.put(tableId, new WeakReference<>(tableId));
       return tableId;
     }
   }
@@ -307,7 +307,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/717febbf/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 765aa0c..5abd0f1 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
@@ -79,7 +79,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"));
     }
 
@@ -421,13 +421,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/717febbf/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 3798453..77b29b4 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
@@ -33,7 +33,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/717febbf/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/717febbf/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 be54835..e0358d3 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
@@ -464,7 +464,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/717febbf/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/717febbf/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 75d5567..b94035b 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/717febbf/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 75ad4c8..8a818e2 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
@@ -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/717febbf/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 5a3e911..0f2a935 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
@@ -55,7 +55,7 @@ public class PrintInfo implements KeywordExecutable {
     @Parameter(names = {"--histogram"}, description = "print a histogram of the key-value sizes")
     boolean histogram = 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/717febbf/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 af9011d..851226c 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
@@ -98,14 +98,14 @@ public class RFile {
     private MultiLevelIndex.Reader indexReader;
 
     public LocalityGroupMetadata(int version, BlockFileReader br) {
-      columnFamilies = new HashMap<ByteSequence,MutableLong>();
+      columnFamilies = new HashMap<>();
       indexReader = new MultiLevelIndex.Reader(br, version);
     }
 
     public LocalityGroupMetadata(int nextBlock, Set<ByteSequence> pcf, int indexBlockSize, BlockFileWriter bfw) {
       this.startBlock = nextBlock;
       isDefaultLG = true;
-      columnFamilies = new HashMap<ByteSequence,MutableLong>();
+      columnFamilies = new HashMap<>();
       previousColumnFamilies = pcf;
 
       indexWriter = new MultiLevelIndex.BufferedWriter(new MultiLevelIndex.Writer(bfw, indexBlockSize));
@@ -115,7 +115,7 @@ public class RFile {
       this.startBlock = nextBlock;
       this.name = name;
       isDefaultLG = false;
-      columnFamilies = new HashMap<ByteSequence,MutableLong>();
+      columnFamilies = new HashMap<>();
       for (ByteSequence cf : cfset) {
         columnFamilies.put(cf, new MutableLong(0));
       }
@@ -193,7 +193,7 @@ public class RFile {
         columnFamilies = null;
       } else {
         if (columnFamilies == null)
-          columnFamilies = new HashMap<ByteSequence,MutableLong>();
+          columnFamilies = new HashMap<>();
         else
           columnFamilies.clear();
 
@@ -252,8 +252,8 @@ public class RFile {
       out.println("Locality group         : " + (isDefaultLG ? "<DEFAULT>" : name));
       out.println("\tStart block          : " + startBlock);
       out.println("\tNum   blocks         : " + String.format("%,d", 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.println("\tIndex level " + entry.getKey() + "        : "
@@ -294,7 +294,7 @@ public class RFile {
     private final int indexBlockSize;
     private int entries = 0;
 
-    private ArrayList<LocalityGroupMetadata> localityGroups = new ArrayList<LocalityGroupMetadata>();
+    private ArrayList<LocalityGroupMetadata> localityGroups = new ArrayList<>();
     private LocalityGroupMetadata currentLocalityGroup = null;
     private int nextBlock = 0;
 
@@ -320,7 +320,7 @@ public class RFile {
       this.indexBlockSize = indexBlockSize;
       this.fileWriter = bfw;
       this.blockWriter = null;
-      previousColumnFamilies = new HashSet<ByteSequence>();
+      previousColumnFamilies = new HashSet<>();
     }
 
     @Override
@@ -461,7 +461,7 @@ public class RFile {
         currentLocalityGroup = new LocalityGroupMetadata(nextBlock, 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);
         }
@@ -851,7 +851,7 @@ public class RFile {
 
     private BlockFileReader reader;
 
-    private ArrayList<LocalityGroupMetadata> localityGroups = new ArrayList<LocalityGroupMetadata>();
+    private ArrayList<LocalityGroupMetadata> localityGroups = new ArrayList<>();
 
     private LocalityGroupReader lgReaders[];
     private HashSet<ByteSequence> nonDefaultColumnFamilies;
@@ -877,7 +877,7 @@ public class RFile {
         int size = mb.readInt();
         lgReaders = new LocalityGroupReader[size];
 
-        deepCopies = new LinkedList<Reader>();
+        deepCopies = new LinkedList<>();
 
         for (int i = 0; i < size; i++) {
           LocalityGroupMetadata lgm = new LocalityGroupMetadata(ver, rdr);
@@ -890,7 +890,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());
@@ -1019,7 +1019,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());
@@ -1058,7 +1058,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 : lgReaders) {
         indexes.add(lgr.getIndex());

http://git-wip-us.apache.org/repos/asf/accumulo/blob/717febbf/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 92a9f72..5a68164 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/717febbf/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 85a833e..d8232b0 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
@@ -566,7 +566,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++) {
@@ -1086,13 +1086,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);
@@ -1184,7 +1184,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);
@@ -1196,7 +1196,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/717febbf/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 64a89a6..2b81541 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
@@ -575,7 +575,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/717febbf/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/717febbf/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/717febbf/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 079bb70..aee9771 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
@@ -111,7 +111,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()) {
@@ -163,7 +163,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);
         }
 
@@ -188,8 +188,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()));
@@ -208,8 +208,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<>();
 
     parseIterConf(scope, iters, allOptions, conf);
 
@@ -241,7 +241,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) {
@@ -330,7 +330,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));
@@ -340,7 +340,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/717febbf/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/717febbf/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/717febbf/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/717febbf/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);
     }

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

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

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

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

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

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

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

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

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

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

http://git-wip-us.apache.org/repos/asf/accumulo/blob/717febbf/core/src/main/java/org/apache/accumulo/core/iterators/user/SummingArrayCombiner.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/user/SummingArrayCombiner.java b/core/src/main/java/org/apache/accumulo/core/iterators/user/SummingArrayCombiner.java
index 260fa36..c0fb5fe 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/user/SummingArrayCombiner.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/user/SummingArrayCombiner.java
@@ -69,7 +69,7 @@ public class SummingArrayCombiner extends TypedValueCombiner<List<Long>> {
 
   @Override
   public List<Long> typedReduce(Key key, Iterator<List<Long>> iter) {
-    List<Long> sum = new ArrayList<Long>();
+    List<Long> sum = new ArrayList<>();
     while (iter.hasNext()) {
       sum = arrayAdd(sum, iter.next());
     }
@@ -173,7 +173,7 @@ public class SummingArrayCombiner extends TypedValueCombiner<List<Long>> {
       DataInputStream dis = new DataInputStream(new ByteArrayInputStream(b, offset, origLen));
       try {
         int len = WritableUtils.readVInt(dis);
-        List<V> vl = new ArrayList<V>(len);
+        List<V> vl = new ArrayList<>(len);
         for (int i = 0; i < len; i++) {
           vl.add(read(dis));
         }
@@ -230,7 +230,7 @@ public class SummingArrayCombiner extends TypedValueCombiner<List<Long>> {
     @Override
     protected List<Long> decodeUnchecked(byte[] b, int offset, int len) {
       String[] longstrs = new String(b, offset, len, UTF_8).split(",");
-      List<Long> la = new ArrayList<Long>(longstrs.length);
+      List<Long> la = new ArrayList<>(longstrs.length);
       for (String s : longstrs) {
         if (s.length() == 0)
           la.add(0l);

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

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

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

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

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

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

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

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


Mime
View raw message