Simplify

2 files changed, 6 insertions, 7 deletions

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 30ee7978b28..71b1c56e8c8 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
@@ -38,9 +38,9 @@ public class UserConfigBuilder {
         ConfigDefinitionKey key = DomConfigPayloadBuilder.parseConfigName(element);
         log.log(LogLevel.SPAM, "Looking at " + key);
 
-        ConfigDefinition def = configDefinitionStore.getConfigDefinition(key).orElse(null);
+        Optional<ConfigDefinition> def = configDefinitionStore.getConfigDefinition(key);
         // TODO: Fail here unless deploying with :force true
-        if (def == null) {
+        if ( ! def.isPresent()) {
             logger.log(LogLevel.WARNING, "Unable to find config definition for config '" + key.getNamespace() + "." + key.getName() +
                                          "'. Please ensure that the name is spelled correctly, and that the def file is included in a bundle.");
         }
@@ -48,9 +48,7 @@ public class UserConfigBuilder {
         for (String warning : issuedWarnings) {
             logger.log(LogLevel.WARNING, warning);
         }
-        ConfigPayloadBuilder payloadBuilder = new DomConfigPayloadBuilder(def).build(element, issuedWarnings);
-        log.log(LogLevel.SPAM, "configvalue=" + ConfigPayload.fromBuilder(payloadBuilder).toString());
-        log.log(LogLevel.DEBUG, "Looking up key: " + key.toString());
+        ConfigPayloadBuilder payloadBuilder = new DomConfigPayloadBuilder(def.orElse(null)).build(element, issuedWarnings);
         ConfigPayloadBuilder old = builderMap.get(key);
         if (old != null) {
             logger.log(LogLevel.WARNING, "Multiple overrides for " + key + " found. Applying in the order they are discovered");
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomConfigPayloadBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomConfigPayloadBuilder.java
index a2478f80397..7912dbefad2 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomConfigPayloadBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomConfigPayloadBuilder.java
@@ -32,6 +32,7 @@ public class DomConfigPayloadBuilder {
     private static final Pattern namePattern = ConfigDefinition.namePattern;
     private static final Pattern namespacePattern = ConfigDefinition.namespacePattern;
 
+    /** The config definition, not null if not found */
     private final ConfigDefinition configDefinition;
 
     public DomConfigPayloadBuilder(ConfigDefinition configDefinition) {
@@ -57,8 +58,8 @@ public class DomConfigPayloadBuilder {
 
     public static ConfigDefinitionKey parseConfigName(Element configE) {
         if (!configE.getNodeName().equals("config")) {
-            throw new ConfigurationRuntimeException("The root element must be 'config', but was '"
-                    + configE.getNodeName() + "'.");
+            throw new ConfigurationRuntimeException("The root element must be 'config', but was '" 
+                                                    + configE.getNodeName() + "'.");
         }
         if (!configE.hasAttribute("name")) {
             throw new ConfigurationRuntimeException