commit a6426cb218c110fe93509700bc3a49db348b5f93
author Sho SHIMIZU <sshimizu@us.fujitsu.com> Thu Oct 01 15:46:48 2015 -0700
committer Gerrit Code Review <gerrit@onlab.us> Fri Oct 02 22:18:25 2015 +0000
tree 3814612ad1fdad75804cf44a641d7f271f08380a
parent fd912ac7a596e1522d531d49c02a9772e2b73782

Refactor: Remove intermediate layer just delegating to DeviceResourceStore

Change-Id: Ie46298311e889a737c4c2ecaefa09ba1bc13d547

apps/optical/src/main/java/org/onosproject/optical/OpticalPathProvisioner.java

diff --git a/apps/optical/src/main/java/org/onosproject/optical/OpticalPathProvisioner.java b/apps/optical/src/main/java/org/onosproject/optical/OpticalPathProvisioner.java
index d72dab9..2c6407f 100644
--- a/apps/optical/src/main/java/org/onosproject/optical/OpticalPathProvisioner.java
+++ b/apps/optical/src/main/java/org/onosproject/optical/OpticalPathProvisioner.java
@@ -46,7 +46,7 @@
 import org.onosproject.net.intent.OpticalConnectivityIntent;
 import org.onosproject.net.intent.PointToPointIntent;
 import org.onosproject.net.newresource.ResourceService;
-import org.onosproject.net.resource.device.DeviceResourceService;
+import org.onosproject.net.resource.device.DeviceResourceStore;
 import org.onosproject.net.resource.link.LinkResourceAllocations;
 import org.onosproject.net.resource.link.LinkResourceService;
 import org.onosproject.net.topology.LinkWeight;
@@ -98,7 +98,7 @@
     protected DeviceService deviceService;
 
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
-    protected DeviceResourceService deviceResourceService;
+    protected DeviceResourceStore deviceResourceStore;
 
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
     protected LinkResourceService linkResourceService;
@@ -385,7 +385,7 @@
                 }
             } else if (intent instanceof OpticalCircuitIntent) {
                 resourceService.release(intent.id());
-                deviceResourceService.releaseMapping(intent.id());
+                deviceResourceStore.releaseMapping(intent.id());
                 if (lra != null) {
                     linkResourceService.releaseResources(lra);
                 }