diff options
Diffstat (limited to 'config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/search/DocumentDatabaseChangeValidator.java')
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/search/DocumentDatabaseChangeValidator.java | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/search/DocumentDatabaseChangeValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/search/DocumentDatabaseChangeValidator.java index ce435a4c157..5596169958a 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/search/DocumentDatabaseChangeValidator.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/search/DocumentDatabaseChangeValidator.java @@ -36,12 +36,12 @@ public class DocumentDatabaseChangeValidator { this.nextDocType = nextDocType; } - public List<VespaConfigChangeAction> validate(ValidationOverrides overrides, Instant now) { + public List<VespaConfigChangeAction> validate() { List<VespaConfigChangeAction> result = new ArrayList<>(); result.addAll(validateAttributeChanges()); - result.addAll(validateStructFieldAttributeChanges(overrides, now)); - result.addAll(validateIndexingScriptChanges(overrides, now)); - result.addAll(validateDocumentTypeChanges(overrides, now)); + result.addAll(validateStructFieldAttributeChanges()); + result.addAll(validateIndexingScriptChanges()); + result.addAll(validateDocumentTypeChanges()); return result; } @@ -54,23 +54,23 @@ public class DocumentDatabaseChangeValidator { .validate(); } - private List<VespaConfigChangeAction> validateStructFieldAttributeChanges(ValidationOverrides overrides, Instant now) { + private List<VespaConfigChangeAction> validateStructFieldAttributeChanges() { return new StructFieldAttributeChangeValidator(id, currentDocType, currentDatabase.getDerivedConfiguration().getAttributeFields(), nextDocType, nextDatabase.getDerivedConfiguration().getAttributeFields()) - .validate(overrides, now); + .validate(); } - private List<VespaConfigChangeAction> validateIndexingScriptChanges(ValidationOverrides overrides, Instant now) { + private List<VespaConfigChangeAction> validateIndexingScriptChanges() { return new IndexingScriptChangeValidator(id, currentDatabase.getDerivedConfiguration().getSearch(), nextDatabase.getDerivedConfiguration().getSearch()) - .validate(overrides, now); + .validate(); } - private List<VespaConfigChangeAction> validateDocumentTypeChanges(ValidationOverrides overrides, Instant now) { + private List<VespaConfigChangeAction> validateDocumentTypeChanges() { return new DocumentTypeChangeValidator(id, currentDocType, nextDocType) .validate(); } |