Revert "Bratseth/apply on restart take 10"

3 files changed, 3 insertions, 8 deletions

diff --git a/config-lib/src/main/java/com/yahoo/config/ConfigBuilder.java b/config-lib/src/main/java/com/yahoo/config/ConfigBuilder.java
index 30bef223045..e35e6916849 100644
--- a/config-lib/src/main/java/com/yahoo/config/ConfigBuilder.java
+++ b/config-lib/src/main/java/com/yahoo/config/ConfigBuilder.java
@@ -5,6 +5,7 @@ package com.yahoo.config;
  * Root interface for all config builders.
  *
  * @author gjoranv
+ * @since 5.1.6
  */
 public interface ConfigBuilder {
 }
diff --git a/config-lib/src/main/java/com/yahoo/config/ConfigInstance.java b/config-lib/src/main/java/com/yahoo/config/ConfigInstance.java
index 113e622a503..04405839a9b 100644
--- a/config-lib/src/main/java/com/yahoo/config/ConfigInstance.java
+++ b/config-lib/src/main/java/com/yahoo/config/ConfigInstance.java
@@ -17,7 +17,6 @@ public abstract class ConfigInstance extends InnerNode {
 
         /**
          * Dispatches a getConfig() call if this instance's producer is of the right type
-         *
          * @param producer a config producer
          * @return true if this instance's producer was the correct type, and hence a getConfig call was dispatched
          */
@@ -27,11 +26,6 @@ public abstract class ConfigInstance extends InnerNode {
         String getDefNamespace();
         String getDefMd5();
 
-        /** Returns true if this instance should be applied on restart, false if it should be applied immediately */
-        default boolean getApplyOnRestart() { return false; }
-
-        default void setApplyOnRestart(boolean applyOnRestart) { throw new java.lang.UnsupportedOperationException(); }
-
     }
 
     public interface Producer {}
diff --git a/config-lib/src/main/java/com/yahoo/config/Node.java b/config-lib/src/main/java/com/yahoo/config/Node.java
index ed11bdc9891..8d16b9727c1 100644
--- a/config-lib/src/main/java/com/yahoo/config/Node.java
+++ b/config-lib/src/main/java/com/yahoo/config/Node.java
@@ -5,6 +5,7 @@ package com.yahoo.config;
  * The Node class is superclass for all nodes in a {@link
  * ConfigInstance}.  Important subclasses of this node are {@link
  * InnerNode} and {@link LeafNode}.
+ *
  */
 public abstract class Node {
 
@@ -12,7 +13,7 @@ public abstract class Node {
      * Postinitialize this node. Any node needing to process its values depending on the config
      * id should override this method.
      *
-     * @param configId the configId of the ConfigInstance that owns (or is) this node
+     * @param configId  the configId of the ConfigInstance that owns (or is) this node
      */
     public void postInitialize(String configId) { return; }
 
@@ -25,5 +26,4 @@ public abstract class Node {
     protected Object clone() throws CloneNotSupportedException {
         return super.clone();
     }
-
 }