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

5 files changed, 17 insertions, 24 deletions

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;