Remove deprecated APIs.

9 files changed, 1 insertions, 86 deletions

diff --git a/docproc/src/main/java/com/yahoo/docproc/Processing.java b/docproc/src/main/java/com/yahoo/docproc/Processing.java
index eacbf6ef132..e157ad0b09b 100644
--- a/docproc/src/main/java/com/yahoo/docproc/Processing.java
+++ b/docproc/src/main/java/com/yahoo/docproc/Processing.java
@@ -61,16 +61,6 @@ public class Processing {
         return new Processing(documentOperation);
     }
 
-    /**
-     * Create a Processing from the given document operation
-     * @deprecated Use {@link #of(DocumentOperation)} instead
-     */
-    @Deprecated
-    @SuppressWarnings("unused")
-    public static Processing fromDocumentOperation(DocumentOperation documentOperation) {
-        return Processing.of(documentOperation);
-    }
-
     private Processing(DocumentOperation documentOperation) {
         this();
         addDocumentOperation(documentOperation);
diff --git a/documentapi/src/main/java/com/yahoo/documentapi/Result.java b/documentapi/src/main/java/com/yahoo/documentapi/Result.java
index c905fa24cb1..1242ccfe472 100644
--- a/documentapi/src/main/java/com/yahoo/documentapi/Result.java
+++ b/documentapi/src/main/java/com/yahoo/documentapi/Result.java
@@ -66,20 +66,6 @@ public class Result {
     public long getRequestId() { return requestId; }
 
     /**
-     * @deprecated use type() instead.
-     * Returns the type of result.
-     *
-     * @return the type of result, typically if this is an error or a success, and what kind of error.
-     *          Does not return CONDITION_NOT_MET_ERROR for backward compatibility.
-     * @see com.yahoo.documentapi.Result.ResultType
-     */
-    @Deprecated
-    public ResultType getType() { return
-            type == ResultType.CONDITION_NOT_MET_ERROR
-                    ? ResultType.FATAL_ERROR
-                    : type;}
-
-    /**
      * Returns the type of result.
      *
      * @return the type of result, typically if this is an error or a success, and what kind of error.
diff --git a/documentapi/src/main/java/com/yahoo/documentapi/SyncParameters.java b/documentapi/src/main/java/com/yahoo/documentapi/SyncParameters.java
index b1986680532..acf027dd0aa 100755
--- a/documentapi/src/main/java/com/yahoo/documentapi/SyncParameters.java
+++ b/documentapi/src/main/java/com/yahoo/documentapi/SyncParameters.java
@@ -13,12 +13,7 @@ import java.util.Optional;
 public class SyncParameters extends Parameters {
     private final Duration defaultTimeout;
 
-    /**
-     * @deprecated Use {@link Builder} instead.
-     */
-    @Deprecated
-    // TODO Vespa 7: Make private
-    public SyncParameters() {
+    private SyncParameters() {
         this(null);
     }
 
diff --git a/documentapi/src/main/java/com/yahoo/documentapi/VisitorDataQueue.java b/documentapi/src/main/java/com/yahoo/documentapi/VisitorDataQueue.java
index a6648a6c89b..70809a5523f 100644
--- a/documentapi/src/main/java/com/yahoo/documentapi/VisitorDataQueue.java
+++ b/documentapi/src/main/java/com/yahoo/documentapi/VisitorDataQueue.java
@@ -59,14 +59,6 @@ public class VisitorDataQueue extends VisitorDataHandler {
         }
     }
 
-    /**
-     * @deprecated This method is no longer called by the visitor subsystem. See onMessage instead.
-     */
-    @Deprecated
-    public void onDocuments(DocumentList docs, AckToken token) {
-        pendingResponses.add(new DocumentListVisitorResponse(docs, token));
-    }
-
     // Inherit doc from VisitorDataHandler
     @Override
     public VisitorResponse getNext() {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/rule/ExpressionNode.java b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/rule/ExpressionNode.java
index c432e49fe2b..dba0da7301d 100755
--- a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/rule/ExpressionNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/rule/ExpressionNode.java
@@ -45,20 +45,6 @@ public abstract class ExpressionNode implements Serializable {
     public abstract StringBuilder toString(StringBuilder builder, SerializationContext context, Deque<String> path, CompositeNode parent);
 
     /**
-     * Returns a script instance of this based on the supplied script functions.
-     * @deprecated use the faster one that takes and returns a StringBuilder instead.
-     *
-     * @param context the serialization context
-     * @param path the call path to this, used for cycle detection, or null if this is a root
-     * @param parent the parent node of this, or null if it a root
-     * @return the main script, referring to script instances.
-     */
-    @Deprecated
-    public String toString(SerializationContext context, Deque<String> path, CompositeNode parent) {
-        return toString(new StringBuilder(), context, path, parent).toString();
-    }
-
-    /**
      * Returns the type this will return if evaluated with the given context.
      *
      * @param context the variable type bindings to use for this evaluation
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 efa609a2d59..3abae261f5e 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
@@ -30,7 +30,6 @@ public class Result {
 
     private final Document document;
     private final boolean success;
-    private final boolean _transient;
     private final List<Detail> details;
     private final String localTrace;
 
@@ -38,13 +37,10 @@ public class Result {
         this.document = document;
         this.details = Collections.unmodifiableList(new ArrayList<>(values));
         boolean totalSuccess = true;
-        boolean totalTransient = true;
         for (Detail d : details) {
             if (d.getResultType() != ResultType.OPERATION_EXECUTED) {totalSuccess = false; }
-            if (d.getResultType() != ResultType.TRANSITIVE_ERROR) {totalTransient = false; }
         }
         this.success = totalSuccess;
-        this._transient = totalTransient;
         this.localTrace = localTrace == null ? null : localTrace.toString();
     }
 
@@ -83,17 +79,6 @@ public class Result {
     public boolean isSuccess() {
         return success;
     }
-    /**
-     * @deprecated use resultType on items getDetails() to check  operations.
-     * Returns true if an error is transient, false if it is permanent. Irrelevant
-     * if {@link #isSuccess()} is true (returns true in those cases).
-     *
-     * @return true if an error is transient (or there is no error), false otherwise.
-     */
-    @Deprecated
-    public boolean isTransient() {
-        return _transient;
-    }
 
     public List<Detail> getDetails() { return details; }
 
@@ -150,18 +135,6 @@ public class Result {
         }
 
         /**
-         * @deprecated use getResultType.
-         * Returns true if an error is transient, false if it is permanent. Irrelevant
-         * if {@link #isSuccess()} is true (returns true in those cases).
-         *
-         * @return true if an error is transient (or there is no error), false otherwise.
-         */
-        @Deprecated
-        public boolean isTransient() {
-            return resultType == ResultType.TRANSITIVE_ERROR || resultType == ResultType.OPERATION_EXECUTED;
-        }
-
-        /**
          * Returns the result of the operation.
          */
         public ResultType getResultType() {
diff --git a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/config/FeedParams.java b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/config/FeedParams.java
index 06edd222be2..17b32929eac 100644
--- a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/config/FeedParams.java
+++ b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/config/FeedParams.java
@@ -44,8 +44,6 @@ public final class FeedParams {
         private long clientTimeout = TimeUnit.SECONDS.toMillis(20);
         private String route = null;
         private int maxChunkSizeBytes = 50 * 1024;
-        // This value is deprecated, and the default is no longer used.
-        private int clientQueueSize = -1;
         private int maxInFlightRequests = 5000;
         private long localQueueTimeOut = 180000;
         private String priority = null;
diff --git a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/runner/CommandLineArguments.java b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/runner/CommandLineArguments.java
index 837df3c98ef..1aee1670832 100644
--- a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/runner/CommandLineArguments.java
+++ b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/runner/CommandLineArguments.java
@@ -152,10 +152,6 @@ public class CommandLineArguments {
                     "to be pending at any given time.")
     private int maxPendingOperationCountArg = 10000;
 
-    @Option(name = {"--debugport"},
-            description = "Deprecated, not used.")
-    private int debugportArg = 9988;
-
     @Option(name = {"-v", "--verbose"},
             description = "Enable verbose output of progress.")
     private boolean verboaseArg = false;
diff --git a/vespa-http-client/src/test/java/com/yahoo/vespa/http/client/runner/CommandLineArgumentsTest.java b/vespa-http-client/src/test/java/com/yahoo/vespa/http/client/runner/CommandLineArgumentsTest.java
index fd10aeb6100..1f01ea12934 100644
--- a/vespa-http-client/src/test/java/com/yahoo/vespa/http/client/runner/CommandLineArgumentsTest.java
+++ b/vespa-http-client/src/test/java/com/yahoo/vespa/http/client/runner/CommandLineArgumentsTest.java
@@ -113,7 +113,6 @@ public class CommandLineArgumentsTest {
         args.add("--useCompression");
         args.add("--useDynamicThrottling");
         add("maxpending", "3456");
-        add("debugport", "7890");
         args.add("--verbose");
         args.add("--useTls");
         add("header", "Header-Name: Header-Value");