Revert "Searchdefinition/schemas cleanup"

2 files changed, 5 insertions, 20 deletions

diff --git a/config-model-api/abi-spec.json b/config-model-api/abi-spec.json
index 58d2693aace..bdf2b53bc92 100644
--- a/config-model-api/abi-spec.json
+++ b/config-model-api/abi-spec.json
@@ -103,7 +103,7 @@
       "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.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,8 +127,7 @@
       "public void writeMetaData()",
       "public java.util.Optional getAllocatedHosts()",
       "public java.util.Map getFileRegistries()",
-      "public java.util.Collection getSearchDefinitions()",
-      "public abstract java.util.Collection getSchemas()",
+      "public abstract java.util.Collection getSearchDefinitions()",
       "public com.yahoo.config.application.api.ApplicationPackage preprocess(com.yahoo.config.provision.Zone, com.yahoo.config.application.api.DeployLogger)"
     ],
     "fields": [
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 bc7dbbe2069..d97ff5ca774 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 in Vespa 8
+    @Deprecated // TODO: Remove on Vespa 8
     String getApplicationName();
 
     ApplicationId getApplicationId();
@@ -113,12 +113,9 @@ 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
      */
-    @Deprecated
-    // TODO: Remove in Vespa 8
-    default Collection<NamedReader> searchDefinitionContents() { return getSchemas(); }
+    Collection<NamedReader> searchDefinitionContents();
 
     /**
      * Returns all the config definitions available in this package as unparsed data.
@@ -238,18 +235,7 @@ public interface ApplicationPackage {
         return Collections.emptyMap();
     }
 
-    /**
-     * @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();
+    Collection<NamedReader> getSearchDefinitions();
 
     /**
      * Preprocess an application for a given zone and return a new application package pointing to the preprocessed