Revert "Merge pull request #15690 from vespa-engine/revert-15686-bratseth/simplify-config"

This reverts commit a90709008ec0d108ee9a2e26bda20e39a10424b5, reversing
changes made to fcb2b4a2fd7a594520613c48d58e26963c68ea90.

1 files changed, 1 insertions, 12 deletions

diff --git a/config/src/main/java/com/yahoo/config/subscription/impl/GenericJRTConfigSubscription.java b/config/src/main/java/com/yahoo/config/subscription/impl/GenericJRTConfigSubscription.java
index ba8fc8a5e19..b052c79f429 100644
--- a/config/src/main/java/com/yahoo/config/subscription/impl/GenericJRTConfigSubscription.java
+++ b/config/src/main/java/com/yahoo/config/subscription/impl/GenericJRTConfigSubscription.java
@@ -32,7 +32,7 @@ public class GenericJRTConfigSubscription extends JRTConfigSubscription<RawConfi
 
     @Override
     protected void setNewConfig(JRTClientConfigRequest jrtReq) {
-        setConfig(jrtReq.getNewGeneration(), jrtReq.responseIsInternalRedeploy(), jrtReq.responseIsApplyOnRestart(), RawConfig.createFromResponseParameters(jrtReq) );
+        setConfig(jrtReq.getNewGeneration(), jrtReq.responseIsApplyOnRestart(), RawConfig.createFromResponseParameters(jrtReq) );
         log.log(FINE, () -> "in setNewConfig, config=" + this.getConfigState().getConfig());
     }
 
@@ -50,17 +50,6 @@ public class GenericJRTConfigSubscription extends JRTConfigSubscription<RawConfi
 
     // Override to propagate internal redeploy into the config value in addition to the config state
     @Override
-    void setInternalRedeploy(boolean internalRedeploy) {
-        super.setInternalRedeploy(internalRedeploy);
-        ConfigState<RawConfig> configState = getConfigState();
-
-        if (configState.getConfig() != null) {
-            configState.getConfig().setInternalRedeploy(internalRedeploy);
-        }
-    }
-
-    // Override to propagate internal redeploy into the config value in addition to the config state
-    @Override
     void setApplyOnRestart(boolean applyOnRestart) {
         super.setApplyOnRestart(applyOnRestart);
         ConfigState<RawConfig> configState = getConfigState();