Bump ONOS to 2.2 and build with Java 11
Change-Id: I215f7ca5cbded3acd9c440fe723f6f21d77f9ed5
diff --git a/app/src/main/java/org/opencord/olt/cli/ShowSubscribersCommand.java b/app/src/main/java/org/opencord/olt/cli/ShowSubscribersCommand.java
index 711d1fa..4d2d583 100644
--- a/app/src/main/java/org/opencord/olt/cli/ShowSubscribersCommand.java
+++ b/app/src/main/java/org/opencord/olt/cli/ShowSubscribersCommand.java
@@ -16,18 +16,20 @@
package org.opencord.olt.cli;
-import java.util.Map;
-
-import org.apache.karaf.shell.commands.Command;
+import org.apache.karaf.shell.api.action.Command;
+import org.apache.karaf.shell.api.action.lifecycle.Service;
import org.onlab.packet.VlanId;
import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.net.ConnectPoint;
import org.opencord.olt.AccessDeviceService;
+import java.util.Map;
+
/**
* Shows provisioned (configured) subscribers. The data plane flows for the
* subscribers may or may not have been programmed.
*/
+@Service
@Command(scope = "onos", name = "volt-subscribers",
description = "Shows pre-provisioned subscribers")
public class ShowSubscribersCommand extends AbstractShellCommand {
@@ -35,7 +37,7 @@
private static final String FORMAT = "port=%s, svlan=%s, cvlan=%s";
@Override
- protected void execute() {
+ protected void doExecute() {
AccessDeviceService service = AbstractShellCommand.get(AccessDeviceService.class);
service.getSubscribers().forEach(this::display);
}