From 276d656d5543cd54a43b015a25e1915b21f76f64 Mon Sep 17 00:00:00 2001 From: Hossein Naderi Date: Fri, 16 Aug 2024 15:28:11 +0330 Subject: [PATCH] Fixed scala2.13 linting errors --- .../.js/src/main/scala/PlatformCompanion.scala | 6 +++--- .../.native/src/main/scala/PlatformCompanion.scala | 6 +++--- modules/http4s/.jvm/src/main/scala/JVMPlatform.scala | 4 ++-- modules/sttp/.jvm/src/main/scala/SttpJVM.scala | 8 ++++---- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/modules/http4s-ember/.js/src/main/scala/PlatformCompanion.scala b/modules/http4s-ember/.js/src/main/scala/PlatformCompanion.scala index 3c6fa804..53c97e40 100644 --- 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 index 65207d0d..df024112 100644 --- 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 index 7b120332..cb7f5ffb 100644 --- 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 index 75ecd219..7297f5bc 100644 --- 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) } }