Reapply "Load platform bundles separately 3"

This reverts commit 1c69b4e72b3212e3ce989a8675db08ac51b7f79d.

1 files changed, 14 insertions, 4 deletions

diff --git a/container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java b/container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java
index b983cbcfe37..80c39bef2cb 100644
--- a/container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java
+++ b/container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java
@@ -101,12 +101,16 @@ public class HandlersConfigurerDi {
     private static class ContainerAndDiOsgi extends OsgiImpl implements OsgiWrapper {
 
         private final OsgiFramework osgiFramework;
-        private final BundleManager bundleManager;
+        private final ApplicationBundleLoader applicationBundleLoader;
+        private final PlatformBundleLoader platformBundleLoader;
 
         public ContainerAndDiOsgi(OsgiFramework osgiFramework) {
             super(osgiFramework);
             this.osgiFramework = osgiFramework;
-            bundleManager = new BundleManager(new OsgiImpl(osgiFramework));
+
+            OsgiImpl osgi = new OsgiImpl(osgiFramework);
+            applicationBundleLoader = new ApplicationBundleLoader(osgi);
+            platformBundleLoader = new PlatformBundleLoader(osgi);
         }
 
 
@@ -131,9 +135,15 @@ public class HandlersConfigurerDi {
         }
 
         @Override
-        public Set<Bundle> useBundles(Collection<FileReference> bundles) {
+        public void installPlatformBundles(Collection<FileReference> bundles) {
+            log.fine("Installing platform bundles.");
+            platformBundleLoader.useBundles(new ArrayList<>(bundles));
+        }
+
+        @Override
+        public Set<Bundle> useApplicationBundles(Collection<FileReference> bundles) {
             log.info("Installing bundles from the latest application");
-            return bundleManager.use(new ArrayList<>(bundles));
+            return applicationBundleLoader.useBundles(new ArrayList<>(bundles));
         }
     }