diff options
Diffstat (limited to 'config-model-api/src/main/java/com/yahoo/config/application/api')
2 files changed, 4 insertions, 43 deletions
diff --git a/config-model-api/src/main/java/com/yahoo/config/application/api/ApplicationPackage.java b/config-model-api/src/main/java/com/yahoo/config/application/api/ApplicationPackage.java index 6b49ea0c172..06f8034453d 100644 --- a/config-model-api/src/main/java/com/yahoo/config/application/api/ApplicationPackage.java +++ b/config-model-api/src/main/java/com/yahoo/config/application/api/ApplicationPackage.java @@ -185,17 +185,7 @@ public interface ApplicationPackage { Optional<Reader> getDeployment(); Optional<Reader> getValidationOverrides(); - /** @deprecated do not override or call. Use the other Version class */ - @Deprecated - default List<ComponentInfo> getComponentsInfo(com.yahoo.config.provision.Version vespaVersion) { - return getComponentsInfo(vespaVersion.toVersion()); - } - - // TODO: Remove the default implementation after December 2018 - @SuppressWarnings("deprecation") - default List<ComponentInfo> getComponentsInfo(Version vespaVersion) { - return getComponentsInfo(com.yahoo.config.provision.Version.from(vespaVersion)); - } + List<ComponentInfo> getComponentsInfo(Version vespaVersion); /** * Reads a ranking expression from file to a string and returns it. @@ -248,12 +238,6 @@ public interface ApplicationPackage { throw new UnsupportedOperationException("This application package cannot validate XML"); } - /** @deprecated do not override or call. Use the other Version class */ - @Deprecated - default void validateXML(Optional<com.yahoo.config.provision.Version> vespaVersion) throws IOException { - validateXMLFor(vespaVersion.map(com.yahoo.config.provision.Version::toVersion)); - } - default void validateXMLFor(Optional<Version> vespaVersion) throws IOException { throw new UnsupportedOperationException("This application package cannot validate XML"); } @@ -262,31 +246,11 @@ public interface ApplicationPackage { throw new UnsupportedOperationException("This application package cannot write its metadata"); } - /** - * Returns the single host allocation info of this, or an empty map if no allocation is available - * - * @deprecated please use #getAllocatedHosts - */ - // TODO: Remove on Vespa 7 - @Deprecated - default Map<com.yahoo.config.provision.Version, AllocatedHosts> getProvisionInfoMap() { - return Collections.emptyMap(); - } - /** Returns the host allocation info of this, or empty if no allocation is available */ default Optional<AllocatedHosts> getAllocatedHosts() { return Optional.empty(); } - /** @deprecated do not override or call. Use getFileRegistries */ - @Deprecated - default Map<com.yahoo.config.provision.Version, FileRegistry> getFileRegistryMap() { - return getFileRegistries().entrySet() - .stream() - .collect(Collectors.toMap(e -> com.yahoo.config.provision.Version.from(e.getKey()), - e -> e.getValue())); - } - default Map<Version, FileRegistry> getFileRegistries() { return Collections.emptyMap(); } diff --git a/config-model-api/src/main/java/com/yahoo/config/application/api/xml/DeploymentSpecXmlReader.java b/config-model-api/src/main/java/com/yahoo/config/application/api/xml/DeploymentSpecXmlReader.java index 084779d2147..e70e8449922 100644 --- a/config-model-api/src/main/java/com/yahoo/config/application/api/xml/DeploymentSpecXmlReader.java +++ b/config-model-api/src/main/java/com/yahoo/config/application/api/xml/DeploymentSpecXmlReader.java @@ -219,13 +219,10 @@ public class DeploymentSpecXmlReader { private List<DeploymentSpec.ChangeBlocker> readChangeBlockers(Element root) { List<DeploymentSpec.ChangeBlocker> changeBlockers = new ArrayList<>(); for (Element tag : XML.getChildren(root)) { - // TODO: Remove block-upgrade on Vespa 7 - if ( ! blockChangeTag.equals(tag.getTagName()) && !"block-upgrade".equals(tag.getTagName())) continue; + if ( ! blockChangeTag.equals(tag.getTagName())) continue; - boolean blockVersions = tag.getTagName().equals("block-upgrade") || // TODO: Remove condition on Vespa 7 - trueOrMissing(tag.getAttribute("version")); - boolean blockRevisions = trueOrMissing(tag.getAttribute("revision")) - && !tag.getTagName().equals("block-upgrade"); // TODO: Remove condition on Vespa 7 + boolean blockVersions = trueOrMissing(tag.getAttribute("version")); + boolean blockRevisions = trueOrMissing(tag.getAttribute("revision")); String daySpec = tag.getAttribute("days"); String hourSpec = tag.getAttribute("hours"); |