commit b1681bda109d5d53a0447be3696c5ef9a1a6a672
author Sho SHIMIZU <sshimizu@us.fujitsu.com> Mon Feb 22 12:47:50 2016 -0800
committer Thomas Vachuska <tom@onlab.us> Thu Mar 24 18:23:57 2016 +0000
tree 7de6acb8e22bd0399021988d4c727963174ebd47
parent 394918d9f7500c057fb40563c7990c5b23f2c7d6

Remove dependency on LinkResourceService from Constraint

Change-Id: Ib9c488331b22eef6769a767c6186ef7d2e8b1501

core/api/src/main/java/org/onosproject/net/intent/constraint/AnnotationConstraint.java

diff --git a/core/api/src/main/java/org/onosproject/net/intent/constraint/AnnotationConstraint.java b/core/api/src/main/java/org/onosproject/net/intent/constraint/AnnotationConstraint.java
index f5439ef..1edb79c 100644
--- a/core/api/src/main/java/org/onosproject/net/intent/constraint/AnnotationConstraint.java
+++ b/core/api/src/main/java/org/onosproject/net/intent/constraint/AnnotationConstraint.java
@@ -18,7 +18,7 @@
 import com.google.common.annotations.Beta;
 import com.google.common.base.MoreObjects;
 import org.onosproject.net.Link;
-import org.onosproject.net.resource.link.LinkResourceService;
+import org.onosproject.net.intent.ResourceContext;
 
 import java.util.Objects;
 
@@ -68,16 +68,28 @@
         return threshold;
     }
 
+    // doesn't use LinkResourceService
     @Override
-    public boolean isValid(Link link, LinkResourceService resourceService) {
+    public boolean isValid(Link link, ResourceContext context) {
+        // explicitly call a method not depending on LinkResourceService
+        return isValid(link);
+    }
+
+    private boolean isValid(Link link) {
         double value = getAnnotatedValue(link, key);
 
         return value <= threshold;
     }
 
+    // doesn't use LinkResourceService
     @Override
-    public double cost(Link link, LinkResourceService resourceService) {
-        if (isValid(link, resourceService)) {
+    public double cost(Link link, ResourceContext context) {
+        // explicitly call a method not depending on LinkResourceService
+        return cost(link);
+    }
+
+    private double cost(Link link) {
+        if (isValid(link)) {
             return getAnnotatedValue(link, key);
         } else {
             return -1;