Remove deprecated APIs.

4 files changed, 0 insertions, 35 deletions

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 dbdd6eb23ac..92dd0715f06 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
@@ -29,7 +29,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;
 
@@ -37,13 +36,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();
     }
 
@@ -73,18 +69,6 @@ public class Result {
         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; }
 
     /**
@@ -141,18 +125,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");