diff options
author | Jon Bratseth <bratseth@gmail.com> | 2022-05-15 10:11:46 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-05-15 10:11:46 +0200 |
commit | fb35d47f9dfdc0cab773b86a496e010877d72afe (patch) | |
tree | ba487520fd97d3a701ba5f07e3477290d9cdf823 | |
parent | 8cab05911e88a1f91fd39ca4b1737ff358c290c9 (diff) | |
parent | 6eed6c38bac91743f81f274ac6865fbff68a7d33 (diff) |
Merge pull request #22607 from vespa-engine/bratseth/validate-once
Validate once
-rw-r--r-- | config-model/src/main/java/com/yahoo/searchdefinition/RankProfile.java | 3 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/application/validation/ConstantValidator.java | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/RankProfile.java b/config-model/src/main/java/com/yahoo/searchdefinition/RankProfile.java index 95e022fca9e..fd7e7e57f00 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/RankProfile.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/RankProfile.java @@ -430,6 +430,9 @@ public class RankProfile implements Cloneable { return allConstants; } + /** Returns an unmodifiable view of the constants declared in this */ + public Map<Reference, Constant> declaredConstants() { return Collections.unmodifiableMap(constants); } + public void addAttributeType(String attributeName, String attributeType) { attributeTypes.addType(attributeName, attributeType); } diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/ConstantValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/ConstantValidator.java index a0fb7078b13..b033d7a1e3b 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/ConstantValidator.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/ConstantValidator.java @@ -28,7 +28,7 @@ public class ConstantValidator extends Validator { for (var constant : schema.constants().values()) validate(constant, deployState.getApplicationPackage(), exceptionMessageCollector); for (var profile : deployState.rankProfileRegistry().rankProfilesOf(schema)) { - for (var constant : profile.constants().values()) + for (var constant : profile.declaredConstants().values()) validate(constant, deployState.getApplicationPackage(), exceptionMessageCollector); } } |