Move Node class to separate file, and add path field.

3 files changed, 37 insertions, 24 deletions

diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/application/Node.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/application/Node.java
new file mode 100644
index 00000000000..06bb2e890ea
--- /dev/null
+++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/application/Node.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+ */
+
+package ai.vespa.metricsproxy.http.application;
+
+import java.net.URI;
+
+/**
+ * Represents a node to retrieve metrics from.
+ *
+ * @author gjoranv
+ */
+public class Node {
+
+    final String configId;
+    final String host;
+    final int port;
+    final String path;
+
+    final URI metricsUri;
+
+    public Node(String configId, String host, int port, String path) {
+        this.configId = configId;
+        this.host = host;
+        this.port = port;
+        this.path = path;
+        metricsUri = getMetricsUri(host, port, path);
+    }
+
+    private static URI getMetricsUri(String host, int port, String path) {
+        return URI.create("http://" + host + ":" + port + path);
+    }
+
+}
diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/application/NodeMetricsClient.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/application/NodeMetricsClient.java
index 28130380c13..34ee38d44f2 100644
--- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/application/NodeMetricsClient.java
+++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/application/NodeMetricsClient.java
@@ -4,7 +4,6 @@
 
 package ai.vespa.metricsproxy.http.application;
 
-import ai.vespa.metricsproxy.http.MetricsHandler;
 import ai.vespa.metricsproxy.metric.model.MetricsPacket;
 import ai.vespa.metricsproxy.metric.model.json.GenericJsonUtil;
 import com.yahoo.yolean.Exceptions;
@@ -13,7 +12,6 @@ import org.apache.http.client.methods.HttpGet;
 import org.apache.http.impl.client.BasicResponseHandler;
 
 import java.io.IOException;
-import java.net.URI;
 import java.time.Clock;
 import java.time.Duration;
 import java.time.Instant;
@@ -76,24 +74,4 @@ public class NodeMetricsClient {
         return snapshotsRetrieved;
     }
 
-    // TODO: move to separate file
-    static class Node {
-        final String configId;
-        final String host;
-        final int port;
-        final URI metricsUri;
-
-        public Node(String configId, String host, int port) {
-            this.configId = configId;
-            this.host = host;
-            this.port = port;
-            metricsUri = getMetricsUri(host, port);
-        }
-
-        private static URI getMetricsUri(String host, int port) {
-          return URI.create("http://" + host + ":" + port + MetricsHandler.VALUES_PATH);
-        }
-
-    }
-
 }
diff --git a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/http/application/NodeMetricsClientTest.java b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/http/application/NodeMetricsClientTest.java
index 93212889b3c..f953e809f85 100644
--- a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/http/application/NodeMetricsClientTest.java
+++ b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/http/application/NodeMetricsClientTest.java
@@ -4,7 +4,7 @@
 
 package ai.vespa.metricsproxy.http.application;
 
-import ai.vespa.metricsproxy.http.application.NodeMetricsClient.Node;
+import ai.vespa.metricsproxy.http.MetricsHandler;
 import ai.vespa.metricsproxy.metric.model.MetricsPacket;
 import com.github.tomakehurst.wiremock.junit.WireMockClassRule;
 import com.yahoo.test.ManualClock;
@@ -48,7 +48,7 @@ public class NodeMetricsClientTest {
 
     @BeforeClass
     public static void setupWireMock() {
-        node = new Node("id", "localhost", wireMockRule.port());
+        node = new Node("id", "localhost", wireMockRule.port(), MetricsHandler.VALUES_PATH);
         wireMockRule.stubFor(get(urlEqualTo(node.metricsUri.getPath()))
                                      .willReturn(aResponse().withBody(RESPONSE)));
     }