Update scalafix/scalafmt. Reformat all

Author: carlosedp

.scalafix.conf

@@ -1,32 +1,40 @@
 rules = [
   DisableSyntax,
-  # RemoveUnused,
+  RemoveUnused,
   OrganizeImports,
   NoValInForComprehension,
   LeakingImplicitClassVal,
   NoAutoTupling,
   RedundantSyntax,
+  # ExplicitResultTypes,
 ]
 
-DisableSyntax.noFinalize = true
-DisableSyntax.noIsInstanceOf = true
-DisableSyntax.noReturns = true
+RemoveUnused.imports = false
+
+DisableSyntax {
+  noFinalize = true
+  noIsInstanceOf = true
+  noReturns = true
+  # noVars = true
+}
 
 triggered.rules = [
   DisableSyntax
 ]
 
 OrganizeImports {
-  coalesceToWildcardImportThreshold = 6
+  targetDialect = Scala3
+  blankLines = Auto
   expandRelative = true
-    groups = [
+  groupedImports = AggressiveMerge
+  coalesceToWildcardImportThreshold = 5
+  removeUnused = true
+  groups = [
     "re:javax?\\."
     "scala."
     "scala.meta."
+    "zio."
+    "io.quarkus."
     "*"
   ]
-  groupedImports = AggressiveMerge
-  removeUnused = false # Disabled until available on Scalafix for Scala 3.3
-  blankLines = Auto
 }
-OrganizeImports.targetDialect = Scala3

.scalafmt.conf

@@ -1,18 +1,20 @@
-version = 3.8.2
+version = 3.8.3
 runner.dialect = scala3
-project.git = true
 
 fileOverride {
-  "glob:**/build.sc" {
+  "glob:**/build.{sc, mill}" {
     runner.dialect = scala213
   }
 }
-
+project.git = true
 maxColumn = 120
-indent.main = 4
-indent.callSite = 4
 
 align.preset = more
+align.tokens."+" = [
+  {
+    code = ":"
+  }
+]
 assumeStandardLibraryStripMargin = true
 docstrings.style = Asterisk
 docstrings.wrapMaxColumn = 80
@@ -21,33 +23,26 @@ danglingParentheses.preset = true
 danglingParentheses.exclude = [
   "`trait`"
 ]
-align.tokens."+" = [
-  {
-    code = ":"
-  }
-]
 newlines.source = keep
 newlines.beforeCurlyLambdaParams = false
 newlines.implicitParamListModifierForce = [before]
 rewrite.trailingCommas.style = "multiple"
 rewrite.trailingCommas.allowFolding = true
 rewrite.scala3.convertToNewSyntax = true
 rewrite.scala3.removeOptionalBraces = yes
-rewrite.scala3.insertEndMarkerMinLines = 20
-rewrite.scala3.removeEndMarkerMaxLines = 19
-
+rewrite.scala3.insertEndMarkerMinLines = 15
+rewrite.scala3.removeEndMarkerMaxLines = 14
+rewrite.redundantBraces.generalExpressions = false
 rewrite.rules = [
   RedundantBraces,
   RedundantParens,
   PreferCurlyFors,
 ]
-
-verticalMultiline.atDefnSite = true
-verticalMultiline.arityThreshold = 3
-
-rewrite.redundantBraces.generalExpressions = false
 rewriteTokens = {
   "⇒": "=>"
   "→": "->"
   "←": "<-"
 }
+
+verticalMultiline.atDefnSite = true
+verticalMultiline.arityThreshold = 3

build.gradle

@@ -36,6 +36,7 @@ dependencies {
     implementation "io.quarkus:quarkus-rest-qute"
     implementation "io.quarkus:quarkus-smallrye-metrics"
     implementation "io.quarkus:quarkus-smallrye-health"
+    implementation "io.quarkus:quarkus-quartz"
     // Quarkus Test Libs
     testImplementation "io.quarkus:quarkus-junit5"
     testImplementation "io.quarkus:quarkus-jacoco"

pom.xml

@@ -1,7 +1,6 @@
-<?xml version="1.0"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"
-  xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.acme</groupId>
   <artifactId>scala3-quarkus-quickstart</artifactId>
@@ -99,49 +98,53 @@
       <groupId>io.quarkus</groupId>
       <artifactId>quarkus-messaging-kafka</artifactId>
     </dependency>
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-quartz</artifactId>
+    </dependency>
+    <!-- ######## Quarkus Health Check Endpoints ######## -->
     <dependency>
       <groupId>io.smallrye.reactive</groupId>
       <artifactId>smallrye-reactive-messaging-in-memory</artifactId>
       <scope>test</scope>
     </dependency>
-    <!-- ######## Quarkus Health Check Endpoints ######## -->
+    <!-- ######## Hibernate ORM specific dependencies ######## -->
     <dependency>
       <groupId>io.quarkus</groupId>
       <artifactId>quarkus-smallrye-health</artifactId>
     </dependency>
-    <!-- ######## Hibernate ORM specific dependencies ######## -->
+    <!-- JDBC driver dependencies -->
     <dependency>
       <groupId>io.quarkus</groupId>
       <artifactId>quarkus-hibernate-orm</artifactId>
     </dependency>
-    <!-- JDBC driver dependencies -->
+    <!-- Narayana JTA dependencies, added to be more explicit, it is otherwise included because of hibernate-orm extension -->
     <dependency>
       <groupId>io.quarkus</groupId>
       <artifactId>quarkus-jdbc-postgresql</artifactId>
     </dependency>
-    <!-- Narayana JTA dependencies, added to be more explicit, it is otherwise included because of hibernate-orm extension -->
+    <!-- Flyway DB migration specific dependencies -->
     <dependency>
       <groupId>io.quarkus</groupId>
       <artifactId>quarkus-narayana-jta</artifactId>
     </dependency>
-    <!-- Flyway DB migration specific dependencies -->
+    <!-- ######## Scala 3 Magnum DB Library ######## -->
     <dependency>
       <groupId>io.quarkus</groupId>
       <artifactId>quarkus-flyway</artifactId>
     </dependency>
-    <!-- ######## Scala 3 Magnum DB Library ######## -->
+    <!-- ######## Quarkus JUnit test dependencies ######## -->
     <dependency>
       <groupId>com.augustnagro</groupId>
       <artifactId>magnum_3</artifactId>
       <version>1.3.0</version>
     </dependency>
-    <!-- ######## Quarkus JUnit test dependencies ######## -->
+    <!-- Here we use the latest version of Rest Assured to use the Scala 3 extensions -->
     <dependency>
       <groupId>io.quarkus</groupId>
       <artifactId>quarkus-junit5</artifactId>
       <scope>test</scope>
     </dependency>
-    <!-- Here we use the latest version of Rest Assured to use the Scala 3 extensions -->
     <dependency>
       <groupId>io.rest-assured</groupId>
       <artifactId>rest-assured</artifactId>
@@ -159,12 +162,12 @@
       <artifactId>quarkus-jacoco</artifactId>
       <scope>test</scope>
     </dependency>
+    <!-- ######## Metrics dependencies ######## -->
     <dependency>
       <groupId>org.awaitility</groupId>
       <artifactId>awaitility</artifactId>
       <scope>test</scope>
     </dependency>
-    <!-- ######## Metrics dependencies ######## -->
     <dependency>
       <groupId>io.quarkus</groupId>
       <artifactId>quarkus-smallrye-metrics</artifactId>
@@ -288,7 +291,7 @@
       <plugin>
         <groupId>io.github.evis</groupId>
         <artifactId>scalafix-maven-plugin_2.13</artifactId>
-        <version>0.1.10_0.11.0</version>
+        <version>0.1.9_0.12.1</version>
       </plugin>
     </plugins>
   </build>

src/main/scala/helper/Scala3ObjectMapperCustomizer.scala

@@ -1,13 +1,14 @@
 package helper
 
+import io.quarkus.jackson.ObjectMapperCustomizer
+
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.module.scala.DefaultScalaModule
-import io.quarkus.jackson.ObjectMapperCustomizer
 import jakarta.inject.Singleton
 
 @Singleton
 class Scala3ObjectMapperCustomizer extends ObjectMapperCustomizer:
-    def customize(mapper: ObjectMapper) =
-        // General Scala support
-        // https://github.com/FasterXML/jackson-module-scala
-        mapper.registerModule(DefaultScalaModule)
+  def customize(mapper: ObjectMapper) =
+    // General Scala support
+    // https://github.com/FasterXML/jackson-module-scala
+    mapper.registerModule(DefaultScalaModule)

src/main/scala/helper/ZioHelper.scala

@@ -8,29 +8,29 @@ import zio.*
 
 // Helper methods to run ZIO effects and return a CompletionStage
 object ZIOHelper:
+  /**
+   * Run a ZIO effect and return a Java CompletionStage
+   *
+   * @param zio
+   *   ZIO[Any, Throwable, A]
+   * @tparam A
+   *   The type of the ZIO effect
+   * @return
+   *   CompletionStage[A]
+   */
+  def runZio[A](zio: ZIO[Any, Throwable, A]): CompletionStage[A] =
+    val runtime = Runtime.default
+    val run = Unsafe.unsafe { implicit unsafe =>
+      runtime.unsafe.runToFuture(zio)
+    }
+    run.asJava
+
+  extension [A](zio: ZIO[Any, Throwable, A])
     /**
-     * Run a ZIO effect and return a Java CompletionStage
+     * Convert a ZIO effect to a Java CompletionStage
      *
-     * @param zio
-     *   ZIO[Any, Throwable, A]
-     * @tparam A
-     *   The type of the ZIO effect
      * @return
      *   CompletionStage[A]
      */
-    def runZio[A](zio: ZIO[Any, Throwable, A]): CompletionStage[A] =
-        val runtime = Runtime.default
-        val run = Unsafe.unsafe { implicit unsafe =>
-            runtime.unsafe.runToFuture(zio)
-        }
-        run.asJava
-
-    extension [A](zio: ZIO[Any, Throwable, A])
-        /**
-         * Convert a ZIO effect to a Java CompletionStage
-         *
-         * @return
-         *   CompletionStage[A]
-         */
-        def fromZio: CompletionStage[A] = runZio(zio)
+    def fromZio: CompletionStage[A] = runZio(zio)
 end ZIOHelper

src/main/scala/org/acme/GreetingResource.scala

@@ -12,29 +12,29 @@ class GreetingResource(
     // Let's inject the configuration property "greeting.message" into a variable
     @ConfigProperty(name = "greeting.message") message: String
   ):
-    @GET
-    @Path("/hello")
-    @Counted(name = "helloCounter", description = "How many times the hello endpoint was invoked")
-    @Produces(Array(TEXT_PLAIN))
-    def hello() =
-        // Or programatically access the configuration property greeting.suffix
-        val messageSuffix = ConfigProvider.getConfig().getValue("greeting.suffix", classOf[String])
-        s"Hello ${message} from RESTEasy Reactive in Scala 3${messageSuffix}"
+  @GET
+  @Path("/hello")
+  @Counted(name = "helloCounter", description = "How many times the hello endpoint was invoked")
+  @Produces(Array(TEXT_PLAIN))
+  def hello() =
+    // Or programatically access the configuration property greeting.suffix
+    val messageSuffix = ConfigProvider.getConfig().getValue("greeting.suffix", classOf[String])
+    s"Hello ${message} from RESTEasy Reactive in Scala 3${messageSuffix}"
 
-    // This is an endpoint which greets a name or names passed via a query parameter "name"
-    @GET
-    @Path("/greet")
-    @Produces(Array(TEXT_PLAIN))
-    def greeting(@RestQuery @DefaultValue("world") name: Array[String]) =
-        val names = name.mkString(" and ")
-        s"Hello ${names} from RESTEasy Reactive in Scala 3"
+  // This is an endpoint which greets a name or names passed via a query parameter "name"
+  @GET
+  @Path("/greet")
+  @Produces(Array(TEXT_PLAIN))
+  def greeting(@RestQuery @DefaultValue("world") name: Array[String]) =
+    val names = name.mkString(" and ")
+    s"Hello ${names} from RESTEasy Reactive in Scala 3"
 
-    // Generates a greeting message in JSON format
-    @GET
-    @Path("/greet/json")
-    @Produces(Array(APPLICATION_JSON))
-    def greetingJson(@RestQuery @DefaultValue("world") name: Array[String]) =
-        val names = name.mkString(" and ")
-        s"""{"message": "Hello ${names} from RESTEasy Reactive in Scala 3"}"""
+  // Generates a greeting message in JSON format
+  @GET
+  @Path("/greet/json")
+  @Produces(Array(APPLICATION_JSON))
+  def greetingJson(@RestQuery @DefaultValue("world") name: Array[String]) =
+    val names = name.mkString(" and ")
+    s"""{"message": "Hello ${names} from RESTEasy Reactive in Scala 3"}"""
 
 end GreetingResource

src/main/scala/org/acme/Main.scala

@@ -7,13 +7,13 @@ import io.quarkus.runtime.{Quarkus, QuarkusApplication}
 @QuarkusMain
 class Main
 object Main:
-    def main(args: Array[String]): Unit =
-        Quarkus.run(classOf[MainApp], args*)
+  def main(args: Array[String]): Unit =
+    Quarkus.run(classOf[MainApp], args*)
 
 class MainApp extends QuarkusApplication:
-    def run(args: String*): Int =
-        Log.debug("Running MainApp... processing startup logic")
-        Log.debug(s"Startup args: ${if args.isEmpty then "none" else args.mkString(", ")}")
-        Quarkus.waitForExit()
-        Log.debug("Shutting down MainApp... processing shutdown logic")
-        0
+  def run(args: String*): Int =
+    Log.debug("Running MainApp... processing startup logic")
+    Log.debug(s"Startup args: ${if args.isEmpty then "none" else args.mkString(", ")}")
+    Quarkus.waitForExit()
+    Log.debug("Shutting down MainApp... processing shutdown logic")
+    0