Mechanical code cleanup (sal-dom-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: I88c96965215d2f5dbf60967afe4a4ddbaed0072f
Signed-off-by: Stephen Kitt <skitt@redhat.com>

diff --git a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMMountPointService.java b/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMMountPointService.java
index 9286f062be470c42b9cc4ee76c55258aae1bcf53..5972273927ca1a45d81b927e6832b01be9c5c0f5 100644 (file)
--- a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMMountPointService.java
+++ b/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMMountPointService.java
@@ -26,7 +26,7 @@ public interface DOMMountPointService extends BrokerService {
 
     ListenerRegistration<MountProvisionListener> registerProvisionListener(MountProvisionListener listener);
 
-    public interface DOMMountPointBuilder {
+    interface DOMMountPointBuilder {
 
         <T extends DOMService> DOMMountPointBuilder addService(Class<T> type,T impl);
 

diff --git a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMNotificationPublishService.java b/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMNotificationPublishService.java
index a7d2770172c0ad0063fc26a84cef84d23ae812b4..b4df6b4564b8b78d7f1c8acb262d6ced9a20fee4 100644 (file)
--- a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMNotificationPublishService.java
+++ b/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMNotificationPublishService.java
@@ -70,7 +70,7 @@ public interface DOMNotificationPublishService extends DOMService, BrokerService
      * @throws InterruptedException if interrupted while waiting
      * @throws NullPointerException if notification is null.
      */
-    @Nonnull ListenableFuture<? extends Object> putNotification(@Nonnull DOMNotification notification) throws InterruptedException;
+    @Nonnull ListenableFuture<?> putNotification(@Nonnull DOMNotification notification) throws InterruptedException;
 
     /**
      * Attempt to publish a notification. The result of this method is a {@link ListenableFuture}
@@ -87,7 +87,7 @@ public interface DOMNotificationPublishService extends DOMService, BrokerService
      *         the implementation from accepting the notification for delivery.
      * @throws NullPointerException if notification is null.
      */
-    @Nonnull ListenableFuture<? extends Object> offerNotification(@Nonnull DOMNotification notification);
+    @Nonnull ListenableFuture<?> offerNotification(@Nonnull DOMNotification notification);
 
     /**
      * Attempt to publish a notification. The result of this method is a {@link ListenableFuture}
@@ -108,6 +108,6 @@ public interface DOMNotificationPublishService extends DOMService, BrokerService
      * @throws NullPointerException if notification or unit is null.
      * @throws IllegalArgumentException if timeout is negative.
      */
-    @Nonnull ListenableFuture<? extends Object> offerNotification(@Nonnull DOMNotification notification,
+    @Nonnull ListenableFuture<?> offerNotification(@Nonnull DOMNotification notification,
         @Nonnegative long timeout, @Nonnull TimeUnit unit) throws InterruptedException;
 }

diff --git a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/Broker.java b/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/Broker.java
index 500dce3cfab2badfff3b1db381448a3ca460f61b..01f78cd5aab6bd006acacd29496234edde526508 100644 (file)
--- a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/Broker.java
+++ b/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/Broker.java
@@ -116,7 +116,7 @@ public interface Broker {
      *
      *
      */
-    public interface ConsumerSession {
+    interface ConsumerSession {
 
         boolean isClosed();
 
@@ -156,7 +156,7 @@ public interface Broker {
      * functionality provided by other {@link Provider}s.
      *
      */
-    public interface ProviderSession extends ConsumerSession {
+    interface ProviderSession extends ConsumerSession {
         /**
          * Closes a session between provider and SAL.
          *

diff --git a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/Consumer.java b/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/Consumer.java
index a5ab8ac911b20fc703b96185af66e9bb60c170d7..f0c4be26696c0a31380e1523305030e3af97bda1 100644 (file)
--- a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/Consumer.java
+++ b/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/Consumer.java
@@ -35,7 +35,7 @@ public interface Consumer {
      * @param session
      *            Unique session between consumer and SAL.
      */
-    public void onSessionInitiated(ConsumerSession session);
+    void onSessionInitiated(ConsumerSession session);
 
     /**
      * @deprecated - no longer used or needed
@@ -48,13 +48,13 @@ public interface Consumer {
      * }
      */
     @Deprecated
-    public Collection<ConsumerFunctionality> getConsumerFunctionality();
+    Collection<ConsumerFunctionality> getConsumerFunctionality();
 
     /**
      * @deprecated - no longer used or needed
      */
     @Deprecated
-    public interface ConsumerFunctionality {
+    interface ConsumerFunctionality {
 
     }
 }

diff --git a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/Provider.java b/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/Provider.java
index 4f32983f84b7e7f5a0408e1b5dfcdf4f5a01b65c..4895d10ac8bccd0f42ed791b7d0509a7427bcb46 100644 (file)
--- a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/Provider.java
+++ b/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/Provider.java
@@ -39,7 +39,7 @@ public interface Provider {
      * @param session
      *            Unique session between provider and SAL.
      */
-    public void onSessionInitiated(ProviderSession session);
+    void onSessionInitiated(ProviderSession session);
 
     /**
      * @deprecated - No longer used or needed
@@ -52,13 +52,13 @@ public interface Provider {
      * }
      */
     @Deprecated
-    public Collection<ProviderFunctionality> getProviderFunctionality();
+    Collection<ProviderFunctionality> getProviderFunctionality();
 
     /**
      * @deprecated - no longer used or needed
      */
     @Deprecated
-    public interface ProviderFunctionality {
+    interface ProviderFunctionality {
 
     }
 }