From df352c6ddadcbc7657f54e23376ceed9033e6db6 Mon Sep 17 00:00:00 2001
From: Kavitha Alagesan <kalagesa@partner.ciena.com>
Date: Wed, 13 Jul 2016 09:58:19 +0530
Subject: [PATCH]  Fix for the ONOS-4836

Change-Id: Iedf597bb79f27ca7834e85fc445ebd5736c852a7
---
 .../codec/impl/FilteringObjectiveCodec.java        | 12 ++++--------
 .../codec/impl/ForwardingObjectiveCodec.java       | 14 +++++---------
 .../onosproject/codec/impl/NextObjectiveCodec.java | 12 ++++--------
 .../main/resources/definitions/NextObjective.json  |  8 +++++++-
 4 files changed, 20 insertions(+), 26 deletions(-)

diff --git a/core/common/src/main/java/org/onosproject/codec/impl/FilteringObjectiveCodec.java b/core/common/src/main/java/org/onosproject/codec/impl/FilteringObjectiveCodec.java
index 673e4c8b19..c5b74627f3 100644
--- a/core/common/src/main/java/org/onosproject/codec/impl/FilteringObjectiveCodec.java
+++ b/core/common/src/main/java/org/onosproject/codec/impl/FilteringObjectiveCodec.java
@@ -53,10 +53,6 @@ public final class FilteringObjectiveCodec extends JsonCodec<FilteringObjective>
             " member is required in FilteringObjective";
     private static final String NOT_NULL_MESSAGE =
             "FilteringObjective cannot be null";
-    private static final String INVALID_TYPE_MESSAGE =
-            "The requested type {} is not defined in FilteringObjective.";
-    private static final String INVALID_OP_MESSAGE =
-            "The requested operation {} is not defined for FilteringObjective.";
 
     public static final String REST_APP_ID = "org.onosproject.rest";
 
@@ -136,8 +132,8 @@ public final class FilteringObjectiveCodec extends JsonCodec<FilteringObjective>
                 builder.deny();
                 break;
             default:
-                log.warn(INVALID_TYPE_MESSAGE, typeStr);
-                return null;
+                throw new IllegalArgumentException("The requested type " + typeStr +
+                " is not defined for FilteringObjective.");
         }
 
         // decode key
@@ -176,8 +172,8 @@ public final class FilteringObjectiveCodec extends JsonCodec<FilteringObjective>
                 filteringObjective = builder.remove();
                 break;
             default:
-                log.warn(INVALID_OP_MESSAGE, opStr);
-                return null;
+                throw new IllegalArgumentException("The requested operation " + opStr +
+                " is not defined for FilteringObjective.");
         }
 
         return filteringObjective;
diff --git a/core/common/src/main/java/org/onosproject/codec/impl/ForwardingObjectiveCodec.java b/core/common/src/main/java/org/onosproject/codec/impl/ForwardingObjectiveCodec.java
index 864756a3c2..ad198c98d1 100644
--- a/core/common/src/main/java/org/onosproject/codec/impl/ForwardingObjectiveCodec.java
+++ b/core/common/src/main/java/org/onosproject/codec/impl/ForwardingObjectiveCodec.java
@@ -50,10 +50,6 @@ public final class ForwardingObjectiveCodec extends JsonCodec<ForwardingObjectiv
             " member is required in ForwardingObjective";
     private static final String NOT_NULL_MESSAGE =
             "ForwardingObjective cannot be null";
-    private static final String INVALID_FLAG_MESSAGE =
-            "The requested flag {} is not defined in ForwardingObjective.";
-    private static final String INVALID_OP_MESSAGE =
-            "The requested operation {} is not defined for FilteringObjective.";
 
     public static final String REST_APP_ID = "org.onosproject.rest";
 
@@ -130,8 +126,8 @@ public final class ForwardingObjectiveCodec extends JsonCodec<ForwardingObjectiv
                 builder.withFlag(ForwardingObjective.Flag.VERSATILE);
                 break;
             default:
-                log.warn(INVALID_FLAG_MESSAGE, flagStr);
-                return null;
+                throw new IllegalArgumentException("The requested flag " + flagStr +
+                " is not defined for FilteringObjective.");
         }
 
         // decode selector
@@ -156,7 +152,7 @@ public final class ForwardingObjectiveCodec extends JsonCodec<ForwardingObjectiv
 
         // decode operation
         String opStr = nullIsIllegal(json.get(OPERATION), OPERATION + MISSING_MEMBER_MESSAGE).asText();
-        ForwardingObjective forwardingObjective;
+        ForwardingObjective forwardingObjective = null;
 
         switch (opStr) {
             case "ADD":
@@ -166,8 +162,8 @@ public final class ForwardingObjectiveCodec extends JsonCodec<ForwardingObjectiv
                 forwardingObjective = builder.remove();
                 break;
             default:
-                log.warn(INVALID_OP_MESSAGE, opStr);
-                return null;
+                throw new IllegalArgumentException("The requested operation " + opStr +
+                " is not defined for FilteringObjective.");
         }
 
         return forwardingObjective;
diff --git a/core/common/src/main/java/org/onosproject/codec/impl/NextObjectiveCodec.java b/core/common/src/main/java/org/onosproject/codec/impl/NextObjectiveCodec.java
index a58ad3fbb3..6b2ad899e7 100644
--- a/core/common/src/main/java/org/onosproject/codec/impl/NextObjectiveCodec.java
+++ b/core/common/src/main/java/org/onosproject/codec/impl/NextObjectiveCodec.java
@@ -53,10 +53,6 @@ public final class NextObjectiveCodec extends JsonCodec<NextObjective> {
             " member is required in NextObjective";
     private static final String NOT_NULL_MESSAGE =
             "NextObjective cannot be null";
-    private static final String INVALID_TYPE_MESSAGE =
-            "The requested flag {} is not defined in NextObjective.";
-    private static final String INVALID_OP_MESSAGE =
-            "The requested operation {} is not defined for NextObjective.";
 
     public static final String REST_APP_ID = "org.onosproject.rest";
 
@@ -142,8 +138,8 @@ public final class NextObjectiveCodec extends JsonCodec<NextObjective> {
                 builder.withType(NextObjective.Type.SIMPLE);
                 break;
             default:
-                log.warn(INVALID_TYPE_MESSAGE, typeStr);
-                return null;
+                throw new IllegalArgumentException("The requested type " + typeStr +
+                " is not defined for FilteringObjective.");
         }
 
         // decode treatments
@@ -175,8 +171,8 @@ public final class NextObjectiveCodec extends JsonCodec<NextObjective> {
                 nextObjective = builder.remove();
                 break;
             default:
-                log.warn(INVALID_OP_MESSAGE, opStr);
-                return null;
+                throw new IllegalArgumentException("The requested operation " + opStr +
+                " is not defined for FilteringObjective.");
         }
 
         return nextObjective;
diff --git a/web/api/src/main/resources/definitions/NextObjective.json b/web/api/src/main/resources/definitions/NextObjective.json
index adbcfc7fe9..d5ab7d7477 100644
--- a/web/api/src/main/resources/definitions/NextObjective.json
+++ b/web/api/src/main/resources/definitions/NextObjective.json
@@ -3,6 +3,7 @@
   "title": "nextObjective",
   "required": [
     "type",
+    "id",
     "priority",
     "timeout",
     "isPermanent",
@@ -16,6 +17,11 @@
       "type": "string",
       "example": "HASHED"
     },
+    "id": {
+      "type": "integer",
+      "format": "int64",
+      "example": 1
+    },
     "priority": {
       "type": "integer",
       "format": "int64",
@@ -308,4 +314,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}