diff options
author | gjoranv <gv@oath.com> | 2018-10-31 15:28:02 +0100 |
---|---|---|
committer | gjoranv <gv@oath.com> | 2018-10-31 15:28:02 +0100 |
commit | c8af9d0370f3ca5faeaa78b8fcdafc3828c938fb (patch) | |
tree | 819f7712e3ff6675d7bfe4be1e5c0fdd0560d87b /container-core | |
parent | f251dfa878d3807ca4f2741c01e18e6006d59aab (diff) |
Use a constant for the packet separator.
Diffstat (limited to 'container-core')
2 files changed, 5 insertions, 2 deletions
diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/state/MetricsPacketsHandler.java b/container-core/src/main/java/com/yahoo/container/jdisc/state/MetricsPacketsHandler.java index 0652642b87f..2217f84beb1 100644 --- a/container-core/src/main/java/com/yahoo/container/jdisc/state/MetricsPacketsHandler.java +++ b/container-core/src/main/java/com/yahoo/container/jdisc/state/MetricsPacketsHandler.java @@ -44,6 +44,8 @@ public class MetricsPacketsHandler extends AbstractRequestHandler { static final String METRICS_KEY = "metrics"; static final String DIMENSIONS_KEY = "dimensions"; + static final String PACKET_SEPARATOR = "\n\n"; + private final StateMonitor monitor; private final Timer timer; private final SnapshotProvider snapshotPreprocessor; @@ -111,7 +113,7 @@ public class MetricsPacketsHandler extends AbstractRequestHandler { StringBuilder ret = new StringBuilder(); List<JSONObject> metricsPackets = getPacketsForSnapshot(getSnapshot(), applicationName, timer.currentTimeMillis()); for (JSONObject packet : metricsPackets) { - ret.append("\n\n"); // For legibility and parsing in unit tests + ret.append(PACKET_SEPARATOR); // For legibility and parsing in unit tests ret.append(jsonToString(packet)); } return ret.toString(); diff --git a/container-core/src/test/java/com/yahoo/container/jdisc/state/MetricsPacketsHandlerTest.java b/container-core/src/test/java/com/yahoo/container/jdisc/state/MetricsPacketsHandlerTest.java index 895cb885828..fc914483117 100644 --- a/container-core/src/test/java/com/yahoo/container/jdisc/state/MetricsPacketsHandlerTest.java +++ b/container-core/src/test/java/com/yahoo/container/jdisc/state/MetricsPacketsHandlerTest.java @@ -13,6 +13,7 @@ import java.util.List; import static com.yahoo.container.jdisc.state.MetricsPacketsHandler.APPLICATION_KEY; import static com.yahoo.container.jdisc.state.MetricsPacketsHandler.DIMENSIONS_KEY; import static com.yahoo.container.jdisc.state.MetricsPacketsHandler.METRICS_KEY; +import static com.yahoo.container.jdisc.state.MetricsPacketsHandler.PACKET_SEPARATOR; import static com.yahoo.container.jdisc.state.MetricsPacketsHandler.STATUS_CODE_KEY; import static com.yahoo.container.jdisc.state.MetricsPacketsHandler.STATUS_MSG_KEY; import static com.yahoo.container.jdisc.state.MetricsPacketsHandler.TIMESTAMP_KEY; @@ -127,7 +128,7 @@ public class MetricsPacketsHandlerTest extends StateHandlerTestBase { private List<JsonNode> toJsonPackets(String response) throws Exception { List<JsonNode> jsonPackets = new ArrayList<>(); - String[] packets = response.split("\\n\\n"); + String[] packets = response.split(PACKET_SEPARATOR); ObjectMapper mapper = new ObjectMapper(); for (String packet : packets) { jsonPackets.add(mapper.readTree(mapper.getFactory().createParser(packet))); |