Fix for ONOS-4836

Change-Id: Ic2f0d36a8238221a1093fda259156485674f6d44

@@ -53,10 +53,6 @@ public class FilteringObjectiveCodec extends JsonCodec<FilteringObjective> {
             " member is required in FilteringObjective";
             " member is required in FilteringObjective";
     private static final String NOT_NULL_MESSAGE =
     private static final String NOT_NULL_MESSAGE =
             "FilteringObjective cannot be null";
             "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";
     public static final String REST_APP_ID = "org.onosproject.rest";
 
 
@@ -133,8 +129,8 @@ public class FilteringObjectiveCodec extends JsonCodec<FilteringObjective> {
                 builder.deny();
                 builder.deny();
                 break;
                 break;
             default:
             default:
-                log.warn(INVALID_TYPE_MESSAGE, typeStr);
-                return null;
+                throw new IllegalArgumentException("The requested type " + typeStr +
+                " is not defined for FilteringObjective.");
         }
         }
 
 
         // decode key
         // decode key
@@ -173,8 +169,8 @@ public class FilteringObjectiveCodec extends JsonCodec<FilteringObjective> {
                 filteringObjective = builder.remove();
                 filteringObjective = builder.remove();
                 break;
                 break;
             default:
             default:
-                log.warn(INVALID_OP_MESSAGE, opStr);
-                return null;
+                throw new IllegalArgumentException("The requested operation " + opStr +
+                " is not defined for FilteringObjective.");
         }
         }
 
 
         return filteringObjective;
         return filteringObjective;

@@ -50,10 +50,6 @@ public class ForwardingObjectiveCodec extends JsonCodec<ForwardingObjective> {
             " member is required in ForwardingObjective";
             " member is required in ForwardingObjective";
     private static final String NOT_NULL_MESSAGE =
     private static final String NOT_NULL_MESSAGE =
             "ForwardingObjective cannot be null";
             "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";
     public static final String REST_APP_ID = "org.onosproject.rest";
 
 
@@ -129,8 +125,8 @@ public class ForwardingObjectiveCodec extends JsonCodec<ForwardingObjective> {
                 builder.withFlag(ForwardingObjective.Flag.VERSATILE);
                 builder.withFlag(ForwardingObjective.Flag.VERSATILE);
                 break;
                 break;
             default:
             default:
-                log.warn(INVALID_FLAG_MESSAGE, flagStr);
-                return null;
+                throw new IllegalArgumentException("The requested flag " + flagStr +
+                " is not defined for FilteringObjective.");
         }
         }
 
 
         // decode selector
         // decode selector
@@ -155,7 +151,7 @@ public class ForwardingObjectiveCodec extends JsonCodec<ForwardingObjective> {
 
 
         // decode operation
         // decode operation
         String opStr = nullIsIllegal(json.get(OPERATION), OPERATION + MISSING_MEMBER_MESSAGE).asText();
         String opStr = nullIsIllegal(json.get(OPERATION), OPERATION + MISSING_MEMBER_MESSAGE).asText();
-        ForwardingObjective forwardingObjective;
+        ForwardingObjective forwardingObjective = null;
 
 
         switch (opStr) {
         switch (opStr) {
             case "ADD":
             case "ADD":
@@ -165,8 +161,8 @@ public class ForwardingObjectiveCodec extends JsonCodec<ForwardingObjective> {
                 forwardingObjective = builder.remove();
                 forwardingObjective = builder.remove();
                 break;
                 break;
             default:
             default:
-                log.warn(INVALID_OP_MESSAGE, opStr);
-                return null;
+                throw new IllegalArgumentException("The requested operation " + opStr +
+                " is not defined for FilteringObjective.");
         }
         }
 
 
         return forwardingObjective;
         return forwardingObjective;

@@ -53,10 +53,6 @@ public class NextObjectiveCodec extends JsonCodec<NextObjective> {
             " member is required in NextObjective";
             " member is required in NextObjective";
     private static final String NOT_NULL_MESSAGE =
     private static final String NOT_NULL_MESSAGE =
             "NextObjective cannot be null";
             "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";
     public static final String REST_APP_ID = "org.onosproject.rest";
 
 
@@ -141,8 +137,8 @@ public class NextObjectiveCodec extends JsonCodec<NextObjective> {
                 builder.withType(NextObjective.Type.SIMPLE);
                 builder.withType(NextObjective.Type.SIMPLE);
                 break;
                 break;
             default:
             default:
-                log.warn(INVALID_TYPE_MESSAGE, typeStr);
-                return null;
+                throw new IllegalArgumentException("The requested type " + typeStr +
+                " is not defined for FilteringObjective.");
         }
         }
 
 
         // decode treatments
         // decode treatments
@@ -174,8 +170,8 @@ public class NextObjectiveCodec extends JsonCodec<NextObjective> {
                 nextObjective = builder.remove();
                 nextObjective = builder.remove();
                 break;
                 break;
             default:
             default:
-                log.warn(INVALID_OP_MESSAGE, opStr);
-                return null;
+                throw new IllegalArgumentException("The requested operation " + opStr +
+                " is not defined for FilteringObjective.");
         }
         }
 
 
         return nextObjective;
         return nextObjective;

@@ -3,6 +3,7 @@
   "title": "nextObjective",
   "title": "nextObjective",
   "required": [
   "required": [
     "type",
     "type",
+    "id",
     "priority",
     "priority",
     "timeout",
     "timeout",
     "isPermanent",
     "isPermanent",
@@ -16,6 +17,11 @@
       "type": "string",
       "type": "string",
       "example": "HASHED"
       "example": "HASHED"
     },
     },
+    "id": {
+      "type": "integer",
+      "format": "int64",
+      "example": 1
+    },
     "priority": {
     "priority": {
       "type": "integer",
       "type": "integer",
       "format": "int64",
       "format": "int64",
@@ -308,4 +314,4 @@
       }
       }
     }
     }
   }
   }
-}
\ No newline at end of file
+}