Fixed scala2.13 linting errors

hnaderi · Aug 16, 2024 · 276d656 · 276d656
1 parent a353f2d
commit 276d656
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/modules/http4s-ember/.js/src/main/scala/PlatformCompanion.scala b/modules/http4s-ember/.js/src/main/scala/PlatformCompanion.scala
@@ -102,10 +102,10 @@ private[http4s] abstract class PlatformCompanion[F[_]: Async: Files: Env]
             "Cannot find where/how to connect using the provided config!"
           ).raiseError
         )
-      case Some((cluster, server, auth)) =>
+      case Some((clusterData, server, auth)) =>
         ssl(
-          caFile = cluster.`certificate-authority`,
-          caData = cluster.`certificate-authority-data`,
+          caFile = clusterData.`certificate-authority`,
+          caData = clusterData.`certificate-authority-data`,
           clientCert = auth.`client-certificate-data`,
           clientCertFile = auth.`client-certificate`,
           clientKey = auth.`client-key-data`,

diff --git a/modules/http4s-ember/.native/src/main/scala/PlatformCompanion.scala b/modules/http4s-ember/.native/src/main/scala/PlatformCompanion.scala
@@ -95,10 +95,10 @@ private[http4s] abstract class PlatformCompanion[F[_]: Async: Files: Env]
             "Cannot find where/how to connect using the provided config!"
           ).raiseError
         )
-      case Some((cluster, server, auth)) =>
+      case Some((clusterData, server, auth)) =>
         client(
-          caFile = cluster.`certificate-authority`,
-          caData = cluster.`certificate-authority-data`,
+          caFile = clusterData.`certificate-authority`,
+          caData = clusterData.`certificate-authority-data`,
           clientCert = auth.`client-certificate-data`,
           clientCertFile = auth.`client-certificate`,
           clientKey = auth.`client-key-data`,

diff --git a/modules/http4s/.jvm/src/main/scala/JVMPlatform.scala b/modules/http4s/.jvm/src/main/scala/JVMPlatform.scala
@@ -68,8 +68,8 @@ private[http4s] abstract class JVMPlatform[F[_]](implicit
             "Cannot find where/how to connect using the provided config!"
           ).raiseError
         )
-      case Some((cluster, server, auth)) =>
-        val sslContext = F.blocking(SSLContexts.from(cluster, auth))
+      case Some((clusterData, server, auth)) =>
+        val sslContext = F.blocking(SSLContexts.from(clusterData, auth))
 
         Resource
           .eval(sslContext)

diff --git a/modules/sttp/.jvm/src/main/scala/SttpJVM.scala b/modules/sttp/.jvm/src/main/scala/SttpJVM.scala
@@ -59,8 +59,8 @@ private[client] trait SttpJVM[F[_]] {
         throw new IllegalArgumentException(
           "Cannot find where/how to connect using the provided config!"
         )
-      case Some((cluster, server, auth)) =>
-        val ssl = SSLContexts.from(cluster, auth)
+      case Some((clusterData, server, auth)) =>
+        val ssl = SSLContexts.from(clusterData, auth)
         HttpClient[SttpF[F, *]](
           server,
           SttpKBackend[F, T](buildWithSSLContext(ssl)),
@@ -124,8 +124,8 @@ private[client] trait SttpJVM[F[_]] {
     val str = readFile(config)
     manifest.parse[Config](str) match {
       case Left(error) => throw error
-      case Right(config) =>
-        fromConfig(config, context = context, cluster = cluster)
+      case Right(configData) =>
+        fromConfig(configData, context = context, cluster = cluster)
     }
   }