1 files changed, 8 insertions, 6 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/RoutingSelectorValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/RoutingSelectorValidator.java
index bd933f1c656..d2a26d87899 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/RoutingSelectorValidator.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/RoutingSelectorValidator.java
@@ -1,20 +1,21 @@
 // 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.config.model.deploy.DeployState;
 import com.yahoo.document.select.DocumentSelector;
-import com.yahoo.vespa.model.application.validation.Validation.Context;
-import com.yahoo.vespa.model.search.IndexedSearchCluster;
+import com.yahoo.vespa.model.VespaModel;
 import com.yahoo.vespa.model.search.SearchCluster;
+import com.yahoo.vespa.model.search.IndexedSearchCluster;
 
 
 /**
  * Validates routing selector for search and content clusters
  */
-public class RoutingSelectorValidator implements Validator {
+public class RoutingSelectorValidator extends Validator {
 
     @Override
-    public void validate(Context context) {
-        for (SearchCluster cluster : context.model().getSearchClusters()) {
+    public void validate(VespaModel model, DeployState deployState) {
+        for (SearchCluster cluster : model.getSearchClusters()) {
             if (cluster instanceof IndexedSearchCluster) {
                 IndexedSearchCluster sc = (IndexedSearchCluster) cluster;
                 String routingSelector = sc.getRoutingSelector();
@@ -22,7 +23,8 @@ public class RoutingSelectorValidator implements Validator {
                 try {
                     new DocumentSelector(routingSelector);
                 } catch (com.yahoo.document.select.parser.ParseException e) {
-                    context.illegal("Failed to parse routing selector for search cluster '" + sc.getClusterName() + "'", e);
+                    throw new IllegalArgumentException("Failed to parse routing selector for search cluster '" +
+                                                       sc.getClusterName() + "'", e);
                 }
             }
         }