Bump Netty to 4.2.0

References #178

Author: acogoluegnes

pom.xml

@@ -42,7 +42,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <spotless.check.skip>true</spotless.check.skip>
         <slf4j.version>1.7.36</slf4j.version>
-        <netty4.version>4.1.119.Final</netty4.version>
+        <netty4.version>4.2.0.Final</netty4.version>
         <netty4.iouring.version>0.0.26.Final</netty4.iouring.version>
         <micrometer.version>1.14.5</micrometer.version>
         <gson.version>2.12.1</gson.version>

src/main/qpid/org/apache/qpid/protonj2/client/transport/netty4/EpollSupport.java

@@ -18,14 +18,16 @@
 
 import java.util.concurrent.ThreadFactory;
 
+import io.netty.channel.MultiThreadIoEventLoopGroup;
+import io.netty.channel.epoll.EpollIoHandler;
+import io.netty.channel.nio.NioIoHandler;
 import org.apache.qpid.protonj2.client.TransportOptions;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import io.netty.channel.Channel;
 import io.netty.channel.EventLoopGroup;
 import io.netty.channel.epoll.Epoll;
-import io.netty.channel.epoll.EpollEventLoopGroup;
 import io.netty.channel.epoll.EpollSocketChannel;
 
 public final class EpollSupport {
@@ -44,7 +46,7 @@ public static boolean isAvailable(TransportOptions transportOptions) {
     }
 
     public static EventLoopGroup createGroup(int nThreads, ThreadFactory ioThreadFactory) {
-        return new EpollEventLoopGroup(nThreads, ioThreadFactory);
+        return new MultiThreadIoEventLoopGroup(nThreads, ioThreadFactory, EpollIoHandler.newFactory());
     }
 
     public static Class<? extends Channel> getChannelClass() {

src/main/qpid/org/apache/qpid/protonj2/client/transport/netty4/KQueueSupport.java

@@ -18,14 +18,15 @@
 
 import java.util.concurrent.ThreadFactory;
 
+import io.netty.channel.MultiThreadIoEventLoopGroup;
+import io.netty.channel.kqueue.KQueueIoHandler;
 import org.apache.qpid.protonj2.client.TransportOptions;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import io.netty.channel.Channel;
 import io.netty.channel.EventLoopGroup;
 import io.netty.channel.kqueue.KQueue;
-import io.netty.channel.kqueue.KQueueEventLoopGroup;
 import io.netty.channel.kqueue.KQueueSocketChannel;
 
 public final class KQueueSupport {
@@ -44,7 +45,7 @@ public static boolean isAvailable(TransportOptions transportOptions) {
     }
 
     public static EventLoopGroup createGroup(int nThreads, ThreadFactory ioThreadFactory) {
-        return new KQueueEventLoopGroup(nThreads, ioThreadFactory);
+        return new MultiThreadIoEventLoopGroup(nThreads, KQueueIoHandler.newFactory());
     }
 
     public static Class<? extends Channel> getChannelClass() {

src/main/qpid/org/apache/qpid/protonj2/client/transport/netty4/Netty4IOContext.java

@@ -22,6 +22,8 @@
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.TimeUnit;
 
+import io.netty.channel.MultiThreadIoEventLoopGroup;
+import io.netty.channel.nio.NioIoHandler;
 import org.apache.qpid.protonj2.client.SslOptions;
 import org.apache.qpid.protonj2.client.TransportOptions;
 import org.apache.qpid.protonj2.client.transport.IOContext;
@@ -33,7 +35,6 @@
 import io.netty.bootstrap.Bootstrap;
 import io.netty.channel.Channel;
 import io.netty.channel.EventLoopGroup;
-import io.netty.channel.nio.NioEventLoopGroup;
 import io.netty.channel.socket.nio.NioSocketChannel;
 
 /**
@@ -100,7 +101,7 @@ public Netty4IOContext(TransportOptions options, SslOptions ssl, String ioThread
 
         if (selectedGroup == null) {
             LOG.trace("Netty Transports will be using NIO mode");
-            selectedGroup = new NioEventLoopGroup(1, threadFactory);
+            selectedGroup = new MultiThreadIoEventLoopGroup(1, NioIoHandler.newFactory());
             selectedChannelClass = NioSocketChannel.class;
         }
 

src/main/qpid/org/apache/qpid/protonj2/client/transport/netty4/SslSupport.java

@@ -125,7 +125,6 @@ public static SslHandler createSslHandler(ByteBufAllocator allocator, String hos
 
             sslEngine = createJdkSslEngine(host, port, sslContext, options);
         }
-
         return new SslHandler(sslEngine);
     }
 
@@ -220,6 +219,8 @@ public static SslContext createOpenSslContext(SslOptions options) throws Excepti
             TrustManagerFactory trustManagerFactory = loadTrustManagerFactory(options);
             SslContextBuilder builder = SslContextBuilder.forClient().sslProvider(SslProvider.OPENSSL);
 
+            builder.endpointIdentificationAlgorithm(options.verifyHost() ? "HTTPS" : null);
+
             // TODO - There is oddly no way in Netty right now to get the set of supported protocols
             //        when creating the SslContext or really even when creating the SSLEngine.  Seems
             //        like an oversight, for now we call it with TLSv1.2 so it looks like we did something.
@@ -274,12 +275,6 @@ public static SSLEngine createOpenSslEngine(ByteBufAllocator allocator, String h
         engine.setEnabledCipherSuites(buildEnabledCipherSuites(engine, options));
         engine.setUseClientMode(true);
 
-        if (options.verifyHost()) {
-            SSLParameters sslParameters = engine.getSSLParameters();
-            sslParameters.setEndpointIdentificationAlgorithm("HTTPS");
-            engine.setSSLParameters(sslParameters);
-        }
-
         return engine;
     }
 

src/main/qpid/org/apache/qpid/protonj2/client/transport/netty4/TcpTransport.java

@@ -419,7 +419,7 @@ private void configureNetty(Bootstrap bootstrap, TransportOptions options) {
 
         if (options.receiveBufferSize() != -1) {
             bootstrap.option(ChannelOption.SO_RCVBUF, options.receiveBufferSize());
-            bootstrap.option(ChannelOption.RCVBUF_ALLOCATOR, new FixedRecvByteBufAllocator(options.receiveBufferSize()));
+            bootstrap.option(ChannelOption.RECVBUF_ALLOCATOR, new FixedRecvByteBufAllocator(options.receiveBufferSize()));
         }
 
         if (options.trafficClass() != -1) {