mirrors/onos
1
0
Fork 0
mirror of https://github.com/opennetworkinglab/onos.git synced 2025-10-15 01:11:30 +02:00
Code Issues Projects Releases Wiki Activity

Make results of application codec and swagger doc desc consistent

Browse Source 
Application codec returns permissions, requiredApps and features
in string format. However, based on swagger doc, the codec is
supposed to return array. This commit fixes the type inconsistent
issue raised in application rest api.

Change-Id: If47338b287518a981c98ff89ca543802579c7610
This commit is contained in:
Jian Li 2016-01-21 13:42:19 -08:00 committed by Gerrit Code Review
parent 32347e0351
commit c67ca3cf7a
4 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
core/common/src/main/java/org/onosproject/codec/impl/ApplicationCodec.java
View File

@ -15,6 +15,7 @@
*/
package org.onosproject.codec.impl;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
import org.apache.commons.lang3.StringEscapeUtils;
import org.onosproject.app.ApplicationService;
@ -33,7 +34,16 @@ public final class ApplicationCodec extends JsonCodec<Application> {
public ObjectNode encode(Application app, CodecContext context) {
checkNotNull(app, "Application cannot be null");
ApplicationService service = context.getService(ApplicationService.class);
return context.mapper().createObjectNode()
ArrayNode permissions = context.mapper().createArrayNode();
ArrayNode features = context.mapper().createArrayNode();
ArrayNode requiredApps = context.mapper().createArrayNode();
app.permissions().forEach(p -> permissions.add(p.toString()));
app.features().forEach(f -> features.add(f));
app.requiredApps().forEach(a -> requiredApps.add(a));
ObjectNode result = context.mapper().createObjectNode()
.put("name", app.id().name())
.put("id", app.id().id())
.put("version", app.version().toString())
@ -42,11 +52,14 @@ public final class ApplicationCodec extends JsonCodec<Application> {
.put("readme", StringEscapeUtils.escapeJson(app.readme()))
.put("origin", app.origin())
.put("url", app.url())
.put("permissions", app.permissions().toString()) // FIXME: change to an array
.put("featuresRepo", app.featuresRepo().isPresent() ?
app.featuresRepo().get().toString() : "")
.put("features", app.features().toString()) // FIXME: change to an array
.put("requiredApps", app.requiredApps().toString()) // FIXME: change to an array
.put("state", service.getState(app.id()).toString());
result.set("features", features);
result.set("permissions", permissions);
result.set("requiredApps", requiredApps);
return result;
}
}

2
web/api/src/main/resources/definitions/Application.json
View File

@ -53,7 +53,7 @@
"permissions": {
"type": "array",
"xml": {
"name": "hosts",
"name": "permissions",
"wrapped": true
},
"items": {

2
web/api/src/main/resources/definitions/ApplicationPost.json
View File

@ -53,7 +53,7 @@
"permissions": {
"type": "array",
"xml": {
"name": "hosts",
"name": "permissions",
"wrapped": true
},
"items": {

2
web/api/src/main/resources/definitions/Applications.json
View File

@ -66,7 +66,7 @@
"permissions": {
"type": "array",
"xml": {
"name": "hosts",
"name": "permissions",
"wrapped": true
},
"items": {