From ddac99566ca559b720304299351ec4032e73e736 Mon Sep 17 00:00:00 2001
From: Jon Bratseth <bratseth@gmail.com>
Date: Mon, 7 Dec 2020 09:55:42 +0100
Subject: Revert "Merge pull request #15690 from
 vespa-engine/revert-15686-bratseth/simplify-config"

This reverts commit a90709008ec0d108ee9a2e26bda20e39a10424b5, reversing
changes made to fcb2b4a2fd7a594520613c48d58e26963c68ea90.
---
 .../yahoo/container/di/ConfigRetrieverTest.java    | 24 ++++------------------
 .../java/com/yahoo/container/di/ContainerTest.java |  4 ++--
 .../com/yahoo/container/di/ContainerTestBase.java  |  2 +-
 3 files changed, 7 insertions(+), 23 deletions(-)

(limited to 'container-di/src/test')

diff --git a/container-di/src/test/java/com/yahoo/container/di/ConfigRetrieverTest.java b/container-di/src/test/java/com/yahoo/container/di/ConfigRetrieverTest.java
index e6b0309981a..4751b9b74b7 100644
--- a/container-di/src/test/java/com/yahoo/container/di/ConfigRetrieverTest.java
+++ b/container-di/src/test/java/com/yahoo/container/di/ConfigRetrieverTest.java
@@ -51,7 +51,7 @@ public class ConfigRetrieverTest {
     public void require_that_bootstrap_configs_come_first() {
         writeConfigs();
         ConfigRetriever retriever = createConfigRetriever();
-        ConfigSnapshot bootstrapConfigs = retriever.getConfigs(Collections.emptySet(), 0, false);
+        ConfigSnapshot bootstrapConfigs = retriever.getConfigs(Collections.emptySet(), 0);
 
         assertThat(bootstrapConfigs, Matchers.instanceOf(BootstrapConfigs.class));
     }
@@ -61,7 +61,7 @@ public class ConfigRetrieverTest {
     public void require_that_components_comes_after_bootstrap() {
         writeConfigs();
         ConfigRetriever retriever = createConfigRetriever();
-        ConfigSnapshot bootstrapConfigs = retriever.getConfigs(Collections.emptySet(), 0, false);
+        ConfigSnapshot bootstrapConfigs = retriever.getConfigs(Collections.emptySet(), 0);
 
         ConfigKey<? extends ConfigInstance> testConfigKey = new ConfigKey<>(TestConfig.class, dirConfigSource.configId());
         ConfigSnapshot componentsConfigs = retriever.getConfigs(Collections.singleton(testConfigKey), 0);
@@ -73,22 +73,6 @@ public class ConfigRetrieverTest {
         }
     }
 
-    @Test
-    @SuppressWarnings("unused")
-    public void require_no_reconfig_when_restart_on_redeploy() {
-        // TODO
-        writeConfigs();
-        ConfigRetriever retriever = createConfigRetriever();
-        ConfigSnapshot bootstrapConfigs = retriever.getConfigs(Collections.emptySet(), 0, false);
-
-        ConfigKey<? extends ConfigInstance> testConfigKey = new ConfigKey<>(TestConfig.class, dirConfigSource.configId());
-        Optional<ConfigSnapshot> componentsConfigs = retriever.getConfigsOnce(Collections.singleton(testConfigKey), 0, true);
-
-        if (componentsConfigs.isPresent()) {
-            fail("Expected no configs");
-        }
-    }
-
     @Rule
     public ExpectedException expectedException = ExpectedException.none();
 
@@ -100,8 +84,8 @@ public class ConfigRetrieverTest {
         writeConfigs();
         ConfigRetriever retriever = createConfigRetriever();
         ConfigKey<? extends ConfigInstance> testConfigKey = new ConfigKey<>(TestConfig.class, dirConfigSource.configId());
-        ConfigSnapshot bootstrapConfigs = retriever.getConfigs(Collections.emptySet(), 0, false);
-        ConfigSnapshot componentsConfigs = retriever.getConfigs(Collections.singleton(testConfigKey), 0, false);
+        ConfigSnapshot bootstrapConfigs = retriever.getConfigs(Collections.emptySet(), 0);
+        ConfigSnapshot componentsConfigs = retriever.getConfigs(Collections.singleton(testConfigKey), 0);
         Set<ConfigKey<? extends ConfigInstance>> keys = new HashSet<>();
         keys.add(testConfigKey);
         keys.add(new ConfigKey<>(TestConfig.class, ""));
diff --git a/container-di/src/test/java/com/yahoo/container/di/ContainerTest.java b/container-di/src/test/java/com/yahoo/container/di/ContainerTest.java
index 19f277ff8fb..de6bd76bf45 100644
--- a/container-di/src/test/java/com/yahoo/container/di/ContainerTest.java
+++ b/container-di/src/test/java/com/yahoo/container/di/ContainerTest.java
@@ -401,11 +401,11 @@ public class ContainerTest extends ContainerTestBase {
     }
 
     ComponentGraph getNewComponentGraph(Container container, ComponentGraph oldGraph) {
-        return container.getNewComponentGraph(oldGraph, Guice.createInjector(), false);
+        return container.getNewComponentGraph(oldGraph, Guice.createInjector());
     }
 
     ComponentGraph getNewComponentGraph(Container container) {
-        return container.getNewComponentGraph(new ComponentGraph(), Guice.createInjector(), false);
+        return container.getNewComponentGraph(new ComponentGraph(), Guice.createInjector());
     }
 
     private ComponentTakingConfig createComponentTakingConfig(ComponentGraph componentGraph) {
diff --git a/container-di/src/test/java/com/yahoo/container/di/ContainerTestBase.java b/container-di/src/test/java/com/yahoo/container/di/ContainerTestBase.java
index f1f3c4a2ae4..815865536f0 100644
--- a/container-di/src/test/java/com/yahoo/container/di/ContainerTestBase.java
+++ b/container-di/src/test/java/com/yahoo/container/di/ContainerTestBase.java
@@ -70,7 +70,7 @@ public class ContainerTestBase {
                             throw new UnsupportedOperationException("getBundle not supported.");
                         }
                     });
-            componentGraph = container.getNewComponentGraph(componentGraph, Guice.createInjector(), false);
+            componentGraph = container.getNewComponentGraph(componentGraph, Guice.createInjector());
         } catch (Exception e) {
             throw new RuntimeException(e);
         }
-- 
cgit v1.2.3