Update circe, logback, objenesis, bcpkix, bcprov, http4s, typesafeCon…

…fig versions (#1732) * Update bcpkix-jdk15on, bcprov-jdk15on to 1.78.1 * Update objenesis to 3.4 * Update circe-core, circe-generic, ... to 0.14.9 * Update logback-classic to 1.5.7 * chore: add sbt-scalafix plugin * chore: update circe-generic-extras to version 0.14.4 * chore: update http4sVersion to 0.22.15 * chore: applied design changes of http4s 0.22.x * chore: http4s 0.22.x migration complete * chore: update typeSafeConfig to version 1.4.3 * chore: ignore kotlin compiler version updates --------- Co-authored-by: Scala Steward <[email protected]>
ing-bank · Sep 3, 2024 · 18aa9af · 18aa9af
1 parent 91e39e9
commit 18aa9af
Show file tree

Hide file tree

Showing 24 changed files with 122 additions and 107 deletions.
diff --git a/.scala-steward.conf b/.scala-steward.conf
@@ -13,8 +13,9 @@ updates.pin = [
   { groupId = "com.github.cb372", artifactId = "cats-retry", version = "2."}
 ]
 
-# ignore updates for cats-effect 3.x compatible versions
+# ignore kotlin compiler version updates and http4s updates for cats-effect 3.x compatible versions
 updates.ignore = [ 
   { groupId = "org.http4s", version = "0.23." }, 
-  { groupId = "org.http4s", version = "1." } 
+  { groupId = "org.http4s", version = "1." },
+  { groupId = "org.jetbrains.kotlin" } 
 ]
diff --git a/bakery/integration-tests/src/test/scala/com/ing/bakery/smoke/BakeryEnvironment.scala b/bakery/integration-tests/src/test/scala/com/ing/bakery/smoke/BakeryEnvironment.scala
@@ -3,7 +3,7 @@ package com.ing.bakery.smoke
 import cats.effect.{ContextShift, IO, Resource, Timer}
 import com.ing.bakery.smoke.k8s.{DefinitionFile, Namespace, Pod}
 import org.http4s.Uri
-import org.http4s.client.blaze.BlazeClientBuilder
+import org.http4s.blaze.client.BlazeClientBuilder
 
 import scala.concurrent.ExecutionContext
 

diff --git a/bakery/integration-tests/src/test/scala/com/ing/bakery/smoke/StateNodeManagementClient.scala b/bakery/integration-tests/src/test/scala/com/ing/bakery/smoke/StateNodeManagementClient.scala
@@ -4,7 +4,7 @@ import cats.effect.{ContextShift, IO, Resource, Timer}
 import org.http4s.Method._
 import org.http4s.Uri
 import org.http4s.client.Client
-import org.http4s.client.blaze.BlazeClientBuilder
+import org.http4s.blaze.client.BlazeClientBuilder
 import org.http4s.client.dsl.io._
 
 import scala.concurrent.ExecutionContext

diff --git a/bakery/integration-tests/src/test/scala/com/ing/bakery/testing/HoldCleanup.scala b/bakery/integration-tests/src/test/scala/com/ing/bakery/testing/HoldCleanup.scala
@@ -9,7 +9,7 @@ import org.http4s._
 import org.http4s.dsl.io._
 import org.http4s.implicits._
 import org.http4s.server.Router
-import org.http4s.server.blaze.BlazeServerBuilder
+import org.http4s.blaze.server.BlazeServerBuilder
 
 import scala.concurrent.ExecutionContext
 import scala.concurrent.duration._

diff --git a/...eraction-protocol/src/main/scala/com/ing/bakery/interaction/RemoteInteractionClient.scala b/...eraction-protocol/src/main/scala/com/ing/bakery/interaction/RemoteInteractionClient.scala
@@ -9,7 +9,7 @@ import com.ing.bakery.metrics.MetricService
 import io.prometheus.client.Counter
 import org.http4s.circe._
 import org.http4s.client.Client
-import org.http4s.client.blaze.BlazeClientBuilder
+import org.http4s.blaze.client.BlazeClientBuilder
 import org.http4s.dsl.io._
 import org.http4s._
 
@@ -23,11 +23,14 @@ object RemoteInteractionClient {
   def resource(headers: Headers,
                pool: ExecutionContext,
                metricService: MetricService,
-               tlsConfig: Option[BakeryHttp.TLSConfig])(implicit cs: ContextShift[IO], timer: Timer[IO]): Resource[IO, RemoteInteractionClient] =
-    BlazeClientBuilder[IO](pool, tlsConfig.map(BakeryHttp.loadSSLContext))
-      .withCheckEndpointAuthentication(false)
-      .resource
-      .map(new BaseRemoteInteractionClient(_, headers, metricService))
+               tlsConfig: Option[BakeryHttp.TLSConfig])(implicit cs: ContextShift[IO], timer: Timer[IO]): Resource[IO, RemoteInteractionClient] = {
+
+    tlsConfig.map(BakeryHttp.loadSSLContext)
+    .fold(BlazeClientBuilder[IO](pool))(BlazeClientBuilder[IO](pool).withSslContext)
+    .withCheckEndpointAuthentication(false)
+    .resource
+    .map(new BaseRemoteInteractionClient(_, headers, metricService))
+  }
 }
 
 trait RemoteInteractionClient {
@@ -49,12 +52,15 @@ class BaseRemoteInteractionClient(
   import RemoteInteractionClient._
   import com.ing.baker.runtime.serialization.InteractionExecutionJsonCodecs._
   import com.ing.baker.runtime.serialization.JsonCodec._
-  def entityCodecs: (EntityEncoder[IO, ExecutionRequest], EntityDecoder[IO, ExecutionResult], EntityDecoder[IO, Interactions]) =
+  override def entityCodecs: (EntityEncoder[IO, ExecutionRequest], EntityDecoder[IO, ExecutionResult], EntityDecoder[IO, Interactions]) =
     (jsonEncoderOf[IO, ExecutionRequest],
       jsonOf[IO, ExecutionResult],
       jsonOf[IO, Interactions])
 
-  private implicit lazy val (interactionEntityDecoder, executeRequestEntityEncoder, executeResponseEntityDecoder) = entityCodecs
+  private implicit lazy val (
+    interactionEntityDecoder: EntityEncoder[IO, ExecutionRequest], 
+    executeRequestEntityEncoder: EntityDecoder[IO, ExecutionResult], 
+    executeResponseEntityDecoder: EntityDecoder[IO, Interactions]) = entityCodecs
 
   def interfaces(uri: Uri): IO[Interactions] =
     client.expect[Interactions](

diff --git a/bakery/interaction-protocol/src/main/scala/com/ing/bakery/metrics/MetricService.scala b/bakery/interaction-protocol/src/main/scala/com/ing/bakery/metrics/MetricService.scala
@@ -8,9 +8,10 @@ import io.prometheus.client.{Collector, CollectorRegistry, Counter}
 import io.prometheus.jmx.JmxCollector
 import org.http4s.dsl.io._
 import org.http4s.implicits.http4sKleisliResponseSyntaxOptionT
-import org.http4s.server.blaze.BlazeServerBuilder
+import org.http4s.blaze.server.BlazeServerBuilder
 import org.http4s.server.{Router, Server}
 import org.http4s._
+import org.typelevel.ci._
 
 import java.io.CharArrayWriter
 import java.net.InetSocketAddress
@@ -46,7 +47,7 @@ object MetricService extends LazyLogging {
   def defaultInstance = new MetricService(new CollectorRegistry(true))
 
   def resourceServer(socketAddress: InetSocketAddress, registry: CollectorRegistry, ec: ExecutionContext)
-                    (implicit cs: ContextShift[IO], timer: Timer[IO]): Resource[IO, Server[IO]] = {
+                    (implicit cs: ContextShift[IO], timer: Timer[IO]): Resource[IO, Server] = {
     val encoder = EntityEncoder.stringEncoder
 
     def fromPrometheus: String = {
@@ -68,7 +69,7 @@ object MetricService extends LazyLogging {
                   Response(
                     status = Ok,
                     body = encoder.toEntity(exportMetrics).body,
-                    headers = Headers.of(Header("Content-Type", TextFormat.CONTENT_TYPE_004))
+                    headers = Headers(Header.Raw(ci"Content-Type", TextFormat.CONTENT_TYPE_004))
                   )
                 }
             }

diff --git a/bakery/interaction/src/main/scala/com/ing/bakery/interaction/HealthService.scala b/bakery/interaction/src/main/scala/com/ing/bakery/interaction/HealthService.scala
@@ -5,15 +5,15 @@ import java.net.InetSocketAddress
 import cats.effect.{ContextShift, IO, Resource, Timer}
 import org.http4s.dsl.io.{->, /, GET, Ok, Root, _}
 import org.http4s.implicits._
-import org.http4s.server.blaze._
+import org.http4s.blaze.server._
 import org.http4s.server.{Router, Server}
 import org.http4s.{HttpApp, HttpRoutes}
 
 import scala.concurrent.ExecutionContext
 
 object HealthService {
 
-  def resource(address: InetSocketAddress)(implicit cs: ContextShift[IO], clock: Timer[IO]): Resource[IO, Server[IO]] =
+  def resource(address: InetSocketAddress)(implicit cs: ContextShift[IO], clock: Timer[IO]): Resource[IO, Server] =
     BlazeServerBuilder[IO](ExecutionContext.global)
       .bindSocketAddress(address)
       .withHttpApp(new HealthService().build)

diff --git a/bakery/interaction/src/main/scala/com/ing/bakery/interaction/RemoteInteractionService.scala b/bakery/interaction/src/main/scala/com/ing/bakery/interaction/RemoteInteractionService.scala
@@ -14,7 +14,7 @@ import org.http4s.circe._
 import org.http4s.dsl.io._
 import org.http4s.implicits._
 import org.http4s.metrics.prometheus.Prometheus
-import org.http4s.server.blaze._
+import org.http4s.blaze.server._
 import org.http4s.server.middleware.{Logger, Metrics}
 import org.http4s.server.{Router, Server}
 
@@ -36,7 +36,7 @@ object RemoteInteractionService {
                metricsPort: Int = 9096,
                metricsEnabled: Boolean = false,
                apiUrlPrefix: String = "/api/bakery/interactions",
-               registry: Option[CollectorRegistry] = None)(implicit timer: Timer[IO], cs: ContextShift[IO], executionContext: ExecutionContext): Resource[IO, Server[IO]] = {
+               registry: Option[CollectorRegistry] = None)(implicit timer: Timer[IO], cs: ContextShift[IO], executionContext: ExecutionContext): Resource[IO, Server] = {
 
     val idToNameMap = interactions.map(i => URLEncoder.encode(i.shaBase64, "UTF-8").take(8) -> i.name).toMap
 
@@ -49,8 +49,8 @@ object RemoteInteractionService {
     val service = new RemoteInteractionService(interactions)
 
     def interactionRequestClassifier(request: Request[IO]): Option[String] = if (interactionPerTypeMetricsEnabled) {
-      val p = request.pathInfo.split('/') // ... /interactions/<id>/execute - we take ID part we care most about
-      (if (p.length == 4) Some(p(2)) else None).map(v => idToNameMap.getOrElse(v.take(8), "unknown"))
+      val segments = request.pathInfo.segments // ... /interactions/<id>/execute - we take ID part we care most about
+      (if (segments.length == 4) Some(segments(2)) else None).map(v => idToNameMap.getOrElse(v.toString.take(8), "unknown"))
     } else None
 
     val collectorRegistry = registry.getOrElse(CollectorRegistry.defaultRegistry)

diff --git a/bakery/interaction/src/test/scala/com/ing/bakery/interaction/HealthServiceSpec.scala b/bakery/interaction/src/test/scala/com/ing/bakery/interaction/HealthServiceSpec.scala
@@ -7,7 +7,7 @@ import com.ing.bakery.testing.BakeryFunSpec
 import org.http4s.Method._
 import org.http4s.Uri
 import org.http4s.client.Client
-import org.http4s.client.blaze.BlazeClientBuilder
+import org.http4s.blaze.client.BlazeClientBuilder
 import org.http4s.client.dsl.io._
 import org.scalatest.ConfigMap
 import org.scalatest.matchers.should.Matchers

diff --git a/bakery/interaction/src/test/scala/com/ing/bakery/interaction/RemoteInteractionSpec.scala b/bakery/interaction/src/test/scala/com/ing/bakery/interaction/RemoteInteractionSpec.scala
@@ -141,7 +141,7 @@ class RemoteInteractionSpec extends BakeryFunSpec {
         val result: IO[Option[String]] = client.execute(uri, implementation0.shaBase64, Seq(ingredient0, ingredient1), Map.empty)
           .map(_ => None)
           .handleErrorWith {
-            case _: java.net.ConnectException | Command.EOF => IO.pure(Some("connection error"))
+            case _: java.net.SocketException | Command.EOF => IO.pure(Some("connection error"))
             case e => IO.raiseError(e)
           }
         result.map(result => assert(result === Some("connection error")))

diff --git a/bakery/state/src/main/scala/com/ing/bakery/components/InteractionRegistry.scala b/bakery/state/src/main/scala/com/ing/bakery/components/InteractionRegistry.scala
@@ -14,7 +14,7 @@ import com.ing.bakery.metrics.MetricService
 import com.typesafe.config.Config
 import com.typesafe.scalalogging.LazyLogging
 import org.http4s.client.Client
-import org.http4s.client.blaze.BlazeClientBuilder
+import org.http4s.blaze.client.BlazeClientBuilder
 import org.http4s.{Headers, Uri}
 import scalax.collection.ChainingOps
 

diff --git a/bakery/state/src/test/scala/com/ing/bakery/components/MetricServiceSpec.scala b/bakery/state/src/test/scala/com/ing/bakery/components/MetricServiceSpec.scala
@@ -5,7 +5,7 @@ import com.ing.bakery.metrics.MetricService
 import com.typesafe.config.ConfigFactory
 import io.prometheus.client.CollectorRegistry
 import org.http4s.Status.Ok
-import org.http4s.client.blaze.BlazeClientBuilder
+import org.http4s.blaze.client.BlazeClientBuilder
 import org.scalatest.funsuite.AnyFunSuite
 import org.scalatest.matchers.should.Matchers
 

diff --git a/examples/baker-example/src/main/scala/webshop/webservice/Main.scala b/examples/baker-example/src/main/scala/webshop/webservice/Main.scala
@@ -8,7 +8,7 @@ import com.ing.baker.runtime.akka.AkkaBaker
 import com.ing.baker.runtime.akka.internal.CachingInteractionManager
 import com.ing.baker.runtime.scaladsl._
 import com.typesafe.config.ConfigFactory
-import org.http4s.server.blaze.BlazeServerBuilder
+import org.http4s.blaze.server.BlazeServerBuilder
 import org.log4s.Logger
 import webshop.webservice.recipe.{MakePaymentInstance, ReserveItemsInstance, ShipItemsInstance}
 

diff --git a/examples/bakery-client-example/src/main/scala/webshop/webservice/Main.scala b/examples/bakery-client-example/src/main/scala/webshop/webservice/Main.scala
@@ -8,7 +8,7 @@ import com.ing.baker.compiler.RecipeCompiler
 import com.ing.baker.http.client.scaladsl.BakerClient
 import com.typesafe.config.ConfigFactory
 import org.http4s.Uri
-import org.http4s.server.blaze.BlazeServerBuilder
+import org.http4s.blaze.server.BlazeServerBuilder
 
 import scala.concurrent.{ExecutionContext, ExecutionContextExecutor}
 

diff --git a/...s/bakery-client-example/src/main/scala/webshop/webservice/StateNodeManagementClient.scala b/...s/bakery-client-example/src/main/scala/webshop/webservice/StateNodeManagementClient.scala
@@ -4,7 +4,7 @@ import cats.effect.{ContextShift, IO, Resource, Timer}
 import org.http4s.Method._
 import org.http4s.Uri
 import org.http4s.client.Client
-import org.http4s.client.blaze.BlazeClientBuilder
+import org.http4s.blaze.client.BlazeClientBuilder
 import org.http4s.client.dsl.io._
 
 import scala.concurrent.ExecutionContext

diff --git a/http/baker-http-client/src/main/scala/com/ing/baker/http/client/javadsl/BakerClient.scala b/http/baker-http-client/src/main/scala/com/ing/baker/http/client/javadsl/BakerClient.scala
@@ -4,7 +4,7 @@ import cats.effect.{ContextShift, IO, Timer}
 import com.ing.baker.http.client.common.TLSConfig
 import com.ing.baker.http.client.scaladsl.{BakerClient => ScalaClient, EndpointConfig}
 import com.ing.baker.runtime.javadsl.{Baker => JavaBaker}
-import org.http4s.client.blaze.BlazeClientBuilder
+import org.http4s.blaze.client.BlazeClientBuilder
 import org.http4s.{Request, Uri}
 
 import java.util.concurrent.CompletableFuture
@@ -45,9 +45,8 @@ object BakerClient {
     implicit val contextShift: ContextShift[IO] = IO.contextShift(ec)
     implicit val timer: Timer[IO] = IO.timer(ec)
 
-    val future = BlazeClientBuilder[IO](
-      executionContext = connectionPool,
-      sslContext = sslContext)
+    val future = sslContext
+      .fold(BlazeClientBuilder[IO](connectionPool))(BlazeClientBuilder[IO](connectionPool).withSslContext)
       .resource
       .map { client =>
         new ScalaClient(