commit f9af43c2ea2fefc6afc4e0d908c91985e9bae569
author Ray Milkey <ray@onlab.us> Mon Feb 09 16:45:48 2015 -0800
committer Brian O'Connor <bocon@onlab.us> Fri Feb 13 14:10:55 2015 -0800
tree 7bc97c87be2d53be4f5dffaefc3709cfa1d0ca04
parent 5811ac22857adc77a16e4cf8d504010ae1ad5d2a

Refactoring of IntentId based APIs

- getIntent
- getIntentState
- getInstallableIntents

Change-Id: I6d2073dfa165e0e5adcef46fe5908b563b481a43

web/api/src/main/java/org/onosproject/rest/IntentsWebResource.java

diff --git a/web/api/src/main/java/org/onosproject/rest/IntentsWebResource.java b/web/api/src/main/java/org/onosproject/rest/IntentsWebResource.java
index 75287e0..3e20c5d 100644
--- a/web/api/src/main/java/org/onosproject/rest/IntentsWebResource.java
+++ b/web/api/src/main/java/org/onosproject/rest/IntentsWebResource.java
@@ -24,8 +24,8 @@
 
 import org.onosproject.net.intent.HostToHostIntent;
 import org.onosproject.net.intent.Intent;
-import org.onosproject.net.intent.IntentId;
 import org.onosproject.net.intent.IntentService;
+import org.onosproject.net.intent.Key;
 import org.onosproject.net.intent.PointToPointIntent;
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
@@ -54,15 +54,15 @@
     /**
      * Gets a single intent by Id.
      *
-     * @param id Id to look up
+     * @param key Id to look up
      * @return intent data
      */
     @GET
     @Produces(MediaType.APPLICATION_JSON)
     @Path("{id}")
-    public Response getIntentById(@PathParam("id") long id) {
+    public Response getIntentById(@PathParam("id") String key) {
         final Intent intent = nullIsNotFound(get(IntentService.class)
-                        .getIntent(IntentId.valueOf(id)),
+                        .getIntent(Key.of(key, null)),
                 INTENT_NOT_FOUND);
         final ObjectNode root;
         if (intent instanceof HostToHostIntent) {

web/api/src/test/java/org/onosproject/rest/IntentsResourceTest.java

diff --git a/web/api/src/test/java/org/onosproject/rest/IntentsResourceTest.java b/web/api/src/test/java/org/onosproject/rest/IntentsResourceTest.java
index 3289c87..35a15d5 100644
--- a/web/api/src/test/java/org/onosproject/rest/IntentsResourceTest.java
+++ b/web/api/src/test/java/org/onosproject/rest/IntentsResourceTest.java
@@ -35,8 +35,8 @@
 import org.onosproject.core.IdGenerator;
 import org.onosproject.net.NetworkResource;
 import org.onosproject.net.intent.Intent;
-import org.onosproject.net.intent.IntentId;
 import org.onosproject.net.intent.IntentService;
+import org.onosproject.net.intent.Key;
 
 import com.eclipsesource.json.JsonArray;
 import com.eclipsesource.json.JsonObject;
@@ -339,7 +339,7 @@
 
         intents.add(intent);
 
-        expect(mockIntentService.getIntent(IntentId.valueOf(0)))
+        expect(mockIntentService.getIntent(Key.of(0, APP_ID)))
                 .andReturn(intent)
                 .anyTimes();
         replay(mockIntentService);
@@ -356,7 +356,7 @@
     @Test
     public void testBadGet() {
 
-        expect(mockIntentService.getIntent(IntentId.valueOf(0)))
+        expect(mockIntentService.getIntent(Key.of(0, APP_ID)))
                 .andReturn(null)
                 .anyTimes();
         replay(mockIntentService);