re-enable scala3 tests (#167)

Author: pjfanning

.github/workflows/ci.yml

@@ -59,13 +59,9 @@ jobs:
         run: sbt '++${{ matrix.scala }}' coverage test coverageReport
 
       - name: Scala build
-        if: '!startsWith(matrix.scala, ''2.13'') && !startsWith(matrix.scala, ''3.0'')'
+        if: '!startsWith(matrix.scala, ''2.13''))'
         run: sbt '++${{ matrix.scala }}' test
 
-      - name: Scala compile
-        if: startsWith(matrix.scala, '3.0')
-        run: sbt '++${{ matrix.scala }}' compile
-
       - name: Publish to Codecov.io
         if: startsWith(matrix.scala, '2.13')
         uses: codecov/codecov-action@v2

build.sbt

@@ -73,9 +73,10 @@ libraryDependencies ++= Seq(
   "org.slf4j" % "slf4j-simple" % "1.7.36" % Test
 )
 libraryDependencies ++= {
-  CrossVersion.partialVersion(Keys.scalaVersion.value) match {
-    case Some((3, _)) => Seq()
-    case _ => Seq("org.scala-lang" % "scala-reflect" % scalaVersion.value)
+  if (scalaReleaseVersion.value == 2) {
+    Seq("org.scala-lang" % "scala-reflect" % scalaVersion.value)
+  } else {
+    Seq()
   }
 }
 
@@ -85,14 +86,14 @@ Test / parallelExecution := false
 
 startYear := Some(2014)
 
-licenses := Seq(("Apache License 2.0", new URL("http://www.apache.org/licenses/LICENSE-2.0.html")))
+licenses := Seq(("Apache License 2.0", new URL("https://www.apache.org/licenses/LICENSE-2.0.html")))
 
 pomExtra := {
   pomExtra.value ++ Group(
-    <issueManagement>
-      <system>github</system>
-      <url>https://github.com/swagger-api/swagger-scala-module/issues</url>
-    </issueManagement>
+      <issueManagement>
+        <system>github</system>
+        <url>https://github.com/swagger-api/swagger-scala-module/issues</url>
+      </issueManagement>
       <developers>
         <developer>
           <id>fehguy</id>
@@ -110,8 +111,7 @@ pomExtra := {
 
 ThisBuild / githubWorkflowBuild := Seq(
   WorkflowStep.Sbt(List("coverage", "test", "coverageReport"), name = Some("Scala 2.13 build"), cond = Some("startsWith(matrix.scala, '2.13')")),
-  WorkflowStep.Sbt(List("test"), name = Some("Scala build"), cond = Some("!startsWith(matrix.scala, '2.13') && !startsWith(matrix.scala, '3.0')")),
-  WorkflowStep.Sbt(List("compile"), name = Some("Scala compile"), cond = Some("startsWith(matrix.scala, '3.0')")),
+  WorkflowStep.Sbt(List("test"), name = Some("Scala build"), cond = Some("!startsWith(matrix.scala, '2.13'))"))
 )
 
 ThisBuild / githubWorkflowJavaVersions := Seq(JavaSpec(Zulu, "8"))

src/main/scala-2/com/github/swagger/scala/converter/RuntimeUtil.scala

@@ -0,0 +1,5 @@
+package com.github.swagger.scala.converter
+
+object RuntimeUtil {
+  def isScala3(): Boolean = false
+}

src/main/scala-3/com/github/swagger/scala/converter/RuntimeUtil.scala

@@ -0,0 +1,5 @@
+package com.github.swagger.scala.converter
+
+object RuntimeUtil {
+  def isScala3(): Boolean = true
+}

src/test/scala/com/github/swagger/scala/converter/ModelPropertyParserTest.scala

@@ -1,6 +1,5 @@
 package com.github.swagger.scala.converter
 
-import com.fasterxml.jackson.module.scala.introspect.ScalaAnnotationIntrospector
 import io.swagger.v3.core.converter._
 import io.swagger.v3.core.util.Json
 import io.swagger.v3.oas.models.media._
@@ -107,10 +106,14 @@ class ModelPropertyParserTest extends AnyFlatSpec with Matchers with OptionValue
     val model = schemas.get("ModelWOptionInt")
     model should be (defined)
     model.value.getProperties should not be (null)
-    val optInt = model.value.getProperties.get("optInt")
+    val optInt = model.value.getProperties().get("optInt")
     optInt should not be (null)
-    optInt shouldBe a [IntegerSchema]
-    optInt.asInstanceOf[IntegerSchema].getFormat shouldEqual "int32"
+    if (RuntimeUtil.isScala3()) {
+      optInt shouldBe a[ObjectSchema]
+    } else {
+      optInt shouldBe a[IntegerSchema]
+      optInt.asInstanceOf[IntegerSchema].getFormat shouldEqual "int32"
+    }
     nullSafeList(model.value.getRequired) shouldBe empty
   }
 
@@ -122,8 +125,12 @@ class ModelPropertyParserTest extends AnyFlatSpec with Matchers with OptionValue
     model.value.getProperties should not be (null)
     val optInt = model.value.getProperties().get("optInt")
     optInt should not be (null)
-    optInt shouldBe a [IntegerSchema]
-    optInt.asInstanceOf[IntegerSchema].getFormat shouldEqual "int32"
+    if (RuntimeUtil.isScala3()) {
+      optInt shouldBe a[ObjectSchema]
+    } else {
+      optInt shouldBe a[IntegerSchema]
+      optInt.asInstanceOf[IntegerSchema].getFormat shouldEqual "int32"
+    }
     optInt.getDescription shouldBe "This is an optional int"
     nullSafeList(model.value.getRequired) shouldBe empty
   }
@@ -136,7 +143,12 @@ class ModelPropertyParserTest extends AnyFlatSpec with Matchers with OptionValue
     model.value.getProperties should not be (null)
     val optInt = model.value.getProperties().get("optInt")
     optInt should not be (null)
-    optInt shouldBe an [IntegerSchema]
+    if (RuntimeUtil.isScala3()) {
+      optInt shouldBe a[ObjectSchema]
+    } else {
+      optInt shouldBe a[IntegerSchema]
+      optInt.asInstanceOf[IntegerSchema].getFormat shouldEqual "int32"
+    }
     nullSafeList(model.value.getRequired) shouldEqual Seq("optInt")
   }
 
@@ -148,27 +160,13 @@ class ModelPropertyParserTest extends AnyFlatSpec with Matchers with OptionValue
     model.value.getProperties should not be (null)
     val optLong = model.value.getProperties().get("optLong")
     optLong should not be (null)
-    optLong shouldBe a [IntegerSchema]
-    nullSafeList(model.value.getRequired) shouldBe empty
-  }
-
-  //needs investigation
-  it should "process Model with Scala Option Long (with jackson model override)" ignore {
-    ScalaAnnotationIntrospector.registerReferencedValueType(
-      classOf[ModelWOptionLong], "optLong", classOf[Long])
-    try {
-      val converter = ModelConverters.getInstance()
-      val schemas = converter.readAll(classOf[ModelWOptionLong]).asScala.toMap
-      val model = schemas.get("ModelWOptionLong")
-      model should be (defined)
-      model.value.getProperties should not be (null)
-      val optLong = model.value.getProperties().get("optLong")
-      optLong shouldBe a [IntegerSchema]
+    if (RuntimeUtil.isScala3()) {
+      optLong shouldBe a[ObjectSchema]
+    } else {
+      optLong shouldBe a[IntegerSchema]
       optLong.asInstanceOf[IntegerSchema].getFormat shouldEqual "int64"
-      nullSafeList(model.value.getRequired) shouldBe empty
-    } finally {
-      ScalaAnnotationIntrospector.clearRegisteredReferencedTypes()
     }
+    nullSafeList(model.value.getRequired) shouldBe empty
   }
 
   it should "process Model with Scala Option Long with Schema Override" in {
@@ -350,7 +348,11 @@ class ModelPropertyParserTest extends AnyFlatSpec with Matchers with OptionValue
     stringsField shouldBe a[ArraySchema]
     val arraySchema = stringsField.asInstanceOf[ArraySchema]
     arraySchema.getUniqueItems() shouldBe (null)
-    arraySchema.getItems shouldBe a[IntegerSchema]
+    if (RuntimeUtil.isScala3()) {
+      arraySchema.getItems shouldBe a[ObjectSchema]
+    } else {
+      arraySchema.getItems shouldBe a[IntegerSchema]
+    }
     nullSafeMap(arraySchema.getProperties()) shouldBe empty
     nullSafeList(arraySchema.getRequired()) shouldBe empty
   }
@@ -368,8 +370,11 @@ class ModelPropertyParserTest extends AnyFlatSpec with Matchers with OptionValue
     val arraySchema = stringsField.asInstanceOf[ArraySchema]
     arraySchema.getUniqueItems() shouldBe (null)
 
-
-    arraySchema.getItems shouldBe a[IntegerSchema]
+    if (RuntimeUtil.isScala3()) {
+      arraySchema.getItems shouldBe a[ObjectSchema]
+    } else {
+      arraySchema.getItems shouldBe a[IntegerSchema]
+    }
     arraySchema.getItems.getDescription shouldBe "These are ints"
     nullSafeMap(arraySchema.getProperties()) shouldBe empty
     nullSafeList(arraySchema.getRequired()) shouldBe empty

src/test/scala/com/github/swagger/scala/converter/ScalaModelTest.scala

@@ -85,15 +85,17 @@ class ScalaModelTest extends AnyFlatSpec with Matchers {
     val model = schemas("ModelWithIntVector")
     val prop = model.getProperties().get("ints")
     prop shouldBe a [ArraySchema]
-    prop.asInstanceOf[ArraySchema].getItems.getType should be ("integer")
+    val expectedType = if (RuntimeUtil.isScala3()) "object" else "integer"
+    prop.asInstanceOf[ArraySchema].getItems.getType should be (expectedType)
   }
 
   it should "read a model with vector of booleans" in {
     val schemas = ModelConverters.getInstance().readAll(classOf[ModelWithBooleanVector]).asScala
     val model = schemas("ModelWithBooleanVector")
     val prop = model.getProperties().get("bools")
     prop shouldBe a [ArraySchema]
-    prop.asInstanceOf[ArraySchema].getItems.getType should be ("boolean")
+    val expectedType = if (RuntimeUtil.isScala3()) "object" else "boolean"
+    prop.asInstanceOf[ArraySchema].getItems.getType should be (expectedType)
   }
 }