More lazy debug log message generation

6 files changed, 10 insertions, 10 deletions

diff --git a/config-model/src/main/java/com/yahoo/config/model/ConfigModelRepo.java b/config-model/src/main/java/com/yahoo/config/model/ConfigModelRepo.java
index 454da0d657a..557df4bd106 100644
--- a/config-model/src/main/java/com/yahoo/config/model/ConfigModelRepo.java
+++ b/config-model/src/main/java/com/yahoo/config/model/ConfigModelRepo.java
@@ -266,7 +266,7 @@ public class ConfigModelRepo implements ConfigModelRepoAdder, Serializable, Iter
     // TODO: Doctoring on the XML is the wrong level for this. We should be able to mark a model as default instead   -Jon
     private static Element getImplicitAdmin(DeployState deployState) throws IOException, SAXException {
         String defaultAdminElement = deployState.isHosted() ? getImplicitAdminV4() : getImplicitAdminV2();
-        log.log(Level.FINE, "No <admin> defined, using " + defaultAdminElement);
+        log.log(Level.FINE, () -> "No <admin> defined, using " + defaultAdminElement);
         return XmlHelper.getDocumentBuilder().parse(new InputSource(new StringReader(defaultAdminElement))).getDocumentElement();
     }
 
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/PortFinder.java b/config-model/src/main/java/com/yahoo/vespa/model/PortFinder.java
index 968f8399e4b..a3d0d2777ab 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/PortFinder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/PortFinder.java
@@ -41,7 +41,7 @@ public class PortFinder {
         String key = request.key();
         if (byKeys.containsKey(key)) {
             int port = byKeys.get(key).port;
-            log.log(Level.FINE, "Re-using port "+port+" for allocation " + request + " on " + host);
+            log.log(Level.FINE, () -> "Re-using port "+port+" for allocation " + request + " on " + host);
             return port;
         }
         int port = request.port;
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java b/config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java
index 44bade4cd84..d78a69b4802 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java
@@ -407,7 +407,7 @@ public final class VespaModel extends AbstractConfigProducerRoot implements Seri
      */
     protected void checkId(String configId) {
         if ( ! id2producer.containsKey(configId)) {
-            log.log(Level.FINE, "Invalid config id: " + configId);
+            log.log(Level.FINE, () -> "Invalid config id: " + configId);
         }
     }
 
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/RankSetupValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/RankSetupValidator.java
index 776ee675ffd..7049213ddab 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/RankSetupValidator.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/RankSetupValidator.java
@@ -99,11 +99,11 @@ public class RankSetupValidator extends Validator {
                 // Give up, don't say same error msg repeatedly
                 deleteTempDir(tempDir);
             }
-            log.log(Level.FINE, String.format("Validating %s for %s, %s took %s ms",
-                                                  sdName,
-                                                  searchCluster,
-                                                  configId,
-                                                  Duration.between(start, Instant.now()).toMillis()));
+            log.log(Level.FINE, () -> String.format("Validating %s for %s, %s took %s ms",
+                                                    sdName,
+                                                    searchCluster,
+                                                    configId,
+                                                    Duration.between(start, Instant.now()).toMillis()));
             return ret;
         } catch (IllegalArgumentException e) {
             deleteTempDir(tempDir);
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/UserConfigBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/UserConfigBuilder.java
index 3390eea21bc..4606d9aa885 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/builder/UserConfigBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/UserConfigBuilder.java
@@ -26,7 +26,7 @@ public class UserConfigBuilder {
         if (producerSpec == null) {
             log.log(Level.FINEST, "In getUserConfigs. producerSpec is null");
         }
-        log.log(Level.FINE, "getUserConfigs for " + producerSpec);
+        log.log(Level.FINE, () -> "getUserConfigs for " + producerSpec);
         for (Element configE : XML.getChildren(producerSpec, "config")) {
             buildElement(configE, builderMap, configDefinitionStore, deployLogger);
         }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/VespaDomBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/VespaDomBuilder.java
index e65fd863d7d..df4cb06ec47 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/VespaDomBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/VespaDomBuilder.java
@@ -136,7 +136,7 @@ public class VespaDomBuilder extends VespaModelBuilder {
             UserConfigRepo userConfigs = UserConfigBuilder.build(producerSpec, deployState, deployState.getDeployLogger());
             // TODO: must be made to work:
             //userConfigs.applyWarnings(child);
-            log.log(Level.FINE, "Adding user configs " + userConfigs + " for " + producerSpec);
+            log.log(Level.FINE, () -> "Adding user configs " + userConfigs + " for " + producerSpec);
             child.mergeUserConfigs(userConfigs);
         }