Whitespace changes only

5 files changed, 40 insertions, 53 deletions

diff --git a/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/ClientFeederV3.java b/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/ClientFeederV3.java
index 5f2952931f3..113f066edfe 100644
--- a/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/ClientFeederV3.java
+++ b/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/ClientFeederV3.java
@@ -313,7 +313,7 @@ class ClientFeederV3 {
         synchronized (monitor) {
             if (now.plusSeconds(1).isAfter(prevOpsPerSecTime)) {
                 Duration duration = Duration.between(now, prevOpsPerSecTime);
-                final double opsPerSec = operationsForOpsPerSec / (duration.toMillis() / 1000.);
+                double opsPerSec = operationsForOpsPerSec / (duration.toMillis() / 1000.);
                 metric.set(MetricNames.OPERATIONS_PER_SEC, opsPerSec, null /*metricContext*/);
                 operationsForOpsPerSec = 1.0d;
                 prevOpsPerSecTime = now;
diff --git a/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/FeedHandler.java b/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/FeedHandler.java
index 2e16b4a2dd0..1b9ae291ca1 100644
--- a/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/FeedHandler.java
+++ b/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/FeedHandler.java
@@ -184,22 +184,20 @@ public class FeedHandler extends LoggingRequestHandler {
             }
         }
 
-        final Feeder feeder;
+        Feeder feeder;
         try {
-            feeder = createFeeder(
-                    request, request.getData(), operations, clientId.first, clientId.second, protocolVersion.second);
-            // the synchronous FeedResponse blocks draining the InputStream, letting
-            // the Feeder read it
+            feeder = createFeeder(request, request.getData(), operations, clientId.first, 
+                                  clientId.second, protocolVersion.second);
+            // the synchronous FeedResponse blocks draining the InputStream, letting the Feeder read it
             workers.submit(feeder);
         } catch (UnknownClientException uce) {
-            final String msg = Exceptions.toMessageString(uce);
+            String msg = Exceptions.toMessageString(uce);
             log.log(LogLevel.WARNING, msg);
             return new ErrorHttpResponse(Status.BAD_REQUEST, msg);
         } catch (Exception e) {
-            final String msg = "Could not initialize document parsing: "
-                               + Exceptions.toMessageString(e);
-            log.log(LogLevel.WARNING, msg);
-            return new ErrorHttpResponse(Status.INTERNAL_SERVER_ERROR, msg);
+            String msg = "Could not initialize document parsing";
+            log.log(LogLevel.WARNING, "Could not initialize document parsing", e);
+            return new ErrorHttpResponse(Status.INTERNAL_SERVER_ERROR, msg + ": " + Exceptions.toMessageString(e));
         }
 
         try {
@@ -208,15 +206,13 @@ public class FeedHandler extends LoggingRequestHandler {
             return new ErrorHttpResponse(Status.INTERNAL_SERVER_ERROR, e.getMessage());
         }
 
-        return new FeedResponse(200, operations,
-                protocolVersion.second.intValue(),
-                clientId.first);
+        return new FeedResponse(200, operations, protocolVersion.second, clientId.first);
     }
 
     // Protected for testing
-    protected static InputStream unzipStreamIfNeeded(final InputStream inputStream, final HttpRequest httpRequest)
+    protected static InputStream unzipStreamIfNeeded(InputStream inputStream, HttpRequest httpRequest)
             throws IOException {
-        final String contentEncodingHeader = httpRequest.getHeader("content-encoding");
+        String contentEncodingHeader = httpRequest.getHeader("content-encoding");
         if ("gzip".equals(contentEncodingHeader)) {
             return new GZIPInputStream(inputStream);
         } else {
@@ -230,30 +226,28 @@ public class FeedHandler extends LoggingRequestHandler {
     protected Feeder createFeeder(
             HttpRequest request,
             InputStream requestInputStream,
-            final BlockingQueue<OperationStatus> operations,
+            BlockingQueue<OperationStatus> operations,
             String clientId,
             boolean sessionIdWasGeneratedJustNow,
             int protocolVersion) throws Exception {
-        switch (protocolVersion) {
-        case 2:
-            return new Feeder(
-                    unzipStreamIfNeeded(requestInputStream, request),
-                    new FeedReaderFactory(),
-                    docTypeManager,
-                    operations,
-                    popClient(clientId),
-                    new FeederSettings(request),
-                    clientId,
-                    sessionIdWasGeneratedJustNow,
-                    sourceSessionParams(request),
-                    sessionCache,
-                    this,
-                    metric,
-                    feedReplyHandler,
-                    localHostname);
-        default:
-            throw new IllegalStateException("BUG! Protocol version " + protocolVersion + " not supported.");
-        }
+        if (protocolVersion != 2) 
+            throw new IllegalStateException("Protocol version " + protocolVersion + " not supported.");
+
+        return new Feeder(
+                unzipStreamIfNeeded(requestInputStream, request),
+                new FeedReaderFactory(),
+                docTypeManager,
+                operations,
+                popClient(clientId),
+                new FeederSettings(request),
+                clientId,
+                sessionIdWasGeneratedJustNow,
+                sourceSessionParams(request),
+                sessionCache,
+                this,
+                metric,
+                feedReplyHandler,
+                localHostname);
     }
 
     private Tuple2<String, Boolean> sessionId(HttpRequest request) {
diff --git a/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/FeedHandlerV3.java b/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/FeedHandlerV3.java
index 50ce18d1524..669e5a22ae9 100644
--- a/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/FeedHandlerV3.java
+++ b/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/FeedHandlerV3.java
@@ -99,12 +99,11 @@ public class FeedHandlerV3 extends LoggingRequestHandler {
         try {
             return clientFeederV3.handleRequest(request);
         } catch (UnknownClientException uce) {
-            final String msg = Exceptions.toMessageString(uce);
+            String msg = Exceptions.toMessageString(uce);
             log.log(LogLevel.WARNING, msg);
             return new ErrorHttpResponse(com.yahoo.jdisc.http.HttpResponse.Status.BAD_REQUEST, msg);
         } catch (Exception e) {
-            final String msg = "Could not initialize document parsing: "
-                    + Exceptions.toMessageString(e);
+            String msg = "Could not initialize document parsing: " + Exceptions.toMessageString(e);
             log.log(LogLevel.WARNING, msg);
             return new ErrorHttpResponse(com.yahoo.jdisc.http.HttpResponse.Status.INTERNAL_SERVER_ERROR, msg);
         }
diff --git a/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/FeedReplyReader.java b/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/FeedReplyReader.java
index b7ecf4211a9..f22e25dd577 100644
--- a/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/FeedReplyReader.java
+++ b/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/FeedReplyReader.java
@@ -14,7 +14,7 @@ import com.yahoo.vespa.http.client.core.OperationStatus;
 /**
  * Catch message bus replies and make the available to a given session.
  *
- * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a>
+ * @author Steinar Knutsen
  */
 public class FeedReplyReader implements ReplyHandler {
 
@@ -48,12 +48,10 @@ public class FeedReplyReader implements ReplyHandler {
     private void enqueue(ReplyContext context, String message, ErrorCode status, Trace trace) {
         try {
             String traceMessage = (trace != null && trace.getLevel() > 0) ? trace.toString() : "";
-            context.feedReplies.put(new OperationStatus(message,
-                    context.docId.toString(), status, traceMessage));
+            context.feedReplies.put(new OperationStatus(message, context.docId, status, traceMessage));
         } catch (InterruptedException e) {
-            log.log(LogLevel.WARNING,
-                    "Interrupted while enqueueing result from putting document with id: "
-                            + context.docId.toString());
+            log.log(LogLevel.WARNING, 
+                    "Interrupted while enqueueing result from putting document with id: " + context.docId);
             Thread.currentThread().interrupt();
         }
     }
diff --git a/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/Feeder.java b/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/Feeder.java
index 106afe6ffe9..cb3c7a7ab69 100644
--- a/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/Feeder.java
+++ b/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/Feeder.java
@@ -73,7 +73,6 @@ public class Feeder implements Runnable {
     private final CountDownLatch requestReceived = new CountDownLatch(1);
     private final FeedReaderFactory feedReaderFactory;
 
-    // TODO refactor this perverse pile of constructor arguments
     public Feeder(InputStream requestInputStream,
                   FeedReaderFactory feedReaderFactory,
                   DocumentTypeManager docTypeManager,
@@ -274,17 +273,14 @@ public class Feeder implements Runnable {
                 ++numPending;
                 updateMetrics(msg.second);
                 updateOpsPerSec();
-                log(LogLevel.DEBUG, "Sent message successfully, document id: ",
-                        msg.first);
+                log(LogLevel.DEBUG, "Sent message successfully, document id: ", msg.first);
             } else if (!result.getError().isFatal()) {
-                enqueue(msg.first, result.getError().getMessage(),
-                        ErrorCode.TRANSIENT_ERROR, msg.second);
+                enqueue(msg.first, result.getError().getMessage(), ErrorCode.TRANSIENT_ERROR, msg.second);
                 break;
             } else {
                 // should probably not happen, but everybody knows stuff that
                 // shouldn't happen, happens all the time
-                enqueue(msg.first, result.getError().getMessage(),
-                        ErrorCode.ERROR, msg.second);
+                enqueue(msg.first, result.getError().getMessage(), ErrorCode.ERROR, msg.second);
                 break;
             }
         }