Add more modules with Scala 3 support (#1591)

Add 7 more projects with Scala 3 support:
- canvas
- control
- metrics
- msgpack
- json
- rx
- ulid

Author: xerial

.github/workflows/test.yml

@@ -54,7 +54,8 @@ jobs:
         with:
           java-version: adopt@1.11
       - name: Scala 3.x test
-        run: DOTTY=true ./sbt dottyTest/run
+        # Only use a limited number of tests until AirSpec and DI can support Scala 3
+        run: DOTTY=true ./sbt "projectDotty/compile; dottyTest/run"
   test_js:
     name: Scala.js / Scala 2.12
     runs-on: ubuntu-latest

airframe-codec/.jvm/src/main/scala/wvlet/airframe/codec/JavaStandardCodec.scala

@@ -56,7 +56,7 @@ object JavaStandardCodec {
     override def unpack(u: Unpacker, v: MessageContext): Unit = {
       val name = u.unpackString
       enumTable.get(CName.toCanonicalName(name)) match {
-        case Some(enum) => v.setObject(enum)
+        case Some(javaEnum) => v.setObject(javaEnum)
         case _ =>
           v.setIncompatibleFormatException(this, s"${name} is not a value of ${enumType}")
       }

airframe-control/.jvm/src/main/scala/wvlet/airframe/control/Shell.scala

@@ -159,7 +159,7 @@ object Shell extends LogSupport {
     */
   def exec(cmdLine: String): Int = {
     val pb       = prepareProcessBuilder(cmdLine, inheritIO = true)
-    val exitCode = Process(pb).!(ProcessLogger { out: String => info(out) })
+    val exitCode = Process(pb).!(ProcessLogger { (out: String) => info(out) })
     debug(s"exec command $cmdLine with exitCode:$exitCode")
     exitCode
   }
@@ -173,7 +173,7 @@ object Shell extends LogSupport {
 
   def execRemote(hostname: String, cmdLine: String): Int = {
     val pb       = prepareProcessBuilderFromSeq(Seq("ssh", hostname, quote(cmdLine)), inheritIO = true)
-    val exitCode = Process(pb).!(ProcessLogger { out: String => info(out) })
+    val exitCode = Process(pb).!(ProcessLogger { (out: String) => info(out) })
     debug(s"exec command $cmdLine with exitCode:$exitCode")
     exitCode
   }

airframe-control/src/main/scala/wvlet/airframe/control/CircuitBreaker.scala

@@ -65,11 +65,11 @@ object CircuitBreaker extends LogSupport {
     default.withHealthCheckPolicy(HealthCheckPolicy.alwaysHealthy)
   }
 
-  private[control] def throwOpenException: CircuitBreakerContext => Unit = { ctx: CircuitBreakerContext =>
+  private[control] def throwOpenException: CircuitBreakerContext => Unit = { (ctx: CircuitBreakerContext) =>
     throw CircuitBreakerOpenException(ctx)
   }
 
-  private[control] def reportStateChange = { ctx: CircuitBreakerContext =>
+  private[control] def reportStateChange = { (ctx: CircuitBreakerContext) =>
     info(s"CircuitBreaker(name:${ctx.name}) is changed to ${ctx.state}")
   }
 }
@@ -284,15 +284,18 @@ case class CircuitBreaker(
     recoveryPolicy.recordSuccess
     val isDead = healthCheckPolicy.isMarkedDead
     currentState.get() match {
-      case HALF_OPEN if (recoveryPolicy.canRecover) =>
+      case HALF_OPEN if (recoveryPolicy.canRecover) => {
         // Probe request succeeds, so move to CLOSED state
         healthCheckPolicy.recovered
         close
-      case CLOSED if isDead =>
+      }
+      case CLOSED if isDead => {
         open
-      case OPEN if !isDead =>
+      }
+      case OPEN if !isDead => {
         // Service is not marked dead, so try proving at HALF_OPEN state
         halfOpen
+      }
       case _ =>
     }
   }

airframe-control/src/main/scala/wvlet/airframe/control/ResultClass.scala

@@ -43,7 +43,7 @@ object ResultClass {
   def retryableFailure(e: Throwable): Failed    = Retry.retryableFailure(e)
   def nonRetryableFailure(e: Throwable): Failed = Retry.nonRetryableFailure(e)
 
-  def ALWAYS_SUCCEED: Any => ResultClass = { x: Any => Succeeded }
+  def ALWAYS_SUCCEED: Any => ResultClass = { (x: Any) => Succeeded }
 
-  def ALWAYS_RETRY: Throwable => ResultClass.Failed = { e: Throwable => retryableFailure(e) }
+  def ALWAYS_RETRY: Throwable => ResultClass.Failed = { (e: Throwable) => retryableFailure(e) }
 }

airframe-control/src/main/scala/wvlet/airframe/control/Retry.scala

@@ -96,13 +96,13 @@ object Retry extends LogSupport {
 
   case object NOT_STARTED extends Exception("Code is not executed")
 
-  private def REPORT_RETRY_COUNT: RetryContext => Unit = { ctx: RetryContext =>
+  private def REPORT_RETRY_COUNT: RetryContext => Unit = { (ctx: RetryContext) =>
     warn(
       f"[${ctx.retryCount}/${ctx.maxRetry}] Execution failed: ${ctx.lastError.getMessage}. Retrying in ${ctx.nextWaitMillis / 1000.0}%.2f sec."
     )
   }
 
-  private def RETHROW_ALL: Throwable => ResultClass.Failed = { e: Throwable => throw e }
+  private def RETHROW_ALL: Throwable => ResultClass.Failed = { (e: Throwable) => throw e }
 
   private[control] val noExtraWait = ExtraWait()
 
@@ -236,7 +236,7 @@ object Retry extends LogSupport {
       * Clear the default beforeRetry action
       */
     def noRetryLogging: RetryContext = {
-      this.copy(beforeRetryAction = { x: RetryContext => })
+      this.copy(beforeRetryAction = { (x: RetryContext) => })
     }
 
     /**
@@ -246,7 +246,7 @@ object Retry extends LogSupport {
       * @return
       */
     def retryOn(errorClassifier: PartialFunction[Throwable, ResultClass.Failed]): RetryContext = {
-      this.copy(errorClassifier = { e: Throwable => errorClassifier.applyOrElse(e, RETHROW_ALL) })
+      this.copy(errorClassifier = { (e: Throwable) => errorClassifier.applyOrElse(e, RETHROW_ALL) })
     }
 
     def run[A](body: => A): A = {
@@ -261,7 +261,10 @@ object Retry extends LogSupport {
       var result: Option[A]          = None
       var retryContext: RetryContext = init(context)
 
-      do {
+      var isFirst: Boolean = true
+
+      while (isFirst || (result.isEmpty && retryContext.canContinue)) {
+        isFirst = false
         val ret = Try(body)
         val resultClass = ret match {
           case Success(x) =>
@@ -286,7 +289,7 @@ object Retry extends LogSupport {
             // Non-retryable error. Exit the loop by throwing the exception
             throw cause
         }
-      } while (result.isEmpty && retryContext.canContinue)
+      }
 
       result match {
         case Some(a) =>

airframe-rx/src/main/scala/wvlet/airframe/rx/RxOption.scala

@@ -46,7 +46,7 @@ trait RxOption[+A] extends Rx[Option[A]] {
   def transform[B](f: Option[A] => B): RxStream[B] = {
     MapOp(
       in,
-      { x: Option[A] =>
+      { (x: Option[A]) =>
         f(x)
       }
     )
@@ -60,7 +60,7 @@ trait RxOption[+A] extends Rx[Option[A]] {
     RxOptionOp[B](
       FlatMapOp(
         in,
-        { x: Option[A] =>
+        { (x: Option[A]) =>
           f(x)
         }
       )
@@ -71,7 +71,7 @@ trait RxOption[+A] extends Rx[Option[A]] {
     RxOptionOp[B](
       MapOp(
         in,
-        { x: Option[A] =>
+        { (x: Option[A]) =>
           f(x)
         }
       )

airframe-rx/src/main/scala/wvlet/airframe/rx/RxRunner.scala

@@ -101,7 +101,7 @@ class RxRunner(
         val c2 = run(fm.input) {
           case OnNext(x) =>
             var toContinue: RxResult = RxResult.Continue
-            Try(fm.f(x)) match {
+            Try(fm.f.asInstanceOf[Function[Any, Rx[_]]](x)) match {
               case Success(rxb) =>
                 // This code is necessary to properly cancel the effect if this operator is evaluated before
                 c1.cancel

airframe-rx/src/main/scala/wvlet/airframe/rx/RxVar.scala

@@ -31,7 +31,7 @@ class RxVar[A](private var currentValue: A) extends RxStream[A] with RxVarOps[A]
   override def get: A = currentValue
 
   override def foreach[U](f: A => U): Cancelable = {
-    val s = { ev: RxEvent =>
+    val s = { (ev: RxEvent) =>
       ev match {
         case OnNext(v) =>
           f(v.asInstanceOf[A])
@@ -84,12 +84,12 @@ trait RxVarOps[A] {
   def foreach[U](f: A => U): Cancelable
   def :=(newValue: A): Unit = set(newValue)
   def set(newValue: A): Unit =
-    update { x: A =>
+    update { (x: A) =>
       newValue
     }
   def forceSet(newValue: A): Unit =
     update(
-      { x: A =>
+      { (x: A) =>
         newValue
       },
       force = true

build.sbt

@@ -11,7 +11,7 @@ val withDotty           = SCALA_3_0 :: targetScalaVersions
 val AIRSPEC_VERSION                 = "21.4.0"
 val SCALACHECK_VERSION              = "1.15.3"
 val MSGPACK_VERSION                 = "0.8.22"
-val SCALA_PARSER_COMBINATOR_VERSION = "1.1.2"
+val SCALA_PARSER_COMBINATOR_VERSION = "1.2.0-RC2"
 val SQLITE_JDBC_VERSION             = "3.34.0"
 val SLF4J_VERSION                   = "1.7.30"
 val JS_JAVA_LOGGING_VERSION         = "1.0.0"
@@ -246,7 +246,30 @@ lazy val projectDotty =
       noPublish,
       crossScalaVersions := Seq(SCALA_3_0)
     )
-    .aggregate(logJVM, surfaceJVM)
+    .aggregate(
+      logJVM,
+      surfaceJVM,
+      canvas,
+      controlJVM,
+      // codec uses Scala reflection
+      //codecJVM,
+      //fluentd,
+      //httpJVM,
+      //// Finagle isn't supporting Scala 3
+      //httpFinagle,
+      //grpc,
+      //jdbc,
+      //jmx,
+      //launcher,
+      metricsJVM,
+      msgpackJVM,
+      jsonJVM,
+      rxJVM,
+      // rx-html uses Scala Macros
+      //rxHtmlJVM,
+      //sql,
+      ulidJVM
+    )
 
 lazy val docs =
   project
@@ -468,6 +491,9 @@ lazy val ulid =
       name := "airframe-ulid",
       description := "ULID: Universally Unique Lexicographically Sortable Identifier"
     )
+    .jsSettings(
+      jsBuildSettings
+    )
     .dependsOn(log % Test)
 
 lazy val ulidJVM = ulid.jvm
@@ -883,7 +909,12 @@ lazy val rxHtml =
     .settings(
       name := "airframe-rx-html",
       description := "Reactive HTML elements for Scala and Scala.js",
-      libraryDependencies += "org.scala-lang" % "scala-reflect" % scalaVersion.value % Provided
+      libraryDependencies ++= {
+        if (DOTTY)
+          Seq.empty
+        else
+          Seq("org.scala-lang" % "scala-reflect" % scalaVersion.value % Provided)
+      }
     )
     .jsSettings(
       jsBuildSettings,