Merge pull request #19280 from vespa-engine/bratseth/cleanup-876

No functional changes

6 files changed, 17 insertions, 13 deletions

diff --git a/config-model/src/main/java/com/yahoo/config/model/producer/AbstractConfigProducer.java b/config-model/src/main/java/com/yahoo/config/model/producer/AbstractConfigProducer.java
index 2784c111019..decc6e98bc4 100644
--- a/config-model/src/main/java/com/yahoo/config/model/producer/AbstractConfigProducer.java
+++ b/config-model/src/main/java/com/yahoo/config/model/producer/AbstractConfigProducer.java
@@ -223,15 +223,11 @@ public abstract class AbstractConfigProducer<CHILD extends AbstractConfigProduce
             didApply = parent.addUserConfig(builder);
         }
 
-        if (log.isLoggable(Level.FINEST)) {
-            log.log(Level.FINEST, "User configs is: " + userConfigs.toString());
-        }
+        log.log(Level.FINEST, () -> "User configs is: " + userConfigs.toString());
         // TODO: What do we do with md5. Currently ignored for user configs?
         ConfigDefinitionKey key = new ConfigDefinitionKey(builder.getDefName(), builder.getDefNamespace());
         if (userConfigs.get(key) != null) {
-            if (log.isLoggable(Level.FINEST)) {
-                log.log(Level.FINEST, "Apply in " + configId);
-            }
+            log.log(Level.FINEST, () -> "Apply in " + configId);
             applyUserConfig(builder, userConfigs.get(key));
             didApply = true;
         }
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/DistributableResource.java b/config-model/src/main/java/com/yahoo/searchdefinition/DistributableResource.java
index 1719ea72cb0..472bc9d5413 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/DistributableResource.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/DistributableResource.java
@@ -11,6 +11,7 @@ import java.util.Collection;
 import java.util.Objects;
 
 public class DistributableResource {
+
     public enum PathType { FILE, URI, BLOB };
 
     /** The search definition-unique name of this constant */
@@ -95,10 +96,9 @@ public class DistributableResource {
         }
     }
 
+    @Override
     public String toString() {
-        StringBuilder b = new StringBuilder();
-        b.append("resource '").append(name).append(" of type '").append(pathType)
-                .append("' with ref '").append(fileReference).append("'");
-        return b.toString();
+        return "resource '" + name + " of type '" + pathType + "' with ref '" + fileReference + "'";
     }
+
 }
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/IndexingOperation.java b/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/IndexingOperation.java
index 4332d8baea8..87fa74b92fe 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/IndexingOperation.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/IndexingOperation.java
@@ -11,6 +11,7 @@ import com.yahoo.vespa.indexinglanguage.ScriptParserContext;
 import com.yahoo.vespa.indexinglanguage.expressions.ScriptExpression;
 import com.yahoo.vespa.indexinglanguage.expressions.StatementExpression;
 import com.yahoo.vespa.indexinglanguage.linguistics.AnnotatorConfig;
+import com.yahoo.yolean.Exceptions;
 
 /**
  * @author Einar M R Rosenvinge
@@ -46,7 +47,7 @@ public class IndexingOperation implements FieldOperation {
                 exp = new ScriptExpression(StatementExpression.newInstance(config));
             }
         } catch (com.yahoo.vespa.indexinglanguage.parser.ParseException e) {
-            ParseException t = new ParseException("Error reported by IL parser: " + e.getMessage());
+            ParseException t = new ParseException("Could not parse indexing statement: " + Exceptions.toMessageString(e));
             t.initCause(e);
             throw t;
         }
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 937537e5f99..2c87fd5c5b3 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
@@ -492,8 +492,8 @@ public final class VespaModel extends AbstractConfigProducerRoot implements Seri
         boolean found = configProducer.cascadeConfig(builder);
         boolean foundOverride = configProducer.addUserConfig(builder);
         log.log(Level.FINE, () -> "Trying to get config for " + builder.getClass().getDeclaringClass().getName() +
-                " for config id " + quote(configProducer.getConfigId()) +
-                ", found=" + found + ", foundOverride=" + foundOverride);
+                                  " for config id " + quote(configProducer.getConfigId()) +
+                                  ", found=" + found + ", foundOverride=" + foundOverride);
     }
 
     /**
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/component/Component.java b/config-model/src/main/java/com/yahoo/vespa/model/container/component/Component.java
index 6d891c55075..e7f6697aecc 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/component/Component.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/component/Component.java
@@ -69,4 +69,10 @@ public class Component<CHILD extends AbstractConfigProducer<?>, MODEL extends Co
         return getComponentId().compareTo(other.getComponentId());
     }
 
+    @Override
+    public String toString() {
+        return "component " + getClassId() +
+               (getClassId().toString().equals(getComponentId().toString()) ? "" : ": " + getComponentId());
+    }
+
 }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/utils/FileSender.java b/config-model/src/main/java/com/yahoo/vespa/model/utils/FileSender.java
index de5eaa2278e..7d761eb07eb 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/utils/FileSender.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/utils/FileSender.java
@@ -149,6 +149,7 @@ public class FileSender implements Serializable {
         String path = builder.getValue();
         FileReference reference = sentFiles.get(path);
         if (reference == null) {
+
             reference = fileRegistry.addFile(path);
             send(reference, services);
             sentFiles.put(path, reference);