Skip to content

Commit

Permalink
For #6491: compile authorizer module with Scala 3
Browse files Browse the repository at this point in the history
- also try Optional Braces syntax and Universal Apply Methods
  • Loading branch information
Erik Bruchez committed Sep 19, 2024
1 parent b9accf4 commit fe116ef
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,18 @@
*/
package org.orbeon.oxf.controller

import org.orbeon.oxf.http.StatusCode
import org.orbeon.oxf.servlet.*


// For backward compatibility
class AuthorizerServlet extends JavaxAuthorizerServlet

class JavaxAuthorizerServlet extends JavaxServiceHttpServlet (new AuthorizerServletImpl)
class JakartaAuthorizerServlet extends JakartaServiceHttpServlet(new AuthorizerServletImpl)
class JavaxAuthorizerServlet extends JavaxServiceHttpServlet (AuthorizerServletImpl())
class JakartaAuthorizerServlet extends JakartaServiceHttpServlet(AuthorizerServletImpl())

// This servlet just returns an ok response when accessed
class AuthorizerServletImpl extends ServiceHttpServlet {
override def service(request: HttpServletRequest, response: HttpServletResponse): Unit = {
response.setStatus(200)
class AuthorizerServletImpl extends ServiceHttpServlet:
override def service(request: HttpServletRequest, response: HttpServletResponse): Unit =
response.setStatus(StatusCode.Ok)
response.setContentType("text/plain")
}
}
1 change: 1 addition & 0 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -601,6 +601,7 @@ lazy val authorizer = (project in file("authorizer"))
.settings(commonSettings: _*)
.settings(
name := "orbeon-authorizer",
scalaVersion := scala3,
libraryDependencies += "javax.servlet" % "javax.servlet-api" % JavaxServletApiVersion % Provided,
libraryDependencies += "jakarta.servlet" % "jakarta.servlet-api" % JakartaServletApiVersion % Provided
)
Expand Down

0 comments on commit fe116ef

Please sign in to comment.