From 84796ce69cdbae37b78f1b909e933f38f3deb292 Mon Sep 17 00:00:00 2001 From: Stephen Kitt Date: Thu, 22 Sep 2016 17:22:45 +0200 Subject: [PATCH] Mechanical code cleanup (sal-remoterpc-connector) * Remove unnecessary type specifiers (use Java 7 <>) * Remove unnecessary "extends Object" declarations * Remove unnecessary semi-colons * Merge identical catch blocks * Remove redundant modifiers: - enum constructors are private by default - interface properties are public static final by default - interface methods are public abstract by default - interfaces are abstract by default - inner interfaces are static by default - inner classes in interfaces are public static by default Change-Id: I502b5887cadb1a7cdbc42e7b817495f9c767a4a1 Signed-off-by: Stephen Kitt --- .../controller/remote/rpc/registry/gossip/Bucket.java | 4 ++-- .../remote/rpc/registry/gossip/BucketStore.java | 4 ++-- .../controller/remote/rpc/registry/gossip/Copier.java | 2 +- .../remote/rpc/RemoteRpcImplementationTest.java | 8 ++++---- .../remote/rpc/registry/gossip/BucketStoreTest.java | 4 ++-- .../remote/rpc/utils/LatestEntryRoutingLogicTest.java | 6 +++--- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/gossip/Bucket.java b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/gossip/Bucket.java index c40fc9349e..32c6dfeb55 100644 --- a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/gossip/Bucket.java +++ b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/gossip/Bucket.java @@ -9,6 +9,6 @@ package org.opendaylight.controller.remote.rpc.registry.gossip; public interface Bucket> { - public Long getVersion(); - public T getData(); + Long getVersion(); + T getData(); } diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/gossip/BucketStore.java b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/gossip/BucketStore.java index cc24e6845f..3ec56b7fca 100644 --- a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/gossip/BucketStore.java +++ b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/gossip/BucketStore.java @@ -120,7 +120,7 @@ public class BucketStore> extends AbstractUntypedActorWithMe */ void receiveGetAllBuckets(){ final ActorRef sender = getSender(); - sender.tell(new GetAllBucketsReply(getAllBuckets()), getSelf()); + sender.tell(new GetAllBucketsReply<>(getAllBuckets()), getSelf()); } /** @@ -148,7 +148,7 @@ public class BucketStore> extends AbstractUntypedActorWithMe void receiveGetBucketsByMembers(Set
members){ final ActorRef sender = getSender(); Map> buckets = getBucketsByMembers(members); - sender.tell(new GetBucketsByMembersReply(buckets), getSelf()); + sender.tell(new GetBucketsByMembersReply<>(buckets), getSelf()); } /** diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/gossip/Copier.java b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/gossip/Copier.java index 45279eb9a2..83dbbf04a3 100644 --- a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/gossip/Copier.java +++ b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/gossip/Copier.java @@ -12,5 +12,5 @@ package org.opendaylight.controller.remote.rpc.registry.gossip; * The implementers should do deep cloning in copy() method. */ public interface Copier { - public T copy(); + T copy(); } diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/RemoteRpcImplementationTest.java b/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/RemoteRpcImplementationTest.java index b3ed7ffb9e..a70b90b07e 100644 --- a/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/RemoteRpcImplementationTest.java +++ b/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/RemoteRpcImplementationTest.java @@ -81,7 +81,7 @@ public class RemoteRpcImplementationTest extends AbstractRpcTest { assertEquals("getType", TEST_RPC, routeIdentifier.getType()); assertEquals("getRoute", TEST_PATH, routeIdentifier.getRoute()); - rpcRegistry1Probe.reply(new RpcRegistry.Messages.FindRoutersReply(Arrays.asList(new Pair( + rpcRegistry1Probe.reply(new RpcRegistry.Messages.FindRoutersReply(Arrays.asList(new Pair<>( rpcBroker2, 200L)))); final DOMRpcResult result = frontEndFuture.checkedGet(5, TimeUnit.SECONDS); @@ -111,7 +111,7 @@ public class RemoteRpcImplementationTest extends AbstractRpcTest { assertEquals("getType", TEST_RPC, routeIdentifier.getType()); assertEquals("getRoute", TEST_PATH, routeIdentifier.getRoute()); - rpcRegistry1Probe.reply(new RpcRegistry.Messages.FindRoutersReply(Arrays.asList(new Pair( + rpcRegistry1Probe.reply(new RpcRegistry.Messages.FindRoutersReply(Arrays.asList(new Pair<>( rpcBroker2, 200L)))); final DOMRpcResult result = frontEndFuture.checkedGet(5, TimeUnit.SECONDS); @@ -143,7 +143,7 @@ public class RemoteRpcImplementationTest extends AbstractRpcTest { assertEquals("getType", TEST_RPC, routeIdentifier.getType()); assertEquals("getRoute", TEST_PATH, routeIdentifier.getRoute()); - rpcRegistry1Probe.reply(new RpcRegistry.Messages.FindRoutersReply(Arrays.asList(new Pair( + rpcRegistry1Probe.reply(new RpcRegistry.Messages.FindRoutersReply(Arrays.asList(new Pair<>( rpcBroker2, 200L)))); final DOMRpcResult result = frontEndFuture.checkedGet(5, TimeUnit.SECONDS); @@ -176,7 +176,7 @@ public class RemoteRpcImplementationTest extends AbstractRpcTest { assertEquals("getType", TEST_RPC, routeIdentifier.getType()); assertEquals("getRoute", TEST_PATH, routeIdentifier.getRoute()); - rpcRegistry1Probe.reply(new RpcRegistry.Messages.FindRoutersReply(Arrays.asList(new Pair( + rpcRegistry1Probe.reply(new RpcRegistry.Messages.FindRoutersReply(Arrays.asList(new Pair<>( rpcBroker2, 200L)))); frontEndFuture.checkedGet(5, TimeUnit.SECONDS); } diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/registry/gossip/BucketStoreTest.java b/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/registry/gossip/BucketStoreTest.java index c2c158bd37..2c9a141307 100644 --- a/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/registry/gossip/BucketStoreTest.java +++ b/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/registry/gossip/BucketStoreTest.java @@ -87,7 +87,7 @@ public class BucketStoreTest { //Add a new remote bucket Address a4 = new Address("tcp", "system4"); - Bucket b4 = new BucketImpl(); + Bucket b4 = new BucketImpl<>(); remoteBuckets.clear(); remoteBuckets.put(a4, b4); store.receiveUpdateRemoteBuckets(remoteBuckets); @@ -99,7 +99,7 @@ public class BucketStoreTest { Assert.assertTrue(remoteBucketsInStore.size() == 4); //Update a bucket - Bucket b3_new = new BucketImpl(); + Bucket b3_new = new BucketImpl<>(); remoteBuckets.clear(); remoteBuckets.put(a3, b3_new); remoteBuckets.put(a1, null); diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/utils/LatestEntryRoutingLogicTest.java b/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/utils/LatestEntryRoutingLogicTest.java index f74bfc3cff..a618bff6a3 100644 --- a/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/utils/LatestEntryRoutingLogicTest.java +++ b/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/utils/LatestEntryRoutingLogicTest.java @@ -46,9 +46,9 @@ public class LatestEntryRoutingLogicTest { ActorRef actor1 = probe1.ref(); ActorRef actor2 = probe2.ref(); ActorRef actor3 = probe3.ref(); - pairList.add(new Pair(actor1, 1000L)); - pairList.add(new Pair(actor2, 3000L)); - pairList.add(new Pair(actor3, 2000L)); + pairList.add(new Pair<>(actor1, 1000L)); + pairList.add(new Pair<>(actor2, 3000L)); + pairList.add(new Pair<>(actor3, 2000L)); RoutingLogic logic = new LatestEntryRoutingLogic(pairList); assertTrue(logic.select().equals(actor2)); } -- 2.36.6