From af68e900af2ac48f70983b966b3efd09535583d0 Mon Sep 17 00:00:00 2001 From: Jon Bratseth Date: Fri, 3 Jun 2022 13:53:55 +0200 Subject: Remove on Vespa 8 --- config-model-api/abi-spec.json | 2 -- .../yahoo/config/application/api/ApplicationPackage.java | 16 ---------------- 2 files changed, 18 deletions(-) (limited to 'config-model-api') diff --git a/config-model-api/abi-spec.json b/config-model-api/abi-spec.json index 59f506d778a..47228cf7768 100644 --- a/config-model-api/abi-spec.json +++ b/config-model-api/abi-spec.json @@ -102,7 +102,6 @@ "public abstract java.io.Reader getHosts()", "public java.util.List getUserIncludeDirs()", "public void validateIncludeDir(java.lang.String)", - "public java.util.Collection searchDefinitionContents()", "public abstract java.util.Map getAllExistingConfigDefs()", "public abstract java.util.List getFiles(com.yahoo.path.Path, java.lang.String, boolean)", "public java.util.List getFiles(com.yahoo.path.Path, java.lang.String)", @@ -127,7 +126,6 @@ "public java.util.Optional getAllocatedHosts()", "public java.util.Map getFileRegistries()", "public java.util.Map legacyOverrides()", - "public java.util.Collection getSearchDefinitions()", "public abstract java.util.Collection getSchemas()", "public com.yahoo.config.application.api.ApplicationPackage preprocess(com.yahoo.config.provision.Zone, com.yahoo.config.application.api.DeployLogger)" ], 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 bc320ac6e98..883b59be410 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 @@ -102,15 +102,6 @@ public interface ApplicationPackage { "This application package does not support validation of include dirs."); } - /** - * Readers for all the search definition files for this. - * @deprecated use {@link #getSchemas()} instead - * @return a list of readers for search definitions - */ - @Deprecated - // TODO: Remove in Vespa 8 - default Collection searchDefinitionContents() { return getSchemas(); } - /** * Returns all the config definitions available in this package as unparsed data. */ @@ -232,13 +223,6 @@ public interface ApplicationPackage { return Collections.emptyMap(); } - /** - * @deprecated use {@link #getSchemas()} instead - */ - @Deprecated - // TODO: Remove in Vespa 8 - default Collection getSearchDefinitions() { return getSchemas(); } - /** * Readers for all the schema files. * @return a collection of readers for schemas -- cgit v1.2.3