diff options
author | Jon Bratseth <bratseth@oath.com> | 2018-02-26 16:41:25 +0100 |
---|---|---|
committer | Jon Bratseth <bratseth@oath.com> | 2018-02-26 16:41:25 +0100 |
commit | 174745d431c59bfd7d8077b817dc38090010fd35 (patch) | |
tree | 135c22a0f22cbdbdcf0b48bf8b9ea2c4c80d7eca /config-model/src/main/java/com/yahoo/searchdefinition/processing/ValidateFieldWithIndexSettingsCreatesIndex.java | |
parent | 446dc287bf35768b73e1390df07a9462ae9db800 (diff) |
Don't validate when reloading models
Diffstat (limited to 'config-model/src/main/java/com/yahoo/searchdefinition/processing/ValidateFieldWithIndexSettingsCreatesIndex.java')
-rw-r--r-- | config-model/src/main/java/com/yahoo/searchdefinition/processing/ValidateFieldWithIndexSettingsCreatesIndex.java | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/ValidateFieldWithIndexSettingsCreatesIndex.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/ValidateFieldWithIndexSettingsCreatesIndex.java index bc7d7195eb5..a0b204a25f2 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/ValidateFieldWithIndexSettingsCreatesIndex.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/ValidateFieldWithIndexSettingsCreatesIndex.java @@ -21,22 +21,22 @@ public class ValidateFieldWithIndexSettingsCreatesIndex extends Processor { } @Override - public void process() { + public void process(boolean validate) { + if ( ! validate) return; + Matching defaultMatching = new Matching(); Ranking defaultRanking = new Ranking(); for (SDField field : search.allConcreteFields()) { - if (field.doesIndexing()) { - continue; - } - if (field.doesAttributing()) { - continue; - } - if (!(field.getRanking().equals(defaultRanking))) { - fail(search, field, "Fields which are not creating an index or attribute can not contain rank settings."); - } - if (!(field.getMatching().equals(defaultMatching))) { - fail(search, field, "Fields which are not creating an index or attribute can not contain match settings."); - } + if (field.doesIndexing()) continue; + if (field.doesAttributing()) continue; + + if ( ! field.getRanking().equals(defaultRanking)) + fail(search, field, + "Fields which are not creating an index or attribute can not contain rank settings."); + if ( ! field.getMatching().equals(defaultMatching)) + fail(search, field, + "Fields which are not creating an index or attribute can not contain match settings."); } } + } |