Use proper tool to look up OSGi service

Change-Id: I50f2d1da5836feb5b3b50ffb694f2d996e796929

Author: y-higuchi

mef-nrp-api/src/main/java/org/onosproject/mefnrpapi/api/impl/ForwardingConstructApiServiceImpl.java

@@ -1,6 +1,5 @@
 package org.onosproject.mefnrpapi.api.impl;
 
-import org.onosproject.cli.AbstractShellCommand;
 import org.onosproject.ecord.carrierethernet.api.CarrierEthernetService;
 import org.onosproject.ecord.carrierethernet.app.CarrierEthernetForwardingConstruct;
 import org.onosproject.mefnrpapi.api.ApiResponseMessage;
@@ -14,12 +13,15 @@
 import javax.ws.rs.core.SecurityContext;
 import javax.ws.rs.core.UriBuilder;
 import javax.ws.rs.core.UriInfo;
+
+import static org.onlab.osgi.DefaultServiceDirectory.getService;
+
 import java.util.LinkedList;
 import java.util.List;
 
 public class ForwardingConstructApiServiceImpl extends ForwardingConstructApiService {
 
-    CarrierEthernetService ceManager = AbstractShellCommand.get(CarrierEthernetService.class);
+    CarrierEthernetService ceManager = getService(CarrierEthernetService.class);
 
     private static final String CHECK_LOG = " Check ONOS log for details.";
     private static final String NOT_TRANSLATED = "Could not translate FC.";

mef-nrp-api/src/main/java/org/onosproject/mefnrpapi/api/impl/LogicalTerminationPointApiServiceImpl.java

@@ -1,6 +1,6 @@
 package org.onosproject.mefnrpapi.api.impl;
 
-import org.onosproject.cli.AbstractShellCommand;
+import org.onlab.osgi.DefaultServiceDirectory;
 import org.onosproject.ecord.carrierethernet.api.CarrierEthernetService;
 import org.onosproject.ecord.carrierethernet.app.CarrierEthernetLogicalTerminationPoint;
 import org.onosproject.mefnrpapi.api.ApiResponseMessage;
@@ -22,7 +22,7 @@
 public class LogicalTerminationPointApiServiceImpl extends LogicalTerminationPointApiService {
 
     CarrierEthernetService ceManager =
-            AbstractShellCommand.get(CarrierEthernetService.class);
+            DefaultServiceDirectory.getService(CarrierEthernetService.class);
 
     private static final String NOT_TRANSLATED = "Could not translate LTP.";
     private static final String EXISTS = "LTP already exists.";

mef-sca-api/src/main/java/org/onosproject/mefscaapi/ApiDocRegistrator.java

@@ -30,4 +30,4 @@ public ApiDocRegistrator() {
                                  "MEF SCA REST API",
                                  ApiDocRegistrator.class.getClassLoader()));
     }
-}
+}

mef-sca-api/src/main/java/org/onosproject/mefscaapi/api/impl/ScaEthFdFrEcApiServiceImpl.java

@@ -1,6 +1,5 @@
 package org.onosproject.mefscaapi.api.impl;
 
-import org.onosproject.cli.AbstractShellCommand;
 import org.onosproject.ecord.carrierethernet.api.CarrierEthernetService;
 import org.onosproject.ecord.carrierethernet.app.CarrierEthernetVirtualConnection;
 import org.onosproject.mefscaapi.api.ApiResponseMessage;
@@ -16,11 +15,12 @@
 import java.util.LinkedList;
 import java.util.List;
 
+import static org.onlab.osgi.DefaultServiceDirectory.getService;
 import static org.slf4j.LoggerFactory.getLogger;
 
 public class ScaEthFdFrEcApiServiceImpl extends SCAETHFDFrECApiService {
 
-    CarrierEthernetService ceManager = AbstractShellCommand.get(CarrierEthernetService.class);
+    CarrierEthernetService ceManager = getService(CarrierEthernetService.class);
 
     private static final Logger log = getLogger(ScaEthFdFrEcApiServiceImpl.class);
 

mef-sca-api/src/main/java/org/onosproject/mefscaapi/api/impl/ScaEthFppUniNApiServiceImpl.java

@@ -1,6 +1,5 @@
 package org.onosproject.mefscaapi.api.impl;
 
-import org.onosproject.cli.AbstractShellCommand;
 import org.onosproject.ecord.carrierethernet.api.CarrierEthernetService;
 import org.onosproject.ecord.carrierethernet.app.CarrierEthernetUni;
 import org.onosproject.mefscaapi.api.ApiResponseMessage;
@@ -13,12 +12,15 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 import javax.ws.rs.core.UriBuilder;
+
+import static org.onlab.osgi.DefaultServiceDirectory.getService;
+
 import java.util.LinkedList;
 import java.util.List;
 
 public class ScaEthFppUniNApiServiceImpl extends SCAETHFPPUNINApiService {
 
-    CarrierEthernetService ceManager = AbstractShellCommand.get(CarrierEthernetService.class);
+    CarrierEthernetService ceManager = getService(CarrierEthernetService.class);
 
     private static final String NOT_TRANSLATED = "Could not translate UNI.";
     private static final String EXISTS = "UNI already exists.";

mef-sca-api/src/main/java/org/onosproject/mefscaapi/api/impl/package-info.java

@@ -16,4 +16,4 @@
 /**
  * MEF SCA API implementations.
  */
-package org.onosproject.mefscaapi.api.impl;
+package org.onosproject.mefscaapi.api.impl;