diff options
author | gjoranv <gv@verizonmedia.com> | 2020-07-15 16:13:51 +0200 |
---|---|---|
committer | gjoranv <gv@verizonmedia.com> | 2020-07-15 17:05:02 +0200 |
commit | 94119fc8757bc5b8bf45be79bc9dde7b81b8d73a (patch) | |
tree | 4011a3f880515a8e56ca6c76c27a4e72a4de0268 /container-core | |
parent | 893dda577f52157274357da58f93e9e8580f417f (diff) |
Rename bundle loader classes and fields for consistency.
* BundleManager -> ApplicationBundleLoader
* PlatformBundleInstaller -> PlatformBundleLoader
Diffstat (limited to 'container-core')
-rw-r--r-- | container-core/src/main/java/com/yahoo/container/core/config/ApplicationBundleLoader.java (renamed from container-core/src/main/java/com/yahoo/container/core/config/BundleManager.java) | 6 | ||||
-rw-r--r-- | container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java | 12 | ||||
-rw-r--r-- | container-core/src/main/java/com/yahoo/container/core/config/PlatformBundleLoader.java (renamed from container-core/src/main/java/com/yahoo/container/core/config/PlatformBundleInstaller.java) | 8 | ||||
-rw-r--r-- | container-core/src/test/java/com/yahoo/container/core/config/ApplicationBundleLoaderTest.java (renamed from container-core/src/test/java/com/yahoo/container/core/config/BundleManagerTest.java) | 6 |
4 files changed, 15 insertions, 17 deletions
diff --git a/container-core/src/main/java/com/yahoo/container/core/config/BundleManager.java b/container-core/src/main/java/com/yahoo/container/core/config/ApplicationBundleLoader.java index fcbadcc1535..9501442cb9f 100644 --- a/container-core/src/main/java/com/yahoo/container/core/config/BundleManager.java +++ b/container-core/src/main/java/com/yahoo/container/core/config/ApplicationBundleLoader.java @@ -23,7 +23,7 @@ import java.util.stream.Collectors; * @author gjoranv * @author Tony Vaagenes */ -public class BundleManager { +public class ApplicationBundleLoader { /* Map of file refs of active bundles (not scheduled for uninstall) to the installed bundle. * @@ -34,13 +34,13 @@ public class BundleManager { */ private final Map<FileReference, Bundle> reference2Bundle = new LinkedHashMap<>(); - private final Logger log = Logger.getLogger(BundleManager.class.getName()); + private final Logger log = Logger.getLogger(ApplicationBundleLoader.class.getName()); private final Osgi osgi; // A custom bundle installer for non-disk bundles, to be used for testing private BundleInstaller customBundleInstaller = null; - public BundleManager(Osgi osgi) { + public ApplicationBundleLoader(Osgi osgi) { this.osgi = osgi; } 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 1677da1896d..cf38e49497c 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,16 +101,16 @@ public class HandlersConfigurerDi { private static class ContainerAndDiOsgi extends OsgiImpl implements OsgiWrapper { private final OsgiFramework osgiFramework; - private final BundleManager bundleManager; - private final PlatformBundleInstaller platformBundleInstaller; + private final ApplicationBundleLoader applicationBundleLoader; + private final PlatformBundleLoader platformBundleLoader; public ContainerAndDiOsgi(OsgiFramework osgiFramework) { super(osgiFramework); this.osgiFramework = osgiFramework; OsgiImpl osgi = new OsgiImpl(osgiFramework); - bundleManager = new BundleManager(osgi); - platformBundleInstaller = new PlatformBundleInstaller(osgi); + applicationBundleLoader = new ApplicationBundleLoader(osgi); + platformBundleLoader = new PlatformBundleLoader(osgi); } @@ -137,13 +137,13 @@ public class HandlersConfigurerDi { @Override public void installPlatformBundles(Collection<FileReference> bundles) { log.fine("Installing platform bundles."); - platformBundleInstaller.install(bundles); + platformBundleLoader.install(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.use(new ArrayList<>(bundles)); } } diff --git a/container-core/src/main/java/com/yahoo/container/core/config/PlatformBundleInstaller.java b/container-core/src/main/java/com/yahoo/container/core/config/PlatformBundleLoader.java index 848930932fd..76f0b959a58 100644 --- a/container-core/src/main/java/com/yahoo/container/core/config/PlatformBundleInstaller.java +++ b/container-core/src/main/java/com/yahoo/container/core/config/PlatformBundleLoader.java @@ -4,7 +4,6 @@ import com.yahoo.config.FileReference; import com.yahoo.osgi.Osgi; import org.osgi.framework.Bundle; -import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.logging.Logger; @@ -15,14 +14,13 @@ import java.util.logging.Logger; * * @author gjoranv */ -// TODO: rename to ...Loader or ...Manager -public class PlatformBundleInstaller { - private static final Logger log = Logger.getLogger(PlatformBundleInstaller.class.getName()); +public class PlatformBundleLoader { + private static final Logger log = Logger.getLogger(PlatformBundleLoader.class.getName()); private final Osgi osgi; private final DiskBundleInstaller installer; - public PlatformBundleInstaller(Osgi osgi) { + public PlatformBundleLoader(Osgi osgi) { this.osgi = osgi; installer = new DiskBundleInstaller(); } diff --git a/container-core/src/test/java/com/yahoo/container/core/config/BundleManagerTest.java b/container-core/src/test/java/com/yahoo/container/core/config/ApplicationBundleLoaderTest.java index 414e6b05128..fa3308bdbc3 100644 --- a/container-core/src/test/java/com/yahoo/container/core/config/BundleManagerTest.java +++ b/container-core/src/test/java/com/yahoo/container/core/config/ApplicationBundleLoaderTest.java @@ -16,21 +16,21 @@ import static org.junit.Assert.assertTrue; /** * @author gjoranv */ -public class BundleManagerTest { +public class ApplicationBundleLoaderTest { private static final FileReference BUNDLE_1_REF = new FileReference("bundle-1"); private static final Bundle BUNDLE_1 = new TestBundle(BUNDLE_1_REF.value()); private static final FileReference BUNDLE_2_REF = new FileReference("bundle-2"); private static final Bundle BUNDLE_2 = new TestBundle(BUNDLE_2_REF.value()); - private BundleManager bundleLoader; + private ApplicationBundleLoader bundleLoader; private TestOsgi osgi; @Before public void setup() { osgi = new TestOsgi(testBundles()); var bundleInstaller = new TestBundleInstaller(); - bundleLoader = new BundleManager(osgi); + bundleLoader = new ApplicationBundleLoader(osgi); bundleLoader.useCustomBundleInstaller(bundleInstaller); } |