Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 43354200B5E for ; Fri, 1 Jul 2016 03:59:02 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 42299160A63; Fri, 1 Jul 2016 01:59:02 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id A2B48160A78 for ; Fri, 1 Jul 2016 03:58:59 +0200 (CEST) Received: (qmail 71613 invoked by uid 500); 1 Jul 2016 01:58:58 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 70905 invoked by uid 99); 1 Jul 2016 01:58:58 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 01 Jul 2016 01:58:58 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 39E27E00DB; Fri, 1 Jul 2016 01:58:58 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ctubbsii@apache.org To: commits@accumulo.apache.org Date: Fri, 01 Jul 2016 01:59:09 -0000 Message-Id: <87bc104f99b64d1cb81d758903997aa9@git.apache.org> In-Reply-To: <564c5b739f274484a0df4b80e4d99b65@git.apache.org> References: <564c5b739f274484a0df4b80e4d99b65@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [12/32] accumulo git commit: ACCUMULO-4357 Remove unneeded code for readability archived-at: Fri, 01 Jul 2016 01:59:02 -0000 http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/iterators/conf/ColumnToClassMapping.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/conf/ColumnToClassMapping.java b/core/src/main/java/org/apache/accumulo/core/iterators/conf/ColumnToClassMapping.java index 84a6996..11d5222 100644 --- a/core/src/main/java/org/apache/accumulo/core/iterators/conf/ColumnToClassMapping.java +++ b/core/src/main/java/org/apache/accumulo/core/iterators/conf/ColumnToClassMapping.java @@ -37,8 +37,8 @@ public class ColumnToClassMapping { private ColFamHashKey lookupCF = new ColFamHashKey(); public ColumnToClassMapping() { - objectsCF = new HashMap(); - objectsCol = new HashMap(); + objectsCF = new HashMap<>(); + objectsCol = new HashMap<>(); } public ColumnToClassMapping(Map objectStrings, Class c) throws InstantiationException, IllegalAccessException, http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/iterators/system/ColumnFamilySkippingIterator.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/system/ColumnFamilySkippingIterator.java b/core/src/main/java/org/apache/accumulo/core/iterators/system/ColumnFamilySkippingIterator.java index 350c4cd..53f3643 100644 --- a/core/src/main/java/org/apache/accumulo/core/iterators/system/ColumnFamilySkippingIterator.java +++ b/core/src/main/java/org/apache/accumulo/core/iterators/system/ColumnFamilySkippingIterator.java @@ -108,12 +108,12 @@ public class ColumnFamilySkippingIterator extends SkippingIterator implements In if (columnFamilies instanceof Set) { colFamSet = (Set) columnFamilies; } else { - colFamSet = new HashSet(); + colFamSet = new HashSet<>(); colFamSet.addAll(columnFamilies); } if (inclusive) { - sortedColFams = new TreeSet(colFamSet); + sortedColFams = new TreeSet<>(colFamSet); } else { sortedColFams = null; } http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/iterators/system/ColumnQualifierFilter.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/system/ColumnQualifierFilter.java b/core/src/main/java/org/apache/accumulo/core/iterators/system/ColumnQualifierFilter.java index aa6426d..866f04f 100644 --- a/core/src/main/java/org/apache/accumulo/core/iterators/system/ColumnQualifierFilter.java +++ b/core/src/main/java/org/apache/accumulo/core/iterators/system/ColumnQualifierFilter.java @@ -66,8 +66,8 @@ public class ColumnQualifierFilter extends Filter { } public void init(Set columns) { - this.columnFamilies = new HashSet(); - this.columnsQualifiers = new HashMap>(); + this.columnFamilies = new HashSet<>(); + this.columnsQualifiers = new HashMap<>(); for (Iterator 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 cfset = this.columnsQualifiers.get(cq); if (cfset == null) { - cfset = new HashSet(); + cfset = new HashSet<>(); this.columnsQualifiers.put(cq, cfset); } http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/iterators/system/HeapIterator.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/system/HeapIterator.java b/core/src/main/java/org/apache/accumulo/core/iterators/system/HeapIterator.java index 8f2f66c..6ed2d3e 100644 --- a/core/src/main/java/org/apache/accumulo/core/iterators/system/HeapIterator.java +++ b/core/src/main/java/org/apache/accumulo/core/iterators/system/HeapIterator.java @@ -53,7 +53,7 @@ public abstract class HeapIterator implements SortedKeyValueIterator if (heap != null) throw new IllegalStateException("heap already exist"); - heap = new PriorityQueue>(maxSize == 0 ? 1 : maxSize, new SKVIComparator()); + heap = new PriorityQueue<>(maxSize == 0 ? 1 : maxSize, new SKVIComparator()); } @Override http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/iterators/system/LocalityGroupIterator.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/system/LocalityGroupIterator.java b/core/src/main/java/org/apache/accumulo/core/iterators/system/LocalityGroupIterator.java index b2fae6d..ac8355b 100644 --- a/core/src/main/java/org/apache/accumulo/core/iterators/system/LocalityGroupIterator.java +++ b/core/src/main/java/org/apache/accumulo/core/iterators/system/LocalityGroupIterator.java @@ -91,7 +91,7 @@ public class LocalityGroupIterator extends HeapIterator implements Interruptible if (columnFamilies instanceof Set) { cfSet = (Set) columnFamilies; } else { - cfSet = new HashSet(); + cfSet = new HashSet<>(); cfSet.addAll(columnFamilies); } else http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/iterators/system/MultiIterator.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/system/MultiIterator.java b/core/src/main/java/org/apache/accumulo/core/iterators/system/MultiIterator.java index aef6aeb..7ff07e6 100644 --- a/core/src/main/java/org/apache/accumulo/core/iterators/system/MultiIterator.java +++ b/core/src/main/java/org/apache/accumulo/core/iterators/system/MultiIterator.java @@ -50,7 +50,7 @@ public class MultiIterator extends HeapIterator { private MultiIterator(MultiIterator other, IteratorEnvironment env) { super(other.iters.size()); - this.iters = new ArrayList>(); + this.iters = new ArrayList<>(); this.fence = other.fence; for (SortedKeyValueIterator iter : other.iters) { iters.add(iter.deepCopy(env)); http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/iterators/system/SourceSwitchingIterator.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/system/SourceSwitchingIterator.java b/core/src/main/java/org/apache/accumulo/core/iterators/system/SourceSwitchingIterator.java index 1f06a71..098aa63 100644 --- a/core/src/main/java/org/apache/accumulo/core/iterators/system/SourceSwitchingIterator.java +++ b/core/src/main/java/org/apache/accumulo/core/iterators/system/SourceSwitchingIterator.java @@ -36,7 +36,7 @@ import org.apache.accumulo.core.iterators.SortedKeyValueIterator; * (InMemoryMap that was minor compacted to a file). Clients reading from a table that has data in memory should not see interruption in their scan when that * data is minor compacted. This iterator is designed to manage this behind the scene. */ -public class SourceSwitchingIterator implements SortedKeyValueIterator, InterruptibleIterator { +public class SourceSwitchingIterator implements InterruptibleIterator { public interface DataSource { boolean isCurrent(); http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/iterators/system/SynchronizedIterator.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/system/SynchronizedIterator.java b/core/src/main/java/org/apache/accumulo/core/iterators/system/SynchronizedIterator.java index a095106..43da54d 100644 --- a/core/src/main/java/org/apache/accumulo/core/iterators/system/SynchronizedIterator.java +++ b/core/src/main/java/org/apache/accumulo/core/iterators/system/SynchronizedIterator.java @@ -68,7 +68,7 @@ public class SynchronizedIterator,V extends Writ @Override public synchronized SortedKeyValueIterator deepCopy(IteratorEnvironment env) { - return new SynchronizedIterator(source.deepCopy(env)); + return new SynchronizedIterator<>(source.deepCopy(env)); } public SynchronizedIterator() {} http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/iterators/user/BigDecimalCombiner.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/user/BigDecimalCombiner.java b/core/src/main/java/org/apache/accumulo/core/iterators/user/BigDecimalCombiner.java index d9e6cdd..77f33d9 100644 --- a/core/src/main/java/org/apache/accumulo/core/iterators/user/BigDecimalCombiner.java +++ b/core/src/main/java/org/apache/accumulo/core/iterators/user/BigDecimalCombiner.java @@ -101,8 +101,7 @@ public abstract class BigDecimalCombiner extends TypedValueCombiner * Provides the ability to encode scientific notation. * */ - public static class BigDecimalEncoder extends AbstractLexicoder implements - org.apache.accumulo.core.iterators.TypedValueCombiner.Encoder { + public static class BigDecimalEncoder extends AbstractLexicoder { @Override public byte[] encode(BigDecimal v) { return v.toString().getBytes(UTF_8); http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/iterators/user/CfCqSliceFilter.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/user/CfCqSliceFilter.java b/core/src/main/java/org/apache/accumulo/core/iterators/user/CfCqSliceFilter.java index a323028..d4630b0 100644 --- a/core/src/main/java/org/apache/accumulo/core/iterators/user/CfCqSliceFilter.java +++ b/core/src/main/java/org/apache/accumulo/core/iterators/user/CfCqSliceFilter.java @@ -16,17 +16,16 @@ */ package org.apache.accumulo.core.iterators.user; +import java.io.IOException; +import java.util.Map; + import org.apache.accumulo.core.data.Key; import org.apache.accumulo.core.data.PartialKey; import org.apache.accumulo.core.data.Value; import org.apache.accumulo.core.iterators.Filter; import org.apache.accumulo.core.iterators.IteratorEnvironment; -import org.apache.accumulo.core.iterators.OptionDescriber; import org.apache.accumulo.core.iterators.SortedKeyValueIterator; -import java.io.IOException; -import java.util.Map; - /** * Filters key/value pairs for a range of column families and a range of column qualifiers. Only keys which fall in both ranges will be passed by the filter. * Note that if you have a small, well-defined set of column families it will be much more efficient to configure locality groups to isolate that data instead @@ -34,7 +33,7 @@ import java.util.Map; * * @see org.apache.accumulo.core.iterators.user.CfCqSliceOpts for a description of this iterator's options. */ -public class CfCqSliceFilter extends Filter implements OptionDescriber { +public class CfCqSliceFilter extends Filter { private CfCqSliceOpts cso; http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/iterators/user/CfCqSliceOpts.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/user/CfCqSliceOpts.java b/core/src/main/java/org/apache/accumulo/core/iterators/user/CfCqSliceOpts.java index c70e4bd..53cbfb0 100644 --- a/core/src/main/java/org/apache/accumulo/core/iterators/user/CfCqSliceOpts.java +++ b/core/src/main/java/org/apache/accumulo/core/iterators/user/CfCqSliceOpts.java @@ -95,7 +95,7 @@ public class CfCqSliceOpts { static class Describer implements OptionDescriber { @Override public OptionDescriber.IteratorOptions describeOptions() { - Map options = new HashMap(); + Map options = new HashMap<>(); options.put(OPT_MIN_CF, OPT_MIN_CF_DESC); options.put(OPT_MIN_CQ, OPT_MIN_CQ_DESC); options.put(OPT_MAX_CF, OPT_MAX_CF_DESC); http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/iterators/user/LargeRowFilter.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/user/LargeRowFilter.java b/core/src/main/java/org/apache/accumulo/core/iterators/user/LargeRowFilter.java index 59a5dec..9fd40b6 100644 --- a/core/src/main/java/org/apache/accumulo/core/iterators/user/LargeRowFilter.java +++ b/core/src/main/java/org/apache/accumulo/core/iterators/user/LargeRowFilter.java @@ -56,8 +56,8 @@ public class LargeRowFilter implements SortedKeyValueIterator, Option private SortedKeyValueIterator source; // a cache of keys - private ArrayList keys = new ArrayList(); - private ArrayList values = new ArrayList(); + private ArrayList keys = new ArrayList<>(); + private ArrayList values = new ArrayList<>(); private int currentPosition; @@ -195,11 +195,11 @@ public class LargeRowFilter implements SortedKeyValueIterator, Option public void seek(Range range, Collection columnFamilies, boolean inclusive) throws IOException { if (inclusive && !columnFamilies.contains(EMPTY)) { - columnFamilies = new HashSet(columnFamilies); + columnFamilies = new HashSet<>(columnFamilies); columnFamilies.add(EMPTY); dropEmptyColFams = true; } else if (!inclusive && columnFamilies.contains(EMPTY)) { - columnFamilies = new HashSet(columnFamilies); + columnFamilies = new HashSet<>(columnFamilies); columnFamilies.remove(EMPTY); dropEmptyColFams = true; } else { http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/iterators/user/RowDeletingIterator.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/user/RowDeletingIterator.java b/core/src/main/java/org/apache/accumulo/core/iterators/user/RowDeletingIterator.java index 60870d8..3f704db 100644 --- a/core/src/main/java/org/apache/accumulo/core/iterators/user/RowDeletingIterator.java +++ b/core/src/main/java/org/apache/accumulo/core/iterators/user/RowDeletingIterator.java @@ -144,11 +144,11 @@ public class RowDeletingIterator implements SortedKeyValueIterator { public void seek(Range range, Collection columnFamilies, boolean inclusive) throws IOException { if (inclusive && !columnFamilies.contains(EMPTY)) { - columnFamilies = new HashSet(columnFamilies); + columnFamilies = new HashSet<>(columnFamilies); columnFamilies.add(EMPTY); dropEmptyColFams = true; } else if (!inclusive && columnFamilies.contains(EMPTY)) { - columnFamilies = new HashSet(columnFamilies); + columnFamilies = new HashSet<>(columnFamilies); columnFamilies.remove(EMPTY); dropEmptyColFams = true; } else { http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/iterators/user/RowEncodingIterator.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/user/RowEncodingIterator.java b/core/src/main/java/org/apache/accumulo/core/iterators/user/RowEncodingIterator.java index 320301d..e0fd64e 100644 --- a/core/src/main/java/org/apache/accumulo/core/iterators/user/RowEncodingIterator.java +++ b/core/src/main/java/org/apache/accumulo/core/iterators/user/RowEncodingIterator.java @@ -91,8 +91,8 @@ public abstract class RowEncodingIterator implements SortedKeyValueIterator keys = new ArrayList(); - List values = new ArrayList(); + List keys = new ArrayList<>(); + List values = new ArrayList<>(); private void prepKeys() throws IOException { long kvBufSize = 0; @@ -163,7 +163,7 @@ public abstract class RowEncodingIterator implements SortedKeyValueIterator namedOptions = new HashMap(); + HashMap namedOptions = new HashMap<>(); namedOptions.put(MAX_BUFFER_SIZE_OPT, bufferDesc); return new IteratorOptions(getClass().getSimpleName(), desc, namedOptions, null); } http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/iterators/user/SummingArrayCombiner.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/user/SummingArrayCombiner.java b/core/src/main/java/org/apache/accumulo/core/iterators/user/SummingArrayCombiner.java index 260fa36..2e59b2c 100644 --- a/core/src/main/java/org/apache/accumulo/core/iterators/user/SummingArrayCombiner.java +++ b/core/src/main/java/org/apache/accumulo/core/iterators/user/SummingArrayCombiner.java @@ -69,7 +69,7 @@ public class SummingArrayCombiner extends TypedValueCombiner> { @Override public List typedReduce(Key key, Iterator> iter) { - List sum = new ArrayList(); + List sum = new ArrayList<>(); while (iter.hasNext()) { sum = arrayAdd(sum, iter.next()); } @@ -142,7 +142,7 @@ public class SummingArrayCombiner extends TypedValueCombiner> { return true; } - public abstract static class DOSArrayEncoder extends AbstractLexicoder> implements Encoder> { + public abstract static class DOSArrayEncoder extends AbstractLexicoder> { public abstract void write(DataOutputStream dos, V v) throws IOException; public abstract V read(DataInputStream dis) throws IOException; @@ -173,7 +173,7 @@ public class SummingArrayCombiner extends TypedValueCombiner> { DataInputStream dis = new DataInputStream(new ByteArrayInputStream(b, offset, origLen)); try { int len = WritableUtils.readVInt(dis); - List vl = new ArrayList(len); + List vl = new ArrayList<>(len); for (int i = 0; i < len; i++) { vl.add(read(dis)); } @@ -208,7 +208,7 @@ public class SummingArrayCombiner extends TypedValueCombiner> { } } - public static class StringArrayEncoder extends AbstractEncoder> implements Encoder> { + public static class StringArrayEncoder extends AbstractEncoder> { @Override public byte[] encode(List la) { if (la.size() == 0) @@ -230,7 +230,7 @@ public class SummingArrayCombiner extends TypedValueCombiner> { @Override protected List decodeUnchecked(byte[] b, int offset, int len) { String[] longstrs = new String(b, offset, len, UTF_8).split(","); - List la = new ArrayList(longstrs.length); + List la = new ArrayList<>(longstrs.length); for (String s : longstrs) { if (s.length() == 0) la.add(0l); http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/iterators/user/TransformingIterator.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/user/TransformingIterator.java b/core/src/main/java/org/apache/accumulo/core/iterators/user/TransformingIterator.java index 66de3d6..1c99f7a 100644 --- a/core/src/main/java/org/apache/accumulo/core/iterators/user/TransformingIterator.java +++ b/core/src/main/java/org/apache/accumulo/core/iterators/user/TransformingIterator.java @@ -86,7 +86,7 @@ abstract public class TransformingIterator extends WrappingIterator implements O protected Logger log = LoggerFactory.getLogger(getClass()); - protected ArrayList> keys = new ArrayList>(); + protected ArrayList> 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 namedOptions = new HashMap(); + HashMap 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(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, new Value(val))); + keys.add(new Pair<>(key, new Value(val))); appened += (key.getSize() + val.getSize() + 128); } } http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/iterators/user/VisibilityFilter.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/user/VisibilityFilter.java b/core/src/main/java/org/apache/accumulo/core/iterators/user/VisibilityFilter.java index 6e55aec..f7007a1 100644 --- a/core/src/main/java/org/apache/accumulo/core/iterators/user/VisibilityFilter.java +++ b/core/src/main/java/org/apache/accumulo/core/iterators/user/VisibilityFilter.java @@ -25,7 +25,6 @@ import org.apache.accumulo.core.client.IteratorSetting; import org.apache.accumulo.core.data.Key; import org.apache.accumulo.core.data.Value; import org.apache.accumulo.core.iterators.IteratorEnvironment; -import org.apache.accumulo.core.iterators.OptionDescriber; import org.apache.accumulo.core.iterators.SortedKeyValueIterator; import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.core.security.ColumnVisibility; @@ -37,7 +36,7 @@ import org.apache.hadoop.io.Text; /** * */ -public class VisibilityFilter extends org.apache.accumulo.core.iterators.system.VisibilityFilter implements OptionDescriber { +public class VisibilityFilter extends org.apache.accumulo.core.iterators.system.VisibilityFilter { private static final String AUTHS = "auths"; private static final String FILTER_INVALID_ONLY = "filterInvalid"; http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/iterators/user/WholeColumnFamilyIterator.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/user/WholeColumnFamilyIterator.java b/core/src/main/java/org/apache/accumulo/core/iterators/user/WholeColumnFamilyIterator.java index 982d0df..0a3f3e5 100644 --- a/core/src/main/java/org/apache/accumulo/core/iterators/user/WholeColumnFamilyIterator.java +++ b/core/src/main/java/org/apache/accumulo/core/iterators/user/WholeColumnFamilyIterator.java @@ -73,7 +73,7 @@ public class WholeColumnFamilyIterator implements SortedKeyValueIterator decodeColumnFamily(Key rowKey, Value rowValue) throws IOException { - SortedMap map = new TreeMap(); + SortedMap 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 keys = new ArrayList(); - List values = new ArrayList(); + List keys = new ArrayList<>(); + List values = new ArrayList<>(); private void prepKeys() throws IOException { if (topKey != null) http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/iterators/user/WholeRowIterator.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/user/WholeRowIterator.java b/core/src/main/java/org/apache/accumulo/core/iterators/user/WholeRowIterator.java index 665cbfe..17bf315 100644 --- a/core/src/main/java/org/apache/accumulo/core/iterators/user/WholeRowIterator.java +++ b/core/src/main/java/org/apache/accumulo/core/iterators/user/WholeRowIterator.java @@ -84,7 +84,7 @@ public class WholeRowIterator extends RowEncodingIterator { // decode a bunch of key value pairs that have been encoded into a single value public static final SortedMap decodeRow(Key rowKey, Value rowValue) throws IOException { - SortedMap map = new TreeMap(); + SortedMap map = new TreeMap<>(); ByteArrayInputStream in = new ByteArrayInputStream(rowValue.get()); DataInputStream din = new DataInputStream(in); int numKeys = din.readInt(); http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/metadata/MetadataLocationObtainer.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/metadata/MetadataLocationObtainer.java b/core/src/main/java/org/apache/accumulo/core/metadata/MetadataLocationObtainer.java index d6af8ba..6336d12 100644 --- a/core/src/main/java/org/apache/accumulo/core/metadata/MetadataLocationObtainer.java +++ b/core/src/main/java/org/apache/accumulo/core/metadata/MetadataLocationObtainer.java @@ -68,10 +68,10 @@ public class MetadataLocationObtainer implements TabletLocationObtainer { public MetadataLocationObtainer() { - locCols = new TreeSet(); + 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(locCols); + columns = new ArrayList<>(locCols); } @Override @@ -90,12 +90,12 @@ public class MetadataLocationObtainer implements TabletLocationObtainer { Range range = new Range(row, true, stopRow, true); - TreeMap encodedResults = new TreeMap(); - TreeMap results = new TreeMap(); + TreeMap encodedResults = new TreeMap<>(); + TreeMap 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 serverSideIteratorList = new ArrayList(); + List serverSideIteratorList = new ArrayList<>(); serverSideIteratorList.add(new IterInfo(10000, WholeRowIterator.class.getName(), "WRI")); Map> serverSideIteratorOptions = Collections.emptyMap(); boolean more = ThriftScanner.getBatchFromServer(context, range, src.tablet_extent, src.tablet_location, encodedResults, locCols, serverSideIteratorList, @@ -162,7 +162,7 @@ public class MetadataLocationObtainer implements TabletLocationObtainer { public List lookupTablets(ClientContext context, String tserver, Map> tabletsRanges, TabletLocator parent) throws AccumuloSecurityException, AccumuloException { - final TreeMap results = new TreeMap(); + final TreeMap results = new TreeMap<>(); ResultReceiver rr = new ResultReceiver() { @@ -183,8 +183,8 @@ public class MetadataLocationObtainer implements TabletLocationObtainer { opts = unsetOpts.setColumns(locCols); } - Map> unscanned = new HashMap>(); - Map> failures = new HashMap>(); + Map> unscanned = new HashMap<>(); + Map> failures = new HashMap<>(); try { TabletServerBatchReaderIterator.doLookup(context, tserver, tabletsRanges, failures, unscanned, rr, columns, opts, Authorizations.EMPTY); if (failures.size() > 0) { @@ -212,8 +212,8 @@ public class MetadataLocationObtainer implements TabletLocationObtainer { Value prevRow = null; KeyExtent ke; - List results = new ArrayList(); - ArrayList locationless = new ArrayList(); + List results = new ArrayList<>(); + ArrayList locationless = new ArrayList<>(); Text lastRowFromKey = new Text(); http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/rpc/ThriftUtil.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/rpc/ThriftUtil.java b/core/src/main/java/org/apache/accumulo/core/rpc/ThriftUtil.java index be4238e..49e4349 100644 --- a/core/src/main/java/org/apache/accumulo/core/rpc/ThriftUtil.java +++ b/core/src/main/java/org/apache/accumulo/core/rpc/ThriftUtil.java @@ -59,7 +59,7 @@ public class ThriftUtil { private static final TraceProtocolFactory protocolFactory = new TraceProtocolFactory(); private static final TFramedTransport.Factory transportFactory = new TFramedTransport.Factory(Integer.MAX_VALUE); - private static final Map factoryCache = new HashMap(); + private static final Map factoryCache = new HashMap<>(); public static final String GSSAPI = "GSSAPI", DIGEST_MD5 = "DIGEST-MD5"; http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/sample/impl/SamplerConfigurationImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/sample/impl/SamplerConfigurationImpl.java b/core/src/main/java/org/apache/accumulo/core/sample/impl/SamplerConfigurationImpl.java index 8abf4e7..d3e2fe7 100644 --- a/core/src/main/java/org/apache/accumulo/core/sample/impl/SamplerConfigurationImpl.java +++ b/core/src/main/java/org/apache/accumulo/core/sample/impl/SamplerConfigurationImpl.java @@ -109,7 +109,7 @@ public class SamplerConfigurationImpl implements Writable { className = in.readUTF(); - options = new HashMap(); + options = new HashMap<>(); int num = in.readInt(); @@ -130,11 +130,11 @@ public class SamplerConfigurationImpl implements Writable { ArrayList> props = new ArrayList<>(); for (Entry entry : options.entrySet()) { - props.add(new Pair(Property.TABLE_SAMPLER_OPTS.getKey() + entry.getKey(), entry.getValue())); + props.add(new Pair<>(Property.TABLE_SAMPLER_OPTS.getKey() + entry.getKey(), entry.getValue())); } // intentionally added last, so its set last - props.add(new Pair(Property.TABLE_SAMPLER.getKey(), className)); + props.add(new Pair<>(Property.TABLE_SAMPLER.getKey(), className)); return props; } http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/security/Authorizations.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/security/Authorizations.java b/core/src/main/java/org/apache/accumulo/core/security/Authorizations.java index 001fed2..c725d9b 100644 --- a/core/src/main/java/org/apache/accumulo/core/security/Authorizations.java +++ b/core/src/main/java/org/apache/accumulo/core/security/Authorizations.java @@ -42,8 +42,8 @@ public class Authorizations implements Iterable, Serializable, Authoriza private static final long serialVersionUID = 1L; - private Set auths = new HashSet(); - private List authsList = new ArrayList(); // sorted order + private Set auths = new HashSet<>(); + private List authsList = new ArrayList<>(); // sorted order /** * An empty set of authorizations. @@ -88,7 +88,7 @@ public class Authorizations implements Iterable, Serializable, Authoriza } private void checkAuths() { - Set sortedAuths = new TreeSet(auths); + Set sortedAuths = new TreeSet<>(auths); for (ByteSequence bs : sortedAuths) { if (bs.length() == 0) { @@ -212,7 +212,7 @@ public class Authorizations implements Iterable, Serializable, Authoriza * @see #Authorizations(Collection) */ public List getAuthorizations() { - ArrayList copy = new ArrayList(authsList.size()); + ArrayList 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, Serializable, Authoriza * @return authorizations, each as a string encoded in UTF-8 and within a buffer */ public List getAuthorizationsBB() { - ArrayList copy = new ArrayList(authsList.size()); + ArrayList copy = new ArrayList<>(authsList.size()); for (byte[] auth : authsList) { byte[] bytes = new byte[auth.length]; System.arraycopy(auth, 0, bytes, 0, auth.length); http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/security/ColumnVisibility.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/security/ColumnVisibility.java b/core/src/main/java/org/apache/accumulo/core/security/ColumnVisibility.java index 4e0d597..c51e688 100644 --- a/core/src/main/java/org/apache/accumulo/core/security/ColumnVisibility.java +++ b/core/src/main/java/org/apache/accumulo/core/security/ColumnVisibility.java @@ -123,7 +123,7 @@ public class ColumnVisibility { public void add(Node child) { if (children == EMPTY) - children = new ArrayList(); + 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 rolledUp = new TreeSet(comparator); + TreeSet rolledUp = new TreeSet<>(comparator); java.util.Iterator itr = root.children.iterator(); while (itr.hasNext()) { Node c = normalize(itr.next(), expression, comparator); http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/security/NamespacePermission.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/security/NamespacePermission.java b/core/src/main/java/org/apache/accumulo/core/security/NamespacePermission.java index 638f630..55a7b75 100644 --- a/core/src/main/java/org/apache/accumulo/core/security/NamespacePermission.java +++ b/core/src/main/java/org/apache/accumulo/core/security/NamespacePermission.java @@ -63,7 +63,7 @@ public enum NamespacePermission { public static List printableValues() { NamespacePermission[] a = NamespacePermission.values(); - List list = new ArrayList(a.length); + List list = new ArrayList<>(a.length); for (NamespacePermission p : a) list.add("Namespace." + p); http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/security/SystemPermission.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/security/SystemPermission.java b/core/src/main/java/org/apache/accumulo/core/security/SystemPermission.java index a1df5dc..cf70ec2 100644 --- a/core/src/main/java/org/apache/accumulo/core/security/SystemPermission.java +++ b/core/src/main/java/org/apache/accumulo/core/security/SystemPermission.java @@ -44,7 +44,7 @@ public enum SystemPermission { private static HashMap mapping; static { - mapping = new HashMap(SystemPermission.values().length); + mapping = new HashMap<>(SystemPermission.values().length); for (SystemPermission perm : SystemPermission.values()) mapping.put(perm.permID, perm); } @@ -70,7 +70,7 @@ public enum SystemPermission { public static List printableValues() { SystemPermission[] a = SystemPermission.values(); - List list = new ArrayList(a.length); + List list = new ArrayList<>(a.length); for (SystemPermission p : a) list.add("System." + p); http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/security/TablePermission.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/security/TablePermission.java b/core/src/main/java/org/apache/accumulo/core/security/TablePermission.java index b6d122f..a80be9a 100644 --- a/core/src/main/java/org/apache/accumulo/core/security/TablePermission.java +++ b/core/src/main/java/org/apache/accumulo/core/security/TablePermission.java @@ -64,7 +64,7 @@ public enum TablePermission { public static List printableValues() { TablePermission[] a = TablePermission.values(); - List list = new ArrayList(a.length); + List list = new ArrayList<>(a.length); for (TablePermission p : a) list.add("Table." + p); http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/security/VisibilityEvaluator.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/security/VisibilityEvaluator.java b/core/src/main/java/org/apache/accumulo/core/security/VisibilityEvaluator.java index 03b336b..efd7ea3 100644 --- a/core/src/main/java/org/apache/accumulo/core/security/VisibilityEvaluator.java +++ b/core/src/main/java/org/apache/accumulo/core/security/VisibilityEvaluator.java @@ -93,7 +93,7 @@ public class VisibilityEvaluator { * @see #escape(byte[], boolean) */ static Authorizations escape(Authorizations auths) { - ArrayList retAuths = new ArrayList(auths.getAuthorizations().size()); + ArrayList retAuths = new ArrayList<>(auths.getAuthorizations().size()); for (byte[] auth : auths.getAuthorizations()) retAuths.add(escape(auth, false)); http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/security/crypto/CachingHDFSSecretKeyEncryptionStrategy.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/security/crypto/CachingHDFSSecretKeyEncryptionStrategy.java b/core/src/main/java/org/apache/accumulo/core/security/crypto/CachingHDFSSecretKeyEncryptionStrategy.java index 4ee27ef..7b79d99 100644 --- a/core/src/main/java/org/apache/accumulo/core/security/crypto/CachingHDFSSecretKeyEncryptionStrategy.java +++ b/core/src/main/java/org/apache/accumulo/core/security/crypto/CachingHDFSSecretKeyEncryptionStrategy.java @@ -112,7 +112,7 @@ public class CachingHDFSSecretKeyEncryptionStrategy implements SecretKeyEncrypti private byte[] keyEncryptionKey; private String pathToKeyName; - public SecretKeyCache() {}; + public SecretKeyCache() {} public synchronized void ensureSecretKeyCacheInitialized(CryptoModuleParameters context) throws IOException { http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/security/crypto/CryptoModuleFactory.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/security/crypto/CryptoModuleFactory.java b/core/src/main/java/org/apache/accumulo/core/security/crypto/CryptoModuleFactory.java index e8e2326..79db306 100644 --- a/core/src/main/java/org/apache/accumulo/core/security/crypto/CryptoModuleFactory.java +++ b/core/src/main/java/org/apache/accumulo/core/security/crypto/CryptoModuleFactory.java @@ -34,8 +34,8 @@ import org.slf4j.LoggerFactory; public class CryptoModuleFactory { private static final Logger log = LoggerFactory.getLogger(CryptoModuleFactory.class); - private static final Map cryptoModulesCache = new HashMap(); - private static final Map secretKeyEncryptionStrategyCache = new HashMap(); + private static final Map cryptoModulesCache = new HashMap<>(); + private static final Map secretKeyEncryptionStrategyCache = new HashMap<>(); /** * This method returns a crypto module based on settings in the given configuration parameter. http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/security/crypto/DefaultCryptoModule.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/security/crypto/DefaultCryptoModule.java b/core/src/main/java/org/apache/accumulo/core/security/crypto/DefaultCryptoModule.java index b7e089f..13104b2 100644 --- a/core/src/main/java/org/apache/accumulo/core/security/crypto/DefaultCryptoModule.java +++ b/core/src/main/java/org/apache/accumulo/core/security/crypto/DefaultCryptoModule.java @@ -300,7 +300,7 @@ public class DefaultCryptoModule implements CryptoModule { String marker = dataIn.readUTF(); if (marker.equals(ENCRYPTION_HEADER_MARKER_V1) || marker.equals(ENCRYPTION_HEADER_MARKER_V2)) { - Map paramsFromFile = new HashMap(); + Map paramsFromFile = new HashMap<>(); // Read in the bulk of parameters int paramsCount = dataIn.readInt(); http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/trace/DistributedTrace.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/trace/DistributedTrace.java b/core/src/main/java/org/apache/accumulo/core/trace/DistributedTrace.java index 14886f1..f833b11 100644 --- a/core/src/main/java/org/apache/accumulo/core/trace/DistributedTrace.java +++ b/core/src/main/java/org/apache/accumulo/core/trace/DistributedTrace.java @@ -52,7 +52,7 @@ public class DistributedTrace { public static final String TRACER_ZK_TIMEOUT = "tracer.zookeeper.timeout"; public static final String TRACER_ZK_PATH = "tracer.zookeeper.path"; - private static final HashSet receivers = new HashSet(); + private static final HashSet receivers = new HashSet<>(); /** * @deprecated since 1.7, use {@link DistributedTrace#enable(String, String, org.apache.accumulo.core.client.ClientConfiguration)} instead http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/trace/wrappers/TraceWrap.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/trace/wrappers/TraceWrap.java b/core/src/main/java/org/apache/accumulo/core/trace/wrappers/TraceWrap.java index bbfa386..8f83bd2 100644 --- a/core/src/main/java/org/apache/accumulo/core/trace/wrappers/TraceWrap.java +++ b/core/src/main/java/org/apache/accumulo/core/trace/wrappers/TraceWrap.java @@ -39,12 +39,12 @@ import java.lang.reflect.Proxy; public class TraceWrap { public static T service(final T instance) { - InvocationHandler handler = new RpcServerInvocationHandler(instance); + InvocationHandler handler = new RpcServerInvocationHandler<>(instance); return wrappedInstance(handler, instance); } public static T client(final T instance) { - InvocationHandler handler = new RpcClientInvocationHandler(instance); + InvocationHandler handler = new RpcClientInvocationHandler<>(instance); return wrappedInstance(handler, instance); } http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/util/ByteArraySet.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/util/ByteArraySet.java b/core/src/main/java/org/apache/accumulo/core/util/ByteArraySet.java index bf177fd..337fe9c 100644 --- a/core/src/main/java/org/apache/accumulo/core/util/ByteArraySet.java +++ b/core/src/main/java/org/apache/accumulo/core/util/ByteArraySet.java @@ -38,7 +38,7 @@ public class ByteArraySet extends TreeSet { } public static ByteArraySet fromStrings(Collection c) { - List lst = new ArrayList(); + List lst = new ArrayList<>(); for (String s : c) lst.add(s.getBytes(UTF_8)); return new ByteArraySet(lst); http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/util/ByteBufferUtil.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/util/ByteBufferUtil.java b/core/src/main/java/org/apache/accumulo/core/util/ByteBufferUtil.java index de889a4..27188fe 100644 --- a/core/src/main/java/org/apache/accumulo/core/util/ByteBufferUtil.java +++ b/core/src/main/java/org/apache/accumulo/core/util/ByteBufferUtil.java @@ -48,7 +48,7 @@ public class ByteBufferUtil { public static List toByteBuffers(Collection bytesList) { if (bytesList == null) return null; - ArrayList result = new ArrayList(); + ArrayList result = new ArrayList<>(); for (byte[] bytes : bytesList) { result.add(ByteBuffer.wrap(bytes)); } @@ -58,7 +58,7 @@ public class ByteBufferUtil { public static List toBytesList(Collection bytesList) { if (bytesList == null) return null; - ArrayList result = new ArrayList(bytesList.size()); + ArrayList result = new ArrayList<>(bytesList.size()); for (ByteBuffer bytes : bytesList) { result.add(toBytes(bytes)); } http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/util/LocalityGroupUtil.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/util/LocalityGroupUtil.java b/core/src/main/java/org/apache/accumulo/core/util/LocalityGroupUtil.java index a5255c7..2063855 100644 --- a/core/src/main/java/org/apache/accumulo/core/util/LocalityGroupUtil.java +++ b/core/src/main/java/org/apache/accumulo/core/util/LocalityGroupUtil.java @@ -51,7 +51,7 @@ public class LocalityGroupUtil { public static Set families(Collection columns) { if (columns.size() == 0) return EMPTY_CF_SET; - Set result = new HashSet(columns.size()); + Set result = new HashSet<>(columns.size()); for (Column col : columns) { result.add(new ArrayByteSequence(col.getColumnFamily())); } @@ -66,13 +66,13 @@ public class LocalityGroupUtil { } public static Map> getLocalityGroups(AccumuloConfiguration acuconf) throws LocalityGroupConfigurationError { - Map> result = new HashMap>(); + Map> result = new HashMap<>(); String[] groups = acuconf.get(Property.TABLE_LOCALITY_GROUPS).split(","); for (String group : groups) { if (group.length() > 0) result.put(group, new HashSet()); } - HashSet all = new HashSet(); + HashSet all = new HashSet<>(); for (Entry entry : acuconf) { String property = entry.getKey(); String value = entry.getValue(); @@ -101,7 +101,7 @@ public class LocalityGroupUtil { } public static Set decodeColumnFamilies(String colFams) throws LocalityGroupConfigurationError { - HashSet colFamsSet = new HashSet(); + HashSet colFamsSet = new HashSet<>(); for (String family : colFams.split(",")) { ByteSequence cfbs = decodeColumnFamily(family); @@ -152,7 +152,7 @@ public class LocalityGroupUtil { } public static String encodeColumnFamilies(Set colFams) { - SortedSet ecfs = new TreeSet(); + SortedSet ecfs = new TreeSet<>(); StringBuilder sb = new StringBuilder(); @@ -235,7 +235,7 @@ public class LocalityGroupUtil { public Partitioner(PreAllocatedArray> groups) { this.groups = groups; - this.colfamToLgidMap = new HashMap(); + this.colfamToLgidMap = new HashMap<>(); for (int i = 0; i < groups.length; i++) { for (ByteSequence cf : groups.get(i).keySet()) { http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/util/MapCounter.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/util/MapCounter.java b/core/src/main/java/org/apache/accumulo/core/util/MapCounter.java index 4372cfc..9c504e9 100644 --- a/core/src/main/java/org/apache/accumulo/core/util/MapCounter.java +++ b/core/src/main/java/org/apache/accumulo/core/util/MapCounter.java @@ -30,7 +30,7 @@ public class MapCounter { private HashMap map; public MapCounter() { - map = new HashMap(); + map = new HashMap<>(); } public long increment(KT key, long l) { @@ -68,7 +68,7 @@ public class MapCounter { public Collection values() { Collection vals = map.values(); - ArrayList ret = new ArrayList(vals.size()); + ArrayList ret = new ArrayList<>(vals.size()); for (MutableLong ml : vals) { ret.add(ml.l); } http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/util/Merge.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/util/Merge.java b/core/src/main/java/org/apache/accumulo/core/util/Merge.java index 71f8325..1af5e37 100644 --- a/core/src/main/java/org/apache/accumulo/core/util/Merge.java +++ b/core/src/main/java/org/apache/accumulo/core/util/Merge.java @@ -51,7 +51,7 @@ public class Merge { MergeException(Exception ex) { super(ex); } - }; + } private static final Logger log = LoggerFactory.getLogger(Merge.class); @@ -120,7 +120,7 @@ public class Merge { if (table.equals(MetadataTable.NAME)) { throw new IllegalArgumentException("cannot merge tablets on the metadata table"); } - List sizes = new ArrayList(); + List sizes = new ArrayList<>(); long totalSize = 0; // Merge any until you get larger than the goal size, and then merge one less tablet Iterator sizeIterator = getSizeIterator(conn, table, start, end); http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/util/Pair.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/util/Pair.java b/core/src/main/java/org/apache/accumulo/core/util/Pair.java index 293d126..2d51bcd 100644 --- a/core/src/main/java/org/apache/accumulo/core/util/Pair.java +++ b/core/src/main/java/org/apache/accumulo/core/util/Pair.java @@ -73,11 +73,11 @@ public class Pair { } public Entry toMapEntry() { - return new SimpleImmutableEntry(getFirst(), getSecond()); + return new SimpleImmutableEntry<>(getFirst(), getSecond()); } public Pair swap() { - return new Pair(getSecond(), getFirst()); + return new Pair<>(getSecond(), getFirst()); } public static Pair fromEntry(Entry entry) { http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/util/ServerServices.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/util/ServerServices.java b/core/src/main/java/org/apache/accumulo/core/util/ServerServices.java index a07ef76..de39d5c 100644 --- a/core/src/main/java/org/apache/accumulo/core/util/ServerServices.java +++ b/core/src/main/java/org/apache/accumulo/core/util/ServerServices.java @@ -32,7 +32,7 @@ public class ServerServices implements Comparable { private String stringForm = null; public ServerServices(String services) { - this.services = new EnumMap(Service.class); + this.services = new EnumMap<>(Service.class); String[] addresses = services.split(SERVICE_SEPARATOR); for (String address : addresses) { http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/util/StopWatch.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/util/StopWatch.java b/core/src/main/java/org/apache/accumulo/core/util/StopWatch.java index 8abe19e..5a574db 100644 --- a/core/src/main/java/org/apache/accumulo/core/util/StopWatch.java +++ b/core/src/main/java/org/apache/accumulo/core/util/StopWatch.java @@ -23,8 +23,8 @@ public class StopWatch> { EnumMap totalTime; public StopWatch(Class k) { - startTime = new EnumMap(k); - totalTime = new EnumMap(k); + startTime = new EnumMap<>(k); + totalTime = new EnumMap<>(k); } public synchronized void start(K timer) { http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/util/format/ShardedTableDistributionFormatter.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/util/format/ShardedTableDistributionFormatter.java b/core/src/main/java/org/apache/accumulo/core/util/format/ShardedTableDistributionFormatter.java index 877f164..336e986 100644 --- a/core/src/main/java/org/apache/accumulo/core/util/format/ShardedTableDistributionFormatter.java +++ b/core/src/main/java/org/apache/accumulo/core/util/format/ShardedTableDistributionFormatter.java @@ -34,7 +34,7 @@ import org.apache.accumulo.core.data.Value; */ public class ShardedTableDistributionFormatter extends AggregatingFormatter { - private Map> countsByDay = new HashMap>(); + private Map> countsByDay = new HashMap<>(); @Override protected void aggregateStats(Entry entry) { http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/util/format/StatisticsDisplayFormatter.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/util/format/StatisticsDisplayFormatter.java b/core/src/main/java/org/apache/accumulo/core/util/format/StatisticsDisplayFormatter.java index b3ee3ee..0f4858a 100644 --- a/core/src/main/java/org/apache/accumulo/core/util/format/StatisticsDisplayFormatter.java +++ b/core/src/main/java/org/apache/accumulo/core/util/format/StatisticsDisplayFormatter.java @@ -28,9 +28,9 @@ import org.apache.accumulo.core.data.Value; * debugging. If used on large result sets it will likely fail. */ public class StatisticsDisplayFormatter extends AggregatingFormatter { - private Map classifications = new HashMap(); - private Map columnFamilies = new HashMap(); - private Map columnQualifiers = new HashMap(); + private Map classifications = new HashMap<>(); + private Map columnFamilies = new HashMap<>(); + private Map columnQualifiers = new HashMap<>(); private long total = 0; @Override @@ -71,9 +71,9 @@ public class StatisticsDisplayFormatter extends AggregatingFormatter { buf.append(total).append(" entries matched."); total = 0; - classifications = new HashMap(); - columnFamilies = new HashMap(); - columnQualifiers = new HashMap(); + classifications = new HashMap<>(); + columnFamilies = new HashMap<>(); + columnQualifiers = new HashMap<>(); return buf.toString(); } http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/main/java/org/apache/accumulo/core/util/interpret/HexScanInterpreter.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/util/interpret/HexScanInterpreter.java b/core/src/main/java/org/apache/accumulo/core/util/interpret/HexScanInterpreter.java index 964e8c6..3794f27 100644 --- a/core/src/main/java/org/apache/accumulo/core/util/interpret/HexScanInterpreter.java +++ b/core/src/main/java/org/apache/accumulo/core/util/interpret/HexScanInterpreter.java @@ -22,6 +22,6 @@ import org.apache.accumulo.core.util.format.HexFormatter; * As simple scan interpreter that converts hex to binary. IT supports translating the output of {@link HexFormatter} back to binary. The hex input can contain * dashes (because {@link HexFormatter} outputs dashes) which are ignored. */ -public class HexScanInterpreter extends HexFormatter implements ScanInterpreter { +public class HexScanInterpreter extends HexFormatter { } http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/client/IteratorSettingTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/accumulo/core/client/IteratorSettingTest.java b/core/src/test/java/org/apache/accumulo/core/client/IteratorSettingTest.java index bbe2415..ddea0b3 100644 --- a/core/src/test/java/org/apache/accumulo/core/client/IteratorSettingTest.java +++ b/core/src/test/java/org/apache/accumulo/core/client/IteratorSettingTest.java @@ -104,7 +104,7 @@ public class IteratorSettingTest { assertNotEquals(setting1, notEqual1); - Map props = new HashMap(); + Map props = new HashMap<>(); props.put("foo", "bar"); IteratorSetting notEquals2 = new IteratorSetting(100, "Combiner", Combiner.class, props); http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/client/RowIteratorTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/accumulo/core/client/RowIteratorTest.java b/core/src/test/java/org/apache/accumulo/core/client/RowIteratorTest.java index 55e21d1..d8b0696 100644 --- a/core/src/test/java/org/apache/accumulo/core/client/RowIteratorTest.java +++ b/core/src/test/java/org/apache/accumulo/core/client/RowIteratorTest.java @@ -36,7 +36,7 @@ import org.junit.Test; public class RowIteratorTest { Iterator> makeIterator(final String... args) { - final Map result = new TreeMap(); + final Map result = new TreeMap<>(); for (String s : args) { final String parts[] = s.split("[ \t]"); final Key key = new Key(parts[0], parts[1], parts[2]); @@ -47,11 +47,11 @@ public class RowIteratorTest { } List>> getRows(final Iterator> iter) { - final List>> result = new ArrayList>>(); + final List>> result = new ArrayList<>(); final RowIterator riter = new RowIterator(iter); while (riter.hasNext()) { final Iterator> row = riter.next(); - final List> rlist = new ArrayList>(); + final List> rlist = new ArrayList<>(); while (row.hasNext()) rlist.add(row.next()); result.add(rlist); http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/client/ZooKeeperInstanceTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/accumulo/core/client/ZooKeeperInstanceTest.java b/core/src/test/java/org/apache/accumulo/core/client/ZooKeeperInstanceTest.java index 41e0b92..aecc947 100644 --- a/core/src/test/java/org/apache/accumulo/core/client/ZooKeeperInstanceTest.java +++ b/core/src/test/java/org/apache/accumulo/core/client/ZooKeeperInstanceTest.java @@ -139,7 +139,7 @@ public class ZooKeeperInstanceTest { replay(config); zki = new ZooKeeperInstance(config, zcf); expect(zc.get(Constants.ZROOT + "/" + IID_STRING)).andReturn("yup".getBytes()); - List children = new java.util.ArrayList(); + List children = new java.util.ArrayList<>(); children.add("child1"); children.add("child2"); expect(zc.getChildren(Constants.ZROOT + Constants.ZINSTANCES)).andReturn(children); http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/client/impl/ClientContextTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/accumulo/core/client/impl/ClientContextTest.java b/core/src/test/java/org/apache/accumulo/core/client/impl/ClientContextTest.java index ff9863c..4eb348e 100644 --- a/core/src/test/java/org/apache/accumulo/core/client/impl/ClientContextTest.java +++ b/core/src/test/java/org/apache/accumulo/core/client/impl/ClientContextTest.java @@ -99,7 +99,7 @@ public class ClientContextTest { clientConf.addProperty(Property.GENERAL_SECURITY_CREDENTIAL_PROVIDER_PATHS.getKey(), absPath); AccumuloConfiguration accClientConf = ClientContext.convertClientConfig(clientConf); - Map props = new HashMap(); + Map props = new HashMap<>(); Predicate all = Predicates.alwaysTrue(); accClientConf.getProperties(props, all); http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/client/impl/TableOperationsHelperTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/accumulo/core/client/impl/TableOperationsHelperTest.java b/core/src/test/java/org/apache/accumulo/core/client/impl/TableOperationsHelperTest.java index c55b62f..1d699c2 100644 --- a/core/src/test/java/org/apache/accumulo/core/client/impl/TableOperationsHelperTest.java +++ b/core/src/test/java/org/apache/accumulo/core/client/impl/TableOperationsHelperTest.java @@ -49,7 +49,7 @@ import org.junit.Test; public class TableOperationsHelperTest { static class Tester extends TableOperationsHelper { - Map> settings = new HashMap>(); + Map> settings = new HashMap<>(); @Override public SortedSet list() { @@ -256,12 +256,12 @@ public class TableOperationsHelperTest { } void check(TableOperationsHelper t, String tablename, String[] values) throws Exception { - Map expected = new TreeMap(); + Map expected = new TreeMap<>(); for (String value : values) { String parts[] = value.split("=", 2); expected.put(parts[0], parts[1]); } - Map actual = new TreeMap(); + Map actual = new TreeMap<>(); for (Entry entry : t.getProperties(tablename)) { actual.put(entry.getKey(), entry.getValue()); } http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/core/src/test/java/org/apache/accumulo/core/client/impl/TabletLocatorImplTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/accumulo/core/client/impl/TabletLocatorImplTest.java b/core/src/test/java/org/apache/accumulo/core/client/impl/TabletLocatorImplTest.java index a053cef..bab52f6 100644 --- a/core/src/test/java/org/apache/accumulo/core/client/impl/TabletLocatorImplTest.java +++ b/core/src/test/java/org/apache/accumulo/core/client/impl/TabletLocatorImplTest.java @@ -88,13 +88,13 @@ public class TabletLocatorImplTest { @SuppressWarnings("unchecked") static Map>> createExpectedBinnings(Object... data) { - Map>> expBinnedRanges = new HashMap>>(); + Map>> expBinnedRanges = new HashMap<>(); for (int i = 0; i < data.length; i += 2) { String loc = (String) data[i]; Object binData[] = (Object[]) data[i + 1]; - HashMap> binnedKE = new HashMap>(); + HashMap> binnedKE = new HashMap<>(); expBinnedRanges.put(loc, binnedKE); @@ -110,7 +110,7 @@ public class TabletLocatorImplTest { } static TreeMap createMetaCacheKE(Object... data) { - TreeMap mcke = new TreeMap(); + TreeMap mcke = new TreeMap<>(); for (int i = 0; i < data.length; i += 2) { KeyExtent ke = (KeyExtent) data[i]; @@ -124,7 +124,7 @@ public class TabletLocatorImplTest { static TreeMap createMetaCache(Object... data) { TreeMap mcke = createMetaCacheKE(data); - TreeMap mc = new TreeMap(TabletLocatorImpl.endRowComparator); + TreeMap mc = new TreeMap<>(TabletLocatorImpl.endRowComparator); for (Entry entry : mcke.entrySet()) { if (entry.getKey().getEndRow() == null) @@ -182,18 +182,18 @@ public class TabletLocatorImplTest { private void runTest(Text tableName, List ranges, TabletLocatorImpl tab1TabletCache, Map>> expected, List efailures) throws Exception { - Map>> binnedRanges = new HashMap>>(); + Map>> binnedRanges = new HashMap<>(); List f = tab1TabletCache.binRanges(context, ranges, binnedRanges); assertEquals(expected, binnedRanges); - HashSet f1 = new HashSet(f); - HashSet f2 = new HashSet(efailures); + HashSet f1 = new HashSet<>(f); + HashSet f2 = new HashSet<>(efailures); assertEquals(f2, f1); } static Set nkes(KeyExtent... extents) { - HashSet kes = new HashSet(); + HashSet kes = new HashSet<>(); for (KeyExtent keyExtent : extents) { kes.add(keyExtent); @@ -205,11 +205,11 @@ public class TabletLocatorImplTest { static void runTest(TreeMap mc, KeyExtent remove, Set expected) { // copy so same metaCache can be used for multiple test - mc = new TreeMap(mc); + mc = new TreeMap<>(mc); TabletLocatorImpl.removeOverlapping(mc, remove); - HashSet eic = new HashSet(); + HashSet eic = new HashSet<>(); for (TabletLocation tl : mc.values()) { eic.add(tl.tablet_extent); } @@ -235,14 +235,14 @@ public class TabletLocatorImplTest { } private void runTest(TabletLocatorImpl metaCache, List ml, Map>> emb, String... efailures) throws Exception { - Map> binnedMutations = new HashMap>(); - List afailures = new ArrayList(); + Map> binnedMutations = new HashMap<>(); + List afailures = new ArrayList<>(); metaCache.binMutations(context, ml, binnedMutations, afailures); verify(emb, binnedMutations); - ArrayList afs = new ArrayList(); - ArrayList efs = new ArrayList(Arrays.asList(efailures)); + ArrayList afs = new ArrayList<>(); + ArrayList efs = new ArrayList<>(Arrays.asList(efailures)); for (Mutation mutation : afailures) { afs.add(new String(mutation.getRow())); @@ -265,8 +265,8 @@ public class TabletLocatorImplTest { assertEquals(etb.keySet(), atb.getMutations().keySet()); for (KeyExtent ke : etb.keySet()) { - ArrayList eRows = new ArrayList(etb.get(ke)); - ArrayList aRows = new ArrayList(); + ArrayList eRows = new ArrayList<>(etb.get(ke)); + ArrayList aRows = new ArrayList<>(); for (Mutation m : atb.getMutations().get(ke)) { aRows.add(new String(m.getRow())); @@ -283,7 +283,7 @@ public class TabletLocatorImplTest { static Map>> cemb(Object[]... ols) { - Map>> emb = new HashMap>>(); + Map>> emb = new HashMap<>(); for (Object[] ol : ols) { String row = (String) ol[0]; @@ -292,13 +292,13 @@ public class TabletLocatorImplTest { Map> tb = emb.get(server); if (tb == null) { - tb = new HashMap>(); + tb = new HashMap<>(); emb.put(server, tb); } List rl = tb.get(ke); if (rl == null) { - rl = new ArrayList(); + rl = new ArrayList<>(); tb.put(ke, rl); } @@ -476,7 +476,7 @@ public class TabletLocatorImplTest { } static class TServers { - private final Map>> tservers = new HashMap>>(); + private final Map>> tservers = new HashMap<>(); } static class TestTabletLocationObtainer implements TabletLocationObtainer { @@ -523,7 +523,7 @@ public class TabletLocatorImplTest { public List lookupTablets(ClientContext context, String tserver, Map> map, TabletLocator parent) throws AccumuloSecurityException { - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList<>(); Map> tablets = tservers.get(tserver); @@ -532,10 +532,10 @@ public class TabletLocatorImplTest { return list; } - TreeMap