Merge pull request #2888 from TonioGela/main

Replacing deprecated http4s-okhttp-client with http4s-jdk-http-client

Author: fthomas

build.sbt

@@ -105,7 +105,7 @@ lazy val core = myCrossProject("core")
       Dependencies.http4sCirce,
       Dependencies.http4sClient,
       Dependencies.http4sCore,
-      Dependencies.http4sOkhttpClient,
+      Dependencies.http4sJdkhttpClient,
       Dependencies.jjwtApi,
       Dependencies.jjwtImpl % Runtime,
       Dependencies.jjwtJackson % Runtime,

modules/core/src/main/scala/org/scalasteward/core/application/Context.scala

@@ -119,7 +119,7 @@ object Context {
         middleware
       )
       urlCheckerClient <- ClientConfiguration.build(
-        ClientConfiguration.disableFollowRedirect[F],
+        ClientConfiguration.disableFollowRedirect,
         middleware
       )
       fileAlg0 = FileAlg.create(logger0, F)

modules/core/src/main/scala/org/scalasteward/core/client/ClientConfiguration.scala

@@ -17,27 +17,49 @@
 package org.scalasteward.core.client
 
 import cats.effect._
+import cats.syntax.all._
 import eu.timepit.refined.auto._
 import eu.timepit.refined.types.numeric.PosInt
 import org.http4s.Response
 import org.http4s.client._
 import org.http4s.headers.`User-Agent`
-import org.http4s.okhttp.client.OkHttpBuilder
+import org.http4s.jdkhttpclient.JdkHttpClient
+import java.net.http.HttpClient
+import java.net.http.HttpClient.Builder
 import org.typelevel.ci._
 
 import scala.concurrent.duration._
 
 object ClientConfiguration {
-  type BuilderMiddleware[F[_]] = OkHttpBuilder[F] => OkHttpBuilder[F]
+  type BuilderMiddleware = Builder => Builder
+
   object BuilderMiddleware {
-    def default[F[_]]: BuilderMiddleware[F] = bmw => bmw
+    def default: BuilderMiddleware = _.followRedirects(HttpClient.Redirect.ALWAYS)
   }
-  def build[F[_]: Async](bmw: BuilderMiddleware[F], cmw: Middleware[F]): Resource[F, Client[F]] =
-    OkHttpBuilder
-      .withDefaultClient[F]
-      .map(bmw)
-      .flatMap(_.resource)
+
+  def build[F[_]: Async](bmw: BuilderMiddleware, cmw: Middleware[F]): Resource[F, Client[F]] =
+    Resource
+      .eval(defaultHttpClient[F](bmw).map(JdkHttpClient[F](_)))
       .map(cmw)
+  // Copied from https://github.com/http4s/http4s-jdk-http-client/blob/b9655b90549319fbe999069e7c95ab1752efecb9/core/src/main/scala/org/http4s/jdkhttpclient/JdkHttpClient.scala#L257-L275 to support BuilderMiddleware
+  private def defaultHttpClient[F[_]: Async](bmw: BuilderMiddleware): F[HttpClient] =
+    Async[F].executor.flatMap { exec =>
+      Async[F].delay {
+        val builder = HttpClient.newBuilder()
+
+        if (Runtime.version().feature() == 11) {
+          val params = javax.net.ssl.SSLContext.getDefault().getDefaultSSLParameters()
+          params.setProtocols(params.getProtocols().filter(_ != "TLSv1.3"))
+          builder.sslParameters(params)
+        }
+
+        builder.executor(exec)
+
+        bmw(builder)
+
+        builder.build()
+      }
+    }
 
   def setUserAgent[F[_]: MonadCancelThrow](userAgent: `User-Agent`): Middleware[F] = { client =>
     Client[F](req => client.run(req.putHeaders(userAgent)))
@@ -69,8 +91,5 @@ object ClientConfiguration {
     }
   }
 
-  def disableFollowRedirect[F[_]](builder: OkHttpBuilder[F]): OkHttpBuilder[F] =
-    builder.withOkHttpClient(
-      builder.okHttpClient.newBuilder().followRedirects(false).build()
-    )
+  def disableFollowRedirect: BuilderMiddleware = _.followRedirects(HttpClient.Redirect.NEVER)
 }

project/Dependencies.scala

@@ -25,7 +25,7 @@ object Dependencies {
   val http4sClient = "org.http4s" %% "http4s-client" % http4sCore.revision
   val http4sDsl = "org.http4s" %% "http4s-dsl" % http4sCore.revision
   val http4sBlazeServer = "org.http4s" %% "http4s-blaze-server" % "1.0.0-M38"
-  val http4sOkhttpClient = "org.http4s" %% "http4s-okhttp-client" % "1.0.0-M32"
+  val http4sJdkhttpClient = "org.http4s" %% "http4s-jdk-http-client" % "1.0.0-M8"
   val log4catsSlf4j = "org.typelevel" %% "log4cats-slf4j" % "2.5.0"
   val logbackClassic = "ch.qos.logback" % "logback-classic" % "1.4.5"
   val jjwtApi = "io.jsonwebtoken" % "jjwt-api" % "0.11.5"