REST API modifications to take application ID/Kep pair to fetch intents.

Change-Id: Icee85c6d801c92d94c6905f1d4316f63fea4e560
Reference: ONOS-1007

@@ -22,6 +22,8 @@ import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.Response;
 
 
+import org.onosproject.core.ApplicationId;
+import org.onosproject.core.CoreService;
 import org.onosproject.net.intent.HostToHostIntent;
 import org.onosproject.net.intent.HostToHostIntent;
 import org.onosproject.net.intent.Intent;
 import org.onosproject.net.intent.Intent;
 import org.onosproject.net.intent.IntentService;
 import org.onosproject.net.intent.IntentService;
@@ -54,16 +56,24 @@ public class IntentsWebResource extends AbstractWebResource {
     /**
     /**
      * Gets a single intent by Id.
      * Gets a single intent by Id.
      *
      *
-     * @param key Id to look up
+     * @param appId the Application ID
+     * @param key the Intent key value to look up
      * @return intent data
      * @return intent data
      */
      */
     @GET
     @GET
     @Produces(MediaType.APPLICATION_JSON)
     @Produces(MediaType.APPLICATION_JSON)
-    @Path("{id}")
-    public Response getIntentById(@PathParam("id") String key) {
-        final Intent intent = nullIsNotFound(get(IntentService.class)
-                        .getIntent(Key.of(key, null)),
-                INTENT_NOT_FOUND);
+    @Path("{appId}/{key}")
+    public Response getIntentById(@PathParam("appId") Short appId,
+                                  @PathParam("key") String key) {
+        final ApplicationId app = get(CoreService.class).getAppId(appId);
+
+        Intent intent = get(IntentService.class).getIntent(Key.of(key, app));
+        if (intent == null) {
+            intent = get(IntentService.class)
+                    .getIntent(Key.of(Long.valueOf(key), app));
+        }
+        nullIsNotFound(intent, INTENT_NOT_FOUND);
+
         final ObjectNode root;
         final ObjectNode root;
         if (intent instanceof HostToHostIntent) {
         if (intent instanceof HostToHostIntent) {
             root = codec(HostToHostIntent.class).encode((HostToHostIntent) intent, this);
             root = codec(HostToHostIntent.class).encode((HostToHostIntent) intent, this);

@@ -32,6 +32,7 @@ import org.onlab.rest.BaseResource;
 import org.onosproject.codec.CodecService;
 import org.onosproject.codec.CodecService;
 import org.onosproject.codec.impl.CodecManager;
 import org.onosproject.codec.impl.CodecManager;
 import org.onosproject.core.ApplicationId;
 import org.onosproject.core.ApplicationId;
+import org.onosproject.core.CoreService;
 import org.onosproject.core.DefaultApplicationId;
 import org.onosproject.core.DefaultApplicationId;
 import org.onosproject.core.IdGenerator;
 import org.onosproject.core.IdGenerator;
 import org.onosproject.net.NetworkResource;
 import org.onosproject.net.NetworkResource;
@@ -63,6 +64,7 @@ import static org.junit.Assert.fail;
 @Ignore
 @Ignore
 public class IntentsResourceTest extends ResourceTest {
 public class IntentsResourceTest extends ResourceTest {
     final IntentService mockIntentService = createMock(IntentService.class);
     final IntentService mockIntentService = createMock(IntentService.class);
+    final CoreService mockCoreService = createMock(CoreService.class);
     final HashSet<Intent> intents = new HashSet<>();
     final HashSet<Intent> intents = new HashSet<>();
     private static final ApplicationId APP_ID = new DefaultApplicationId(1, "test");
     private static final ApplicationId APP_ID = new DefaultApplicationId(1, "test");
     private IdGenerator mockGenerator;
     private IdGenerator mockGenerator;
@@ -105,6 +107,7 @@ public class IntentsResourceTest extends ResourceTest {
             this.id = id;
             this.id = id;
         }
         }
 
 
+        @Override
         public String toString() {
         public String toString() {
             return "Resource " + Integer.toString(id);
             return "Resource " + Integer.toString(id);
         }
         }
@@ -260,14 +263,14 @@ public class IntentsResourceTest extends ResourceTest {
     @Before
     @Before
     public void setUpTest() {
     public void setUpTest() {
         expect(mockIntentService.getIntents()).andReturn(intents).anyTimes();
         expect(mockIntentService.getIntents()).andReturn(intents).anyTimes();
-
         // Register the services needed for the test
         // Register the services needed for the test
         final CodecManager codecService =  new CodecManager();
         final CodecManager codecService =  new CodecManager();
         codecService.activate();
         codecService.activate();
         ServiceDirectory testDirectory =
         ServiceDirectory testDirectory =
                 new TestServiceDirectory()
                 new TestServiceDirectory()
                         .add(IntentService.class, mockIntentService)
                         .add(IntentService.class, mockIntentService)
-                        .add(CodecService.class, codecService);
+                        .add(CodecService.class, codecService)
+                        .add(CoreService.class, mockCoreService);
 
 
         BaseResource.setServiceDirectory(testDirectory);
         BaseResource.setServiceDirectory(testDirectory);
 
 
@@ -344,10 +347,15 @@ public class IntentsResourceTest extends ResourceTest {
         expect(mockIntentService.getIntent(Key.of(0, APP_ID)))
         expect(mockIntentService.getIntent(Key.of(0, APP_ID)))
                 .andReturn(intent)
                 .andReturn(intent)
                 .anyTimes();
                 .anyTimes();
+        expect(mockIntentService.getIntent(Key.of("0", APP_ID)))
+                .andReturn(intent)
+                .anyTimes();
         replay(mockIntentService);
         replay(mockIntentService);
-
+        expect(mockCoreService.getAppId(APP_ID.id()))
+                .andReturn(APP_ID).anyTimes();
+        replay(mockCoreService);
         final WebResource rs = resource();
         final WebResource rs = resource();
-        final String response = rs.path("intents/0").get(String.class);
+        final String response = rs.path("intents/1/0").get(String.class);
         final JsonObject result = JsonObject.readFrom(response);
         final JsonObject result = JsonObject.readFrom(response);
         assertThat(result, matchesIntent(intent));
         assertThat(result, matchesIntent(intent));
     }
     }