Merge pull request #8742 from vespa-engine/balder/gc-yapachelog

GC unused yapache log and derivatives.

3 files changed, 6 insertions, 15 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/component/AccessLogComponent.java b/config-model/src/main/java/com/yahoo/vespa/model/container/component/AccessLogComponent.java
index 009aa454ab3..e75812a9ad6 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/component/AccessLogComponent.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/component/AccessLogComponent.java
@@ -3,10 +3,8 @@ package com.yahoo.vespa.model.container.component;
 
 import com.yahoo.container.core.AccessLogConfig;
 import com.yahoo.container.logging.VespaAccessLog;
-import com.yahoo.container.logging.YApacheAccessLog;
 import com.yahoo.container.logging.JSONAccessLog;
 import com.yahoo.osgi.provider.model.ComponentModel;
-import edu.umd.cs.findbugs.annotations.Nullable;
 
 /**
  * @author Tony Vaagenes
@@ -54,8 +52,6 @@ public final class AccessLogComponent extends SimpleComponent implements AccessL
 
     private static String accessLogClass(AccessLogType logType) {
         switch (logType) {
-            case yApacheAccessLog:
-                return YApacheAccessLog.class.getName();
             case queryAccessLog:
                 return VespaAccessLog.class.getName();
             case jsonAccessLog:
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 0eb34ead7bf..a29c54f951b 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
@@ -3,7 +3,6 @@ package com.yahoo.vespa.model.container.xml;
 
 import com.yahoo.config.model.deploy.DeployState;
 import com.yahoo.config.model.producer.AbstractConfigProducer;
-import com.yahoo.container.core.AccessLogConfig;
 import com.yahoo.vespa.model.builder.xml.dom.VespaDomBuilder;
 import com.yahoo.vespa.model.container.ContainerCluster;
 import com.yahoo.vespa.model.container.component.AccessLogComponent;
@@ -27,7 +26,6 @@ public class AccessLogBuilder {
      */
     private enum AccessLogTypeLiteral {
         VESPA("vespa"),
-        YAPACHE("yapache"),
         JSON("json"),
         DISABLED("disabled");
 
@@ -88,8 +86,6 @@ public class AccessLogBuilder {
                 return null;
             case VESPA:
                 return AccessLogType.queryAccessLog;
-            case YAPACHE:
-                return AccessLogType.yApacheAccessLog;
             case JSON:
                 return AccessLogType.jsonAccessLog;
             default:
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/AccessLogTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/AccessLogTest.java
index d545723241e..7ea71fe686a 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/AccessLogTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/AccessLogTest.java
@@ -6,7 +6,6 @@ import com.yahoo.config.model.builder.xml.test.DomBuilderTest;
 import com.yahoo.container.core.AccessLogConfig;
 import com.yahoo.container.logging.JSONAccessLog;
 import com.yahoo.container.logging.VespaAccessLog;
-import com.yahoo.container.logging.YApacheAccessLog;
 import com.yahoo.vespa.model.container.ContainerCluster;
 import com.yahoo.vespa.model.container.component.Component;
 import org.junit.Test;
@@ -73,7 +72,7 @@ public class AccessLogTest extends ContainerModelBuilderTestBase {
     public void access_log_can_be_configured() throws Exception {
         Element clusterElem = DomBuilderTest.parse(
                 "<jdisc id='default' version='1.0'>",
-                "  <accesslog type='yapache' ",
+                "  <accesslog type='vespa' ",
                 "             fileNamePattern='pattern' rotationInterval='interval' />",
                 "  <accesslog type='json' ",
                 "             fileNamePattern='pattern' rotationInterval='interval' />",
@@ -82,13 +81,13 @@ public class AccessLogTest extends ContainerModelBuilderTestBase {
 
         createModel(root, clusterElem);
         assertNotNull(getJsonAccessLog("default"));
-        assertNull(getVespaAccessLog("default"));
+        assertNotNull(getVespaAccessLog("default"));
 
-        { // yapache
-            Component<?, ?> accessLogComponent = getContainerComponent("default", YApacheAccessLog.class.getName());
+        { // vespa
+            Component<?, ?> accessLogComponent = getContainerComponent("default", VespaAccessLog.class.getName());
             assertNotNull(accessLogComponent);
-            assertEquals(YApacheAccessLog.class.getName(), accessLogComponent.getClassId().getName(), YApacheAccessLog.class.getName());
-            AccessLogConfig config = root.getConfig(AccessLogConfig.class, "default/component/com.yahoo.container.logging.YApacheAccessLog");
+            assertEquals(VespaAccessLog.class.getName(), accessLogComponent.getClassId().getName(), VespaAccessLog.class.getName());
+            AccessLogConfig config = root.getConfig(AccessLogConfig.class, "default/component/com.yahoo.container.logging.VespaAccessLog");
             AccessLogConfig.FileHandler fileHandlerConfig = config.fileHandler();
             assertEquals("pattern", fileHandlerConfig.pattern());
             assertEquals("interval", fileHandlerConfig.rotation());