diff options
author | gjoranv <gv@verizonmedia.com> | 2019-05-23 16:10:57 +0200 |
---|---|---|
committer | gjoranv <gv@verizonmedia.com> | 2019-05-24 15:10:26 +0200 |
commit | a74d3f42dfbe0f896b84fc612c0143e9180ac0fa (patch) | |
tree | 9dbf8b040f7bc7c62bdef5d6b4c1efbd948b4e12 /metrics-proxy | |
parent | c8856d2a54e8b49f927d4a1e5955cf5ecdcc4754 (diff) |
Rename JsonUtil -> YamasJsonUtil
Diffstat (limited to 'metrics-proxy')
-rw-r--r-- | metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/model/json/YamasJsonUtil.java (renamed from metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/model/json/JsonUtil.java) | 4 | ||||
-rw-r--r-- | metrics-proxy/src/main/java/ai/vespa/metricsproxy/rpc/RpcServer.java | 7 | ||||
-rw-r--r-- | metrics-proxy/src/test/java/ai/vespa/metricsproxy/metric/model/json/YamasJsonModelTest.java | 4 | ||||
-rw-r--r-- | metrics-proxy/src/test/java/ai/vespa/metricsproxy/metric/model/json/YamasJsonUtilTest.java (renamed from metrics-proxy/src/test/java/ai/vespa/metricsproxy/metric/model/json/JsonUtilTest.java) | 12 |
4 files changed, 12 insertions, 15 deletions
diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/model/json/JsonUtil.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/model/json/YamasJsonUtil.java index f48e5759528..7c1539d1c55 100644 --- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/model/json/JsonUtil.java +++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/model/json/YamasJsonUtil.java @@ -27,8 +27,8 @@ import static java.util.logging.Level.WARNING; /** * @author gjoranv */ -public class JsonUtil { - private static final Logger log = Logger.getLogger(JsonUtil.class.getName()); +public class YamasJsonUtil { + private static final Logger log = Logger.getLogger(YamasJsonUtil.class.getName()); static final String YAMAS_ROUTING = "yamas"; diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/rpc/RpcServer.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/rpc/RpcServer.java index e0e0e7a3f87..7157e3c40a0 100644 --- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/rpc/RpcServer.java +++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/rpc/RpcServer.java @@ -12,10 +12,7 @@ import ai.vespa.metricsproxy.service.VespaServices; import com.yahoo.jrt.ErrorCode; import com.yahoo.jrt.Method; import com.yahoo.jrt.Request; -import com.yahoo.jrt.Spec; import com.yahoo.jrt.StringValue; -import com.yahoo.jrt.Supervisor; -import com.yahoo.jrt.Transport; import java.time.Instant; import java.util.List; @@ -23,8 +20,8 @@ import java.util.logging.Level; import java.util.logging.Logger; import static ai.vespa.metricsproxy.metric.model.ConsumerId.toConsumerId; -import static ai.vespa.metricsproxy.metric.model.json.JsonUtil.toMetricsPackets; -import static ai.vespa.metricsproxy.metric.model.json.JsonUtil.toYamasArray; +import static ai.vespa.metricsproxy.metric.model.json.YamasJsonUtil.toMetricsPackets; +import static ai.vespa.metricsproxy.metric.model.json.YamasJsonUtil.toYamasArray; import static com.yahoo.collections.CollectionUtil.mkString; import static com.yahoo.log.LogLevel.DEBUG; import static java.util.logging.Level.INFO; diff --git a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/metric/model/json/YamasJsonModelTest.java b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/metric/model/json/YamasJsonModelTest.java index e91ff32e3b4..a73d15e8be3 100644 --- a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/metric/model/json/YamasJsonModelTest.java +++ b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/metric/model/json/YamasJsonModelTest.java @@ -59,7 +59,7 @@ public class YamasJsonModelTest { @Test public void deserialize_serialize_roundtrip_with_metrics_packet() throws IOException { YamasJsonModel jsonModel = getYamasJsonModel("yamas-array.json"); - MetricsPacket metricsPacket = JsonUtil.toMetricsPacketBuilder(jsonModel).build(); + MetricsPacket metricsPacket = YamasJsonUtil.toMetricsPacketBuilder(jsonModel).build(); // Do some sanity checking assertEquals(toServiceId("vespa.searchnode"), metricsPacket.service); @@ -67,7 +67,7 @@ public class YamasJsonModelTest { assertEquals(5.555555555E9, metricsPacket.metrics().get(toMetricId("memory_rss")).doubleValue(), 0.1d); //Not using custom double rendrer // Serialize and verify - YamasArrayJsonModel yamasArray = JsonUtil.toYamasArray(Collections.singleton(metricsPacket), true); + YamasArrayJsonModel yamasArray = YamasJsonUtil.toYamasArray(Collections.singleton(metricsPacket), true); String string = yamasArray.serialize(); assertEquals(EXPECTED_JSON, string); } diff --git a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/metric/model/json/JsonUtilTest.java b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/metric/model/json/YamasJsonUtilTest.java index 28912293fdb..b5b5ba9eaa5 100644 --- a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/metric/model/json/JsonUtilTest.java +++ b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/metric/model/json/YamasJsonUtilTest.java @@ -10,7 +10,7 @@ import org.junit.Test; import java.util.List; import static ai.vespa.metricsproxy.metric.model.ServiceId.toServiceId; -import static ai.vespa.metricsproxy.metric.model.json.JsonUtil.toMetricsPackets; +import static ai.vespa.metricsproxy.metric.model.json.YamasJsonUtil.toMetricsPackets; import static java.util.Collections.singleton; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; @@ -19,12 +19,12 @@ import static org.junit.Assert.assertTrue; /** * @author gjoranv */ -public class JsonUtilTest { +public class YamasJsonUtilTest { @Test public void json_model_gets_null_status_by_default() { MetricsPacket packet = new MetricsPacket.Builder(toServiceId("foo")) .build(); - YamasJsonModel jsonModel = JsonUtil.toYamasArray(singleton(packet)).metrics.get(0); + YamasJsonModel jsonModel = YamasJsonUtil.toYamasArray(singleton(packet)).metrics.get(0); assertNull(jsonModel.status_code); assertNull(jsonModel.status_msg); } @@ -33,7 +33,7 @@ public class JsonUtilTest { public void status_is_included_in_json_model_when_explicitly_asked_for() { MetricsPacket packet = new MetricsPacket.Builder(toServiceId("foo")) .build(); - YamasJsonModel jsonModel = JsonUtil.toYamasArray(singleton(packet), true).metrics.get(0); + YamasJsonModel jsonModel = YamasJsonUtil.toYamasArray(singleton(packet), true).metrics.get(0); assertNotNull(jsonModel.status_code); assertNotNull(jsonModel.status_msg); } @@ -43,7 +43,7 @@ public class JsonUtilTest { MetricsPacket packet = new MetricsPacket.Builder(toServiceId("foo")) .timestamp(0L) .build(); - YamasJsonModel jsonModel = JsonUtil.toYamasArray(singleton(packet)).metrics.get(0); + YamasJsonModel jsonModel = YamasJsonUtil.toYamasArray(singleton(packet)).metrics.get(0); assertNull(jsonModel.timestamp); } @@ -51,7 +51,7 @@ public class JsonUtilTest { public void empty_consumers_is_translated_to_null_routing_in_json_model() { MetricsPacket packet = new MetricsPacket.Builder(toServiceId("foo")) .build(); - YamasJsonModel jsonModel = JsonUtil.toYamasArray(singleton(packet)).metrics.get(0); + YamasJsonModel jsonModel = YamasJsonUtil.toYamasArray(singleton(packet)).metrics.get(0); assertNull(jsonModel.routing); } |