diff options
Diffstat (limited to 'config-model/src/main/java/com/yahoo/searchdefinition/derived/validation')
3 files changed, 11 insertions, 11 deletions
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/validation/IndexStructureValidator.java b/config-model/src/main/java/com/yahoo/searchdefinition/derived/validation/IndexStructureValidator.java index c41437f2531..76f52bce2a9 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/validation/IndexStructureValidator.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/derived/validation/IndexStructureValidator.java @@ -2,7 +2,7 @@ package com.yahoo.searchdefinition.derived.validation; import com.yahoo.searchdefinition.document.SDDocumentType; -import com.yahoo.searchdefinition.Search; +import com.yahoo.searchdefinition.Schema; import com.yahoo.searchdefinition.derived.DerivedConfiguration; import com.yahoo.searchdefinition.derived.IndexingScript; import com.yahoo.vespa.indexinglanguage.ExpressionVisitor; @@ -14,14 +14,14 @@ import com.yahoo.vespa.indexinglanguage.expressions.OutputExpression; */ public class IndexStructureValidator extends Validator { - public IndexStructureValidator(DerivedConfiguration config, Search search) { - super(config, search); + public IndexStructureValidator(DerivedConfiguration config, Schema schema) { + super(config, schema); } public void validate() { IndexingScript script = config.getIndexingScript(); for (Expression exp : script.expressions()) { - new OutputVisitor(search.getDocument(), exp).visit(exp); + new OutputVisitor(schema.getDocument(), exp).visit(exp); } } diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/validation/Validation.java b/config-model/src/main/java/com/yahoo/searchdefinition/derived/validation/Validation.java index a32fe67312f..fd75fbb2f48 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/validation/Validation.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/derived/validation/Validation.java @@ -1,12 +1,12 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.searchdefinition.derived.validation; -import com.yahoo.searchdefinition.Search; +import com.yahoo.searchdefinition.Schema; import com.yahoo.searchdefinition.derived.DerivedConfiguration; public class Validation { - public static void validate(DerivedConfiguration config, Search search) { - new IndexStructureValidator(config, search).validate(); + public static void validate(DerivedConfiguration config, Schema schema) { + new IndexStructureValidator(config, schema).validate(); } } diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/validation/Validator.java b/config-model/src/main/java/com/yahoo/searchdefinition/derived/validation/Validator.java index 170639f5deb..7d3e5b8e9ed 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/validation/Validator.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/derived/validation/Validator.java @@ -1,7 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.searchdefinition.derived.validation; -import com.yahoo.searchdefinition.Search; +import com.yahoo.searchdefinition.Schema; import com.yahoo.searchdefinition.derived.DerivedConfiguration; /** @@ -10,11 +10,11 @@ import com.yahoo.searchdefinition.derived.DerivedConfiguration; public abstract class Validator { protected DerivedConfiguration config; - protected Search search; + protected Schema schema; - protected Validator(DerivedConfiguration config, Search search) { + protected Validator(DerivedConfiguration config, Schema schema) { this.config = config; - this.search = search; + this.schema = schema; } public abstract void validate(); |