Use proper ValidationId instead of their String names in ConfigChangeAction subclasses

5 files changed, 15 insertions, 6 deletions

diff --git a/config-model-api/abi-spec.json b/config-model-api/abi-spec.json
index 9df68821454..fad69359da0 100644
--- a/config-model-api/abi-spec.json
+++ b/config-model-api/abi-spec.json
@@ -529,15 +529,14 @@
       "public static final enum com.yahoo.config.application.api.ValidationId indexModeChange",
       "public static final enum com.yahoo.config.application.api.ValidationId fieldTypeChange",
       "public static final enum com.yahoo.config.application.api.ValidationId clusterSizeReduction",
+      "public static final enum com.yahoo.config.application.api.ValidationId tensorTypeChange",
       "public static final enum com.yahoo.config.application.api.ValidationId resourcesReduction",
       "public static final enum com.yahoo.config.application.api.ValidationId contentTypeRemoval",
       "public static final enum com.yahoo.config.application.api.ValidationId contentClusterRemoval",
       "public static final enum com.yahoo.config.application.api.ValidationId deploymentRemoval",
-      "public static final enum com.yahoo.config.application.api.ValidationId skipAutomaticTenantUpgradeTests",
       "public static final enum com.yahoo.config.application.api.ValidationId globalDocumentChange",
       "public static final enum com.yahoo.config.application.api.ValidationId configModelVersionMismatch",
       "public static final enum com.yahoo.config.application.api.ValidationId skipOldConfigModels",
-      "public static final enum com.yahoo.config.application.api.ValidationId forceAutomaticTenantUpgradeTests",
       "public static final enum com.yahoo.config.application.api.ValidationId accessControl",
       "public static final enum com.yahoo.config.application.api.ValidationId globalEndpointChange"
     ]
diff --git a/config-model-api/src/main/java/com/yahoo/config/application/api/ValidationId.java b/config-model-api/src/main/java/com/yahoo/config/application/api/ValidationId.java
index c0bae137b0d..4c76d42a17e 100644
--- a/config-model-api/src/main/java/com/yahoo/config/application/api/ValidationId.java
+++ b/config-model-api/src/main/java/com/yahoo/config/application/api/ValidationId.java
@@ -14,15 +14,14 @@ public enum ValidationId {
     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
+    tensorTypeChange("tensor-type-change"), // Tensor type change
     resourcesReduction("resources-reduction"), // Large reductions in node resources
     contentTypeRemoval("content-type-removal"), // Removal of a data type (causes deletion of all data)
     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
     globalDocumentChange("global-document-change"), // Changing global attribute for document types in content clusters
     configModelVersionMismatch("config-model-version-mismatch"), // Internal use
     skipOldConfigModels("skip-old-config-models"), // Internal use
-    forceAutomaticTenantUpgradeTests("force-automatic-tenant-upgrade-test"), // Internal use
     accessControl("access-control"), // Internal use, used in zones where there should be no access-control
     globalEndpointChange("global-endpoint-change"); // Changing global endpoints
 
diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/ConfigChangeAction.java b/config-model-api/src/main/java/com/yahoo/config/model/api/ConfigChangeAction.java
index 1248560c931..aa497c47d2f 100644
--- a/config-model-api/src/main/java/com/yahoo/config/model/api/ConfigChangeAction.java
+++ b/config-model-api/src/main/java/com/yahoo/config/model/api/ConfigChangeAction.java
@@ -1,6 +1,7 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.config.model.api;
 
+import com.yahoo.config.application.api.ValidationId;
 import com.yahoo.config.provision.ClusterSpec;
 
 import java.util.List;
diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/ConfigChangeRefeedAction.java b/config-model-api/src/main/java/com/yahoo/config/model/api/ConfigChangeRefeedAction.java
index c5a7bd030e2..470031ba499 100644
--- a/config-model-api/src/main/java/com/yahoo/config/model/api/ConfigChangeRefeedAction.java
+++ b/config-model-api/src/main/java/com/yahoo/config/model/api/ConfigChangeRefeedAction.java
@@ -1,6 +1,8 @@
 // Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.config.model.api;
 
+import com.yahoo.config.application.api.ValidationId;
+
 /**
  * Represents an action to re-feed a document type in order to handle a config change.
  *
@@ -11,8 +13,11 @@ public interface ConfigChangeRefeedAction extends ConfigChangeAction {
     @Override
     default Type getType() { return Type.REFEED; }
 
+    /** Returns the validation ID used to allow deployment when this action is required. */
+    ValidationId validationId();
+
     /** Returns the name identifying this kind of change, used to identify names which should be allowed */
-    String name();
+    default String name() { return validationId().value(); }
 
     /** Returns the name of the document type that one must re-feed to handle this config change */
     String getDocumentType();
diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/ConfigChangeReindexAction.java b/config-model-api/src/main/java/com/yahoo/config/model/api/ConfigChangeReindexAction.java
index 085638e31ff..9820890672b 100644
--- a/config-model-api/src/main/java/com/yahoo/config/model/api/ConfigChangeReindexAction.java
+++ b/config-model-api/src/main/java/com/yahoo/config/model/api/ConfigChangeReindexAction.java
@@ -1,6 +1,8 @@
 // Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.config.model.api;
 
+import com.yahoo.config.application.api.ValidationId;
+
 /**
  * Represents an action to re-index a document type in order to handle a config change.
  *
@@ -10,8 +12,11 @@ public interface ConfigChangeReindexAction extends ConfigChangeAction {
 
     @Override default Type getType() { return Type.REINDEX; }
 
+    /** Returns the validation ID used to allow deployment when this action is required. */
+    ValidationId validationId();
+
     /** @return name identifying this kind of change, used to identify names which should be allowed */
-    String name();
+    default String name() { return validationId().value(); }
 
     /** @return name of the document type that must be re-indexed */
     String getDocumentType();