mirrors/onos
1
0
Fork 0
mirror of https://github.com/opennetworkinglab/onos.git synced 2026-05-05 20:26:16 +02:00
Code Issues Projects Releases Wiki Activity

Fix for the ONOS-4836

Browse Source 
Change-Id: Iedf597bb79f27ca7834e85fc445ebd5736c852a7
This commit is contained in:
Kavitha Alagesan 2016-07-13 09:58:19 +05:30 committed by Gerrit Code Review
parent 528ef30d89
commit df352c6dda
4 changed files with 20 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/common/src/main/java/org/onosproject/codec/impl/FilteringObjectiveCodec.java
View File

@ -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;

14
core/common/src/main/java/org/onosproject/codec/impl/ForwardingObjectiveCodec.java
View File

@ -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;

12
core/common/src/main/java/org/onosproject/codec/impl/NextObjectiveCodec.java
View File

@ -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;

8
web/api/src/main/resources/definitions/NextObjective.json
View File

@ -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 @@
}
}
}
}
}