Revert "Merge pull request #12565 from vespa-engine/revert-12563-bratseth/search-to-schema"

This reverts commit ea5fe1bf8c0d389a3964d2e5c490994920d21a4e, reversing
changes made to 7e92c3852e893d09f0aa821e04e4e9dbe83b4ab2.

3 files changed, 11 insertions, 13 deletions

diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/DocumentReferenceResolver.java b/config-model/src/main/java/com/yahoo/searchdefinition/DocumentReferenceResolver.java
index 14f8a0a9d37..0d0da71bd0f 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/DocumentReferenceResolver.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/DocumentReferenceResolver.java
@@ -25,8 +25,8 @@ public class DocumentReferenceResolver {
 
     private final Map<String, Search> searchMapping;
 
-    public DocumentReferenceResolver(List<Search> searchDefinitions) {
-        this.searchMapping = createDocumentNameToSearchMapping(searchDefinitions);
+    public DocumentReferenceResolver(List<Search> schemas) {
+        this.searchMapping = createDocumentNameToSearchMapping(schemas);
     }
 
     public void resolveReferences(SDDocumentType documentType) {
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/ImportedFieldsEnumerator.java b/config-model/src/main/java/com/yahoo/searchdefinition/ImportedFieldsEnumerator.java
index ee4fc41f2f9..25cdd1e08cd 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/ImportedFieldsEnumerator.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/ImportedFieldsEnumerator.java
@@ -2,9 +2,7 @@
 package com.yahoo.searchdefinition;
 
 import com.yahoo.searchdefinition.document.SDDocumentType;
-import com.yahoo.searchdefinition.document.TemporaryImportedFields;
 
-import java.util.Collections;
 import java.util.List;
 
 /**
@@ -13,17 +11,17 @@ import java.util.List;
  */
 public class ImportedFieldsEnumerator {
 
-    private final List<Search> searchDefinitions;
+    private final List<Search> schemas;
 
-    public ImportedFieldsEnumerator(List<Search> searchDefinitions) {
-        this.searchDefinitions = searchDefinitions;
+    public ImportedFieldsEnumerator(List<Search> schemas) {
+        this.schemas = schemas;
     }
 
     public void enumerateImportedFields(SDDocumentType documentType) {
-        var search = this.searchDefinitions.stream()
-                .filter(s -> s.getDocument() != null)
-                .filter(s -> s.getDocument().getName().equals(documentType.getName()))
-                .findFirst();
+        var search = this.schemas.stream()
+                                 .filter(s -> s.getDocument() != null)
+                                 .filter(s -> s.getDocument().getName().equals(documentType.getName()))
+                                 .findFirst();
         if (search.isEmpty()) {
             return; // No imported fields present.
         }
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/Search.java b/config-model/src/main/java/com/yahoo/searchdefinition/Search.java
index f90a7e4f6cd..0ab8a2308a4 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/Search.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/Search.java
@@ -288,7 +288,7 @@ public class Search implements ImmutableSearch {
     /**
      * Adds an extra field of this search definition not contained in a document
      *
-     * @param field to add to the searchdefinitions list of external fields.
+     * @param field to add to the schemas list of external fields
      */
     public void addExtraField(SDField field) {
         if (fields.containsKey(field.getName())) {
@@ -383,7 +383,7 @@ public class Search implements ImmutableSearch {
      * Consolidates a set of index settings for the same index into one
      *
      * @param indices The list of indexes to consolidate.
-     * @return The consolidated index
+     * @return the consolidated index
      */
     private Index consolidateIndices(List<Index> indices) {
         Index first = indices.get(0);