1 files changed, 8 insertions, 7 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/AccessControlFilterValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/AccessControlFilterValidator.java
index cd6212051cf..8ea0155dd04 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/AccessControlFilterValidator.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/AccessControlFilterValidator.java
@@ -1,7 +1,8 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.model.application.validation;
 
-import com.yahoo.vespa.model.application.validation.Validation.Context;
+import com.yahoo.config.model.deploy.DeployState;
+import com.yahoo.vespa.model.VespaModel;
 import com.yahoo.vespa.model.container.component.chain.Chain;
 import com.yahoo.vespa.model.container.http.AccessControl;
 import com.yahoo.vespa.model.container.http.Filter;
@@ -13,26 +14,26 @@ import com.yahoo.vespa.model.container.http.Http;
  *
  * @author bjorncs
  */
-public class AccessControlFilterValidator implements Validator {
+public class AccessControlFilterValidator extends Validator {
 
     @Override
-    public void validate(Context context) {
-        context.model().getContainerClusters().forEach((id, cluster) -> {
+    public void validate(VespaModel model, DeployState deployState) {
+        model.getContainerClusters().forEach((id, cluster) -> {
             Http http = cluster.getHttp();
             if (http != null) {
                 if (http.getAccessControl().isPresent()) {
-                    verifyAccessControlFilterPresent(context, http);
+                    verifyAccessControlFilterPresent(http);
                 }
             }
         });
     }
 
-    private static void verifyAccessControlFilterPresent(Context context, Http http) {
+    private static void verifyAccessControlFilterPresent(Http http) {
         FilterChains filterChains = http.getFilterChains();
         Chain<Filter> chain = filterChains.allChains().getComponent(AccessControl.ACCESS_CONTROL_CHAIN_ID);
         if (chain.getInnerComponents().isEmpty()) {
             // No access control filter configured - it's up to a config model plugin to provide an implementation of an access control filter.
-            context.illegal("The 'access-control' feature is not available in open-source Vespa.");
+            throw new IllegalArgumentException("The 'access-control' feature is not available in open-source Vespa.");
         }
     }
 }