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 <skitt@redhat.com>

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 c40fc9349ec059a174e69820fd03639a5bcf45dc..32c6dfeb559ef0f7f73fc0fcb0d196d530ddc931 100644 (file)
--- 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<T extends Copier<T>> {
-    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 cc24e6845f852df17b52e604cc113f7e34a4a6d8..3ec56b7fcac29a9ecc590af52b18703a2a62bbbf 100644 (file)
--- 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<T extends Copier<T>> extends AbstractUntypedActorWithMe
      */
     void receiveGetAllBuckets(){
         final ActorRef sender = getSender();
-        sender.tell(new GetAllBucketsReply<T>(getAllBuckets()), getSelf());
+        sender.tell(new GetAllBucketsReply<>(getAllBuckets()), getSelf());
     }
 
     /**
@@ -148,7 +148,7 @@ public class BucketStore<T extends Copier<T>> extends AbstractUntypedActorWithMe
     void receiveGetBucketsByMembers(Set<Address> members){
         final ActorRef sender = getSender();
         Map<Address, Bucket<T>> buckets = getBucketsByMembers(members);
-        sender.tell(new GetBucketsByMembersReply<T>(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 45279eb9a2b640df7154900dbc5f8912ba7f4a0c..83dbbf04a3fb093cb73f1688559386e5ec1a8e46 100644 (file)
--- 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<T> {
-    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 b3ed7ffb9e0cdda0125650714edaf200b8433a8c..a70b90b07e58bf830cf972c415ded12e8983ebc7 100644 (file)
--- 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<ActorRef, Long>(
+        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<ActorRef, Long>(
+        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<ActorRef, Long>(
+        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<ActorRef, Long>(
+        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 c2c158bd377897f1cbf84336429d54aeff002dda..2c9a14130710857eaa8da7bda5efef6341614376 100644 (file)
--- 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<T> b4 = new BucketImpl<T>();
+        Bucket<T> 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<T> b3_new = new BucketImpl<T>();
+        Bucket<T> 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 f74bfc3cffe5e666dccec01057c823f3b9feb673..a618bff6a3600c6c2544e6c36de24f8a7063dd69 100644 (file)
--- 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<ActorRef, Long>(actor1, 1000L));
-    pairList.add(new Pair<ActorRef, Long>(actor2, 3000L));
-    pairList.add(new Pair<ActorRef, Long>(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));
   }