Cleaned up code

1 files changed, 14 insertions, 16 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;
-    }
-
 }