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 05265200BC4 for ; Fri, 4 Nov 2016 23:22:49 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 03BE6160B30; Fri, 4 Nov 2016 22:22:49 +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 E34EB160B13 for ; Fri, 4 Nov 2016 23:22:46 +0100 (CET) Received: (qmail 67256 invoked by uid 500); 4 Nov 2016 22:22:45 -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 66286 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 5EAD9F0BE6; 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:49 -0000 Message-Id: In-Reply-To: <8db15481562846a5947e4d4b91c82ee1@git.apache.org> References: <8db15481562846a5947e4d4b91c82ee1@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [07/48] accumulo git commit: ACCUMULO-4514 Remove unnecessary code archived-at: Fri, 04 Nov 2016 22:22:49 -0000 http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/server/base/src/test/java/org/apache/accumulo/server/fs/VolumeUtilTest.java ---------------------------------------------------------------------- diff --git a/server/base/src/test/java/org/apache/accumulo/server/fs/VolumeUtilTest.java b/server/base/src/test/java/org/apache/accumulo/server/fs/VolumeUtilTest.java index 9fcd3e0..d04b124 100644 --- a/server/base/src/test/java/org/apache/accumulo/server/fs/VolumeUtilTest.java +++ b/server/base/src/test/java/org/apache/accumulo/server/fs/VolumeUtilTest.java @@ -42,10 +42,10 @@ public class VolumeUtilTest { @Test public void testSwitchVolume() { - List> replacements = new ArrayList>(); - replacements.add(new Pair(new Path("hdfs://nn1/accumulo"), new Path("viewfs:/a/accumulo"))); - replacements.add(new Pair(new Path("hdfs://nn1:9000/accumulo"), new Path("viewfs:/a/accumulo"))); - replacements.add(new Pair(new Path("hdfs://nn2/accumulo"), new Path("viewfs:/b/accumulo"))); + List> replacements = new ArrayList<>(); + replacements.add(new Pair<>(new Path("hdfs://nn1/accumulo"), new Path("viewfs:/a/accumulo"))); + replacements.add(new Pair<>(new Path("hdfs://nn1:9000/accumulo"), new Path("viewfs:/a/accumulo"))); + replacements.add(new Pair<>(new Path("hdfs://nn2/accumulo"), new Path("viewfs:/b/accumulo"))); Assert.assertEquals("viewfs:/a/accumulo/tables/t-00000/C000.rf", VolumeUtil.switchVolume("hdfs://nn1/accumulo/tables/t-00000/C000.rf", FileType.TABLE, replacements)); @@ -57,9 +57,9 @@ public class VolumeUtilTest { Assert.assertNull(VolumeUtil.switchVolume("file:/nn1/a/accumulo/tables/t-00000/C000.rf", FileType.TABLE, replacements)); replacements.clear(); - replacements.add(new Pair(new Path("hdfs://nn1/d1/accumulo"), new Path("viewfs:/a/accumulo"))); - replacements.add(new Pair(new Path("hdfs://nn1:9000/d1/accumulo"), new Path("viewfs:/a/accumulo"))); - replacements.add(new Pair(new Path("hdfs://nn2/d2/accumulo"), new Path("viewfs:/b/accumulo"))); + replacements.add(new Pair<>(new Path("hdfs://nn1/d1/accumulo"), new Path("viewfs:/a/accumulo"))); + replacements.add(new Pair<>(new Path("hdfs://nn1:9000/d1/accumulo"), new Path("viewfs:/a/accumulo"))); + replacements.add(new Pair<>(new Path("hdfs://nn2/d2/accumulo"), new Path("viewfs:/b/accumulo"))); Assert.assertEquals("viewfs:/a/accumulo/tables/t-00000/C000.rf", VolumeUtil.switchVolume("hdfs://nn1/d1/accumulo/tables/t-00000/C000.rf", FileType.TABLE, replacements)); @@ -74,10 +74,10 @@ public class VolumeUtilTest { @Test public void testSwitchVolumesDifferentSourceDepths() { - List> replacements = new ArrayList>(); - replacements.add(new Pair(new Path("hdfs://nn1/accumulo"), new Path("viewfs:/a"))); - replacements.add(new Pair(new Path("hdfs://nn1:9000/accumulo"), new Path("viewfs:/a"))); - replacements.add(new Pair(new Path("hdfs://nn2/accumulo"), new Path("viewfs:/b"))); + List> replacements = new ArrayList<>(); + replacements.add(new Pair<>(new Path("hdfs://nn1/accumulo"), new Path("viewfs:/a"))); + replacements.add(new Pair<>(new Path("hdfs://nn1:9000/accumulo"), new Path("viewfs:/a"))); + replacements.add(new Pair<>(new Path("hdfs://nn2/accumulo"), new Path("viewfs:/b"))); Assert .assertEquals("viewfs:/a/tables/t-00000/C000.rf", VolumeUtil.switchVolume("hdfs://nn1/accumulo/tables/t-00000/C000.rf", FileType.TABLE, replacements)); @@ -89,9 +89,9 @@ public class VolumeUtilTest { Assert.assertNull(VolumeUtil.switchVolume("file:/nn1/a/accumulo/tables/t-00000/C000.rf", FileType.TABLE, replacements)); replacements.clear(); - replacements.add(new Pair(new Path("hdfs://nn1/d1/accumulo"), new Path("viewfs:/a"))); - replacements.add(new Pair(new Path("hdfs://nn1:9000/d1/accumulo"), new Path("viewfs:/a"))); - replacements.add(new Pair(new Path("hdfs://nn2/d2/accumulo"), new Path("viewfs:/b"))); + replacements.add(new Pair<>(new Path("hdfs://nn1/d1/accumulo"), new Path("viewfs:/a"))); + replacements.add(new Pair<>(new Path("hdfs://nn1:9000/d1/accumulo"), new Path("viewfs:/a"))); + replacements.add(new Pair<>(new Path("hdfs://nn2/d2/accumulo"), new Path("viewfs:/b"))); Assert.assertEquals("viewfs:/a/tables/t-00000/C000.rf", VolumeUtil.switchVolume("hdfs://nn1/d1/accumulo/tables/t-00000/C000.rf", FileType.TABLE, replacements)); @@ -106,10 +106,10 @@ public class VolumeUtilTest { @Test public void testSwitchVolumesDifferentTargetDepths() { - List> replacements = new ArrayList>(); - replacements.add(new Pair(new Path("hdfs://nn1/accumulo"), new Path("viewfs:/path1/path2"))); - replacements.add(new Pair(new Path("hdfs://nn1:9000/accumulo"), new Path("viewfs:/path1/path2"))); - replacements.add(new Pair(new Path("hdfs://nn2/accumulo"), new Path("viewfs:/path3"))); + List> replacements = new ArrayList<>(); + replacements.add(new Pair<>(new Path("hdfs://nn1/accumulo"), new Path("viewfs:/path1/path2"))); + replacements.add(new Pair<>(new Path("hdfs://nn1:9000/accumulo"), new Path("viewfs:/path1/path2"))); + replacements.add(new Pair<>(new Path("hdfs://nn2/accumulo"), new Path("viewfs:/path3"))); Assert.assertEquals("viewfs:/path1/path2/tables/t-00000/C000.rf", VolumeUtil.switchVolume("hdfs://nn1/accumulo/tables/t-00000/C000.rf", FileType.TABLE, replacements)); @@ -121,9 +121,9 @@ public class VolumeUtilTest { Assert.assertNull(VolumeUtil.switchVolume("file:/nn1/a/accumulo/tables/t-00000/C000.rf", FileType.TABLE, replacements)); replacements.clear(); - replacements.add(new Pair(new Path("hdfs://nn1/d1/accumulo"), new Path("viewfs:/path1/path2"))); - replacements.add(new Pair(new Path("hdfs://nn1:9000/d1/accumulo"), new Path("viewfs:/path1/path2"))); - replacements.add(new Pair(new Path("hdfs://nn2/d2/accumulo"), new Path("viewfs:/path3"))); + replacements.add(new Pair<>(new Path("hdfs://nn1/d1/accumulo"), new Path("viewfs:/path1/path2"))); + replacements.add(new Pair<>(new Path("hdfs://nn1:9000/d1/accumulo"), new Path("viewfs:/path1/path2"))); + replacements.add(new Pair<>(new Path("hdfs://nn2/d2/accumulo"), new Path("viewfs:/path3"))); Assert.assertEquals("viewfs:/path1/path2/tables/t-00000/C000.rf", VolumeUtil.switchVolume("hdfs://nn1/d1/accumulo/tables/t-00000/C000.rf", FileType.TABLE, replacements)); @@ -199,9 +199,9 @@ public class VolumeUtilTest { @Test public void testRootTableReplacement() throws IOException { - List> replacements = new ArrayList>(); - replacements.add(new Pair(new Path("file:/foo/v1"), new Path("file:/foo/v8"))); - replacements.add(new Pair(new Path("file:/foo/v2"), new Path("file:/foo/v9"))); + List> replacements = new ArrayList<>(); + replacements.add(new Pair<>(new Path("file:/foo/v1"), new Path("file:/foo/v8"))); + replacements.add(new Pair<>(new Path("file:/foo/v2"), new Path("file:/foo/v9"))); FileType ft = FileType.TABLE; http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/server/base/src/test/java/org/apache/accumulo/server/iterators/MetadataBulkLoadFilterTest.java ---------------------------------------------------------------------- diff --git a/server/base/src/test/java/org/apache/accumulo/server/iterators/MetadataBulkLoadFilterTest.java b/server/base/src/test/java/org/apache/accumulo/server/iterators/MetadataBulkLoadFilterTest.java index ed662a5..b81c01e 100644 --- a/server/base/src/test/java/org/apache/accumulo/server/iterators/MetadataBulkLoadFilterTest.java +++ b/server/base/src/test/java/org/apache/accumulo/server/iterators/MetadataBulkLoadFilterTest.java @@ -81,8 +81,8 @@ public class MetadataBulkLoadFilterTest { @Test public void testBasic() throws IOException { - TreeMap tm1 = new TreeMap(); - TreeMap expected = new TreeMap(); + TreeMap tm1 = new TreeMap<>(); + TreeMap expected = new TreeMap<>(); // following should not be deleted by filter put(tm1, "2;m", TabletsSection.ServerColumnFamily.DIRECTORY_COLUMN, "/t1"); @@ -138,7 +138,7 @@ public class MetadataBulkLoadFilterTest { iter.seek(new Range(), new ArrayList(), false); - TreeMap actual = new TreeMap(); + TreeMap actual = new TreeMap<>(); while (iter.hasTop()) { actual.put(iter.getTopKey(), iter.getTopValue()); http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/server/base/src/test/java/org/apache/accumulo/server/master/balancer/ChaoticLoadBalancerTest.java ---------------------------------------------------------------------- diff --git a/server/base/src/test/java/org/apache/accumulo/server/master/balancer/ChaoticLoadBalancerTest.java b/server/base/src/test/java/org/apache/accumulo/server/master/balancer/ChaoticLoadBalancerTest.java index 0fb9182..f2d3322 100644 --- a/server/base/src/test/java/org/apache/accumulo/server/master/balancer/ChaoticLoadBalancerTest.java +++ b/server/base/src/test/java/org/apache/accumulo/server/master/balancer/ChaoticLoadBalancerTest.java @@ -44,11 +44,11 @@ import com.google.common.net.HostAndPort; public class ChaoticLoadBalancerTest { class FakeTServer { - List extents = new ArrayList(); + List extents = new ArrayList<>(); TabletServerStatus getStatus(TServerInstance server) { TabletServerStatus result = new TabletServerStatus(); - result.tableMap = new HashMap(); + result.tableMap = new HashMap<>(); for (KeyExtent extent : extents) { String table = extent.getTableId().toString(); TableInfo info = result.tableMap.get(table); @@ -63,13 +63,13 @@ public class ChaoticLoadBalancerTest { } } - Map servers = new HashMap(); + Map servers = new HashMap<>(); class TestChaoticLoadBalancer extends ChaoticLoadBalancer { @Override public List getOnlineTabletsForTable(TServerInstance tserver, String table) throws ThriftSecurityException, TException { - List result = new ArrayList(); + List result = new ArrayList<>(); for (KeyExtent extent : servers.get(tserver).extents) { if (extent.getTableId().toString().equals(table)) { result.add(new TabletStats(extent.toThrift(), null, null, null, 0l, 0., 0., 0)); @@ -85,7 +85,7 @@ public class ChaoticLoadBalancerTest { servers.put(new TServerInstance(HostAndPort.fromParts("127.0.0.1", 1234), "a"), new FakeTServer()); servers.put(new TServerInstance(HostAndPort.fromParts("127.0.0.1", 1235), "b"), new FakeTServer()); servers.put(new TServerInstance(HostAndPort.fromParts("127.0.0.1", 1236), "c"), new FakeTServer()); - Map metadataTable = new TreeMap(); + Map metadataTable = new TreeMap<>(); String table = "t1"; metadataTable.put(makeExtent(table, null, null), null); table = "t2"; @@ -101,19 +101,19 @@ public class ChaoticLoadBalancerTest { TestChaoticLoadBalancer balancer = new TestChaoticLoadBalancer(); - SortedMap current = new TreeMap(); + SortedMap current = new TreeMap<>(); for (Entry entry : servers.entrySet()) { current.put(entry.getKey(), entry.getValue().getStatus(entry.getKey())); } - Map assignments = new HashMap(); + Map assignments = new HashMap<>(); balancer.getAssignments(getAssignments(servers), metadataTable, assignments); assertEquals(assignments.size(), metadataTable.size()); } SortedMap getAssignments(Map servers) { - SortedMap result = new TreeMap(); + SortedMap result = new TreeMap<>(); for (Entry entry : servers.entrySet()) { result.put(entry.getKey(), entry.getValue().getStatus(entry.getKey())); } @@ -147,7 +147,7 @@ public class ChaoticLoadBalancerTest { Set migrations = Collections.emptySet(); // Just want to make sure it gets some migrations, randomness prevents guarantee of a defined amount, or even expected amount - List migrationsOut = new ArrayList(); + List migrationsOut = new ArrayList<>(); while (migrationsOut.size() != 0) { balancer.balance(getAssignments(servers), migrations, migrationsOut); } http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/server/base/src/test/java/org/apache/accumulo/server/master/balancer/DefaultLoadBalancerTest.java ---------------------------------------------------------------------- diff --git a/server/base/src/test/java/org/apache/accumulo/server/master/balancer/DefaultLoadBalancerTest.java b/server/base/src/test/java/org/apache/accumulo/server/master/balancer/DefaultLoadBalancerTest.java index aee1795..ba19d9a 100644 --- a/server/base/src/test/java/org/apache/accumulo/server/master/balancer/DefaultLoadBalancerTest.java +++ b/server/base/src/test/java/org/apache/accumulo/server/master/balancer/DefaultLoadBalancerTest.java @@ -48,11 +48,11 @@ import com.google.common.net.HostAndPort; public class DefaultLoadBalancerTest { class FakeTServer { - List extents = new ArrayList(); + List extents = new ArrayList<>(); TabletServerStatus getStatus(TServerInstance server) { TabletServerStatus result = new TabletServerStatus(); - result.tableMap = new HashMap(); + result.tableMap = new HashMap<>(); for (KeyExtent extent : extents) { String table = extent.getTableId().toString(); TableInfo info = result.tableMap.get(table); @@ -67,14 +67,14 @@ public class DefaultLoadBalancerTest { } } - Map servers = new HashMap(); - Map last = new HashMap(); + Map servers = new HashMap<>(); + Map last = new HashMap<>(); class TestDefaultLoadBalancer extends DefaultLoadBalancer { @Override public List getOnlineTabletsForTable(TServerInstance tserver, String table) throws ThriftSecurityException, TException { - List result = new ArrayList(); + List result = new ArrayList<>(); for (KeyExtent extent : servers.get(tserver).extents) { if (extent.getTableId().toString().equals(table)) { result.add(new TabletStats(extent.toThrift(), null, null, null, 0l, 0., 0., 0)); @@ -95,7 +95,7 @@ public class DefaultLoadBalancerTest { servers.put(new TServerInstance(HostAndPort.fromParts("127.0.0.1", 1234), "a"), new FakeTServer()); servers.put(new TServerInstance(HostAndPort.fromParts("127.0.0.2", 1234), "b"), new FakeTServer()); servers.put(new TServerInstance(HostAndPort.fromParts("127.0.0.3", 1234), "c"), new FakeTServer()); - List metadataTable = new ArrayList(); + List metadataTable = new ArrayList<>(); String table = "t1"; metadataTable.add(makeExtent(table, null, null)); table = "t2"; @@ -112,14 +112,14 @@ public class DefaultLoadBalancerTest { TestDefaultLoadBalancer balancer = new TestDefaultLoadBalancer(); - SortedMap current = new TreeMap(); + SortedMap current = new TreeMap<>(); for (Entry entry : servers.entrySet()) { current.put(entry.getKey(), entry.getValue().getStatus(entry.getKey())); } assignTablets(metadataTable, servers, current, balancer); // Verify that the counts on the tables are correct - Map expectedCounts = new HashMap(); + Map expectedCounts = new HashMap<>(); expectedCounts.put("t1", 1); expectedCounts.put("t2", 1); expectedCounts.put("t3", 2); @@ -131,7 +131,7 @@ public class DefaultLoadBalancerTest { } // Nothing should happen, we are balanced - ArrayList out = new ArrayList(); + ArrayList out = new ArrayList<>(); balancer.getMigrations(current, out); assertEquals(out.size(), 0); @@ -158,7 +158,7 @@ public class DefaultLoadBalancerTest { } SortedMap getAssignments(Map servers) { - SortedMap result = new TreeMap(); + SortedMap result = new TreeMap<>(); for (Entry entry : servers.entrySet()) { result.put(entry.getKey(), entry.getValue().getStatus(entry.getKey())); } @@ -192,7 +192,7 @@ public class DefaultLoadBalancerTest { int moved = 0; // balance until we can't balance no more! while (true) { - List migrationsOut = new ArrayList(); + List migrationsOut = new ArrayList<>(); balancer.balance(getAssignments(servers), migrations, migrationsOut); if (migrationsOut.size() == 0) break; @@ -217,7 +217,7 @@ public class DefaultLoadBalancerTest { servers.put(tsi, fakeTServer); } // put 60 tablets on 25 of them - List> shortList = new ArrayList>(servers.entrySet()); + List> shortList = new ArrayList<>(servers.entrySet()); Entry shortServer = shortList.remove(0); int c = 0; for (int i = 0; i < 60; i++) { @@ -235,7 +235,7 @@ public class DefaultLoadBalancerTest { int moved = 0; // balance until we can't balance no more! while (true) { - List migrationsOut = new ArrayList(); + List migrationsOut = new ArrayList<>(); balancer.balance(getAssignments(servers), migrations, migrationsOut); if (migrationsOut.size() == 0) break; @@ -264,7 +264,7 @@ public class DefaultLoadBalancerTest { if (expectedCounts != null) { for (FakeTServer server : servers.values()) { - Map counts = new HashMap(); + Map counts = new HashMap<>(); for (KeyExtent extent : server.extents) { String t = extent.getTableId().toString(); if (counts.get(t) == null) http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/server/base/src/test/java/org/apache/accumulo/server/master/balancer/GroupBalancerTest.java ---------------------------------------------------------------------- diff --git a/server/base/src/test/java/org/apache/accumulo/server/master/balancer/GroupBalancerTest.java b/server/base/src/test/java/org/apache/accumulo/server/master/balancer/GroupBalancerTest.java index 5de4923..acd3be8 100644 --- a/server/base/src/test/java/org/apache/accumulo/server/master/balancer/GroupBalancerTest.java +++ b/server/base/src/test/java/org/apache/accumulo/server/master/balancer/GroupBalancerTest.java @@ -84,7 +84,7 @@ public class GroupBalancerTest { @Override public Pair apply(final Entry input) { - return new Pair(input.getKey(), new Location(input.getValue())); + return new Pair<>(input.getKey(), new Location(input.getValue())); } }); http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/server/base/src/test/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancerReconfigurationTest.java ---------------------------------------------------------------------- diff --git a/server/base/src/test/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancerReconfigurationTest.java b/server/base/src/test/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancerReconfigurationTest.java index eff9a11..504b39b 100644 --- a/server/base/src/test/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancerReconfigurationTest.java +++ b/server/base/src/test/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancerReconfigurationTest.java @@ -70,8 +70,8 @@ public class HostRegexTableLoadBalancerReconfigurationTest extends BaseHostRegex Assert.fail("tablet not in bounds: " + e.getKey() + " -> " + e.getValue().host()); } } - Set migrations = new HashSet(); - List migrationsOut = new ArrayList(); + Set migrations = new HashSet<>(); + List migrationsOut = new ArrayList<>(); // Wait to trigger the out of bounds check which will call our version of getOnlineTabletsForTable UtilWaitThread.sleep(11000); this.balance(Collections.unmodifiableSortedMap(allTabletServers), migrations, migrationsOut); http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/server/base/src/test/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancerTest.java ---------------------------------------------------------------------- diff --git a/server/base/src/test/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancerTest.java b/server/base/src/test/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancerTest.java index 868ac0a..c0ccc48 100644 --- a/server/base/src/test/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancerTest.java +++ b/server/base/src/test/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancerTest.java @@ -325,7 +325,7 @@ public class HostRegexTableLoadBalancerTest extends BaseHostRegexTableLoadBalanc } SortedMap current = createCurrent(15); // Remove the BAR tablet servers from current - List removals = new ArrayList(); + List removals = new ArrayList<>(); for (Entry e : current.entrySet()) { if (e.getKey().host().equals("192.168.0.6") || e.getKey().host().equals("192.168.0.7") || e.getKey().host().equals("192.168.0.8") || e.getKey().host().equals("192.168.0.9") || e.getKey().host().equals("192.168.0.10")) { @@ -350,8 +350,8 @@ public class HostRegexTableLoadBalancerTest extends BaseHostRegexTableLoadBalanc init((ServerConfiguration) factory); // Wait to trigger the out of bounds check which will call our version of getOnlineTabletsForTable UtilWaitThread.sleep(11000); - Set migrations = new HashSet(); - List migrationsOut = new ArrayList(); + Set migrations = new HashSet<>(); + List migrationsOut = new ArrayList<>(); this.balance(createCurrent(15), migrations, migrationsOut); Assert.assertEquals(2, migrationsOut.size()); } http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/server/base/src/test/java/org/apache/accumulo/server/master/balancer/TableLoadBalancerTest.java ---------------------------------------------------------------------- diff --git a/server/base/src/test/java/org/apache/accumulo/server/master/balancer/TableLoadBalancerTest.java b/server/base/src/test/java/org/apache/accumulo/server/master/balancer/TableLoadBalancerTest.java index c957009..0cc6c86 100644 --- a/server/base/src/test/java/org/apache/accumulo/server/master/balancer/TableLoadBalancerTest.java +++ b/server/base/src/test/java/org/apache/accumulo/server/master/balancer/TableLoadBalancerTest.java @@ -55,7 +55,7 @@ public class TableLoadBalancerTest { static private TabletServerStatus status(Object... config) { TabletServerStatus result = new TabletServerStatus(); - result.tableMap = new HashMap(); + result.tableMap = new HashMap<>(); String tablename = null; for (Object c : config) { if (c instanceof String) { @@ -76,7 +76,7 @@ public class TableLoadBalancerTest { static SortedMap state; static List generateFakeTablets(TServerInstance tserver, String tableId) { - List result = new ArrayList(); + List result = new ArrayList<>(); TabletServerStatus tableInfo = state.get(tserver); // generate some fake tablets for (int i = 0; i < tableInfo.tableMap.get(tableId).onlineTablets; i++) { @@ -140,12 +140,12 @@ public class TableLoadBalancerTest { tops.create("t2"); tops.create("t3"); String t1Id = tops.tableIdMap().get("t1"), t2Id = tops.tableIdMap().get("t2"), t3Id = tops.tableIdMap().get("t3"); - state = new TreeMap(); + state = new TreeMap<>(); TServerInstance svr = mkts("10.0.0.1", "0x01020304"); state.put(svr, status(t1Id, 10, t2Id, 10, t3Id, 10)); Set migrations = Collections.emptySet(); - List migrationsOut = new ArrayList(); + List migrationsOut = new ArrayList<>(); TableLoadBalancer tls = new TableLoadBalancer(); tls.init(confFactory); tls.balance(state, migrations, migrationsOut); @@ -156,7 +156,7 @@ public class TableLoadBalancerTest { tls.init(confFactory); tls.balance(state, migrations, migrationsOut); int count = 0; - Map movedByTable = new HashMap(); + Map movedByTable = new HashMap<>(); movedByTable.put(t1Id, Integer.valueOf(0)); movedByTable.put(t2Id, Integer.valueOf(0)); movedByTable.put(t3Id, Integer.valueOf(0)); http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/server/base/src/test/java/org/apache/accumulo/server/master/state/TabletLocationStateTest.java ---------------------------------------------------------------------- diff --git a/server/base/src/test/java/org/apache/accumulo/server/master/state/TabletLocationStateTest.java b/server/base/src/test/java/org/apache/accumulo/server/master/state/TabletLocationStateTest.java index 0a0afd1..f270fe4 100644 --- a/server/base/src/test/java/org/apache/accumulo/server/master/state/TabletLocationStateTest.java +++ b/server/base/src/test/java/org/apache/accumulo/server/master/state/TabletLocationStateTest.java @@ -35,8 +35,8 @@ import org.junit.BeforeClass; import org.junit.Test; public class TabletLocationStateTest { - private static final Collection innerWalogs = new java.util.HashSet(); - private static final Collection> walogs = new java.util.HashSet>(); + private static final Collection innerWalogs = new java.util.HashSet<>(); + private static final Collection> walogs = new java.util.HashSet<>(); @BeforeClass public static void setUpClass() { @@ -137,7 +137,7 @@ public class TabletLocationStateTest { @Test public void testGetState_Assigned() throws Exception { - Set liveServers = new java.util.HashSet(); + Set liveServers = new java.util.HashSet<>(); liveServers.add(future); tls = new TabletLocationState(keyExtent, future, null, last, walogs, true); assertEquals(TabletState.ASSIGNED, tls.getState(liveServers)); @@ -145,7 +145,7 @@ public class TabletLocationStateTest { @Test public void testGetState_Hosted() throws Exception { - Set liveServers = new java.util.HashSet(); + Set liveServers = new java.util.HashSet<>(); liveServers.add(current); tls = new TabletLocationState(keyExtent, null, current, last, walogs, true); assertEquals(TabletState.HOSTED, tls.getState(liveServers)); @@ -153,7 +153,7 @@ public class TabletLocationStateTest { @Test public void testGetState_Dead1() throws Exception { - Set liveServers = new java.util.HashSet(); + Set liveServers = new java.util.HashSet<>(); liveServers.add(current); tls = new TabletLocationState(keyExtent, future, null, last, walogs, true); assertEquals(TabletState.ASSIGNED_TO_DEAD_SERVER, tls.getState(liveServers)); @@ -161,7 +161,7 @@ public class TabletLocationStateTest { @Test public void testGetState_Dead2() throws Exception { - Set liveServers = new java.util.HashSet(); + Set liveServers = new java.util.HashSet<>(); liveServers.add(future); tls = new TabletLocationState(keyExtent, null, current, last, walogs, true); assertEquals(TabletState.ASSIGNED_TO_DEAD_SERVER, tls.getState(liveServers)); http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/server/base/src/test/java/org/apache/accumulo/server/problems/ProblemReportingIteratorTest.java ---------------------------------------------------------------------- diff --git a/server/base/src/test/java/org/apache/accumulo/server/problems/ProblemReportingIteratorTest.java b/server/base/src/test/java/org/apache/accumulo/server/problems/ProblemReportingIteratorTest.java index 2e0ad0c..926f215 100644 --- a/server/base/src/test/java/org/apache/accumulo/server/problems/ProblemReportingIteratorTest.java +++ b/server/base/src/test/java/org/apache/accumulo/server/problems/ProblemReportingIteratorTest.java @@ -85,7 +85,7 @@ public class ProblemReportingIteratorTest { @Test public void testSeek() throws Exception { Range r = createMock(Range.class); - Collection f = new java.util.HashSet(); + Collection f = new java.util.HashSet<>(); ii.seek(r, f, true); replay(ii); pri.seek(r, f, true); http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/server/base/src/test/java/org/apache/accumulo/server/rpc/RpcWrapperTest.java ---------------------------------------------------------------------- diff --git a/server/base/src/test/java/org/apache/accumulo/server/rpc/RpcWrapperTest.java b/server/base/src/test/java/org/apache/accumulo/server/rpc/RpcWrapperTest.java index 39d3705..de0df01 100644 --- a/server/base/src/test/java/org/apache/accumulo/server/rpc/RpcWrapperTest.java +++ b/server/base/src/test/java/org/apache/accumulo/server/rpc/RpcWrapperTest.java @@ -49,12 +49,12 @@ public class RpcWrapperTest { * @return A ProcessFunction. */ private fake_proc createProcessFunction(String methodName, boolean isOneway) { - return new fake_proc(methodName, isOneway); + return new fake_proc<>(methodName, isOneway); } @Test public void testSomeOnewayMethods() { - Map> procs = new HashMap>(); + Map> procs = new HashMap<>(); procs.put("foo", createProcessFunction("foo", true)); procs.put("foobar", createProcessFunction("foobar", false)); procs.put("bar", createProcessFunction("bar", true)); @@ -66,7 +66,7 @@ public class RpcWrapperTest { @Test public void testNoOnewayMethods() { - Map> procs = new HashMap>(); + Map> procs = new HashMap<>(); procs.put("foo", createProcessFunction("foo", false)); procs.put("foobar", createProcessFunction("foobar", false)); procs.put("bar", createProcessFunction("bar", false)); @@ -78,7 +78,7 @@ public class RpcWrapperTest { @Test public void testAllOnewayMethods() { - Map> procs = new HashMap>(); + Map> procs = new HashMap<>(); procs.put("foo", createProcessFunction("foo", true)); procs.put("foobar", createProcessFunction("foobar", true)); procs.put("bar", createProcessFunction("bar", true)); http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/server/base/src/test/java/org/apache/accumulo/server/rpc/TCredentialsUpdatingInvocationHandlerTest.java ---------------------------------------------------------------------- diff --git a/server/base/src/test/java/org/apache/accumulo/server/rpc/TCredentialsUpdatingInvocationHandlerTest.java b/server/base/src/test/java/org/apache/accumulo/server/rpc/TCredentialsUpdatingInvocationHandlerTest.java index c4340c6..52eee25 100644 --- a/server/base/src/test/java/org/apache/accumulo/server/rpc/TCredentialsUpdatingInvocationHandlerTest.java +++ b/server/base/src/test/java/org/apache/accumulo/server/rpc/TCredentialsUpdatingInvocationHandlerTest.java @@ -63,7 +63,7 @@ public class TCredentialsUpdatingInvocationHandlerTest { } }; - proxy = new TCredentialsUpdatingInvocationHandler(new Object(), conf); + proxy = new TCredentialsUpdatingInvocationHandler<>(new Object(), conf); } @After @@ -123,7 +123,7 @@ public class TCredentialsUpdatingInvocationHandlerTest { final String proxyServer = "proxy"; cc.set(Property.INSTANCE_RPC_SASL_PROXYUSERS.getKey() + proxyServer + ".users", "*"); cc.set(Property.INSTANCE_RPC_SASL_PROXYUSERS.getKey() + proxyServer + ".hosts", "*"); - proxy = new TCredentialsUpdatingInvocationHandler(new Object(), conf); + proxy = new TCredentialsUpdatingInvocationHandler<>(new Object(), conf); TCredentials tcreds = new TCredentials("client", KerberosToken.class.getName(), ByteBuffer.allocate(0), UUID.randomUUID().toString()); UGIAssumingProcessor.rpcPrincipal.set(proxyServer); proxy.updateArgs(new Object[] {new Object(), tcreds}); @@ -134,7 +134,7 @@ public class TCredentialsUpdatingInvocationHandlerTest { final String proxyServer = "proxy"; cc.set(Property.INSTANCE_RPC_SASL_ALLOWED_USER_IMPERSONATION, proxyServer + ":*"); cc.set(Property.INSTANCE_RPC_SASL_ALLOWED_HOST_IMPERSONATION, "*"); - proxy = new TCredentialsUpdatingInvocationHandler(new Object(), conf); + proxy = new TCredentialsUpdatingInvocationHandler<>(new Object(), conf); TCredentials tcreds = new TCredentials("client", KerberosToken.class.getName(), ByteBuffer.allocate(0), UUID.randomUUID().toString()); UGIAssumingProcessor.rpcPrincipal.set(proxyServer); proxy.updateArgs(new Object[] {new Object(), tcreds}); @@ -146,7 +146,7 @@ public class TCredentialsUpdatingInvocationHandlerTest { final String proxyServer = "proxy"; cc.set(Property.INSTANCE_RPC_SASL_PROXYUSERS.getKey() + proxyServer + ".users", "client1,client2"); cc.set(Property.INSTANCE_RPC_SASL_PROXYUSERS.getKey() + proxyServer + ".hosts", "*"); - proxy = new TCredentialsUpdatingInvocationHandler(new Object(), conf); + proxy = new TCredentialsUpdatingInvocationHandler<>(new Object(), conf); TCredentials tcreds = new TCredentials("client1", KerberosToken.class.getName(), ByteBuffer.allocate(0), UUID.randomUUID().toString()); UGIAssumingProcessor.rpcPrincipal.set(proxyServer); proxy.updateArgs(new Object[] {new Object(), tcreds}); @@ -159,7 +159,7 @@ public class TCredentialsUpdatingInvocationHandlerTest { final String proxyServer = "proxy"; cc.set(Property.INSTANCE_RPC_SASL_ALLOWED_USER_IMPERSONATION, proxyServer + ":client1,client2"); cc.set(Property.INSTANCE_RPC_SASL_ALLOWED_HOST_IMPERSONATION, "*"); - proxy = new TCredentialsUpdatingInvocationHandler(new Object(), conf); + proxy = new TCredentialsUpdatingInvocationHandler<>(new Object(), conf); TCredentials tcreds = new TCredentials("client1", KerberosToken.class.getName(), ByteBuffer.allocate(0), UUID.randomUUID().toString()); UGIAssumingProcessor.rpcPrincipal.set(proxyServer); proxy.updateArgs(new Object[] {new Object(), tcreds}); @@ -174,7 +174,7 @@ public class TCredentialsUpdatingInvocationHandlerTest { // let "otherproxy" impersonate, but not "proxy" cc.set(Property.INSTANCE_RPC_SASL_PROXYUSERS.getKey() + "otherproxy" + ".users", "*"); cc.set(Property.INSTANCE_RPC_SASL_PROXYUSERS.getKey() + "otherproxy" + ".hosts", "*"); - proxy = new TCredentialsUpdatingInvocationHandler(new Object(), conf); + proxy = new TCredentialsUpdatingInvocationHandler<>(new Object(), conf); TCredentials tcreds = new TCredentials("client", KerberosToken.class.getName(), ByteBuffer.allocate(0), UUID.randomUUID().toString()); UGIAssumingProcessor.rpcPrincipal.set(proxyServer); proxy.updateArgs(new Object[] {new Object(), tcreds}); @@ -186,7 +186,7 @@ public class TCredentialsUpdatingInvocationHandlerTest { // let "otherproxy" impersonate, but not "proxy" cc.set(Property.INSTANCE_RPC_SASL_ALLOWED_USER_IMPERSONATION, "otherproxy:*"); cc.set(Property.INSTANCE_RPC_SASL_ALLOWED_HOST_IMPERSONATION, "*"); - proxy = new TCredentialsUpdatingInvocationHandler(new Object(), conf); + proxy = new TCredentialsUpdatingInvocationHandler<>(new Object(), conf); TCredentials tcreds = new TCredentials("client", KerberosToken.class.getName(), ByteBuffer.allocate(0), UUID.randomUUID().toString()); UGIAssumingProcessor.rpcPrincipal.set(proxyServer); proxy.updateArgs(new Object[] {new Object(), tcreds}); @@ -201,7 +201,7 @@ public class TCredentialsUpdatingInvocationHandlerTest { cc.set(Property.INSTANCE_RPC_SASL_PROXYUSERS.getKey() + "otherproxy1" + ".hosts", "*"); cc.set(Property.INSTANCE_RPC_SASL_PROXYUSERS.getKey() + "otherproxy2" + ".users", "client1,client2"); cc.set(Property.INSTANCE_RPC_SASL_PROXYUSERS.getKey() + "otherproxy2" + ".hosts", "*"); - proxy = new TCredentialsUpdatingInvocationHandler(new Object(), conf); + proxy = new TCredentialsUpdatingInvocationHandler<>(new Object(), conf); TCredentials tcreds = new TCredentials("client1", KerberosToken.class.getName(), ByteBuffer.allocate(0), UUID.randomUUID().toString()); UGIAssumingProcessor.rpcPrincipal.set(proxyServer); proxy.updateArgs(new Object[] {new Object(), tcreds}); @@ -213,7 +213,7 @@ public class TCredentialsUpdatingInvocationHandlerTest { // let "otherproxy" impersonate, but not "proxy" cc.set(Property.INSTANCE_RPC_SASL_ALLOWED_USER_IMPERSONATION, "otherproxy1:*;otherproxy2:client1,client2"); cc.set(Property.INSTANCE_RPC_SASL_ALLOWED_HOST_IMPERSONATION, "*;*"); - proxy = new TCredentialsUpdatingInvocationHandler(new Object(), conf); + proxy = new TCredentialsUpdatingInvocationHandler<>(new Object(), conf); TCredentials tcreds = new TCredentials("client1", KerberosToken.class.getName(), ByteBuffer.allocate(0), UUID.randomUUID().toString()); UGIAssumingProcessor.rpcPrincipal.set(proxyServer); proxy.updateArgs(new Object[] {new Object(), tcreds}); @@ -225,7 +225,7 @@ public class TCredentialsUpdatingInvocationHandlerTest { final String proxyServer = "proxy", client = "client", host = "host.domain.com"; cc.set(Property.INSTANCE_RPC_SASL_PROXYUSERS.getKey() + proxyServer + ".users", client); cc.set(Property.INSTANCE_RPC_SASL_PROXYUSERS.getKey() + proxyServer + ".hosts", host); - proxy = new TCredentialsUpdatingInvocationHandler(new Object(), conf); + proxy = new TCredentialsUpdatingInvocationHandler<>(new Object(), conf); TCredentials tcreds = new TCredentials("client", KerberosToken.class.getName(), ByteBuffer.allocate(0), UUID.randomUUID().toString()); UGIAssumingProcessor.rpcPrincipal.set(proxyServer); TServerUtils.clientAddress.set(host); @@ -237,7 +237,7 @@ public class TCredentialsUpdatingInvocationHandlerTest { final String proxyServer = "proxy", client = "client", host = "host.domain.com"; cc.set(Property.INSTANCE_RPC_SASL_ALLOWED_USER_IMPERSONATION, proxyServer + ":" + client); cc.set(Property.INSTANCE_RPC_SASL_ALLOWED_HOST_IMPERSONATION, host); - proxy = new TCredentialsUpdatingInvocationHandler(new Object(), conf); + proxy = new TCredentialsUpdatingInvocationHandler<>(new Object(), conf); TCredentials tcreds = new TCredentials("client", KerberosToken.class.getName(), ByteBuffer.allocate(0), UUID.randomUUID().toString()); UGIAssumingProcessor.rpcPrincipal.set(proxyServer); TServerUtils.clientAddress.set(host); @@ -250,7 +250,7 @@ public class TCredentialsUpdatingInvocationHandlerTest { final String proxyServer = "proxy", client = "client", host = "host.domain.com"; cc.set(Property.INSTANCE_RPC_SASL_PROXYUSERS.getKey() + proxyServer + ".users", client); cc.set(Property.INSTANCE_RPC_SASL_PROXYUSERS.getKey() + proxyServer + ".hosts", host); - proxy = new TCredentialsUpdatingInvocationHandler(new Object(), conf); + proxy = new TCredentialsUpdatingInvocationHandler<>(new Object(), conf); TCredentials tcreds = new TCredentials("client", KerberosToken.class.getName(), ByteBuffer.allocate(0), UUID.randomUUID().toString()); UGIAssumingProcessor.rpcPrincipal.set(proxyServer); // The RPC came from a different host than is allowed @@ -263,7 +263,7 @@ public class TCredentialsUpdatingInvocationHandlerTest { final String proxyServer = "proxy", client = "client", host = "host.domain.com"; cc.set(Property.INSTANCE_RPC_SASL_ALLOWED_USER_IMPERSONATION, proxyServer + ":" + client); cc.set(Property.INSTANCE_RPC_SASL_ALLOWED_HOST_IMPERSONATION, host); - proxy = new TCredentialsUpdatingInvocationHandler(new Object(), conf); + proxy = new TCredentialsUpdatingInvocationHandler<>(new Object(), conf); TCredentials tcreds = new TCredentials("client", KerberosToken.class.getName(), ByteBuffer.allocate(0), UUID.randomUUID().toString()); UGIAssumingProcessor.rpcPrincipal.set(proxyServer); // The RPC came from a different host than is allowed http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/server/base/src/test/java/org/apache/accumulo/server/security/handler/ZKAuthenticatorTest.java ---------------------------------------------------------------------- diff --git a/server/base/src/test/java/org/apache/accumulo/server/security/handler/ZKAuthenticatorTest.java b/server/base/src/test/java/org/apache/accumulo/server/security/handler/ZKAuthenticatorTest.java index 827e772..1b0970d 100644 --- a/server/base/src/test/java/org/apache/accumulo/server/security/handler/ZKAuthenticatorTest.java +++ b/server/base/src/test/java/org/apache/accumulo/server/security/handler/ZKAuthenticatorTest.java @@ -55,7 +55,7 @@ public class ZKAuthenticatorTest extends TestCase { } public void testSystemConversion() { - Set perms = new TreeSet(); + Set perms = new TreeSet<>(); for (SystemPermission s : SystemPermission.values()) perms.add(s); @@ -66,7 +66,7 @@ public class ZKAuthenticatorTest extends TestCase { } public void testTableConversion() { - Set perms = new TreeSet(); + Set perms = new TreeSet<>(); for (TablePermission s : TablePermission.values()) perms.add(s); http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/server/base/src/test/java/org/apache/accumulo/server/tablets/LogicalTimeTest.java ---------------------------------------------------------------------- diff --git a/server/base/src/test/java/org/apache/accumulo/server/tablets/LogicalTimeTest.java b/server/base/src/test/java/org/apache/accumulo/server/tablets/LogicalTimeTest.java index b491f0e..1076249 100644 --- a/server/base/src/test/java/org/apache/accumulo/server/tablets/LogicalTimeTest.java +++ b/server/base/src/test/java/org/apache/accumulo/server/tablets/LogicalTimeTest.java @@ -57,7 +57,7 @@ public class LogicalTimeTest { @Test public void testSetUpdateTimes() { - List ms = new java.util.ArrayList(); + List ms = new java.util.ArrayList<>(); ServerMutation m = createMock(ServerMutation.class); ServerMutation m2 = createMock(ServerMutation.class); m.setSystemTimestamp(1235L); @@ -74,7 +74,7 @@ public class LogicalTimeTest { @Test public void testSetUpdateTimes_NoMutations() { - List ms = new java.util.ArrayList(); + List ms = new java.util.ArrayList<>(); assertEquals(TIME, ltime.setUpdateTimes(ms)); } http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/server/base/src/test/java/org/apache/accumulo/server/tablets/MillisTimeTest.java ---------------------------------------------------------------------- diff --git a/server/base/src/test/java/org/apache/accumulo/server/tablets/MillisTimeTest.java b/server/base/src/test/java/org/apache/accumulo/server/tablets/MillisTimeTest.java index 3ee220e..49f5913 100644 --- a/server/base/src/test/java/org/apache/accumulo/server/tablets/MillisTimeTest.java +++ b/server/base/src/test/java/org/apache/accumulo/server/tablets/MillisTimeTest.java @@ -59,7 +59,7 @@ public class MillisTimeTest { @Test public void testSetUpdateTimes() { - List ms = new java.util.ArrayList(); + List ms = new java.util.ArrayList<>(); ServerMutation m = createMock(ServerMutation.class); m.setSystemTimestamp(anyLong()); replay(m); @@ -71,7 +71,7 @@ public class MillisTimeTest { @Test public void testSetUpdateTimes_NoMutations() { - List ms = new java.util.ArrayList(); + List ms = new java.util.ArrayList<>(); assertEquals(TIME, mtime.setUpdateTimes(ms)); } http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/server/base/src/test/java/org/apache/accumulo/server/util/CloneTest.java ---------------------------------------------------------------------- diff --git a/server/base/src/test/java/org/apache/accumulo/server/util/CloneTest.java b/server/base/src/test/java/org/apache/accumulo/server/util/CloneTest.java index 9d33935..58e6410 100644 --- a/server/base/src/test/java/org/apache/accumulo/server/util/CloneTest.java +++ b/server/base/src/test/java/org/apache/accumulo/server/util/CloneTest.java @@ -111,7 +111,7 @@ public class CloneTest { Scanner scanner = conn.createScanner(MetadataTable.NAME, Authorizations.EMPTY); scanner.setRange(new KeyExtent(new Text("1"), null, null).toMetadataRange()); - HashSet files = new HashSet(); + HashSet files = new HashSet<>(); for (Entry entry : scanner) { if (entry.getKey().getColumnFamily().equals(DataFileColumnFamily.NAME)) @@ -151,7 +151,7 @@ public class CloneTest { Scanner scanner = conn.createScanner(MetadataTable.NAME, Authorizations.EMPTY); scanner.setRange(new KeyExtent(new Text("1"), null, null).toMetadataRange()); - HashSet files = new HashSet(); + HashSet files = new HashSet<>(); int count = 0; for (Entry entry : scanner) { @@ -200,7 +200,7 @@ public class CloneTest { Scanner scanner = conn.createScanner(MetadataTable.NAME, Authorizations.EMPTY); scanner.setRange(new KeyExtent(new Text("1"), null, null).toMetadataRange()); - HashSet files = new HashSet(); + HashSet files = new HashSet<>(); int count = 0; @@ -269,7 +269,7 @@ public class CloneTest { Scanner scanner = conn.createScanner(MetadataTable.NAME, Authorizations.EMPTY); scanner.setRange(new KeyExtent(new Text("1"), null, null).toMetadataRange()); - HashSet files = new HashSet(); + HashSet files = new HashSet<>(); int count = 0; for (Entry entry : scanner) { @@ -334,7 +334,7 @@ public class CloneTest { Scanner scanner = conn.createScanner(MetadataTable.NAME, Authorizations.EMPTY); scanner.setRange(new KeyExtent(new Text("1"), null, null).toMetadataRange()); - HashSet files = new HashSet(); + HashSet files = new HashSet<>(); int count = 0; for (Entry entry : scanner) { http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/server/base/src/test/java/org/apache/accumulo/server/util/DefaultMapTest.java ---------------------------------------------------------------------- diff --git a/server/base/src/test/java/org/apache/accumulo/server/util/DefaultMapTest.java b/server/base/src/test/java/org/apache/accumulo/server/util/DefaultMapTest.java index 9ca2596..88aaa71 100644 --- a/server/base/src/test/java/org/apache/accumulo/server/util/DefaultMapTest.java +++ b/server/base/src/test/java/org/apache/accumulo/server/util/DefaultMapTest.java @@ -38,7 +38,7 @@ public class DefaultMapTest { assertNotNull(canConstruct); assertEquals(new AtomicInteger(0).get(), canConstruct.get()); - DefaultMap map = new DefaultMap(""); + DefaultMap map = new DefaultMap<>(""); assertEquals(map.get("foo"), ""); map.put("foo", "bar"); assertEquals(map.get("foo"), "bar"); http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/server/base/src/test/java/org/apache/accumulo/server/util/FileSystemMonitorTest.java ---------------------------------------------------------------------- diff --git a/server/base/src/test/java/org/apache/accumulo/server/util/FileSystemMonitorTest.java b/server/base/src/test/java/org/apache/accumulo/server/util/FileSystemMonitorTest.java index 7387035..95167d6 100644 --- a/server/base/src/test/java/org/apache/accumulo/server/util/FileSystemMonitorTest.java +++ b/server/base/src/test/java/org/apache/accumulo/server/util/FileSystemMonitorTest.java @@ -74,7 +74,7 @@ public class FileSystemMonitorTest { List mounts = FileSystemMonitor.getMountsFromFile(reader); log.info("Filtered mount points: " + mounts); assertEquals(2, mounts.size()); - Set expectedCheckedMountPoints = new HashSet(); + Set expectedCheckedMountPoints = new HashSet<>(); expectedCheckedMountPoints.add("/"); expectedCheckedMountPoints.add("/grid/0"); for (Mount mount : mounts) { http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/server/base/src/test/java/org/apache/accumulo/server/util/FileUtilTest.java ---------------------------------------------------------------------- diff --git a/server/base/src/test/java/org/apache/accumulo/server/util/FileUtilTest.java b/server/base/src/test/java/org/apache/accumulo/server/util/FileUtilTest.java index 7bded1a..a826acf 100644 --- a/server/base/src/test/java/org/apache/accumulo/server/util/FileUtilTest.java +++ b/server/base/src/test/java/org/apache/accumulo/server/util/FileUtilTest.java @@ -66,7 +66,7 @@ public class FileUtilTest { @Test public void testToPathStrings() { - Collection c = new java.util.ArrayList(); + Collection c = new java.util.ArrayList<>(); FileRef r1 = createMock(FileRef.class); expect(r1.path()).andReturn(new Path("/foo")); replay(r1); @@ -91,7 +91,7 @@ public class FileUtilTest { assertTrue(tmp1.mkdirs() || tmp1.isDirectory()); Path tmpPath1 = new Path(tmp1.toURI()); - HashMap testProps = new HashMap(); + HashMap testProps = new HashMap<>(); testProps.put(Property.INSTANCE_DFS_DIR, accumuloDir.getAbsolutePath()); AccumuloConfiguration testConf = new FileUtilTestConfiguration(testProps); @@ -118,7 +118,7 @@ public class FileUtilTest { assertTrue(tmp2.mkdirs() || tmp2.isDirectory()); Path tmpPath1 = new Path(tmp1.toURI()), tmpPath2 = new Path(tmp2.toURI()); - HashMap testProps = new HashMap(); + HashMap testProps = new HashMap<>(); testProps.put(Property.INSTANCE_VOLUMES, v1.toURI().toString() + "," + v2.toURI().toString()); AccumuloConfiguration testConf = new FileUtilTestConfiguration(testProps); @@ -150,7 +150,7 @@ public class FileUtilTest { assertTrue(tmp2.mkdirs() || tmp2.isDirectory()); Path tmpPath1 = new Path(tmp1.toURI()), tmpPath2 = new Path(tmp2.toURI()); - HashMap testProps = new HashMap(); + HashMap testProps = new HashMap<>(); testProps.put(Property.INSTANCE_VOLUMES, v1.toURI().toString() + "," + v2.toURI().toString()); AccumuloConfiguration testConf = new FileUtilTestConfiguration(testProps); @@ -178,7 +178,7 @@ public class FileUtilTest { assertTrue(tmp2.mkdirs() || tmp2.isDirectory()); Path tmpPath1 = new Path(tmp1.toURI()), tmpPath2 = new Path(tmp2.toURI()); - HashMap testProps = new HashMap(); + HashMap testProps = new HashMap<>(); testProps.put(Property.INSTANCE_VOLUMES, v1.toURI().toString() + "," + v2.toURI().toString()); AccumuloConfiguration testConf = new FileUtilTestConfiguration(testProps); @@ -207,7 +207,7 @@ public class FileUtilTest { assertTrue(tmp2.mkdirs() || tmp2.isDirectory()); Path tmpPath1 = new Path(tmp1.toURI()), tmpPath2 = new Path(tmp2.toURI()); - HashMap testProps = new HashMap(); + HashMap testProps = new HashMap<>(); testProps.put(Property.INSTANCE_VOLUMES, v1.toURI().toString() + "," + v2.toURI().toString()); AccumuloConfiguration testConf = new FileUtilTestConfiguration(testProps); http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/server/base/src/test/java/org/apache/accumulo/server/util/ReplicationTableUtilTest.java ---------------------------------------------------------------------- diff --git a/server/base/src/test/java/org/apache/accumulo/server/util/ReplicationTableUtilTest.java b/server/base/src/test/java/org/apache/accumulo/server/util/ReplicationTableUtilTest.java index 3983bde..2049166 100644 --- a/server/base/src/test/java/org/apache/accumulo/server/util/ReplicationTableUtilTest.java +++ b/server/base/src/test/java/org/apache/accumulo/server/util/ReplicationTableUtilTest.java @@ -67,7 +67,7 @@ public class ReplicationTableUtilTest { public void properPathInRow() throws Exception { Writer writer = EasyMock.createNiceMock(Writer.class); writer.update(EasyMock.anyObject(Mutation.class)); - final List mutations = new ArrayList(); + final List mutations = new ArrayList<>(); // Mock a Writer to just add the mutation to a list EasyMock.expectLastCall().andAnswer(new IAnswer() { http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java ---------------------------------------------------------------------- diff --git a/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java b/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java index 339b233..f89892e 100644 --- a/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java +++ b/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java @@ -151,8 +151,8 @@ public class GarbageCollectWriteAheadLogs { status.currentLog.started = System.currentTimeMillis(); - Map fileToServerMap = new HashMap(); - Map nameToFileMap = new HashMap(); + Map fileToServerMap = new HashMap<>(); + Map nameToFileMap = new HashMap<>(); int count = scanServers(fileToServerMap, nameToFileMap); long fileScanStop = System.currentTimeMillis(); log.info(String.format("Fetched %d files from %d servers in %.2f seconds", fileToServerMap.size(), count, @@ -424,7 +424,7 @@ public class GarbageCollectWriteAheadLogs { * @return string forms of paths */ static List paths2strings(List paths) { - List result = new ArrayList(paths.size()); + List result = new ArrayList<>(paths.size()); for (Path path : paths) result.add(path.toString()); return result; @@ -441,13 +441,13 @@ public class GarbageCollectWriteAheadLogs { * @return map of servers to lists of file paths */ static Map> mapServersToFiles(Map fileToServerMap, Map nameToFileMap) { - Map> result = new HashMap>(); + Map> result = new HashMap<>(); for (Entry fileServer : fileToServerMap.entrySet()) { if (!nameToFileMap.containsKey(fileServer.getKey().getName())) continue; ArrayList files = result.get(fileServer.getValue()); if (files == null) { - files = new ArrayList(); + files = new ArrayList<>(); result.put(fileServer.getValue(), files); } files.add(fileServer.getKey()); @@ -597,7 +597,7 @@ public class GarbageCollectWriteAheadLogs { * @return number of servers located (including those with no logs present) */ int scanServers(String[] walDirs, Map fileToServerMap, Map nameToFileMap) throws Exception { - Set servers = new HashSet(); + Set servers = new HashSet<>(); for (String walDir : walDirs) { Path walRoot = new Path(walDir); FileStatus[] listing = null; @@ -647,7 +647,7 @@ public class GarbageCollectWriteAheadLogs { * @return map of log file names to paths */ Map getSortedWALogs(String[] recoveryDirs) throws IOException { - Map result = new HashMap(); + Map result = new HashMap<>(); for (String dir : recoveryDirs) { Path recoveryDir = new Path(dir); http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionAlgorithm.java ---------------------------------------------------------------------- diff --git a/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionAlgorithm.java b/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionAlgorithm.java index 9f94622..1e15324 100644 --- a/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionAlgorithm.java +++ b/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionAlgorithm.java @@ -81,7 +81,7 @@ public class GarbageCollectionAlgorithm { } if (containsEmpty) { - ArrayList tmp = new ArrayList(); + ArrayList tmp = new ArrayList<>(); for (String token : tokens) { if (!token.equals("")) { tmp.add(token); @@ -112,7 +112,7 @@ public class GarbageCollectionAlgorithm { private SortedMap makeRelative(Collection candidates) { - SortedMap ret = new TreeMap(); + SortedMap ret = new TreeMap<>(); for (String candidate : candidates) { String relPath; @@ -243,7 +243,7 @@ public class GarbageCollectionAlgorithm { } private void cleanUpDeletedTableDirs(GarbageCollectionEnvironment gce, SortedMap candidateMap) throws IOException { - HashSet tableIdsWithDeletes = new HashSet(); + HashSet tableIdsWithDeletes = new HashSet<>(); // find the table ids that had dirs deleted for (String delete : candidateMap.keySet()) { @@ -305,7 +305,7 @@ public class GarbageCollectionAlgorithm { boolean outOfMemory = true; while (outOfMemory) { - List candidates = new ArrayList(); + List candidates = new ArrayList<>(); outOfMemory = getCandidates(gce, lastCandidate, candidates); http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java ---------------------------------------------------------------------- diff --git a/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java b/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java index 879d6b9..7f4af83 100644 --- a/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java +++ b/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java @@ -721,9 +721,9 @@ public class SimpleGarbageCollector extends AccumuloServerContext implements Ifa final Processor processor; if (ThriftServerType.SASL == getThriftServerType()) { Iface tcProxy = TCredentialsUpdatingWrapper.service(rpcProxy, getClass(), getConfiguration()); - processor = new Processor(tcProxy); + processor = new Processor<>(tcProxy); } else { - processor = new Processor(rpcProxy); + processor = new Processor<>(rpcProxy); } int port = getConfiguration().getPort(Property.GC_PORT); long maxMessageSize = getConfiguration().getMemoryInBytes(Property.GENERAL_MAX_MESSAGE_SIZE); http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/server/gc/src/main/java/org/apache/accumulo/gc/replication/CloseWriteAheadLogReferences.java ---------------------------------------------------------------------- diff --git a/server/gc/src/main/java/org/apache/accumulo/gc/replication/CloseWriteAheadLogReferences.java b/server/gc/src/main/java/org/apache/accumulo/gc/replication/CloseWriteAheadLogReferences.java index 78ac4ac..a038d43 100644 --- a/server/gc/src/main/java/org/apache/accumulo/gc/replication/CloseWriteAheadLogReferences.java +++ b/server/gc/src/main/java/org/apache/accumulo/gc/replication/CloseWriteAheadLogReferences.java @@ -331,7 +331,7 @@ public class CloseWriteAheadLogReferences implements Runnable { // Compute the total set of WALs used by tservers Set walogs = null; if (null != tservers) { - walogs = new HashSet(); + walogs = new HashSet<>(); // TODO If we have a lot of tservers, this might start to take a fair amount of time // Consider adding a threadpool to parallelize the requests. // Alternatively, we might have to move to a solution that doesn't involve tserver RPC http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/server/gc/src/test/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogsTest.java ---------------------------------------------------------------------- diff --git a/server/gc/src/test/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogsTest.java b/server/gc/src/test/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogsTest.java index 940b922..61cad3f 100644 --- a/server/gc/src/test/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogsTest.java +++ b/server/gc/src/test/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogsTest.java @@ -166,7 +166,7 @@ public class GarbageCollectWriteAheadLogsTest { @Test public void testPathsToStrings() { - ArrayList paths = new ArrayList(); + ArrayList paths = new ArrayList<>(); paths.add(new Path(DIR_1_PATH, "file1")); paths.add(DIR_2_PATH); paths.add(new Path(DIR_3_PATH, "file3")); @@ -188,7 +188,7 @@ public class GarbageCollectWriteAheadLogsTest { * /dir3/server3/uuid3 -> server3 (new-style) */ // @formatter:on - Map fileToServerMap = new java.util.HashMap(); + Map fileToServerMap = new java.util.HashMap<>(); Path path1 = new Path(new Path(DIR_1_PATH, "server1"), UUID1); fileToServerMap.put(path1, "server1"); // new-style Path path2 = new Path(DIR_1_PATH, UUID2); @@ -202,7 +202,7 @@ public class GarbageCollectWriteAheadLogsTest { * uuid3 -> /dir3/server3/uuid3 */ // @formatter:on - Map nameToFileMap = new java.util.HashMap(); + Map nameToFileMap = new java.util.HashMap<>(); nameToFileMap.put(UUID1, path1); nameToFileMap.put(UUID3, path3); @@ -268,8 +268,8 @@ public class GarbageCollectWriteAheadLogsTest { mockListStatus(serverDir3Path, file3); replay(volMgr); - Map fileToServerMap = new java.util.HashMap(); - Map nameToFileMap = new java.util.HashMap(); + Map fileToServerMap = new java.util.HashMap<>(); + Map nameToFileMap = new java.util.HashMap<>(); int count = gcwal.scanServers(walDirs, fileToServerMap, nameToFileMap); assertEquals(3, count); // @formatter:off @@ -314,8 +314,8 @@ public class GarbageCollectWriteAheadLogsTest { mockListStatus(DIR_3_PATH, serverFile3); replay(volMgr); - Map fileToServerMap = new java.util.HashMap(); - Map nameToFileMap = new java.util.HashMap(); + Map fileToServerMap = new java.util.HashMap<>(); + Map nameToFileMap = new java.util.HashMap<>(); int count = gcwal.scanServers(walDirs, fileToServerMap, nameToFileMap); /* * Expect only a single server, the non-server entry for upgrade WALs @@ -628,7 +628,7 @@ public class GarbageCollectWriteAheadLogsTest { private LinkedHashMap> mapWrapper; public MethodCalls() { - mapWrapper = new LinkedHashMap>(); + mapWrapper = new LinkedHashMap<>(); } public void put(String methodName, Object... args) { @@ -709,12 +709,12 @@ public class GarbageCollectWriteAheadLogsTest { } private Map getEmptyMap() { - return new HashMap(); + return new HashMap<>(); } private Map> getServerToFileMap1(String key, Path singlePath) { - Map> serverToFileMap = new HashMap>(); - serverToFileMap.put(key, new ArrayList(Arrays.asList(singlePath))); + Map> serverToFileMap = new HashMap<>(); + serverToFileMap.put(key, new ArrayList<>(Arrays.asList(singlePath))); return serverToFileMap; } @@ -779,8 +779,8 @@ public class GarbageCollectWriteAheadLogsTest { public void testRemoveFilesRemovesSortedWALs() throws IOException { GCStatus status = new GCStatus(); GarbageCollectWriteAheadLogs realGCWAL = getGCWALForRemoveFileTest(status, true); - Map> serverToFileMap = new HashMap>(); - Map sortedWALogs = new HashMap(); + Map> serverToFileMap = new HashMap<>(); + Map sortedWALogs = new HashMap<>(); Path p1 = new Path("hdfs://localhost:9000/accumulo/wal/tserver1+9997/" + UUID.randomUUID().toString()); sortedWALogs.put("junk", p1); // TODO: see if this key is actually used here, maybe can be removed @@ -811,7 +811,7 @@ public class GarbageCollectWriteAheadLogsTest { @Override Map getSortedWALogs() { - return new HashMap(); + return new HashMap<>(); } @Override http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/server/gc/src/test/java/org/apache/accumulo/gc/GarbageCollectionTest.java ---------------------------------------------------------------------- diff --git a/server/gc/src/test/java/org/apache/accumulo/gc/GarbageCollectionTest.java b/server/gc/src/test/java/org/apache/accumulo/gc/GarbageCollectionTest.java index 1548fa1..3ee5fc7 100644 --- a/server/gc/src/test/java/org/apache/accumulo/gc/GarbageCollectionTest.java +++ b/server/gc/src/test/java/org/apache/accumulo/gc/GarbageCollectionTest.java @@ -46,14 +46,14 @@ import org.junit.Test; */ public class GarbageCollectionTest { static class TestGCE implements GarbageCollectionEnvironment { - TreeSet candidates = new TreeSet(); - ArrayList blips = new ArrayList(); - Map references = new TreeMap(); - HashSet tableIds = new HashSet(); + TreeSet candidates = new TreeSet<>(); + ArrayList blips = new ArrayList<>(); + Map references = new TreeMap<>(); + HashSet tableIds = new HashSet<>(); - ArrayList deletes = new ArrayList(); - ArrayList tablesDirsToDelete = new ArrayList(); - TreeMap filesToReplicate = new TreeMap(); + ArrayList deletes = new ArrayList<>(); + ArrayList tablesDirsToDelete = new ArrayList<>(); + TreeMap filesToReplicate = new TreeMap<>(); @Override public boolean getCandidates(String continuePoint, List ret) { @@ -208,7 +208,7 @@ public class GarbageCollectionTest { gca.collect(gce); assertRemoved(gce); - List refsToRemove = new ArrayList(); + List refsToRemove = new ArrayList<>(); refsToRemove.add(new String[] {"4", "/t0/F000.rf"}); refsToRemove.add(new String[] {"5", "../4/t0/F000.rf"}); refsToRemove.add(new String[] {"6", "hdfs://foo.com:6000/accumulo/tables/4/t0/F000.rf"}); @@ -545,7 +545,7 @@ public class GarbageCollectionTest { gca.collect(gce); - HashSet tids = new HashSet(); + HashSet tids = new HashSet<>(); tids.add("5"); tids.add("6"); http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/server/gc/src/test/java/org/apache/accumulo/gc/replication/CloseWriteAheadLogReferencesTest.java ---------------------------------------------------------------------- diff --git a/server/gc/src/test/java/org/apache/accumulo/gc/replication/CloseWriteAheadLogReferencesTest.java b/server/gc/src/test/java/org/apache/accumulo/gc/replication/CloseWriteAheadLogReferencesTest.java index 3115de1..8c9570a 100644 --- a/server/gc/src/test/java/org/apache/accumulo/gc/replication/CloseWriteAheadLogReferencesTest.java +++ b/server/gc/src/test/java/org/apache/accumulo/gc/replication/CloseWriteAheadLogReferencesTest.java @@ -429,7 +429,7 @@ public class CloseWriteAheadLogReferencesTest { EasyMock.verify(closeWals); - Set expectedWals = new HashSet(); + Set expectedWals = new HashSet<>(); for (int i = 0; i < numWals; i++) { expectedWals.add("/wal" + i); } http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/server/master/src/main/java/org/apache/accumulo/master/FateServiceHandler.java ---------------------------------------------------------------------- diff --git a/server/master/src/main/java/org/apache/accumulo/master/FateServiceHandler.java b/server/master/src/main/java/org/apache/accumulo/master/FateServiceHandler.java index a1ce1d4..09a90b5 100644 --- a/server/master/src/main/java/org/apache/accumulo/master/FateServiceHandler.java +++ b/server/master/src/main/java/org/apache/accumulo/master/FateServiceHandler.java @@ -105,7 +105,7 @@ class FateServiceHandler implements FateService.Iface { if (!master.security.canCreateNamespace(c, namespace)) throw new ThriftSecurityException(c.getPrincipal(), SecurityErrorCode.PERMISSION_DENIED); - master.fate.seedTransaction(opid, new TraceRepo(new CreateNamespace(c.getPrincipal(), namespace, options)), autoCleanup); + master.fate.seedTransaction(opid, new TraceRepo<>(new CreateNamespace(c.getPrincipal(), namespace, options)), autoCleanup); break; } case NAMESPACE_RENAME: { @@ -117,7 +117,7 @@ class FateServiceHandler implements FateService.Iface { if (!master.security.canRenameNamespace(c, namespaceId, oldName, newName)) throw new ThriftSecurityException(c.getPrincipal(), SecurityErrorCode.PERMISSION_DENIED); - master.fate.seedTransaction(opid, new TraceRepo(new RenameNamespace(namespaceId, oldName, newName)), autoCleanup); + master.fate.seedTransaction(opid, new TraceRepo<>(new RenameNamespace(namespaceId, oldName, newName)), autoCleanup); break; } case NAMESPACE_DELETE: { @@ -128,7 +128,7 @@ class FateServiceHandler implements FateService.Iface { if (!master.security.canDeleteNamespace(c, namespaceId)) throw new ThriftSecurityException(c.getPrincipal(), SecurityErrorCode.PERMISSION_DENIED); - master.fate.seedTransaction(opid, new TraceRepo(new DeleteNamespace(namespaceId)), autoCleanup); + master.fate.seedTransaction(opid, new TraceRepo<>(new DeleteNamespace(namespaceId)), autoCleanup); break; } case TABLE_CREATE: { @@ -147,7 +147,7 @@ class FateServiceHandler implements FateService.Iface { if (!master.security.canCreateTable(c, tableName, namespaceId)) throw new ThriftSecurityException(c.getPrincipal(), SecurityErrorCode.PERMISSION_DENIED); - master.fate.seedTransaction(opid, new TraceRepo(new CreateTable(c.getPrincipal(), tableName, timeType, options, namespaceId)), autoCleanup); + master.fate.seedTransaction(opid, new TraceRepo<>(new CreateTable(c.getPrincipal(), tableName, timeType, options, namespaceId)), autoCleanup); break; } @@ -185,7 +185,7 @@ class FateServiceHandler implements FateService.Iface { throw new ThriftSecurityException(c.getPrincipal(), SecurityErrorCode.PERMISSION_DENIED); try { - master.fate.seedTransaction(opid, new TraceRepo(new RenameTable(tableId, oldTableName, newTableName)), autoCleanup); + master.fate.seedTransaction(opid, new TraceRepo<>(new RenameTable(tableId, oldTableName, newTableName)), autoCleanup); } catch (NamespaceNotFoundException e) { throw new ThriftTableOperationException(null, oldTableName, tableOp, TableOperationExceptionType.NAMESPACE_NOTFOUND, ""); } @@ -215,8 +215,8 @@ class FateServiceHandler implements FateService.Iface { if (!canCloneTable) throw new ThriftSecurityException(c.getPrincipal(), SecurityErrorCode.PERMISSION_DENIED); - Map propertiesToSet = new HashMap(); - Set propertiesToExclude = new HashSet(); + Map propertiesToSet = new HashMap<>(); + Set propertiesToExclude = new HashSet<>(); for (Entry entry : options.entrySet()) { if (entry.getKey().startsWith(TableOperationsImpl.CLONE_EXCLUDE_PREFIX)) { @@ -232,7 +232,7 @@ class FateServiceHandler implements FateService.Iface { propertiesToSet.put(entry.getKey(), entry.getValue()); } - master.fate.seedTransaction(opid, new TraceRepo(new CloneTable(c.getPrincipal(), srcTableId, tableName, propertiesToSet, propertiesToExclude)), + master.fate.seedTransaction(opid, new TraceRepo<>(new CloneTable(c.getPrincipal(), srcTableId, tableName, propertiesToSet, propertiesToExclude)), autoCleanup); break; @@ -254,7 +254,7 @@ class FateServiceHandler implements FateService.Iface { if (!canDeleteTable) throw new ThriftSecurityException(c.getPrincipal(), SecurityErrorCode.PERMISSION_DENIED); - master.fate.seedTransaction(opid, new TraceRepo(new DeleteTable(tableId)), autoCleanup); + master.fate.seedTransaction(opid, new TraceRepo<>(new DeleteTable(tableId)), autoCleanup); break; } case TABLE_ONLINE: { @@ -273,7 +273,7 @@ class FateServiceHandler implements FateService.Iface { if (!canOnlineOfflineTable) throw new ThriftSecurityException(c.getPrincipal(), SecurityErrorCode.PERMISSION_DENIED); - master.fate.seedTransaction(opid, new TraceRepo(new ChangeTableState(tableId, tableOp)), autoCleanup); + master.fate.seedTransaction(opid, new TraceRepo<>(new ChangeTableState(tableId, tableOp)), autoCleanup); break; } case TABLE_OFFLINE: { @@ -292,7 +292,7 @@ class FateServiceHandler implements FateService.Iface { if (!canOnlineOfflineTable) throw new ThriftSecurityException(c.getPrincipal(), SecurityErrorCode.PERMISSION_DENIED); - master.fate.seedTransaction(opid, new TraceRepo(new ChangeTableState(tableId, tableOp)), autoCleanup); + master.fate.seedTransaction(opid, new TraceRepo<>(new ChangeTableState(tableId, tableOp)), autoCleanup); break; } case TABLE_MERGE: { @@ -316,7 +316,7 @@ class FateServiceHandler implements FateService.Iface { throw new ThriftSecurityException(c.getPrincipal(), SecurityErrorCode.PERMISSION_DENIED); Master.log.debug("Creating merge op: " + tableId + " " + startRow + " " + endRow); - master.fate.seedTransaction(opid, new TraceRepo(new TableRangeOp(MergeInfo.Operation.MERGE, tableId, startRow, endRow)), autoCleanup); + master.fate.seedTransaction(opid, new TraceRepo<>(new TableRangeOp(MergeInfo.Operation.MERGE, tableId, startRow, endRow)), autoCleanup); break; } case TABLE_DELETE_RANGE: { @@ -339,7 +339,7 @@ class FateServiceHandler implements FateService.Iface { if (!canDeleteRange) throw new ThriftSecurityException(c.getPrincipal(), SecurityErrorCode.PERMISSION_DENIED); - master.fate.seedTransaction(opid, new TraceRepo(new TableRangeOp(MergeInfo.Operation.DELETE, tableId, startRow, endRow)), autoCleanup); + master.fate.seedTransaction(opid, new TraceRepo<>(new TableRangeOp(MergeInfo.Operation.DELETE, tableId, startRow, endRow)), autoCleanup); break; } case TABLE_BULK_IMPORT: { @@ -363,7 +363,7 @@ class FateServiceHandler implements FateService.Iface { if (!canBulkImport) throw new ThriftSecurityException(c.getPrincipal(), SecurityErrorCode.PERMISSION_DENIED); - master.fate.seedTransaction(opid, new TraceRepo(new BulkImport(tableId, dir, failDir, setTime)), autoCleanup); + master.fate.seedTransaction(opid, new TraceRepo<>(new BulkImport(tableId, dir, failDir, setTime)), autoCleanup); break; } case TABLE_COMPACT: { @@ -386,7 +386,7 @@ class FateServiceHandler implements FateService.Iface { if (!canCompact) throw new ThriftSecurityException(c.getPrincipal(), SecurityErrorCode.PERMISSION_DENIED); - master.fate.seedTransaction(opid, new TraceRepo(new CompactRange(tableId, startRow, endRow, iterators, compactionStrategy)), autoCleanup); + master.fate.seedTransaction(opid, new TraceRepo<>(new CompactRange(tableId, startRow, endRow, iterators, compactionStrategy)), autoCleanup); break; } case TABLE_CANCEL_COMPACT: { @@ -405,7 +405,7 @@ class FateServiceHandler implements FateService.Iface { if (!canCancelCompact) throw new ThriftSecurityException(c.getPrincipal(), SecurityErrorCode.PERMISSION_DENIED); - master.fate.seedTransaction(opid, new TraceRepo(new CancelCompactions(tableId)), autoCleanup); + master.fate.seedTransaction(opid, new TraceRepo<>(new CancelCompactions(tableId)), autoCleanup); break; } case TABLE_IMPORT: { @@ -430,7 +430,7 @@ class FateServiceHandler implements FateService.Iface { if (!canImport) throw new ThriftSecurityException(c.getPrincipal(), SecurityErrorCode.PERMISSION_DENIED); - master.fate.seedTransaction(opid, new TraceRepo(new ImportTable(c.getPrincipal(), tableName, exportDir, namespaceId)), autoCleanup); + master.fate.seedTransaction(opid, new TraceRepo<>(new ImportTable(c.getPrincipal(), tableName, exportDir, namespaceId)), autoCleanup); break; } case TABLE_EXPORT: { @@ -452,7 +452,7 @@ class FateServiceHandler implements FateService.Iface { if (!canExport) throw new ThriftSecurityException(c.getPrincipal(), SecurityErrorCode.PERMISSION_DENIED); - master.fate.seedTransaction(opid, new TraceRepo(new ExportTable(tableName, tableId, exportDir)), autoCleanup); + master.fate.seedTransaction(opid, new TraceRepo<>(new ExportTable(tableName, tableId, exportDir)), autoCleanup); break; } default: