1 files changed, 8 insertions, 14 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/ContentTypeRemovalValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/ContentTypeRemovalValidator.java
index fec08f90b1e..34e5a4b42a5 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/ContentTypeRemovalValidator.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/ContentTypeRemovalValidator.java
@@ -2,14 +2,10 @@
 package com.yahoo.vespa.model.application.validation.change;
 
 import com.yahoo.config.application.api.ValidationId;
-import com.yahoo.config.model.api.ConfigChangeAction;
-import com.yahoo.config.model.deploy.DeployState;
 import com.yahoo.documentmodel.NewDocumentType;
-import com.yahoo.vespa.model.VespaModel;
+import com.yahoo.vespa.model.application.validation.Validation.ChangeContext;
 import com.yahoo.vespa.model.content.cluster.ContentCluster;
 
-import java.util.List;
-
 /**
  * Checks that this does not remove a data type in a cluster, as that causes deletion
  * of all data of that type.
@@ -19,22 +15,20 @@ import java.util.List;
 public class ContentTypeRemovalValidator implements ChangeValidator {
 
     @Override
-    public List<ConfigChangeAction> validate(VespaModel current, VespaModel next, DeployState deployState) {
-        for (ContentCluster currentCluster : current.getContentClusters().values()) {
-            ContentCluster nextCluster = next.getContentClusters().get(currentCluster.getSubId());
+    public void validate(ChangeContext context) {
+        for (ContentCluster currentCluster : context.previousModel().getContentClusters().values()) {
+            ContentCluster nextCluster = context.model().getContentClusters().get(currentCluster.getSubId());
             if (nextCluster == null) continue; // validated elsewhere
 
             for (NewDocumentType type : currentCluster.getDocumentDefinitions().values()) {
                 if ( ! nextCluster.getDocumentDefinitions().containsKey(type.getName())) {
-                    deployState.validationOverrides().invalid(ValidationId.contentTypeRemoval,
-                                      "Schema '" + type.getName() + "' is removed " +
-                                      "in content cluster '" + currentCluster.getName() + "'. " +
-                                      "This will cause loss of all data in this schema",
-                                      deployState.now());
+                    context.invalid(ValidationId.contentTypeRemoval,
+                                    "Schema '" + type.getName() + "' is removed " +
+                                    "in content cluster '" + currentCluster.getName() + "'. " +
+                                    "This will cause loss of all data in this schema");
                 }
             }
         }
-        return List.of();
     }
 
 }