Guard metrics and GC unused code

3 files changed, 14 insertions, 27 deletions

diff --git a/vespaclient-core/src/main/java/com/yahoo/feedhandler/FeedResponse.java b/vespaclient-core/src/main/java/com/yahoo/feedhandler/FeedResponse.java
index 3b84f83fafa..c08703c5061 100755
--- a/vespaclient-core/src/main/java/com/yahoo/feedhandler/FeedResponse.java
+++ b/vespaclient-core/src/main/java/com/yahoo/feedhandler/FeedResponse.java
@@ -25,7 +25,6 @@ import java.util.List;
 import java.util.logging.Logger;
 import java.util.stream.Stream;
 
-@SuppressWarnings("deprecation")
 public final class FeedResponse extends HttpResponse implements SharedSender.ResultCallback {
 
     private final static Logger log = Logger.getLogger(FeedResponse.class.getName());
@@ -37,7 +36,7 @@ public final class FeedResponse extends HttpResponse implements SharedSender.Res
     private boolean isAborted = false;
     private final SharedSender.Pending pendingNumber = new SharedSender.Pending();
 
-    public FeedResponse(RouteMetricSet metrics) {
+    FeedResponse(RouteMetricSet metrics) {
         super(com.yahoo.jdisc.http.HttpResponse.Status.OK);
         this.metrics = metrics;
     }
@@ -46,7 +45,7 @@ public final class FeedResponse extends HttpResponse implements SharedSender.Res
         return isAborted;
     }
 
-    public void setAbortOnFeedError(boolean abort) {
+    void setAbortOnFeedError(boolean abort) {
         abortOnError = abort;
     }
 
@@ -88,7 +87,7 @@ public final class FeedResponse extends HttpResponse implements SharedSender.Res
         return "application/xml";
     }
 
-    public String prettyPrint(Message m) {
+    private String prettyPrint(Message m) {
         if (m instanceof PutDocumentMessage) {
             return "PUT[" + ((PutDocumentMessage)m).getDocumentPut().getDocument().getId() + "] ";
         }
@@ -138,17 +137,12 @@ public final class FeedResponse extends HttpResponse implements SharedSender.Res
         metrics.done();
     }
 
-    public FeedResponse addXMLParseError(String error) {
+    FeedResponse addXMLParseError(String error) {
         errorMessages.add(ErrorMessage.createBadRequest(error));
         errors.add(error);
         return this;
     }
 
-    public FeedResponse addError(String error) {
-        errorMessages.add(ErrorMessage.createBadRequest(error));
-        errors.add(error);
-        return this;
-    }
     public FeedResponse addError(com.yahoo.container.protect.Error code, String error) {
         errorMessages.add(new ErrorMessage(code.code, error));
         errors.add(error);
@@ -159,10 +153,6 @@ public final class FeedResponse extends HttpResponse implements SharedSender.Res
         return errors;
     }
 
-    public List<ErrorMessage> getErrorMessageList() {
-        return errorMessages;
-    }
-
     private static boolean containsFatalErrors(Stream<Error> errors) {
         return errors.anyMatch(e -> e.getCode() != DocumentProtocol.ERROR_TEST_AND_SET_CONDITION_FAILED);
     }
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 4adfe3ebe1d..c3f13aeb4ae 100755
--- a/vespaclient-core/src/main/java/com/yahoo/feedhandler/VespaFeedHandler.java
+++ b/vespaclient-core/src/main/java/com/yahoo/feedhandler/VespaFeedHandler.java
@@ -46,14 +46,13 @@ public final class VespaFeedHandler extends VespaFeedHandlerBase {
                             LoadTypeConfig loadTypeConfig,
                             DocumentmanagerConfig documentmanagerConfig,
                             SlobroksConfig slobroksConfig,
-                            ClusterListConfig clusterListConfig,
                             Executor executor,
                             Metric metric)  {
-        super(feederConfig, loadTypeConfig, documentmanagerConfig, slobroksConfig, clusterListConfig, executor, metric);
+        super(feederConfig, loadTypeConfig, documentmanagerConfig, slobroksConfig, executor, metric);
         this.maxBusyThreads = feederConfig.maxbusythreads();
     }
 
-    VespaFeedHandler(FeedContext context, Executor executor) {
+    private VespaFeedHandler(FeedContext context, Executor executor) {
         super(context, executor);
         this.maxBusyThreads = 32;
     }
diff --git a/vespaclient-core/src/main/java/com/yahoo/feedhandler/VespaFeedHandlerBase.java b/vespaclient-core/src/main/java/com/yahoo/feedhandler/VespaFeedHandlerBase.java
index a22cbc08e38..9dc81c31a0d 100755
--- a/vespaclient-core/src/main/java/com/yahoo/feedhandler/VespaFeedHandlerBase.java
+++ b/vespaclient-core/src/main/java/com/yahoo/feedhandler/VespaFeedHandlerBase.java
@@ -3,7 +3,6 @@ package com.yahoo.feedhandler;
 
 import com.google.inject.Inject;
 import com.yahoo.clientmetrics.ClientMetrics;
-import com.yahoo.cloud.config.ClusterListConfig;
 import com.yahoo.cloud.config.SlobroksConfig;
 import com.yahoo.component.provider.ComponentRegistry;
 import com.yahoo.container.jdisc.HttpRequest;
@@ -34,37 +33,36 @@ public abstract class VespaFeedHandlerBase extends ThreadedHttpRequestHandler {
                                 LoadTypeConfig loadTypeConfig,
                                 DocumentmanagerConfig documentmanagerConfig,
                                 SlobroksConfig slobroksConfig,
-                                ClusterListConfig clusterListConfig,
                                 Executor executor,
                                 Metric metric) {
         this(FeedContext.getInstance(feederConfig, loadTypeConfig, documentmanagerConfig, 
-                                     slobroksConfig, clusterListConfig, metric), 
+                                     slobroksConfig, metric),
              executor, (long)feederConfig.timeout() * 1000);
     }
 
-    public VespaFeedHandlerBase(FeedContext context, Executor executor) {
+    VespaFeedHandlerBase(FeedContext context, Executor executor) {
         this(context, executor, context.getPropertyProcessor().getDefaultTimeoutMillis());
     }
 
-    public VespaFeedHandlerBase(FeedContext context, Executor executor, long defaultTimeoutMillis) {
+    VespaFeedHandlerBase(FeedContext context, Executor executor, long defaultTimeoutMillis) {
         super(executor, context.getMetricAPI());
         this.context = context;
         this.defaultTimeoutMillis = defaultTimeoutMillis;
     }
 
-    public SharedSender getSharedSender(String route) {
+    SharedSender getSharedSender(String route) {
         return context.getSharedSender(route);
     }
 
-    public DocprocService getDocprocChain(HttpRequest request) {
+    DocprocService getDocprocChain(HttpRequest request) {
         return context.getPropertyProcessor().getDocprocChain(request);
     }
 
-    public ComponentRegistry<DocprocService> getDocprocServiceRegistry(HttpRequest request) {
+    ComponentRegistry<DocprocService> getDocprocServiceRegistry(HttpRequest request) {
         return context.getPropertyProcessor().getDocprocServiceRegistry(request);
     }
 
-    public MessagePropertyProcessor getPropertyProcessor() {
+    MessagePropertyProcessor getPropertyProcessor() {
         return context.getPropertyProcessor();
     }
 
@@ -74,7 +72,7 @@ public abstract class VespaFeedHandlerBase extends ThreadedHttpRequestHandler {
      *         original data stream.
      * @throws IllegalArgumentException if GZIP stream creation failed
      */
-    public InputStream getRequestInputStream(HttpRequest request) {
+    InputStream getRequestInputStream(HttpRequest request) {
         if ("gzip".equals(request.getHeader("Content-Encoding"))) {
             try {
                 return new GZIPInputStream(request.getData());