Remove all usage of BundleConfig and bundles.cfg test files.

- The latter were not even used by the tests.
- The bundles.def file itself will be removed when the last
  model using it has rolled out of hosted Vespa.

3 files changed, 0 insertions, 26 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 c65107ba5b7..5ae9d813417 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,7 +5,6 @@ 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.PlatformBundlesConfig;
 import com.yahoo.osgi.provider.model.ComponentModel;
@@ -26,7 +25,6 @@ import static com.yahoo.vespa.defaults.Defaults.getDefaults;
  */
 @RestartConfigs({FleetcontrollerConfig.class, ZookeeperServerConfig.class})
 public class ClusterControllerContainer extends Container implements
-        BundlesConfig.Producer,
         PlatformBundlesConfig.Producer,
         ZookeeperServerConfig.Producer
 {
@@ -104,13 +102,6 @@ public class ClusterControllerContainer extends Container implements
     }
 
     @Override
-    public void getConfig(BundlesConfig.Builder builder) {
-        for (String bundle : bundles) {
-            builder.bundle(bundle);
-        }
-    }
-
-    @Override
     public void getConfig(PlatformBundlesConfig.Builder builder) {
         bundles.forEach(builder::bundles);
     }
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 794cc5aa4c6..20b774a4cb5 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,7 +8,6 @@ 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.ApplicationBundlesConfig;
 import com.yahoo.container.handler.ThreadpoolConfig;
@@ -48,7 +47,6 @@ import java.util.stream.Stream;
  */
 public final class ApplicationContainerCluster extends ContainerCluster<ApplicationContainer> implements
         ApplicationBundlesConfig.Producer,
-        BundlesConfig.Producer,
         QrStartConfig.Producer,
         RankProfilesConfig.Producer,
         RankingConstantsConfig.Producer,
@@ -190,13 +188,6 @@ public final class ApplicationContainerCluster extends ContainerCluster<Applicat
     public Optional<Integer> getMemoryPercentage() { return Optional.ofNullable(memoryPercentage); }
 
     @Override
-    public void getConfig(BundlesConfig.Builder builder) {
-        applicationBundles.stream().map(FileReference::value)
-                .forEach(builder::bundle);
-        super.getConfig(builder);
-    }
-
-    @Override
     public void getConfig(ApplicationBundlesConfig.Builder builder) {
         applicationBundles.stream().map(FileReference::value)
                 .forEach(builder::bundles);
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 c40c8e86afe..9095962e5b3 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,7 +12,6 @@ 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;
@@ -88,7 +87,6 @@ public abstract class ContainerCluster<CONTAINER extends Container>
         ContainerDocumentConfig.Producer,
         HealthMonitorConfig.Producer,
         ApplicationMetadataConfig.Producer,
-        BundlesConfig.Producer,
         PlatformBundlesConfig.Producer,
         IndexInfoConfig.Producer,
         IlscriptsConfig.Producer,
@@ -474,12 +472,6 @@ public abstract class ContainerCluster<CONTAINER extends Container>
     }
 
     @Override
-    public void getConfig(BundlesConfig.Builder builder) {
-        platformBundles.stream() .map(ContainerCluster::toFileReferenceString)
-                .forEach(builder::bundle);
-    }
-
-    @Override
     public void getConfig(PlatformBundlesConfig.Builder builder) {
         platformBundles.stream() .map(ContainerCluster::toFileReferenceString)
                 .forEach(builder::bundles);