Add deployment-removal validation id

3 files changed, 15 insertions, 12 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/ValidationId.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/ValidationId.java
index f3a8c0570a5..8f9b0081db1 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/ValidationId.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/ValidationId.java
@@ -10,15 +10,16 @@ import java.util.Optional;
  */
 public enum ValidationId {
 
-    indexingChange("indexing-change"),
-    indexModeChange("indexing-mode-change"),
-    fieldTypeChange("field-type-change"),
-    clusterSizeReduction("cluster-size-reduction"),
-    contentClusterRemoval("content-cluster-removal"),
-    configModelVersionMismatch("config-model-version-mismatch"),
-    skipOldConfigModels("skip-old-config-models"),
-    skipAutomaticTenantUpgradeTests("skip-automatic-tenant-upgrade-test"),
-    forceAutomaticTenantUpgradeTests("force-automatic-tenant-upgrade-test");
+    indexingChange("indexing-change"), // Changing what tokens are expected and stored in field indexes
+    indexModeChange("indexing-mode-change"), // Changing the index mode (streaming, indexed, store-only) of documents 
+    fieldTypeChange("field-type-change"), // Field type changes
+    clusterSizeReduction("cluster-size-reduction"), // Large reductions in cluster size
+    contentClusterRemoval("content-cluster-removal"), // Removal (or id change) of content clusters
+    deploymentRemoval("deployment-removal"), // Removal of production zones from deployment.xml
+    skipAutomaticTenantUpgradeTests("skip-automatic-tenant-upgrade-test"), // Skip platform supplied staging tests
+    configModelVersionMismatch("config-model-version-mismatch"), // Internal use
+    skipOldConfigModels("skip-old-config-models"), // Internal use
+    forceAutomaticTenantUpgradeTests("force-automatic-tenant-upgrade-test"); // Internal use
 
     private final String id;
 
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/IndexingModeChangeValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/IndexingModeChangeValidator.java
index 8972d69b7fa..e876630a401 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/IndexingModeChangeValidator.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/IndexingModeChangeValidator.java
@@ -3,6 +3,7 @@ package com.yahoo.vespa.model.application.validation.change;
 
 import com.yahoo.config.model.api.ConfigChangeAction;
 import com.yahoo.vespa.model.VespaModel;
+import com.yahoo.vespa.model.application.validation.ValidationId;
 import com.yahoo.vespa.model.application.validation.ValidationOverrides;
 import com.yahoo.vespa.model.application.validation.change.ChangeValidator;
 import com.yahoo.vespa.model.application.validation.change.VespaRefeedAction;
@@ -41,7 +42,7 @@ public class IndexingModeChangeValidator implements ChangeValidator {
 
         if (currentClusterIsIndexed == nextClusterIsIndexed) return Optional.empty();
 
-        return Optional.of(VespaRefeedAction.of("indexing-mode-change",
+        return Optional.of(VespaRefeedAction.of(ValidationId.indexModeChange.value(),
                                                 overrides,
                                                 "Cluster '" + currentCluster.getName() + "' changed indexing mode from '" +
                                                 indexingMode(currentClusterIsIndexed) + "' to '" + indexingMode(nextClusterIsIndexed) + "'"));
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/search/IndexingScriptChangeValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/search/IndexingScriptChangeValidator.java
index 724b64503bf..cb3f0d40742 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/search/IndexingScriptChangeValidator.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/search/IndexingScriptChangeValidator.java
@@ -7,6 +7,7 @@ import com.yahoo.vespa.indexinglanguage.ExpressionConverter;
 import com.yahoo.vespa.indexinglanguage.expressions.Expression;
 import com.yahoo.vespa.indexinglanguage.expressions.OutputExpression;
 import com.yahoo.vespa.indexinglanguage.expressions.ScriptExpression;
+import com.yahoo.vespa.model.application.validation.ValidationId;
 import com.yahoo.vespa.model.application.validation.ValidationOverrides;
 import com.yahoo.vespa.model.application.validation.change.VespaConfigChangeAction;
 import com.yahoo.vespa.model.application.validation.change.VespaRefeedAction;
@@ -47,11 +48,11 @@ public class IndexingScriptChangeValidator {
                                                               ValidationOverrides overrides) {
         ScriptExpression currentScript = currentField.getIndexingScript();
         ScriptExpression nextScript = nextField.getIndexingScript();
-        if (!equalScripts(currentScript, nextScript)) {
+        if ( ! equalScripts(currentScript, nextScript)) {
             ChangeMessageBuilder messageBuilder = new ChangeMessageBuilder(nextField.getName());
             new IndexingScriptChangeMessageBuilder(currentSearch, currentField, nextSearch, nextField).populate(messageBuilder);
             messageBuilder.addChange("indexing script", currentScript.toString(), nextScript.toString());
-            return Optional.of(VespaRefeedAction.of("indexing-change", overrides, messageBuilder.build()));
+            return Optional.of(VespaRefeedAction.of(ValidationId.indexingChange.value(), overrides, messageBuilder.build()));
         }
         return Optional.empty();
     }