Revert "Revert "Searchdefinition/schemas cleanup""

1 files changed, 17 insertions, 3 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 d97ff5ca774..bc7dbbe2069 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
@@ -79,7 +79,7 @@ public interface ApplicationPackage {
      * @return the name of the application (i.e the directory where the application package was deployed from)
      * @deprecated do not use
      */
-    @Deprecated // TODO: Remove on Vespa 8
+    @Deprecated // TODO: Remove in Vespa 8
     String getApplicationName();
 
     ApplicationId getApplicationId();
@@ -113,9 +113,12 @@ public interface ApplicationPackage {
 
     /**
      * Readers for all the search definition files for this.
+     * @deprecated use {@link #getSchemas()} instead
      * @return a list of readers for search definitions
      */
-    Collection<NamedReader> searchDefinitionContents();
+    @Deprecated
+    // TODO: Remove in Vespa 8
+    default Collection<NamedReader> searchDefinitionContents() { return getSchemas(); }
 
     /**
      * Returns all the config definitions available in this package as unparsed data.
@@ -235,7 +238,18 @@ public interface ApplicationPackage {
         return Collections.emptyMap();
     }
 
-    Collection<NamedReader> getSearchDefinitions();
+    /**
+     * @deprecated use {@link #getSchemas()} instead
+     */
+    @Deprecated
+    // TODO: Remove in Vespa 8
+    default Collection<NamedReader> getSearchDefinitions() { return getSchemas(); }
+
+    /**
+     * Readers for all the schema files.
+     * @return a collection of readers for schemas
+     */
+    Collection<NamedReader> getSchemas();
 
     /**
      * Preprocess an application for a given zone and return a new application package pointing to the preprocessed