minor non-functional changes:

- limit accessibility
- fix typo
- use Optional.isEmpty

2 files changed, 6 insertions, 6 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 67ba25d5e49..f82fd22f40d 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
@@ -184,7 +184,7 @@ public class Container {
         }
     }
 
-    public void installBundles(Map<ConfigKey<? extends ConfigInstance>, ConfigInstance> configsIncludingBootstrapConfigs) {
+    private void installBundles(Map<ConfigKey<? extends ConfigInstance>, ConfigInstance> configsIncludingBootstrapConfigs) {
         BundlesConfig bundlesConfig = getConfig(bundlesConfigKey, configsIncludingBootstrapConfigs);
         osgi.useBundles(bundlesConfig.bundle());
     }
@@ -209,7 +209,7 @@ public class Container {
     private void addNodes(ComponentsConfig componentsConfig, ComponentGraph graph) {
 
         for (ComponentsConfig.Components config : componentsConfig.components()) {
-            BundleInstantiationSpecification specification = bundleInstatiationSpecification(config);
+            BundleInstantiationSpecification specification = bundleInstantiationSpecification(config);
             Class<?> componentClass = osgi.resolveClass(specification);
             Node componentNode;
 
@@ -234,7 +234,7 @@ public class Container {
         }
     }
 
-    public void shutdownConfigurer() {
+    void shutdownConfigurer() {
         configurer.shutdown();
     }
 
@@ -258,7 +258,7 @@ public class Container {
         return key.getConfigClass().cast(inst);
     }
 
-    public static BundleInstantiationSpecification bundleInstatiationSpecification(ComponentsConfig.Components config) {
+    private static BundleInstantiationSpecification bundleInstantiationSpecification(ComponentsConfig.Components config) {
         return BundleInstantiationSpecification.getFromStrings(config.id(), config.classId(), config.bundle());
     }
 
diff --git a/container-di/src/main/java/com/yahoo/container/di/componentgraph/core/ComponentGraph.java b/container-di/src/main/java/com/yahoo/container/di/componentgraph/core/ComponentGraph.java
index 67143c60f62..d07aefef75b 100644
--- a/container-di/src/main/java/com/yahoo/container/di/componentgraph/core/ComponentGraph.java
+++ b/container-di/src/main/java/com/yahoo/container/di/componentgraph/core/ComponentGraph.java
@@ -158,7 +158,7 @@ public class ComponentGraph {
         // reset instances with modified dependencies
         for (Node node : topologicalSort(nodes())) {
             for (Node usedComponent : node.usedComponents()) {
-                if (!usedComponent.instance.isPresent()) {
+                if (usedComponent.instance.isEmpty()) {
                     node.instance = Optional.empty();
                 }
             }
@@ -252,7 +252,7 @@ public class ComponentGraph {
 
     private Node lookupOrCreateGlobalComponent(Node node, Injector fallbackInjector, Class<?> clazz, Key<?> key) {
         Optional<Node> component = lookupGlobalComponent(key);
-        if (!component.isPresent()) {
+        if (component.isEmpty()) {
             Object instance;
             try {
                 log.log(LogLevel.DEBUG, "Trying the fallback injector to create" + messageForNoGlobalComponent(clazz, node));