From b78bcd20832ff1e1eaa69cb1098c2002911c32bb Mon Sep 17 00:00:00 2001
From: jchrys <jchrys@me.com>
Date: Wed, 19 Feb 2025 23:22:35 +0900
Subject: [PATCH] Ensure Reactor-Netty Forward Compatibility

Motivation:
A change in `r.n.t.SslProvider.ProtocolSslContextSpec` breaks forward
compatibility.

Modifications:
Remove Usage of `ProtocolSslContextSpec`.

Result:
The SSL context is now correctly initialized under the old reactor-netty
version, ensuring forward compatibility.
---
 .../r2dbc/mysql/client/SslBridgeHandler.java  | 28 ++++++++-----------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/r2dbc-mysql/src/main/java/io/asyncer/r2dbc/mysql/client/SslBridgeHandler.java b/r2dbc-mysql/src/main/java/io/asyncer/r2dbc/mysql/client/SslBridgeHandler.java
index ce3361fd4..22038bb43 100644
--- a/r2dbc-mysql/src/main/java/io/asyncer/r2dbc/mysql/client/SslBridgeHandler.java
+++ b/r2dbc-mysql/src/main/java/io/asyncer/r2dbc/mysql/client/SslBridgeHandler.java
@@ -33,6 +33,7 @@
 import io.netty.handler.ssl.util.InsecureTrustManagerFactory;
 import io.netty.util.internal.logging.InternalLogger;
 import io.netty.util.internal.logging.InternalLoggerFactory;
+import reactor.core.Exceptions;
 import reactor.netty.tcp.SslProvider;
 
 import javax.net.ssl.HostnameVerifier;
@@ -40,7 +41,6 @@
 import javax.net.ssl.SSLException;
 import java.io.File;
 import java.net.InetSocketAddress;
-import java.util.function.Consumer;
 
 import static io.asyncer.r2dbc.mysql.internal.util.AssertUtils.requireNonNull;
 import static io.netty.handler.ssl.SslProvider.JDK;
@@ -151,10 +151,16 @@ private void handleSslState(ChannelHandlerContext ctx, SslState state) {
         switch (state) {
             case BRIDGING:
                 logger.debug("SSL event triggered, enable SSL handler to pipeline");
-
-                SslProvider sslProvider = SslProvider.builder()
-                    .sslContext(MySqlSslContextSpec.forClient(ssl, context))
-                    .build();
+                final SslProvider sslProvider;
+                try {
+                    // Workaround for a forward incompatible change in reactor-netty version 1.2.0
+                    // See: https://github.com/reactor/reactor-netty/commit/6d0c24d83a7c5b15e403475272293f847415191c
+                    sslProvider = SslProvider.builder()
+                                             .sslContext(MySqlSslContextSpec.forClient(ssl, context).sslContext())
+                                             .build();
+                } catch (SSLException e) {
+                    throw Exceptions.propagate(e);
+                }
                 SslHandler sslHandler = sslProvider.getSslContext().newHandler(ctx.alloc());
 
                 this.sslEngine = sslHandler.engine();
@@ -195,7 +201,7 @@ private static boolean isTls13Enabled(ConnectionContext context) {
             || (version.isGreaterThanOrEqualTo(MYSQL_5_6_0) && version.isEnterprise());
     }
 
-    private static final class MySqlSslContextSpec implements SslProvider.ProtocolSslContextSpec {
+    private static final class MySqlSslContextSpec {
 
         private final SslContextBuilder builder;
 
@@ -203,16 +209,6 @@ private MySqlSslContextSpec(SslContextBuilder builder) {
             this.builder = builder;
         }
 
-        @Override
-        public MySqlSslContextSpec configure(Consumer<SslContextBuilder> customizer) {
-            requireNonNull(customizer, "customizer must not be null");
-
-            customizer.accept(builder);
-
-            return this;
-        }
-
-        @Override
         public SslContext sslContext() throws SSLException {
             return builder.build();
         }