Fix some JSON related deprecation and javadoc warnings
Change-Id: If39c0bbe578794c8308b24d9290e269bd14b9219
diff --git a/apps/routing/src/main/java/org/onosproject/routing/cli/BgpRoutesListCommand.java b/apps/routing/src/main/java/org/onosproject/routing/cli/BgpRoutesListCommand.java
index 3b032c0..c3d3c52 100644
--- a/apps/routing/src/main/java/org/onosproject/routing/cli/BgpRoutesListCommand.java
+++ b/apps/routing/src/main/java/org/onosproject/routing/cli/BgpRoutesListCommand.java
@@ -122,8 +122,8 @@
if (outputJson()) {
ObjectMapper mapper = new ObjectMapper();
ObjectNode result = mapper.createObjectNode();
- result.put("routes4", json(routes4));
- result.put("routes6", json(routes6));
+ result.set("routes4", json(routes4));
+ result.set("routes6", json(routes6));
print("%s", result);
} else {
// The IPv4 routes
@@ -248,7 +248,7 @@
result.put("bgpId",
route.getBgpSession().remoteInfo().bgpId().toString());
result.put("origin", Update.Origin.typeToString(route.getOrigin()));
- result.put("asPath", json(mapper, route.getAsPath()));
+ result.set("asPath", json(mapper, route.getAsPath()));
result.put("localPref", route.getLocalPref());
result.put("multiExitDisc", route.getMultiExitDisc());
@@ -273,10 +273,10 @@
for (Long asNumber : pathSegment.getSegmentAsNumbers()) {
segmentAsNumbersJson.add(asNumber);
}
- pathSegmentJson.put("segmentAsNumbers", segmentAsNumbersJson);
+ pathSegmentJson.set("segmentAsNumbers", segmentAsNumbersJson);
pathSegmentsJson.add(pathSegmentJson);
}
- result.put("pathSegments", pathSegmentsJson);
+ result.set("pathSegments", pathSegmentsJson);
return result;
}
diff --git a/apps/routing/src/main/java/org/onosproject/routing/cli/RoutesListCommand.java b/apps/routing/src/main/java/org/onosproject/routing/cli/RoutesListCommand.java
index 6c9d688..ab2b91e 100644
--- a/apps/routing/src/main/java/org/onosproject/routing/cli/RoutesListCommand.java
+++ b/apps/routing/src/main/java/org/onosproject/routing/cli/RoutesListCommand.java
@@ -92,8 +92,8 @@
if (outputJson()) {
ObjectMapper mapper = new ObjectMapper();
ObjectNode result = mapper.createObjectNode();
- result.put("routes4", json(routes4));
- result.put("routes6", json(routes6));
+ result.set("routes4", json(routes4));
+ result.set("routes6", json(routes6));
print("%s", result);
} else {
// The IPv4 routes