Refactor: Remove intermediate layer just delegating to DeviceResourceStore

Change-Id: Ie46298311e889a737c4c2ecaefa09ba1bc13d547

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

@@ -46,7 +46,7 @@ import org.onosproject.net.intent.OpticalCircuitIntent;
 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 @@ public class OpticalPathProvisioner {
     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 @@ public class OpticalPathProvisioner {
                 }
             } else if (intent instanceof OpticalCircuitIntent) {
                 resourceService.release(intent.id());
-                deviceResourceService.releaseMapping(intent.id());
+                deviceResourceStore.releaseMapping(intent.id());
                 if (lra != null) {
                     linkResourceService.releaseResources(lra);
                 }

core/api/src/main/java/org/onosproject/net/resource/device/DeviceResourceService.java

@@ -1,52 +0,0 @@
-/*
- * Copyright 2015 Open Networking Laboratory
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.onosproject.net.resource.device;
-
-import com.google.common.annotations.Beta;
-import org.onosproject.net.intent.IntentId;
-
-import java.util.Set;
-
-/**
- * Service for providing device resources.
- */
-@Beta
-public interface DeviceResourceService {
-
-    /**
-     * Request a mapping between the given intents.
-     *
-     * @param keyIntentId the key intent ID
-     * @param valIntentId the value intent ID
-     * @return true if mapping was successful, false otherwise
-     */
-    boolean requestMapping(IntentId keyIntentId, IntentId valIntentId);
-
-    /**
-     * Returns the intents mapped to a lower intent.
-     *
-     * @param intentId the intent ID
-     * @return the set of intent IDs
-     */
-    Set<IntentId> getMapping(IntentId intentId);
-
-    /**
-     * Release mapping of given intent.
-     *
-     * @param intentId intent ID
-     */
-    void releaseMapping(IntentId intentId);
-}

core/net/src/main/java/org/onosproject/net/intent/impl/compiler/OpticalCircuitIntentCompiler.java

@@ -52,7 +52,7 @@ import org.onosproject.net.intent.impl.IntentCompilationException;
 import org.onosproject.net.newresource.ResourceAllocation;
 import org.onosproject.net.newresource.ResourcePath;
 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.osgi.service.component.ComponentContext;
 import org.slf4j.Logger;
@@ -98,7 +98,7 @@ public class OpticalCircuitIntentCompiler implements IntentCompiler<OpticalCircu
     protected ResourceService resourceService;
 
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
-    protected DeviceResourceService deviceResourceService;
+    protected DeviceResourceStore deviceResourceStore;
 
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
     protected IntentService intentService;
@@ -208,7 +208,7 @@ public class OpticalCircuitIntentCompiler implements IntentCompiler<OpticalCircu
         circuitIntent = new FlowRuleIntent(appId, rules, intent.resources());
 
         // Save circuit to connectivity intent mapping
-        deviceResourceService.requestMapping(connIntent.id(), intent.id());
+        deviceResourceStore.allocateMapping(connIntent.id(), intent.id());
         intents.add(circuitIntent);
 
         return intents;
@@ -226,7 +226,7 @@ public class OpticalCircuitIntentCompiler implements IntentCompiler<OpticalCircu
             return true;
         }
 
-        Set<IntentId> mapping = deviceResourceService.getMapping(resource);
+        Set<IntentId> mapping = deviceResourceStore.getMapping(resource);
 
         if (mapping == null) {
             return true;

core/net/src/main/java/org/onosproject/net/resource/impl/DeviceResourceManager.java

@@ -1,69 +0,0 @@
-/*
- * Copyright 2015 Open Networking Laboratory
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.onosproject.net.resource.impl;
-
-import org.apache.felix.scr.annotations.Activate;
-import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.Deactivate;
-import org.apache.felix.scr.annotations.Reference;
-import org.apache.felix.scr.annotations.ReferenceCardinality;
-import org.apache.felix.scr.annotations.Service;
-import org.onosproject.net.intent.IntentId;
-import org.onosproject.net.resource.device.DeviceResourceService;
-import org.onosproject.net.resource.device.DeviceResourceStore;
-import org.slf4j.Logger;
-
-import java.util.Set;
-
-import static org.slf4j.LoggerFactory.getLogger;
-
-/**
- * Provides basic implementation of device resources allocation.
- */
-@Component(immediate = true)
-@Service
-public class DeviceResourceManager implements DeviceResourceService {
-
-    private final Logger log = getLogger(getClass());
-
-    @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
-    private DeviceResourceStore store;
-
-    @Activate
-    public void activate() {
-        log.info("Started");
-    }
-
-    @Deactivate
-    public void deactivate() {
-        log.info("Stopped");
-    }
-
-    @Override
-    public void releaseMapping(IntentId intentId) {
-        store.releaseMapping(intentId);
-    }
-
-    @Override
-    public boolean requestMapping(IntentId keyIntentId, IntentId valIntentId) {
-        return store.allocateMapping(keyIntentId, valIntentId);
-    }
-
-    @Override
-    public Set<IntentId> getMapping(IntentId intentId) {
-        return store.getMapping(intentId);
-    }
-}