commit a8091b12b9a8c377d083ee0c7c50033f0182d17e
author Ray Milkey <ray@onlab.us> Fri May 16 14:42:47 2014 -0700
committer Ray Milkey <ray@onlab.us> Tue May 20 11:40:51 2014 -0700
tree b761dee18c86eab5a43ad00b1948c24783869bde
parent e3dadc3a38e36aac445bcb28613cb9e1e5eb935f

First cut at REST errors

 - Added a new client-facing class to hold a formatted error
 - Renamed the existing RestError to be RestErrorCatalogEntry
 - Modified the Intent POST operation to return an actual error if the
   POST can't parse the inbound object

Change-Id: I05d8919626f1a9350262d4aee7919c0fc8a4fa09

src/main/java/net/onrc/onos/core/intent/runtime/web/IntentHighResource.java

diff --git a/src/main/java/net/onrc/onos/core/intent/runtime/web/IntentHighResource.java b/src/main/java/net/onrc/onos/core/intent/runtime/web/IntentHighResource.java
index ede564f..8229e38 100644
--- a/src/main/java/net/onrc/onos/core/intent/runtime/web/IntentHighResource.java
+++ b/src/main/java/net/onrc/onos/core/intent/runtime/web/IntentHighResource.java
@@ -5,6 +5,8 @@
 
 import net.floodlightcontroller.util.MACAddress;
 import net.onrc.onos.api.intent.ApplicationIntent;
+import net.onrc.onos.api.rest.RestError;
+import net.onrc.onos.api.rest.RestErrorCodes;
 import net.onrc.onos.core.intent.ConstrainedShortestPathIntent;
 import net.onrc.onos.core.intent.Intent;
 import net.onrc.onos.core.intent.IntentMap;
@@ -14,9 +16,8 @@
 import net.onrc.onos.core.intent.runtime.IPathCalcRuntimeService;
 import net.onrc.onos.core.util.Dpid;
 
-import org.codehaus.jackson.JsonParseException;
-import org.codehaus.jackson.map.JsonMappingException;
 import org.codehaus.jackson.map.ObjectMapper;
+import org.restlet.data.Status;
 import org.restlet.resource.Delete;
 import org.restlet.resource.Get;
 import org.restlet.resource.Post;
@@ -66,16 +67,18 @@
         ObjectMapper mapper = new ObjectMapper();
         ApplicationIntent[] addOperations = null;
         try {
-            addOperations = mapper.readValue(jsonIntent, ApplicationIntent[].class);
-        } catch (JsonParseException ex) {
-            log.error("JsonParseException occurred", ex);
-        } catch (JsonMappingException ex) {
-            log.error("JsonMappingException occurred", ex);
+            if (jsonIntent != null) {
+                addOperations = mapper.readValue(jsonIntent, ApplicationIntent[].class);
+            }
         } catch (IOException ex) {
-            log.error("IOException occurred", ex);
+            log.error("Exception occurred parsing inbound JSON", ex);
         }
+
         if (addOperations == null) {
-            return "";
+            setStatus(Status.CLIENT_ERROR_BAD_REQUEST);
+            final RestError error =
+                    RestError.createRestError(RestErrorCodes.RestErrorCode.INTENT_INVALID);
+            return mapper.writeValueAsString(error);
         }
 
         //
@@ -127,6 +130,8 @@
         // Apply the Intent Operations
         pathRuntime.executeIntentOperations(intentOperations);
 
+        setStatus(Status.SUCCESS_CREATED);
+
         return reply;
     }
 
@@ -144,6 +149,7 @@
         // TODO: The implementation below is broken - waiting for the Java API
         // TODO: The deletion should use synchronous Java API?
         pathRuntime.purgeIntents();
+        setStatus(Status.SUCCESS_NO_CONTENT);
         return "";      // TODO no reply yet from the purge intents call
     }
 }