searchdefinitions -> schemas

8 files changed, 36 insertions, 35 deletions

diff --git a/config-model/src/main/java/com/yahoo/config/model/test/MockApplicationPackage.java b/config-model/src/main/java/com/yahoo/config/model/test/MockApplicationPackage.java
index 8e11d495baa..67448a24189 100644
--- a/config-model/src/main/java/com/yahoo/config/model/test/MockApplicationPackage.java
+++ b/config-model/src/main/java/com/yahoo/config/model/test/MockApplicationPackage.java
@@ -108,7 +108,7 @@ public class MockApplicationPackage implements ApplicationPackage {
 
     @Override
     public Reader getHosts() {
-        if (hostsS==null) return null;
+        if (hostsS == null) return null;
         return new StringReader(hostsS);
     }
 
@@ -200,9 +200,9 @@ public class MockApplicationPackage implements ApplicationPackage {
 
     public static ApplicationPackage fromSearchDefinitionDirectory(String dir) {
         return new MockApplicationPackage.Builder()
-                .withEmptyHosts()
-                .withEmptyServices()
-                .withSearchDefinitionDir(dir).build();
+                       .withEmptyHosts()
+                       .withEmptyServices()
+                       .withSchemaDir(dir).build();
     }
 
     public static class Builder {
@@ -210,8 +210,8 @@ public class MockApplicationPackage implements ApplicationPackage {
         private File root = new File("nonexisting");
         private String hosts = null;
         private String services = null;
-        private List<String> searchDefinitions = Collections.emptyList();
-        private String searchDefinitionDir = null;
+        private List<String> schemas = Collections.emptyList();
+        private String schemaDir = null;
         private String deploymentSpec = null;
         private String validationOverrides = null;
         private boolean failOnValidateXml = false;
@@ -245,17 +245,17 @@ public class MockApplicationPackage implements ApplicationPackage {
         }
 
         public Builder withSearchDefinition(String searchDefinition) {
-            this.searchDefinitions = Collections.singletonList(searchDefinition);
+            this.schemas = Collections.singletonList(searchDefinition);
             return this;
         }
 
         public Builder withSearchDefinitions(List<String> searchDefinition) {
-            this.searchDefinitions = Collections.unmodifiableList(searchDefinition);
+            this.schemas = Collections.unmodifiableList(searchDefinition);
             return this;
         }
 
-        public Builder withSearchDefinitionDir(String searchDefinitionDir) {
-            this.searchDefinitionDir = searchDefinitionDir;
+        public Builder withSchemaDir(String schemaDir) {
+            this.schemaDir = schemaDir;
             return this;
         }
 
@@ -285,7 +285,7 @@ public class MockApplicationPackage implements ApplicationPackage {
         }
 
         public ApplicationPackage build() {
-                return new MockApplicationPackage(root, hosts, services, searchDefinitions, searchDefinitionDir,
+                return new MockApplicationPackage(root, hosts, services, schemas, schemaDir,
                                                   deploymentSpec, validationOverrides, failOnValidateXml,
                                                   queryProfile, queryProfileType);
         }
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);
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 57b654e20db..fcaba66ef69 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
@@ -17,7 +17,7 @@ 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.NamedSchema;
-import com.yahoo.vespa.model.search.SearchDefinitionXMLHandler;
+import com.yahoo.vespa.model.search.SchemaDefinitionXMLHandler;
 import com.yahoo.vespa.model.search.SearchNode;
 import com.yahoo.vespa.model.search.StreamingSearchCluster;
 import com.yahoo.vespa.model.search.TransactionLogServer;
@@ -136,7 +136,7 @@ public class ContentSearchCluster extends AbstractConfigProducer implements Prot
 
         private void buildIndexedSearchCluster(DeployState deployState, ModelElement clusterElem,
                                                String clusterName, ContentSearchCluster search) {
-            List<ModelElement> indexedDefs = getIndexedSearchDefinitions(clusterElem);
+            List<ModelElement> indexedDefs = getIndexedSchemas(clusterElem);
             if (!indexedDefs.isEmpty()) {
                 IndexedSearchCluster isc = new IndexedSearchCluster(search, clusterName, 0, deployState);
                 isc.setRoutingSelector(clusterElem.childAsString("documents.selection"));
@@ -150,7 +150,7 @@ public class ContentSearchCluster extends AbstractConfigProducer implements Prot
             }
         }
 
-        private List<ModelElement> getIndexedSearchDefinitions(ModelElement clusterElem) {
+        private List<ModelElement> getIndexedSchemas(ModelElement clusterElem) {
             List<ModelElement> indexedDefs = new ArrayList<>();
             ModelElement docElem = clusterElem.child("documents");
             if (docElem == null) {
@@ -188,24 +188,24 @@ public class ContentSearchCluster extends AbstractConfigProducer implements Prot
     }
 
     private void addSearchCluster(DeployState deployState, SearchCluster cluster, Double queryTimeout, List<ModelElement> documentDefs) {
-        addSearchDefinitions(deployState, documentDefs, cluster);
+        addSchemas(deployState, documentDefs, cluster);
 
         if (queryTimeout != null) {
             cluster.setQueryTimeout(queryTimeout);
         }
         cluster.defaultDocumentsConfig();
-        cluster.deriveSearchDefinitions(deployState);
+        cluster.deriveSchemas(deployState);
         addCluster(cluster);
     }
 
-    private void addSearchDefinitions(DeployState deployState, List<ModelElement> searchDefs, AbstractSearchCluster sc) {
+    private void addSchemas(DeployState deployState, List<ModelElement> searchDefs, AbstractSearchCluster sc) {
         for (ModelElement e : searchDefs) {
-            SearchDefinitionXMLHandler searchDefinitionXMLHandler = new SearchDefinitionXMLHandler(e);
+            SchemaDefinitionXMLHandler schemaDefinitionXMLHandler = new SchemaDefinitionXMLHandler(e);
             NamedSchema searchDefinition =
-                    searchDefinitionXMLHandler.getResponsibleSearchDefinition(deployState.getSchemas());
+                    schemaDefinitionXMLHandler.getResponsibleSearchDefinition(deployState.getSchemas());
             if (searchDefinition == null)
                 throw new RuntimeException("Search definition parsing error or file does not exist: '" +
-                        searchDefinitionXMLHandler.getName() + "'");
+                                           schemaDefinitionXMLHandler.getName() + "'");
 
             // TODO: remove explicit building of user configs when the complete content model is built using builders.
             sc.getLocalSDS().add(new AbstractSearchCluster.SchemaSpec(searchDefinition,
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/IndexedSearchCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/search/IndexedSearchCluster.java
index bd6577457ba..9746c50450e 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/search/IndexedSearchCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/search/IndexedSearchCluster.java
@@ -195,8 +195,9 @@ public class IndexedSearchCluster extends SearchCluster
             routingSelector = sb.toString();
         }
     }
+
     @Override
-    protected void deriveAllSearchDefinitions(List<SchemaSpec> localSearches, DeployState deployState) {
+    protected void deriveAllSchemas(List<SchemaSpec> localSearches, DeployState deployState) {
         for (SchemaSpec spec : localSearches) {
             com.yahoo.searchdefinition.Search search = spec.getSearchDefinition().getSearch();
             if ( ! (search instanceof DocumentOnlySearch)) {
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/NamedSchema.java b/config-model/src/main/java/com/yahoo/vespa/model/search/NamedSchema.java
index 01a9f602252..ba81073709e 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/search/NamedSchema.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/search/NamedSchema.java
@@ -30,9 +30,9 @@ public class NamedSchema {
     }
 
     //Find search definition from a collection with the name specified
-    public static NamedSchema findByName(final String searchDefinitionName, Collection<NamedSchema> searchDefinitions) {
-        for (NamedSchema candidate : searchDefinitions) {
-            if (candidate.getName().equals(searchDefinitionName) )
+    public static NamedSchema findByName(String schemaName, Collection<NamedSchema> schemas) {
+        for (NamedSchema candidate : schemas) {
+            if (candidate.getName().equals(schemaName) )
                 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/SchemaDefinitionXMLHandler.java
index 521827f2aec..b505b5e681c 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/SchemaDefinitionXMLHandler.java
@@ -7,15 +7,15 @@ import java.io.Serializable;
 import java.util.List;
 
 /**
- * Represents a single searchdefinition file.
+ * Represents a single schema file.
  *
  * @author arnej27959
  */
-public class SearchDefinitionXMLHandler implements Serializable {
+public class SchemaDefinitionXMLHandler implements Serializable {
 
     private String sdName;
 
-    public SearchDefinitionXMLHandler(ModelElement elem) {
+    public SchemaDefinitionXMLHandler(ModelElement elem) {
         sdName = elem.stringAttribute("name");
         if (sdName == null) {
             sdName = elem.stringAttribute("type");
@@ -24,8 +24,8 @@ public class SearchDefinitionXMLHandler implements Serializable {
 
     public String getName() { return sdName; }
 
-    public NamedSchema getResponsibleSearchDefinition(List<NamedSchema> searchDefinitions) {
-        return NamedSchema.findByName(getName(), searchDefinitions );
+    public NamedSchema getResponsibleSearchDefinition(List<NamedSchema> schemas) {
+        return NamedSchema.findByName(getName(), schemas );
     }
 
 }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/SearchCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/search/SearchCluster.java
index 417a9ff598a..0139e949c7a 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/search/SearchCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/search/SearchCluster.java
@@ -41,8 +41,8 @@ public abstract class SearchCluster extends AbstractSearchCluster
      * Also stores the document names contained in the search
      * definitions.
      */
-    public void deriveSearchDefinitions(DeployState deployState) {
-        deriveAllSearchDefinitions(getLocalSDS(), deployState);
+    public void deriveSchemas(DeployState deployState) {
+        deriveAllSchemas(getLocalSDS(), deployState);
     }
 
     @Override
@@ -132,7 +132,7 @@ public abstract class SearchCluster extends AbstractSearchCluster
         return false;
     }
 
-    protected abstract void deriveAllSearchDefinitions(List<SchemaSpec> localSearches, DeployState deployState);
+    protected abstract void deriveAllSchemas(List<SchemaSpec> localSearches, DeployState deployState);
 
     public abstract void defaultDocumentsConfig();
     public abstract DerivedConfiguration getSdConfig();
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/StreamingSearchCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/search/StreamingSearchCluster.java
index 524e3191cb0..28e7b3eb37a 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/search/StreamingSearchCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/search/StreamingSearchCluster.java
@@ -91,7 +91,7 @@ public class StreamingSearchCluster extends SearchCluster implements
     }
 
     @Override
-    protected void deriveAllSearchDefinitions(List<SchemaSpec> local, DeployState deployState) {
+    protected void deriveAllSchemas(List<SchemaSpec> local, DeployState deployState) {
         if (local.size() == 1) {
             deriveSingleSearchDefinition(local.get(0).getSearchDefinition().getSearch(), deployState);
         } else if (local.size() > 1){