Use java.util.logging.Level in static imports.

5 files changed, 19 insertions, 20 deletions

diff --git a/container-di/src/main/java/com/yahoo/container/di/ConfigRetriever.java b/container-di/src/main/java/com/yahoo/container/di/ConfigRetriever.java
index fde4ecfd33a..6ed9c2a2994 100644
--- a/container-di/src/main/java/com/yahoo/container/di/ConfigRetriever.java
+++ b/container-di/src/main/java/com/yahoo/container/di/ConfigRetriever.java
@@ -16,7 +16,7 @@ import java.util.function.Function;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import static com.yahoo.log.LogLevel.DEBUG;
+import static java.util.logging.Level.FINE;
 
 /**
  * @author Tony Vaagenes
@@ -56,7 +56,7 @@ public final class ConfigRetriever {
                 throw new IllegalArgumentException("Component config keys [" + componentConfigKeys +
                                                    "] overlaps with bootstrap config keys [" + bootstrapKeys + "]");
 
-            log.log(DEBUG, "getConfigs: " + componentConfigKeys);
+            log.log(FINE, "getConfigs: " + componentConfigKeys);
             Set<ConfigKey<? extends ConfigInstance>> allKeys = new HashSet<>(componentConfigKeys);
             allKeys.addAll(bootstrapKeys);
             setupComponentSubscriber(allKeys);
@@ -84,7 +84,7 @@ public final class ConfigRetriever {
             throw new IllegalArgumentException(
                     "Component config keys [" + componentConfigKeys + "] overlaps with bootstrap config keys [" + bootstrapKeys + "]");
         }
-        log.log(DEBUG, "getConfigsOnce: " + componentConfigKeys);
+        log.log(FINE, "getConfigsOnce: " + componentConfigKeys);
 
         Set<ConfigKey<? extends ConfigInstance>> allKeys = new HashSet<>(componentConfigKeys);
         allKeys.addAll(bootstrapKeys);
@@ -97,7 +97,7 @@ public final class ConfigRetriever {
 
     private Optional<ConfigSnapshot> getConfigsOptional(long leastGeneration, boolean restartOnRedeploy) {
         long newestComponentGeneration = componentSubscriber.waitNextGeneration();
-        log.log(DEBUG, "getConfigsOptional: new component generation: " + newestComponentGeneration);
+        log.log(FINE, "getConfigsOptional: new component generation: " + newestComponentGeneration);
 
         // leastGeneration is only used to ensure newer generation when the previous generation was invalidated due to an exception
         if (newestComponentGeneration < leastGeneration) {
@@ -106,13 +106,13 @@ public final class ConfigRetriever {
             return Optional.empty();
         } else if (bootstrapSubscriber.generation() < newestComponentGeneration) {
             long newestBootstrapGeneration = bootstrapSubscriber.waitNextGeneration();
-            log.log(DEBUG, "getConfigsOptional: new bootstrap generation: " + bootstrapSubscriber.generation());
+            log.log(FINE, "getConfigsOptional: new bootstrap generation: " + bootstrapSubscriber.generation());
             Optional<ConfigSnapshot> bootstrapConfig = bootstrapConfigIfChanged();
             if (bootstrapConfig.isPresent()) {
                 return bootstrapConfig;
             } else {
                 if (newestBootstrapGeneration == newestComponentGeneration) {
-                    log.log(DEBUG, "Got new components configs with unchanged bootstrap configs.");
+                    log.log(FINE, "Got new components configs with unchanged bootstrap configs.");
                     return componentsConfigIfChanged();
                 } else {
                     // This should not be a normal case, and hence a warning to allow investigation.
@@ -155,7 +155,7 @@ public final class ConfigRetriever {
             componentSubscriber.close();
             componentSubscriberKeys = keys;
             try {
-                log.log(DEBUG, "Setting up new component subscriber for keys: " + keys);
+                log.log(FINE, "Setting up new component subscriber for keys: " + keys);
                 componentSubscriber = subscribe.apply(keys);
             } catch (Throwable e) {
                 log.log(Level.WARNING, "Failed setting up subscriptions for component configs: " + e.getMessage());
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 9a9245f4ba2..d8fec35633b 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
@@ -30,7 +30,7 @@ import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import static com.yahoo.log.LogLevel.DEBUG;
+import static java.util.logging.Level.FINE;
 
 /**
  * @author gjoranv
@@ -139,7 +139,7 @@ public class Container {
         while (true) {
             snapshot = configurer.getConfigs(graph.configKeys(), leastGeneration, restartOnRedeploy);
 
-            log.log(DEBUG, String.format("createNewGraph:\n" + "graph.configKeys = %s\n" + "graph.generation = %s\n" + "snapshot = %s\n",
+            log.log(FINE, String.format("createNewGraph:\n" + "graph.configKeys = %s\n" + "graph.generation = %s\n" + "snapshot = %s\n",
                     graph.configKeys(), graph.generation(), snapshot));
 
             if (snapshot instanceof BootstrapConfigs) {
@@ -148,7 +148,7 @@ public class Container {
                             "Got bootstrap configs out of sequence for old config generation %d.\n" + "Previous config generation is %d",
                             getBootstrapGeneration(), previousConfigGeneration));
                 }
-                log.log(DEBUG,
+                log.log(FINE,
                         String.format(
                                 "Got new bootstrap generation\n" + "bootstrap generation = %d\n" + "components generation: %d\n"
                                         + "previous generation: %d\n",
@@ -165,7 +165,7 @@ public class Container {
                 break;
             }
         }
-        log.log(DEBUG,
+        log.log(FINE,
                 String.format(
                         "Got components configs,\n" + "bootstrap generation = %d\n" + "components generation: %d\n"
                                 + "previous generation: %d",
diff --git a/container-di/src/main/java/com/yahoo/container/di/componentgraph/core/ComponentNode.java b/container-di/src/main/java/com/yahoo/container/di/componentgraph/core/ComponentNode.java
index 6662ba85e5d..92695565d47 100644
--- a/container-di/src/main/java/com/yahoo/container/di/componentgraph/core/ComponentNode.java
+++ b/container-di/src/main/java/com/yahoo/container/di/componentgraph/core/ComponentNode.java
@@ -29,7 +29,7 @@ import java.util.stream.Collectors;
 import static com.yahoo.container.di.componentgraph.core.Exceptions.cutStackTraceAtConstructor;
 import static com.yahoo.container.di.componentgraph.core.Exceptions.removeStackTrace;
 import static com.yahoo.container.di.componentgraph.core.Keys.createKey;
-import static com.yahoo.log.LogLevel.DEBUG;
+import static java.util.logging.Level.FINE;
 
 /**
  * @author Tony Vaagenes
@@ -148,9 +148,9 @@ public class ComponentNode extends Node {
 
         Object instance;
         try {
-            log.log(DEBUG, "Constructing " + idAndType());
+            log.log(FINE, "Constructing " + idAndType());
             instance = constructor.newInstance(actualArguments.toArray());
-            log.log(DEBUG, "Finished constructing " + idAndType());
+            log.log(FINE, "Finished constructing " + idAndType());
         } catch (InvocationTargetException | InstantiationException | IllegalAccessException e) {
             StackTraceElement dependencyInjectorMarker = new StackTraceElement("============= Dependency Injection =============", "newInstance", null, -1);
 
diff --git a/container-di/src/main/java/com/yahoo/container/di/componentgraph/core/Node.java b/container-di/src/main/java/com/yahoo/container/di/componentgraph/core/Node.java
index 9ed89a6091a..3afc8bb817c 100644
--- a/container-di/src/main/java/com/yahoo/container/di/componentgraph/core/Node.java
+++ b/container-di/src/main/java/com/yahoo/container/di/componentgraph/core/Node.java
@@ -15,8 +15,7 @@ import java.util.Optional;
 import java.util.Set;
 import java.util.logging.Logger;
 
-import static com.yahoo.log.LogLevel.DEBUG;
-import static com.yahoo.log.LogLevel.SPAM;
+import static java.util.logging.Level.FINE;
 
 /**
  * @author Tony Vaagenes
diff --git a/container-di/src/main/java/com/yahoo/container/di/componentgraph/cycle/CycleFinder.java b/container-di/src/main/java/com/yahoo/container/di/componentgraph/cycle/CycleFinder.java
index ed9b1350b1c..327949bb8d0 100644
--- a/container-di/src/main/java/com/yahoo/container/di/componentgraph/cycle/CycleFinder.java
+++ b/container-di/src/main/java/com/yahoo/container/di/componentgraph/cycle/CycleFinder.java
@@ -11,7 +11,7 @@ import java.util.stream.Collectors;
 import static com.yahoo.container.di.componentgraph.cycle.CycleFinder.State.BLACK;
 import static com.yahoo.container.di.componentgraph.cycle.CycleFinder.State.GRAY;
 import static com.yahoo.container.di.componentgraph.cycle.CycleFinder.State.WHITE;
-import static com.yahoo.log.LogLevel.DEBUG;
+import static java.util.logging.Level.FINE;
 import static java.util.Collections.singletonList;
 
 
@@ -58,7 +58,7 @@ public class CycleFinder<T> {
                 if (visitDepthFirst(vertex, new ArrayList<>(singletonList(vertex)))) {
                     if (cycle == null) throw new IllegalStateException("Null cycle - this should never happen");
                     if (cycle.isEmpty()) throw new IllegalStateException("Empty cycle - this should never happen");
-                    log.log(DEBUG, "Cycle detected: " + cycle);
+                    log.log(FINE, "Cycle detected: " + cycle);
                     return cycle;
                 }
             }
@@ -68,7 +68,7 @@ public class CycleFinder<T> {
 
     private boolean visitDepthFirst(T vertex, List<T> path) {
         colors.put(vertex, GRAY);
-        log.log(DEBUG, "Vertex start " + vertex + " - colors: " + colors + " - path: " + path);
+        log.log(FINE, "Vertex start " + vertex + " - colors: " + colors + " - path: " + path);
         for (T adjacent : graph.getAdjacent(vertex)) {
             path.add(adjacent);
             if (colors.get(adjacent) == GRAY) {
@@ -81,7 +81,7 @@ public class CycleFinder<T> {
             path.remove(adjacent);
         }
         colors.put(vertex, BLACK);
-        log.log(DEBUG, "Vertex end " + vertex + " - colors: " + colors + " - path: " + path);
+        log.log(FINE, "Vertex end " + vertex + " - colors: " + colors + " - path: " + path);
         return false;
     }