From 52a0ba9c3951004884bbdfad403546ed6d2278a5 Mon Sep 17 00:00:00 2001 From: Jon Bratseth Date: Sun, 5 Jun 2022 20:41:30 +0200 Subject: Remove on Vespa 8 --- .../model/container/component/AccessLogComponent.java | 2 +- .../yahoo/vespa/model/container/http/xml/HttpBuilder.java | 2 +- .../vespa/model/container/xml/ContainerModelBuilder.java | 2 +- config-model/src/main/resources/schema/container.rnc | 6 +++--- documentapi/abi-spec.json | 1 - .../src/main/java/com/yahoo/documentapi/Result.java | 14 -------------- .../documentapi/messagebus/MessageBusDocumentAccess.java | 1 - .../documentapi/messagebus/protocol/DocumentMessage.java | 1 - .../messagebus/protocol/RoutableFactories60.java | 1 - .../messagebus/protocol/RoutableRepository.java | 1 - 10 files changed, 6 insertions(+), 25 deletions(-) diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/component/AccessLogComponent.java b/config-model/src/main/java/com/yahoo/vespa/model/container/component/AccessLogComponent.java index e29ca9399e5..cc0415a7630 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/component/AccessLogComponent.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/component/AccessLogComponent.java @@ -38,7 +38,7 @@ public final class AccessLogComponent extends SimpleComponent implements AccessL this(logType, compressionType, clusterName.isEmpty() ? String.format("logs/vespa/access/%s.%s", capitalize(logType.name()), "%Y%m%d%H%M%S") : - // TODO: Clean up after Vespa 8 + // TODO: Vespa > 8: Clean up VespaVersion.major == 7 ? String.format("logs/vespa/qrs/%s.%s.%s", capitalize(logType.name()), clusterName.get(), "%Y%m%d%H%M%S") : String.format("logs/vespa/access/%s.%s.%s", capitalize(logType.name()), clusterName.get(), "%Y%m%d%H%M%S"), null, diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/http/xml/HttpBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/http/xml/HttpBuilder.java index a8fb486b979..f27e0b24c82 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/http/xml/HttpBuilder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/http/xml/HttpBuilder.java @@ -104,7 +104,7 @@ public class HttpBuilder extends VespaDomBuilder.DomConfigProducerBuilder return builder.build(); } - // TODO(tokle,bjorncs) After Vespa 8 fail if domain is not provided through deploy properties + // TODO(tokle,bjorncs) Vespa > 8: Fail if domain is not provided through deploy properties private static AthenzDomain getAccessControlDomain(DeployState deployState, Element accessControlElem) { AthenzDomain tenantDomain = deployState.getProperties().athenzDomain().orElse(null); AthenzDomain explicitDomain = XmlHelper.getOptionalAttribute(accessControlElem, "domain") diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java index 552ada756b6..fb62ffb6ad1 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java @@ -402,7 +402,7 @@ public class ContainerModelBuilder extends ConfigModelBuilder { // Add connection log if access log is configured if (cluster.getAllComponents().stream().anyMatch(component -> component instanceof AccessLogComponent)) { - // TODO: clean up after Vespa 8 + // TODO: Vespa > 8: Clean up if (cluster.isHostedVespa() || deployState.getVespaVersion().getMajor() == 8) { cluster.addComponent(new ConnectionLogComponent(cluster, FileConnectionLog.class, "access")); } else { diff --git a/config-model/src/main/resources/schema/container.rnc b/config-model/src/main/resources/schema/container.rnc index 71ce5df62d9..2d145e170db 100644 --- a/config-model/src/main/resources/schema/container.rnc +++ b/config-model/src/main/resources/schema/container.rnc @@ -16,9 +16,9 @@ Server = element server { } AccessControl = element access-control { - attribute domain { xsd:NCName }? & # TODO(tokle,bjorncs) Remove after Vespa 8 - attribute read { string "true" | string "false" }? & # TODO(tokle,bjorncs) Remove after Vespa 8 - attribute write { string "true" | string "false" }? & # TODO(tokle,bjorncs) Remove after Vespa 8 + attribute domain { xsd:NCName }? & # TODO(tokle,bjorncs) Vespa > 8: Remove + attribute read { string "true" | string "false" }? & # TODO(tokle,bjorncs) Vespa > 8: Remove + attribute write { string "true" | string "false" }? & # TODO(tokle,bjorncs) Vespa > 8: Remove attribute tls-handshake-client-auth {string "want" | string "need"}? & element exclude { Binding+ diff --git a/documentapi/abi-spec.json b/documentapi/abi-spec.json index c26ab46d316..e4d64dd05c5 100644 --- a/documentapi/abi-spec.json +++ b/documentapi/abi-spec.json @@ -471,7 +471,6 @@ "public void (long)", "public void (com.yahoo.documentapi.Result$ResultType, com.yahoo.messagebus.Error)", "public boolean isSuccess()", - "public java.lang.Error getError()", "public com.yahoo.messagebus.Error error()", "public long getRequestId()", "public com.yahoo.documentapi.Result$ResultType type()", diff --git a/documentapi/src/main/java/com/yahoo/documentapi/Result.java b/documentapi/src/main/java/com/yahoo/documentapi/Result.java index 294560204a9..76891b90352 100644 --- a/documentapi/src/main/java/com/yahoo/documentapi/Result.java +++ b/documentapi/src/main/java/com/yahoo/documentapi/Result.java @@ -60,20 +60,6 @@ public class Result { */ public boolean isSuccess() { return type == ResultType.SUCCESS; } - /** - * Returns the error causes by this. If this was not a success, this method always returns an error - * If this was a success, this method returns null. - * - * @return the Error, or null - * @deprecated Will be removed on Vespa 8 - */ - @Deprecated(forRemoval = true, since="7") - public java.lang.Error getError() { - return error != null - ? new java.lang.Error(error.getMessage()) - : null; - } - public Error error() { return error; } /** diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusDocumentAccess.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusDocumentAccess.java index 09b7cf8d9a9..3b16def1f1c 100644 --- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusDocumentAccess.java +++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusDocumentAccess.java @@ -53,7 +53,6 @@ public class MessageBusDocumentAccess extends DocumentAccess { * * @param params All parameters for construction. */ - @SuppressWarnings("removal") // TODO: Remove on Vespa 8 public MessageBusDocumentAccess(MessageBusParams params) { super(params); this.params = params; diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/DocumentMessage.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/DocumentMessage.java index d4736c391f7..d04a5db3974 100755 --- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/DocumentMessage.java +++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/DocumentMessage.java @@ -8,7 +8,6 @@ import com.yahoo.text.Utf8String; /** * @author Simon Thoresen Hult */ -@SuppressWarnings("removal") // TODO: Remove on Vespa 8 public abstract class DocumentMessage extends Message { private DocumentProtocol.Priority priority = DocumentProtocol.Priority.NORMAL_3; diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/RoutableFactories60.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/RoutableFactories60.java index e0d52ced318..158ccc417c7 100644 --- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/RoutableFactories60.java +++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/RoutableFactories60.java @@ -129,7 +129,6 @@ public abstract class RoutableFactories60 { return doEncode(reply, out); } - @SuppressWarnings("removal") // TODO: Remove on Vespa 8 public Routable decode(DocumentDeserializer in) { byte pri = in.getByte(null); DocumentReply reply = doDecode(in); diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/RoutableRepository.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/RoutableRepository.java index eb6caf5d0f7..5323c1f5226 100755 --- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/RoutableRepository.java +++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/RoutableRepository.java @@ -27,7 +27,6 @@ import java.util.logging.Logger; * * @author Simon Thoresen Hult */ -@SuppressWarnings("removal") // TODO: Remove on Vespa 8 final class RoutableRepository { private static final Logger log = Logger.getLogger(RoutableRepository.class.getName()); -- cgit v1.2.3