From 0c58b29c6d22a2896a3167e210e426ac065e31eb Mon Sep 17 00:00:00 2001 From: Olivier Bruchez Date: Fri, 16 Feb 2024 15:50:23 +0100 Subject: [PATCH] Fix erroneous traits used for backward compatibility --- .../scala/org/orbeon/oxf/controller/AuthorizerServlet.scala | 2 +- src/main/scala/org/orbeon/oxf/servlet/HttpLoggingFilter.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/scala/org/orbeon/oxf/controller/AuthorizerServlet.scala b/src/main/scala/org/orbeon/oxf/controller/AuthorizerServlet.scala index ec8914350c..ad5c1600b4 100644 --- a/src/main/scala/org/orbeon/oxf/controller/AuthorizerServlet.scala +++ b/src/main/scala/org/orbeon/oxf/controller/AuthorizerServlet.scala @@ -16,7 +16,7 @@ package org.orbeon.oxf.controller import org.orbeon.oxf.servlet._ // For backward compatibility -trait AuthorizerServlet extends JavaxAuthorizerServlet +class AuthorizerServlet extends JavaxAuthorizerServlet class JavaxAuthorizerServlet extends JavaxServiceHttpServlet (new AuthorizerServletImpl) class JakartaAuthorizerServlet extends JakartaServiceHttpServlet(new AuthorizerServletImpl) diff --git a/src/main/scala/org/orbeon/oxf/servlet/HttpLoggingFilter.scala b/src/main/scala/org/orbeon/oxf/servlet/HttpLoggingFilter.scala index 7840a8b10f..3d068e52dc 100644 --- a/src/main/scala/org/orbeon/oxf/servlet/HttpLoggingFilter.scala +++ b/src/main/scala/org/orbeon/oxf/servlet/HttpLoggingFilter.scala @@ -21,7 +21,7 @@ import scala.jdk.CollectionConverters._ // // For backward compatibility -trait HttpLoggingFilter extends JavaxHttpLoggingFilter +class HttpLoggingFilter extends JavaxHttpLoggingFilter class JavaxHttpLoggingFilter extends JavaxFilter (new HttpLoggingFilterImpl) class JakartaHttpLoggingFilter extends JakartaFilter(new HttpLoggingFilterImpl)