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

apps/calendar/src/main/java/org/onosproject/calendar/BandwidthCalendarResource.java

diff --git a/apps/calendar/src/main/java/org/onosproject/calendar/BandwidthCalendarResource.java b/apps/calendar/src/main/java/org/onosproject/calendar/BandwidthCalendarResource.java
index 2e73a87..9d457b7 100644
--- a/apps/calendar/src/main/java/org/onosproject/calendar/BandwidthCalendarResource.java
+++ b/apps/calendar/src/main/java/org/onosproject/calendar/BandwidthCalendarResource.java
@@ -23,7 +23,6 @@
 import org.onosproject.net.DeviceId;
 import org.onosproject.net.intent.Intent;
 import org.onosproject.net.intent.IntentEvent;
-import org.onosproject.net.intent.IntentId;
 import org.onosproject.net.intent.IntentListener;
 import org.onosproject.net.intent.IntentService;
 import org.onosproject.net.intent.IntentState;
@@ -108,12 +107,15 @@
     public Response withdrawIntent(@PathParam("intentId") String intentId) {
         log.info("Receiving Teardown request for {}", intentId);
         IntentService service = get(IntentService.class);
+        // TODO: there needs to be an app id and key here
+        /*
         Intent intent = service.getIntent(IntentId.valueOf(Long.parseLong(intentId)));
         if (intent != null) {
             service.withdraw(intent);
             String reply = "ok\n";
             return Response.ok(reply).build();
         }
+        */
         return Response.status(Response.Status.NOT_FOUND).build();
     }
 
@@ -163,7 +165,7 @@
         @Override
         public void event(IntentEvent event) {
             if (event.subject().equals(intent)) {
-                state = service.getIntentState(intent.id());
+                state = service.getIntentState(intent.key());
                 if (state == INSTALLED || state == FAILED || state == WITHDRAWN) {
                     latch.countDown();
                 }