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

2 files changed, 1 insertions, 10 deletions

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 70a54918216..87a150a6c3c 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
@@ -39,16 +39,11 @@ public interface ConfigChangeAction {
     /** Returns the list of services where the action must be performed */
     List<ServiceInfo> getServices();
 
-    /** Returns whether this change should be allowed. */
-    // TODO jonmv: remove in 2021.
-    boolean allowed();
-
     /** When this is non-empty, validation may fail unless this validation id is allowed by validation overrides. */
     default Optional<ValidationId> validationId() { return Optional.empty(); }
 
     /** The id of the cluster that needs this action applied */
-    // TODO: Remove this default implementation after October 2020
-    default ClusterSpec.Id clusterId() { return null; }
+    ClusterSpec.Id clusterId();
 
     /** Returns whether this change should be ignored for internal redeploy */
     default boolean ignoreForInternalRedeploy() {
diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/ConfigChangeRestartAction.java b/config-model-api/src/main/java/com/yahoo/config/model/api/ConfigChangeRestartAction.java
index f178180b6e0..c13399a42f5 100644
--- a/config-model-api/src/main/java/com/yahoo/config/model/api/ConfigChangeRestartAction.java
+++ b/config-model-api/src/main/java/com/yahoo/config/model/api/ConfigChangeRestartAction.java
@@ -11,8 +11,4 @@ public interface ConfigChangeRestartAction extends ConfigChangeAction {
     @Override
     default Type getType() { return Type.RESTART; }
 
-    /** Restarts are handled automatically so they are allowed */
-    @Override
-    default boolean allowed() { return true; }
-
 }