1 files changed, 1 insertions, 29 deletions

diff --git a/vespaclient-core/src/main/java/com/yahoo/feedhandler/VespaFeedHandler.java b/vespaclient-core/src/main/java/com/yahoo/feedhandler/VespaFeedHandler.java
index 4587c84f9dc..59cd86670e1 100755
--- a/vespaclient-core/src/main/java/com/yahoo/feedhandler/VespaFeedHandler.java
+++ b/vespaclient-core/src/main/java/com/yahoo/feedhandler/VespaFeedHandler.java
@@ -1,15 +1,11 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.feedhandler;
 
-import com.google.inject.Inject;
 import com.yahoo.clientmetrics.RouteMetricSet;
-import com.yahoo.cloud.config.ClusterListConfig;
-import com.yahoo.cloud.config.SlobroksConfig;
 import com.yahoo.container.jdisc.EmptyResponse;
 import com.yahoo.container.jdisc.HttpRequest;
 import com.yahoo.container.jdisc.HttpResponse;
 import com.yahoo.container.protect.Error;
-import com.yahoo.document.config.DocumentmanagerConfig;
 import com.yahoo.feedapi.DocprocMessageProcessor;
 import com.yahoo.feedapi.FeedContext;
 import com.yahoo.feedapi.Feeder;
@@ -18,9 +14,6 @@ import com.yahoo.feedapi.MessagePropertyProcessor;
 import com.yahoo.feedapi.SimpleFeedAccess;
 import com.yahoo.feedapi.SingleSender;
 import com.yahoo.feedapi.XMLFeeder;
-import com.yahoo.jdisc.Metric;
-import com.yahoo.vespa.config.content.LoadTypeConfig;
-import com.yahoo.vespaclient.config.FeederConfig;
 
 import java.util.List;
 import java.util.concurrent.Executor;
@@ -40,18 +33,6 @@ public final class VespaFeedHandler extends VespaFeedHandlerBase {
     private final AtomicInteger busyThreads = new AtomicInteger(0);
     private final int maxBusyThreads;
 
-    @SuppressWarnings("unused")
-    @Inject
-    public VespaFeedHandler(FeederConfig feederConfig,
-                            LoadTypeConfig loadTypeConfig,
-                            DocumentmanagerConfig documentmanagerConfig,
-                            SlobroksConfig slobroksConfig,
-                            Executor executor,
-                            Metric metric)  {
-        super(feederConfig, loadTypeConfig, documentmanagerConfig, slobroksConfig, executor, metric);
-        this.maxBusyThreads = feederConfig.maxbusythreads();
-    }
-
     private VespaFeedHandler(FeedContext context, Executor executor) {
         super(context, executor);
         this.maxBusyThreads = 32;
@@ -67,22 +48,17 @@ public final class VespaFeedHandler extends VespaFeedHandlerBase {
     }
 
     public HttpResponse handle(HttpRequest request, RouteMetricSet.ProgressCallback callback, int numThreads) {
-        if (request.getProperty("status") != null) {
-            return new MetricResponse(context.getMetrics().getMetricSet());
-        }
         try {
             int busy = busyThreads.incrementAndGet();
             if (busy > maxBusyThreads)
                 return new EmptyResponse(com.yahoo.jdisc.http.HttpResponse.Status.SERVICE_UNAVAILABLE);
 
-            boolean asynchronous = request.getBooleanProperty("asynchronous");
-
             MessagePropertyProcessor.PropertySetter properties = getPropertyProcessor().buildPropertySetter(request);
 
             String route = properties.getRoute().toString();
             FeedResponse response = new FeedResponse(new RouteMetricSet(route, callback));
 
-            SingleSender sender = new SingleSender(response, getSharedSender(route), !asynchronous);
+            SingleSender sender = new SingleSender(response, getSharedSender(route));
             sender.addMessageProcessor(properties);
             sender.addMessageProcessor(new DocprocMessageProcessor(getDocprocChain(request), getDocprocServiceRegistry(request)));
             ThreadedFeedAccess feedAccess = new ThreadedFeedAccess(numThreads, sender);
@@ -101,10 +77,6 @@ public final class VespaFeedHandler extends VespaFeedHandlerBase {
 
             sender.done();
             feedAccess.close();
-
-            if (asynchronous) {
-                return response;
-            }
             long millis = getTimeoutMillis(request);
             boolean completed = sender.waitForPending(millis);
             if (!completed) {