Revert "Merge pull request #15739 from vespa-engine/revert-15734-bratseth/simplify-config-take-2"

This reverts commit d1e33a9420805f5d416ca55ed79497fd28f20216, reversing
changes made to 10464c859ccca2596e2b841612f8ea958330e4dc.

2 files changed, 4 insertions, 5 deletions

diff --git a/container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java b/container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java
index af163e88fee..ac632f5acce 100644
--- a/container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java
+++ b/container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java
@@ -74,7 +74,7 @@ public class HandlersConfigurerDi {
 
         this.vespaContainer = vespaContainer;
         container = new Container(subscriberFactory, configId, deconstructor, osgiWrapper);
-        getNewComponentGraph(discInjector, false);
+        getNewComponentGraph(discInjector);
     }
 
     private static class ContainerAndDiOsgi extends OsgiImpl implements OsgiWrapper {
@@ -128,10 +128,9 @@ public class HandlersConfigurerDi {
     /**
      * Wait for new config to arrive and produce the new graph
      */
-    public void getNewComponentGraph(Injector discInjector, boolean restartOnRedeploy) {
+    public void getNewComponentGraph(Injector discInjector) {
         currentGraph = container.getNewComponentGraph(currentGraph,
-                                                      createFallbackInjector(vespaContainer, discInjector),
-                                                      restartOnRedeploy);
+                                                      createFallbackInjector(vespaContainer, discInjector));
     }
 
     private Injector createFallbackInjector(com.yahoo.container.Container vespaContainer, Injector discInjector) {
diff --git a/container-core/src/main/java/com/yahoo/container/core/config/testutil/HandlersConfigurerTestWrapper.java b/container-core/src/main/java/com/yahoo/container/core/config/testutil/HandlersConfigurerTestWrapper.java
index d98a865e1fb..42e54d3a78f 100644
--- a/container-core/src/main/java/com/yahoo/container/core/config/testutil/HandlersConfigurerTestWrapper.java
+++ b/container-core/src/main/java/com/yahoo/container/core/config/testutil/HandlersConfigurerTestWrapper.java
@@ -117,7 +117,7 @@ public class HandlersConfigurerTestWrapper {
 
     public void reloadConfig() {
         configurer.reloadConfig(++lastGeneration);
-        configurer.getNewComponentGraph(guiceInjector(), false);
+        configurer.getNewComponentGraph(guiceInjector());
     }
 
     public void shutdown() {