diff options
Diffstat (limited to 'zookeeper-server/src/test')
93 files changed, 264 insertions, 264 deletions
diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/GetEphemeralsTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/GetEphemeralsTest.java index 7dcd9e815..6591cf3ce 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/GetEphemeralsTest.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/GetEphemeralsTest.java @@ -83,7 +83,7 @@ public class GetEphemeralsTest extends ClientBase { public void testGetEphemerals() throws IOException, KeeperException, InterruptedException { final CountDownLatch doneProcessing = new CountDownLatch(1); - final List<String> unexpectedBehavior = new ArrayList<String>(); + final List<String> unexpectedBehavior = new ArrayList<>(); zk.getEphemerals((rc, ctx, paths) -> { if (paths == null) { unexpectedBehavior.add(String.format("Expected ephemeral count for" @@ -112,7 +112,7 @@ public class GetEphemeralsTest extends ClientBase { final CountDownLatch doneProcessing = new CountDownLatch(1); final String checkPath = BASE + "0"; - final List<String> unexpectedBehavior = new ArrayList<String>(); + final List<String> unexpectedBehavior = new ArrayList<>(); zk.getEphemerals(checkPath, (rc, ctx, paths) -> { if (paths == null) { unexpectedBehavior.add(String.format("Expected ephemeral count for %s to be %d but was null", checkPath, expected.length)); @@ -141,7 +141,7 @@ public class GetEphemeralsTest extends ClientBase { final CountDownLatch doneProcessing = new CountDownLatch(1); final String checkPath = "/unknownPath"; final int expectedSize = 0; - final List<String> unexpectedBehavior = new ArrayList<String>(); + final List<String> unexpectedBehavior = new ArrayList<>(); zk.getEphemerals(checkPath, (rc, ctx, paths) -> { if (paths == null) { unexpectedBehavior.add(String.format("Expected ephemeral count for %s to be %d but was null", checkPath, expectedSize)); diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/JaasConfiguration.java b/zookeeper-server/src/test/java/org/apache/zookeeper/JaasConfiguration.java index aecc7ede1..22d8d6efd 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/JaasConfiguration.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/JaasConfiguration.java @@ -35,7 +35,7 @@ import javax.security.auth.login.AppConfigurationEntry.LoginModuleControlFlag; */ public class JaasConfiguration extends javax.security.auth.login.Configuration { - private final Map<String, AppConfigurationEntry[]> sections = new HashMap<String, AppConfigurationEntry[]>(); + private final Map<String, AppConfigurationEntry[]> sections = new HashMap<>(); public JaasConfiguration() { } @@ -47,7 +47,7 @@ public class JaasConfiguration extends javax.security.auth.login.Configuration { * @param args login key/value args */ public void addSection(String name, String loginModuleName, String... args) { - Map<String, String> conf = new HashMap<String, String>(); + Map<String, String> conf = new HashMap<>(); // loop through the args (must be key/value sequence) for (int i = 0; i < args.length - 1; i += 2) { conf.put(args[i], args[i + 1]); diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/RemoveWatchesTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/RemoveWatchesTest.java index 93ab353ab..945b87cb0 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/RemoveWatchesTest.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/RemoveWatchesTest.java @@ -481,7 +481,7 @@ public class RemoveWatchesTest extends ClientBase { @Timeout(value = 90) public void testManyPreNodeWatchers(boolean useAsync) throws Exception { int count = 50; - List<MyWatcher> wList = new ArrayList<MyWatcher>(count); + List<MyWatcher> wList = new ArrayList<>(count); MyWatcher w; String path = "/node"; // Exists watcher @@ -510,7 +510,7 @@ public class RemoveWatchesTest extends ClientBase { @Timeout(value = 90) public void testManyChildWatchers(boolean useAsync) throws Exception { int count = 50; - List<MyWatcher> wList = new ArrayList<MyWatcher>(count); + List<MyWatcher> wList = new ArrayList<>(count); MyWatcher w; String path = "/node"; @@ -546,7 +546,7 @@ public class RemoveWatchesTest extends ClientBase { @Timeout(value = 90) public void testManyDataWatchers(boolean useAsync) throws Exception { int count = 50; - List<MyWatcher> wList = new ArrayList<MyWatcher>(count); + List<MyWatcher> wList = new ArrayList<>(count); MyWatcher w; String path = "/node"; @@ -578,7 +578,7 @@ public class RemoveWatchesTest extends ClientBase { @Timeout(value = 90) public void testManyWatchersWhenNoConnection(boolean useAsync) throws Exception { int count = 3; - List<MyWatcher> wList = new ArrayList<MyWatcher>(count); + List<MyWatcher> wList = new ArrayList<>(count); MyWatcher w; String path = "/node"; @@ -990,7 +990,7 @@ public class RemoveWatchesTest extends ClientBase { private final String path; private String eventPath; private CountDownLatch latch; - private List<EventType> eventsAfterWatchRemoval = new ArrayList<EventType>(); + private List<EventType> eventsAfterWatchRemoval = new ArrayList<>(); MyWatcher(String path, int count) { this.path = path; latch = new CountDownLatch(count); diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/SaslAuthTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/SaslAuthTest.java index 005cf4bac..be9194f59 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/SaslAuthTest.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/SaslAuthTest.java @@ -128,7 +128,7 @@ public class SaslAuthTest extends ClientBase { public void testValidSaslIds() throws Exception { ZooKeeper zk = createClient(); - List<String> validIds = new ArrayList<String>(); + List<String> validIds = new ArrayList<>(); validIds.add("user"); validIds.add("service/host.name.com"); validIds.add("user@KERB.REALM"); @@ -136,7 +136,7 @@ public class SaslAuthTest extends ClientBase { int i = 0; for (String validId : validIds) { - List<ACL> aclList = new ArrayList<ACL>(); + List<ACL> aclList = new ArrayList<>(); ACL acl = new ACL(0, new Id("sasl", validId)); aclList.add(acl); zk.create("/valid" + i, null, aclList, CreateMode.PERSISTENT); @@ -148,13 +148,13 @@ public class SaslAuthTest extends ClientBase { public void testInvalidSaslIds() throws Exception { ZooKeeper zk = createClient(); - List<String> invalidIds = new ArrayList<String>(); + List<String> invalidIds = new ArrayList<>(); invalidIds.add("user@KERB.REALM/server.com"); invalidIds.add("user@KERB.REALM1@KERB.REALM2"); int i = 0; for (String invalidId : invalidIds) { - List<ACL> aclList = new ArrayList<ACL>(); + List<ACL> aclList = new ArrayList<>(); try { ACL acl = new ACL(0, new Id("sasl", invalidId)); aclList.add(acl); @@ -253,4 +253,4 @@ public class SaslAuthTest extends ClientBase { } } } -}
\ No newline at end of file +} diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/ZooKeeperTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/ZooKeeperTest.java index c829e85da..186d7b6eb 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/ZooKeeperTest.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/ZooKeeperTest.java @@ -550,7 +550,7 @@ public class ZooKeeperTest extends ClientBase { LsCommand cmd = new LsCommand(); cmd.setZk(zk); cmd.parse("ls /".split(" ")); - List<String> expected = new ArrayList<String>(); + List<String> expected = new ArrayList<>(); expected.add("[aa1, aa2, aa3, test1, zk1, zookeeper]"); runCommandExpect(cmd, expected); } @@ -571,7 +571,7 @@ public class ZooKeeperTest extends ClientBase { cmd.setZk(zk); cmd.parse("ls -R /a".split(" ")); - List<String> expected = new ArrayList<String>(); + List<String> expected = new ArrayList<>(); expected.add("/a"); expected.add("/a/b"); expected.add("/a/c"); @@ -590,7 +590,7 @@ public class ZooKeeperTest extends ClientBase { cmd.setZk(zk); cmd.parse("ls -R /".split(" ")); - List<String> expected = new ArrayList<String>(); + List<String> expected = new ArrayList<>(); expected.add("/"); expected.add("/zookeeper"); runCommandExpect(cmd, expected); @@ -608,7 +608,7 @@ public class ZooKeeperTest extends ClientBase { cmd.setZk(zk); cmd.parse("ls -R /b/c".split(" ")); - List<String> expected = new ArrayList<String>(); + List<String> expected = new ArrayList<>(); expected.add("/b/c"); runCommandExpect(cmd, expected); } @@ -626,7 +626,7 @@ public class ZooKeeperTest extends ClientBase { cmd.parse("ls -R /b/c/d".split(" ")); try { - runCommandExpect(cmd, new ArrayList<String>()); + runCommandExpect(cmd, new ArrayList<>()); fail("Path doesn't exists so, command should fail."); } catch (CliWrapperException e) { assertEquals(KeeperException.Code.NONODE, ((KeeperException) e.getCause()).code()); @@ -691,7 +691,7 @@ public class ZooKeeperTest extends ClientBase { SyncCommand cmd = new SyncCommand(); cmd.setZk(zk); cmd.parse("sync /".split(" ")); - List<String> expected = new ArrayList<String>(); + List<String> expected = new ArrayList<>(); expected.add("Sync is OK"); runCommandExpect(cmd, expected); diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/server/CRCTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/CRCTest.java index bcfdfcc69..2d94d2ba4 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/CRCTest.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/CRCTest.java @@ -72,7 +72,7 @@ public class CRCTest extends ZKTestCase { /** return if checksum matches for a snapshot **/ private boolean getCheckSum(FileSnap snap, File snapFile) throws IOException { DataTree dt = new DataTree(); - Map<Long, Integer> sessions = new ConcurrentHashMap<Long, Integer>(); + Map<Long, Integer> sessions = new ConcurrentHashMap<>(); InputStream snapIS = new BufferedInputStream(new FileInputStream(snapFile)); CheckedInputStream crcIn = new CheckedInputStream(snapIS, new Adler32()); InputArchive ia = BinaryInputArchive.getArchive(crcIn); diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/server/FinalRequestProcessorTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/FinalRequestProcessorTest.java index 4b47d6cbb..cb86963e4 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/FinalRequestProcessorTest.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/FinalRequestProcessorTest.java @@ -50,7 +50,7 @@ import org.mockito.stubbing.Answer; public class FinalRequestProcessorTest { - private List<ACL> testACLs = new ArrayList<ACL>(); + private List<ACL> testACLs = new ArrayList<>(); private final Record[] responseRecord = new Record[1]; private final ReplyHeader[] replyHeaders = new ReplyHeader[1]; @@ -119,7 +119,7 @@ public class FinalRequestProcessorTest { @Test public void testACLDigestHashHiding_UserCanRead() { // Arrange - List<Id> authInfo = new ArrayList<Id>(); + List<Id> authInfo = new ArrayList<>(); authInfo.add(new Id("digest", "otheruser:somesecrethash")); // Act @@ -133,7 +133,7 @@ public class FinalRequestProcessorTest { @Test public void testACLDigestHashHiding_UserCanAll() { // Arrange - List<Id> authInfo = new ArrayList<Id>(); + List<Id> authInfo = new ArrayList<>(); authInfo.add(new Id("digest", "user:secrethash")); // Act @@ -147,7 +147,7 @@ public class FinalRequestProcessorTest { @Test public void testACLDigestHashHiding_AdminUser() { // Arrange - List<Id> authInfo = new ArrayList<Id>(); + List<Id> authInfo = new ArrayList<>(); authInfo.add(new Id("digest", "adminuser:adminsecret")); // Act @@ -163,7 +163,7 @@ public class FinalRequestProcessorTest { // Arrange testACLs.clear(); testACLs.addAll(Arrays.asList(new ACL(ZooDefs.Perms.READ, new Id("digest", "user:secrethash")), new ACL(ZooDefs.Perms.ADMIN, new Id("digest", "adminuser:adminsecret")))); - List<Id> authInfo = new ArrayList<Id>(); + List<Id> authInfo = new ArrayList<>(); authInfo.add(new Id("digest", "adminuser:adminsecret")); // Act diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/server/PrepRequestProcessorTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/PrepRequestProcessorTest.java index 689b8eda9..b10258fb5 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/PrepRequestProcessorTest.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/PrepRequestProcessorTest.java @@ -371,7 +371,7 @@ public class PrepRequestProcessorTest extends ClientBase { } @Override public Map<Long, Set<Long>> getSessionExpiryMap() { - return new HashMap<Long, Set<Long>>(); + return new HashMap<>(); } @Override public long getLocalSessionCount() { diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/server/PurgeTxnTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/PurgeTxnTest.java index 3a45a8d96..299cdaa64 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/PurgeTxnTest.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/PurgeTxnTest.java @@ -186,7 +186,7 @@ public class PurgeTxnTest extends ZKTestCase { List<File> foundSnaps = txnLog.findNValidSnapshots(1); assertEquals(0, foundSnaps.size()); - List<File> expectedNRecentSnapFiles = new ArrayList<File>(); + List<File> expectedNRecentSnapFiles = new ArrayList<>(); int counter = offset + (2 * nRecentCount); for (int i = 0; i < nRecentCount; i++) { // simulate log file @@ -234,12 +234,12 @@ public class PurgeTxnTest extends ZKTestCase { AtomicInteger offset = new AtomicInteger(0); File version2 = new File(tmpDir.toString(), "version-2"); assertTrue(version2.mkdir(), "Failed to create version_2 dir:" + version2.toString()); - List<File> snapsToPurge = new ArrayList<File>(); - List<File> logsToPurge = new ArrayList<File>(); - List<File> snaps = new ArrayList<File>(); - List<File> logs = new ArrayList<File>(); - List<File> snapsAboveRecentFiles = new ArrayList<File>(); - List<File> logsAboveRecentFiles = new ArrayList<File>(); + List<File> snapsToPurge = new ArrayList<>(); + List<File> logsToPurge = new ArrayList<>(); + List<File> snaps = new ArrayList<>(); + List<File> logs = new ArrayList<>(); + List<File> snapsAboveRecentFiles = new ArrayList<>(); + List<File> logsAboveRecentFiles = new ArrayList<>(); createDataDirFiles(offset, fileToPurgeCount, false, version2, snapsToPurge, logsToPurge); createDataDirFiles(offset, nRecentCount, false, version2, snaps, logs); logs.add(logsToPurge.remove(0)); // log that precedes first retained snapshot is also retained @@ -285,8 +285,8 @@ public class PurgeTxnTest extends ZKTestCase { AtomicInteger offset = new AtomicInteger(0); File version2 = new File(tmpDir.toString(), "version-2"); assertTrue(version2.mkdir(), "Failed to create version_2 dir:" + version2.toString()); - List<File> snaps = new ArrayList<File>(); - List<File> logs = new ArrayList<File>(); + List<File> snaps = new ArrayList<>(); + List<File> logs = new ArrayList<>(); createDataDirFiles(offset, nRecentCount, testWithPrecedingLogFile, version2, snaps, logs); FileTxnSnapLog txnLog = new FileTxnSnapLog(tmpDir, tmpDir); @@ -307,10 +307,10 @@ public class PurgeTxnTest extends ZKTestCase { AtomicInteger offset = new AtomicInteger(0); File version2 = new File(tmpDir.toString(), "version-2"); assertTrue(version2.mkdir(), "Failed to create version_2 dir:" + version2.toString()); - List<File> snapsToPurge = new ArrayList<File>(); - List<File> logsToPurge = new ArrayList<File>(); - List<File> snaps = new ArrayList<File>(); - List<File> logs = new ArrayList<File>(); + List<File> snapsToPurge = new ArrayList<>(); + List<File> logsToPurge = new ArrayList<>(); + List<File> snaps = new ArrayList<>(); + List<File> logs = new ArrayList<>(); createDataDirFiles(offset, fileToPurgeCount, false, version2, snapsToPurge, logsToPurge); createDataDirFiles(offset, nRecentCount, false, version2, snaps, logs); logs.add(logsToPurge.remove(0)); // log that precedes first retained snapshot is also retained @@ -560,7 +560,7 @@ public class PurgeTxnTest extends ZKTestCase { private List<String> manyClientOps(final ZooKeeper zk, final CountDownLatch doPurge, int thCount, final String prefix) { Thread[] ths = new Thread[thCount]; - final List<String> znodes = Collections.synchronizedList(new ArrayList<String>()); + final List<String> znodes = Collections.synchronizedList(new ArrayList<>()); final CountDownLatch finished = new CountDownLatch(thCount); final AtomicReference<Exception> exception = new AtomicReference<>(); for (int indx = 0; indx < thCount; indx++) { diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/server/ReferenceCountedACLCacheTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/ReferenceCountedACLCacheTest.java index 9eab2e8cd..e7bb38da9 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/ReferenceCountedACLCacheTest.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/ReferenceCountedACLCacheTest.java @@ -50,14 +50,14 @@ public class ReferenceCountedACLCacheTest { @Test public void testWhetherOrderingMatters() { - List<ACL> testACL = new ArrayList<ACL>(); + List<ACL> testACL = new ArrayList<>(); testACL.add(new ACL(ZooDefs.Perms.READ, new Id("scheme", "ro"))); testACL.add(new ACL(ZooDefs.Perms.WRITE, new Id("scheme", "rw"))); ReferenceCountedACLCache cache = new ReferenceCountedACLCache(); Long aclId = cache.convertAcls(testACL); - List<ACL> testACL2 = new ArrayList<ACL>(); + List<ACL> testACL2 = new ArrayList<>(); testACL2.add(new ACL(ZooDefs.Perms.WRITE, new Id("scheme", "rw"))); testACL2.add(new ACL(ZooDefs.Perms.READ, new Id("scheme", "ro"))); @@ -279,7 +279,7 @@ public class ReferenceCountedACLCacheTest { } private List<ACL> createACL(String id) { - List<ACL> acl1 = new ArrayList<ACL>(); + List<ACL> acl1 = new ArrayList<>(); acl1.add(new ACL(ZooDefs.Perms.ADMIN, new Id("scheme", id))); return acl1; } diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/server/SnapshotDigestTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/SnapshotDigestTest.java index 4e8c6f8e2..fb73e1572 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/SnapshotDigestTest.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/SnapshotDigestTest.java @@ -100,7 +100,7 @@ public class SnapshotDigestTest extends ClientBase { zk.delete(firstNode, -1); // trigger multi op - List<Op> subTxns = new ArrayList<Op>(); + List<Op> subTxns = new ArrayList<>(); for (int i = 0; i < 3; i++) { String path = pathPrefix + "-m" + i; subTxns.add(Op.create(path, path.getBytes(), ZooDefs.Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT)); diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/server/TxnLogDigestTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/TxnLogDigestTest.java index ae58fa563..c6af1724a 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/TxnLogDigestTest.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/TxnLogDigestTest.java @@ -236,7 +236,7 @@ public class TxnLogDigestTest extends ClientBase { client.setData(path, updatedData.getBytes(), -1); nodes.put(path, updatedData); - List<Op> subTxns = new ArrayList<Op>(); + List<Op> subTxns = new ArrayList<>(); for (int i = 0; i < 3; i++) { path = prefix + "/m" + i; subTxns.add(Op.create(path, path.getBytes(), diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/server/admin/CommandResponseTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/admin/CommandResponseTest.java index 8009dab47..855acd0b5 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/admin/CommandResponseTest.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/admin/CommandResponseTest.java @@ -47,7 +47,7 @@ public class CommandResponseTest extends ZKTestCase { @Test public void testMap() { r.put("missing", "sudo"); - Map<String, Object> m = new HashMap<String, Object>(); + Map<String, Object> m = new HashMap<>(); m.put("origin", "xkcd"); m.put("url", "http://xkcd.com/149/"); r.putAll(m); diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/server/admin/CommandsTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/admin/CommandsTest.java index c60ae868d..85c4a78e9 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/admin/CommandsTest.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/admin/CommandsTest.java @@ -107,7 +107,7 @@ public class CommandsTest extends ClientBase { } public void testCommand(String cmdName, Field... fields) throws IOException, InterruptedException { - testCommand(cmdName, new HashMap<String, String>(), null, new HashMap<>(), HttpServletResponse.SC_OK, fields); + testCommand(cmdName, new HashMap<>(), null, new HashMap<>(), HttpServletResponse.SC_OK, fields); } private static class Field { @@ -271,7 +271,7 @@ public class CommandsTest extends ClientBase { @Test public void testSetTraceMask() throws IOException, InterruptedException { - Map<String, String> kwargs = new HashMap<String, String>(); + Map<String, String> kwargs = new HashMap<>(); kwargs.put("traceMask", "1"); testCommand("set_trace_mask", kwargs, null, new HashMap<>(), HttpServletResponse.SC_OK, new Field("tracemask", Long.class)); } diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/CnxManagerTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/CnxManagerTest.java index ad43d8826..920c1391c 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/CnxManagerTest.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/CnxManagerTest.java @@ -78,7 +78,7 @@ public class CnxManagerTest extends ZKTestCase { public void setUp() throws Exception { this.count = 3; - this.peers = new HashMap<Long, QuorumServer>(count); + this.peers = new HashMap<>(count); peerTmpdir = new File[count]; peerQuorumPort = new int[count]; peerClientPort = new int[count]; @@ -499,7 +499,7 @@ public class CnxManagerTest extends ZKTestCase { */ @Test public void testWorkerThreads() throws Exception { - ArrayList<QuorumPeer> peerList = new ArrayList<QuorumPeer>(); + ArrayList<QuorumPeer> peerList = new ArrayList<>(); try { for (int sid = 0; sid < 3; sid++) { QuorumPeer peer = new QuorumPeer(peers, peerTmpdir[sid], peerTmpdir[sid], peerClientPort[sid], 3, sid, 1000, 2, 2, 2); diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/CommitProcessorConcurrencyTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/CommitProcessorConcurrencyTest.java index e5f668d1f..21970f3ea 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/CommitProcessorConcurrencyTest.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/CommitProcessorConcurrencyTest.java @@ -63,7 +63,7 @@ public class CommitProcessorConcurrencyTest extends ZKTestCase { @BeforeEach public void setUp() throws Exception { - processedRequests = new LinkedBlockingQueue<Request>(); + processedRequests = new LinkedBlockingQueue<>(); processor = new MockCommitProcessor(); CommitProcessor.setMaxReadBatchSize(-1); CommitProcessor.setMaxCommitBatchSize(1); @@ -174,8 +174,8 @@ public class CommitProcessorConcurrencyTest extends ZKTestCase { @Test public void processAsMuchUncommittedRequestsAsPossibleTest() throws Exception { final String path = "/testAsMuchAsPossible"; - List<Request> shouldBeProcessed = new LinkedList<Request>(); - Set<Request> shouldNotBeProcessed = new HashSet<Request>(); + List<Request> shouldBeProcessed = new LinkedList<>(); + Set<Request> shouldNotBeProcessed = new HashSet<>(); for (int sessionId = 1; sessionId <= 5; ++sessionId) { for (int readReqId = 1; readReqId <= sessionId; ++readReqId) { Request readReq = newRequest(new GetDataRequest(path, false), OpCode.getData, sessionId, readReqId); @@ -225,8 +225,8 @@ public class CommitProcessorConcurrencyTest extends ZKTestCase { @Test public void processAllFollowingUncommittedAfterFirstCommitTest() throws Exception { final String path = "/testUncommittedFollowingCommited"; - Set<Request> shouldBeInPending = new HashSet<Request>(); - Set<Request> shouldBeProcessedAfterPending = new HashSet<Request>(); + Set<Request> shouldBeInPending = new HashSet<>(); + Set<Request> shouldBeProcessedAfterPending = new HashSet<>(); Request writeReq = newRequest( new CreateRequest(path, new byte[0], Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT_SEQUENTIAL.toFlag()), @@ -287,7 +287,7 @@ public class CommitProcessorConcurrencyTest extends ZKTestCase { @Test public void processAllWritesMaxBatchSize() throws Exception { final String path = "/processAllWritesMaxBatchSize"; - HashSet<Request> shouldBeProcessedAfterPending = new HashSet<Request>(); + HashSet<Request> shouldBeProcessedAfterPending = new HashSet<>(); Request writeReq = newRequest( new CreateRequest( @@ -423,7 +423,7 @@ public class CommitProcessorConcurrencyTest extends ZKTestCase { public void noStarvationOfNonLocalCommittedRequestsTest() throws Exception { final String path = "/noStarvationOfCommittedRequests"; processor.queuedRequests = new MockRequestsQueue(); - Set<Request> nonLocalCommits = new HashSet<Request>(); + Set<Request> nonLocalCommits = new HashSet<>(); for (int i = 0; i < 10; i++) { Request nonLocalCommitReq = newRequest( new CreateRequest(path, new byte[0], Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT_SEQUENTIAL.toFlag()), @@ -461,7 +461,7 @@ public class CommitProcessorConcurrencyTest extends ZKTestCase { processor.queuedRequests.add(firstCommittedReq); processor.queuedWriteRequests.add(firstCommittedReq); processor.committedRequests.add(firstCommittedReq); - Set<Request> allReads = new HashSet<Request>(); + Set<Request> allReads = new HashSet<>(); // +1 read request to queuedRequests Request firstRead = newRequest(new GetDataRequest(path, false), OpCode.getData, 0x1, 0); @@ -476,7 +476,7 @@ public class CommitProcessorConcurrencyTest extends ZKTestCase { 2); processor.committedRequests.add(secondCommittedReq); - Set<Request> waitingCommittedRequests = new HashSet<Request>(); + Set<Request> waitingCommittedRequests = new HashSet<>(); // +99 non local committed requests for (int writeReqId = 3; writeReqId < 102; ++writeReqId) { Request writeReq = newRequest( @@ -530,7 +530,7 @@ public class CommitProcessorConcurrencyTest extends ZKTestCase { final int firstCXid = 0x100; int readReqId = firstCXid; processor.stoppedMainLoop = true; - HashSet<Request> localRequests = new HashSet<Request>(); + HashSet<Request> localRequests = new HashSet<>(); // queue the blocking write request to queuedRequests Request firstCommittedReq = newRequest( new CreateRequest(path, new byte[0], Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT_SEQUENTIAL.toFlag()), @@ -592,7 +592,7 @@ public class CommitProcessorConcurrencyTest extends ZKTestCase { final int numberofReads = 10; int readReqId = lastCXid; processor.stoppedMainLoop = true; - HashSet<Request> localRequests = new HashSet<Request>(); + HashSet<Request> localRequests = new HashSet<>(); // queue the blocking write request to queuedRequests Request orphanCommittedReq = newRequest( diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/CommitProcessorTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/CommitProcessorTest.java index 46a4c3874..2de0987af 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/CommitProcessorTest.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/CommitProcessorTest.java @@ -81,7 +81,7 @@ public class CommitProcessorTest extends ZKTestCase { boolean stopped; TestZooKeeperServer zks; File tmpDir; - ArrayList<TestClientThread> testClients = new ArrayList<TestClientThread>(); + ArrayList<TestClientThread> testClients = new ArrayList<>(); CommitProcessor commitProcessor; public void setUp(int numCommitThreads, int numClientThreads, int writePercent) throws Exception { @@ -318,7 +318,7 @@ public class CommitProcessorTest extends ZKTestCase { private class MockProposalRequestProcessor extends Thread implements RequestProcessor { private final CommitProcessor commitProcessor; - private final LinkedBlockingQueue<Request> proposals = new LinkedBlockingQueue<Request>(); + private final LinkedBlockingQueue<Request> proposals = new LinkedBlockingQueue<>(); public MockProposalRequestProcessor(CommitProcessor commitProcessor) { this.commitProcessor = commitProcessor; @@ -367,7 +367,7 @@ public class CommitProcessorTest extends ZKTestCase { RequestProcessor nextProcessor; CommitProcessor commitProcessor; AtomicLong expectedZxid = new AtomicLong(1); - ConcurrentHashMap<Long, AtomicInteger> cxidMap = new ConcurrentHashMap<Long, AtomicInteger>(); + ConcurrentHashMap<Long, AtomicInteger> cxidMap = new ConcurrentHashMap<>(); AtomicInteger outstandingReadRequests = new AtomicInteger(0); AtomicInteger outstandingWriteRequests = new AtomicInteger(0); diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/FLEBackwardElectionRoundTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/FLEBackwardElectionRoundTest.java index e4d32456a..67d646c97 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/FLEBackwardElectionRoundTest.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/FLEBackwardElectionRoundTest.java @@ -49,7 +49,7 @@ public class FLEBackwardElectionRoundTest extends ZKTestCase { public void setUp() throws Exception { count = 3; - peers = new HashMap<Long, QuorumServer>(count); + peers = new HashMap<>(count); tmpdir = new File[count]; port = new int[count]; cnxManagers = new QuorumCnxManager[count - 1]; diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/FLELostMessageTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/FLELostMessageTest.java index 84b233d72..d84396ed5 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/FLELostMessageTest.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/FLELostMessageTest.java @@ -49,7 +49,7 @@ public class FLELostMessageTest extends ZKTestCase { public void setUp() throws Exception { count = 3; - peers = new HashMap<Long, QuorumServer>(count); + peers = new HashMap<>(count); tmpdir = new File[count]; port = new int[count]; } diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/FLEOutOfElectionTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/FLEOutOfElectionTest.java index d1afdaa80..7feed9c05 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/FLEOutOfElectionTest.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/FLEOutOfElectionTest.java @@ -43,7 +43,7 @@ public class FLEOutOfElectionTest { @BeforeEach public void setUp() throws Exception { File tmpdir = ClientBase.createTmpDir(); - Map<Long, QuorumServer> peers = new HashMap<Long, QuorumServer>(); + Map<Long, QuorumServer> peers = new HashMap<>(); for (int i = 0; i < 5; i++) { peers.put(Long.valueOf(i), new QuorumServer(Long.valueOf(i), new InetSocketAddress("127.0.0.1", PortAssignment.unique()))); } @@ -53,7 +53,7 @@ public class FLEOutOfElectionTest { @Test public void testIgnoringZxidElectionEpoch() { - Map<Long, Vote> votes = new HashMap<Long, Vote>(); + Map<Long, Vote> votes = new HashMap<>(); votes.put(0L, new Vote(0x1, 4L, ZxidUtils.makeZxid(1, 1), 1, 2, ServerState.FOLLOWING)); votes.put(1L, new Vote(0x1, 4L, ZxidUtils.makeZxid(1, 2), 1, 2, ServerState.FOLLOWING)); votes.put(3L, new Vote(0x1, 4L, ZxidUtils.makeZxid(2, 1), 2, 2, ServerState.FOLLOWING)); @@ -64,7 +64,7 @@ public class FLEOutOfElectionTest { @Test public void testElectionWIthDifferentVersion() { - Map<Long, Vote> votes = new HashMap<Long, Vote>(); + Map<Long, Vote> votes = new HashMap<>(); votes.put(0L, new Vote(0x1, 4L, ZxidUtils.makeZxid(1, 1), 1, 1, ServerState.FOLLOWING)); votes.put(1L, new Vote(0x1, 4L, ZxidUtils.makeZxid(1, 1), 1, 1, ServerState.FOLLOWING)); votes.put(3L, new Vote(4L, ZxidUtils.makeZxid(2, 1), 2, 2, ServerState.FOLLOWING)); @@ -75,7 +75,7 @@ public class FLEOutOfElectionTest { @Test public void testLookingNormal() { - Map<Long, Vote> votes = new HashMap<Long, Vote>(); + Map<Long, Vote> votes = new HashMap<>(); votes.put(0L, new Vote(4L, ZxidUtils.makeZxid(2, 1), 1, 1, ServerState.LOOKING)); votes.put(1L, new Vote(4L, ZxidUtils.makeZxid(2, 1), 1, 1, ServerState.LOOKING)); votes.put(3L, new Vote(4L, ZxidUtils.makeZxid(2, 1), 1, 1, ServerState.LOOKING)); @@ -86,7 +86,7 @@ public class FLEOutOfElectionTest { @Test public void testLookingDiffRounds() { - HashMap<Long, Vote> votes = new HashMap<Long, Vote>(); + HashMap<Long, Vote> votes = new HashMap<>(); votes.put(0L, new Vote(4L, ZxidUtils.makeZxid(1, 1), 1, 1, ServerState.LOOKING)); votes.put(1L, new Vote(4L, ZxidUtils.makeZxid(2, 1), 2, 2, ServerState.LOOKING)); votes.put(3L, new Vote(4L, ZxidUtils.makeZxid(2, 1), 3, 2, ServerState.LOOKING)); @@ -97,7 +97,7 @@ public class FLEOutOfElectionTest { @Test public void testOutofElection() { - HashMap<Long, Vote> outofelection = new HashMap<Long, Vote>(); + HashMap<Long, Vote> outofelection = new HashMap<>(); outofelection.put(1L, new Vote(0x0, 5, ZxidUtils.makeZxid(15, 0), 0xa, 0x17, ServerState.FOLLOWING)); outofelection.put(2L, new Vote(0x0, 5, ZxidUtils.makeZxid(15, 0), 0xa, 0x17, ServerState.FOLLOWING)); diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/FuzzySnapshotRelatedTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/FuzzySnapshotRelatedTest.java index a75fb3830..73ad201c1 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/FuzzySnapshotRelatedTest.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/FuzzySnapshotRelatedTest.java @@ -430,8 +430,8 @@ public class FuzzySnapshotRelatedTest extends QuorumPeerTestBase { static class CustomDataTree extends DataTree { - Map<String, NodeCreateListener> nodeCreateListeners = new HashMap<String, NodeCreateListener>(); - Map<String, NodeSerializeListener> listeners = new HashMap<String, NodeSerializeListener>(); + Map<String, NodeCreateListener> nodeCreateListeners = new HashMap<>(); + Map<String, NodeSerializeListener> listeners = new HashMap<>(); DigestSerializeListener digestListener; SetDataTxnListener setListener; diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/LeaderBeanTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/LeaderBeanTest.java index dc537abbd..82084e13c 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/LeaderBeanTest.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/LeaderBeanTest.java @@ -62,7 +62,7 @@ public class LeaderBeanTest { public static Map<Long, QuorumServer> getMockedPeerViews(long myId) { int clientPort = PortAssignment.unique(); - Map<Long, QuorumServer> peersView = new HashMap<Long, QuorumServer>(); + Map<Long, QuorumServer> peersView = new HashMap<>(); InetAddress clientIP = InetAddress.getLoopbackAddress(); peersView.put(Long.valueOf(myId), @@ -174,7 +174,7 @@ public class LeaderBeanTest { @Test public void testFollowerInfo() throws IOException { - Map<Long, QuorumServer> votingMembers = new HashMap<Long, QuorumServer>(); + Map<Long, QuorumServer> votingMembers = new HashMap<>(); votingMembers.put(1L, null); votingMembers.put(2L, null); votingMembers.put(3L, null); diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/LearnerHandlerTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/LearnerHandlerTest.java index 2d63f24e5..bbf36367e 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/LearnerHandlerTest.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/LearnerHandlerTest.java @@ -73,8 +73,8 @@ public class LearnerHandlerTest extends ZKTestCase { long lastProcessedZxid; ReentrantReadWriteLock lock = new ReentrantReadWriteLock(); - LinkedList<Proposal> committedLog = new LinkedList<Leader.Proposal>(); - LinkedList<Proposal> txnLog = new LinkedList<Leader.Proposal>(); + LinkedList<Proposal> committedLog = new LinkedList<>(); + LinkedList<Proposal> txnLog = new LinkedList<>(); public MockZKDatabase(FileTxnSnapLog snapLog) { super(snapLog); diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/LearnerSyncThrottlerTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/LearnerSyncThrottlerTest.java index fbd33d2a0..51d80c2c2 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/LearnerSyncThrottlerTest.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/LearnerSyncThrottlerTest.java @@ -127,7 +127,7 @@ public class LearnerSyncThrottlerTest extends ZKTestCase { final CountDownLatch threadStartLatch = new CountDownLatch(numThreads); final CountDownLatch syncProgressLatch = new CountDownLatch(numThreads); - List<Future<Boolean>> results = new ArrayList<Future<Boolean>>(numThreads); + List<Future<Boolean>> results = new ArrayList<>(numThreads); for (int i = 0; i < numThreads; i++) { results.add(threadPool.submit(new Callable<Boolean>() { diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/QuorumDigestTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/QuorumDigestTest.java index af2fed8cf..1ffc74f0d 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/QuorumDigestTest.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/QuorumDigestTest.java @@ -251,7 +251,7 @@ public class QuorumDigestTest extends QuorumPeerTestBase { ProcessTxnResult rc = new ProcessTxnResult(); rc.path = ""; rc.stat = new Stat(); - rc.multiResult = new ArrayList<ProcessTxnResult>(); + rc.multiResult = new ArrayList<>(); return rc; } return invocation.proceed(header, txn, digest); diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/QuorumPeerTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/QuorumPeerTest.java index 194144b14..b832f4f96 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/QuorumPeerTest.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/QuorumPeerTest.java @@ -49,7 +49,7 @@ public class QuorumPeerTest { long myId = 1; File dataDir = ClientBase.createTmpDir(); int clientPort = PortAssignment.unique(); - Map<Long, QuorumServer> peersView = new HashMap<Long, QuorumServer>(); + Map<Long, QuorumServer> peersView = new HashMap<>(); InetAddress clientIP = InetAddress.getLoopbackAddress(); peersView.put(Long.valueOf(myId), new QuorumServer(myId, new InetSocketAddress(clientIP, PortAssignment.unique()), new InetSocketAddress(clientIP, PortAssignment.unique()), new InetSocketAddress(clientIP, clientPort), LearnerType.PARTICIPANT)); diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/QuorumPeerTestBase.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/QuorumPeerTestBase.java index 2a116dce0..8249cd222 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/QuorumPeerTestBase.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/QuorumPeerTestBase.java @@ -303,7 +303,7 @@ public class QuorumPeerTestBase extends ZKTestCase implements Watcher { } public MainThread(int myid, int clientPort, String quorumCfgSection) throws IOException { - this(myid, clientPort, quorumCfgSection, new HashMap<String, String>()); + this(myid, clientPort, quorumCfgSection, new HashMap<>()); } public MainThread(int myid, int clientPort, String quorumCfgSection, Map<String, String> otherConfigs) throws IOException { diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/QuorumRequestPipelineTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/QuorumRequestPipelineTest.java index c395a62e6..624661044 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/QuorumRequestPipelineTest.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/QuorumRequestPipelineTest.java @@ -46,7 +46,7 @@ public class QuorumRequestPipelineTest extends QuorumBase { protected final CountDownLatch callComplete = new CountDownLatch(1); protected boolean complete = false; protected static final String PARENT_PATH = "/foo"; - protected static final Set<String> CHILDREN = new HashSet<String>(Arrays.asList("1", "2", "3")); + protected static final Set<String> CHILDREN = new HashSet<>(Arrays.asList("1", "2", "3")); protected static final String AUTH_PROVIDER = "digest"; protected static final byte[] AUTH = "hello".getBytes(); protected static final byte[] DATA = "Hint Water".getBytes(); diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/QuorumSSLTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/QuorumSSLTest.java index b5af84f1e..b7aed52bc 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/QuorumSSLTest.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/QuorumSSLTest.java @@ -896,7 +896,7 @@ public class QuorumSSLTest extends QuorumPeerTestBase { public void testCipherSuites() throws Exception { // Get default cipher suites from JDK SSLServerSocketFactory ssf = (SSLServerSocketFactory) SSLServerSocketFactory.getDefault(); - List<String> defaultCiphers = new ArrayList<String>(); + List<String> defaultCiphers = new ArrayList<>(); for (String cipher : ssf.getDefaultCipherSuites()) { if (!cipher.matches(".*EMPTY.*") && cipher.startsWith("TLS") && cipher.contains("RSA")) { defaultCiphers.add(cipher); diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/ReconfigBackupTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/ReconfigBackupTest.java index b465865b3..cb03b2f8f 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/ReconfigBackupTest.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/ReconfigBackupTest.java @@ -117,8 +117,8 @@ public class ReconfigBackupTest extends QuorumPeerTestBase { final String[] servers = new String[NEW_SERVER_COUNT]; StringBuilder sb = new StringBuilder(); - ArrayList<String> oldServers = new ArrayList<String>(); - ArrayList<String> newServers = new ArrayList<String>(); + ArrayList<String> oldServers = new ArrayList<>(); + ArrayList<String> newServers = new ArrayList<>(); for (int i = 0; i < NEW_SERVER_COUNT; i++) { clientPorts[i] = PortAssignment.unique(); @@ -238,7 +238,7 @@ public class ReconfigBackupTest extends QuorumPeerTestBase { StringBuilder sb = new StringBuilder(); String server; StringBuilder oldSb = new StringBuilder(); - ArrayList<String> allServers = new ArrayList<String>(); + ArrayList<String> allServers = new ArrayList<>(); for (int i = 0; i < SERVER_COUNT; i++) { clientPorts[i] = PortAssignment.unique(); diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/ReconfigFailureCasesTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/ReconfigFailureCasesTest.java index 4fba09f84..120365444 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/ReconfigFailureCasesTest.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/ReconfigFailureCasesTest.java @@ -66,7 +66,7 @@ public class ReconfigFailureCasesTest extends QuorumPeerTestBase { ZooKeeper[] zkArr = ReconfigTest.createHandles(qu); ZooKeeperAdmin[] zkAdminArr = ReconfigTest.createAdminHandles(qu); - ArrayList<String> members = new ArrayList<String>(); + ArrayList<String> members = new ArrayList<>(); members.add("group.1=3:4:5"); members.add("group.2=1:2"); members.add("weight.1=0"); @@ -88,7 +88,7 @@ public class ReconfigFailureCasesTest extends QuorumPeerTestBase { ReconfigTest.testNormalOperation(zkArr[1], zkArr[2]); // Attempt an incremental reconfig. - List<String> leavingServers = new ArrayList<String>(); + List<String> leavingServers = new ArrayList<>(); leavingServers.add("3"); try { zkAdminArr[1].reconfigure(null, leavingServers, null, -1, null); @@ -117,7 +117,7 @@ public class ReconfigFailureCasesTest extends QuorumPeerTestBase { ZooKeeper[] zkArr = ReconfigTest.createHandles(qu); ZooKeeperAdmin[] zkAdminArr = ReconfigTest.createAdminHandles(qu); - List<String> leavingServers = new ArrayList<String>(); + List<String> leavingServers = new ArrayList<>(); leavingServers.add("2"); leavingServers.add("3"); try { @@ -144,7 +144,7 @@ public class ReconfigFailureCasesTest extends QuorumPeerTestBase { ZooKeeper[] zkArr = ReconfigTest.createHandles(qu); ZooKeeperAdmin[] zkAdminArr = ReconfigTest.createAdminHandles(qu); - List<String> leavingServers = new ArrayList<String>(); + List<String> leavingServers = new ArrayList<>(); leavingServers.add("3"); try { zkAdminArr[1].reconfigure(null, leavingServers, null, 8, null); @@ -183,7 +183,7 @@ public class ReconfigFailureCasesTest extends QuorumPeerTestBase { int[][] ports = ReconfigRecoveryTest.generatePorts(SERVER_COUNT); // generate old config string - Set<Integer> observers = new HashSet<Integer>(); + Set<Integer> observers = new HashSet<>(); observers.add(3); StringBuilder sb = ReconfigRecoveryTest.generateConfig(SERVER_COUNT, ports, observers); String currentQuorumCfgSection = sb.toString(); @@ -217,7 +217,7 @@ public class ReconfigFailureCasesTest extends QuorumPeerTestBase { fail("Reconfig should have failed with NewConfigNoQuorum"); } // In this scenario to change 3's role to participant we need to remove it first - ArrayList<String> leavingServers = new ArrayList<String>(); + ArrayList<String> leavingServers = new ArrayList<>(); leavingServers.add("3"); ReconfigTest.reconfig(zkAdmin[1], null, leavingServers, null, -1); ReconfigTest.testNormalOperation(zk[2], zk[3]); diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/ReconfigLegacyTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/ReconfigLegacyTest.java index 498b4b6c4..2f9a5303e 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/ReconfigLegacyTest.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/ReconfigLegacyTest.java @@ -60,7 +60,7 @@ public class ReconfigLegacyTest extends QuorumPeerTestBase { final int[] clientPorts = new int[SERVER_COUNT]; StringBuilder sb = new StringBuilder(); String server; - ArrayList<String> allServers = new ArrayList<String>(); + ArrayList<String> allServers = new ArrayList<>(); for (int i = 0; i < SERVER_COUNT; i++) { clientPorts[i] = PortAssignment.unique(); @@ -154,8 +154,8 @@ public class ReconfigLegacyTest extends QuorumPeerTestBase { final int newClientPort = PortAssignment.unique(); StringBuilder sb = new StringBuilder(); - ArrayList<String> allServers = new ArrayList<String>(); - ArrayList<String> newServers = new ArrayList<String>(); + ArrayList<String> allServers = new ArrayList<>(); + ArrayList<String> newServers = new ArrayList<>(); for (int i = 0; i < SERVER_COUNT; i++) { clientPorts[i] = PortAssignment.unique(); diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/ReconfigRecoveryTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/ReconfigRecoveryTest.java index 746da1d85..80b2a215f 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/ReconfigRecoveryTest.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/ReconfigRecoveryTest.java @@ -52,7 +52,7 @@ public class ReconfigRecoveryTest extends QuorumPeerTestBase { final int[] clientPorts = new int[SERVER_COUNT]; StringBuilder sb = new StringBuilder(); String server; - ArrayList<String> allServers = new ArrayList<String>(); + ArrayList<String> allServers = new ArrayList<>(); String currentQuorumCfgSection = null, nextQuorumCfgSection; @@ -136,7 +136,7 @@ public class ReconfigRecoveryTest extends QuorumPeerTestBase { String currentQuorumCfg, nextQuorumCfgSection; - ArrayList<String> allServersNext = new ArrayList<String>(); + ArrayList<String> allServersNext = new ArrayList<>(); for (int i = 0; i < 2; i++) { oldClientPorts[i] = PortAssignment.unique(); @@ -294,7 +294,7 @@ public class ReconfigRecoveryTest extends QuorumPeerTestBase { String currentQuorumCfgSection = null, nextQuorumCfgSection; - ArrayList<String> allServers = new ArrayList<String>(); + ArrayList<String> allServers = new ArrayList<>(); for (int i = 0; i < SERVER_COUNT; i++) { clientPorts[i] = PortAssignment.unique(); server = "server." + i + "=localhost:" + PortAssignment.unique() + ":" + PortAssignment.unique() @@ -375,13 +375,13 @@ public class ReconfigRecoveryTest extends QuorumPeerTestBase { String currentQuorumCfgSection, nextQuorumCfgSection; // generate old config string - Set<Integer> observers = new HashSet<Integer>(); + Set<Integer> observers = new HashSet<>(); observers.add(2); StringBuilder sb = generateConfig(3, ports, observers); currentQuorumCfgSection = sb.toString(); // generate new config string - ArrayList<String> allServersNext = new ArrayList<String>(); + ArrayList<String> allServersNext = new ArrayList<>(); sb = new StringBuilder(); for (int i = 2; i < SERVER_COUNT; i++) { String server = "server." + i + "=localhost:" + ports[i][0] + ":" + ports[i][1] @@ -446,7 +446,7 @@ public class ReconfigRecoveryTest extends QuorumPeerTestBase { String currentQuorumCfg, nextQuorumCfgSection; // generate old config string - Set<Integer> observers = new HashSet<Integer>(); + Set<Integer> observers = new HashSet<>(); observers.add(2); StringBuilder sb = generateConfig(3, ports, observers); @@ -475,7 +475,7 @@ public class ReconfigRecoveryTest extends QuorumPeerTestBase { } // generate new config string - ArrayList<String> allServersNext = new ArrayList<String>(); + ArrayList<String> allServersNext = new ArrayList<>(); sb = new StringBuilder(); for (int i = 2; i < SERVER_COUNT; i++) { String server = "server." + i + "=localhost:" + ports[i][0] + ":" + ports[i][1] diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/SessionUpgradeQuorumTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/SessionUpgradeQuorumTest.java index 3d60c8b91..8876f74c9 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/SessionUpgradeQuorumTest.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/SessionUpgradeQuorumTest.java @@ -149,7 +149,7 @@ public class SessionUpgradeQuorumTest extends QuorumPeerTestBase { mt[i].shutdown(); } - ArrayList<States> waitStates = new ArrayList<States>(); + ArrayList<States> waitStates = new ArrayList<>(); waitStates.add(States.CONNECTING); waitStates.add(States.CLOSED); waitForOne(zk, waitStates); diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/StandaloneDisabledTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/StandaloneDisabledTest.java index 2cfec4d52..1483d80a8 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/StandaloneDisabledTest.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/StandaloneDisabledTest.java @@ -108,7 +108,7 @@ public class StandaloneDisabledTest extends QuorumPeerTestBase { //Add two participants and change them to observers to check //that we can reconfigure down to one participant with observers. - ArrayList<String> observerStrings = new ArrayList<String>(); + ArrayList<String> observerStrings = new ArrayList<>(); startObservers(observerStrings); testReconfig(follower2, true, reconfigServers); //add partcipants testReconfig(follower2, true, observerStrings); //change to observers @@ -129,7 +129,7 @@ public class StandaloneDisabledTest extends QuorumPeerTestBase { zkAdminHandles = new ZooKeeperAdmin[NUM_SERVERS]; clientPorts = new int[NUM_SERVERS]; serverStrings = buildServerStrings(); - reconfigServers = new ArrayList<String>(); + reconfigServers = new ArrayList<>(); System.setProperty("zookeeper.DigestAuthenticationProvider.superDigest", "super:D/InIHSb7yEEbrWz8b9l71RjZJU="/* password is 'test'*/); } @@ -151,7 +151,7 @@ public class StandaloneDisabledTest extends QuorumPeerTestBase { * the test servers. */ private ArrayList<String> buildServerStrings() { - ArrayList<String> serverStrings = new ArrayList<String>(); + ArrayList<String> serverStrings = new ArrayList<>(); for (int i = 0; i < NUM_SERVERS; i++) { clientPorts[i] = PortAssignment.unique(); diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/WatchLeakTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/WatchLeakTest.java index 2fadcf36f..93d3b845c 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/WatchLeakTest.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/WatchLeakTest.java @@ -228,7 +228,7 @@ public class WatchLeakTest { * @return a message that attempts to set 1 watch on / */ private ByteBuffer createWatchesMessage() { - List<String> dataWatches = new ArrayList<String>(1); + List<String> dataWatches = new ArrayList<>(1); dataWatches.add("/"); List<String> existWatches = Collections.emptyList(); List<String> childWatches = Collections.emptyList(); diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/Zab1_0Test.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/Zab1_0Test.java index 107ae6a72..dcf7819b1 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/Zab1_0Test.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/Zab1_0Test.java @@ -1195,7 +1195,7 @@ public class Zab1_0Test extends ZKTestCase { FileTxnSnapLog logFactory = new FileTxnSnapLog(tmpDir, tmpDir); File version2 = new File(tmpDir, "version-2"); version2.mkdir(); - logFactory.save(new DataTree(), new ConcurrentHashMap<Long, Integer>(), false); + logFactory.save(new DataTree(), new ConcurrentHashMap<>(), false); long zxid = ZxidUtils.makeZxid(3, 3); logFactory.append(new Request(1, 1, ZooDefs.OpCode.error, new TxnHeader(1, 1, zxid, 1, ZooDefs.OpCode.error), new ErrorTxn(1), zxid)); logFactory.commit(); diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/ZabUtils.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/ZabUtils.java index fff5e62de..0755e8920 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/ZabUtils.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/ZabUtils.java @@ -42,7 +42,7 @@ public class ZabUtils { public static final int SYNC_LIMIT = 2; public static QuorumPeer createQuorumPeer(File tmpDir) throws IOException { - HashMap<Long, QuorumPeer.QuorumServer> peers = new HashMap<Long, QuorumPeer.QuorumServer>(); + HashMap<Long, QuorumPeer.QuorumServer> peers = new HashMap<>(); QuorumPeer peer = QuorumPeer.testingQuorumPeer(); peer.syncLimit = SYNC_LIMIT; peer.initLimit = 2; diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/auth/KerberosTestUtils.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/auth/KerberosTestUtils.java index db95d8d6d..e7de1dc35 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/auth/KerberosTestUtils.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/auth/KerberosTestUtils.java @@ -115,7 +115,7 @@ public class KerberosTestUtils { @Override public AppConfigurationEntry[] getAppConfigurationEntry(String name) { - Map<String, String> options = new HashMap<String, String>(); + Map<String, String> options = new HashMap<>(); options.put("principal", principal); options.put("refreshKrb5Config", "true"); if (IBM_JAVA) { diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/auth/MiniKdc.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/auth/MiniKdc.java index fdd68b5bc..bfb61a7d8 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/auth/MiniKdc.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/auth/MiniKdc.java @@ -154,7 +154,7 @@ public class MiniKdc { public static final String TRANSPORT = "transport"; public static final String DEBUG = "debug"; - private static final Set<String> PROPERTIES = new HashSet<String>(); + private static final Set<String> PROPERTIES = new HashSet<>(); private static final Properties DEFAULT_CONFIG = new Properties(); static { @@ -214,7 +214,7 @@ public class MiniKdc { */ public MiniKdc(Properties conf, File workDir) throws Exception { if (!conf.keySet().containsAll(PROPERTIES)) { - Set<String> missingProperties = new HashSet<String>(PROPERTIES); + Set<String> missingProperties = new HashSet<>(PROPERTIES); missingProperties.removeAll(conf.keySet()); throw new IllegalArgumentException("Missing configuration properties: " + missingProperties); } diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/auth/MiniKdcTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/auth/MiniKdcTest.java index 3e57f9a46..4221ceb81 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/auth/MiniKdcTest.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/auth/MiniKdcTest.java @@ -61,7 +61,7 @@ public class MiniKdcTest extends KerberosSecurityTestcase { kdc.createPrincipal(new File(workDir, "keytab"), "foo/bar", "bar/foo"); List<PrincipalName> principalNameList = Keytab.loadKeytab(new File(workDir, "keytab")).getPrincipals(); - Set<String> principals = new HashSet<String>(); + Set<String> principals = new HashSet<>(); for (PrincipalName principalName : principalNameList) { principals.add(principalName.getName()); } @@ -82,7 +82,7 @@ public class MiniKdcTest extends KerberosSecurityTestcase { File keytab = new File(workDir, "foo.keytab"); kdc.createPrincipal(keytab, principal); - Set<Principal> principals = new HashSet<Principal>(); + Set<Principal> principals = new HashSet<>(); principals.add(new KerberosPrincipal(principal)); // client login diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/auth/QuorumAuthTestBase.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/auth/QuorumAuthTestBase.java index 67c5d70dc..f1a9bcac8 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/auth/QuorumAuthTestBase.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/auth/QuorumAuthTestBase.java @@ -43,7 +43,7 @@ import org.slf4j.LoggerFactory; public class QuorumAuthTestBase extends ZKTestCase { protected static final Logger LOG = LoggerFactory.getLogger(QuorumAuthTestBase.class); - protected List<MainThread> mt = new ArrayList<MainThread>(); + protected List<MainThread> mt = new ArrayList<>(); protected static File jaasConfigDir; public static void setupJaasConfig(String jaasEntries) { diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/auth/QuorumAuthUpgradeTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/auth/QuorumAuthUpgradeTest.java index 46d65c9a4..fb03f23d6 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/auth/QuorumAuthUpgradeTest.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/auth/QuorumAuthUpgradeTest.java @@ -87,7 +87,7 @@ public class QuorumAuthUpgradeTest extends QuorumAuthTestBase { @Test @Timeout(value = 30) public void testNullAuthLearnerServer() throws Exception { - Map<String, String> authConfigs = new HashMap<String, String>(); + Map<String, String> authConfigs = new HashMap<>(); authConfigs.put(QuorumAuth.QUORUM_SASL_AUTH_ENABLED, "false"); String connectStr = startQuorum(2, authConfigs, 0); @@ -106,7 +106,7 @@ public class QuorumAuthUpgradeTest extends QuorumAuthTestBase { @Test @Timeout(value = 30) public void testAuthLearnerAgainstNullAuthServer() throws Exception { - Map<String, String> authConfigs = new HashMap<String, String>(); + Map<String, String> authConfigs = new HashMap<>(); authConfigs.put(QuorumAuth.QUORUM_SASL_AUTH_ENABLED, "true"); String connectStr = startQuorum(2, authConfigs, 1); @@ -125,7 +125,7 @@ public class QuorumAuthUpgradeTest extends QuorumAuthTestBase { @Test @Timeout(value = 30) public void testAuthLearnerAgainstNoAuthRequiredServer() throws Exception { - Map<String, String> authConfigs = new HashMap<String, String>(); + Map<String, String> authConfigs = new HashMap<>(); authConfigs.put(QuorumAuth.QUORUM_SASL_AUTH_ENABLED, "true"); String connectStr = startQuorum(2, authConfigs, 2); @@ -144,7 +144,7 @@ public class QuorumAuthUpgradeTest extends QuorumAuthTestBase { @Test @Timeout(value = 30) public void testAuthLearnerServer() throws Exception { - Map<String, String> authConfigs = new HashMap<String, String>(); + Map<String, String> authConfigs = new HashMap<>(); authConfigs.put(QuorumAuth.QUORUM_SASL_AUTH_ENABLED, "true"); authConfigs.put(QuorumAuth.QUORUM_SERVER_SASL_AUTH_REQUIRED, "true"); authConfigs.put(QuorumAuth.QUORUM_LEARNER_SASL_AUTH_REQUIRED, "true"); @@ -178,7 +178,7 @@ public class QuorumAuthUpgradeTest extends QuorumAuthTestBase { // Start peer0,1,2 servers with quorum.auth.enableSasl=false and // quorum.auth.learnerRequireSasl=false, quorum.auth.serverRequireSasl=false // Assume this is an existing cluster. - Map<String, String> authConfigs = new HashMap<String, String>(); + Map<String, String> authConfigs = new HashMap<>(); authConfigs.put(QuorumAuth.QUORUM_SASL_AUTH_ENABLED, "false"); String connectStr = startQuorum(3, authConfigs, 0); diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/auth/QuorumDigestAuthTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/auth/QuorumDigestAuthTest.java index b1b1dedf6..c70c5c9c3 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/auth/QuorumDigestAuthTest.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/auth/QuorumDigestAuthTest.java @@ -81,7 +81,7 @@ public class QuorumDigestAuthTest extends QuorumAuthTestBase { @Test @Timeout(value = 30) public void testValidCredentials() throws Exception { - Map<String, String> authConfigs = new HashMap<String, String>(); + Map<String, String> authConfigs = new HashMap<>(); authConfigs.put(QuorumAuth.QUORUM_SASL_AUTH_ENABLED, "true"); authConfigs.put(QuorumAuth.QUORUM_SERVER_SASL_AUTH_REQUIRED, "true"); authConfigs.put(QuorumAuth.QUORUM_LEARNER_SASL_AUTH_REQUIRED, "true"); @@ -103,7 +103,7 @@ public class QuorumDigestAuthTest extends QuorumAuthTestBase { @Test @Timeout(value = 30) public void testValidCredentialsWithMultiAddresses() throws Exception { - Map<String, String> authConfigs = new HashMap<String, String>(); + Map<String, String> authConfigs = new HashMap<>(); authConfigs.put(QuorumAuth.QUORUM_SASL_AUTH_ENABLED, "true"); authConfigs.put(QuorumAuth.QUORUM_SERVER_SASL_AUTH_REQUIRED, "true"); authConfigs.put(QuorumAuth.QUORUM_LEARNER_SASL_AUTH_REQUIRED, "true"); @@ -126,7 +126,7 @@ public class QuorumDigestAuthTest extends QuorumAuthTestBase { @Test @Timeout(value = 30) public void testSaslNotRequiredWithInvalidCredentials() throws Exception { - Map<String, String> authConfigs = new HashMap<String, String>(); + Map<String, String> authConfigs = new HashMap<>(); authConfigs.put(QuorumAuth.QUORUM_LEARNER_SASL_LOGIN_CONTEXT, "QuorumLearnerInvalid"); authConfigs.put(QuorumAuth.QUORUM_SASL_AUTH_ENABLED, "false"); authConfigs.put(QuorumAuth.QUORUM_SERVER_SASL_AUTH_REQUIRED, "false"); @@ -148,7 +148,7 @@ public class QuorumDigestAuthTest extends QuorumAuthTestBase { @Test @Timeout(value = 30) public void testSaslRequiredInvalidCredentials() throws Exception { - Map<String, String> authConfigs = new HashMap<String, String>(); + Map<String, String> authConfigs = new HashMap<>(); authConfigs.put(QuorumAuth.QUORUM_LEARNER_SASL_LOGIN_CONTEXT, "QuorumLearnerInvalid"); authConfigs.put(QuorumAuth.QUORUM_SASL_AUTH_ENABLED, "true"); authConfigs.put(QuorumAuth.QUORUM_SERVER_SASL_AUTH_REQUIRED, "true"); @@ -169,7 +169,7 @@ public class QuorumDigestAuthTest extends QuorumAuthTestBase { @Test @Timeout(value = 10) public void testEnableQuorumServerRequireSaslWithoutQuorumLearnerRequireSasl() throws Exception { - Map<String, String> authConfigs = new HashMap<String, String>(); + Map<String, String> authConfigs = new HashMap<>(); authConfigs.put(QuorumAuth.QUORUM_LEARNER_SASL_LOGIN_CONTEXT, "QuorumLearner"); authConfigs.put(QuorumAuth.QUORUM_SASL_AUTH_ENABLED, "true"); authConfigs.put(QuorumAuth.QUORUM_SERVER_SASL_AUTH_REQUIRED, "true"); @@ -198,7 +198,7 @@ public class QuorumDigestAuthTest extends QuorumAuthTestBase { @Test @Timeout(value = 10) public void testEnableQuorumAuthenticationConfigurations() throws Exception { - Map<String, String> authConfigs = new HashMap<String, String>(); + Map<String, String> authConfigs = new HashMap<>(); authConfigs.put(QuorumAuth.QUORUM_LEARNER_SASL_LOGIN_CONTEXT, "QuorumLearner"); authConfigs.put(QuorumAuth.QUORUM_SASL_AUTH_ENABLED, "false"); diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/auth/QuorumKerberosAuthTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/auth/QuorumKerberosAuthTest.java index d9a32a755..475c89973 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/auth/QuorumKerberosAuthTest.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/auth/QuorumKerberosAuthTest.java @@ -114,7 +114,7 @@ public class QuorumKerberosAuthTest extends KerberosSecurityTestcase { public void testValidCredentials() throws Exception { String serverPrincipal = KerberosTestUtils.getServerPrincipal(); serverPrincipal = serverPrincipal.substring(0, serverPrincipal.lastIndexOf("@")); - Map<String, String> authConfigs = new HashMap<String, String>(); + Map<String, String> authConfigs = new HashMap<>(); authConfigs.put(QuorumAuth.QUORUM_SASL_AUTH_ENABLED, "true"); authConfigs.put(QuorumAuth.QUORUM_SERVER_SASL_AUTH_REQUIRED, "true"); authConfigs.put(QuorumAuth.QUORUM_LEARNER_SASL_AUTH_REQUIRED, "true"); @@ -138,7 +138,7 @@ public class QuorumKerberosAuthTest extends KerberosSecurityTestcase { public void testValidCredentialsWithMultiAddresses() throws Exception { String serverPrincipal = KerberosTestUtils.getServerPrincipal(); serverPrincipal = serverPrincipal.substring(0, serverPrincipal.lastIndexOf("@")); - Map<String, String> authConfigs = new HashMap<String, String>(); + Map<String, String> authConfigs = new HashMap<>(); authConfigs.put(QuorumAuth.QUORUM_SASL_AUTH_ENABLED, "true"); authConfigs.put(QuorumAuth.QUORUM_SERVER_SASL_AUTH_REQUIRED, "true"); authConfigs.put(QuorumAuth.QUORUM_LEARNER_SASL_AUTH_REQUIRED, "true"); diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/auth/QuorumKerberosHostBasedAuthTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/auth/QuorumKerberosHostBasedAuthTest.java index f02da0b20..287761ac3 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/auth/QuorumKerberosHostBasedAuthTest.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/auth/QuorumKerberosHostBasedAuthTest.java @@ -138,7 +138,7 @@ public class QuorumKerberosHostBasedAuthTest extends KerberosSecurityTestcase { @Timeout(value = 120) public void testValidCredentials() throws Exception { String serverPrincipal = hostServerPrincipal.substring(0, hostServerPrincipal.lastIndexOf("@")); - Map<String, String> authConfigs = new HashMap<String, String>(); + Map<String, String> authConfigs = new HashMap<>(); authConfigs.put(QuorumAuth.QUORUM_SASL_AUTH_ENABLED, "true"); authConfigs.put(QuorumAuth.QUORUM_SERVER_SASL_AUTH_REQUIRED, "true"); authConfigs.put(QuorumAuth.QUORUM_LEARNER_SASL_AUTH_REQUIRED, "true"); @@ -161,7 +161,7 @@ public class QuorumKerberosHostBasedAuthTest extends KerberosSecurityTestcase { @Timeout(value = 120) public void testValidCredentialsWithMultiAddresses() throws Exception { String serverPrincipal = hostServerPrincipal.substring(0, hostServerPrincipal.lastIndexOf("@")); - Map<String, String> authConfigs = new HashMap<String, String>(); + Map<String, String> authConfigs = new HashMap<>(); authConfigs.put(QuorumAuth.QUORUM_SASL_AUTH_ENABLED, "true"); authConfigs.put(QuorumAuth.QUORUM_SERVER_SASL_AUTH_REQUIRED, "true"); authConfigs.put(QuorumAuth.QUORUM_LEARNER_SASL_AUTH_REQUIRED, "true"); @@ -183,7 +183,7 @@ public class QuorumKerberosHostBasedAuthTest extends KerberosSecurityTestcase { @Timeout(value = 120) public void testConnectBadServer() throws Exception { String serverPrincipal = hostServerPrincipal.substring(0, hostServerPrincipal.lastIndexOf("@")); - Map<String, String> authConfigs = new HashMap<String, String>(); + Map<String, String> authConfigs = new HashMap<>(); authConfigs.put(QuorumAuth.QUORUM_SASL_AUTH_ENABLED, "true"); authConfigs.put(QuorumAuth.QUORUM_SERVER_SASL_AUTH_REQUIRED, "true"); authConfigs.put(QuorumAuth.QUORUM_LEARNER_SASL_AUTH_REQUIRED, "true"); diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/server/util/BitHashSetTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/util/BitHashSetTest.java index 5a2a5b79b..8d42528af 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/util/BitHashSetTest.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/util/BitHashSetTest.java @@ -36,7 +36,7 @@ public class BitHashSetTest extends ZKTestCase { assertEquals(1, ws.size()); assertEquals(1, ws.cachedSize()); - List<Integer> actualBits = new ArrayList<Integer>(); + List<Integer> actualBits = new ArrayList<>(); for (int bit : ws) { actualBits.add(bit); @@ -77,7 +77,7 @@ public class BitHashSetTest extends ZKTestCase { assertEquals(1, ws.size()); assertEquals(0, ws.cachedSize()); - List<Integer> actualBits = new ArrayList<Integer>(); + List<Integer> actualBits = new ArrayList<>(); for (int bit : ws) { actualBits.add(bit); diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/server/util/BitMapTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/util/BitMapTest.java index 8c1922f35..9ea76e702 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/util/BitMapTest.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/util/BitMapTest.java @@ -28,7 +28,7 @@ public class BitMapTest extends ZKTestCase { @Test public void testAddAndRemove() { - BitMap<String> bitMap = new BitMap<String>(); + BitMap<String> bitMap = new BitMap<>(); String v1 = "v1"; Integer bit = bitMap.add(v1); @@ -62,7 +62,7 @@ public class BitMapTest extends ZKTestCase { @Test public void testBitReuse() { - BitMap<String> bitMap = new BitMap<String>(); + BitMap<String> bitMap = new BitMap<>(); int v1Bit = bitMap.add("v1"); int v2Bit = bitMap.add("v2"); int v3Bit = bitMap.add("v3"); diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/server/watch/WatchManagerTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/watch/WatchManagerTest.java index bd613a444..f65391c49 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/watch/WatchManagerTest.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/watch/WatchManagerTest.java @@ -236,7 +236,7 @@ public class WatchManagerTest extends ZKTestCase { // 1. start 5 workers to trigger watchers on that path // count all the watchers have been fired AtomicInteger watchTriggered = new AtomicInteger(); - List<WatcherTriggerWorker> triggerWorkers = new ArrayList<WatcherTriggerWorker>(); + List<WatcherTriggerWorker> triggerWorkers = new ArrayList<>(); for (int i = 0; i < 5; i++) { WatcherTriggerWorker worker = new WatcherTriggerWorker(manager, paths, watchTriggered); triggerWorkers.add(worker); @@ -246,7 +246,7 @@ public class WatchManagerTest extends ZKTestCase { // 2. start 5 workers to add different watchers on the same path // count all the watchers being added AtomicInteger watchesAdded = new AtomicInteger(); - List<AddWatcherWorker> addWorkers = new ArrayList<AddWatcherWorker>(); + List<AddWatcherWorker> addWorkers = new ArrayList<>(); for (int i = 0; i < 5; i++) { AddWatcherWorker worker = new AddWatcherWorker(manager, paths, watchers, watchesAdded); addWorkers.add(worker); @@ -297,7 +297,7 @@ public class WatchManagerTest extends ZKTestCase { // 1. start 5 workers to remove watchers on those path // record the watchers have been removed AtomicInteger watchesRemoved = new AtomicInteger(); - List<RemoveWatcherWorker> removeWorkers = new ArrayList<RemoveWatcherWorker>(); + List<RemoveWatcherWorker> removeWorkers = new ArrayList<>(); for (int i = 0; i < 5; i++) { RemoveWatcherWorker worker = new RemoveWatcherWorker(manager, paths, watchers, watchesRemoved); removeWorkers.add(worker); @@ -307,7 +307,7 @@ public class WatchManagerTest extends ZKTestCase { // 2. start 5 workers to add different watchers on different path // record the watchers have been added AtomicInteger watchesAdded = new AtomicInteger(); - List<AddWatcherWorker> addWorkers = new ArrayList<AddWatcherWorker>(); + List<AddWatcherWorker> addWorkers = new ArrayList<>(); for (int i = 0; i < 5; i++) { AddWatcherWorker worker = new AddWatcherWorker(manager, paths, watchers, watchesAdded); addWorkers.add(worker); @@ -359,8 +359,8 @@ public class WatchManagerTest extends ZKTestCase { // 1. start 5 workers to randomly mark those watcher as dead // and remove them from watch manager - Set<Watcher> deadWatchers = new HashSet<Watcher>(); - List<CreateDeadWatchersWorker> deadWorkers = new ArrayList<CreateDeadWatchersWorker>(); + Set<Watcher> deadWatchers = new HashSet<>(); + List<CreateDeadWatchersWorker> deadWorkers = new ArrayList<>(); for (int i = 0; i < 5; i++) { CreateDeadWatchersWorker worker = new CreateDeadWatchersWorker(manager, watchers, deadWatchers); deadWorkers.add(worker); @@ -369,7 +369,7 @@ public class WatchManagerTest extends ZKTestCase { // 2. start 5 workers to add different watchers on the same path AtomicInteger watchesAdded = new AtomicInteger(); - List<AddWatcherWorker> addWorkers = new ArrayList<AddWatcherWorker>(); + List<AddWatcherWorker> addWorkers = new ArrayList<>(); for (int i = 0; i < 5; i++) { AddWatcherWorker worker = new AddWatcherWorker(manager, paths, watchers, watchesAdded); addWorkers.add(worker); diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/server/watch/WatcherCleanerTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/watch/WatcherCleanerTest.java index 9ed145aa3..17e44eb9b 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/watch/WatcherCleanerTest.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/watch/WatcherCleanerTest.java @@ -43,7 +43,7 @@ public class WatcherCleanerTest extends ZKTestCase { private CountDownLatch latch; private int delayMs; - private Set<Integer> deadWatchers = new HashSet<Integer>(); + private Set<Integer> deadWatchers = new HashSet<>(); public void setCountDownLatch(CountDownLatch latch) { this.latch = latch; diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/server/watch/WatcherOrBitSetTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/watch/WatcherOrBitSetTest.java index fb25d2104..6e4220a77 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/watch/WatcherOrBitSetTest.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/watch/WatcherOrBitSetTest.java @@ -32,7 +32,7 @@ public class WatcherOrBitSetTest extends ZKTestCase { @Test public void testWatcherSet() { - Set<Watcher> wset = new HashSet<Watcher>(); + Set<Watcher> wset = new HashSet<>(); WatcherOrBitSet hashSet = new WatcherOrBitSet(wset); assertEquals(0, hashSet.size()); diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/server/watch/WatchesPathReportTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/watch/WatchesPathReportTest.java index 4e1c31682..37efedab9 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/watch/WatchesPathReportTest.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/watch/WatchesPathReportTest.java @@ -36,11 +36,11 @@ public class WatchesPathReportTest extends ZKTestCase { @BeforeEach public void setUp() { m = new HashMap<String, Set<Long>>(); - Set<Long> s = new HashSet<Long>(); + Set<Long> s = new HashSet<>(); s.add(101L); s.add(102L); m.put("path1", s); - s = new HashSet<Long>(); + s = new HashSet<>(); s.add(201L); m.put("path2", s); r = new WatchesPathReport(m); diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/server/watch/WatchesReportTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/watch/WatchesReportTest.java index 0ae952f6c..3b0d0e2ae 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/watch/WatchesReportTest.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/watch/WatchesReportTest.java @@ -36,11 +36,11 @@ public class WatchesReportTest extends ZKTestCase { @BeforeEach public void setUp() { m = new HashMap<Long, Set<String>>(); - Set<String> s = new HashSet<String>(); + Set<String> s = new HashSet<>(); s.add("path1a"); s.add("path1b"); m.put(1L, s); - s = new HashSet<String>(); + s = new HashSet<>(); s.add("path2a"); m.put(2L, s); r = new WatchesReport(m); diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/test/ACLTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/ACLTest.java index d1b5a1065..2f0d408fc 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/test/ACLTest.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/ACLTest.java @@ -156,7 +156,7 @@ public class ACLTest extends ZKTestCase implements Watcher { id.setId("1.1.1." + j); id.setScheme("ip"); acl.setId(id); - List<ACL> list = new ArrayList<ACL>(); + List<ACL> list = new ArrayList<>(); list.add(acl); zk.create(path, path.getBytes(), list, CreateMode.PERSISTENT); } @@ -184,7 +184,7 @@ public class ACLTest extends ZKTestCase implements Watcher { id.setId("1.1.1." + j); id.setScheme("ip"); acl.setId(id); - ArrayList<ACL> list = new ArrayList<ACL>(); + ArrayList<ACL> list = new ArrayList<>(); list.add(acl); zk.create(path, path.getBytes(), list, CreateMode.PERSISTENT); } @@ -268,7 +268,7 @@ public class ACLTest extends ZKTestCase implements Watcher { ZooKeeper zk = ClientBase.createZKClient(HOSTPORT); try { - List<ACL> acls = new ArrayList<ACL>(); + List<ACL> acls = new ArrayList<>(); acls.add(null); // case 1 : null value in ACL list with create diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/test/AsyncOps.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/AsyncOps.java index ea02aa82a..f55e9675e 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/test/AsyncOps.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/AsyncOps.java @@ -281,7 +281,7 @@ public class AsyncOps { public static class ChildrenCB extends AsyncCB implements ChildrenCallback { - List<String> children = new ArrayList<String>(); + List<String> children = new ArrayList<>(); ChildrenCB(ZooKeeper zk) { this(zk, new CountDownLatch(1)); @@ -366,7 +366,7 @@ public class AsyncOps { public static class Children2CB extends AsyncCB implements Children2Callback { - List<String> children = new ArrayList<String>(); + List<String> children = new ArrayList<>(); Children2CB(ZooKeeper zk) { this(zk, new CountDownLatch(1)); diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/test/AsyncTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/AsyncTest.java index c31527003..f1667db10 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/test/AsyncTest.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/AsyncTest.java @@ -64,7 +64,7 @@ public class AsyncTest extends ZKTestCase implements StringCallback, VoidCallbac return zk; } - List<Integer> results = new LinkedList<Integer>(); + List<Integer> results = new LinkedList<>(); @Test public void testAsync() throws Exception { diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/test/ClientBase.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/ClientBase.java index 43c2fad07..e2257c156 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/test/ClientBase.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/ClientBase.java @@ -230,7 +230,7 @@ public abstract class ClientBase extends ZKTestCase { } public static List<HostPort> parseHostPortList(String hplist) { - ArrayList<HostPort> alist = new ArrayList<HostPort>(); + ArrayList<HostPort> alist = new ArrayList<>(); for (String hp : hplist.split(",")) { int idx = hp.lastIndexOf(':'); String host = hp.substring(0, idx); @@ -465,7 +465,7 @@ public abstract class ClientBase extends ZKTestCase { } protected void setUpAll() throws Exception { - allClients = new LinkedList<ZooKeeper>(); + allClients = new LinkedList<>(); allClientsSetup = true; } diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/test/ClientTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/ClientTest.java index 5ee50f19a..96db26f80 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/test/ClientTest.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/ClientTest.java @@ -135,7 +135,7 @@ public class ClientTest extends ClientBase { } try { - ArrayList<ACL> testACL = new ArrayList<ACL>(); + ArrayList<ACL> testACL = new ArrayList<>(); testACL.add(new ACL(Perms.ALL | Perms.ADMIN, Ids.AUTH_IDS)); testACL.add(new ACL(Perms.ALL | Perms.ADMIN, new Id("ip", "127.0.0.1/8"))); zk.create("/acltest", new byte[0], testACL, CreateMode.PERSISTENT); @@ -145,7 +145,7 @@ public class ClientTest extends ClientBase { } try { - ArrayList<ACL> testACL = new ArrayList<ACL>(); + ArrayList<ACL> testACL = new ArrayList<>(); testACL.add(new ACL(Perms.ALL | Perms.ADMIN, new Id())); zk.create("/nullidtest", new byte[0], testACL, CreateMode.PERSISTENT); fail("Should have received an invalid acl error"); @@ -154,7 +154,7 @@ public class ClientTest extends ClientBase { } zk.addAuthInfo("digest", "ben:passwd".getBytes()); - ArrayList<ACL> testACL = new ArrayList<ACL>(); + ArrayList<ACL> testACL = new ArrayList<>(); testACL.add(new ACL(Perms.ALL, new Id("auth", ""))); testACL.add(new ACL(Perms.WRITE, new Id("ip", "127.0.0.1"))); zk.create("/acltest", new byte[0], testACL, CreateMode.PERSISTENT); @@ -204,7 +204,7 @@ public class ClientTest extends ClientBase { try { zk = createClient(); zk.addAuthInfo("digest", "ben:passwd".getBytes()); - ArrayList<ACL> testACL = new ArrayList<ACL>(); + ArrayList<ACL> testACL = new ArrayList<>(); testACL.add(new ACL(Perms.ALL, new Id("auth", null))); zk.create("/acltest", new byte[0], testACL, CreateMode.PERSISTENT); zk.close(); @@ -242,7 +242,7 @@ public class ClientTest extends ClientBase { private class MyWatcher extends CountdownWatcher { - LinkedBlockingQueue<WatchedEvent> events = new LinkedBlockingQueue<WatchedEvent>(); + LinkedBlockingQueue<WatchedEvent> events = new LinkedBlockingQueue<>(); public void process(WatchedEvent event) { super.process(event); diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/test/DisconnectedWatcherTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/DisconnectedWatcherTest.java index c8a4fffe7..aacede199 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/test/DisconnectedWatcherTest.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/DisconnectedWatcherTest.java @@ -43,7 +43,7 @@ public class DisconnectedWatcherTest extends ClientBase { private class MyWatcher extends CountdownWatcher { - LinkedBlockingQueue<WatchedEvent> events = new LinkedBlockingQueue<WatchedEvent>(); + LinkedBlockingQueue<WatchedEvent> events = new LinkedBlockingQueue<>(); public void process(WatchedEvent event) { super.process(event); @@ -200,7 +200,7 @@ public class DisconnectedWatcherTest extends ClientBase { // Create 10,000 nodes. This should ensure the length of our // watches set below exceeds 1MB. - List<String> paths = new ArrayList<String>(); + List<String> paths = new ArrayList<>(); for (int i = 0; i < 10000; i++) { String path = zk1.create(pathBase + "/ch-", null, Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT_SEQUENTIAL); paths.add(path); diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/test/FLENewEpochTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/FLENewEpochTest.java index 2ad1fe1b8..eb62dd653 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/test/FLENewEpochTest.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/FLENewEpochTest.java @@ -54,8 +54,8 @@ public class FLENewEpochTest extends ZKTestCase { public void setUp() throws Exception { count = 3; - peers = new HashMap<Long, QuorumServer>(count); - threads = new ArrayList<LEThread>(count); + peers = new HashMap<>(count); + threads = new ArrayList<>(count); tmpdir = new File[count]; port = new int[count]; diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/test/FLEPredicateTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/FLEPredicateTest.java index b9e374953..5c372b9dc 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/test/FLEPredicateTest.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/FLEPredicateTest.java @@ -55,7 +55,7 @@ public class FLEPredicateTest extends ZKTestCase { @Test public void testPredicate() throws IOException { - peers = new HashMap<Long, QuorumServer>(3); + peers = new HashMap<>(3); /* * Creates list of peers. diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/test/FLERestartTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/FLERestartTest.java index 52cd1851a..07ac68b78 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/test/FLERestartTest.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/FLERestartTest.java @@ -74,8 +74,8 @@ public class FLERestartTest extends ZKTestCase { @BeforeEach public void setUp() throws Exception { count = 3; - peers = new HashMap<Long, QuorumServer>(count); - restartThreads = new ArrayList<FLERestartThread>(count); + peers = new HashMap<>(count); + restartThreads = new ArrayList<>(count); tmpdir = new File[count]; port = new int[count]; finish = new Semaphore(0); diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/test/FLETest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/FLETest.java index 0f679b2d2..b147f7ae8 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/test/FLETest.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/FLETest.java @@ -90,14 +90,14 @@ public class FLETest extends ZKTestCase { public void setUp() throws Exception { count = 7; - peers = new HashMap<Long, QuorumServer>(count); - threads = new ArrayList<LEThread>(count); + peers = new HashMap<>(count); + threads = new ArrayList<>(count); voteMap = new HashMap<Integer, HashSet<TestVote>>(); votes = new Vote[count]; tmpdir = new File[count]; port = new int[count]; successCount = 0; - joinedThreads = new HashSet<Long>(); + joinedThreads = new HashSet<>(); } @AfterEach @@ -191,7 +191,7 @@ public class FLETest extends ZKTestCase { * we first update it with the vote of this peer. */ if (quora.get(v.getId()) == null) { - quora.put(v.getId(), new HashSet<Integer>()); + quora.put(v.getId(), new HashSet<>()); } quora.get(v.getId()).add(i); @@ -296,7 +296,7 @@ public class FLETest extends ZKTestCase { * @throws Exception */ private void runElection(int rounds) throws Exception { - ConcurrentHashMap<Long, HashSet<Integer>> quora = new ConcurrentHashMap<Long, HashSet<Integer>>(); + ConcurrentHashMap<Long, HashSet<Integer>> quora = new ConcurrentHashMap<>(); LOG.info("TestLE: {}, {}", getTestName(), count); @@ -401,7 +401,7 @@ public class FLETest extends ZKTestCase { int sid; QuorumPeer peer; int waitTime = 10 * 1000; - ArrayList<QuorumPeer> peerList = new ArrayList<QuorumPeer>(); + ArrayList<QuorumPeer> peerList = new ArrayList<>(); for (sid = 0; sid < 3; sid++) { port[sid] = PortAssignment.unique(); peers.put(Long.valueOf(sid), new QuorumServer(sid, new InetSocketAddress("127.0.0.1", PortAssignment.unique()), new InetSocketAddress("127.0.0.1", PortAssignment.unique()), new InetSocketAddress("127.0.0.1", port[sid]))); @@ -450,7 +450,7 @@ public class FLETest extends ZKTestCase { int sid; QuorumPeer peer; int waitTime = 10 * 1000; - ArrayList<QuorumPeer> peerList = new ArrayList<QuorumPeer>(); + ArrayList<QuorumPeer> peerList = new ArrayList<>(); for (sid = 0; sid < 3; sid++) { peers.put(Long.valueOf(sid), new QuorumServer(sid, new InetSocketAddress("127.0.0.1", PortAssignment.unique()), new InetSocketAddress("127.0.0.1", PortAssignment.unique()))); tmpdir[sid] = ClientBase.createTmpDir(); diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/test/FLEZeroWeightTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/FLEZeroWeightTest.java index 59ed266f6..68bfa3127 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/test/FLEZeroWeightTest.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/FLEZeroWeightTest.java @@ -57,8 +57,8 @@ public class FLEZeroWeightTest extends ZKTestCase { public void setUp() throws Exception { count = 9; - peers = new HashMap<Long, QuorumServer>(count); - threads = new ArrayList<LEThread>(count); + peers = new HashMap<>(count); + threads = new ArrayList<>(count); votes = new Vote[count]; tmpdir = new File[count]; port = new int[count]; diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/test/FollowerResyncConcurrencyTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/FollowerResyncConcurrencyTest.java index aafd36ac7..d9d67c402 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/test/FollowerResyncConcurrencyTest.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/FollowerResyncConcurrencyTest.java @@ -635,7 +635,7 @@ public class FollowerResyncConcurrencyTest extends ZKTestCase { private class MyWatcher extends CountdownWatcher { - LinkedBlockingQueue<WatchedEvent> events = new LinkedBlockingQueue<WatchedEvent>(); + LinkedBlockingQueue<WatchedEvent> events = new LinkedBlockingQueue<>(); public void process(WatchedEvent event) { super.process(event); diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/test/GetChildren2Test.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/GetChildren2Test.java index 6776fdf4e..0ea8053dc 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/test/GetChildren2Test.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/GetChildren2Test.java @@ -93,8 +93,8 @@ public class GetChildren2Test extends ClientBase { String name = "/foo"; zk.create(name, name.getBytes(), Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT); - List<String> children = new ArrayList<String>(); - List<String> children_s = new ArrayList<String>(); + List<String> children = new ArrayList<>(); + List<String> children_s = new ArrayList<>(); for (int i = 0; i < 10; i++) { String childname = name + "/bar" + i; diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/test/GetProposalFromTxnTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/GetProposalFromTxnTest.java index ed6a30d48..010d69b33 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/test/GetProposalFromTxnTest.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/GetProposalFromTxnTest.java @@ -101,7 +101,7 @@ public class GetProposalFromTxnTest extends ZKTestCase { Iterator<Proposal> itr = db.getProposalsFromTxnLog(zxids[0], 10000000); int createCount = 0; - ArrayList<Long> retrievedZxids = new ArrayList<Long>(MSG_COUNT); + ArrayList<Long> retrievedZxids = new ArrayList<>(MSG_COUNT); // Get zxid of create requests while (itr.hasNext()) { diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/test/HierarchicalQuorumTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/HierarchicalQuorumTest.java index 35992513d..e91261ed3 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/test/HierarchicalQuorumTest.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/HierarchicalQuorumTest.java @@ -214,7 +214,7 @@ public class HierarchicalQuorumTest extends ClientBase { // interesting to see what's there... JMXEnv.dump(); // make sure we have these 5 servers listed - Set<String> ensureNames = new LinkedHashSet<String>(); + Set<String> ensureNames = new LinkedHashSet<>(); for (int i = 1; i <= numberOfPeers; i++) { ensureNames.add("InMemoryDataTree"); } diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/test/IntegrityCheck.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/IntegrityCheck.java index 4aba36da2..1fc467cc2 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/test/IntegrityCheck.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/IntegrityCheck.java @@ -52,7 +52,7 @@ public class IntegrityCheck implements StatCallback, DataCallback { ZooKeeper zk; - Map<String, byte[]> lastValue = new HashMap<String, byte[]>(); + Map<String, byte[]> lastValue = new HashMap<>(); int count; diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/test/JMXEnv.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/JMXEnv.java index 5b80574e6..49db17078 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/test/JMXEnv.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/JMXEnv.java @@ -111,7 +111,7 @@ public class JMXEnv { throw new RuntimeException(e); } - found = new HashSet<ObjectName>(); + found = new HashSet<>(); for (String name : expectedNames) { LOG.info("expect:{}", name); for (ObjectName bean : beans) { @@ -220,7 +220,7 @@ public class JMXEnv { Set<ObjectName> beans; int nTry = 0; - Set<ObjectName> found = new HashSet<ObjectName>(); + Set<ObjectName> found = new HashSet<>(); do { if (nTry++ > 0) { Thread.sleep(500); diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/test/LoadFromLogNoServerTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/LoadFromLogNoServerTest.java index 30c277207..bec029d2c 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/test/LoadFromLogNoServerTest.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/LoadFromLogNoServerTest.java @@ -130,7 +130,7 @@ public class LoadFromLogNoServerTest extends ZKTestCase { } else if (type == ZooDefs.OpCode.multi) { txnHeader = new TxnHeader(0xabcd, 0x123, prevPzxid + 1, Time.currentElapsedTime(), ZooDefs.OpCode.create); txn = new CreateTxn(path, new byte[0], null, false, cversion); - List<Txn> txnList = new ArrayList<Txn>(); + List<Txn> txnList = new ArrayList<>(); ByteArrayOutputStream baos = new ByteArrayOutputStream(); BinaryOutputArchive boa = BinaryOutputArchive.getArchive(baos); txn.serialize(boa, "request"); diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/test/LocalSessionsOnlyTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/LocalSessionsOnlyTest.java index 98fafdfde..cf6d46a6d 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/test/LocalSessionsOnlyTest.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/LocalSessionsOnlyTest.java @@ -106,7 +106,7 @@ public class LocalSessionsOnlyTest extends ZKTestCase { zk.close(); // Validate data on both follower and leader - Map<String, Integer> peers = new HashMap<String, Integer>(); + Map<String, Integer> peers = new HashMap<>(); peers.put("leader", leaderIdx); peers.put("follower", followerIdx); for (Entry<String, Integer> entry : peers.entrySet()) { diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/test/LogChopperTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/LogChopperTest.java index e31eba261..9bdefc051 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/test/LogChopperTest.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/LogChopperTest.java @@ -85,7 +85,7 @@ public class LogChopperTest extends ClientBase { } txnLog.close(); rmr(tmp); - return new Pair<Long, Long>(firstZxid, lastZxid); + return new Pair<>(firstZxid, lastZxid); } @Test diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/test/MultiAsyncTransactionTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/MultiAsyncTransactionTest.java index 0ee0825e9..fada1c479 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/test/MultiAsyncTransactionTest.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/MultiAsyncTransactionTest.java @@ -82,7 +82,7 @@ public class MultiAsyncTransactionTest extends ClientBase { @Test public void testSequentialNodeCreateInAsyncMulti() throws Exception { final int iteration = 4; - final List<MultiResult> results = new ArrayList<MultiResult>(); + final List<MultiResult> results = new ArrayList<>(); pendingOps.set(iteration); diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/test/MultiOperationTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/MultiOperationTest.java index 4ff593222..0fdf02ca7 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/test/MultiOperationTest.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/MultiOperationTest.java @@ -192,7 +192,7 @@ public class MultiOperationTest extends ClientBase { @ValueSource(booleans = {true, false}) @Timeout(value = 90) public void testInvalidPath(boolean useAsync) throws Exception { - List<Integer> expectedResultCodes = new ArrayList<Integer>(); + List<Integer> expectedResultCodes = new ArrayList<>(); expectedResultCodes.add(KeeperException.Code.RUNTIMEINCONSISTENCY.intValue()); expectedResultCodes.add(KeeperException.Code.BADARGUMENTS.intValue()); expectedResultCodes.add(KeeperException.Code.RUNTIMEINCONSISTENCY.intValue()); @@ -295,7 +295,7 @@ public class MultiOperationTest extends ClientBase { @ValueSource(booleans = {true, false}) @Timeout(value = 90) public void testBlankPath(boolean useAsync) throws Exception { - List<Integer> expectedResultCodes = new ArrayList<Integer>(); + List<Integer> expectedResultCodes = new ArrayList<>(); expectedResultCodes.add(KeeperException.Code.RUNTIMEINCONSISTENCY.intValue()); expectedResultCodes.add(KeeperException.Code.BADARGUMENTS.intValue()); expectedResultCodes.add(KeeperException.Code.RUNTIMEINCONSISTENCY.intValue()); @@ -318,7 +318,7 @@ public class MultiOperationTest extends ClientBase { @ValueSource(booleans = {true, false}) @Timeout(value = 90) public void testInvalidCreateModeFlag(boolean useAsync) throws Exception { - List<Integer> expectedResultCodes = new ArrayList<Integer>(); + List<Integer> expectedResultCodes = new ArrayList<>(); expectedResultCodes.add(KeeperException.Code.RUNTIMEINCONSISTENCY.intValue()); expectedResultCodes.add(KeeperException.Code.BADARGUMENTS.intValue()); expectedResultCodes.add(KeeperException.Code.RUNTIMEINCONSISTENCY.intValue()); @@ -361,7 +361,7 @@ public class MultiOperationTest extends ClientBase { // setData using chRoot client. zk_chroot = createClient(this.hostPort + chRoot); String[] names = {"/multi0", "/multi1", "/multi2"}; - List<Op> ops = new ArrayList<Op>(); + List<Op> ops = new ArrayList<>(); for (int i = 0; i < names.length; i++) { ops.add(Op.create(names[i], new byte[0], Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT)); @@ -383,7 +383,7 @@ public class MultiOperationTest extends ClientBase { // checking the child version using chRoot client. zk_chroot = createClient(this.hostPort + chRoot); String[] names = {"/multi0", "/multi1", "/multi2"}; - List<Op> ops = new ArrayList<Op>(); + List<Op> ops = new ArrayList<>(); for (int i = 0; i < names.length; i++) { zk.create(chRoot + names[i], new byte[0], Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT); @@ -499,7 +499,7 @@ public class MultiOperationTest extends ClientBase { public void testSetData(boolean useAsync) throws Exception { String[] names = {"/multi0", "/multi1", "/multi2"}; - List<Op> ops = new ArrayList<Op>(); + List<Op> ops = new ArrayList<>(); for (int i = 0; i < names.length; i++) { ops.add(Op.create(names[i], new byte[0], Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT)); @@ -745,8 +745,8 @@ public class MultiOperationTest extends ClientBase { @ParameterizedTest @ValueSource(booleans = {true, false}) public void testMultiGetChildren(boolean useAsync) throws Exception { - List<String> topLevelNodes = new ArrayList<String>(); - Map<String, List<String>> childrenNodes = new HashMap<String, List<String>>(); + List<String> topLevelNodes = new ArrayList<>(); + Map<String, List<String>> childrenNodes = new HashMap<>(); // Creating a database where '/fooX' nodes has 'barXY' named children. for (int i = 0; i < 10; i++) { String name = "/foo" + i; @@ -777,7 +777,7 @@ public class MultiOperationTest extends ClientBase { @ParameterizedTest @ValueSource(booleans = {true, false}) public void testMultiGetChildrenSameNode(boolean useAsync) throws Exception { - List<String> childrenNodes = new ArrayList<String>(); + List<String> childrenNodes = new ArrayList<>(); // Creating a database where '/foo' node has 'barX' named children. String topLevelNode = "/foo"; zk.create(topLevelNode, topLevelNode.getBytes(), Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT); diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/test/ObserverMasterTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/ObserverMasterTest.java index 573d361ae..edde2b5da 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/test/ObserverMasterTest.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/ObserverMasterTest.java @@ -439,7 +439,7 @@ public class ObserverMasterTest extends ObserverMasterTestBase { waitServerUp(observerClientPort); // create a client to the observer - final LinkedBlockingQueue<KeeperState> states = new LinkedBlockingQueue<KeeperState>(); + final LinkedBlockingQueue<KeeperState> states = new LinkedBlockingQueue<>(); ZooKeeper observerClient = new ZooKeeper( "127.0.0.1:" + observerClientPort, ClientBase.CONNECTION_TIMEOUT, @@ -456,7 +456,7 @@ public class ObserverMasterTest extends ObserverMasterTestBase { assertEquals(KeeperState.SyncConnected, state); // issue reconfig command - ArrayList<String> newServers = new ArrayList<String>(); + ArrayList<String> newServers = new ArrayList<>(); String server = "server.3=127.0.0.1:" + PortAssignment.unique() + ":" + PortAssignment.unique() + ":participant;localhost:" + PortAssignment.unique(); newServers.add(server); ZooKeeperAdmin admin = createAdmin(clientPort1); diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/test/QuorumBase.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/QuorumBase.java index 4f723f299..42740f897 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/test/QuorumBase.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/QuorumBase.java @@ -183,7 +183,7 @@ public class QuorumBase extends ClientBase { int initLimit = 3; int syncLimit = 3; int connectToLearnerMasterLimit = 3; - Map<Long, QuorumServer> peers = new HashMap<Long, QuorumServer>(); + Map<Long, QuorumServer> peers = new HashMap<>(); peers.put(Long.valueOf(1), new QuorumServer(1, new InetSocketAddress(LOCALADDR, port1), new InetSocketAddress(LOCALADDR, portLE1), new InetSocketAddress(LOCALADDR, portClient1), LearnerType.PARTICIPANT)); peers.put(Long.valueOf(2), new QuorumServer(2, new InetSocketAddress(LOCALADDR, port2), new InetSocketAddress(LOCALADDR, portLE2), new InetSocketAddress(LOCALADDR, portClient2), LearnerType.PARTICIPANT)); peers.put(Long.valueOf(3), new QuorumServer(3, new InetSocketAddress(LOCALADDR, port3), new InetSocketAddress(LOCALADDR, portLE3), new InetSocketAddress(LOCALADDR, portClient3), LearnerType.PARTICIPANT)); @@ -279,7 +279,7 @@ public class QuorumBase extends ClientBase { // interesting to see what's there... JMXEnv.dump(); // make sure we have these 5 servers listed - Set<String> ensureNames = new LinkedHashSet<String>(); + Set<String> ensureNames = new LinkedHashSet<>(); for (int i = 1; i <= 5; i++) { ensureNames.add("InMemoryDataTree"); } @@ -384,7 +384,7 @@ public class QuorumBase extends ClientBase { } public ArrayList<QuorumPeer> getPeerList() { - ArrayList<QuorumPeer> peers = new ArrayList<QuorumPeer>(); + ArrayList<QuorumPeer> peers = new ArrayList<>(); peers.add(s1); peers.add(s2); peers.add(s3); @@ -418,7 +418,7 @@ public class QuorumBase extends ClientBase { int connectToLearnerMasterLimit = 3; if (peers == null) { - peers = new HashMap<Long, QuorumServer>(); + peers = new HashMap<>(); peers.put(Long.valueOf(1), new QuorumServer(1, new InetSocketAddress(LOCALADDR, port1), new InetSocketAddress(LOCALADDR, portLE1), new InetSocketAddress(LOCALADDR, portClient1), LearnerType.PARTICIPANT)); peers.put(Long.valueOf(2), new QuorumServer(2, new InetSocketAddress(LOCALADDR, port2), new InetSocketAddress(LOCALADDR, portLE2), new InetSocketAddress(LOCALADDR, portClient2), LearnerType.PARTICIPANT)); diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/test/QuorumBaseOracle_2Nodes.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/QuorumBaseOracle_2Nodes.java index d32af9995..a7f4a7e1d 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/test/QuorumBaseOracle_2Nodes.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/QuorumBaseOracle_2Nodes.java @@ -129,7 +129,7 @@ public class QuorumBaseOracle_2Nodes extends ClientBase{ int initLimit = 3; int syncLimit = 3; int connectToLearnerMasterLimit = 3; - Map<Long, QuorumPeer.QuorumServer> peers = new HashMap<Long, QuorumPeer.QuorumServer>(); + Map<Long, QuorumPeer.QuorumServer> peers = new HashMap<>(); peers.put(Long.valueOf(1), new QuorumPeer.QuorumServer(1, new InetSocketAddress(LOCALADDR, port1), new InetSocketAddress(LOCALADDR, portLE1), new InetSocketAddress(LOCALADDR, portClient1), QuorumPeer.LearnerType.PARTICIPANT)); peers.put(Long.valueOf(2), new QuorumPeer.QuorumServer(2, new InetSocketAddress(LOCALADDR, port2), new InetSocketAddress(LOCALADDR, portLE2), new InetSocketAddress(LOCALADDR, portClient2), QuorumPeer.LearnerType.PARTICIPANT)); @@ -165,7 +165,7 @@ public class QuorumBaseOracle_2Nodes extends ClientBase{ // interesting to see what's there... JMXEnv.dump(); // make sure we have these 5 servers listed - Set<String> ensureNames = new LinkedHashSet<String>(); + Set<String> ensureNames = new LinkedHashSet<>(); for (int i = 1; i <= 2; i++) { ensureNames.add("InMemoryDataTree"); } @@ -240,7 +240,7 @@ public class QuorumBaseOracle_2Nodes extends ClientBase{ } public ArrayList<QuorumPeer> getPeerList() { - ArrayList<QuorumPeer> peers = new ArrayList<QuorumPeer>(); + ArrayList<QuorumPeer> peers = new ArrayList<>(); peers.add(s1); peers.add(s2); return peers; @@ -269,7 +269,7 @@ public class QuorumBaseOracle_2Nodes extends ClientBase{ int connectToLearnerMasterLimit = 3; if (peers == null) { - peers = new HashMap<Long, QuorumPeer.QuorumServer>(); + peers = new HashMap<>(); peers.put(Long.valueOf(1), new QuorumPeer.QuorumServer(1, new InetSocketAddress(LOCALADDR, port1), new InetSocketAddress(LOCALADDR, portLE1), new InetSocketAddress(LOCALADDR, portClient1), QuorumPeer.LearnerType.PARTICIPANT)); peers.put(Long.valueOf(2), new QuorumPeer.QuorumServer(2, new InetSocketAddress(LOCALADDR, port2), new InetSocketAddress(LOCALADDR, portLE2), new InetSocketAddress(LOCALADDR, portClient2), QuorumPeer.LearnerType.PARTICIPANT)); diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/test/QuorumTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/QuorumTest.java index 72a5f140b..ff53b0fe9 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/test/QuorumTest.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/QuorumTest.java @@ -314,7 +314,7 @@ public class QuorumTest extends ZKTestCase { assertTrue(oldWatcher.zkDisco); } - ArrayList<ZooKeeper> toClose = new ArrayList<ZooKeeper>(); + ArrayList<ZooKeeper> toClose = new ArrayList<>(); toClose.add(zknew); // Let's just make sure it can still move for (int i = 0; i < 10; i++) { diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/test/QuorumUtil.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/QuorumUtil.java index ce1cd1b3c..865d82b0c 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/test/QuorumUtil.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/QuorumUtil.java @@ -65,9 +65,9 @@ public class QuorumUtil { } - private final Map<Long, QuorumServer> peersView = new HashMap<Long, QuorumServer>(); + private final Map<Long, QuorumServer> peersView = new HashMap<>(); - private final Map<Integer, PeerStruct> peers = new HashMap<Integer, PeerStruct>(); + private final Map<Integer, PeerStruct> peers = new HashMap<>(); public final int N; @@ -165,7 +165,7 @@ public class QuorumUtil { try { JMXEnv.dump(); // make sure we have all servers listed - Set<String> ensureNames = new LinkedHashSet<String>(); + Set<String> ensureNames = new LinkedHashSet<>(); for (int i = 1; i <= ALL; ++i) { ensureNames.add("InMemoryDataTree"); } @@ -294,7 +294,7 @@ public class QuorumUtil { } public List<QuorumPeer> getFollowerQuorumPeers() { - List<QuorumPeer> peerList = new ArrayList<QuorumPeer>(ALL - 1); + List<QuorumPeer> peerList = new ArrayList<>(ALL - 1); for (PeerStruct ps : peers.values()) { if (ps.peer.leader == null) { diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/test/ReconfigExceptionTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/ReconfigExceptionTest.java index 9dc21ba27..5afcb0d34 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/test/ReconfigExceptionTest.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/ReconfigExceptionTest.java @@ -156,7 +156,7 @@ public class ReconfigExceptionTest extends ZKTestCase { try { zkAdmin.addAuthInfo("digest", "super:test".getBytes()); // There is ACL however the permission is wrong - need WRITE permission at leaste. - ArrayList<ACL> acls = new ArrayList<ACL>(Collections.singletonList(new ACL(ZooDefs.Perms.READ, new Id("digest", "user:tl+z3z0vO6PfPfEENfLF96E6pM0="/* password is test */)))); + ArrayList<ACL> acls = new ArrayList<>(Collections.singletonList(new ACL(ZooDefs.Perms.READ, new Id("digest", "user:tl+z3z0vO6PfPfEENfLF96E6pM0="/* password is test */)))); zkAdmin.setACL(ZooDefs.CONFIG_NODE, acls, -1); resetZKAdmin(); zkAdmin.addAuthInfo("digest", "user:test".getBytes()); @@ -174,7 +174,7 @@ public class ReconfigExceptionTest extends ZKTestCase { try { zkAdmin.addAuthInfo("digest", "super:test".getBytes()); - ArrayList<ACL> acls = new ArrayList<ACL>(Collections.singletonList(new ACL(ZooDefs.Perms.WRITE, new Id("digest", "user:tl+z3z0vO6PfPfEENfLF96E6pM0="/* password is test */)))); + ArrayList<ACL> acls = new ArrayList<>(Collections.singletonList(new ACL(ZooDefs.Perms.WRITE, new Id("digest", "user:tl+z3z0vO6PfPfEENfLF96E6pM0="/* password is test */)))); zkAdmin.setACL(ZooDefs.CONFIG_NODE, acls, -1); resetZKAdmin(); zkAdmin.addAuthInfo("digest", "user:test".getBytes()); @@ -208,7 +208,7 @@ public class ReconfigExceptionTest extends ZKTestCase { } private boolean reconfigPort() throws KeeperException, InterruptedException { - List<String> joiningServers = new ArrayList<String>(); + List<String> joiningServers = new ArrayList<>(); int leaderId = 1; while (qu.getPeer(leaderId).peer.leader == null) { leaderId++; diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/test/ReconfigMisconfigTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/ReconfigMisconfigTest.java index 9e1b83802..712497f35 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/test/ReconfigMisconfigTest.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/ReconfigMisconfigTest.java @@ -115,7 +115,7 @@ public class ReconfigMisconfigTest extends ZKTestCase { } private boolean reconfigPort() throws KeeperException, InterruptedException { - List<String> joiningServers = new ArrayList<String>(); + List<String> joiningServers = new ArrayList<>(); int leaderId = 1; while (qu.getPeer(leaderId).peer.leader == null) { leaderId++; diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/test/ReconfigTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/ReconfigTest.java index 65026a6b9..20ec82d09 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/test/ReconfigTest.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/ReconfigTest.java @@ -288,8 +288,8 @@ public class ReconfigTest extends ZKTestCase implements DataCallback { zkArr = createHandles(qu); zkAdminArr = createAdminHandles(qu); - List<String> leavingServers = new ArrayList<String>(); - List<String> joiningServers = new ArrayList<String>(); + List<String> leavingServers = new ArrayList<>(); + List<String> joiningServers = new ArrayList<>(); int leaderIndex = getLeaderId(qu); @@ -366,8 +366,8 @@ public class ReconfigTest extends ZKTestCase implements DataCallback { zkArr = createHandles(qu); zkAdminArr = createAdminHandles(qu); - List<String> leavingServers = new ArrayList<String>(); - List<String> joiningServers = new ArrayList<String>(); + List<String> leavingServers = new ArrayList<>(); + List<String> joiningServers = new ArrayList<>(); int leaderIndex = getLeaderId(qu); @@ -473,7 +473,7 @@ public class ReconfigTest extends ZKTestCase implements DataCallback { // new config will have three of the servers as followers // two of the servers as observers, and all ports different - ArrayList<String> newServers = new ArrayList<String>(); + ArrayList<String> newServers = new ArrayList<>(); for (int i = 1; i <= 5; i++) { String server = "server." + i + "=localhost:" + PortAssignment.unique() + ":" + PortAssignment.unique() + ":" + ((i == 4 || i == 5) ? "observer" : "participant") @@ -507,12 +507,12 @@ public class ReconfigTest extends ZKTestCase implements DataCallback { zkArr = createHandles(qu); zkAdminArr = createAdminHandles(qu); - List<String> leavingServers = new ArrayList<String>(); + List<String> leavingServers = new ArrayList<>(); // lets remove someone who's not the leader leavingServers.add(getLeaderId(qu) == 5 ? "4" : "5"); - List<Integer> results = new LinkedList<Integer>(); + List<Integer> results = new LinkedList<>(); zkAdminArr[1].reconfigure(null, leavingServers, null, -1, this, results); @@ -547,7 +547,7 @@ public class ReconfigTest extends ZKTestCase implements DataCallback { // changing a server's role / port is done by "adding" it with the same // id but different role / port - List<String> joiningServers = new ArrayList<String>(); + List<String> joiningServers = new ArrayList<>(); int leaderIndex = getLeaderId(qu); @@ -622,7 +622,7 @@ public class ReconfigTest extends ZKTestCase implements DataCallback { zkArr = createHandles(qu); zkAdminArr = createAdminHandles(qu); - List<String> joiningServers = new ArrayList<String>(); + List<String> joiningServers = new ArrayList<>(); int leaderIndex = getLeaderId(qu); int followerIndex = leaderIndex == 1 ? 2 : 1; @@ -761,7 +761,7 @@ public class ReconfigTest extends ZKTestCase implements DataCallback { zkArr = createHandles(qu); zkAdminArr = createAdminHandles(qu); - List<String> joiningServers = new ArrayList<String>(); + List<String> joiningServers = new ArrayList<>(); int leaderIndex = getLeaderId(qu); int followerIndex = leaderIndex == 1 ? 2 : 1; @@ -950,8 +950,8 @@ public class ReconfigTest extends ZKTestCase implements DataCallback { zkArr = createHandles(qu); zkAdminArr = createAdminHandles(qu); - List<String> leavingServers = new ArrayList<String>(); - List<String> joiningServers = new ArrayList<String>(); + List<String> leavingServers = new ArrayList<>(); + List<String> joiningServers = new ArrayList<>(); // assert remotePeerBean.1 of ReplicatedServer_2 int leavingIndex = 1; @@ -1035,7 +1035,7 @@ public class ReconfigTest extends ZKTestCase implements DataCallback { // changing a server's role / port is done by "adding" it with the same // id but different role / port - List<String> joiningServers = new ArrayList<String>(); + List<String> joiningServers = new ArrayList<>(); // assert remotePeerBean.1 of ReplicatedServer_2 int changingIndex = 1; diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/test/SaslAuthDesignatedClientTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/SaslAuthDesignatedClientTest.java index 27156865d..e5cd89d43 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/test/SaslAuthDesignatedClientTest.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/SaslAuthDesignatedClientTest.java @@ -112,7 +112,7 @@ public class SaslAuthDesignatedClientTest extends ClientBase { public void testReadAccessUser() throws Exception { System.setProperty("zookeeper.letAnySaslUserDoX", "anyone"); ZooKeeper zk = createClient(); - List<ACL> aclList = new ArrayList<ACL>(); + List<ACL> aclList = new ArrayList<>(); ACL acl = new ACL(Perms.ADMIN | Perms.CREATE | Perms.WRITE | Perms.DELETE, new Id("sasl", "fakeuser")); ACL acl1 = new ACL(Perms.READ, new Id("sasl", "anyone")); aclList.add(acl); diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/test/SessionTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/SessionTest.java index 9d859eeaa..85f76c213 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/test/SessionTest.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/SessionTest.java @@ -331,7 +331,7 @@ public class SessionTest extends ZKTestCase { private class DupWatcher extends CountdownWatcher { - public List<WatchedEvent> states = new LinkedList<WatchedEvent>(); + public List<WatchedEvent> states = new LinkedList<>(); public void process(WatchedEvent event) { super.process(event); if (event.getType() == EventType.None) { diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/test/SessionTrackerCheckTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/SessionTrackerCheckTest.java index 250dc887b..d0ea52bd2 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/test/SessionTrackerCheckTest.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/SessionTrackerCheckTest.java @@ -43,7 +43,7 @@ public class SessionTrackerCheckTest extends ZKTestCase { public static final int TICK_TIME = 1000; public static final int CONNECTION_TIMEOUT = TICK_TIME * 10; - private ConcurrentHashMap<Long, Integer> sessionsWithTimeouts = new ConcurrentHashMap<Long, Integer>(); + private ConcurrentHashMap<Long, Integer> sessionsWithTimeouts = new ConcurrentHashMap<>(); private class Expirer implements SessionExpirer { diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/test/StandaloneTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/StandaloneTest.java index c7efeb177..49e648b0e 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/test/StandaloneTest.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/StandaloneTest.java @@ -137,7 +137,7 @@ public class StandaloneTest extends QuorumPeerTestBase implements Watcher { ZooKeeperAdmin zkAdmin = new ZooKeeperAdmin(HOSTPORT, CONNECTION_TIMEOUT, watcher); watcher.waitForConnected(CONNECTION_TIMEOUT); - List<String> joiners = new ArrayList<String>(); + List<String> joiners = new ArrayList<>(); joiners.add("server.2=localhost:1234:1235;1236"); // generate some transactions that will get logged try { diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/test/StaticHostProviderTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/StaticHostProviderTest.java index 905b6cd78..c782e9820 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/test/StaticHostProviderTest.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/StaticHostProviderTest.java @@ -169,7 +169,7 @@ public class StaticHostProviderTest extends ZKTestCase { hostProvider.onConnected(); // Number of machines increased, my server is not in the new cluster - newList = new ArrayList<InetSocketAddress>(3); + newList = new ArrayList<>(3); for (byte i = 4; i > 1; i--) { // 10.10.10.4:1238, 10.10.10.3:1237, 10.10.10.2:1236 newList.add(new InetSocketAddress(InetAddress.getByAddress(new byte[]{10, 10, 10, i}), 1234 + i)); } @@ -203,20 +203,20 @@ public class StaticHostProviderTest extends ZKTestCase { public void testUpdateMigrationGoesRound() throws UnknownHostException { HostProvider hostProvider = getHostProvider((byte) 4); // old list (just the ports): 1238, 1237, 1236, 1235 - Collection<InetSocketAddress> newList = new ArrayList<InetSocketAddress>(10); + Collection<InetSocketAddress> newList = new ArrayList<>(10); for (byte i = 12; i > 2; i--) { // 1246, 1245, 1244, 1243, 1242, 1241, // 1240, 1239, 1238, 1237 newList.add(new InetSocketAddress(InetAddress.getByAddress(new byte[]{10, 10, 10, i}), 1234 + i)); } // servers from the old list that appear in the new list - Collection<InetSocketAddress> oldStaying = new ArrayList<InetSocketAddress>(2); + Collection<InetSocketAddress> oldStaying = new ArrayList<>(2); for (byte i = 4; i > 2; i--) { // 1238, 1237 oldStaying.add(new InetSocketAddress(InetAddress.getByAddress(new byte[]{10, 10, 10, i}), 1234 + i)); } // servers in the new list that are not in the old list - Collection<InetSocketAddress> newComing = new ArrayList<InetSocketAddress>(10); + Collection<InetSocketAddress> newComing = new ArrayList<>(10); for (byte i = 12; i > 4; i--) {// 1246, 1245, 1244, 1243, 1242, 1241, 1240, 1139 newComing.add(new InetSocketAddress(InetAddress.getByAddress(new byte[]{10, 10, 10, i}), 1234 + i)); } @@ -232,7 +232,7 @@ public class StaticHostProviderTest extends ZKTestCase { // This means reconfigMode = true, and nextHostInReconfigMode will be // called from next // Since pNew = 1 we should first try the new servers - ArrayList<InetSocketAddress> seen = new ArrayList<InetSocketAddress>(); + ArrayList<InetSocketAddress> seen = new ArrayList<>(); for (int i = 0; i < newComing.size(); i++) { InetSocketAddress addr = hostProvider.next(0); assertTrue(newComing.contains(addr)); @@ -325,7 +325,7 @@ public class StaticHostProviderTest extends ZKTestCase { // remove host number 0 (the first one in the current list) // and add back hosts 6, 7 and 8 - newList = new ArrayList<InetSocketAddress>(8); + newList = new ArrayList<>(8); for (byte i = 9; i > 1; i--) { newList.add(new InetSocketAddress(InetAddress.getByAddress(new byte[]{10, 10, 10, i}), 1234 + i)); } @@ -486,7 +486,7 @@ public class StaticHostProviderTest extends ZKTestCase { } private Collection<InetSocketAddress> getServerAddresses(byte size) { - ArrayList<InetSocketAddress> list = new ArrayList<InetSocketAddress>(size); + ArrayList<InetSocketAddress> list = new ArrayList<>(size); while (size > 0) { try { list.add(new InetSocketAddress(InetAddress.getByAddress(new byte[]{10, 10, 10, size}), 1234 + size)); @@ -699,7 +699,7 @@ public class StaticHostProviderTest extends ZKTestCase { public void testReResolvingSingle() throws UnknownHostException { // Arrange byte size = 1; - ArrayList<InetSocketAddress> list = new ArrayList<InetSocketAddress>(size); + ArrayList<InetSocketAddress> list = new ArrayList<>(size); // Test a hostname that resolves to a single address list.add(InetSocketAddress.createUnresolved("issues.apache.org", 1234)); @@ -733,7 +733,7 @@ public class StaticHostProviderTest extends ZKTestCase { public void testReResolvingMultiple() throws UnknownHostException { // Arrange byte size = 1; - ArrayList<InetSocketAddress> list = new ArrayList<InetSocketAddress>(size); + ArrayList<InetSocketAddress> list = new ArrayList<>(size); // Test a hostname that resolves to multiple addresses list.add(InetSocketAddress.createUnresolved("www.apache.org", 1234)); @@ -748,7 +748,7 @@ public class StaticHostProviderTest extends ZKTestCase { when(apacheOrg2.toString()).thenReturn("www.apache.org"); when(apacheOrg2.getHostName()).thenReturn("www.apache.org"); - final List<InetAddress> resolvedAddresses = new ArrayList<InetAddress>(); + final List<InetAddress> resolvedAddresses = new ArrayList<>(); resolvedAddresses.add(apacheOrg1); resolvedAddresses.add(apacheOrg2); StaticHostProvider.Resolver resolver = new StaticHostProvider.Resolver() { @@ -775,10 +775,10 @@ public class StaticHostProviderTest extends ZKTestCase { @Test public void testReResolveMultipleOneFailing() throws UnknownHostException { // Arrange - final List<InetSocketAddress> list = new ArrayList<InetSocketAddress>(); + final List<InetSocketAddress> list = new ArrayList<>(); list.add(InetSocketAddress.createUnresolved("www.apache.org", 1234)); - final List<String> ipList = new ArrayList<String>(); - final List<InetAddress> resolvedAddresses = new ArrayList<InetAddress>(); + final List<String> ipList = new ArrayList<>(); + final List<InetAddress> resolvedAddresses = new ArrayList<>(); for (int i = 0; i < 3; i++) { ipList.add(String.format("192.168.1.%d", i + 1)); final InetAddress apacheOrg = mock(InetAddress.class); @@ -821,10 +821,10 @@ public class StaticHostProviderTest extends ZKTestCase { @Test public void testEmptyResolution() throws UnknownHostException { // Arrange - final List<InetSocketAddress> list = new ArrayList<InetSocketAddress>(); + final List<InetSocketAddress> list = new ArrayList<>(); list.add(InetSocketAddress.createUnresolved("www.apache.org", 1234)); list.add(InetSocketAddress.createUnresolved("www.google.com", 1234)); - final List<InetAddress> resolvedAddresses = new ArrayList<InetAddress>(); + final List<InetAddress> resolvedAddresses = new ArrayList<>(); final InetAddress apacheOrg1 = mock(InetAddress.class); when(apacheOrg1.getHostAddress()).thenReturn("192.168.1.1"); @@ -865,7 +865,7 @@ public class StaticHostProviderTest extends ZKTestCase { @Test public void testReResolvingLocalhost() { byte size = 2; - ArrayList<InetSocketAddress> list = new ArrayList<InetSocketAddress>(size); + ArrayList<InetSocketAddress> list = new ArrayList<>(size); // Test a hostname that resolves to multiple addresses list.add(InetSocketAddress.createUnresolved("localhost", 1234)); @@ -884,7 +884,7 @@ public class StaticHostProviderTest extends ZKTestCase { } private Collection<InetSocketAddress> getUnresolvedServerAddresses(byte size) { - ArrayList<InetSocketAddress> list = new ArrayList<InetSocketAddress>(size); + ArrayList<InetSocketAddress> list = new ArrayList<>(size); while (size > 0) { list.add(InetSocketAddress.createUnresolved("10.10.10." + size, 1234 + size)); --size; diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/test/TruncateTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/TruncateTest.java index 622dadfa7..f81afc867 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/test/TruncateTest.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/TruncateTest.java @@ -189,7 +189,7 @@ public class TruncateTest extends ZKTestCase { int port3 = PortAssignment.unique(); // Start up two of the quorum and add 10 txns - Map<Long, QuorumServer> peers = new HashMap<Long, QuorumServer>(); + Map<Long, QuorumServer> peers = new HashMap<>(); peers.put(Long.valueOf(1), new QuorumServer(1, new InetSocketAddress("127.0.0.1", PortAssignment.unique()), new InetSocketAddress("127.0.0.1", PortAssignment.unique()), new InetSocketAddress("127.0.0.1", port1))); peers.put(Long.valueOf(2), new QuorumServer(2, new InetSocketAddress("127.0.0.1", PortAssignment.unique()), new InetSocketAddress("127.0.0.1", PortAssignment.unique()), new InetSocketAddress("127.0.0.1", port2))); peers.put(Long.valueOf(3), new QuorumServer(3, new InetSocketAddress("127.0.0.1", PortAssignment.unique()), new InetSocketAddress("127.0.0.1", PortAssignment.unique()), new InetSocketAddress("127.0.0.1", port3))); diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/test/WatchEventWhenAutoResetTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/WatchEventWhenAutoResetTest.java index f519c95d1..5fd4b96b1 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/test/WatchEventWhenAutoResetTest.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/WatchEventWhenAutoResetTest.java @@ -51,7 +51,7 @@ public class WatchEventWhenAutoResetTest extends ZKTestCase { public static class EventsWatcher extends CountdownWatcher { - private LinkedBlockingQueue<WatchedEvent> dataEvents = new LinkedBlockingQueue<WatchedEvent>(); + private LinkedBlockingQueue<WatchedEvent> dataEvents = new LinkedBlockingQueue<>(); @Override public void process(WatchedEvent event) { diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/test/WatcherFuncTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/WatcherFuncTest.java index 0987c4cf7..180cd08a6 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/test/WatcherFuncTest.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/WatcherFuncTest.java @@ -45,7 +45,7 @@ public class WatcherFuncTest extends ClientBase { private static class SimpleWatcher implements Watcher { - private LinkedBlockingQueue<WatchedEvent> events = new LinkedBlockingQueue<WatchedEvent>(); + private LinkedBlockingQueue<WatchedEvent> events = new LinkedBlockingQueue<>(); private CountDownLatch latch; public SimpleWatcher(CountDownLatch latch) { @@ -103,7 +103,7 @@ public class WatcherFuncTest extends ClientBase { lsnr_dwatch = new SimpleWatcher(lsnr_latch); lsnr = createClient(lsnr_dwatch, lsnr_latch); - expected = new ArrayList<EventType>(); + expected = new ArrayList<>(); } @AfterEach @@ -266,7 +266,7 @@ public class WatcherFuncTest extends ClientBase { SimpleWatcher w3 = new SimpleWatcher(null); SimpleWatcher w4 = new SimpleWatcher(null); - List<EventType> e2 = new ArrayList<EventType>(); + List<EventType> e2 = new ArrayList<>(); assertNull(lsnr.exists("/foo", true)); assertNull(lsnr.exists("/foo", w1)); @@ -302,7 +302,7 @@ public class WatcherFuncTest extends ClientBase { client.setData("/foo/bar", "child".getBytes(), -1); e2.add(EventType.NodeDataChanged); - lsnr_dwatch.verify(new ArrayList<EventType>()); // not reg so should = 0 + lsnr_dwatch.verify(new ArrayList<>()); // not reg so should = 0 w1.verify(expected); w2.verify(e2); w3.verify(e2); @@ -341,7 +341,7 @@ public class WatcherFuncTest extends ClientBase { SimpleWatcher w3 = new SimpleWatcher(null); SimpleWatcher w4 = new SimpleWatcher(null); - List<EventType> e2 = new ArrayList<EventType>(); + List<EventType> e2 = new ArrayList<>(); try { lsnr.getData("/foo", w1, null); @@ -408,7 +408,7 @@ public class WatcherFuncTest extends ClientBase { SimpleWatcher w3 = new SimpleWatcher(null); SimpleWatcher w4 = new SimpleWatcher(null); - List<EventType> e2 = new ArrayList<EventType>(); + List<EventType> e2 = new ArrayList<>(); try { lsnr.getChildren("/foo", true); diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/test/WatcherTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/WatcherTest.java index 8a17885b1..22da89a2e 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/test/WatcherTest.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/WatcherTest.java @@ -63,7 +63,7 @@ public class WatcherTest extends ClientBase { private class MyWatcher extends CountdownWatcher { - LinkedBlockingQueue<WatchedEvent> events = new LinkedBlockingQueue<WatchedEvent>(); + LinkedBlockingQueue<WatchedEvent> events = new LinkedBlockingQueue<>(); public void process(WatchedEvent event) { super.process(event); diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/test/ZooKeeperTestClient.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/ZooKeeperTestClient.java index c4ef9e23d..389104b9a 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/test/ZooKeeperTestClient.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/ZooKeeperTestClient.java @@ -45,7 +45,7 @@ public class ZooKeeperTestClient extends ZKTestCase implements Watcher { protected String testDirOnZK = dirOnZK + "/" + Time.currentElapsedTime(); - LinkedBlockingQueue<WatchedEvent> events = new LinkedBlockingQueue<WatchedEvent>(); + LinkedBlockingQueue<WatchedEvent> events = new LinkedBlockingQueue<>(); private WatchedEvent getEvent(int numTries) throws InterruptedException { WatchedEvent event = null; |