Merge pull request #13916 from vespa-engine/revert-13909-load-platform-bundles-separately_3

Revert "Load platform bundles separately 3"

1 files changed, 5 insertions, 4 deletions

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