Revert "Load platform bundles separately 3"

6 files changed, 35 insertions, 24 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainer.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainer.java
index 9cc83bb4275..547c05d2c9b 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainer.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainer.java
@@ -5,8 +5,8 @@ import com.yahoo.cloud.config.ZookeeperServerConfig;
 import com.yahoo.component.ComponentSpecification;
 import com.yahoo.config.model.api.container.ContainerServiceType;
 import com.yahoo.config.model.producer.AbstractConfigProducer;
+import com.yahoo.container.BundlesConfig;
 import com.yahoo.container.bundle.BundleInstantiationSpecification;
-import com.yahoo.container.di.config.PlatformBundlesConfig;
 import com.yahoo.osgi.provider.model.ComponentModel;
 import com.yahoo.vespa.config.content.FleetcontrollerConfig;
 import com.yahoo.vespa.model.application.validation.RestartConfigs;
@@ -25,7 +25,7 @@ import static com.yahoo.vespa.defaults.Defaults.getDefaults;
  */
 @RestartConfigs({FleetcontrollerConfig.class, ZookeeperServerConfig.class})
 public class ClusterControllerContainer extends Container implements
-        PlatformBundlesConfig.Producer,
+        BundlesConfig.Producer,
         ZookeeperServerConfig.Producer
 {
     private static final ComponentSpecification CLUSTERCONTROLLER_BUNDLE = new ComponentSpecification("clustercontroller-apps");
@@ -102,8 +102,10 @@ public class ClusterControllerContainer extends Container implements
     }
 
     @Override
