diff options
3 files changed, 0 insertions, 13 deletions
diff --git a/config-model-api/abi-spec.json b/config-model-api/abi-spec.json index 313ef0f5fb9..c67e86de38b 100644 --- a/config-model-api/abi-spec.json +++ b/config-model-api/abi-spec.json @@ -119,7 +119,6 @@ "public abstract java.util.Optional getValidationOverrides()", "public abstract java.util.List getComponentsInfo(com.yahoo.component.Version)", "public abstract java.io.Reader getRankingExpression(java.lang.String)", - "public static java.util.Map getBundleSdFiles(java.lang.String, java.util.jar.JarFile)", "public static java.lang.String getFileName(java.util.jar.JarEntry)", "public abstract com.yahoo.config.application.api.ApplicationMetaData getMetaData()", "public abstract java.io.File getFileReference(com.yahoo.path.Path)", 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 cdab2dc2fb2..b6f030fab52 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 @@ -23,7 +23,6 @@ import java.util.List; import java.util.Map; import java.util.Optional; import java.util.jar.JarEntry; -import java.util.jar.JarFile; /** * Represents an application package, that is, used as input when creating a VespaModel and as @@ -200,11 +199,6 @@ public interface ApplicationPackage { */ Reader getRankingExpression(String name); - // TODO: Unused, remove when 7.264 is latest version in use - static Map<String, String> getBundleSdFiles(String path, JarFile bundle) throws IOException { - return Map.of(); - } - /** * The name of an SD in a JarEntry */ diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/HostSpec.java b/config-provisioning/src/main/java/com/yahoo/config/provision/HostSpec.java index 81c01cd2e7f..597e413c941 100644 --- a/config-provisioning/src/main/java/com/yahoo/config/provision/HostSpec.java +++ b/config-provisioning/src/main/java/com/yahoo/config/provision/HostSpec.java @@ -94,12 +94,6 @@ public class HostSpec implements Comparable<HostSpec> { /** The total advertised resources of this node, typically matching what's requested. */ public NodeResources advertisedResources() { return advertisedResources; } - /** A flavor contained the advertised resources of this host */ - // TODO: Remove when models older than 7.285 are gone - public Optional<Flavor> flavor() { - return advertisedResources.asOptional().map(resources -> new Flavor(resources)); - } - /** Returns the current version of Vespa running on this node, or empty if not known */ public Optional<com.yahoo.component.Version> version() { return version; } |