Support for Scala 3

Author: Mikhail42

build.sbt

@@ -31,7 +31,7 @@ lazy val client = project
   .settings(
     name               := "play-soap-client",
     description        := "Play SOAP client",
-    crossScalaVersions := Seq(scala213),
+    crossScalaVersions := Seq(scala213, scala3),
     Dependencies.`play-client`,
   )
 
@@ -87,7 +87,7 @@ lazy val testJava = project
   .settings(
     name                    := "play-soap-test-java",
     description             := "Play SOAP integration tests for Java",
-    crossScalaVersions      := Seq(scala213),
+    crossScalaVersions      := Seq(scala213, scala3),
     scalaVersion            := scala213,
     publish / skip          := true,
     Compile / doc / sources := Seq.empty,
@@ -121,7 +121,7 @@ lazy val testScala = project
   .settings(
     name                    := "play-soap-test-scala",
     description             := "Play SOAP integration tests for Scala",
-    crossScalaVersions      := Seq(scala213),
+    crossScalaVersions      := Seq(scala213, scala3),
     scalaVersion            := scala213,
     publish / skip          := true,
     Compile / doc / sources := Seq.empty,

client/src/main/scala/play/soap/PlayJaxWsProxyFactoryBean.scala

@@ -82,7 +82,7 @@ private[soap] class PlayJaxWsProxyFactoryBean extends ClientProxyFactoryBean(new
    * @param h
    *   a <code>List</code> of <code>Handler</code> objects
    */
-  def setHandlers(h: JList[Handler[_ <: MessageContext]]) {
+  def setHandlers(h: JList[Handler[_ <: MessageContext]]): Unit = {
     handlers.clear()
     handlers.addAll(h)
   }
@@ -97,7 +97,7 @@ private[soap] class PlayJaxWsProxyFactoryBean extends ClientProxyFactoryBean(new
     handlers
   }
 
-  def setLoadHandlers(b: Boolean) {
+  def setLoadHandlers(b: Boolean): Unit = {
     loadHandlers = b
   }
 
@@ -123,7 +123,7 @@ private[soap] class PlayJaxWsProxyFactoryBean extends ClientProxyFactoryBean(new
    * @return
    *   the proxy. You must cast the returned object to the approriate class before making remote calls
    */
-  override def create: AnyRef = {
+  override def create(): AnyRef = {
     var orig: ClassLoaderUtils.ClassLoaderHolder = null
     try {
       if (getBus != null) {
@@ -132,7 +132,7 @@ private[soap] class PlayJaxWsProxyFactoryBean extends ClientProxyFactoryBean(new
           orig = ClassLoaderUtils.setThreadContextClassloader(loader)
         }
       }
-      val obj: AnyRef = super.create
+      val obj: AnyRef = super.create()
 
       val service: Service = getServiceFactory.getService
       if (needWrapperClassInterceptor(service.getServiceInfos.get(0))) {
@@ -156,13 +156,10 @@ private[soap] class PlayJaxWsProxyFactoryBean extends ClientProxyFactoryBean(new
     if (serviceInfo == null) {
       return false
     }
-    import scala.collection.JavaConverters._
-    for (opInfo <- serviceInfo.getInterface.getOperations.asScala) {
-      if (opInfo.isUnwrappedCapable && opInfo.getProperty(ReflectionServiceFactoryBean.WRAPPERGEN_NEEDED) != null) {
-        return true
-      }
-    }
-    return false
+    import scala.jdk.CollectionConverters._
+    serviceInfo.getInterface.getOperations.asScala.exists(opInfo =>
+      opInfo.isUnwrappedCapable && opInfo.getProperty(ReflectionServiceFactoryBean.WRAPPERGEN_NEEDED) != null
+    )
   }
 
   private def buildHandlerChain(cp: PlayJaxWsClientProxy): Unit = {
@@ -185,7 +182,7 @@ private[soap] class PlayJaxWsProxyFactoryBean extends ClientProxyFactoryBean(new
       resourceManager = new DefaultResourceManager(resolvers)
       resourceManager.addResourceResolver(new WebServiceContextResourceResolver)
       val injector: ResourceInjector = new ResourceInjector(resourceManager)
-      import scala.collection.JavaConverters._
+      import scala.jdk.CollectionConverters._
       for (h <- chain.asScala) {
         if (Proxy.isProxyClass(h.getClass) && getServiceClass != null) {
           injector.inject(h, getServiceClass)

client/src/main/scala/play/soap/PlaySoapPlugin.scala

@@ -20,7 +20,7 @@ import org.apache.cxf.transport.http.asyncclient.AsyncHttpTransportFactory
 import play.api._
 import play.api.inject.ApplicationLifecycle
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 import scala.concurrent.Future
 import scala.reflect.ClassTag
 
@@ -59,7 +59,7 @@ abstract class PlaySoapClient @Inject() (apacheCxfBus: ApacheCxfBus, configurati
       defaultAddress: String,
       handlers: Handler[_ <: MessageContext]*
   )(implicit ct: ClassTag[T]): T = {
-    val factory = createFactory
+    val factory: PlayJaxWsProxyFactoryBean = createFactory
 
     if (readConfig(portName, _.getOptional[Boolean]("debugLog"), false)) {
       factory.getInInterceptors.add(new LoggingInInterceptor)
@@ -79,7 +79,7 @@ abstract class PlaySoapClient @Inject() (apacheCxfBus: ApacheCxfBus, configurati
     port.asInstanceOf[T]
   }
 
-  private def createFactory = {
+  private def createFactory: PlayJaxWsProxyFactoryBean = {
     val factory = new PlayJaxWsProxyFactoryBean
     factory.setBus(apacheCxfBus.bus)
     factory

project/Common.scala

@@ -50,8 +50,7 @@ object Common extends AutoPlugin {
         )
       ),
       headerMappings ++= Map(
-        // TODO: use `FileType.xml.firstLinePattern` instead after release https://github.com/sbt/sbt-header/issues/310
-        FileType("wsdl", Some("(<\\?xml.*\\?>(?:\\s+))([\\S\\s]*)".r)) -> HeaderCommentStyle.xmlStyleBlockComment
+        FileType("wsdl", FileType.xml.firstLinePattern) -> HeaderCommentStyle.xmlStyleBlockComment
       )
     )
 }

project/Dependencies.scala

@@ -9,6 +9,7 @@ object Dependencies {
 
   object ScalaVersions {
     val scala213 = "2.13.16"
+    val scala3   = "3.3.5"
   }
 
   object Versions {

test/scala/src/test/scala/play/soap/test/PrimitivesSpec.scala

@@ -38,7 +38,7 @@ class PrimitivesSpec extends AsyncWordSpec with BeforeAndAfterAll with AsyncTime
     factory.setServiceClass(classOf[Primitives])
     // noinspection HttpUrlsUsage
     factory.setAddress(s"http://${container.containerIpAddress}:${container.mappedPort(8080)}/primitives")
-    client = factory.create.asInstanceOf[Primitives]
+    client = factory.create().asInstanceOf[Primitives]
   }
 
   "SOAP service that uses primitives" should {