Remove on Vespa 8

2 files changed, 0 insertions, 15 deletions

diff --git a/documentapi/abi-spec.json b/documentapi/abi-spec.json
index 1a003d58d53..2caaee90186 100644
--- a/documentapi/abi-spec.json
+++ b/documentapi/abi-spec.json
@@ -154,14 +154,12 @@
     ],
     "methods": [
       "public static com.yahoo.documentapi.DocumentOperationParameters parameters()",
-      "public com.yahoo.documentapi.DocumentOperationParameters withPriority(com.yahoo.documentapi.messagebus.protocol.DocumentProtocol$Priority)",
       "public com.yahoo.documentapi.DocumentOperationParameters withFieldSet(com.yahoo.document.fieldset.FieldSet)",
       "public com.yahoo.documentapi.DocumentOperationParameters withFieldSet(java.lang.String)",
       "public com.yahoo.documentapi.DocumentOperationParameters withRoute(java.lang.String)",
       "public com.yahoo.documentapi.DocumentOperationParameters withTraceLevel(int)",
       "public com.yahoo.documentapi.DocumentOperationParameters withDeadline(java.time.Instant)",
       "public com.yahoo.documentapi.DocumentOperationParameters withResponseHandler(com.yahoo.documentapi.ResponseHandler)",
-      "public java.util.Optional priority()",
       "public java.util.Optional fieldSet()",
       "public java.util.Optional route()",
       "public java.util.OptionalInt traceLevel()",
diff --git a/documentapi/src/main/java/com/yahoo/documentapi/DocumentOperationParameters.java b/documentapi/src/main/java/com/yahoo/documentapi/DocumentOperationParameters.java
index 74cdcc02b94..9677aaf1905 100644
--- a/documentapi/src/main/java/com/yahoo/documentapi/DocumentOperationParameters.java
+++ b/documentapi/src/main/java/com/yahoo/documentapi/DocumentOperationParameters.java
@@ -42,14 +42,6 @@ public class DocumentOperationParameters {
         return empty;
     }
 
-    /** Sets the priority with which to perform an operation.
-     * @deprecated specifying explicit operation priority is deprecated
-     */
-    @Deprecated(forRemoval = true) // TODO: Remove on Vespa 8
-    public DocumentOperationParameters withPriority(DocumentProtocol.Priority priority) {
-        return new DocumentOperationParameters(requireNonNull(priority), fieldSet, route, traceLevel, deadline, responseHandler);
-    }
-
     /** Sets the field set used for retrieval. */
     public DocumentOperationParameters withFieldSet(FieldSet fieldSet) {
         return new DocumentOperationParameters(priority, new FieldSetRepo().serialize(fieldSet), route, traceLevel, deadline, responseHandler);
@@ -83,11 +75,6 @@ public class DocumentOperationParameters {
         return new DocumentOperationParameters(priority, fieldSet, route, traceLevel, deadline, requireNonNull(responseHandler));
     }
 
-    /**
-     * @deprecated explicit operation priority is deprecated
-     */
-    @Deprecated(forRemoval = true) // TODO: Remove on Vespa 8
-    public Optional<DocumentProtocol.Priority> priority() { return Optional.ofNullable(priority); }
     public Optional<String> fieldSet() { return Optional.ofNullable(fieldSet); }
     public Optional<String> route() { return Optional.ofNullable(route); }
     public OptionalInt traceLevel() { return traceLevel >= 0 ? OptionalInt.of(traceLevel) : OptionalInt.empty(); }