build: scalafmt3

Author: j5ik2o

.scalafix.conf

@@ -1,11 +1,11 @@
 rules = [
   //Semantic Rules
-  ExplicitResultTypes,
+  //ExplicitResultTypes, // Deactivated as scalafix on Scala 3 fails otherwise
   RemoveUnused,
   NoAutoTupling,
   //Syntactic Rules
   DisableSyntax,
   ProcedureSyntax,
   LeakingImplicitClassVal,
   NoValInForComprehension
-]
+]

.scalafmt.conf

@@ -1,12 +1,12 @@
-version                                 = 2.7.5
+version                                 = 3.0.0-RC3
 style                                   = defaultWithAlign
-danglingParentheses                     = true
-indentOperator                          = spray
+danglingParentheses.preset              = true
+indentOperator.preset                   = spray
 includeCurlyBraceInSelectChains         = true
 maxColumn                               = 120
 rewrite.rules                           = [RedundantParens, SortImports, PreferCurlyFors]
 spaces.inImportCurlyBraces              = true
 binPack.literalArgumentLists            = false
 unindentTopLevelOperators               = true
 optIn.breaksInsideChains                = true
-newlines.alwaysBeforeTopLevelStatements = true
+newlines.alwaysBeforeTopLevelStatements = true

docker-controller-scala-flyway/src/main/scala/com/github/j5ik2o/dockerController/flyway/FlywaySpecSupport.scala

@@ -58,6 +58,7 @@ trait FlywaySpecSupport {
     flywayDbUserName,
     flywayDbPassword
   )
+
   // s"jdbc:mysql://$flywayDbHost:$flywayDbHostPort/$flywayDbName?useSSL=false&user=$flywayDbUserName&password=$flywayDbPassword",
 
   protected def createFlywayContext(flywayConfig: FlywayConfig): FlywayContext = createFlywayContext(

docker-controller-scala-kafka/src/main/scala/com/github/j5ik2o/dockerController/kafka/KafkaController.scala

@@ -70,15 +70,15 @@ class KafkaController(
   private val zooKeeperContainerPort = zooKeeperController.containerPort
 
   private val environmentVariables = Map(
-    "KAFKA_AUTO_CREATE_TOPICS_ENABLE"        -> (if (createTopics.isEmpty) "false" else "true"),
-    "KAFKA_CREATE_TOPICS"                    -> createTopics.mkString(","),
-    "KAFKA_BROKER_ID"                        -> "1",
-    "KAFKA_ADVERTISED_LISTENERS"             -> s"LISTENER_DOCKER_INTERNAL://$kafkaContainerName:19092,LISTENER_DOCKER_EXTERNAL://$kafkaExternalHostName:$kafkaExternalHostPort",
-    "KAFKA_LISTENERS"                        -> s"LISTENER_DOCKER_INTERNAL://:19092,LISTENER_DOCKER_EXTERNAL://:$kafkaExternalHostPort",
-    "KAFKA_LISTENER_SECURITY_PROTOCOL_MAP"   -> "LISTENER_DOCKER_INTERNAL:PLAINTEXT,LISTENER_DOCKER_EXTERNAL:PLAINTEXT",
-    "KAFKA_INTER_BROKER_LISTENER_NAME"       -> "LISTENER_DOCKER_INTERNAL",
-    "KAFKA_ZOOKEEPER_CONNECT"                -> s"$zooKeeperContainerName:$zooKeeperContainerPort",
-    "KAFKA_LOG4J_LOGGERS"                    -> "kafka.controller=INFO,kafka.producer.async.DefaultEventHandler=INFO,state.change.logger=INFO",
+    "KAFKA_AUTO_CREATE_TOPICS_ENABLE" -> (if (createTopics.isEmpty) "false" else "true"),
+    "KAFKA_CREATE_TOPICS"             -> createTopics.mkString(","),
+    "KAFKA_BROKER_ID"                 -> "1",
+    "KAFKA_ADVERTISED_LISTENERS" -> s"LISTENER_DOCKER_INTERNAL://$kafkaContainerName:19092,LISTENER_DOCKER_EXTERNAL://$kafkaExternalHostName:$kafkaExternalHostPort",
+    "KAFKA_LISTENERS" -> s"LISTENER_DOCKER_INTERNAL://:19092,LISTENER_DOCKER_EXTERNAL://:$kafkaExternalHostPort",
+    "KAFKA_LISTENER_SECURITY_PROTOCOL_MAP" -> "LISTENER_DOCKER_INTERNAL:PLAINTEXT,LISTENER_DOCKER_EXTERNAL:PLAINTEXT",
+    "KAFKA_INTER_BROKER_LISTENER_NAME"     -> "LISTENER_DOCKER_INTERNAL",
+    "KAFKA_ZOOKEEPER_CONNECT"              -> s"$zooKeeperContainerName:$zooKeeperContainerPort",
+    "KAFKA_LOG4J_LOGGERS" -> "kafka.controller=INFO,kafka.producer.async.DefaultEventHandler=INFO,state.change.logger=INFO",
     "KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR" -> "1"
   ) ++ envVars
 

docker-controller-scala-mysql/src/test/scala/com/github/j5ik2o/dockerController/MySQLControllerSpec.scala

@@ -25,7 +25,7 @@ class MySQLControllerSpec extends AnyFreeSpec with DockerControllerSpecSupport w
   override protected def flywayJDBCUrl: String =
     s"jdbc:mysql://$flywayDbHost:$flywayDbHostPort/$flywayDbName?useSSL=false&user=$flywayDbUserName&password=$flywayDbPassword"
 
-  val controller: MySQLController                                    = MySQLController(dockerClient)(hostPort, rootPassword, databaseName = Some("test"))
+  val controller: MySQLController = MySQLController(dockerClient)(hostPort, rootPassword, databaseName = Some("test"))
   override protected val dockerControllers: Vector[DockerController] = Vector(controller)
 
   override protected val waitPredicatesSettings: Map[DockerController, WaitPredicateSetting] =

docker-controller-scala-zookeeper/src/main/scala/com/github/j5ik2o/dockerController/zooKeeper/ZooKeeperController.scala

@@ -61,7 +61,7 @@ class ZooKeeperController(
     val portBinding = new Ports()
     portBinding.bind(zooPort, Ports.Binding.bindPort(hostPort))
     val defaultHostConfig = newHostConfig.withPortBindings(portBinding)
-    val hostConfig        = networkAlias.fold(defaultHostConfig) { n => defaultHostConfig.withNetworkMode(n.network.id) }
+    val hostConfig = networkAlias.fold(defaultHostConfig) { n => defaultHostConfig.withNetworkMode(n.network.id) }
     val result = super
       .newCreateContainerCmd()
       .withEnv(environmentVariables(myId).map { case (k, v) => s"$k=$v" }.toArray: _*)