Fix some JSON related deprecation and javadoc warnings
Change-Id: If39c0bbe578794c8308b24d9290e269bd14b9219
diff --git a/apps/metrics/topology/src/main/java/org/onosproject/metrics/topology/cli/TopologyEventsListCommand.java b/apps/metrics/topology/src/main/java/org/onosproject/metrics/topology/cli/TopologyEventsListCommand.java
index 9634df6..0cd2cfb 100644
--- a/apps/metrics/topology/src/main/java/org/onosproject/metrics/topology/cli/TopologyEventsListCommand.java
+++ b/apps/metrics/topology/src/main/java/org/onosproject/metrics/topology/cli/TopologyEventsListCommand.java
@@ -77,7 +77,7 @@
* Produces JSON object for a topology event.
*
* @param mapper the JSON object mapper to use
- * @param topologyEvent the topology event with the data
+ * @param event the topology event with the data
* @return JSON object for the topology event
*/
private ObjectNode json(ObjectMapper mapper, Event event) {
@@ -94,7 +94,7 @@
for (Event reason : topologyEvent.reasons()) {
reasons.add(json(mapper, reason));
}
- result.put("reasons", reasons);
+ result.set("reasons", reasons);
}
return result;
diff --git a/apps/metrics/topology/src/main/java/org/onosproject/metrics/topology/cli/TopologyEventsMetricsCommand.java b/apps/metrics/topology/src/main/java/org/onosproject/metrics/topology/cli/TopologyEventsMetricsCommand.java
index 4205dfa..274a14d 100644
--- a/apps/metrics/topology/src/main/java/org/onosproject/metrics/topology/cli/TopologyEventsMetricsCommand.java
+++ b/apps/metrics/topology/src/main/java/org/onosproject/metrics/topology/cli/TopologyEventsMetricsCommand.java
@@ -85,8 +85,8 @@
Gauge<Long> gauge = eventMetric.lastEventTimestampGauge();
Meter meter = eventMetric.eventRateMeter();
- objectNode.put(gaugeName, json(mapper, gauge));
- objectNode.put(meterName, json(mapper, meter));
+ objectNode.set(gaugeName, json(mapper, gauge));
+ objectNode.set(meterName, json(mapper, meter));
return objectNode;
}