From 87fff82f9c6d2a1f15086ba4b4dbeb474206e645 Mon Sep 17 00:00:00 2001
From: Jon Bratseth <bratseth@gmail.com>
Date: Wed, 2 Dec 2020 00:26:08 +0100
Subject: Revert "Bratseth/apply on restart take 10"

---
 config-lib/abi-spec.json                                      | 4 +---
 config-lib/pom.xml                                            | 6 ------
 config-lib/src/main/java/com/yahoo/config/ConfigBuilder.java  | 1 +
 config-lib/src/main/java/com/yahoo/config/ConfigInstance.java | 6 ------
 config-lib/src/main/java/com/yahoo/config/Node.java           | 4 ++--
 5 files changed, 4 insertions(+), 17 deletions(-)

(limited to 'config-lib')

diff --git a/config-lib/abi-spec.json b/config-lib/abi-spec.json
index 8a1cfa9834e..fa352d8f6bd 100644
--- a/config-lib/abi-spec.json
+++ b/config-lib/abi-spec.json
@@ -73,9 +73,7 @@
       "public abstract boolean dispatchGetConfig(com.yahoo.config.ConfigInstance$Producer)",
       "public abstract java.lang.String getDefName()",
       "public abstract java.lang.String getDefNamespace()",
-      "public abstract java.lang.String getDefMd5()",
-      "public boolean getApplyOnRestart()",
-      "public void setApplyOnRestart(boolean)"
+      "public abstract java.lang.String getDefMd5()"
     ],
     "fields": []
   },
diff --git a/config-lib/pom.xml b/config-lib/pom.xml
index 90c61725466..1002d43bc37 100644
--- a/config-lib/pom.xml
+++ b/config-lib/pom.xml
@@ -26,12 +26,6 @@
       <artifactId>annotations</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>com.yahoo.vespa</groupId>
-      <artifactId>configgen</artifactId>
-      <version>${project.version}</version>
-      <scope>provided</scope>
-    </dependency>
   </dependencies>
   <build>
     <plugins>
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();
     }
-
 }
-- 
cgit v1.2.3