Use plain strings for platform bundles, instead of file references

3 files changed, 9 insertions, 9 deletions

diff --git a/container-di/src/main/java/com/yahoo/container/di/Container.java b/container-di/src/main/java/com/yahoo/container/di/Container.java
index 672cef22010..af580767a17 100644
--- a/container-di/src/main/java/com/yahoo/container/di/Container.java
+++ b/container-di/src/main/java/com/yahoo/container/di/Container.java
@@ -4,11 +4,11 @@ package com.yahoo.container.di;
 import com.google.inject.Injector;
 import com.yahoo.config.ConfigInstance;
 import com.yahoo.config.ConfigurationRuntimeException;
-import com.yahoo.config.FileReference;
 import com.yahoo.config.subscription.ConfigInterruptedException;
 import com.yahoo.container.ComponentsConfig;
 import com.yahoo.container.bundle.BundleInstantiationSpecification;
 import com.yahoo.container.di.ConfigRetriever.BootstrapConfigs;
+import com.yahoo.container.di.ConfigRetriever.ComponentsConfigs;
 import com.yahoo.container.di.ConfigRetriever.ConfigSnapshot;
 import com.yahoo.container.di.componentgraph.core.ComponentGraph;
 import com.yahoo.container.di.componentgraph.core.ComponentNode;
@@ -50,7 +50,7 @@ public class Container {
     private final Osgi osgi;
 
     private final ConfigRetriever configurer;
-    private List<FileReference> platformBundles;  // Used to verify that platform bundles don't change.
+    private List<String> platformBundles;  // Used to verify that platform bundles don't change.
     private long previousConfigGeneration = -1L;
     private long leastGeneration = -1L;
 
@@ -106,7 +106,7 @@ public class Container {
                 log.log(FINE, "Got new bootstrap generation\n" + configGenerationsString());
 
                 if (graph.generation() == 0) {
-                    platformBundles = getConfig(platformBundlesConfigKey, snapshot.configs()).bundles();
+                    platformBundles = getConfig(platformBundlesConfigKey, snapshot.configs()).bundlePaths();
                     osgi.installPlatformBundles(platformBundles);
                 } else {
                     throwIfPlatformBundlesChanged(snapshot);
@@ -118,7 +118,7 @@ public class Container {
 
                 // Continues loop
 
-            } else if (snapshot instanceof ConfigRetriever.ComponentsConfigs) {
+            } else if (snapshot instanceof ComponentsConfigs) {
                 break;
             }
         }
@@ -140,7 +140,7 @@ public class Container {
     }
 
     private void throwIfPlatformBundlesChanged(ConfigSnapshot snapshot) {
-        var checkPlatformBundles = getConfig(platformBundlesConfigKey, snapshot.configs()).bundles();
+        var checkPlatformBundles = getConfig(platformBundlesConfigKey, snapshot.configs()).bundlePaths();
         if (! checkPlatformBundles.equals(platformBundles))
             throw new RuntimeException("Platform bundles are not allowed to change!\nOld: " + platformBundles + "\nNew: " + checkPlatformBundles);
     }
diff --git a/container-di/src/main/java/com/yahoo/container/di/Osgi.java b/container-di/src/main/java/com/yahoo/container/di/Osgi.java
index c9ca256b5e0..940986e2f38 100644
--- a/container-di/src/main/java/com/yahoo/container/di/Osgi.java
+++ b/container-di/src/main/java/com/yahoo/container/di/Osgi.java
@@ -25,8 +25,8 @@ public interface Osgi {
         return new BundleClasses(new MockBundle(), Collections.emptySet());
     }
 
-    default void installPlatformBundles(Collection<FileReference> bundles) {
-        System.out.println("installPlatformBundles " + bundles.stream().map(Object::toString).collect(Collectors.joining(", ")));
+    default void installPlatformBundles(Collection<String> bundlePaths) {
+        System.out.println("installPlatformBundles " + bundlePaths);
     }
 
     /**
diff --git a/container-di/src/main/resources/configdefinitions/platform-bundles.def b/container-di/src/main/resources/configdefinitions/platform-bundles.def
index 9b72bf6831e..a30a846b565 100644
--- a/container-di/src/main/resources/configdefinitions/platform-bundles.def
+++ b/container-di/src/main/resources/configdefinitions/platform-bundles.def
@@ -1,5 +1,5 @@
 # Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package=com.yahoo.container.di.config
 
-# References to platform bundles to install.
-bundles[] file
+# Paths to platform bundles to install.
+bundlePaths[] string