diff options
4 files changed, 0 insertions, 16 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 784575cd001..875ff3e5bf0 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 @@ -240,7 +240,6 @@ class ClientFeederV3 { return message; } - @SuppressWarnings("removal") // TODO: Remove on Vespa 8 private void setMessageParameters(DocumentOperationMessageV3 msg, FeederSettings settings) { msg.getMessage().setContext(new ReplyContext(msg.getOperationId(), feedReplies)); if (settings.traceLevel != null) { @@ -249,9 +248,6 @@ class ClientFeederV3 { if (settings.priority != null) { try { DocumentProtocol.Priority priority = DocumentProtocol.Priority.valueOf(settings.priority); - if (msg.getMessage() instanceof DocumentMessage) { - ((DocumentMessage) msg.getMessage()).setPriority(priority); // TODO: Remove on Vespa 8 - } } catch (IllegalArgumentException i) { log.severe(i.getMessage()); diff --git a/vespajlib/abi-spec.json b/vespajlib/abi-spec.json index 654042372cf..81a21af780d 100644 --- a/vespajlib/abi-spec.json +++ b/vespajlib/abi-spec.json @@ -1242,7 +1242,6 @@ "public abstract java.lang.String toString()", "public abstract java.lang.String toString(boolean, boolean)", "public abstract java.lang.String toAbbreviatedString()", - "public java.lang.String toShortString()", "public static java.lang.String toStandardString(com.yahoo.tensor.Tensor, boolean, boolean, long)", "public static java.lang.String valueToString(com.yahoo.tensor.Tensor, boolean, long)", "public abstract boolean equals(java.lang.Object)", diff --git a/vespajlib/src/main/java/com/yahoo/collections/AbstractFilteringList.java b/vespajlib/src/main/java/com/yahoo/collections/AbstractFilteringList.java index f035e2c6f00..0d06a18b096 100644 --- a/vespajlib/src/main/java/com/yahoo/collections/AbstractFilteringList.java +++ b/vespajlib/src/main/java/com/yahoo/collections/AbstractFilteringList.java @@ -70,12 +70,6 @@ public abstract class AbstractFilteringList<Type, ListType extends AbstractFilte return matching(new HashSet<>(others.asList())::contains); } - /** @deprecated use and(others) */ - @Deprecated // TODO: Remove on Vespa 8 - public ListType concat(ListType others) { - return and(others); - } - /** Returns the union of the two lists. */ public ListType and(ListType others) { return constructor.apply(Stream.concat(items.stream(), others.asList().stream()).collect(toUnmodifiableList()), false); diff --git a/vespajlib/src/main/java/com/yahoo/tensor/Tensor.java b/vespajlib/src/main/java/com/yahoo/tensor/Tensor.java index 8a84e97fe05..349214ee7f9 100644 --- a/vespajlib/src/main/java/com/yahoo/tensor/Tensor.java +++ b/vespajlib/src/main/java/com/yahoo/tensor/Tensor.java @@ -327,11 +327,6 @@ public interface Tensor { /** Returns an abbreviated string representation of this tensor suitable for human-readable messages */ String toAbbreviatedString(); - // TODO: Remove on Vespa 8 - /** @deprecated use toAbbreviatedString */ - @Deprecated - default String toShortString() { return toAbbreviatedString(); } - /** * Call this from toString in implementations to return this tensor on the * <a href="https://docs.vespa.ai/en/reference/tensor.html#tensor-literal-form">tensor literal form</a>. |