1 files changed, 8 insertions, 9 deletions

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 e4a07622ea3..b3802bf211b 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
@@ -4,13 +4,12 @@ package com.yahoo.vespa.model.application.validation;
 import com.yahoo.config.application.api.ApplicationFile;
 import com.yahoo.config.application.api.ApplicationPackage;
 import com.yahoo.config.model.application.provider.FilesApplicationPackage;
-import com.yahoo.config.model.deploy.DeployState;
 import com.yahoo.path.Path;
 import com.yahoo.schema.DistributableResource;
 import com.yahoo.schema.RankProfile;
 import com.yahoo.schema.Schema;
-import com.yahoo.vespa.model.VespaModel;
 import com.yahoo.vespa.model.application.validation.ConstantTensorJsonValidator.InvalidConstantTensorException;
+import com.yahoo.vespa.model.application.validation.Validation.Context;
 
 import java.io.FileNotFoundException;
 
@@ -19,22 +18,22 @@ import java.io.FileNotFoundException;
  *
  * @author Vegard Sjonfjell
  */
-public class ConstantValidator extends Validator {
+public class ConstantValidator implements Validator {
 
     @Override
-    public void validate(VespaModel model, DeployState deployState) {
+    public void validate(Context context) {
         var exceptionMessageCollector = new ExceptionMessageCollector("Invalid constant tensor file(s):");
-        for (Schema schema : deployState.getSchemas()) {
+        for (Schema schema : context.deployState().getSchemas()) {
             for (var constant : schema.declaredConstants().values())
-                validate(constant, deployState.getApplicationPackage(), exceptionMessageCollector);
-            for (var profile : deployState.rankProfileRegistry().rankProfilesOf(schema)) {
+                validate(constant, context.deployState().getApplicationPackage(), exceptionMessageCollector);
+            for (var profile : context.deployState().rankProfileRegistry().rankProfilesOf(schema)) {
                 for (var constant : profile.declaredConstants().values())
-                    validate(constant, deployState.getApplicationPackage(), exceptionMessageCollector);
+                    validate(constant, context.deployState().getApplicationPackage(), exceptionMessageCollector);
             }
         }
 
         if (exceptionMessageCollector.exceptionsOccurred)
-            throw new IllegalArgumentException(exceptionMessageCollector.combinedMessage);
+            context.illegal(exceptionMessageCollector.combinedMessage);
     }
 
     private void validate(RankProfile.Constant constant,