Remove "allowed" from config change actions (+ wiring) — allowed if not thrown

13 files changed, 56 insertions, 78 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java b/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java
index b53447a1fd2..6cc05a0f69e 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java
@@ -1009,21 +1009,19 @@ public class ApplicationRepository implements com.yahoo.config.provision.Deploye
         RestartActions restartActions = actions.getRestartActions();
         if ( ! restartActions.isEmpty()) {
             logger.log(Level.WARNING, "Change(s) between active and new application that require restart:\n" +
-                    restartActions.format());
+                                      restartActions.format());
         }
         RefeedActions refeedActions = actions.getRefeedActions();
         if ( ! refeedActions.isEmpty()) {
-            boolean allAllowed = refeedActions.getEntries().stream().allMatch(RefeedActions.Entry::allowed);
-            logger.log(allAllowed ? Level.INFO : Level.WARNING,
+            logger.log(Level.WARNING,
                        "Change(s) between active and new application that may require re-feed:\n" +
-                               refeedActions.format());
+                       refeedActions.format());
         }
         ReindexActions reindexActions = actions.getReindexActions();
         if ( ! reindexActions.isEmpty()) {
-            boolean allAllowed = reindexActions.getEntries().stream().allMatch(ReindexActions.Entry::allowed);
-            logger.log(allAllowed ? Level.INFO : Level.WARNING,
-                    "Change(s) between active and new application that may require re-index:\n" +
-                            reindexActions.format());
+            logger.log(Level.WARNING,
+                       "Change(s) between active and new application that may require re-index:\n" +
+                       reindexActions.format());
         }
     }
 
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/configchange/ConfigChangeActionsSlimeConverter.java b/configserver/src/main/java/com/yahoo/vespa/config/server/configchange/ConfigChangeActionsSlimeConverter.java
index ec48b671a5b..1a0d109b6c9 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/configchange/ConfigChangeActionsSlimeConverter.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/configchange/ConfigChangeActionsSlimeConverter.java
@@ -42,7 +42,6 @@ public class ConfigChangeActionsSlimeConverter {
         for (RefeedActions.Entry entry : actions.getRefeedActions().getEntries()) {
             Cursor entryCursor = refeedCursor.addObject();
             entryCursor.setString("name", entry.name());
-            entryCursor.setBool("allowed", entry.allowed());
             entryCursor.setString("documentType", entry.getDocumentType());
             entryCursor.setString("clusterName", entry.getClusterName());
             messagesToSlime(entryCursor, entry.getMessages());
@@ -55,7 +54,6 @@ public class ConfigChangeActionsSlimeConverter {
         for (ReindexActions.Entry entry : actions.getReindexActions().getEntries()) {
             Cursor entryCursor = refeedCursor.addObject();
             entryCursor.setString("name", entry.name());
-            entryCursor.setBool("allowed", entry.allowed());
             entryCursor.setString("documentType", entry.getDocumentType());
             entryCursor.setString("clusterName", entry.getClusterName());
             messagesToSlime(entryCursor, entry.getMessages());
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/configchange/RefeedActions.java b/configserver/src/main/java/com/yahoo/vespa/config/server/configchange/RefeedActions.java
index c20b8527f2e..b2221cbcf6c 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/configchange/RefeedActions.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/configchange/RefeedActions.java
@@ -5,7 +5,13 @@ import com.yahoo.config.model.api.ConfigChangeAction;
 import com.yahoo.config.model.api.ConfigChangeRefeedAction;
 import com.yahoo.config.model.api.ServiceInfo;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeMap;
+import java.util.TreeSet;
 
 /**
  * Represents all actions to re-feed document types in order to handle config changes.
@@ -17,15 +23,13 @@ public class RefeedActions {
     public static class Entry {
 
         private final String name;
-        private final boolean allowed;
         private final String documentType;
         private final String clusterName;
         private final Set<ServiceInfo> services = new LinkedHashSet<>();
         private final Set<String> messages = new TreeSet<>();
 
-        private Entry(String name, boolean allowed, String documentType, String clusterName) {
+        private Entry(String name, String documentType, String clusterName) {
             this.name = name;
-            this.allowed = allowed;
             this.documentType = documentType;
             this.clusterName = clusterName;
         }
@@ -42,8 +46,6 @@ public class RefeedActions {
 
         public String name() { return name; }
 
-        public boolean allowed() { return allowed; }
-
         public String getDocumentType() { return documentType; }
 
         public String getClusterName() { return clusterName; }
@@ -54,12 +56,12 @@ public class RefeedActions {
 
     }
 
-    private Entry addEntry(String name, boolean allowed, String documentType, ServiceInfo service) {
+    private Entry addEntry(String name, String documentType, ServiceInfo service) {
         String clusterName = service.getProperty("clustername").orElse("");
-        String entryId = name + "." + allowed + "." + clusterName + "." + documentType;
+        String entryId = name + "." + "." + clusterName + "." + documentType;
         Entry entry = actions.get(entryId);
         if (entry == null) {
-            entry = new Entry(name, allowed, documentType, clusterName);
+            entry = new Entry(name, documentType, clusterName);
             actions.put(entryId, entry);
         }
         return entry;
@@ -75,7 +77,7 @@ public class RefeedActions {
             if (action.getType().equals(ConfigChangeAction.Type.REFEED)) {
                 ConfigChangeRefeedAction refeedAction = (ConfigChangeRefeedAction) action;
                 for (ServiceInfo service : refeedAction.getServices()) {
-                    addEntry(refeedAction.name(), refeedAction.allowed(), refeedAction.getDocumentType(), service).
+                    addEntry(refeedAction.name(), refeedAction.getDocumentType(), service).
                             addService(service).
                             addMessage(action.getMessage());
                 }
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/configchange/RefeedActionsFormatter.java b/configserver/src/main/java/com/yahoo/vespa/config/server/configchange/RefeedActionsFormatter.java
index 425276cebd6..6e2e23ab6be 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/configchange/RefeedActionsFormatter.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/configchange/RefeedActionsFormatter.java
@@ -18,8 +18,6 @@ public class RefeedActionsFormatter {
     public String format() {
         StringBuilder builder = new StringBuilder();
         for (RefeedActions.Entry entry : actions.getEntries()) {
-            if (entry.allowed())
-                builder.append("(allowed) ");
             builder.append(entry.name() + ": Consider removing data and re-feed document type '" + entry.getDocumentType() +
                            "' in cluster '" + entry.getClusterName() + "' because:\n");
             int counter = 1;
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/configchange/ReindexActions.java b/configserver/src/main/java/com/yahoo/vespa/config/server/configchange/ReindexActions.java
index e328f9595b7..6ed1c43623f 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/configchange/ReindexActions.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/configchange/ReindexActions.java
@@ -27,7 +27,7 @@ public class ReindexActions {
             if (action.getType().equals(ConfigChangeAction.Type.REINDEX)) {
                 ConfigChangeReindexAction reindexChange = (ConfigChangeReindexAction) action;
                 for (ServiceInfo service : reindexChange.getServices()) {
-                    addEntry(reindexChange.name(), reindexChange.allowed(), reindexChange.getDocumentType(), service).
+                    addEntry(reindexChange.name(), reindexChange.getDocumentType(), service).
                             addService(service).
                             addMessage(action.getMessage());
                 }
@@ -35,12 +35,12 @@ public class ReindexActions {
         }
     }
 
-    private Entry addEntry(String name, boolean allowed, String documentType, ServiceInfo service) {
+    private Entry addEntry(String name, String documentType, ServiceInfo service) {
         String clusterName = service.getProperty("clustername").orElse("");
-        String entryId = name + "." + allowed + "." + clusterName + "." + documentType;
+        String entryId = name + "." + "." + clusterName + "." + documentType;
         Entry entry = actions.get(entryId);
         if (entry == null) {
-            entry = new Entry(name, allowed, documentType, clusterName);
+            entry = new Entry(name, documentType, clusterName);
             actions.put(entryId, entry);
         }
         return entry;
@@ -53,15 +53,13 @@ public class ReindexActions {
     public static class Entry {
 
         private final String name;
-        private final boolean allowed;
         private final String documentType;
         private final String clusterName;
         private final Set<ServiceInfo> services = new LinkedHashSet<>();
         private final Set<String> messages = new TreeSet<>();
 
-        private Entry(String name, boolean allowed, String documentType, String clusterName) {
+        private Entry(String name, String documentType, String clusterName) {
             this.name = name;
-            this.allowed = allowed;
             this.documentType = documentType;
             this.clusterName = clusterName;
         }
@@ -77,7 +75,6 @@ public class ReindexActions {
         }
 
         public String name() { return name; }
-        public boolean allowed() { return allowed; }
         public String getDocumentType() { return documentType; }
         public String getClusterName() { return clusterName; }
         public Set<ServiceInfo> getServices() { return services; }
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/configchange/ReindexActionsFormatter.java b/configserver/src/main/java/com/yahoo/vespa/config/server/configchange/ReindexActionsFormatter.java
index e89bfd522cd..bdd01404f64 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/configchange/ReindexActionsFormatter.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/configchange/ReindexActionsFormatter.java
@@ -17,8 +17,6 @@ class ReindexActionsFormatter {
     String format() {
         StringBuilder builder = new StringBuilder();
         for (ReindexActions.Entry entry : actions.getEntries()) {
-            if (entry.allowed())
-                builder.append("(allowed) ");
             builder.append(entry.name() + ": Consider re-indexing document type '" + entry.getDocumentType() +
                            "' in cluster '" + entry.getClusterName() + "' because:\n");
             int counter = 1;
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/configchange/ConfigChangeActionsBuilder.java b/configserver/src/test/java/com/yahoo/vespa/config/server/configchange/ConfigChangeActionsBuilder.java
index 9724e92e34c..876b169742f 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/configchange/ConfigChangeActionsBuilder.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/configchange/ConfigChangeActionsBuilder.java
@@ -16,7 +16,6 @@ import java.util.List;
 
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
 
 /**
  * @author geirst
@@ -44,20 +43,16 @@ public class ConfigChangeActionsBuilder {
     }
 
 
-    ConfigChangeActionsBuilder refeed(ValidationId validationId, boolean allowed, String message, String documentType, String clusterName, String serviceName) {
+    ConfigChangeActionsBuilder refeed(ValidationId validationId, String message, String documentType, String clusterName, String serviceName) {
         actions.add(new MockRefeedAction(validationId,
-                                         allowed,
                                          message,
                                          List.of(createService(clusterName, "myclustertype", "myservicetype", serviceName)), documentType));
         return this;
     }
 
-    ConfigChangeActionsBuilder reindex(ValidationId validationId, boolean allowed, String message, String documentType, String clusterName, String serviceName) {
+    ConfigChangeActionsBuilder reindex(ValidationId validationId, String message, String documentType, String clusterName, String serviceName) {
         List<ServiceInfo> services = List.of(createService(clusterName, "myclustertype", "myservicetype", serviceName));
-        ValidationOverrides overrides = mock(ValidationOverrides.class);
-        when(overrides.allows((String) any(), any())).thenReturn(allowed);
-        when(overrides.allows((ValidationId) any(), any())).thenReturn(allowed);
-        actions.add(VespaReindexAction.of(ClusterSpec.Id.from(clusterName), validationId, overrides, message, services, documentType, Instant.now()));
+        actions.add(VespaReindexAction.of(ClusterSpec.Id.from(clusterName), validationId, message, services, documentType));
         return this;
     }
 
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/configchange/ConfigChangeActionsSlimeConverterTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/configchange/ConfigChangeActionsSlimeConverterTest.java
index 33e60a4ce39..d75f95d4c48 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/configchange/ConfigChangeActionsSlimeConverterTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/configchange/ConfigChangeActionsSlimeConverterTest.java
@@ -89,8 +89,8 @@ public class ConfigChangeActionsSlimeConverterTest {
     @Test
     public void json_representation_of_refeed_actions() throws IOException {
         ConfigChangeActions actions = new ConfigChangeActionsBuilder().
-                refeed(CHANGE_ID, true, CHANGE_MSG, DOC_TYPE, CLUSTER, SERVICE_TYPE).
-                refeed(CHANGE_ID_2, false, CHANGE_MSG, DOC_TYPE_2, CLUSTER, SERVICE_TYPE).build();
+                refeed(CHANGE_ID, CHANGE_MSG, DOC_TYPE, CLUSTER, SERVICE_TYPE).
+                refeed(CHANGE_ID_2, CHANGE_MSG, DOC_TYPE_2, CLUSTER, SERVICE_TYPE).build();
         assertEquals("{\n" +
                         " \"configChangeActions\": {\n" +
                         "  \"restart\": [\n" +
@@ -98,7 +98,6 @@ public class ConfigChangeActionsSlimeConverterTest {
                         "  \"refeed\": [\n" +
                         "   {\n" +
                         "    \"name\": \"field-type-change\",\n" +
-                        "    \"allowed\": true,\n" +
                         "    \"documentType\": \"music\",\n" +
                         "    \"clusterName\": \"foo\",\n" +
                         "    \"messages\": [\n" +
@@ -115,7 +114,6 @@ public class ConfigChangeActionsSlimeConverterTest {
                         "   },\n" +
                         "   {\n" +
                         "    \"name\": \"indexing-change\",\n" +
-                        "    \"allowed\": false,\n" +
                         "    \"documentType\": \"book\",\n" +
                         "    \"clusterName\": \"foo\",\n" +
                         "    \"messages\": [\n" +
@@ -141,7 +139,7 @@ public class ConfigChangeActionsSlimeConverterTest {
         @Test
         public void json_representation_of_reindex_actions() throws IOException {
             ConfigChangeActions actions = new ConfigChangeActionsBuilder().
-                    reindex(CHANGE_ID, true, CHANGE_MSG, DOC_TYPE, CLUSTER, SERVICE_TYPE).build();
+                    reindex(CHANGE_ID, CHANGE_MSG, DOC_TYPE, CLUSTER, SERVICE_TYPE).build();
             assertEquals(
                     "{\n" +
                             " \"configChangeActions\": {\n" +
@@ -152,7 +150,6 @@ public class ConfigChangeActionsSlimeConverterTest {
                             "  \"reindex\": [\n" +
                             "   {\n" +
                             "    \"name\": \"field-type-change\",\n" +
-                            "    \"allowed\": true,\n" +
                             "    \"documentType\": \"music\",\n" +
                             "    \"clusterName\": \"foo\",\n" +
                             "    \"messages\": [\n" +
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/configchange/MockRefeedAction.java b/configserver/src/test/java/com/yahoo/vespa/config/server/configchange/MockRefeedAction.java
index a17138d8693..615d4c86c1d 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/configchange/MockRefeedAction.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/configchange/MockRefeedAction.java
@@ -4,6 +4,7 @@ package com.yahoo.vespa.config.server.configchange;
 import com.yahoo.config.application.api.ValidationId;
 import com.yahoo.config.model.api.ConfigChangeRefeedAction;
 import com.yahoo.config.model.api.ServiceInfo;
+import com.yahoo.config.provision.ClusterSpec;
 
 import java.util.List;
 import java.util.Optional;
@@ -14,13 +15,11 @@ import java.util.Optional;
 public class MockRefeedAction extends MockConfigChangeAction implements ConfigChangeRefeedAction {
 
     private final ValidationId validationId;
-    private final boolean allowed;
     private final String documentType;
 
-    public MockRefeedAction(ValidationId validationId, boolean allowed, String message, List<ServiceInfo> services, String documentType) {
+    public MockRefeedAction(ValidationId validationId, String message, List<ServiceInfo> services, String documentType) {
         super(message, services);
         this.validationId = validationId;
-        this.allowed = allowed;
         this.documentType = documentType;
     }
 
@@ -28,7 +27,9 @@ public class MockRefeedAction extends MockConfigChangeAction implements ConfigCh
     public Optional<ValidationId> validationId() { return Optional.of(validationId); }
 
     @Override
-    public boolean allowed() { return allowed; }
+    public ClusterSpec.Id clusterId() {
+        return null;
+    }
 
     @Override
     public boolean ignoreForInternalRedeploy() {
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/configchange/RefeedActionsFormatterTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/configchange/RefeedActionsFormatterTest.java
index 246d4b88163..4b898b501ec 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/configchange/RefeedActionsFormatterTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/configchange/RefeedActionsFormatterTest.java
@@ -15,7 +15,7 @@ public class RefeedActionsFormatterTest {
     @Test
     public void formatting_of_single_action() {
         RefeedActions actions = new ConfigChangeActionsBuilder().
-                refeed(CHANGE_ID, false, CHANGE_MSG, DOC_TYPE, CLUSTER, SERVICE_NAME).
+                refeed(CHANGE_ID, CHANGE_MSG, DOC_TYPE, CLUSTER, SERVICE_NAME).
                 build().getRefeedActions();
         assertEquals("field-type-change: Consider removing data and re-feed document type 'music' in cluster 'foo' because:\n" +
                      "    1) change\n",
@@ -25,11 +25,11 @@ public class RefeedActionsFormatterTest {
     @Test
     public void formatting_of_multiple_actions() {
         RefeedActions actions = new ConfigChangeActionsBuilder().
-                refeed(CHANGE_ID,   false, CHANGE_MSG,   DOC_TYPE,   CLUSTER, SERVICE_NAME).
-                refeed(CHANGE_ID,   false, CHANGE_MSG_2, DOC_TYPE,   CLUSTER, SERVICE_NAME).
-                refeed(CHANGE_ID_2, false, CHANGE_MSG_2, DOC_TYPE,   CLUSTER, SERVICE_NAME).
-                refeed(CHANGE_ID_2, true, CHANGE_MSG_2, DOC_TYPE,   CLUSTER, SERVICE_NAME).
-                refeed(CHANGE_ID,   false, CHANGE_MSG_2, DOC_TYPE_2, CLUSTER, SERVICE_NAME).
+                refeed(CHANGE_ID, CHANGE_MSG, DOC_TYPE, CLUSTER, SERVICE_NAME).
+                refeed(CHANGE_ID, CHANGE_MSG_2, DOC_TYPE, CLUSTER, SERVICE_NAME).
+                refeed(CHANGE_ID_2, CHANGE_MSG_2, DOC_TYPE, CLUSTER, SERVICE_NAME).
+                refeed(CHANGE_ID_2, CHANGE_MSG_2, DOC_TYPE, CLUSTER, SERVICE_NAME).
+                refeed(CHANGE_ID, CHANGE_MSG_2, DOC_TYPE_2, CLUSTER, SERVICE_NAME).
                 build().getRefeedActions();
         assertEquals("field-type-change: Consider removing data and re-feed document type 'book' in cluster 'foo' because:\n" +
                      "    1) other change\n" +
@@ -37,8 +37,6 @@ public class RefeedActionsFormatterTest {
                      "    1) change\n" +
                      "    2) other change\n" +
                      "indexing-change: Consider removing data and re-feed document type 'music' in cluster 'foo' because:\n" +
-                     "    1) other change\n" +
-                     "(allowed) indexing-change: Consider removing data and re-feed document type 'music' in cluster 'foo' because:\n" +
                      "    1) other change\n",
                 new RefeedActionsFormatter(actions).format());
     }
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/configchange/RefeedActionsTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/configchange/RefeedActionsTest.java
index befb2c06106..24e81dc3f99 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/configchange/RefeedActionsTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/configchange/RefeedActionsTest.java
@@ -33,8 +33,8 @@ public class RefeedActionsTest {
     @Test
     public void action_with_multiple_reasons() {
         List<RefeedActions.Entry> entries = new ConfigChangeActionsBuilder().
-                refeed(ValidationId.indexModeChange, false, CHANGE_MSG, DOC_TYPE, CLUSTER, SERVICE_NAME).
-                refeed(ValidationId.indexModeChange, false, CHANGE_MSG_2, DOC_TYPE, CLUSTER, SERVICE_NAME).
+                refeed(ValidationId.indexModeChange, CHANGE_MSG, DOC_TYPE, CLUSTER, SERVICE_NAME).
+                refeed(ValidationId.indexModeChange, CHANGE_MSG_2, DOC_TYPE, CLUSTER, SERVICE_NAME).
                 build().getRefeedActions().getEntries();
         assertThat(entries.size(), is(1));
         assertThat(toString(entries.get(0)), equalTo("music.foo:[baz][change,other change]"));
@@ -43,8 +43,8 @@ public class RefeedActionsTest {
     @Test
     public void actions_with_multiple_services() {
         List<RefeedActions.Entry> entries = new ConfigChangeActionsBuilder().
-                refeed(ValidationId.indexModeChange, false, CHANGE_MSG, DOC_TYPE, CLUSTER, SERVICE_NAME).
-                refeed(ValidationId.indexModeChange, false, CHANGE_MSG, DOC_TYPE, CLUSTER, SERVICE_NAME_2).
+                refeed(ValidationId.indexModeChange, CHANGE_MSG, DOC_TYPE, CLUSTER, SERVICE_NAME).
+                refeed(ValidationId.indexModeChange, CHANGE_MSG, DOC_TYPE, CLUSTER, SERVICE_NAME_2).
                 build().getRefeedActions().getEntries();
         assertThat(entries.size(), is(1));
         assertThat(toString(entries.get(0)), equalTo("music.foo:[baz,qux][change]"));
@@ -53,8 +53,8 @@ public class RefeedActionsTest {
     @Test
     public void actions_with_multiple_document_types() {
         List<RefeedActions.Entry> entries = new ConfigChangeActionsBuilder().
-                refeed(ValidationId.indexModeChange, false, CHANGE_MSG, DOC_TYPE, CLUSTER, SERVICE_NAME).
-                refeed(ValidationId.indexModeChange, false, CHANGE_MSG, DOC_TYPE_2, CLUSTER, SERVICE_NAME).
+                refeed(ValidationId.indexModeChange, CHANGE_MSG, DOC_TYPE, CLUSTER, SERVICE_NAME).
+                refeed(ValidationId.indexModeChange, CHANGE_MSG, DOC_TYPE_2, CLUSTER, SERVICE_NAME).
                 build().getRefeedActions().getEntries();
         assertThat(entries.size(), is(2));
         assertThat(toString(entries.get(0)), equalTo("book.foo:[baz][change]"));
@@ -64,8 +64,8 @@ public class RefeedActionsTest {
     @Test
     public void actions_with_multiple_clusters() {
         List<RefeedActions.Entry> entries = new ConfigChangeActionsBuilder().
-                refeed(ValidationId.indexModeChange, false, CHANGE_MSG, DOC_TYPE, CLUSTER, SERVICE_NAME).
-                refeed(ValidationId.indexModeChange, false, CHANGE_MSG, DOC_TYPE, CLUSTER_2, SERVICE_NAME).
+                refeed(ValidationId.indexModeChange, CHANGE_MSG, DOC_TYPE, CLUSTER, SERVICE_NAME).
+                refeed(ValidationId.indexModeChange, CHANGE_MSG, DOC_TYPE, CLUSTER_2, SERVICE_NAME).
                 build().getRefeedActions().getEntries();
         assertThat(entries.size(), is(2));
         assertThat(toString(entries.get(0)), equalTo("music.bar:[baz][change]"));
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/configchange/ReindexActionsFormatterTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/configchange/ReindexActionsFormatterTest.java
index 6650b9c523d..b07d002a431 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/configchange/ReindexActionsFormatterTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/configchange/ReindexActionsFormatterTest.java
@@ -21,7 +21,7 @@ public class ReindexActionsFormatterTest {
     @Test
     public void formatting_of_single_action() {
         ReindexActions actions = new ConfigChangeActionsBuilder().
-                reindex(CHANGE_ID, false, CHANGE_MSG, DOC_TYPE, CLUSTER, SERVICE_NAME).
+                reindex(CHANGE_ID, CHANGE_MSG, DOC_TYPE, CLUSTER, SERVICE_NAME).
                 build().getReindexActions();
         assertEquals("field-type-change: Consider re-indexing document type 'music' in cluster 'foo' because:\n" +
                         "    1) change\n",
@@ -31,11 +31,11 @@ public class ReindexActionsFormatterTest {
     @Test
     public void formatting_of_multiple_actions() {
         ReindexActions actions = new ConfigChangeActionsBuilder().
-                reindex(CHANGE_ID,   false, CHANGE_MSG,   DOC_TYPE,   CLUSTER, SERVICE_NAME).
-                reindex(CHANGE_ID,   false, CHANGE_MSG_2, DOC_TYPE,   CLUSTER, SERVICE_NAME).
-                reindex(CHANGE_ID_2, false, CHANGE_MSG_2, DOC_TYPE,   CLUSTER, SERVICE_NAME).
-                reindex(CHANGE_ID_2, true, CHANGE_MSG_2, DOC_TYPE,   CLUSTER, SERVICE_NAME).
-                reindex(CHANGE_ID,   false, CHANGE_MSG_2, DOC_TYPE_2, CLUSTER, SERVICE_NAME).
+                reindex(CHANGE_ID, CHANGE_MSG, DOC_TYPE, CLUSTER, SERVICE_NAME).
+                reindex(CHANGE_ID, CHANGE_MSG_2, DOC_TYPE, CLUSTER, SERVICE_NAME).
+                reindex(CHANGE_ID_2, CHANGE_MSG_2, DOC_TYPE, CLUSTER, SERVICE_NAME).
+                reindex(CHANGE_ID_2, CHANGE_MSG_2, DOC_TYPE, CLUSTER, SERVICE_NAME).
+                reindex(CHANGE_ID, CHANGE_MSG_2, DOC_TYPE_2, CLUSTER, SERVICE_NAME).
                 build().getReindexActions();
         assertEquals("field-type-change: Consider re-indexing document type 'book' in cluster 'foo' because:\n" +
                         "    1) other change\n" +
@@ -43,8 +43,6 @@ public class ReindexActionsFormatterTest {
                         "    1) change\n" +
                         "    2) other change\n" +
                         "indexing-change: Consider re-indexing document type 'music' in cluster 'foo' because:\n" +
-                        "    1) other change\n" +
-                        "(allowed) indexing-change: Consider re-indexing document type 'music' in cluster 'foo' because:\n" +
                         "    1) other change\n",
                 new ReindexActionsFormatter(actions).format());
     }
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/HostedDeployTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/HostedDeployTest.java
index f7d1b37dcc5..341fa7109da 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/HostedDeployTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/HostedDeployTest.java
@@ -4,7 +4,6 @@ package com.yahoo.vespa.config.server.deploy;
 import com.yahoo.cloud.config.ConfigserverConfig;
 import com.yahoo.component.Version;
 import com.yahoo.config.application.api.ValidationId;
-import com.yahoo.config.application.api.ValidationOverrides;
 import com.yahoo.config.model.api.ConfigChangeAction;
 import com.yahoo.config.model.api.ModelContext;
 import com.yahoo.config.model.api.ModelCreateResult;
@@ -27,7 +26,6 @@ import com.yahoo.vespa.config.server.http.InvalidApplicationException;
 import com.yahoo.vespa.config.server.http.v2.PrepareResult;
 import com.yahoo.vespa.config.server.model.TestModelFactory;
 import com.yahoo.vespa.config.server.session.PrepareParams;
-import com.yahoo.vespa.config.server.session.Session;
 import com.yahoo.vespa.model.application.validation.change.VespaReindexAction;
 import com.yahoo.vespa.model.application.validation.change.VespaRestartAction;
 import org.junit.Rule;
@@ -404,8 +402,8 @@ public class HostedDeployTest {
         ManualClock clock = new ManualClock(Instant.EPOCH);
         List<ModelFactory> modelFactories = List.of(
                 new ConfigChangeActionsModelFactory(Version.fromString("6.1.0"),
-                                                    VespaReindexAction.of(ClusterSpec.Id.from("test"), ValidationId.indexModeChange, ValidationOverrides.all,
-                                                                          "reindex please", services, "music", clock.instant()),
+                                                    VespaReindexAction.of(ClusterSpec.Id.from("test"), ValidationId.indexModeChange,
+                                                                          "reindex please", services, "music"),
                                                     new VespaRestartAction(ClusterSpec.Id.from("test"), "change", services)));
 
         DeployTester tester = createTester(hosts, modelFactories, prodZone, clock);