Remove on Vespa 8

2 files changed, 0 insertions, 31 deletions

diff --git a/container-core/abi-spec.json b/container-core/abi-spec.json
index a088659e2f4..881c22cb482 100644
--- a/container-core/abi-spec.json
+++ b/container-core/abi-spec.json
@@ -723,11 +723,9 @@
       "public"
     ],
     "methods": [
-      "public void <init>(java.util.concurrent.Executor, com.yahoo.container.logging.AccessLog, com.yahoo.jdisc.Metric)",
       "public void <init>(java.util.concurrent.Executor, com.yahoo.jdisc.Metric)",
       "public void <init>(com.yahoo.container.jdisc.LoggingRequestHandler$Context)",
       "public java.util.concurrent.Executor getExecutor()",
-      "public com.yahoo.container.logging.AccessLog getAccessLog()",
       "public com.yahoo.jdisc.Metric getMetric()"
     ],
     "fields": []
@@ -742,12 +740,9 @@
     "methods": [
       "public static com.yahoo.container.jdisc.LoggingRequestHandler$Context testOnlyContext()",
       "public void <init>(com.yahoo.container.jdisc.LoggingRequestHandler$Context)",
-      "public void <init>(java.util.concurrent.Executor, com.yahoo.container.logging.AccessLog)",
       "public void <init>(java.util.concurrent.Executor)",
       "public void <init>(com.yahoo.container.jdisc.LoggingRequestHandler$Context, boolean)",
       "public void <init>(java.util.concurrent.Executor, com.yahoo.jdisc.Metric)",
-      "public void <init>(java.util.concurrent.Executor, com.yahoo.container.logging.AccessLog, com.yahoo.jdisc.Metric)",
-      "public void <init>(java.util.concurrent.Executor, com.yahoo.container.logging.AccessLog, com.yahoo.jdisc.Metric, boolean)",
       "public void <init>(java.util.concurrent.Executor, com.yahoo.jdisc.Metric, boolean)",
       "protected com.yahoo.container.jdisc.LoggingCompletionHandler createLoggingCompletionHandler(long, long, com.yahoo.container.jdisc.HttpResponse, com.yahoo.container.jdisc.HttpRequest, com.yahoo.container.jdisc.ContentChannelOutputStream)"
     ],
diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/LoggingRequestHandler.java b/container-core/src/main/java/com/yahoo/container/jdisc/LoggingRequestHandler.java
index c6735559429..fa4ed9a4afa 100644
--- a/container-core/src/main/java/com/yahoo/container/jdisc/LoggingRequestHandler.java
+++ b/container-core/src/main/java/com/yahoo/container/jdisc/LoggingRequestHandler.java
@@ -28,7 +28,6 @@ import java.util.logging.Level;
  *
  * @deprecated  Use {@link ThreadedHttpRequestHandler}, which provides the same level of functionality.
  */
-// TODO Vespa 8: Remove deprecated constructors
 @Deprecated
 public abstract class LoggingRequestHandler extends ThreadedHttpRequestHandler {
 
@@ -38,12 +37,6 @@ public abstract class LoggingRequestHandler extends ThreadedHttpRequestHandler {
         final Executor executor;
         final Metric metric;
 
-        /** @deprecated Use {@link #Context(Executor, Metric)} instead */
-        @Deprecated(forRemoval = true, since = "7")
-        public Context(Executor executor, AccessLog ignored, Metric metric) {
-            this(executor, metric);
-        }
-
         @Inject
         public Context(Executor executor, Metric metric) {
             this.executor = executor;
@@ -56,7 +49,6 @@ public abstract class LoggingRequestHandler extends ThreadedHttpRequestHandler {
         }
 
         public Executor getExecutor() { return executor; }
-        @Deprecated(forRemoval = true, since = "7") public AccessLog getAccessLog() { return null; }
         public Metric getMetric() { return metric; }
 
     }
@@ -76,12 +68,6 @@ public abstract class LoggingRequestHandler extends ThreadedHttpRequestHandler {
         this(ctx.executor, ctx.metric);
     }
 
-    /** @deprecated Use {@link #LoggingRequestHandler(Executor)} instead */
-    @Deprecated(forRemoval = true, since = "7")
-    public LoggingRequestHandler(Executor executor, AccessLog ignored) {
-        this(executor, (Metric)null);
-    }
-
     public LoggingRequestHandler(Executor executor) {
         this(executor, (Metric)null);
     }
@@ -94,18 +80,6 @@ public abstract class LoggingRequestHandler extends ThreadedHttpRequestHandler {
         this(executor, metric, false);
     }
 
-    /** @deprecated Use {@link #LoggingRequestHandler(Executor, Metric)} instead */
-    @Deprecated(forRemoval = true, since = "7")
-    public LoggingRequestHandler(Executor executor, AccessLog ignored, Metric metric) {
-        this(executor, metric, false);
-    }
-
-    /** @deprecated Use {@link #LoggingRequestHandler(Executor, Metric, boolean)} instead */
-    @Deprecated(forRemoval = true, since = "7")
-    public LoggingRequestHandler(Executor executor, AccessLog ignored, Metric metric, boolean allowAsyncResponse) {
-        this(executor, metric, allowAsyncResponse);
-    }
-
     public LoggingRequestHandler(Executor executor, Metric metric, boolean allowAsyncResponse) {
         super(executor, metric, allowAsyncResponse);
     }