From 34dc9e627876c65f4445460d8eb50e2f5a0c5771 Mon Sep 17 00:00:00 2001 From: Valerij Fredriksen Date: Fri, 22 Sep 2017 20:13:21 +0200 Subject: Revert "RestApiHandler injection fix" --- .../com/yahoo/vespa/hosted/node/admin/restapi/RestApiHandler.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'node-admin/src/main') diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/restapi/RestApiHandler.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/restapi/RestApiHandler.java index 6cbfa02009e..adfb937b8d7 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/restapi/RestApiHandler.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/restapi/RestApiHandler.java @@ -3,6 +3,7 @@ package com.yahoo.vespa.hosted.node.admin.restapi; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; +import com.yahoo.container.di.componentgraph.Provider; import com.yahoo.container.jdisc.HttpRequest; import com.yahoo.container.jdisc.HttpResponse; import com.yahoo.container.jdisc.LoggingRequestHandler; @@ -10,7 +11,6 @@ import com.yahoo.container.logging.AccessLog; import com.yahoo.vespa.hosted.dockerapi.metrics.DimensionMetrics; import com.yahoo.vespa.hosted.dockerapi.metrics.MetricReceiverWrapper; import com.yahoo.vespa.hosted.node.admin.nodeadmin.NodeAdminStateUpdater; -import com.yahoo.vespa.hosted.node.admin.provider.NodeAdminProvider; import javax.inject.Inject; import javax.ws.rs.core.MediaType; @@ -39,10 +39,10 @@ public class RestApiHandler extends LoggingRequestHandler{ @Inject public RestApiHandler(Executor executor, AccessLog accessLog, - NodeAdminProvider nodeAdminProvider, + Provider componentsProvider, MetricReceiverWrapper metricReceiverWrapper) { super(executor, accessLog); - this.refresher = nodeAdminProvider.get(); + this.refresher = componentsProvider.get(); this.metricReceiverWrapper = metricReceiverWrapper; } -- cgit v1.2.3