Verify macros

10 files changed, 27 insertions, 27 deletions

diff --git a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/FeedClientFactory.java b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/FeedClientFactory.java
index cfa9ce670f6..6095134b7a2 100644
--- a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/FeedClientFactory.java
+++ b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/FeedClientFactory.java
@@ -15,14 +15,14 @@ import static com.yahoo.vespa.http.client.SessionFactory.createTimeoutExecutor;
 public class FeedClientFactory {
 
     /**
-     * Creates FeedClient.
+     * Creates a FeedClient.
+     *
      * @param sessionParams parameters for connection, hosts, cluster configurations and more.
      * @param resultCallback on each result, this callback is called.
      * @return newly created FeedClient API object.
      */
-    public static FeedClient create(
-            SessionParams sessionParams,
-            FeedClient.ResultCallback resultCallback) {
+    public static FeedClient create(SessionParams sessionParams, FeedClient.ResultCallback resultCallback) {
         return new FeedClientImpl(sessionParams, resultCallback, createTimeoutExecutor());
     }
+
 }
diff --git a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/Result.java b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/Result.java
index 138be61de80..65f56f72a58 100644
--- a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/Result.java
+++ b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/Result.java
@@ -20,6 +20,7 @@ import java.util.List;
  */
 // This should be an interface, but in order to be binary compatible during refactoring we made it abstract.
 public class Result {
+
     public enum ResultType {
         OPERATION_EXECUTED,
         TRANSITIVE_ERROR,
@@ -106,12 +107,10 @@ public class Result {
 
     /**
      * Information in a Result for a single operation sent to a single endpoint.
-     *
-     * @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a>
-     * @since 5.1.20
      */
     @Immutable
     public static final class Detail {
+
         private final ResultType resultType;
         private final Endpoint endpoint;
         private final Exception exception;
@@ -212,4 +211,5 @@ public class Result {
         }
         return b.toString();
     }
+
 }
diff --git a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/EndpointResult.java b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/EndpointResult.java
index 5aec46a8fc7..b04248f98a5 100644
--- a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/EndpointResult.java
+++ b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/EndpointResult.java
@@ -5,9 +5,11 @@ import com.yahoo.vespa.http.client.Result;
 
 /**
  * Result from a single endpoint.
+ *
  * @author dybis
  */
 public class EndpointResult {
+
     private final String operationId;
     private final Result.Detail detail;
 
@@ -23,4 +25,5 @@ public class EndpointResult {
     public Result.Detail getDetail() {
         return detail;
     }
+
 }
diff --git a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/ErrorCode.java b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/ErrorCode.java
index 96afc537c59..445ad5295c1 100644
--- a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/ErrorCode.java
+++ b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/ErrorCode.java
@@ -6,12 +6,12 @@ import com.google.common.annotations.Beta;
 /**
  * Return types for the server.
  *
- * @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a>
- * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a>
- * @since 5.1.20
+ * @author Einar M R Rosenvinge
+ * @author Steinar Knutsen
  */
 @Beta
 public enum ErrorCode {
+
     OK(true, true),
     ERROR(false, false),
     TRANSIENT_ERROR(false, true),
@@ -20,7 +20,7 @@ public enum ErrorCode {
     private boolean success;
     private boolean _transient;
 
-    private ErrorCode(boolean success, boolean _transient) {
+    ErrorCode(boolean success, boolean _transient) {
         this.success = success;
         this._transient = _transient;
     }
@@ -32,4 +32,5 @@ public enum ErrorCode {
     public boolean isTransient() {
         return _transient;
     }
+
 }
diff --git a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/OperationStatus.java b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/OperationStatus.java
index 7ea4a214cbd..7aec207e0ab 100644
--- a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/OperationStatus.java
+++ b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/OperationStatus.java
@@ -10,11 +10,11 @@ import java.util.Iterator;
 /**
  * Serialization/deserialization class for the result of a single document operation against Vespa.
  *
- * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a>
- * @since 5.1
+ * @author Steinar Knutsen
  */
 @Beta
 public final class OperationStatus {
+
     public static final String IS_CONDITION_NOT_MET = "IS-CONDITION-NOT-MET";
     public final String message;
     public final String operationId;
@@ -81,9 +81,7 @@ public final class OperationStatus {
         return new OperationStatus(message, operationId, errorCode, isConditionNotMet, traceMessage);
     }
 
-    /**
-     * @return a string representing the status.
-     */
+    /** Returns a string representing the status. */
     public String render() {
         StringBuilder s = new StringBuilder();
         Encoder.encode(operationId, s).append(SEPARATOR);
@@ -92,4 +90,5 @@ public final class OperationStatus {
         Encoder.encode(traceMessage, s).append(EOL);
         return s.toString();
     }
+
 }
diff --git a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/ServerResponseException.java b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/ServerResponseException.java
index 4c291935916..1800864cd90 100644
--- a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/ServerResponseException.java
+++ b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/ServerResponseException.java
@@ -5,12 +5,13 @@ import com.google.common.annotations.Beta;
 
 /**
  * The request was not processed properly on the server.
- * @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a>
- * @since 5.1.20
+ *
+ * @author Einar M R Rosenvinge
  */
 @SuppressWarnings("serial")
 @Beta
 public class ServerResponseException extends Exception {
+
     private final int responseCode;
     private final String responseString;
 
@@ -33,5 +34,6 @@ public class ServerResponseException extends Exception {
         }
         return responseString;
     }
+
 }
 
diff --git a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/api/FeedClientImpl.java b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/api/FeedClientImpl.java
index a16d992324d..903c1ad4842 100644
--- a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/api/FeedClientImpl.java
+++ b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/api/FeedClientImpl.java
@@ -17,7 +17,7 @@ import java.util.concurrent.TimeUnit;
 
 /**
  * Implementation of FeedClient. It is a thin layer on top of multiClusterHandler and multiClusterResultAggregator.
- * 
+ *
  * @author dybis
  */
 public class FeedClientImpl implements FeedClient {
@@ -92,4 +92,5 @@ public class FeedClientImpl implements FeedClient {
         }
         return true;
     }
+
 }
diff --git a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/api/SessionImpl.java b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/api/SessionImpl.java
index edbe5542bc4..c3b5d9912de 100644
--- a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/api/SessionImpl.java
+++ b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/api/SessionImpl.java
@@ -6,7 +6,6 @@ import com.yahoo.vespa.http.client.Result;
 import com.yahoo.vespa.http.client.Session;
 import com.yahoo.vespa.http.client.config.SessionParams;
 import com.yahoo.vespa.http.client.core.ThrottlePolicy;
-import com.yahoo.vespa.http.client.core.api.MultiClusterSessionOutputStream;
 import com.yahoo.vespa.http.client.core.operationProcessor.IncompleteResultsThrottler;
 import com.yahoo.vespa.http.client.core.operationProcessor.OperationProcessor;
 
@@ -65,4 +64,5 @@ public class SessionImpl implements Session {
     public int getIncompleteResultQueueSize() {
         return operationProcessor.getIncompleteResultQueueSize();
     }
+
 }
diff --git a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/communication/ApacheGatewayConnection.java b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/communication/ApacheGatewayConnection.java
index 420f64d4bf3..dd724e90a42 100644
--- a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/communication/ApacheGatewayConnection.java
+++ b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/communication/ApacheGatewayConnection.java
@@ -44,8 +44,6 @@ import java.util.zip.GZIPOutputStream;
 
 /**
  * @author Einar M R Rosenvinge
- *
- * @since 5.1.20
  */
 @Beta
 class ApacheGatewayConnection implements GatewayConnection {
diff --git a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/communication/DocumentQueue.java b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/communication/DocumentQueue.java
index 671e6f07dbe..d963ae79227 100644
--- a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/communication/DocumentQueue.java
+++ b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/communication/DocumentQueue.java
@@ -2,8 +2,6 @@
 package com.yahoo.vespa.http.client.core.communication;
 
 import com.yahoo.vespa.http.client.core.Document;
-import com.yahoo.vespa.http.client.core.EndpointResult;
-import com.yahoo.vespa.http.client.core.operationProcessor.EndPointResultFactory;
 
 import java.util.ArrayDeque;
 import java.util.ArrayList;
@@ -13,7 +11,7 @@ import java.util.Optional;
 import java.util.concurrent.TimeUnit;
 
 /**
- * Document queue that only gives you document operations on documents for which there are no 
+ * Document queue that only gives you document operations on documents for which there are no
  * already in flight operations for.
  *
  * @author dybis
@@ -54,8 +52,6 @@ class DocumentQueue {
         }
     }
 
-
-
     Document poll(long timeout, TimeUnit unit) throws InterruptedException {
         synchronized (queue) {
             long remainingToWait = unit.toMillis(timeout);