searchdefinitions -> schemas

10 files changed, 38 insertions, 40 deletions

diff --git a/config-model/src/main/java/com/yahoo/config/model/deploy/DeployState.java b/config-model/src/main/java/com/yahoo/config/model/deploy/DeployState.java
index 23983fda413..02498067021 100644
--- a/config-model/src/main/java/com/yahoo/config/model/deploy/DeployState.java
+++ b/config-model/src/main/java/com/yahoo/config/model/deploy/DeployState.java
@@ -36,9 +36,8 @@ import com.yahoo.vespa.model.container.search.QueryProfiles;
 import com.yahoo.vespa.model.container.search.QueryProfilesBuilder;
 import com.yahoo.vespa.model.container.search.SemanticRuleBuilder;
 import com.yahoo.vespa.model.container.search.SemanticRules;
-import com.yahoo.vespa.model.search.SearchDefinition;
+import com.yahoo.vespa.model.search.Schemas;
 
-import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.Reader;
@@ -62,7 +61,7 @@ public class DeployState implements ConfigDefinitionStore {
     private final DeployLogger logger;
     private final FileRegistry fileRegistry;
     private final DocumentModel documentModel;
-    private final List<SearchDefinition> searchDefinitions;
+    private final List<Schemas> schemas;
     private final ApplicationPackage applicationPackage;
     private final Optional<ConfigDefinitionRepo> configDefinitionRepo;
     private final Optional<ApplicationPackage> permanentApplicationPackage;
@@ -120,7 +119,7 @@ public class DeployState implements ConfigDefinitionStore {
         this.previousModel = previousModel;
         this.accessLoggingEnabledByDefault = accessLoggingEnabledByDefault;
         this.provisioner = hostProvisioner.orElse(getDefaultModelHostProvisioner(applicationPackage));
-        this.searchDefinitions = searchDocumentModel.getSearchDefinitions();
+        this.schemas = searchDocumentModel.getSearchDefinitions();
         this.documentModel = searchDocumentModel.getDocumentModel();
         this.permanentApplicationPackage = permanentApplicationPackage;
         this.configDefinitionRepo = configDefinitionRepo;
@@ -208,8 +207,8 @@ public class DeployState implements ConfigDefinitionStore {
         return applicationPackage;
     }
 
-    public List<SearchDefinition> getSearchDefinitions() {
-        return searchDefinitions;
+    public List<Schemas> getSearchDefinitions() {
+        return schemas;
     }
 
     public DocumentModel getDocumentModel() {
diff --git a/config-model/src/main/java/com/yahoo/config/model/deploy/SearchDocumentModel.java b/config-model/src/main/java/com/yahoo/config/model/deploy/SearchDocumentModel.java
index cdd4f6f8e8a..2270b389e5a 100644
--- a/config-model/src/main/java/com/yahoo/config/model/deploy/SearchDocumentModel.java
+++ b/config-model/src/main/java/com/yahoo/config/model/deploy/SearchDocumentModel.java
@@ -3,7 +3,7 @@ package com.yahoo.config.model.deploy;
 
 import com.yahoo.searchdefinition.SearchBuilder;
 import com.yahoo.vespa.documentmodel.DocumentModel;
-import com.yahoo.vespa.model.search.SearchDefinition;
+import com.yahoo.vespa.model.search.Schemas;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -18,11 +18,11 @@ import java.util.Map;
 public class SearchDocumentModel {
 
     private final DocumentModel documentModel;
-    private final List<SearchDefinition> searchDefinitions;
+    private final List<Schemas> schemas;
 
-    public SearchDocumentModel(DocumentModel documentModel, List<SearchDefinition> searchDefinitions) {
+    public SearchDocumentModel(DocumentModel documentModel, List<Schemas> schemas) {
         this.documentModel = documentModel;
-        this.searchDefinitions = searchDefinitions;
+        this.schemas = schemas;
 
     }
 
@@ -30,22 +30,22 @@ public class SearchDocumentModel {
         return documentModel;
     }
 
-    public List<SearchDefinition> getSearchDefinitions() {
-        return searchDefinitions;
+    public List<Schemas> getSearchDefinitions() {
+        return schemas;
     }
 
     public static SearchDocumentModel fromBuilderAndNames(SearchBuilder builder, Map<String, String> names) {
-        List<SearchDefinition> ret = new ArrayList<>();
+        List<Schemas> ret = new ArrayList<>();
         for (com.yahoo.searchdefinition.Search search : builder.getSearchList()) {
-            ret.add(new SearchDefinition(names.get(search.getName()), search));
+            ret.add(new Schemas(names.get(search.getName()), search));
         }
         return new SearchDocumentModel(builder.getModel(), ret);
     }
 
     public static SearchDocumentModel fromBuilder(SearchBuilder builder) {
-        List<SearchDefinition> ret = new ArrayList<>();
+        List<Schemas> ret = new ArrayList<>();
         for (com.yahoo.searchdefinition.Search search : builder.getSearchList()) {
-            ret.add(new SearchDefinition(search.getName(), search));
+            ret.add(new Schemas(search.getName(), search));
         }
         return new SearchDocumentModel(builder.getModel(), ret);
     }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/RankingConstantsValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/RankingConstantsValidator.java
index 907418ea9f0..27327431d60 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/RankingConstantsValidator.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/RankingConstantsValidator.java
@@ -9,7 +9,7 @@ import com.yahoo.path.Path;
 import com.yahoo.searchdefinition.RankingConstant;
 import com.yahoo.vespa.model.VespaModel;
 import com.yahoo.vespa.model.application.validation.ConstantTensorJsonValidator.InvalidConstantTensor;
-import com.yahoo.vespa.model.search.SearchDefinition;
+import com.yahoo.vespa.model.search.Schemas;
 
 import java.io.FileNotFoundException;
 
@@ -47,7 +47,7 @@ public class RankingConstantsValidator extends Validator {
         ApplicationPackage applicationPackage = deployState.getApplicationPackage();
         ExceptionMessageCollector exceptionMessageCollector = new ExceptionMessageCollector("Invalid constant tensor file(s):");
 
-        for (SearchDefinition sd : deployState.getSearchDefinitions()) {
+        for (Schemas sd : deployState.getSearchDefinitions()) {
             for (RankingConstant rc : sd.getSearch().rankingConstants().asMap().values()) {
                 try {
                     validateRankingConstant(rc, applicationPackage);
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/SearchDataTypeValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/SearchDataTypeValidator.java
index 85ba75639eb..9d6ddde66cb 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/SearchDataTypeValidator.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/SearchDataTypeValidator.java
@@ -15,7 +15,7 @@ import com.yahoo.searchdefinition.document.SDDocumentType;
 import com.yahoo.searchdefinition.document.SDField;
 import com.yahoo.vespa.model.VespaModel;
 import com.yahoo.vespa.model.search.AbstractSearchCluster;
-import com.yahoo.vespa.model.search.SearchDefinition;
+import com.yahoo.vespa.model.search.Schemas;
 
 import java.util.List;
 
@@ -44,7 +44,7 @@ public class SearchDataTypeValidator extends Validator {
         }
     }
 
-    private void validateDocument(AbstractSearchCluster cluster, SearchDefinition def, SDDocumentType doc) {
+    private void validateDocument(AbstractSearchCluster cluster, Schemas def, SDDocumentType doc) {
         for (SDDocumentType child : doc.getTypes()) {
             validateDocument(cluster, def, child);
         }
@@ -84,7 +84,7 @@ public class SearchDataTypeValidator extends Validator {
         }
     }
 
-    private void disallowIndexingOfMaps(AbstractSearchCluster cluster, SearchDefinition def, Field field) {
+    private void disallowIndexingOfMaps(AbstractSearchCluster cluster, Schemas def, Field field) {
         DataType fieldType = field.getDataType();
         if ((fieldType instanceof MapDataType) && (((SDField) field).doesIndexing())) {
             throw new IllegalArgumentException("Field type '" + fieldType.getName() + "' cannot be indexed for search " +
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/ContentSearchCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/content/ContentSearchCluster.java
index fa822df652f..2aaa4aa5591 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/content/ContentSearchCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/content/ContentSearchCluster.java
@@ -16,7 +16,7 @@ import com.yahoo.vespa.model.search.AbstractSearchCluster;
 import com.yahoo.vespa.model.search.IndexedSearchCluster;
 import com.yahoo.vespa.model.search.NodeSpec;
 import com.yahoo.vespa.model.search.SearchCluster;
-import com.yahoo.vespa.model.search.SearchDefinition;
+import com.yahoo.vespa.model.search.Schemas;
 import com.yahoo.vespa.model.search.SearchDefinitionXMLHandler;
 import com.yahoo.vespa.model.search.SearchNode;
 import com.yahoo.vespa.model.search.StreamingSearchCluster;
@@ -201,7 +201,7 @@ public class ContentSearchCluster extends AbstractConfigProducer implements Prot
     private void addSearchDefinitions(DeployState deployState, List<ModelElement> searchDefs, AbstractSearchCluster sc) {
         for (ModelElement e : searchDefs) {
             SearchDefinitionXMLHandler searchDefinitionXMLHandler = new SearchDefinitionXMLHandler(e);
-            SearchDefinition searchDefinition =
+            Schemas searchDefinition =
                     searchDefinitionXMLHandler.getResponsibleSearchDefinition(deployState.getSearchDefinitions());
             if (searchDefinition == null)
                 throw new RuntimeException("Search definition parsing error or file does not exist: '" +
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/AbstractSearchCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/search/AbstractSearchCluster.java
index 8a88e720bed..bf6cf3d99b0 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/search/AbstractSearchCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/search/AbstractSearchCluster.java
@@ -42,7 +42,7 @@ public abstract class AbstractSearchCluster extends AbstractConfigProducer
             sds.getSearchDefinition().getSearch().rankingConstants().sendTo(backends);
     }
 
-    public void addDocumentNames(SearchDefinition searchDefinition) {
+    public void addDocumentNames(Schemas searchDefinition) {
         String dName = searchDefinition.getSearch().getDocument().getDocumentName().getName();
         documentNames.add(dName);
     }
@@ -109,16 +109,16 @@ public abstract class AbstractSearchCluster extends AbstractConfigProducer
 
     public static final class SearchDefinitionSpec {
 
-        private final SearchDefinition searchDefinition;
+        private final Schemas searchDefinition;
         private final UserConfigRepo userConfigRepo;
 
-        public SearchDefinitionSpec(SearchDefinition searchDefinition,
+        public SearchDefinitionSpec(Schemas searchDefinition,
                                     UserConfigRepo userConfigRepo) {
             this.searchDefinition = searchDefinition;
             this.userConfigRepo = userConfigRepo;
         }
 
-        public SearchDefinition getSearchDefinition() {
+        public Schemas getSearchDefinition() {
             return searchDefinition;
         }
 
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/SearchDefinition.java b/config-model/src/main/java/com/yahoo/vespa/model/search/Schemas.java
index 860f89792e2..730e7467d54 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/search/SearchDefinition.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/search/Schemas.java
@@ -8,7 +8,7 @@ import java.util.Collection;
 /**
  * @author Tony Vaagenes
  */
-public class SearchDefinition {
+public class Schemas {
 
     private final Search search;
     private final String name;
@@ -23,14 +23,14 @@ public class SearchDefinition {
         return name;
     }
 
-    public SearchDefinition(String name, Search search) {
+    public Schemas(String name, Search search) {
         this.name = name;
         this.search = search;
     }
 
     //Find search definition from a collection with the name specified
-    public static SearchDefinition findByName(final String searchDefinitionName, Collection<SearchDefinition> searchDefinitions) {
-        for (SearchDefinition candidate : searchDefinitions) {
+    public static Schemas findByName(final String searchDefinitionName, Collection<Schemas> searchDefinitions) {
+        for (Schemas candidate : searchDefinitions) {
             if (candidate.getName().equals(searchDefinitionName) )
                 return candidate;
         }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/SearchDefinitionXMLHandler.java b/config-model/src/main/java/com/yahoo/vespa/model/search/SearchDefinitionXMLHandler.java
index 1054253e3f0..e1ed241ce45 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/search/SearchDefinitionXMLHandler.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/search/SearchDefinitionXMLHandler.java
@@ -24,8 +24,8 @@ public class SearchDefinitionXMLHandler implements Serializable {
 
     public String getName() { return sdName; }
 
-    public SearchDefinition getResponsibleSearchDefinition(List<SearchDefinition> searchDefinitions) {
-        return SearchDefinition.findByName( getName(), searchDefinitions );
+    public Schemas getResponsibleSearchDefinition(List<Schemas> searchDefinitions) {
+        return Schemas.findByName(getName(), searchDefinitions );
     }
 
 }
diff --git a/config-model/src/test/java/com/yahoo/config/model/ApplicationDeployTest.java b/config-model/src/test/java/com/yahoo/config/model/ApplicationDeployTest.java
index 099ff83774f..ffb2baa04ab 100644
--- a/config-model/src/test/java/com/yahoo/config/model/ApplicationDeployTest.java
+++ b/config-model/src/test/java/com/yahoo/config/model/ApplicationDeployTest.java
@@ -20,7 +20,7 @@ import com.yahoo.searchdefinition.DocumentOnlySearch;
 import com.yahoo.vespa.config.ConfigDefinition;
 import com.yahoo.vespa.config.ConfigDefinitionKey;
 import com.yahoo.vespa.model.VespaModel;
-import com.yahoo.vespa.model.search.SearchDefinition;
+import com.yahoo.vespa.model.search.Schemas;
 import org.junit.After;
 import org.junit.Rule;
 import org.junit.Test;
@@ -31,7 +31,6 @@ import java.io.File;
 import java.io.IOException;
 import java.io.Reader;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -60,9 +59,9 @@ public class ApplicationDeployTest {
     public void testVespaModel() throws SAXException, IOException {
         ApplicationPackageTester tester = ApplicationPackageTester.create(TESTDIR + "app1");
         VespaModel model = new VespaModel(tester.app());
-        List<SearchDefinition> searchDefinitions = tester.getSearchDefinitions();
+        List<Schemas> searchDefinitions = tester.getSearchDefinitions();
         assertEquals(searchDefinitions.size(), 5);
-        for (SearchDefinition searchDefinition : searchDefinitions) {
+        for (Schemas searchDefinition : searchDefinitions) {
             Search s = searchDefinition.getSearch();
             switch (s.getName()) {
                 case "music":
@@ -100,7 +99,7 @@ public class ApplicationDeployTest {
 
         // Check that getFilename works
         ArrayList<String> sdFileNames = new ArrayList<>();
-        for (SearchDefinition sd : searchDefinitions)
+        for (Schemas sd : searchDefinitions)
             sdFileNames.add(sd.getFilename());
         Collections.sort(sdFileNames);
         assertEquals("laptop.sd", sdFileNames.get(0));
diff --git a/config-model/src/test/java/com/yahoo/config/model/ApplicationPackageTester.java b/config-model/src/test/java/com/yahoo/config/model/ApplicationPackageTester.java
index 87b6efa83d6..56c27e4c331 100644
--- a/config-model/src/test/java/com/yahoo/config/model/ApplicationPackageTester.java
+++ b/config-model/src/test/java/com/yahoo/config/model/ApplicationPackageTester.java
@@ -5,7 +5,7 @@ import com.yahoo.component.Version;
 import com.yahoo.config.model.application.provider.ApplicationPackageXmlFilesValidator;
 import com.yahoo.config.model.application.provider.FilesApplicationPackage;
 import com.yahoo.config.model.deploy.DeployState;
-import com.yahoo.vespa.model.search.SearchDefinition;
+import com.yahoo.vespa.model.search.Schemas;
 
 import java.io.File;
 import java.io.IOException;
@@ -39,7 +39,7 @@ public class ApplicationPackageTester {
 
     public FilesApplicationPackage app() { return applicationPackage; }
 
-    public List<SearchDefinition> getSearchDefinitions() {
+    public List<Schemas> getSearchDefinitions() {
         return new DeployState.Builder().applicationPackage(app()).build().getSearchDefinitions();
     }