From 2e81fe9b62ac07cfa112ae46386fd81743d6a873 Mon Sep 17 00:00:00 2001
From: danicheg <esik.danny@gmail.com>
Date: Tue, 19 Nov 2024 15:01:27 +0300
Subject: [PATCH 1/2] Use the ServerBuilder#tls to reuse Netty's SslContext

Co-authored-by: Ikhun Um <ih.pert@gmail.com>
---
 .../armeria/server/ArmeriaServerBuilder.scala | 25 ++++++-------------
 1 file changed, 7 insertions(+), 18 deletions(-)

diff --git a/server/src/main/scala/org/http4s/armeria/server/ArmeriaServerBuilder.scala b/server/src/main/scala/org/http4s/armeria/server/ArmeriaServerBuilder.scala
index 7b35628..1a9051c 100644
--- a/server/src/main/scala/org/http4s/armeria/server/ArmeriaServerBuilder.scala
+++ b/server/src/main/scala/org/http4s/armeria/server/ArmeriaServerBuilder.scala
@@ -25,8 +25,7 @@ import com.linecorp.armeria.common.{
   HttpRequest,
   HttpResponse,
   SessionProtocol,
-  TlsKeyPair,
-  TlsProvider
+  TlsKeyPair
 }
 import com.linecorp.armeria.server.{
   HttpService,
@@ -254,11 +253,8 @@ sealed class ArmeriaServerBuilder[F[_]] private (
     */
   def withTls(keyCertChainFile: File, keyFile: File, keyPassword: Option[String]): Self =
     atBuild(
-      _.tlsProvider(
-        TlsProvider
-          .builder()
-          .keyPair(TlsKeyPair.of(keyFile, keyPassword.orNull, keyCertChainFile))
-          .build()))
+      _.tls(TlsKeyPair.of(keyFile, keyPassword.orNull, keyCertChainFile))
+    )
 
   /** Configures SSL or TLS of this [[com.linecorp.armeria.server.Server]] with the specified
     * `keyCertChainInputStream`, `keyInputStream` and `keyPassword`.
@@ -276,11 +272,9 @@ sealed class ArmeriaServerBuilder[F[_]] private (
           .both(keyInputStream)
           .use { case (keyCertChain, key) =>
             F.delay {
-              ab.tlsProvider(
-                TlsProvider
-                  .builder()
-                  .keyPair(TlsKeyPair.of(key, keyPassword.orNull, keyCertChain))
-                  .build())
+              ab.tls(
+                TlsKeyPair.of(key, keyPassword.orNull, keyCertChain)
+              )
             }
           }
       })
@@ -292,12 +286,7 @@ sealed class ArmeriaServerBuilder[F[_]] private (
     *   [[withTlsCustomizer]]
     */
   def withTls(key: PrivateKey, keyCertChain: X509Certificate*): Self =
-    atBuild(
-      _.tlsProvider(
-        TlsProvider
-          .builder()
-          .keyPair(TlsKeyPair.of(key, keyCertChain: _*))
-          .build()))
+    atBuild(_.tls(TlsKeyPair.of(key, keyCertChain: _*)))
 
   /** Configures SSL or TLS of this [[com.linecorp.armeria.server.Server]] with the specified
     * [[javax.net.ssl.KeyManagerFactory]].

From 992df25aa158efc1732439f054bdb36e2df9237d Mon Sep 17 00:00:00 2001
From: danicheg <esik.danny@gmail.com>
Date: Tue, 19 Nov 2024 15:04:22 +0300
Subject: [PATCH 2/2] Scalafmt

---
 .../org/http4s/armeria/server/ArmeriaServerBuilder.scala   | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/server/src/main/scala/org/http4s/armeria/server/ArmeriaServerBuilder.scala b/server/src/main/scala/org/http4s/armeria/server/ArmeriaServerBuilder.scala
index 1a9051c..e3ff9c6 100644
--- a/server/src/main/scala/org/http4s/armeria/server/ArmeriaServerBuilder.scala
+++ b/server/src/main/scala/org/http4s/armeria/server/ArmeriaServerBuilder.scala
@@ -21,12 +21,7 @@ import cats.syntax.applicative._
 import cats.syntax.flatMap._
 import cats.syntax.functor._
 import com.linecorp.armeria.common.util.Version
-import com.linecorp.armeria.common.{
-  HttpRequest,
-  HttpResponse,
-  SessionProtocol,
-  TlsKeyPair
-}
+import com.linecorp.armeria.common.{HttpRequest, HttpResponse, SessionProtocol, TlsKeyPair}
 import com.linecorp.armeria.server.{
   HttpService,
   HttpServiceWithRoutes,