Merge pull request #1037 from scala-steward/update/2.2.x/patches

[2.2.x] Patch updates

Author: mkurz

.git-blame-ignore-revs

@@ -3,3 +3,6 @@
 
 # Scala Steward: Reformat with scalafmt 3.8.3
 186674ddaa8e441a6361b4b677c666eb7bdb4aef
+
+# Scala Steward: Reformat with scalafmt 3.9.7
+cdd452887453edc19f5c924c1baae9c9b81a9abe

.scalafmt.conf

@@ -11,4 +11,4 @@ rewrite.sortModifiers.order = [ "private", "protected", "final", "sealed", "abst
 spaces.inImportCurlyBraces = true   # more idiomatic to include whitepsace in import x.{ yyy }
 trailingCommas = preserve
 newlines.afterCurlyLambda = preserve
-version = 3.9.6
+version = 3.9.7

build.sbt

@@ -72,7 +72,7 @@ lazy val commonSettings = Def.settings(
   licenses           := Seq("Apache-2.0" -> url("http://opensource.org/licenses/Apache-2.0")),
   scalaVersion       := scala213,
   crossScalaVersions := Seq(scala213, scala3),
-  conflictWarning := {
+  conflictWarning    := {
     if (scalaBinaryVersion.value == "3") {
       ConflictWarning("warn", sbt.Level.Warn, false)
     } else {
@@ -106,7 +106,7 @@ lazy val shadedCommonSettings = Seq(
 
 lazy val shadeAssemblySettings = commonSettings ++ shadedCommonSettings ++ Seq(
   assembly / assemblyOption ~= (_.withIncludeScala(false)),
-  assembly / test := {},
+  assembly / test            := {},
   assembly / assemblyJarName := {
     CrossVersion.partialVersion(scalaVersion.value) match {
       case Some((epoch, major)) =>
@@ -167,10 +167,10 @@ lazy val `shaded-asynchttpclient` = project
   .settings(shadeAssemblySettings)
   .settings(
     libraryDependencies ++= asyncHttpClient,
-    name                := "shaded-asynchttpclient",
-    assembly / logLevel := Level.Error,
+    name                             := "shaded-asynchttpclient",
+    assembly / logLevel              := Level.Error,
     assembly / assemblyMergeStrategy := {
-      val NettyPropertiesPath = "META-INF" + File.separator + "io.netty.versions.properties"
+      val NettyPropertiesPath                    = "META-INF" + File.separator + "io.netty.versions.properties"
       val mergeStrategy: String => MergeStrategy = {
         case NettyPropertiesPath =>
           MergeStrategy.first

integration-tests/src/test/scala/play/api/libs/ws/ahc/JsonRequestSpec.scala

@@ -45,7 +45,7 @@ class JsonRequestSpec extends Specification with AfterAll with JsonBodyWritables
   "set a json node" in {
     val jsValue = Json.obj("k1" -> JsString("v1"))
     val client  = StandaloneAhcWSClient()
-    val req = new StandaloneAhcWSRequest(client, "http://playframework.com/", null)
+    val req     = new StandaloneAhcWSRequest(client, "http://playframework.com/", null)
       .withBody(jsValue)
       .asInstanceOf[StandaloneAhcWSRequest]
       .buildRequest()
@@ -60,7 +60,7 @@ class JsonRequestSpec extends Specification with AfterAll with JsonBodyWritables
     implicit val jsonReadable = body(objectMapper)
     val jsonNode              = objectMapper.readTree("""{"k1":"v1"}""")
     val client                = StandaloneAhcWSClient()
-    val req = new StandaloneAhcWSRequest(client, "http://playframework.com/", null)
+    val req                   = new StandaloneAhcWSRequest(client, "http://playframework.com/", null)
       .withBody(jsonNode)
       .asInstanceOf[StandaloneAhcWSRequest]
       .buildRequest()

integration-tests/src/test/scala/play/api/libs/ws/ahc/XMLRequestSpec.scala

@@ -54,7 +54,7 @@ class XMLRequestSpec extends Specification with AfterAll with MustMatchers {
 
     val xml    = XML.parser.loadString("<hello><test></test></hello>")
     val client = StandaloneAhcWSClient()
-    val req = new StandaloneAhcWSRequest(client, "http://playframework.com/", null)
+    val req    = new StandaloneAhcWSRequest(client, "http://playframework.com/", null)
       .withBody(xml)
       .asInstanceOf[StandaloneAhcWSRequest]
       .buildRequest()

integration-tests/src/test/scala/play/libs/ws/ahc/AhcWSClientSpec.scala

@@ -64,7 +64,7 @@ class AhcWSClientSpec(implicit val executionEnv: ExecutionEnv)
     }
 
     "source successfully" in withClient() { client =>
-      val future = client.url(s"http://localhost:$testServerPort").stream().asScala
+      val future                     = client.url(s"http://localhost:$testServerPort").stream().asScala
       val result: Future[ByteString] = future.flatMap { (response: StandaloneWSResponse) =>
         response.getBodyAsSource.runWith(Sink.head[ByteString](), materializer).asScala
       }

integration-tests/src/test/scala/play/libs/ws/ahc/AhcWSRequestFilterSpec.scala

@@ -36,7 +36,7 @@ class AhcWSRequestFilterSpec(implicit val executionEnv: ExecutionEnv)
 
     "work with one request filter" in withClient() { client =>
       import scala.jdk.CollectionConverters._
-      val callList = new java.util.ArrayList[Integer]()
+      val callList       = new java.util.ArrayList[Integer]()
       val responseFuture =
         client
           .url(s"http://localhost:$testServerPort")
@@ -52,7 +52,7 @@ class AhcWSRequestFilterSpec(implicit val executionEnv: ExecutionEnv)
 
     "stream with one request filter" in withClient() { client =>
       import scala.jdk.CollectionConverters._
-      val callList = new java.util.ArrayList[Integer]()
+      val callList       = new java.util.ArrayList[Integer]()
       val responseFuture =
         client
           .url(s"http://localhost:$testServerPort")
@@ -68,7 +68,7 @@ class AhcWSRequestFilterSpec(implicit val executionEnv: ExecutionEnv)
 
     "work with three request filter" in withClient() { client =>
       import scala.jdk.CollectionConverters._
-      val callList = new java.util.ArrayList[Integer]()
+      val callList       = new java.util.ArrayList[Integer]()
       val responseFuture =
         client
           .url(s"http://localhost:$testServerPort")
@@ -86,7 +86,7 @@ class AhcWSRequestFilterSpec(implicit val executionEnv: ExecutionEnv)
 
     "stream with three request filters" in withClient() { client =>
       import scala.jdk.CollectionConverters._
-      val callList = new java.util.ArrayList[Integer]()
+      val callList       = new java.util.ArrayList[Integer]()
       val responseFuture =
         client
           .url(s"http://localhost:$testServerPort")
@@ -105,7 +105,7 @@ class AhcWSRequestFilterSpec(implicit val executionEnv: ExecutionEnv)
     "should allow filters to modify the request" in withClient() { client =>
       val appendedHeader      = "X-Request-Id"
       val appendedHeaderValue = "someid"
-      val responseFuture =
+      val responseFuture      =
         client
           .url(s"http://localhost:$testServerPort")
           .setRequestFilter(new HeaderAppendingFilter(appendedHeader, appendedHeaderValue))
@@ -122,7 +122,7 @@ class AhcWSRequestFilterSpec(implicit val executionEnv: ExecutionEnv)
     "allow filters to modify the streaming request" in withClient() { client =>
       val appendedHeader      = "X-Request-Id"
       val appendedHeaderValue = "someid"
-      val responseFuture =
+      val responseFuture      =
         client
           .url(s"http://localhost:$testServerPort")
           .setRequestFilter(new HeaderAppendingFilter(appendedHeader, appendedHeaderValue))

play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/AhcCurlRequestLogger.scala

@@ -86,7 +86,7 @@ trait CurlFormat {
         b.append(s"  --data '${quote(bodyString)}'")
         b.append(" \\\n")
       case EmptyBody => // Do nothing.
-      case other =>
+      case other     =>
         throw new UnsupportedOperationException("Unsupported body type " + other.getClass)
     }
 

play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/StandaloneAhcWSClient.scala

@@ -74,7 +74,7 @@ class StandaloneAhcWSClient @Inject() (asyncHttpClient: AsyncHttpClient)(implici
   private[ahc] def execute(
       request: Request
   ): Future[StandaloneAhcWSResponse] = {
-    val result = Promise[StandaloneAhcWSResponse]()
+    val result  = Promise[StandaloneAhcWSResponse]()
     val handler = new AsyncCompletionHandler[AHCResponse]() {
       override def onCompleted(response: AHCResponse): AHCResponse = {
         result.success(StandaloneAhcWSResponse(response))
@@ -163,7 +163,7 @@ class StandaloneAhcWSClient @Inject() (asyncHttpClient: AsyncHttpClient)(implici
     import scala.concurrent.ExecutionContext.Implicits.global
 
     val limitedSource = bodyAsSource.limit(StandaloneAhcWSClient.elementLimit)
-    val result = limitedSource
+    val result        = limitedSource
       .runFold(ByteString.createBuilder) { (acc, bs) =>
         acc.append(bs)
       }
@@ -217,7 +217,7 @@ object StandaloneAhcWSClient {
   )(implicit materializer: Materializer): StandaloneAhcWSClient = {
     val ahcConfig       = new AhcConfigBuilder(config).build()
     val asyncHttpClient = new DefaultAsyncHttpClient(ahcConfig)
-    val wsClient = new StandaloneAhcWSClient(
+    val wsClient        = new StandaloneAhcWSClient(
       httpCache
         .map { cache =>
           new CachingAsyncHttpClient(asyncHttpClient, cache)

play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/StandaloneAhcWSRequest.scala

@@ -317,7 +317,7 @@ case class StandaloneAhcWSRequest(
     }
 
     val (builderWithBody, updatedHeaders) = body match {
-      case EmptyBody => (builder, this.headers)
+      case EmptyBody           => (builder, this.headers)
       case InMemoryBody(bytes) =>
         val ct: String = contentType.getOrElse("text/plain")
 
@@ -333,7 +333,7 @@ case class StandaloneAhcWSRequest(
 
               // extract the content type and the charset
               val charsetOption = Option(HttpUtils.extractContentTypeCharsetAttribute(ct))
-              val charset = charsetOption
+              val charset       = charsetOption
                 .getOrElse {
                   StandardCharsets.UTF_8
                 }
@@ -435,7 +435,7 @@ case class StandaloneAhcWSRequest(
   private[libs] def createProxy(wsProxyServer: WSProxyServer): AHCProxyServer = {
     val proxyBuilder = new AHCProxyServer.Builder(wsProxyServer.host, wsProxyServer.port)
     if (wsProxyServer.principal.isDefined) {
-      val realmBuilder = new Realm.Builder(wsProxyServer.principal.orNull, wsProxyServer.password.orNull)
+      val realmBuilder             = new Realm.Builder(wsProxyServer.principal.orNull, wsProxyServer.password.orNull)
       val scheme: Realm.AuthScheme =
         wsProxyServer.protocol.getOrElse("http").toLowerCase(java.util.Locale.ENGLISH) match {
           case "http" | "https" => Realm.AuthScheme.BASIC