From 699b6aab27990ee4c6aca0a7241ecb8f42d86d00 Mon Sep 17 00:00:00 2001
From: gjoranv <gv@verizonmedia.com>
Date: Tue, 11 Jun 2019 17:37:53 +0200
Subject: Remove method that was only used in tests.

---
 .../main/java/ai/vespa/metricsproxy/metric/Metrics.java  | 16 ----------------
 .../java/ai/vespa/metricsproxy/metric/MetricsTest.java   |  4 +++-
 .../vespa/metricsproxy/service/MetricsFetcherTest.java   |  8 ++++----
 3 files changed, 7 insertions(+), 21 deletions(-)

(limited to 'metrics-proxy')

diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/Metrics.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/Metrics.java
index 2a803062b5d..f1d029d8746 100644
--- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/Metrics.java
+++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/Metrics.java
@@ -83,22 +83,6 @@ public class Metrics {
     }
 
 
-    /**
-     * Get a single metric based on the metric name
-     * TODO: Remove, might be multiple metrics with same name, but different
-     *
-     * @param key metric name
-     * @return The value or null if metric was not found or expired
-     */
-    public Number get(String key) {
-        isFrozen = true;
-        Metric m = getMetric(key);
-        if (m != null) {
-            return m.getValue();
-        }
-        return null;
-    }
-
     public String toString() {
         StringBuilder sb = new StringBuilder();
         for (Metric m : metrics) {
diff --git a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/metric/MetricsTest.java b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/metric/MetricsTest.java
index b9e6377c27b..cce88a5bd53 100644
--- a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/metric/MetricsTest.java
+++ b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/metric/MetricsTest.java
@@ -12,6 +12,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertThat;
 
 /**
@@ -46,7 +47,8 @@ public class MetricsTest {
     public void testBasicMetric() {
         Metrics m = new Metrics();
         m.add(new Metric("count", 1, System.currentTimeMillis() / 1000));
-        assertThat(m.get("count").intValue(), is(1));
+        assertThat(m.getMetrics().size(), is(1));
+        assertThat(m.getMetrics().get(0).getName(), is("count"));
     }
 
     @Test
diff --git a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/service/MetricsFetcherTest.java b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/service/MetricsFetcherTest.java
index 278b2a3143a..ce33ce9f7bf 100644
--- a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/service/MetricsFetcherTest.java
+++ b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/service/MetricsFetcherTest.java
@@ -22,10 +22,10 @@ public class MetricsFetcherTest {
         String jsonData = TestUtil.getFileContents("metrics-state.json");
         RemoteMetricsFetcher fetcher = new RemoteMetricsFetcher(new DummyService(0, "dummy/id/0"), port);
         Metrics metrics = fetcher.createMetrics(jsonData, 0);
-        assertThat("Wrong number of metrics", metrics.size(), is(10));
-        assertThat("Wrong value for metric", metrics.get("query_hits.count").intValue(), is(28));
-        assertThat("Wrong value for metric ", metrics.get("queries.rate").doubleValue(), is(0.4667));
-        assertThat("Wrong timestamp", metrics.getTimeStamp(), is(1334134700L));
+        assertThat(metrics.size(), is(10));
+        assertThat(metrics.getMetric("query_hits.count").getValue().intValue(), is(28));
+        assertThat(metrics.getMetric("queries.rate").getValue().doubleValue(), is(0.4667));
+        assertThat(metrics.getTimeStamp(), is(1334134700L));
     }
 
     @Test
-- 
cgit v1.2.3