Merge "fix diagstatus NPE on showSvcStatus CLI"

[openflowplugin.git] / test-provider / src / main / java / org / opendaylight / openflowplugin / test / OpenflowpluginTestServiceProvider.java

diff --git a/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginTestServiceProvider.java b/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginTestServiceProvider.java
index 1464509c06d7af4566394f1f4eb83b9b8dcf87e6..a5d5740641736fcba9e17b37cfabd10d8074c240 100644 (file)
--- a/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginTestServiceProvider.java
+++ b/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginTestServiceProvider.java
@@ -8,7 +8,7 @@
 
 package org.opendaylight.openflowplugin.test;
 
-import java.util.concurrent.Future;
+import com.google.common.util.concurrent.ListenableFuture;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderContext;
 import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.RoutedRpcRegistration;
@@ -44,7 +44,7 @@ public class OpenflowpluginTestServiceProvider implements AutoCloseable,
     private NotificationProviderService notificationProviderService;
 
     /**
-     * get data service
+     * Get data service.
      *
      * @return {@link #dataService}
      */
@@ -53,16 +53,14 @@ public class OpenflowpluginTestServiceProvider implements AutoCloseable,
     }
 
     /**
-     * set {@link #dataService}
-     *
-     * @param dataService
+     * Set {@link #dataService}.
      */
     public void setDataService(final DataBroker dataService) {
         this.dataService = dataService;
     }
 
     /**
-     * get flow registration
+     * Get flow registration.
      *
      * @return {@link #flowRegistration}
      */
@@ -71,9 +69,7 @@ public class OpenflowpluginTestServiceProvider implements AutoCloseable,
     }
 
     /**
-     * set {@link #flowRegistration}
-     *
-     * @param flowRegistration
+     * Set {@link #flowRegistration}.
      */
     public void setFlowRegistration(
             final RoutedRpcRegistration<SalFlowService> flowRegistration) {
@@ -81,7 +77,7 @@ public class OpenflowpluginTestServiceProvider implements AutoCloseable,
     }
 
     /**
-     * get notification service
+     * Get notification service.
      *
      * @return {@link #notificationProviderService}
      */
@@ -90,13 +86,10 @@ public class OpenflowpluginTestServiceProvider implements AutoCloseable,
     }
 
     /**
-     * set {@link #notificationProviderService}
-     *
-     * @param notificationProviderService
+     * Set {@link #notificationProviderService}.
      */
-    public void setNotificationService(
-            final NotificationProviderService notificationProviderService) {
-        this.notificationProviderService = notificationProviderService;
+    public void setNotificationService(final NotificationProviderService service) {
+        this.notificationProviderService = service;
     }
 
     public void start() {
@@ -126,8 +119,8 @@ public class OpenflowpluginTestServiceProvider implements AutoCloseable,
      * service.rev130819.AddFlowInput)
      */
     @Override
-    public Future<RpcResult<AddFlowOutput>> addFlow(AddFlowInput input) {
-        String plus = ("addFlow - " + input);
+    public ListenableFuture<RpcResult<AddFlowOutput>> addFlow(AddFlowInput input) {
+        String plus = "addFlow - " + input;
         OpenflowpluginTestServiceProvider.LOG.info(plus);
         return null;
     }
@@ -142,8 +135,8 @@ public class OpenflowpluginTestServiceProvider implements AutoCloseable,
      * .service.rev130819.RemoveFlowInput)
      */
     @Override
-    public Future<RpcResult<RemoveFlowOutput>> removeFlow(RemoveFlowInput input) {
-        String plus = ("removeFlow - " + input);
+    public ListenableFuture<RpcResult<RemoveFlowOutput>> removeFlow(RemoveFlowInput input) {
+        String plus = "removeFlow - " + input;
         OpenflowpluginTestServiceProvider.LOG.info(plus);
         return null;
     }
@@ -158,32 +151,28 @@ public class OpenflowpluginTestServiceProvider implements AutoCloseable,
      * .service.rev130819.UpdateFlowInput)
      */
     @Override
-    public Future<RpcResult<UpdateFlowOutput>> updateFlow(UpdateFlowInput input) {
-        String plus = ("updateFlow - " + input);
+    public ListenableFuture<RpcResult<UpdateFlowOutput>> updateFlow(UpdateFlowInput input) {
+        String plus = "updateFlow - " + input;
         OpenflowpluginTestServiceProvider.LOG.info(plus);
         return null;
     }
 
-    /**
-     * @param ctx
-     * @return {@link ObjectRegistration}
-     */
     public ObjectRegistration<OpenflowpluginTestServiceProvider> register(
             final ProviderContext ctx) {
         RoutedRpcRegistration<SalFlowService> addRoutedRpcImplementation = ctx
-                .<SalFlowService> addRoutedRpcImplementation(
+                .<SalFlowService>addRoutedRpcImplementation(
                         SalFlowService.class, this);
 
         setFlowRegistration(addRoutedRpcImplementation);
 
         InstanceIdentifierBuilder<Nodes> builderII = InstanceIdentifier
-                .<Nodes> builder(Nodes.class);
+                .<Nodes>builder(Nodes.class);
 
         NodeId nodeId = new NodeId(OpenflowpluginTestActivator.NODE_ID);
         NodeKey nodeKey = new NodeKey(nodeId);
 
         InstanceIdentifierBuilder<Node> nodeIdentifier = builderII
-                .<Node, NodeKey> child(Node.class, nodeKey);
+                .<Node, NodeKey>child(Node.class, nodeKey);
 
         InstanceIdentifier<Node> instance = nodeIdentifier.build();