From ec07ab582af461c92fbc5abd127d1e7cc15e37d5 Mon Sep 17 00:00:00 2001
From: gjoranv <gv@verizonmedia.com>
Date: Wed, 15 Jul 2020 16:05:16 +0200
Subject: Rename useBundles -> useApplicationBundles

---
 container-di/src/main/java/com/yahoo/container/di/Container.java       | 3 +--
 container-di/src/main/java/com/yahoo/container/di/Osgi.java            | 2 +-
 .../src/test/java/com/yahoo/container/di/ContainerTestBase.java        | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'container-di')

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 bb3634983a9..757bb521b86 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
@@ -5,7 +5,6 @@ import com.google.inject.Injector;
 import com.yahoo.config.ConfigInstance;
 import com.yahoo.config.ConfigurationRuntimeException;
 import com.yahoo.config.subscription.ConfigInterruptedException;
-import com.yahoo.container.BundlesConfig;
 import com.yahoo.container.ComponentsConfig;
 import com.yahoo.container.bundle.BundleInstantiationSpecification;
 import com.yahoo.container.di.ConfigRetriever.BootstrapConfigs;
@@ -161,7 +160,7 @@ public class Container {
 
     private Set<Bundle> installBundles(Map<ConfigKey<? extends ConfigInstance>, ConfigInstance> configsIncludingBootstrapConfigs) {
         ApplicationBundlesConfig applicationBundlesConfig = getConfig(applicationBundlesConfigKey, configsIncludingBootstrapConfigs);
-        return osgi.useBundles(applicationBundlesConfig.bundles());
+        return osgi.useApplicationBundles(applicationBundlesConfig.bundles());
     }
 
     private ComponentGraph createComponentsGraph(Map<ConfigKey<? extends ConfigInstance>, ConfigInstance> configsIncludingBootstrapConfigs,
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 563efd5f65e..c9ca256b5e0 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
@@ -33,7 +33,7 @@ public interface Osgi {
      * Returns the set of bundles that is not used by the current application generation,
      * and therefore should be scheduled for uninstalling.
      */
-    default Set<Bundle> useBundles(Collection<FileReference> bundles) {
+    default Set<Bundle> useApplicationBundles(Collection<FileReference> bundles) {
         System.out.println("useBundles " + bundles.stream().map(Object::toString).collect(Collectors.joining(", ")));
         return emptySet();
     }
diff --git a/container-di/src/test/java/com/yahoo/container/di/ContainerTestBase.java b/container-di/src/test/java/com/yahoo/container/di/ContainerTestBase.java
index 4578a173c3b..f1f3c4a2ae4 100644
--- a/container-di/src/test/java/com/yahoo/container/di/ContainerTestBase.java
+++ b/container-di/src/test/java/com/yahoo/container/di/ContainerTestBase.java
@@ -61,7 +61,7 @@ public class ContainerTestBase {
                         }
 
                         @Override
-                        public Set<Bundle> useBundles(Collection<FileReference> bundles) {
+                        public Set<Bundle> useApplicationBundles(Collection<FileReference> bundles) {
                             return emptySet();
                         }
 
-- 
cgit v1.2.3