Validate once

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);
             }
         }