Mechanical code cleanup (sal-connector-api)

* 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: I7771fe4533469229b319c5d0590d26922a389f9e
Signed-off-by: Stephen Kitt <skitt@redhat.com>

diff --git a/opendaylight/md-sal/sal-connector-api/src/main/java/org/opendaylight/controller/sal/connector/api/BindingAwareRpcRouter.java b/opendaylight/md-sal/sal-connector-api/src/main/java/org/opendaylight/controller/sal/connector/api/BindingAwareRpcRouter.java
index cf59eb4a9063fbd531749727143927cc26dd47d4..c242e0c96797549528a1e8dd733424b4908db8ab 100644 (file)
--- a/opendaylight/md-sal/sal-connector-api/src/main/java/org/opendaylight/controller/sal/connector/api/BindingAwareRpcRouter.java
+++ b/opendaylight/md-sal/sal-connector-api/src/main/java/org/opendaylight/controller/sal/connector/api/BindingAwareRpcRouter.java
@@ -14,7 +14,7 @@ import org.opendaylight.yangtools.concepts.Immutable;
 public interface BindingAwareRpcRouter extends RpcRouter<String, String, String, byte[]> {
 
     @Override
-    public Future<org.opendaylight.controller.sal.connector.api.RpcRouter.RpcReply<byte[]>> sendRpc(
+    Future<org.opendaylight.controller.sal.connector.api.RpcRouter.RpcReply<byte[]>> sendRpc(
             RpcRequest<String, String, String, byte[]> input);
 
     class BindingAwareRequest implements RpcRequest<String, String, String, byte[]>, Immutable {

diff --git a/opendaylight/md-sal/sal-connector-api/src/main/java/org/opendaylight/controller/sal/connector/api/RpcRouter.java b/opendaylight/md-sal/sal-connector-api/src/main/java/org/opendaylight/controller/sal/connector/api/RpcRouter.java
index fa4c8048fac87e1e218b45d6508f78274b14a75c..f49f7ef5f40b2ad47213a0c682fd1bf4d4901aaf 100644 (file)
--- a/opendaylight/md-sal/sal-connector-api/src/main/java/org/opendaylight/controller/sal/connector/api/RpcRouter.java
+++ b/opendaylight/md-sal/sal-connector-api/src/main/java/org/opendaylight/controller/sal/connector/api/RpcRouter.java
@@ -34,20 +34,20 @@ public interface RpcRouter<C,T,R,D> {
         * @param <T> Rpc Type
         * @param <D> Data Type
      */
-    public interface RpcRequest<C,T,R,D> {
+    interface RpcRequest<C,T,R,D> {
 
         RouteIdentifier<C,T,R> getRoutingInformation();
         D getPayload();
     }
 
-    public interface RouteIdentifier<C,T,R> {
+    interface RouteIdentifier<C,T,R> {
 
         C getContext(); // defines a routing table (e.g. NodeContext)
         T getType(); // rpc type
         R getRoute(); // e.g. (node identity)
     }
 
-    public interface RpcReply<D> {
+    interface RpcReply<D> {
         D getPayload();
     }
 }