Update scalafmt-core to 3.8.5

.git-blame-ignore-revs

@@ -8,3 +8,6 @@ d91037fb5c5c3d6f4c5ee6ed994331763a8fbacb
 
 # Scala Steward: Reformat with scalafmt 3.8.2
 23009fa5e4e0e26398cc931a236add25d4394e0f
+
+# Scala Steward: Reformat with scalafmt 3.8.5
+7f5ea5c2ddcf2e0bd3810a9240f4df42b05bbb8b

.scalafmt.conf

@@ -1,4 +1,4 @@
-version                                  = 3.8.3
+version                                  = 3.8.5
 runner.dialect                           = scala213
 project.git                              = true
 style                                    = defaultWithAlign

aws-spi-pekko-http/src/test/scala/org/apache/pekko/stream/connectors/awsspi/PekkoHttpClientSpec.scala

@@ -89,7 +89,8 @@ class PekkoHttpClientSpec extends AnyWordSpec with Matchers with OptionValues {
       pekkoClient.connectionSettings.connectionSettings.connectingTimeout shouldBe
       SdkHttpConfigurationOption.GLOBAL_HTTP_DEFAULTS.get(SdkHttpConfigurationOption.CONNECTION_TIMEOUT).asScala
       pekkoClient.connectionSettings.connectionSettings.idleTimeout shouldBe
-      SdkHttpConfigurationOption.GLOBAL_HTTP_DEFAULTS.get(SdkHttpConfigurationOption.CONNECTION_MAX_IDLE_TIMEOUT).asScala
+      SdkHttpConfigurationOption.GLOBAL_HTTP_DEFAULTS.get(
+        SdkHttpConfigurationOption.CONNECTION_MAX_IDLE_TIMEOUT).asScala
       pekkoClient.connectionSettings.maxConnections shouldBe
       SdkHttpConfigurationOption.GLOBAL_HTTP_DEFAULTS.get(SdkHttpConfigurationOption.MAX_CONNECTIONS).intValue()
       infiniteToZero(pekkoClient.connectionSettings.maxConnectionLifetime) shouldBe

aws-spi-pekko-http/src/test/scala/org/apache/pekko/stream/connectors/awsspi/s3/TestS3.scala

@@ -43,7 +43,7 @@ class TestS3 extends BaseAwsClientTest[S3AsyncClient] {
 
     "upload and download a file to a bucket" in withClient { implicit client =>
       val bucketName = createBucket()
-      val fileContent = 0 to 1000 mkString
+      val fileContent = (0 to 1000).mkString
 
       client
         .putObject(PutObjectRequest.builder().bucket(bucketName).key("my-file").contentType("text/plain").build(),
@@ -73,7 +73,8 @@ class TestS3 extends BaseAwsClientTest[S3AsyncClient] {
         .join()
 
       val p1 = client
-        .uploadPart(UploadPartRequest
+        .uploadPart(
+          UploadPartRequest
             .builder()
             .bucket(bucketName)
             .key("bar")
@@ -83,7 +84,8 @@ class TestS3 extends BaseAwsClientTest[S3AsyncClient] {
           randomFile.toPath)
         .join
       val p2 = client
-        .uploadPart(UploadPartRequest
+        .uploadPart(
+          UploadPartRequest
             .builder()
             .bucket(bucketName)
             .key("bar")
@@ -184,5 +186,5 @@ class TestS3 extends BaseAwsClientTest[S3AsyncClient] {
   override lazy val container: GenericContainer = new GenericContainer(
     dockerImage = "adobe/s3mock:2.17.0",
     exposedPorts = Seq(exposedServicePort),
-    waitStrategy = Some(TimeoutWaitStrategy(10 seconds)))
+    waitStrategy = Some(TimeoutWaitStrategy(10.seconds)))
 }

elasticsearch/src/main/scala/org/apache/pekko/stream/connectors/elasticsearch/scaladsl/ElasticsearchFlow.scala

@@ -181,7 +181,8 @@ object ElasticsearchFlow {
 
   @InternalApi
   private def amendWithIndexFlow[T, C]: Flow[immutable.Seq[WriteMessage[T, C]],
-    (immutable.Seq[WriteMessage[T,
+    (
+        immutable.Seq[WriteMessage[T,
           (Int,
               C)]], immutable.Seq[WriteResult[T, (Int, C)]]), NotUsed] = {
     Flow[immutable.Seq[WriteMessage[T, C]]].map { messages =>

geode/src/main/scala-3/org/apache/pekko/stream/connectors/geode/impl/pdx/ObjectEncoder.scala

@@ -25,7 +25,8 @@ private[pekko] trait ObjectEncoder {
   given emptyTupleEncoder: PdxEncoder[EmptyTuple] =
     PdxEncoder.instance[EmptyTuple] { case _ => true }
 
-  given tupleEncoder[K <: String, H, T <: Tuple](using
+  given tupleEncoder[K <: String, H, T <: Tuple](
+      using
       m: ValueOf[K],
       hEncoder: PdxEncoder[H],
       tEncoder: PdxEncoder[T]): PdxEncoder[FieldType[K, H] *: T] =

geode/src/test/scala/docs/scaladsl/GeodeBaseSpec.scala

@@ -56,5 +56,5 @@ class GeodeBaseSpec extends AnyWordSpec with Matchers with BeforeAndAfterAll wit
     Source(range).map(i => Complex(UUID.randomUUID(), List(1, 2, 3), List(new Date()), Set(UUID.randomUUID())))
 
   override protected def afterAll(): Unit =
-    Await.result(system.terminate(), 10 seconds)
+    Await.result(system.terminate(), 10.seconds)
 }

geode/src/test/scala/docs/scaladsl/GeodeContinuousSourceSpec.scala

@@ -58,9 +58,9 @@ class GeodeContinuousSourceSpec extends GeodeBaseSpec {
           .via(flow) // geode flow
           .runWith(Sink.ignore)
 
-        Await.result(f, 10 seconds)
+        Await.result(f, 10.seconds)
 
-        Await.result(source, 5 seconds)
+        Await.result(source, 5.seconds)
         geode.close()
       }
     }

geode/src/test/scala/docs/scaladsl/GeodeFiniteSourceSpec.scala

@@ -38,21 +38,21 @@ class GeodeFiniteSourceSpec extends GeodeBaseSpec {
             .query[Person](s"select * from /persons order by id")
             .runWith(Sink.foreach(e => log.debug(s"$e")))
         // #query
-        Await.ready(source, 10 seconds)
+        Await.ready(source, 10.seconds)
 
         val animals =
           geode
             .query[Animal](s"select * from /animals order by id")
             .runWith(Sink.foreach(e => log.debug(s"$e")))
 
-        Await.ready(animals, 10 seconds)
+        Await.ready(animals, 10.seconds)
 
         val complexes =
           geode
             .query[Complex](s"select * from /complexes order by id")
             .runWith(Sink.foreach(e => log.debug(s"$e")))
 
-        Await.ready(complexes, 10 seconds)
+        Await.ready(complexes, 10.seconds)
 
         geode.close()
       }

geode/src/test/scala/docs/scaladsl/GeodeFlowSpec.scala

@@ -51,7 +51,7 @@ class GeodeFlowSpec extends GeodeBaseSpec {
 
         val fut = source.via(flow).runWith(Sink.ignore)
         // #flow
-        Await.ready(fut, 10 seconds)
+        Await.ready(fut, 10.seconds)
 
         geode.close()
       }
@@ -61,7 +61,7 @@ class GeodeFlowSpec extends GeodeBaseSpec {
         val source = buildPersonsSource(1 to 20)
         val flow: Flow[Person, Person, NotUsed] = geode.flow(personsRegionSettings, PersonPdxSerializer)
         val fut = source.via(flow).runWith(Sink.ignore)
-        Await.ready(fut, 10 seconds)
+        Await.ready(fut, 10.seconds)
         geode.close()
       }
     }

hbase/src/main/scala/org/apache/pekko/stream/connectors/hbase/impl/HBaseCapabilities.scala

@@ -53,7 +53,7 @@ private[impl] trait HBaseCapabilities { this: StageLogging =>
    * @return
    */
   def connect(conf: Configuration, timeout: Int = 10) =
-    Await.result(Future(ConnectionFactory.createConnection(conf)), timeout seconds)
+    Await.result(Future(ConnectionFactory.createConnection(conf)), timeout.seconds)
 
   private[impl] def getOrCreateTable(tableName: TableName, columnFamilies: Seq[String])(
       implicit connection: Connection): Try[Table] = twr(connection.getAdmin) { admin =>

mqtt-streaming/src/main/scala/org/apache/pekko/stream/connectors/mqtt/streaming/impl/RequestState.scala

@@ -492,9 +492,10 @@ import scala.util.{ Either, Failure, Success }
           registrantsByPacketId.get(packetId) match {
             case Some(registration: Registration[A]) =>
               registration.registrant ! event
-              main(registrantsByPacketId
+              main(
+                registrantsByPacketId
                   .updated(packetId,
-                  registration.copy(failureReplies = failureReply +: registration.failureReplies)),
+                    registration.copy(failureReplies = failureReply +: registration.failureReplies)),
                 nextPacketId,
                 pendingRegistrations)
             case None =>

s3/src/main/scala/org/apache/pekko/stream/connectors/s3/impl/S3Stream.scala

@@ -1260,7 +1260,8 @@ import scala.util.{ Failure, Success, Try }
             }
 
         val retriableFlow: Flow[((Chunk, (MultipartUpload, Int)), immutable.Iterable[C]),
-          ((Try[HttpResponse],
+          (
+              (Try[HttpResponse],
                   (
                       MultipartUpload, Int)), immutable.Iterable[C]), NotUsed] =
           Flow[((Chunk, (MultipartUpload, Int)), immutable.Iterable[C])]

solr/src/main/scala/org/apache/pekko/stream/connectors/solr/impl/SolrFlowStage.scala

@@ -190,8 +190,7 @@ private final class SolrFlowLogic[T, C](
       }
     }
 
-    val response = if (messages.nonEmpty) send(messages).fold(0) { _.getStatus }
-    else 0
+    val response = if (messages.nonEmpty) send(messages).fold(0) { _.getStatus } else 0
 
     log.debug("Handle the response with {}", response)
     val results = messages.map(m =>