summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhakonhall <hakon@oath.com>2017-09-22 14:36:31 +0200
committerGitHub <noreply@github.com>2017-09-22 14:36:31 +0200
commit50cf2dfb8548de2827be1a5007dd10f393afed0c (patch)
treec034a5b1ce1bd602046404161f45a64cedc6d3a1
parentdadab806057d320806e8af94ee0396cc7e94dd93 (diff)
parent8ffd34f774bf592c871edb1d6c865e269c1ee74d (diff)
Merge pull request #3502 from vespa-engine/freva/node-admin-injection-fix
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 adfb937b8d7..6cbfa02009e 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,7 +3,6 @@ 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;
@@ -11,6 +10,7 @@ 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,
- Provider<NodeAdminStateUpdater> componentsProvider,
+ NodeAdminProvider nodeAdminProvider,
MetricReceiverWrapper metricReceiverWrapper) {
super(executor, accessLog);
- this.refresher = componentsProvider.get();
+ this.refresher = nodeAdminProvider.get();
this.metricReceiverWrapper = metricReceiverWrapper;
}