ONOS-1242 - REST API for Withdrawing Intents

- upgraded Jersey to 1.19 for some REST bug fixes for Java 8
- consolidated references to Jersey by using the dependecy
  management plugin in the top level pom file.

Change-Id: Ic027f97f8fce6c673c9f2c02a92abaeedfedeb97

@@ -71,9 +71,10 @@
              description="ONOS 3rd party dependencies">
              description="ONOS 3rd party dependencies">
         <feature>war</feature>
         <feature>war</feature>
         <feature>onos-thirdparty-base</feature>
         <feature>onos-thirdparty-base</feature>
-        <bundle>mvn:com.sun.jersey/jersey-core/1.18.1</bundle>
-        <bundle>mvn:com.sun.jersey/jersey-server/1.18.1</bundle>
-        <bundle>mvn:com.sun.jersey/jersey-servlet/1.18.1</bundle>
+        <bundle>mvn:com.sun.jersey/jersey-core/1.19</bundle>
+        <bundle>mvn:com.sun.jersey/jersey-server/1.19</bundle>
+        <bundle>mvn:com.sun.jersey/jersey-servlet/1.19</bundle>
+        <bundle>mvn:javax.ws.rs/jsr311-api/1.1.1</bundle>
     </feature>
     </feature>
 
 
     <feature name="onos-api" version="@FEATURE-VERSION"
     <feature name="onos-api" version="@FEATURE-VERSION"

@@ -194,10 +194,22 @@
             <dependency>
             <dependency>
                 <groupId>com.sun.jersey</groupId>
                 <groupId>com.sun.jersey</groupId>
                 <artifactId>jersey-servlet</artifactId>
                 <artifactId>jersey-servlet</artifactId>
-                <version>1.18.1</version>
+                <version>1.19</version>
                 <scope>provided</scope>
                 <scope>provided</scope>
             </dependency>
             </dependency>
             <dependency>
             <dependency>
+                <groupId>com.sun.jersey.jersey-test-framework</groupId>
+                <artifactId>jersey-test-framework-core</artifactId>
+                <version>1.19</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>com.sun.jersey.jersey-test-framework</groupId>
+                <artifactId>jersey-test-framework-grizzly2</artifactId>
+                <version>1.19</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
                 <groupId>com.fasterxml.jackson.core</groupId>
                 <groupId>com.fasterxml.jackson.core</groupId>
                 <artifactId>jackson-databind</artifactId>
                 <artifactId>jackson-databind</artifactId>
                 <version>2.4.2</version>
                 <version>2.4.2</version>

@@ -33,19 +33,13 @@
 
 
     <dependencies>
     <dependencies>
         <dependency>
         <dependency>
-            <groupId>com.sun.jersey</groupId>
-            <artifactId>jersey-servlet</artifactId>
-        </dependency>
-        <dependency>
             <groupId>com.sun.jersey.jersey-test-framework</groupId>
             <groupId>com.sun.jersey.jersey-test-framework</groupId>
             <artifactId>jersey-test-framework-core</artifactId>
             <artifactId>jersey-test-framework-core</artifactId>
-            <version>1.18.1</version>
             <scope>test</scope>
             <scope>test</scope>
         </dependency>
         </dependency>
         <dependency>
         <dependency>
             <groupId>com.sun.jersey.jersey-test-framework</groupId>
             <groupId>com.sun.jersey.jersey-test-framework</groupId>
             <artifactId>jersey-test-framework-grizzly2</artifactId>
             <artifactId>jersey-test-framework-grizzly2</artifactId>
-            <version>1.18.1</version>
             <scope>test</scope>
             <scope>test</scope>
         </dependency>
         </dependency>
 
 

@@ -15,6 +15,11 @@
  */
  */
 package org.onosproject.rest;
 package org.onosproject.rest;
 
 
+import java.util.Objects;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+import javax.ws.rs.DELETE;
 import javax.ws.rs.GET;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
 import javax.ws.rs.PathParam;
@@ -26,18 +31,29 @@ import org.onosproject.core.ApplicationId;
 import org.onosproject.core.CoreService;
 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.IntentEvent;
+import org.onosproject.net.intent.IntentListener;
 import org.onosproject.net.intent.IntentService;
 import org.onosproject.net.intent.IntentService;
