Fix ambiguous naming and use modern Java.

1 files changed, 2 insertions, 4 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 fdbdd009536..027c9cdd354 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
@@ -58,10 +58,8 @@ public class Container {
         this.componentDeconstructor = componentDeconstructor;
         this.osgi = osgi;
 
-        Set<ConfigKey<? extends ConfigInstance>> keySet = new HashSet<>();
-        keySet.add(bundlesConfigKey);
-        keySet.add(componentsConfigKey);
-        this.configurer = new ConfigRetriever(keySet, subscriberFactory::getSubscriber);
+        var bootstrapKeys = Set.of(bundlesConfigKey, componentsConfigKey);
+        this.configurer = new ConfigRetriever(bootstrapKeys, subscriberFactory::getSubscriber);
     }
 
     public Container(SubscriberFactory subscriberFactory, String configId, ComponentDeconstructor componentDeconstructor) {