summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorValerij Fredriksen <freva@users.noreply.github.com>2017-09-22 20:13:34 +0200
committerGitHub <noreply@github.com>2017-09-22 20:13:34 +0200
commit33720727a40c18ba3be652bdaba7b0809eb3d606 (patch)
treeb55e80b56e3da527dacb225d5b528309d78f1c92
parent1c00bc4432007b58be9c761e89452ae5381c6314 (diff)
parent34dc9e627876c65f4445460d8eb50e2f5a0c5771 (diff)
Merge pull request #3506 from vespa-engine/revert-3502-freva/node-admin-injection-fix
Revert "RestApiHandler injection fix"
-rw-r--r--node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/restapi/RestApiHandler.java6
1 files changed, 3 insertions, 3 deletions
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<NodeAdminStateUpdater> componentsProvider,
MetricReceiverWrapper metricReceiverWrapper) {
super(executor, accessLog);
- this.refresher = nodeAdminProvider.get();
+ this.refresher = componentsProvider.get();
this.metricReceiverWrapper = metricReceiverWrapper;
}