Cleaned up code

2 files changed, 22 insertions, 30 deletions

diff --git a/container-core/src/main/java/com/yahoo/container/handler/metrics/PrometheusV1Handler.java b/container-core/src/main/java/com/yahoo/container/handler/metrics/PrometheusV1Handler.java
index 57268108f84..4212708c36c 100644
--- a/container-core/src/main/java/com/yahoo/container/handler/metrics/PrometheusV1Handler.java
+++ b/container-core/src/main/java/com/yahoo/container/handler/metrics/PrometheusV1Handler.java
@@ -37,6 +37,20 @@ public class PrometheusV1Handler extends HttpHandlerBase {
         metricsProxyUri = "http://localhost:+" + config.metricsPort() + config.metricsApiPath();
     }
 
+    private static CloseableHttpClient createHttpClient() {
+        return VespaHttpClientBuilder.create()
+                .setUserAgent("application-prometheus-retriever")
+                .setDefaultRequestConfig(RequestConfig.custom()
+                        .setConnectTimeout(HTTP_CONNECT_TIMEOUT)
+                        .setSocketTimeout(HTTP_SOCKET_TIMEOUT)
+                        .build())
+                .build();
+    }
+
+    static String consumerQuery(String consumer) {
+        return (consumer == null || consumer.isEmpty()) ? "" : "?consumer=" + consumer;
+    }
+
     @Override
     protected Optional<HttpResponse> doHandle(URI requestUri, Path apiPath, String consumer) {
         if (apiPath.matches(V1_PATH)) return Optional.of(resourceListResponse(requestUri, List.of(VALUES_PATH)));
@@ -55,20 +69,4 @@ public class PrometheusV1Handler extends HttpHandlerBase {
         }
     }
 
-
-
-    private static CloseableHttpClient createHttpClient() {
-        return VespaHttpClientBuilder.create()
-                .setUserAgent("application-prometheus-retriever")
-                .setDefaultRequestConfig(RequestConfig.custom()
-                                                .setConnectTimeout(HTTP_CONNECT_TIMEOUT)
-                                                .setSocketTimeout(HTTP_SOCKET_TIMEOUT)
-                                                .build())
-                .build();
-    }
-
-    static String consumerQuery(String consumer) {
-        return (consumer == null || consumer.isEmpty()) ? "" : "?consumer=" + consumer;
-    }
-
 }
diff --git a/container-core/src/test/java/com/yahoo/container/handler/metrics/PrometheusV1HandlerTest.java b/container-core/src/test/java/com/yahoo/container/handler/metrics/PrometheusV1HandlerTest.java
index 5be2e8df519..f49eeb80cbf 100644
--- a/container-core/src/test/java/com/yahoo/container/handler/metrics/PrometheusV1HandlerTest.java
+++ b/container-core/src/test/java/com/yahoo/container/handler/metrics/PrometheusV1HandlerTest.java
@@ -5,28 +5,22 @@ import com.yahoo.container.jdisc.RequestHandlerTestDriver;
 import java.io.BufferedReader;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.net.HttpURLConnection;
-import java.net.URL;
 import java.util.concurrent.Executors;
 import java.util.stream.Collectors;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 
 import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
 import static com.github.tomakehurst.wiremock.client.WireMock.equalTo;
 import static com.github.tomakehurst.wiremock.client.WireMock.get;
-import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
 import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo;
-import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options;
 import static com.yahoo.container.handler.metrics.PrometheusV1Handler.consumerQuery;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
 
 public class PrometheusV1HandlerTest {
 
@@ -49,6 +43,14 @@ public class PrometheusV1HandlerTest {
     @Rule
     public WireMockRule wireMockRule = new WireMockRule(80);
 
+    private static String getFileContents(String filename) {
+        InputStream in = PrometheusV1HandlerTest.class.getClassLoader().getResourceAsStream(filename);
+        if (in == null) {
+            throw new RuntimeException("File not found: " + filename);
+        }
+        return new BufferedReader(new InputStreamReader(in)).lines().collect(Collectors.joining("\n"));
+    }
+
     @Before
     public void setup() {
         setupWireMock();
@@ -116,12 +118,4 @@ public class PrometheusV1HandlerTest {
     private String getResponseAsString(String consumer) {
         return testDriver.sendRequest(VALUES_URI + consumerQuery(consumer)).readAll();
     }
-
-    private static String getFileContents(String filename) {
-        InputStream in = PrometheusV1HandlerTest.class.getClassLoader().getResourceAsStream(filename);
-        if (in == null) {
-            throw new RuntimeException("File not found: " + filename);
-        }
-        return new BufferedReader(new InputStreamReader(in)).lines().collect(Collectors.joining("\n"));
-    }
 }