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 9AD95200BB6 for ; Fri, 4 Nov 2016 23:22:46 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 997DD160B13; Fri, 4 Nov 2016 22:22:46 +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 93990160AFE for ; Fri, 4 Nov 2016 23:22:44 +0100 (CET) Received: (qmail 66293 invoked by uid 500); 4 Nov 2016 22:22:43 -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 66197 invoked by uid 99); 4 Nov 2016 22:22:43 -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, 04 Nov 2016 22:22:43 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 49F00E186F; Fri, 4 Nov 2016 22:22:43 +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, 04 Nov 2016 22:22:45 -0000 Message-Id: In-Reply-To: <8db15481562846a5947e4d4b91c82ee1@git.apache.org> References: <8db15481562846a5947e4d4b91c82ee1@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [03/48] accumulo git commit: ACCUMULO-4514 Remove unnecessary code archived-at: Fri, 04 Nov 2016 22:22:46 -0000 http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/main/java/org/apache/accumulo/test/continuous/Histogram.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/continuous/Histogram.java b/test/src/main/java/org/apache/accumulo/test/continuous/Histogram.java index 8dd3c9d..f4b21df 100644 --- a/test/src/main/java/org/apache/accumulo/test/continuous/Histogram.java +++ b/test/src/main/java/org/apache/accumulo/test/continuous/Histogram.java @@ -41,7 +41,7 @@ public class Histogram implements Serializable { public Histogram() { sum = 0; - counts = new HashMap>(); + counts = new HashMap<>(); } public void addPoint(T x) { @@ -52,7 +52,7 @@ public class Histogram implements Serializable { HistData hd = counts.get(x); if (hd == null) { - hd = new HistData(x); + hd = new HistData<>(x); counts.put(x, hd); } @@ -80,7 +80,7 @@ public class Histogram implements Serializable { public List getKeysInCountSortedOrder() { - ArrayList> sortedCounts = new ArrayList>(counts.values()); + ArrayList> sortedCounts = new ArrayList<>(counts.values()); Collections.sort(sortedCounts, new Comparator>() { @Override @@ -93,7 +93,7 @@ public class Histogram implements Serializable { } }); - ArrayList sortedKeys = new ArrayList(); + ArrayList sortedKeys = new ArrayList<>(); for (Iterator> iter = sortedCounts.iterator(); iter.hasNext();) { HistData hd = iter.next(); @@ -104,7 +104,7 @@ public class Histogram implements Serializable { } public void print(StringBuilder out) { - TreeSet> sortedCounts = new TreeSet>(counts.values()); + TreeSet> sortedCounts = new TreeSet<>(counts.values()); int maxValueLen = 0; @@ -133,7 +133,7 @@ public class Histogram implements Serializable { BufferedOutputStream bos = new BufferedOutputStream(fos); PrintStream ps = new PrintStream(bos, false, UTF_8.name()); - TreeSet> sortedCounts = new TreeSet>(counts.values()); + TreeSet> sortedCounts = new TreeSet<>(counts.values()); for (Iterator> iter = sortedCounts.iterator(); iter.hasNext();) { HistData hd = iter.next(); ps.println(" " + hd.bin + " " + hd.count); http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/main/java/org/apache/accumulo/test/continuous/PrintScanTimeHistogram.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/continuous/PrintScanTimeHistogram.java b/test/src/main/java/org/apache/accumulo/test/continuous/PrintScanTimeHistogram.java index a43c2ba..1a25bab 100644 --- a/test/src/main/java/org/apache/accumulo/test/continuous/PrintScanTimeHistogram.java +++ b/test/src/main/java/org/apache/accumulo/test/continuous/PrintScanTimeHistogram.java @@ -32,8 +32,8 @@ public class PrintScanTimeHistogram { private static final Logger log = LoggerFactory.getLogger(PrintScanTimeHistogram.class); public static void main(String[] args) throws Exception { - Histogram srqHist = new Histogram(); - Histogram fsrHist = new Histogram(); + Histogram srqHist = new Histogram<>(); + Histogram fsrHist = new Histogram<>(); processFile(System.in, srqHist, fsrHist); http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/main/java/org/apache/accumulo/test/continuous/TimeBinner.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/continuous/TimeBinner.java b/test/src/main/java/org/apache/accumulo/test/continuous/TimeBinner.java index e40bc8e..6ecb14e 100644 --- a/test/src/main/java/org/apache/accumulo/test/continuous/TimeBinner.java +++ b/test/src/main/java/org/apache/accumulo/test/continuous/TimeBinner.java @@ -77,10 +77,10 @@ public class TimeBinner { String line = null; - HashMap aggregation1 = new HashMap(); - HashMap aggregation2 = new HashMap(); - HashMap aggregation3 = new HashMap(); - HashMap aggregation4 = new HashMap(); + HashMap aggregation1 = new HashMap<>(); + HashMap aggregation2 = new HashMap<>(); + HashMap aggregation3 = new HashMap<>(); + HashMap aggregation4 = new HashMap<>(); while ((line = in.readLine()) != null) { @@ -144,7 +144,7 @@ public class TimeBinner { } } - TreeMap sorted = new TreeMap(aggregation1); + TreeMap sorted = new TreeMap<>(aggregation1); Set> es = sorted.entrySet(); http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/main/java/org/apache/accumulo/test/continuous/UndefinedAnalyzer.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/continuous/UndefinedAnalyzer.java b/test/src/main/java/org/apache/accumulo/test/continuous/UndefinedAnalyzer.java index 00c7eb0..bcd35d8 100644 --- a/test/src/main/java/org/apache/accumulo/test/continuous/UndefinedAnalyzer.java +++ b/test/src/main/java/org/apache/accumulo/test/continuous/UndefinedAnalyzer.java @@ -68,7 +68,7 @@ public class UndefinedAnalyzer { static class IngestInfo { - Map> flushes = new HashMap>(); + Map> flushes = new HashMap<>(); public IngestInfo(String logDir) throws Exception { File dir = new File(logDir); @@ -103,7 +103,7 @@ public class UndefinedAnalyzer { return; } - tm = new TreeMap(Collections.reverseOrder()); + tm = new TreeMap<>(Collections.reverseOrder()); tm.put(0l, Long.parseLong(time)); flushes.put(uuid, tm); break; @@ -162,7 +162,7 @@ public class UndefinedAnalyzer { static class TabletHistory { - List assignments = new ArrayList(); + List assignments = new ArrayList<>(); TabletHistory(String tableId, String acuLogDir) throws Exception { File dir = new File(acuLogDir); @@ -263,7 +263,7 @@ public class UndefinedAnalyzer { BatchScannerOpts bsOpts = new BatchScannerOpts(); opts.parseArgs(UndefinedAnalyzer.class.getName(), args, bsOpts); - List undefs = new ArrayList(); + List undefs = new ArrayList<>(); BufferedReader reader = new BufferedReader(new InputStreamReader(System.in, UTF_8)); String line; @@ -278,20 +278,20 @@ public class UndefinedAnalyzer { Connector conn = opts.getConnector(); BatchScanner bscanner = conn.createBatchScanner(opts.getTableName(), opts.auths, bsOpts.scanThreads); bscanner.setTimeout(bsOpts.scanTimeout, TimeUnit.MILLISECONDS); - List refs = new ArrayList(); + List refs = new ArrayList<>(); for (UndefinedNode undefinedNode : undefs) refs.add(new Range(new Text(undefinedNode.ref))); bscanner.setRanges(refs); - HashMap> refInfo = new HashMap>(); + HashMap> refInfo = new HashMap<>(); for (Entry entry : bscanner) { String ref = entry.getKey().getRow().toString(); List vals = refInfo.get(ref); if (vals == null) { - vals = new ArrayList(); + vals = new ArrayList<>(); refInfo.put(ref, vals); } http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/main/java/org/apache/accumulo/test/functional/CacheTestReader.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/functional/CacheTestReader.java b/test/src/main/java/org/apache/accumulo/test/functional/CacheTestReader.java index fd8ba2c..5abae1e 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/CacheTestReader.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/CacheTestReader.java @@ -51,7 +51,7 @@ public class CacheTestReader { return; } - Map readData = new TreeMap(); + Map readData = new TreeMap<>(); for (int i = 0; i < numData; i++) { byte[] v = zc.get(rootDir + "/data" + i); http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/main/java/org/apache/accumulo/test/functional/CacheTestWriter.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/functional/CacheTestWriter.java b/test/src/main/java/org/apache/accumulo/test/functional/CacheTestWriter.java index 76e8168..84e55a5 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/CacheTestWriter.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/CacheTestWriter.java @@ -57,7 +57,7 @@ public class CacheTestWriter { zk.putPersistentData(rootDir + "/dir", new byte[0], NodeExistsPolicy.FAIL); - ArrayList children = new ArrayList(); + ArrayList children = new ArrayList<>(); Random r = new Random(); @@ -67,7 +67,7 @@ public class CacheTestWriter { // change children in dir for (int u = 0; u < r.nextInt(4) + 1; u++) { - expectedData = new TreeMap(); + expectedData = new TreeMap<>(); if (r.nextFloat() < .5) { String child = UUID.randomUUID().toString(); http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/main/java/org/apache/accumulo/test/functional/ZombieTServer.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ZombieTServer.java b/test/src/main/java/org/apache/accumulo/test/functional/ZombieTServer.java index da9f1d6..dbb0c29 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/ZombieTServer.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/ZombieTServer.java @@ -23,7 +23,6 @@ import java.util.Random; import org.apache.accumulo.core.Constants; import org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException; -import org.apache.accumulo.core.master.thrift.TableInfo; import org.apache.accumulo.core.master.thrift.TabletServerStatus; import org.apache.accumulo.core.security.thrift.TCredentials; import org.apache.accumulo.core.tabletserver.thrift.TabletClientService.Iface; @@ -78,7 +77,7 @@ public class ZombieTServer { synchronized (this) { if (statusCount++ < 1) { TabletServerStatus result = new TabletServerStatus(); - result.tableMap = new HashMap(); + result.tableMap = new HashMap<>(); return result; } } http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/main/java/org/apache/accumulo/test/performance/metadata/MetadataBatchScanTest.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/performance/metadata/MetadataBatchScanTest.java b/test/src/main/java/org/apache/accumulo/test/performance/metadata/MetadataBatchScanTest.java index 1c7ce67..a8314d4 100644 --- a/test/src/main/java/org/apache/accumulo/test/performance/metadata/MetadataBatchScanTest.java +++ b/test/src/main/java/org/apache/accumulo/test/performance/metadata/MetadataBatchScanTest.java @@ -70,7 +70,7 @@ public class MetadataBatchScanTest { Instance inst = new ZooKeeperInstance(new ClientConfiguration().withInstance("acu14").withZkHosts("localhost")); final Connector connector = inst.getConnector(opts.getPrincipal(), opts.getToken()); - TreeSet splits = new TreeSet(); + TreeSet splits = new TreeSet<>(); Random r = new Random(42); while (splits.size() < 99999) { @@ -80,7 +80,7 @@ public class MetadataBatchScanTest { Text tid = new Text("8"); Text per = null; - ArrayList extents = new ArrayList(); + ArrayList extents = new ArrayList<>(); for (Long split : splits) { Text er = new Text(String.format("%012d", split)); @@ -128,12 +128,12 @@ public class MetadataBatchScanTest { final int numLoop = Integer.parseInt(args[2]); int numLookups = Integer.parseInt(args[3]); - HashSet indexes = new HashSet(); + HashSet indexes = new HashSet<>(); while (indexes.size() < numLookups) { indexes.add(r.nextInt(extents.size())); } - final List ranges = new ArrayList(); + final List ranges = new ArrayList<>(); for (Integer i : indexes) { ranges.add(extents.get(i).toMetadataRange()); } http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/main/java/org/apache/accumulo/test/performance/scan/CollectTabletStats.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/performance/scan/CollectTabletStats.java b/test/src/main/java/org/apache/accumulo/test/performance/scan/CollectTabletStats.java index 9c1f777..18e0bff 100644 --- a/test/src/main/java/org/apache/accumulo/test/performance/scan/CollectTabletStats.java +++ b/test/src/main/java/org/apache/accumulo/test/performance/scan/CollectTabletStats.java @@ -119,7 +119,7 @@ public class CollectTabletStats { System.exit(-1); } - TreeMap tabletLocations = new TreeMap(); + TreeMap tabletLocations = new TreeMap<>(); List candidates = findTablets(context, !opts.selectFarTablets, opts.getTableName(), tabletLocations); if (candidates.size() < opts.numThreads) { @@ -129,7 +129,7 @@ public class CollectTabletStats { List tabletsToTest = selectRandomTablets(opts.numThreads, candidates); - Map> tabletFiles = new HashMap>(); + Map> tabletFiles = new HashMap<>(); for (KeyExtent ke : tabletsToTest) { List files = getTabletFiles(context, tableId, ke); @@ -155,7 +155,7 @@ public class CollectTabletStats { for (int i = 0; i < opts.iterations; i++) { - ArrayList tests = new ArrayList(); + ArrayList tests = new ArrayList<>(); for (final KeyExtent ke : tabletsToTest) { final List files = tabletFiles.get(ke); @@ -175,7 +175,7 @@ public class CollectTabletStats { for (int i = 0; i < opts.iterations; i++) { - ArrayList tests = new ArrayList(); + ArrayList tests = new ArrayList<>(); for (final KeyExtent ke : tabletsToTest) { final List files = tabletFiles.get(ke); @@ -193,7 +193,7 @@ public class CollectTabletStats { } for (int i = 0; i < opts.iterations; i++) { - ArrayList tests = new ArrayList(); + ArrayList tests = new ArrayList<>(); for (final KeyExtent ke : tabletsToTest) { final List files = tabletFiles.get(ke); @@ -212,7 +212,7 @@ public class CollectTabletStats { for (int i = 0; i < opts.iterations; i++) { - ArrayList tests = new ArrayList(); + ArrayList tests = new ArrayList<>(); final Connector conn = opts.getConnector(); @@ -354,7 +354,7 @@ public class CollectTabletStats { InetAddress localaddress = InetAddress.getLocalHost(); - List candidates = new ArrayList(); + List candidates = new ArrayList<>(); for (Entry entry : tabletLocations.entrySet()) { String loc = entry.getValue(); @@ -372,7 +372,7 @@ public class CollectTabletStats { } private static List selectRandomTablets(int numThreads, List candidates) { - List tabletsToTest = new ArrayList(); + List tabletsToTest = new ArrayList<>(); Random rand = new Random(); for (int i = 0; i < numThreads; i++) { @@ -385,7 +385,7 @@ public class CollectTabletStats { } private static List getTabletFiles(ClientContext context, String tableId, KeyExtent ke) throws IOException { - return new ArrayList(MetadataTableUtil.getDataFileSizes(ke, context).keySet()); + return new ArrayList<>(MetadataTableUtil.getDataFileSizes(ke, context).keySet()); } private static void reportHdfsBlockLocations(List files) throws Exception { @@ -423,7 +423,7 @@ public class CollectTabletStats { SortedMapIterator smi = new SortedMapIterator(new TreeMap()); - List> iters = new ArrayList>(mapfiles.size() + 1); + List> iters = new ArrayList<>(mapfiles.size() + 1); iters.addAll(mapfiles); iters.add(smi); @@ -461,7 +461,7 @@ public class CollectTabletStats { } private static HashSet createColumnBSS(String[] columns) { - HashSet columnSet = new HashSet(); + HashSet columnSet = new HashSet<>(); for (String c : columns) { columnSet.add(new ArrayByteSequence(c)); } @@ -473,7 +473,7 @@ public class CollectTabletStats { SortedKeyValueIterator reader; - List> readers = new ArrayList>(files.size()); + List> readers = new ArrayList<>(files.size()); for (FileRef file : files) { FileSystem ns = fs.getVolumeByPath(file.path()).getFileSystem(); http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/main/java/org/apache/accumulo/test/performance/thrift/NullTserver.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/performance/thrift/NullTserver.java b/test/src/main/java/org/apache/accumulo/test/performance/thrift/NullTserver.java index d0de29f..c972d3b 100644 --- a/test/src/main/java/org/apache/accumulo/test/performance/thrift/NullTserver.java +++ b/test/src/main/java/org/apache/accumulo/test/performance/thrift/NullTserver.java @@ -180,7 +180,7 @@ public class NullTserver { @Override public List getActiveScans(TInfo tinfo, TCredentials credentials) throws ThriftSecurityException, TException { - return new ArrayList(); + return new ArrayList<>(); } @Override @@ -206,7 +206,7 @@ public class NullTserver { @Override public List getActiveCompactions(TInfo tinfo, TCredentials credentials) throws ThriftSecurityException, TException { - return new ArrayList(); + return new ArrayList<>(); } @Override @@ -267,7 +267,7 @@ public class NullTserver { MetaDataTableScanner s = new MetaDataTableScanner(context, tableRange); long randomSessionID = opts.port; TServerInstance instance = new TServerInstance(addr, randomSessionID); - List assignments = new ArrayList(); + List assignments = new ArrayList<>(); while (s.hasNext()) { TabletLocationState next = s.next(); assignments.add(new Assignment(next.extent, instance)); http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/main/java/org/apache/accumulo/test/randomwalk/Framework.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/Framework.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/Framework.java index f5b721b..fd5d5fa 100644 --- a/test/src/main/java/org/apache/accumulo/test/randomwalk/Framework.java +++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/Framework.java @@ -29,7 +29,7 @@ import com.beust.jcommander.Parameter; public class Framework { private static final Logger log = Logger.getLogger(Framework.class); - private HashMap nodes = new HashMap(); + private HashMap nodes = new HashMap<>(); private String configDir = null; private static final Framework INSTANCE = new Framework(); http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/main/java/org/apache/accumulo/test/randomwalk/Module.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/Module.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/Module.java index e5af8e6..37b0417 100644 --- a/test/src/main/java/org/apache/accumulo/test/randomwalk/Module.java +++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/Module.java @@ -116,8 +116,8 @@ public class Module extends Node { } } - private HashMap nodes = new HashMap(); - private HashMap localProps = new HashMap(); + private HashMap nodes = new HashMap<>(); + private HashMap localProps = new HashMap<>(); private class Edge { String nodeId; @@ -126,7 +126,7 @@ public class Module extends Node { private class AdjList { - private List edges = new ArrayList(); + private List edges = new ArrayList<>(); private int totalWeight = 0; private Random rand = new Random(); @@ -167,9 +167,9 @@ public class Module extends Node { } } - private HashMap prefixes = new HashMap(); - private HashMap adjMap = new HashMap(); - private HashMap> aliasMap = new HashMap>(); + private HashMap prefixes = new HashMap<>(); + private HashMap adjMap = new HashMap<>(); + private HashMap> aliasMap = new HashMap<>(); private final File xmlFile; private String initNodeId; private Fixture fixture = null; @@ -275,7 +275,7 @@ public class Module extends Node { } // Wrap the visit of the next node in the module in a callable that returns a thrown exception - FutureTask task = new FutureTask(new Callable() { + FutureTask task = new FutureTask<>(new Callable() { @Override public Exception call() throws Exception { @@ -327,7 +327,7 @@ public class Module extends Node { log.debug(" " + entry.getKey() + ": " + entry.getValue()); } log.debug("State information"); - for (String key : new TreeSet(state.getMap().keySet())) { + for (String key : new TreeSet<>(state.getMap().keySet())) { Object value = state.getMap().get(key); String logMsg = " " + key + ": "; if (value == null) @@ -565,7 +565,7 @@ public class Module extends Node { // parse aliases NodeList aliaslist = nodeEl.getElementsByTagName("alias"); - Set aliases = new TreeSet(); + Set aliases = new TreeSet<>(); for (int j = 0; j < aliaslist.getLength(); j++) { Element propEl = (Element) aliaslist.item(j); http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/main/java/org/apache/accumulo/test/randomwalk/State.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/State.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/State.java index 9b74ad4..d906d00 100644 --- a/test/src/main/java/org/apache/accumulo/test/randomwalk/State.java +++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/State.java @@ -23,7 +23,7 @@ import java.util.HashMap; */ public class State { - private HashMap stateMap = new HashMap(); + private HashMap stateMap = new HashMap<>(); /** * Creates new empty state. http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/main/java/org/apache/accumulo/test/randomwalk/bulk/BulkPlusOne.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/bulk/BulkPlusOne.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/bulk/BulkPlusOne.java index c54a8e7..85d8658 100644 --- a/test/src/main/java/org/apache/accumulo/test/randomwalk/bulk/BulkPlusOne.java +++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/bulk/BulkPlusOne.java @@ -45,7 +45,7 @@ public class BulkPlusOne extends BulkImportTest { public static final int COLS = 10; public static final int HEX_SIZE = (int) Math.ceil(Math.log(LOTS) / Math.log(16)); public static final String FMT = "r%0" + HEX_SIZE + "x"; - public static final List COLNAMES = new ArrayList(); + public static final List COLNAMES = new ArrayList<>(); public static final Text CHECK_COLUMN_FAMILY = new Text("cf"); static { for (int i = 0; i < COLS; i++) { @@ -66,19 +66,19 @@ public class BulkPlusOne extends BulkImportTest { fs.mkdirs(fail); final int parts = rand.nextInt(10) + 1; - TreeSet startRows = new TreeSet(); + TreeSet startRows = new TreeSet<>(); startRows.add(0); while (startRows.size() < parts) startRows.add(rand.nextInt(LOTS)); - List printRows = new ArrayList(startRows.size()); + List printRows = new ArrayList<>(startRows.size()); for (Integer row : startRows) printRows.add(String.format(FMT, row)); String markerColumnQualifier = String.format("%07d", counter.incrementAndGet()); log.debug("preparing bulk files with start rows " + printRows + " last row " + String.format(FMT, LOTS - 1) + " marker " + markerColumnQualifier); - List rows = new ArrayList(startRows); + List rows = new ArrayList<>(startRows); rows.add(LOTS); for (int i = 0; i < parts; i++) { http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/main/java/org/apache/accumulo/test/randomwalk/bulk/Split.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/bulk/Split.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/bulk/Split.java index b69805d..641950e 100644 --- a/test/src/main/java/org/apache/accumulo/test/randomwalk/bulk/Split.java +++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/bulk/Split.java @@ -28,7 +28,7 @@ public class Split extends SelectiveBulkTest { @Override protected void runLater(State state, Environment env) throws Exception { - SortedSet splits = new TreeSet(); + SortedSet splits = new TreeSet<>(); Random rand = (Random) state.get("rand"); int count = rand.nextInt(20); for (int i = 0; i < count; i++) http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/AddSplits.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/AddSplits.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/AddSplits.java index 2727e62..dc040a6 100644 --- a/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/AddSplits.java +++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/AddSplits.java @@ -41,11 +41,11 @@ public class AddSplits extends Test { @SuppressWarnings("unchecked") List tableNames = (List) state.get("tables"); - tableNames = new ArrayList(tableNames); + tableNames = new ArrayList<>(tableNames); tableNames.add(MetadataTable.NAME); String tableName = tableNames.get(rand.nextInt(tableNames.size())); - TreeSet splits = new TreeSet(); + TreeSet splits = new TreeSet<>(); for (int i = 0; i < rand.nextInt(10) + 1; i++) splits.add(new Text(String.format("%016x", rand.nextLong() & 0x7fffffffffffffffl))); http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/BatchScan.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/BatchScan.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/BatchScan.java index 187199f..111e6c7 100644 --- a/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/BatchScan.java +++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/BatchScan.java @@ -52,7 +52,7 @@ public class BatchScan extends Test { try { BatchScanner bs = conn.createBatchScanner(tableName, Authorizations.EMPTY, 3); - List ranges = new ArrayList(); + List ranges = new ArrayList<>(); for (int i = 0; i < rand.nextInt(2000) + 1; i++) ranges.add(new Range(String.format("%016x", rand.nextLong() & 0x7fffffffffffffffl))); http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/BulkImport.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/BulkImport.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/BulkImport.java index 5af08ec..d543889 100644 --- a/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/BulkImport.java +++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/BulkImport.java @@ -115,7 +115,7 @@ public class BulkImport extends Test { try { BatchWriter bw = new RFileBatchWriter(conf, fs, bulkDir + "/file01.rf"); try { - TreeSet rows = new TreeSet(); + TreeSet rows = new TreeSet<>(); int numRows = rand.nextInt(100000); for (int i = 0; i < numRows; i++) { rows.add(rand.nextLong() & 0x7fffffffffffffffl); http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/ChangeAuthorizations.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/ChangeAuthorizations.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/ChangeAuthorizations.java index 65502c3..646c415 100644 --- a/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/ChangeAuthorizations.java +++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/ChangeAuthorizations.java @@ -43,7 +43,7 @@ public class ChangeAuthorizations extends Test { String userName = userNames.get(rand.nextInt(userNames.size())); try { - List auths = new ArrayList(conn.securityOperations().getUserAuthorizations(userName).getAuthorizations()); + List auths = new ArrayList<>(conn.securityOperations().getUserAuthorizations(userName).getAuthorizations()); if (rand.nextBoolean()) { String authorization = String.format("a%d", rand.nextInt(5000)); http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/ChangePermissions.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/ChangePermissions.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/ChangePermissions.java index 680750a..7e8f789 100644 --- a/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/ChangePermissions.java +++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/ChangePermissions.java @@ -88,13 +88,13 @@ public class ChangePermissions extends Test { more.removeAll(perms); if (rand.nextBoolean() && more.size() > 0) { - List moreList = new ArrayList(more); + List moreList = new ArrayList<>(more); TablePermission choice = moreList.get(rand.nextInt(moreList.size())); log.debug("adding permission " + choice); conn.securityOperations().grantTablePermission(userName, tableName, choice); } else { if (perms.size() > 0) { - List permList = new ArrayList(perms); + List permList = new ArrayList<>(perms); TablePermission choice = permList.get(rand.nextInt(permList.size())); log.debug("removing permission " + choice); conn.securityOperations().revokeTablePermission(userName, tableName, choice); @@ -114,13 +114,13 @@ public class ChangePermissions extends Test { more.remove(SystemPermission.GRANT); if (rand.nextBoolean() && more.size() > 0) { - List moreList = new ArrayList(more); + List moreList = new ArrayList<>(more); SystemPermission choice = moreList.get(rand.nextInt(moreList.size())); log.debug("adding permission " + choice); conn.securityOperations().grantSystemPermission(userName, choice); } else { if (perms.size() > 0) { - List permList = new ArrayList(perms); + List permList = new ArrayList<>(perms); SystemPermission choice = permList.get(rand.nextInt(permList.size())); log.debug("removing permission " + choice); conn.securityOperations().revokeSystemPermission(userName, choice); @@ -140,13 +140,13 @@ public class ChangePermissions extends Test { more.removeAll(perms); if (rand.nextBoolean() && more.size() > 0) { - List moreList = new ArrayList(more); + List moreList = new ArrayList<>(more); NamespacePermission choice = moreList.get(rand.nextInt(moreList.size())); log.debug("adding permission " + choice); conn.securityOperations().grantNamespacePermission(userName, namespace, choice); } else { if (perms.size() > 0) { - List permList = new ArrayList(perms); + List permList = new ArrayList<>(perms); NamespacePermission choice = permList.get(rand.nextInt(permList.size())); log.debug("removing permission " + choice); conn.securityOperations().revokeNamespacePermission(userName, namespace, choice); http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/ConcurrentFixture.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/ConcurrentFixture.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/ConcurrentFixture.java index b27f34c..403a66a 100644 --- a/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/ConcurrentFixture.java +++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/ConcurrentFixture.java @@ -46,7 +46,7 @@ public class ConcurrentFixture extends Fixture { * @return A two element list with first being smaller than the second, but either value (or both) can be null */ public static List generateRange(Random rand) { - ArrayList toRet = new ArrayList(2); + ArrayList toRet = new ArrayList<>(2); long firstLong = rand.nextLong(); http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/DeleteRange.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/DeleteRange.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/DeleteRange.java index 280f620..c164b6b 100644 --- a/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/DeleteRange.java +++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/DeleteRange.java @@ -43,7 +43,7 @@ public class DeleteRange extends Test { String tableName = tableNames.get(rand.nextInt(tableNames.size())); - List range = new ArrayList(); + List range = new ArrayList<>(); do { range.add(new Text(String.format("%016x", rand.nextLong() & 0x7fffffffffffffffl))); range.add(new Text(String.format("%016x", rand.nextLong() & 0x7fffffffffffffffl))); http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/IsolatedScan.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/IsolatedScan.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/IsolatedScan.java index 1bb51bb..eac39fa 100644 --- a/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/IsolatedScan.java +++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/IsolatedScan.java @@ -52,7 +52,7 @@ public class IsolatedScan extends Test { RowIterator iter = new RowIterator(new IsolatedScanner(conn.createScanner(tableName, Authorizations.EMPTY))); while (iter.hasNext()) { - PeekingIterator> row = new PeekingIterator>(iter.next()); + PeekingIterator> row = new PeekingIterator<>(iter.next()); Entry kv = null; if (row.hasNext()) kv = row.peek(); http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/Merge.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/Merge.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/Merge.java index a997c2b..fe84dca 100644 --- a/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/Merge.java +++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/Merge.java @@ -40,7 +40,7 @@ public class Merge extends Test { @SuppressWarnings("unchecked") List tableNames = (List) state.get("tables"); - tableNames = new ArrayList(tableNames); + tableNames = new ArrayList<>(tableNames); tableNames.add(MetadataTable.NAME); String tableName = tableNames.get(rand.nextInt(tableNames.size())); http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/Setup.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/Setup.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/Setup.java index c19fcbd..ee7ae32 100644 --- a/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/Setup.java +++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/Setup.java @@ -36,8 +36,8 @@ public class Setup extends Test { int numNamespaces = Integer.parseInt(props.getProperty("numNamespaces", "2")); log.debug("numTables = " + numTables); log.debug("numNamespaces = " + numNamespaces); - List tables = new ArrayList(); - List namespaces = new ArrayList(); + List tables = new ArrayList<>(); + List namespaces = new ArrayList<>(); for (int i = 0; i < numNamespaces; i++) { namespaces.add(String.format("nspc_%03d", i)); @@ -62,7 +62,7 @@ public class Setup extends Test { int numUsers = Integer.parseInt(props.getProperty("numUsers", "5")); log.debug("numUsers = " + numUsers); - List users = new ArrayList(); + List users = new ArrayList<>(); for (int i = 0; i < numUsers; i++) users.add(String.format("user%03d", i)); state.set("users", users); http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/StopTabletServer.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/StopTabletServer.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/StopTabletServer.java index 995a72e..d819cc0 100644 --- a/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/StopTabletServer.java +++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/StopTabletServer.java @@ -40,7 +40,7 @@ import org.apache.zookeeper.data.Stat; public class StopTabletServer extends Test { Set getTServers(Instance instance) throws KeeperException, InterruptedException { - Set result = new HashSet(); + Set result = new HashSet<>(); ZooReader rdr = new ZooReader(instance.getZooKeepers(), instance.getZooKeepersSessionTimeOut()); String base = ZooUtil.getRoot(instance) + Constants.ZTSERVERS; for (String child : rdr.getChildren(base)) { @@ -66,7 +66,7 @@ public class StopTabletServer extends Test { Instance instance = env.getInstance(); - List currentServers = new ArrayList(getTServers(instance)); + List currentServers = new ArrayList<>(getTServers(instance)); Collections.shuffle(currentServers); Runtime runtime = Runtime.getRuntime(); if (currentServers.size() > 1) { http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/main/java/org/apache/accumulo/test/randomwalk/conditional/Init.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/conditional/Init.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/conditional/Init.java index ebe12ef..4668802 100644 --- a/test/src/main/java/org/apache/accumulo/test/randomwalk/conditional/Init.java +++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/conditional/Init.java @@ -43,13 +43,13 @@ public class Init extends Test { int numAccts = (Integer) state.get("numAccts"); // add some splits to spread ingest out a little - TreeSet splits = new TreeSet(); + TreeSet splits = new TreeSet<>(); for (int i = 1; i < 10; i++) splits.add(new Text(Utils.getBank((int) (numBanks * .1 * i)))); env.getConnector().tableOperations().addSplits((String) state.get("tableName"), splits); log.debug("Added splits " + splits); - ArrayList banks = new ArrayList(); + ArrayList banks = new ArrayList<>(); for (int i = 0; i < numBanks; i++) banks.add(i); // shuffle for case when multiple threads are adding banks http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/main/java/org/apache/accumulo/test/randomwalk/conditional/Split.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/conditional/Split.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/conditional/Split.java index a1ca830..0d7fee1 100644 --- a/test/src/main/java/org/apache/accumulo/test/randomwalk/conditional/Split.java +++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/conditional/Split.java @@ -39,7 +39,7 @@ public class Split extends Test { String row = Utils.getBank(rand.nextInt((Integer) state.get("numBanks"))); log.debug("adding split " + row); - conn.tableOperations().addSplits(table, new TreeSet(Arrays.asList(new Text(row)))); + conn.tableOperations().addSplits(table, new TreeSet<>(Arrays.asList(new Text(row)))); } } http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/main/java/org/apache/accumulo/test/randomwalk/image/ImageFixture.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/image/ImageFixture.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/image/ImageFixture.java index 3bcc41c..b37ff90 100644 --- a/test/src/main/java/org/apache/accumulo/test/randomwalk/image/ImageFixture.java +++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/image/ImageFixture.java @@ -47,7 +47,7 @@ public class ImageFixture extends Fixture { Connector conn = env.getConnector(); Instance instance = env.getInstance(); - SortedSet splits = new TreeSet(); + SortedSet splits = new TreeSet<>(); for (int i = 1; i < 256; i++) { splits.add(new Text(String.format("%04x", i << 8))); } @@ -94,13 +94,13 @@ public class ImageFixture extends Fixture { } static Map> getLocalityGroups() { - Map> groups = new HashMap>(); + Map> groups = new HashMap<>(); - HashSet lg1 = new HashSet(); + HashSet lg1 = new HashSet<>(); lg1.add(Write.CONTENT_COLUMN_FAMILY); groups.put("lg1", lg1); - HashSet lg2 = new HashSet(); + HashSet lg2 = new HashSet<>(); lg2.add(Write.META_COLUMN_FAMILY); groups.put("lg2", lg2); return groups; http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/main/java/org/apache/accumulo/test/randomwalk/image/ScanMeta.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/image/ScanMeta.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/image/ScanMeta.java index 4b801c2..49d33d0 100644 --- a/test/src/main/java/org/apache/accumulo/test/randomwalk/image/ScanMeta.java +++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/image/ScanMeta.java @@ -63,7 +63,7 @@ public class ScanMeta extends Test { Random rand = new Random(); int numToScan = rand.nextInt(maxScan - minScan) + minScan; - Map hashes = new HashMap(); + Map hashes = new HashMap<>(); Iterator> iter = imageScanner.iterator(); @@ -84,14 +84,14 @@ public class ScanMeta extends Test { // use batch scanner to verify all of these exist in index BatchScanner indexScanner = conn.createBatchScanner(indexTableName, Authorizations.EMPTY, 3); - ArrayList ranges = new ArrayList(); + ArrayList ranges = new ArrayList<>(); for (Text row : hashes.keySet()) { ranges.add(new Range(row)); } indexScanner.setRanges(ranges); - Map hashes2 = new HashMap(); + Map hashes2 = new HashMap<>(); for (Entry entry : indexScanner) hashes2.put(entry.getKey().getRow(), new Text(entry.getValue().get())); http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/main/java/org/apache/accumulo/test/randomwalk/image/TableOp.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/image/TableOp.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/image/TableOp.java index b62ec34..d2b5e2f 100644 --- a/test/src/main/java/org/apache/accumulo/test/randomwalk/image/TableOp.java +++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/image/TableOp.java @@ -72,7 +72,7 @@ public class TableOp extends Test { groups = ImageFixture.getLocalityGroups(); } else { log.debug("Removing locality groups from " + state.getString("imageTableName")); - groups = new HashMap>(); + groups = new HashMap<>(); } tableOps.setLocalityGroups(state.getString("imageTableName"), groups); http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/CopyTable.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/CopyTable.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/CopyTable.java index 0f040b1..d1207f2 100644 --- a/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/CopyTable.java +++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/CopyTable.java @@ -34,7 +34,7 @@ public class CopyTable extends Test { private final TreeSet splits; public CopyTable() { - splits = new TreeSet(); + splits = new TreeSet<>(); for (int i = 1; i < 10; i++) { splits.add(new Text(Integer.toString(i))); } http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/CreateTable.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/CreateTable.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/CreateTable.java index 84c359b..ee573e3 100644 --- a/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/CreateTable.java +++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/CreateTable.java @@ -33,7 +33,7 @@ public class CreateTable extends Test { private final TreeSet splits; public CreateTable() { - splits = new TreeSet(); + splits = new TreeSet<>(); for (int i = 1; i < 10; i++) { splits.add(new Text(Integer.toString(i))); } http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/main/java/org/apache/accumulo/test/randomwalk/security/TableOp.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/security/TableOp.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/security/TableOp.java index 2612fc9..b7dac75 100644 --- a/test/src/main/java/org/apache/accumulo/test/randomwalk/security/TableOp.java +++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/security/TableOp.java @@ -195,7 +195,7 @@ public class TableOp extends Test { break; case BULK_IMPORT: key = WalkingSecurity.get(state, env).getLastKey() + "1"; - SortedSet keys = new TreeSet(); + SortedSet keys = new TreeSet<>(); for (String s : WalkingSecurity.get(state, env).getAuthsArray()) { Key k = new Key(key, "", "", s); keys.add(k); http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/main/java/org/apache/accumulo/test/randomwalk/security/WalkingSecurity.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/security/WalkingSecurity.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/security/WalkingSecurity.java index 457b478..0c440af 100644 --- a/test/src/main/java/org/apache/accumulo/test/randomwalk/security/WalkingSecurity.java +++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/security/WalkingSecurity.java @@ -154,7 +154,7 @@ public class WalkingSecurity extends SecurityOperation implements Authorizor, Au @Override public Set listUsers() throws AccumuloSecurityException { - Set userList = new TreeSet(); + Set userList = new TreeSet<>(); for (String user : new String[] {getSysUserName(), getTabUserName()}) { if (userExists(user)) userList.add(user); @@ -488,7 +488,7 @@ public class WalkingSecurity extends SecurityOperation implements Authorizor, Au @Override public Set> getSupportedTokenTypes() { - Set> cs = new HashSet>(); + Set> cs = new HashSet<>(); cs.add(PasswordToken.class); return cs; } http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/main/java/org/apache/accumulo/test/randomwalk/sequential/BatchVerify.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/sequential/BatchVerify.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/sequential/BatchVerify.java index 9ae1bf7..074cbcf 100644 --- a/test/src/main/java/org/apache/accumulo/test/randomwalk/sequential/BatchVerify.java +++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/sequential/BatchVerify.java @@ -55,7 +55,7 @@ public class BatchVerify extends Test { try { int count = 0; - List ranges = new ArrayList(); + List ranges = new ArrayList<>(); while (count < numVerify) { long rangeStart = rand.nextInt((int) numWrites); long rangeEnd = rangeStart + 99; @@ -81,7 +81,7 @@ public class BatchVerify extends Test { scanner.setRanges(ranges); - List keys = new ArrayList(); + List keys = new ArrayList<>(); for (Entry entry : scanner) { keys.add(entry.getKey()); } http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/CompactFilter.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/CompactFilter.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/CompactFilter.java index a73b311..42dc9dc 100644 --- a/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/CompactFilter.java +++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/CompactFilter.java @@ -49,7 +49,7 @@ public class CompactFilter extends Test { String deleteChar = Integer.toHexString(rand.nextInt(16)) + ""; String regex = "^[0-9a-f][" + deleteChar + "].*"; - ArrayList documentFilters = new ArrayList(); + ArrayList documentFilters = new ArrayList<>(); IteratorSetting is = new IteratorSetting(21, "ii", RegExFilter.class); RegExFilter.setRegexs(is, regex, null, null, null, false); @@ -61,7 +61,7 @@ public class CompactFilter extends Test { long t2 = System.currentTimeMillis(); long t3 = t2 - t1; - ArrayList indexFilters = new ArrayList(); + ArrayList indexFilters = new ArrayList<>(); is = new IteratorSetting(21, RegExFilter.class); RegExFilter.setRegexs(is, null, null, regex, null, false); @@ -76,7 +76,7 @@ public class CompactFilter extends Test { BatchScanner bscanner = env.getConnector().createBatchScanner(docTableName, new Authorizations(), 10); - List ranges = new ArrayList(); + List ranges = new ArrayList<>(); for (int i = 0; i < 16; i++) { ranges.add(Range.prefix(new Text(Integer.toHexString(i) + "" + deleteChar))); } http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/DeleteSomeDocs.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/DeleteSomeDocs.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/DeleteSomeDocs.java index f7fb1df..08fcb4f 100644 --- a/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/DeleteSomeDocs.java +++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/DeleteSomeDocs.java @@ -43,7 +43,7 @@ public class DeleteSomeDocs extends Test { String indexTableName = (String) state.get("indexTableName"); String dataTableName = (String) state.get("docTableName"); - ArrayList patterns = new ArrayList(); + ArrayList patterns = new ArrayList<>(); for (Object key : props.keySet()) if (key instanceof String && ((String) key).startsWith("pattern")) http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/DeleteWord.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/DeleteWord.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/DeleteWord.java index 28b1899..9de0240 100644 --- a/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/DeleteWord.java +++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/DeleteWord.java @@ -54,7 +54,7 @@ public class DeleteWord extends Test { Scanner scanner = env.getConnector().createScanner(indexTableName, Authorizations.EMPTY); scanner.fetchColumnFamily(new Text(wordToDelete)); - ArrayList documentsToDelete = new ArrayList(); + ArrayList documentsToDelete = new ArrayList<>(); for (Entry entry : scanner) documentsToDelete.add(new Range(entry.getKey().getColumnQualifier())); http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/ExportIndex.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/ExportIndex.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/ExportIndex.java index ca273ac..5b57ace 100644 --- a/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/ExportIndex.java +++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/ExportIndex.java @@ -89,17 +89,17 @@ public class ExportIndex extends Test { fs.delete(new Path(exportDir), true); fs.delete(new Path(copyDir), true); - HashSet splits1 = new HashSet(env.getConnector().tableOperations().listSplits(indexTableName)); - HashSet splits2 = new HashSet(env.getConnector().tableOperations().listSplits(tmpIndexTableName)); + HashSet splits1 = new HashSet<>(env.getConnector().tableOperations().listSplits(indexTableName)); + HashSet splits2 = new HashSet<>(env.getConnector().tableOperations().listSplits(tmpIndexTableName)); if (!splits1.equals(splits2)) throw new Exception("Splits not equals " + indexTableName + " " + tmpIndexTableName); - HashMap props1 = new HashMap(); + HashMap props1 = new HashMap<>(); for (Entry entry : env.getConnector().tableOperations().getProperties(indexTableName)) props1.put(entry.getKey(), entry.getValue()); - HashMap props2 = new HashMap(); + HashMap props2 = new HashMap<>(); for (Entry entry : env.getConnector().tableOperations().getProperties(tmpIndexTableName)) props2.put(entry.getKey(), entry.getValue()); http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/Grep.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/Grep.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/Grep.java index d5c5e5d..7409ea7 100644 --- a/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/Grep.java +++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/Grep.java @@ -59,7 +59,7 @@ public class Grep extends Test { bs.addScanIterator(ii); bs.setRanges(Collections.singleton(new Range())); - HashSet documentsFoundInIndex = new HashSet(); + HashSet documentsFoundInIndex = new HashSet<>(); for (Entry entry2 : bs) { documentsFoundInIndex.add(entry2.getKey().getColumnQualifier()); @@ -77,7 +77,7 @@ public class Grep extends Test { bs.setRanges(Collections.singleton(new Range())); - HashSet documentsFoundByGrep = new HashSet(); + HashSet documentsFoundByGrep = new HashSet<>(); for (Entry entry2 : bs) { documentsFoundByGrep.add(entry2.getKey().getRow()); http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/Insert.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/Insert.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/Insert.java index 4fdbbb9..8482a59 100644 --- a/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/Insert.java +++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/Insert.java @@ -115,7 +115,7 @@ public class Insert extends Test { Mutation m = new Mutation(partition); - HashSet tokensSeen = new HashSet(); + HashSet tokensSeen = new HashSet<>(); for (String token : tokens) { token = token.toLowerCase(); http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/Merge.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/Merge.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/Merge.java index 36a70f6..910e64c 100644 --- a/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/Merge.java +++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/Merge.java @@ -33,7 +33,7 @@ public class Merge extends Test { String indexTableName = (String) state.get("indexTableName"); Collection splits = env.getConnector().tableOperations().listSplits(indexTableName); - SortedSet splitSet = new TreeSet(splits); + SortedSet splitSet = new TreeSet<>(splits); log.debug("merging " + indexTableName); env.getConnector().tableOperations().merge(indexTableName, null, null); org.apache.accumulo.core.util.Merge merge = new org.apache.accumulo.core.util.Merge(); http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/Search.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/Search.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/Search.java index 899ec42..bccb280 100644 --- a/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/Search.java +++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/Search.java @@ -57,7 +57,7 @@ public class Search extends Test { if (numSearchTerms < 2) numSearchTerms = 2; - HashSet searchTerms = new HashSet(); + HashSet searchTerms = new HashSet<>(); while (searchTerms.size() < numSearchTerms) searchTerms.add(tokens[rand.nextInt(tokens.length)]); http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/ShardFixture.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/ShardFixture.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/ShardFixture.java index 63500a0..99e3a61 100644 --- a/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/ShardFixture.java +++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/ShardFixture.java @@ -39,7 +39,7 @@ public class ShardFixture extends Fixture { long distance = max / numTablets; long split = distance; - TreeSet splits = new TreeSet(); + TreeSet splits = new TreeSet<>(); for (int i = 0; i < numSplits; i++) { splits.add(new Text(String.format(format, split))); http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/main/java/org/apache/accumulo/test/replication/merkle/MerkleTree.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/replication/merkle/MerkleTree.java b/test/src/main/java/org/apache/accumulo/test/replication/merkle/MerkleTree.java index 03eb466..9a4b127 100644 --- a/test/src/main/java/org/apache/accumulo/test/replication/merkle/MerkleTree.java +++ b/test/src/main/java/org/apache/accumulo/test/replication/merkle/MerkleTree.java @@ -67,7 +67,7 @@ public class MerkleTree { // At the same level if (left.getLevel() == right.getLevel()) { - return new Pair(i, j); + return new Pair<>(i, j); } // Peek to see if we have another element @@ -77,14 +77,14 @@ public class MerkleTree { j++; } else { // Otherwise, the last two elements must be paired - return new Pair(i, j); + return new Pair<>(i, j); } } if (2 < nodes.size()) { throw new IllegalStateException("Should not have exited loop without pairing two elements when we have at least 3 nodes"); } else if (2 == nodes.size()) { - return new Pair(0, 1); + return new Pair<>(0, 1); } else { throw new IllegalStateException("Must have at least two nodes to pair"); } http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/main/java/org/apache/accumulo/test/replication/merkle/MerkleTreeNode.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/replication/merkle/MerkleTreeNode.java b/test/src/main/java/org/apache/accumulo/test/replication/merkle/MerkleTreeNode.java index 33ec056..f392f12 100644 --- a/test/src/main/java/org/apache/accumulo/test/replication/merkle/MerkleTreeNode.java +++ b/test/src/main/java/org/apache/accumulo/test/replication/merkle/MerkleTreeNode.java @@ -58,7 +58,7 @@ public class MerkleTreeNode { public MerkleTreeNode(List children, String digestAlgorithm) throws NoSuchAlgorithmException { level = 0; - this.children = new ArrayList(children.size()); + this.children = new ArrayList<>(children.size()); MessageDigest digest = MessageDigest.getInstance(digestAlgorithm); Range childrenRange = null; http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/main/java/org/apache/accumulo/test/replication/merkle/cli/ComputeRootHash.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/replication/merkle/cli/ComputeRootHash.java b/test/src/main/java/org/apache/accumulo/test/replication/merkle/cli/ComputeRootHash.java index cb2761b..56a5931 100644 --- a/test/src/main/java/org/apache/accumulo/test/replication/merkle/cli/ComputeRootHash.java +++ b/test/src/main/java/org/apache/accumulo/test/replication/merkle/cli/ComputeRootHash.java @@ -76,7 +76,7 @@ public class ComputeRootHash { protected ArrayList getLeaves(Connector conn, String tableName) throws TableNotFoundException { // TODO make this a bit more resilient to very large merkle trees by lazily reading more data from the table when necessary final Scanner s = conn.createScanner(tableName, Authorizations.EMPTY); - final ArrayList leaves = new ArrayList(); + final ArrayList leaves = new ArrayList<>(); for (Entry entry : s) { Range range = RangeSerialization.toRange(entry.getKey()); http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/main/java/org/apache/accumulo/test/replication/merkle/cli/GenerateHashes.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/replication/merkle/cli/GenerateHashes.java b/test/src/main/java/org/apache/accumulo/test/replication/merkle/cli/GenerateHashes.java index b1ef6c3..72da0ae 100644 --- a/test/src/main/java/org/apache/accumulo/test/replication/merkle/cli/GenerateHashes.java +++ b/test/src/main/java/org/apache/accumulo/test/replication/merkle/cli/GenerateHashes.java @@ -129,7 +129,7 @@ public class GenerateHashes { return endRowsToRanges(endRows); } else { log.info("Using provided split points"); - ArrayList splits = new ArrayList(); + ArrayList splits = new ArrayList<>(); String line; java.util.Scanner file = new java.util.Scanner(new File(splitsFile), UTF_8.name()); @@ -249,7 +249,7 @@ public class GenerateHashes { } public TreeSet endRowsToRanges(Collection endRows) { - ArrayList sortedEndRows = new ArrayList(endRows); + ArrayList sortedEndRows = new ArrayList<>(endRows); Collections.sort(sortedEndRows); Text prevEndRow = null; http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/main/java/org/apache/accumulo/test/scalability/ScaleTest.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/scalability/ScaleTest.java b/test/src/main/java/org/apache/accumulo/test/scalability/ScaleTest.java index f908296..2f82bfa 100644 --- a/test/src/main/java/org/apache/accumulo/test/scalability/ScaleTest.java +++ b/test/src/main/java/org/apache/accumulo/test/scalability/ScaleTest.java @@ -70,7 +70,7 @@ public abstract class ScaleTest { int numSplits = numTabletServers - 1; long distance = (Long.MAX_VALUE / numTabletServers) + 1; long split = distance; - TreeSet keys = new TreeSet(); + TreeSet keys = new TreeSet<>(); for (int i = 0; i < numSplits; i++) { keys.add(new Text(String.format("%016x", split))); split += distance; http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/test/java/org/apache/accumulo/harness/conf/AccumuloClusterPropertyConfiguration.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/harness/conf/AccumuloClusterPropertyConfiguration.java b/test/src/test/java/org/apache/accumulo/harness/conf/AccumuloClusterPropertyConfiguration.java index 4e04db9..779c111 100644 --- a/test/src/test/java/org/apache/accumulo/harness/conf/AccumuloClusterPropertyConfiguration.java +++ b/test/src/test/java/org/apache/accumulo/harness/conf/AccumuloClusterPropertyConfiguration.java @@ -139,7 +139,7 @@ public abstract class AccumuloClusterPropertyConfiguration implements AccumuloCl throw new IllegalArgumentException("Unknown ClusterType: " + type); } - Map configuration = new HashMap(); + Map configuration = new HashMap<>(); Properties systemProperties = System.getProperties(); http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/test/java/org/apache/accumulo/test/AssignmentThreadsIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/AssignmentThreadsIT.java b/test/src/test/java/org/apache/accumulo/test/AssignmentThreadsIT.java index fd7ea6c..133cabd 100644 --- a/test/src/test/java/org/apache/accumulo/test/AssignmentThreadsIT.java +++ b/test/src/test/java/org/apache/accumulo/test/AssignmentThreadsIT.java @@ -63,7 +63,7 @@ public class AssignmentThreadsIT extends ConfigurableMacIT { Connector c = getConnector(); log.info("Creating table"); c.tableOperations().create(tableName); - SortedSet splits = new TreeSet(); + SortedSet splits = new TreeSet<>(); for (int i = 0; i < 1000; i++) { splits.add(new Text(randomHex(8))); } http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/test/src/test/java/org/apache/accumulo/test/AuditMessageIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/AuditMessageIT.java b/test/src/test/java/org/apache/accumulo/test/AuditMessageIT.java index 268965f..479c781 100644 --- a/test/src/test/java/org/apache/accumulo/test/AuditMessageIT.java +++ b/test/src/test/java/org/apache/accumulo/test/AuditMessageIT.java @@ -94,7 +94,7 @@ public class AuditMessageIT extends ConfigurableMacIT { private Connector conn; private static ArrayList findAuditMessage(ArrayList input, String pattern) { - ArrayList result = new ArrayList(); + ArrayList result = new ArrayList<>(); for (String s : input) { if (s.matches(".*" + pattern + ".*")) result.add(s); @@ -125,7 +125,7 @@ public class AuditMessageIT extends ConfigurableMacIT { // Grab the audit messages System.out.println("Start of captured audit messages for step " + stepName); - ArrayList result = new ArrayList