Eliminate blueprint for southbound-cli commands

[openflowplugin.git] / applications / southbound-cli / src / main / java / org / opendaylight / openflowplugin / applications / southboundcli / cli / GetReconciliationStateCommand.java

diff --git a/applications/southbound-cli/src/main/java/org/opendaylight/openflowplugin/applications/southboundcli/cli/GetReconciliationStateProvider.java b/applications/southbound-cli/src/main/java/org/opendaylight/openflowplugin/applications/southboundcli/cli/GetReconciliationStateCommand.java
similarity index 66%
rename from applications/southbound-cli/src/main/java/org/opendaylight/openflowplugin/applications/southboundcli/cli/GetReconciliationStateProvider.java
rename to applications/southbound-cli/src/main/java/org/opendaylight/openflowplugin/applications/southboundcli/cli/GetReconciliationStateCommand.java
index 6edce231292168cea49d6f9fe9706260cec75bec..c140a502df57ac229f0bdcbc3242204b13dc4bdb 100644 (file)
--- a/applications/southbound-cli/src/main/java/org/opendaylight/openflowplugin/applications/southboundcli/cli/GetReconciliationStateProvider.java
+++ b/applications/southbound-cli/src/main/java/org/opendaylight/openflowplugin/applications/southboundcli/cli/GetReconciliationStateCommand.java
@@ -7,22 +7,32 @@
  */
 package org.opendaylight.openflowplugin.applications.southboundcli.cli;
 
+import static org.opendaylight.openflowplugin.applications.southboundcli.util.ShellUtil.LINE_SEPARATOR;
+
 import java.util.ArrayList;
-import org.apache.karaf.shell.commands.Command;
-import org.apache.karaf.shell.console.OsgiCommandSupport;
+import org.apache.karaf.shell.api.action.Action;
+import org.apache.karaf.shell.api.action.Command;
+import org.apache.karaf.shell.api.action.lifecycle.Reference;
+import org.apache.karaf.shell.api.action.lifecycle.Service;
+import org.apache.karaf.shell.api.console.Session;
 import org.opendaylight.openflowplugin.applications.frm.ReconciliationJMXServiceMBean;
 
+@Service
 @Command(scope = "openflow", name = "getreconciliationstate",
         description = "Print reconciliation state for all devices")
-public class GetReconciliationStateProvider extends OsgiCommandSupport {
-    private final ReconciliationJMXServiceMBean reconciliationJMXServiceMBean;
-
-    public GetReconciliationStateProvider(final ReconciliationJMXServiceMBean reconciliationJMXServiceMBean) {
-        this.reconciliationJMXServiceMBean = reconciliationJMXServiceMBean;
-    }
+public final class GetReconciliationStateCommand implements Action {
+    @Reference
+    Session session;
+    @Reference
+    ReconciliationJMXServiceMBean reconciliationJMXServiceMBean;
 
     @Override
-    protected Object doExecute() {
+    public Object execute() {
+        if (reconciliationJMXServiceMBean == null) {
+            // not initialized
+            return null;
+        }
+
         final var reconciliationStates  = reconciliationJMXServiceMBean.acquireReconciliationStates();
         if (!reconciliationStates.isEmpty()) {
             final var result = new ArrayList<String>();
@@ -31,7 +41,7 @@ public class GetReconciliationStateProvider extends OsgiCommandSupport {
                 result.add(status);
             });
             session.getConsole().println(getHeaderOutput());
-            session.getConsole().println(getLineSeparator());
+            session.getConsole().println(LINE_SEPARATOR);
             result.stream().forEach(p -> session.getConsole().println(p));
         } else {
             session.getConsole().println("Reconciliation data not available");
@@ -42,8 +52,4 @@ public class GetReconciliationStateProvider extends OsgiCommandSupport {
     private static String getHeaderOutput() {
         return String.format("%-17s %-25s %-25s", "DatapathId", "Reconciliation Status", "Reconciliation Time");
     }
-
-    private static String getLineSeparator() {
-        return "-------------------------------------------------------------------";
-    }
 }
\ No newline at end of file