minor refactoring

1 files changed, 18 insertions, 10 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/AccessLogBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/AccessLogBuilder.java
index a1dba16124e..4f51933d8bb 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/AccessLogBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/AccessLogBuilder.java
@@ -87,23 +87,31 @@ public class AccessLogBuilder {
         }
     }
 
-    public static Optional<AccessLogComponent> buildIfNotDisabled(ContainerCluster cluster, Element accessLogSpec) {
-        AccessLogTypeLiteral typeLiteral =
-                getOptionalAttribute(accessLogSpec, "type").
-                        map(AccessLogTypeLiteral::fromAttributeValue).
-                        orElse(AccessLogTypeLiteral.VESPA);
-        DeployState deployState = cluster.getDeployState();
+    private static AccessLogType logTypeFor(AccessLogTypeLiteral typeLiteral) {
         switch (typeLiteral) {
             case DISABLED:
-                return Optional.empty();
+                return null;
             case VESPA:
-                return Optional.of(new DomBuilder(AccessLogType.queryAccessLog, deployState).build(cluster, accessLogSpec));
+                return AccessLogType.queryAccessLog;
             case YAPACHE:
-                return Optional.of(new DomBuilder(AccessLogType.yApacheAccessLog, deployState).build(cluster, accessLogSpec));
+                return AccessLogType.yApacheAccessLog;
             case JSON:
-                return Optional.of(new DomBuilder(AccessLogType.jsonAccessLog, deployState).build(cluster, accessLogSpec));
+                return AccessLogType.jsonAccessLog;
             default:
                 throw new InconsistentSchemaAndCodeError();
         }
     }
+
+    public static Optional<AccessLogComponent> buildIfNotDisabled(ContainerCluster cluster, Element accessLogSpec) {
+        AccessLogTypeLiteral typeLiteral =
+                getOptionalAttribute(accessLogSpec, "type").
+                        map(AccessLogTypeLiteral::fromAttributeValue).
+                        orElse(AccessLogTypeLiteral.VESPA);
+        AccessLogType logType = logTypeFor(typeLiteral);
+        if (logType == null) {
+            return Optional.empty();
+        }
+        DeployState deployState = cluster.getDeployState();
+        return Optional.of(new DomBuilder(logType, deployState).build(cluster, accessLogSpec));
+    }
 }