Extract interface consisting of read-only operations
Change-Id: I0e43b25ea5feba6af882addb0e734d0662f3808f
diff --git a/core/net/src/main/java/org/onosproject/net/intent/impl/compiler/ConnectivityIntentCompiler.java b/core/net/src/main/java/org/onosproject/net/intent/impl/compiler/ConnectivityIntentCompiler.java
index ea3e28b..576049f 100644
--- a/core/net/src/main/java/org/onosproject/net/intent/impl/compiler/ConnectivityIntentCompiler.java
+++ b/core/net/src/main/java/org/onosproject/net/intent/impl/compiler/ConnectivityIntentCompiler.java
@@ -27,7 +27,7 @@
import org.onosproject.net.intent.IntentCompiler;
import org.onosproject.net.intent.IntentExtensionService;
import org.onosproject.net.intent.impl.PathNotFoundException;
-import org.onosproject.net.resource.ResourceService;
+import org.onosproject.net.resource.ResourceQueryService;
import org.onosproject.net.provider.ProviderId;
import org.onosproject.net.topology.LinkWeight;
import org.onosproject.net.topology.PathService;
@@ -55,7 +55,7 @@
protected PathService pathService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
- protected ResourceService resourceService;
+ protected ResourceQueryService resourceService;
/**
* Returns an edge-weight capable of evaluating links on the basis of the
diff --git a/core/net/src/main/java/org/onosproject/net/resource/impl/ResourceDeviceListener.java b/core/net/src/main/java/org/onosproject/net/resource/impl/ResourceDeviceListener.java
index c9d4513..ee27abb 100644
--- a/core/net/src/main/java/org/onosproject/net/resource/impl/ResourceDeviceListener.java
+++ b/core/net/src/main/java/org/onosproject/net/resource/impl/ResourceDeviceListener.java
@@ -43,8 +43,8 @@
import org.onosproject.net.resource.ResourceAdminService;
import org.onosproject.net.resource.BandwidthCapacity;
import org.onosproject.net.resource.Resource;
+import org.onosproject.net.resource.ResourceQueryService;
import org.onosproject.net.resource.Resources;
-import org.onosproject.net.resource.ResourceService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -66,7 +66,7 @@
private static final Logger log = LoggerFactory.getLogger(ResourceDeviceListener.class);
private final ResourceAdminService adminService;
- private final ResourceService resourceService;
+ private final ResourceQueryService resourceService;
private final DeviceService deviceService;
private final MastershipService mastershipService;
private final DriverService driverService;
@@ -78,14 +78,14 @@
* Creates an instance with the specified ResourceAdminService and ExecutorService.
*
* @param adminService instance invoked to register resources
- * @param resourceService {@link ResourceService} to be used
+ * @param resourceService {@link ResourceQueryService} to be used
* @param deviceService {@link DeviceService} to be used
* @param mastershipService {@link MastershipService} to be used
* @param driverService {@link DriverService} to be used
* @param netcfgService {@link NetworkConfigService} to be used.
* @param executor executor used for processing resource registration
*/
- ResourceDeviceListener(ResourceAdminService adminService, ResourceService resourceService,
+ ResourceDeviceListener(ResourceAdminService adminService, ResourceQueryService resourceService,
DeviceService deviceService, MastershipService mastershipService,
DriverService driverService, NetworkConfigService netcfgService,
ExecutorService executor) {