diff options
author | Bjørn Christian Seime <bjorn.christian@seime.no> | 2021-02-01 23:51:00 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-02-01 23:51:00 +0100 |
commit | 42794e42e8ce223705e0a8e0e3e9293d65adaf6c (patch) | |
tree | a337188686fe568fd0dc04db5234c7ffa2ccbb63 /controller-api | |
parent | 7f04da806204b7727f377b4099bd10571c61e5da (diff) |
Revert "Remove org.json usage [run-systemtest]"
Diffstat (limited to 'controller-api')
-rw-r--r-- | controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/ProtonMetrics.java | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/ProtonMetrics.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/ProtonMetrics.java index ed88902e094..c6d907ec7fc 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/ProtonMetrics.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/ProtonMetrics.java @@ -1,19 +1,14 @@ package com.yahoo.vespa.hosted.controller.api.application.v4.model; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.node.ObjectNode; - import java.util.HashMap; import java.util.Map; -import java.util.logging.Level; import java.util.logging.LogManager; import java.util.logging.Logger; +import org.json.JSONException; +import org.json.JSONObject; public class ProtonMetrics { - private static final ObjectMapper jsonMapper = new ObjectMapper(); - private static final Logger logger = LogManager.getLogManager().getLogger(ProtonMetrics.class.getName()); public static final String DOCUMENTS_ACTIVE_COUNT = "documentsActiveCount"; @@ -50,19 +45,19 @@ public class ProtonMetrics { return this; } - public JsonNode toJson() { + public JSONObject toJson() { try { - ObjectNode protonMetrics = jsonMapper.createObjectNode(); + JSONObject protonMetrics = new JSONObject(); protonMetrics.put("clusterId", clusterId); - ObjectNode jsonMetrics = jsonMapper.createObjectNode(); + JSONObject jsonMetrics = new JSONObject(); for (Map.Entry<String, Double> entry : metrics.entrySet()) { jsonMetrics.put(entry.getKey(), entry.getValue()); } - protonMetrics.set("metrics", jsonMetrics); + protonMetrics.put("metrics", jsonMetrics); return protonMetrics; - } catch (Exception e) { - logger.log(Level.SEVERE, "Unable to convert Proton Metrics to JSON Object: " + e.getMessage(), e); + } catch (JSONException e) { + logger.severe("Unable to convert Proton Metrics to JSON Object"); } - return jsonMapper.createObjectNode(); + return new JSONObject(); } } |