Add support for using more than 1 sender thread.

3 files changed, 10 insertions, 16 deletions

diff --git a/vespaclient-core/src/main/java/com/yahoo/feedapi/DocprocMessageProcessor.java b/vespaclient-core/src/main/java/com/yahoo/feedapi/DocprocMessageProcessor.java
index 195604b067f..c6974cff5c1 100755
--- a/vespaclient-core/src/main/java/com/yahoo/feedapi/DocprocMessageProcessor.java
+++ b/vespaclient-core/src/main/java/com/yahoo/feedapi/DocprocMessageProcessor.java
@@ -6,18 +6,16 @@ import com.yahoo.docproc.CallStack;
 import com.yahoo.docproc.DocprocService;
 import com.yahoo.docproc.DocumentProcessor;
 import com.yahoo.docproc.Processing;
-import com.yahoo.document.*;
+import com.yahoo.document.DocumentOperation;
 import com.yahoo.documentapi.messagebus.protocol.DocumentProtocol;
 import com.yahoo.documentapi.messagebus.protocol.PutDocumentMessage;
 import com.yahoo.documentapi.messagebus.protocol.RemoveDocumentMessage;
 import com.yahoo.documentapi.messagebus.protocol.UpdateDocumentMessage;
 import com.yahoo.messagebus.Message;
 import com.yahoo.messagebus.routing.Route;
-import com.yahoo.vdslib.Entry;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
 
 public class DocprocMessageProcessor implements MessageProcessor {
     private final DocprocService docproc;
@@ -31,7 +29,7 @@ public class DocprocMessageProcessor implements MessageProcessor {
     @Override
     public void process(Message m) {
         try {
-            List<DocumentOperation> documentBases = new ArrayList<DocumentOperation>();
+            List<DocumentOperation> documentBases = new ArrayList<>(1);
 
             if (m.getType() == DocumentProtocol.MESSAGE_PUTDOCUMENT) {
                 documentBases.add(((PutDocumentMessage) m).getDocumentPut());
@@ -49,7 +47,7 @@ public class DocprocMessageProcessor implements MessageProcessor {
         }
     }
 
-    public void processDocumentOperations(List<DocumentOperation> documentOperations, Message m) throws Exception {
+    private void processDocumentOperations(List<DocumentOperation> documentOperations, Message m) throws Exception {
         Processing processing = Processing.createProcessingFromDocumentOperations(docproc.getName(), documentOperations, new CallStack(docproc.getCallStack()));
         processing.setServiceName(docproc.getName());
         processing.setDocprocServiceRegistry(docprocServiceRegistry);
diff --git a/vespaclient-core/src/main/java/com/yahoo/feedapi/Feeder.java b/vespaclient-core/src/main/java/com/yahoo/feedapi/Feeder.java
index 523ea0605a4..4ad5c86b663 100644
--- a/vespaclient-core/src/main/java/com/yahoo/feedapi/Feeder.java
+++ b/vespaclient-core/src/main/java/com/yahoo/feedapi/Feeder.java
@@ -24,11 +24,11 @@ public abstract class Feeder {
 
     protected final InputStream stream;
     protected final DocumentTypeManager docMan;
-    protected List<String> errors = new LinkedList<String>();
-    protected boolean doAbort = true;
-    protected boolean createIfNonExistent = false;
-    protected final VespaFeedSender sender;
-    private final int MAX_ERRORS = 10;
+    protected List<String> errors = new LinkedList<>();
+    private boolean doAbort = true;
+    private boolean createIfNonExistent = false;
+    private final VespaFeedSender sender;
+    private static final int MAX_ERRORS = 10;
 
     protected Feeder(DocumentTypeManager docMan, VespaFeedSender sender, InputStream stream) {
         this.docMan = docMan;
@@ -44,7 +44,7 @@ public abstract class Feeder {
         this.createIfNonExistent = value;
     }
 
-    public void addException(Exception e) {
+    private void addException(Exception e) {
         String message;
         if (e.getMessage() != null) {
             message = e.getMessage().replaceAll("\"", "'");
@@ -69,7 +69,7 @@ public abstract class Feeder {
     protected abstract FeedReader createReader() throws Exception;
 
     public List<String> parse() {
-        FeedReader reader = null;
+        FeedReader reader;
 
         try {
             reader = createReader();
diff --git a/vespaclient-core/src/main/java/com/yahoo/feedapi/VespaFeedSender.java b/vespaclient-core/src/main/java/com/yahoo/feedapi/VespaFeedSender.java
index d7329264bc0..b441e81a829 100755
--- a/vespaclient-core/src/main/java/com/yahoo/feedapi/VespaFeedSender.java
+++ b/vespaclient-core/src/main/java/com/yahoo/feedapi/VespaFeedSender.java
@@ -3,10 +3,6 @@ package com.yahoo.feedapi;
 
 import com.yahoo.vespaxmlparser.VespaXMLFeedReader;
 
-import java.util.Date;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.logging.Logger;
-
 /**
  * Wrapper class for SimpleFeedAccess to send various XML operations.
  */