+import org.onosproject.net.intent.IntentState;
 import org.onosproject.net.intent.Key;
 import org.onosproject.net.intent.Key;
 import org.onosproject.net.intent.PointToPointIntent;
 import org.onosproject.net.intent.PointToPointIntent;
+import org.slf4j.Logger;
 
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 
 
+import static org.onosproject.net.intent.IntentState.FAILED;
+import static org.onosproject.net.intent.IntentState.WITHDRAWN;
+import static org.slf4j.LoggerFactory.getLogger;
+
 /**
 /**
  * REST resource for interacting with the inventory of intents.
  * REST resource for interacting with the inventory of intents.
  */
  */
 
 
 @Path("intents")
 @Path("intents")
 public class IntentsWebResource extends AbstractWebResource {
 public class IntentsWebResource extends AbstractWebResource {
+    private static final Logger log = getLogger(IntentsWebResource.class);
+    private static final int WITHDRAW_EVENT_TIMEOUT_SECONDS = 5;
+
     public static final String INTENT_NOT_FOUND = "Intent is not found";
     public static final String INTENT_NOT_FOUND = "Intent is not found";
 
 
     /**
     /**
@@ -84,4 +100,79 @@ public class IntentsWebResource extends AbstractWebResource {
         }
         }
         return ok(root).build();
         return ok(root).build();
     }
     }
+
+    class DeleteListener implements IntentListener {
+        final Key key;
+        final CountDownLatch latch;
+
+        DeleteListener(Key key, CountDownLatch latch) {
+            this.key = key;
+            this.latch = latch;
+        }
+
+        @Override
+        public void event(IntentEvent event) {
+            if (Objects.equals(event.subject().key(), key) &&
+                (event.type() == IntentEvent.Type.WITHDRAWN ||
+                        event.type() == IntentEvent.Type.FAILED)) {
+                latch.countDown();
+            }
+        }
+    }
+
+    /**
+     * Uninstalls a single intent by Id.
+     *
+     * @param appId the Application ID
+     * @param keyString the Intent key value to look up
+     */
+    @DELETE
+    @Path("{appId}/{key}")
+    public void deleteIntentById(@PathParam("appId") Short appId,
+                                  @PathParam("key") String keyString) {
+        final ApplicationId app = get(CoreService.class).getAppId(appId);
+
+        Intent intent = get(IntentService.class).getIntent(Key.of(keyString, app));
+        IntentService service = get(IntentService.class);
+
+        if (intent == null) {
+            intent = service
+                    .getIntent(Key.of(Long.parseLong(keyString), app));
+        }
+        if (intent == null) {
+            // No such intent.  REST standards recommend a positive status code
+            // in this case.
+            return;
+        }
+
+
+        Key key = intent.key();
+
+        // set up latch and listener to track uninstall progress
+        CountDownLatch latch = new CountDownLatch(1);
+
+        IntentListener listener = new DeleteListener(key, latch);
+        service.addListener(listener);
+
+        try {
+            // request the withdraw
+            service.withdraw(intent);
+
+            try {
+                latch.await(WITHDRAW_EVENT_TIMEOUT_SECONDS, TimeUnit.SECONDS);
+            } catch (InterruptedException e) {
+                log.info("REST Delete operation timed out waiting for intent {}", key);
+            }
+            // double check the state
+            IntentState state = service.getIntentState(key);
+            if (state == WITHDRAWN || state == FAILED) {
+                service.purge(intent);
+            }
+
+        } finally {
+            // clean up the listener
+            service.removeListener(listener);
+        }
+    }
+
 }
 }

@@ -79,13 +79,11 @@
         <dependency>
         <dependency>
             <groupId>com.sun.jersey.jersey-test-framework</groupId>
             <groupId>com.sun.jersey.jersey-test-framework</groupId>
             <artifactId>jersey-test-framework-core</artifactId>
             <artifactId>jersey-test-framework-core</artifactId>
-            <version>1.18.1</version>
             <scope>test</scope>
             <scope>test</scope>
         </dependency>
         </dependency>
         <dependency>
         <dependency>
             <groupId>com.sun.jersey.jersey-test-framework</groupId>
             <groupId>com.sun.jersey.jersey-test-framework</groupId>
             <artifactId>jersey-test-framework-grizzly2</artifactId>
             <artifactId>jersey-test-framework-grizzly2</artifactId>
-            <version>1.18.1</version>
             <scope>test</scope>
             <scope>test</scope>
         </dependency>
         </dependency>