-    public void getConfig(PlatformBundlesConfig.Builder builder) {
-        bundles.forEach(builder::bundles);
+    public void getConfig(BundlesConfig.Builder builder) {
+        for (String bundle : bundles) {
+            builder.bundle(bundle);
+        }
     }
 
     @Override
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java
index b0ac02d0fe8..9ce5fdfcc04 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java
@@ -8,8 +8,8 @@ import com.yahoo.config.FileReference;
 import com.yahoo.config.application.api.ComponentInfo;
 import com.yahoo.config.model.deploy.DeployState;
 import com.yahoo.config.model.producer.AbstractConfigProducer;
+import com.yahoo.container.BundlesConfig;
 import com.yahoo.container.bundle.BundleInstantiationSpecification;
-import com.yahoo.container.di.config.ApplicationBundlesConfig;
 import com.yahoo.container.handler.ThreadpoolConfig;
 import com.yahoo.container.handler.metrics.MetricsProxyApiConfig;
 import com.yahoo.container.handler.metrics.MetricsV2Handler;
@@ -46,7 +46,7 @@ import java.util.stream.Stream;
  * @author gjoranv
  */
 public final class ApplicationContainerCluster extends ContainerCluster<ApplicationContainer> implements
-        ApplicationBundlesConfig.Producer,
+        BundlesConfig.Producer,
         QrStartConfig.Producer,
         RankProfilesConfig.Producer,
         RankingConstantsConfig.Producer,
@@ -188,9 +188,10 @@ public final class ApplicationContainerCluster extends ContainerCluster<Applicat
     public Optional<Integer> getMemoryPercentage() { return Optional.ofNullable(memoryPercentage); }
 
     @Override
-    public void getConfig(ApplicationBundlesConfig.Builder builder) {
+    public void getConfig(BundlesConfig.Builder builder) {
         applicationBundles.stream().map(FileReference::value)
-                .forEach(builder::bundles);
+                .forEach(builder::bundle);
+        super.getConfig(builder);
     }
 
     @Override
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java
index e2d0868cb9d..5127616ad5e 100755
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java
@@ -12,12 +12,12 @@ import com.yahoo.config.model.ApplicationConfigProducerRoot;
 import com.yahoo.config.model.deploy.DeployState;
 import com.yahoo.config.model.producer.AbstractConfigProducer;
 import com.yahoo.config.provision.Zone;
+import com.yahoo.container.BundlesConfig;
 import com.yahoo.container.ComponentsConfig;
 import com.yahoo.container.QrSearchersConfig;
 import com.yahoo.container.bundle.BundleInstantiationSpecification;
 import com.yahoo.container.core.ApplicationMetadataConfig;
 import com.yahoo.container.core.document.ContainerDocumentConfig;
-import com.yahoo.container.di.config.PlatformBundlesConfig;
 import com.yahoo.container.handler.ThreadpoolConfig;
 import com.yahoo.container.jdisc.JdiscBindingsConfig;
 import com.yahoo.container.jdisc.config.HealthMonitorConfig;
@@ -87,7 +87,7 @@ public abstract class ContainerCluster<CONTAINER extends Container>
         ContainerDocumentConfig.Producer,
         HealthMonitorConfig.Producer,
         ApplicationMetadataConfig.Producer,
-        PlatformBundlesConfig.Producer,
+        BundlesConfig.Producer,
         IndexInfoConfig.Producer,
         IlscriptsConfig.Producer,
         SchemamappingConfig.Producer,
@@ -464,7 +464,6 @@ public abstract class ContainerCluster<CONTAINER extends Container>
 
     /**
      * Adds a bundle present at a known location at the target container nodes.
-     * Note that the set of platform bundles cannot change during the jdisc container's lifetime.
      *
      * @param bundlePath usually an absolute path, e.g. '$VESPA_HOME/lib/jars/foo.jar'
      */
@@ -473,9 +472,9 @@ public abstract class ContainerCluster<CONTAINER extends Container>
     }
 
     @Override
-    public void getConfig(PlatformBundlesConfig.Builder builder) {
+    public void getConfig(BundlesConfig.Builder builder) {
         platformBundles.stream() .map(ContainerCluster::toFileReferenceString)
-                .forEach(builder::bundles);
+                .forEach(builder::bundle);
     }
 
     private static String toFileReferenceString(Path path) {
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerClusterTest.java
index 754f4b66070..bed77bd5c77 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerClusterTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerClusterTest.java
@@ -15,8 +15,8 @@ import ai.vespa.metricsproxy.metric.dimensions.PublicDimensions;
 import com.yahoo.component.ComponentSpecification;
 import com.yahoo.config.model.test.MockApplicationPackage;
 import com.yahoo.config.provision.Zone;
+import com.yahoo.container.BundlesConfig;
 import com.yahoo.container.core.ApplicationMetadataConfig;
-import com.yahoo.container.di.config.PlatformBundlesConfig;
 import com.yahoo.search.config.QrStartConfig;
 import com.yahoo.vespa.model.VespaModel;
 import com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyContainerCluster.AppDimensionNames;
@@ -44,6 +44,7 @@ import static org.hamcrest.CoreMatchers.endsWith;
 import static org.hamcrest.CoreMatchers.hasItem;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotSame;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 
@@ -55,11 +56,11 @@ public class MetricsProxyContainerClusterTest {
     @Test
     public void metrics_proxy_bundle_is_included_in_bundles_config() {
         VespaModel model = getModel(servicesWithAdminOnly(), self_hosted);
-        var builder = new PlatformBundlesConfig.Builder();
+        var builder = new BundlesConfig.Builder();
         model.getConfig(builder, CLUSTER_CONFIG_ID);
-        PlatformBundlesConfig config = builder.build();
-        assertEquals(1, config.bundles().size());
-        assertThat(config.bundles(0).value(), endsWith(METRICS_PROXY_BUNDLE_FILE.toString()));
+        BundlesConfig config = builder.build();
+        assertEquals(1, config.bundle().size());
+        assertThat(config.bundle(0).value(), endsWith(METRICS_PROXY_BUNDLE_FILE.toString()));
     }
 
     @Test
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java
index 07b6cd72bdb..03c05af1145 100755
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java
@@ -16,7 +16,7 @@ import com.yahoo.config.provision.RegionName;
 import com.yahoo.config.provision.SystemName;
 import com.yahoo.config.provision.Zone;
 import com.yahoo.config.provisioning.FlavorsConfig;
-import com.yahoo.container.di.config.PlatformBundlesConfig;
+import com.yahoo.container.BundlesConfig;
 import com.yahoo.container.handler.ThreadpoolConfig;
 import com.yahoo.search.config.QrStartConfig;
 import com.yahoo.vespa.model.Host;
@@ -292,9 +292,9 @@ public class ContainerClusterTest {
                 .zone(zone).build();
         MockRoot root = new MockRoot("foo", state);
         ApplicationContainerCluster cluster = new ApplicationContainerCluster(root, "container0", "container1", state);
-        var bundleBuilder = new PlatformBundlesConfig.Builder();
+        BundlesConfig.Builder bundleBuilder = new BundlesConfig.Builder();
         cluster.getConfig(bundleBuilder);
-        List<String> installedBundles = bundleBuilder.build().bundles().stream().map(FileReference::value).collect(Collectors.toList());
+        List<String> installedBundles = bundleBuilder.build().bundle().stream().map(FileReference::value).collect(Collectors.toList());
 
         assertEquals(expectedBundleNames.size(), installedBundles.size());
         assertThat(installedBundles, containsInAnyOrder(
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/DocprocBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/DocprocBuilderTest.java
index e9048cf7863..eda90b03147 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/DocprocBuilderTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/DocprocBuilderTest.java
@@ -3,16 +3,17 @@ package com.yahoo.vespa.model.container.xml;
 
 import com.yahoo.config.docproc.DocprocConfig;
 import com.yahoo.config.docproc.SchemamappingConfig;
-import com.yahoo.config.model.builder.xml.test.DomBuilderTest;
 import com.yahoo.config.model.deploy.DeployState;
+import com.yahoo.config.model.builder.xml.test.DomBuilderTest;
+import com.yahoo.container.BundlesConfig;
 import com.yahoo.container.ComponentsConfig;
 import com.yahoo.container.core.ChainsConfig;
 import com.yahoo.container.jdisc.ContainerMbusConfig;
 import com.yahoo.document.config.DocumentmanagerConfig;
 import com.yahoo.search.config.QrStartConfig;
 import com.yahoo.vespa.model.HostPorts;
-import com.yahoo.vespa.model.container.ApplicationContainer;
 import com.yahoo.vespa.model.container.ApplicationContainerCluster;
+import com.yahoo.vespa.model.container.ApplicationContainer;
 import com.yahoo.vespa.model.container.ContainerModel;
 import com.yahoo.vespa.model.container.docproc.DocprocChain;
 import com.yahoo.vespa.model.container.docproc.DocumentProcessor;
@@ -29,8 +30,8 @@ import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.core.IsNull.notNullValue;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertThat;
 
 
 /**
@@ -45,6 +46,7 @@ public class DocprocBuilderTest extends DomBuilderTest {
     private ContainerMbusConfig containerMbusConfig;
     private ComponentsConfig componentsConfig;
     private ChainsConfig chainsConfig;
+    private BundlesConfig bundlesConfig;
     private SchemamappingConfig schemamappingConfig;
     private DocprocConfig docprocConfig;
     private QrStartConfig qrStartConfig;
@@ -62,6 +64,7 @@ public class DocprocBuilderTest extends DomBuilderTest {
                 cluster.getConfigId() + "/component/com.yahoo.docproc.jdisc.DocumentProcessingHandler");
 
         documentmanagerConfig = root.getConfig(DocumentmanagerConfig.class, cluster.getConfigId());
+        bundlesConfig = root.getConfig(BundlesConfig.class, cluster.getConfigId());
         schemamappingConfig = root.getConfig(SchemamappingConfig.class, cluster.getContainers().get(0).getConfigId());
         qrStartConfig = root.getConfig(QrStartConfig.class, cluster.getConfigId());
         docprocConfig = root.getConfig(DocprocConfig.class, cluster.getConfigId());
@@ -204,6 +207,11 @@ public class DocprocBuilderTest extends DomBuilderTest {
     }
 
     @Test
+    public void testBundlesConfig() {
+        assertTrue(bundlesConfig.bundle().isEmpty());
+    }
+
+    @Test
     public void testSchemaMappingConfig() {
         assertTrue(schemamappingConfig.fieldmapping().isEmpty());
     }