Bump Netty to 4.2.2

Author: davidh44

bom-internal/pom.xml

@@ -116,7 +116,7 @@
             </dependency>
             <dependency>
                 <groupId>io.netty</groupId>
-                <artifactId>netty-codec</artifactId>
+                <artifactId>netty-codec-base</artifactId>
                 <version>${netty.version}</version>
             </dependency>
             <dependency>

bundle-sdk/pom.xml

@@ -108,7 +108,7 @@
                 </exclusion>
                 <exclusion>
                     <groupId>io.netty</groupId>
-                    <artifactId>netty-codec</artifactId>
+                    <artifactId>netty-codec-base</artifactId>
                 </exclusion>
                 <exclusion>
                     <groupId>io.netty</groupId>

http-clients/netty-nio-client/pom.xml

@@ -63,7 +63,7 @@
         </dependency>
         <dependency>
             <groupId>io.netty</groupId>
-            <artifactId>netty-codec</artifactId>
+            <artifactId>netty-codec-base</artifactId>
         </dependency>
         <dependency>
             <groupId>io.netty</groupId>

http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/SdkEventLoopGroup.java

@@ -18,7 +18,8 @@
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelFactory;
 import io.netty.channel.EventLoopGroup;
-import io.netty.channel.nio.NioEventLoopGroup;
+import io.netty.channel.MultiThreadIoEventLoopGroup;
+import io.netty.channel.nio.NioIoHandler;
 import io.netty.channel.socket.DatagramChannel;
 import io.netty.channel.socket.nio.NioDatagramChannel;
 import io.netty.channel.socket.nio.NioSocketChannel;
@@ -142,7 +143,7 @@ private EventLoopGroup resolveEventLoopGroup(DefaultBuilder builder) {
                                               .orElseGet(() -> new ThreadFactoryBuilder()
                                                   .threadNamePrefix("aws-java-sdk-NettyEventLoop")
                                                   .build());
-        return new NioEventLoopGroup(numThreads, threadFactory);
+        return new MultiThreadIoEventLoopGroup(numThreads, threadFactory, NioIoHandler.newFactory());
         /*
         Need to investigate why epoll is raising channel inactive after successful response that causes
         problems with retries.

http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/utils/ChannelResolver.java

@@ -20,6 +20,7 @@
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelFactory;
 import io.netty.channel.EventLoopGroup;
+import io.netty.channel.MultiThreadIoEventLoopGroup;
 import io.netty.channel.ReflectiveChannelFactory;
 import io.netty.channel.epoll.EpollDatagramChannel;
 import io.netty.channel.epoll.EpollEventLoopGroup;
@@ -67,7 +68,7 @@ public static ChannelFactory<? extends Channel> resolveSocketChannelFactory(Even
             return resolveSocketChannelFactory(((DelegatingEventLoopGroup) eventLoopGroup).getDelegate());
         }
 
-        if (eventLoopGroup instanceof NioEventLoopGroup) {
+        if (isNioGroup(eventLoopGroup)) {
             return NioSocketChannel::new;
         }
         if (eventLoopGroup instanceof EpollEventLoopGroup) {
@@ -95,7 +96,7 @@ public static ChannelFactory<? extends DatagramChannel> resolveDatagramChannelFa
             return resolveDatagramChannelFactory(((DelegatingEventLoopGroup) eventLoopGroup).getDelegate());
         }
 
-        if (eventLoopGroup instanceof NioEventLoopGroup) {
+        if (isNioGroup(eventLoopGroup)) {
             return NioDatagramChannel::new;
         }
         if (eventLoopGroup instanceof EpollEventLoopGroup) {
@@ -109,4 +110,10 @@ public static ChannelFactory<? extends DatagramChannel> resolveDatagramChannelFa
 
         return invokeSafely(() -> new ReflectiveChannelFactory(Class.forName(datagramFqcn)));
     }
+
+    private static boolean isNioGroup(EventLoopGroup group) {
+        return group instanceof NioEventLoopGroup ||
+               group instanceof MultiThreadIoEventLoopGroup;
+    }
+
 }

http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/utils/NettyUtils.java

@@ -336,7 +336,6 @@ public static SslHandler newSslHandler(SslContext sslContext, ByteBufAllocator a
      */
     private static void configureSslEngine(SSLEngine sslEngine) {
         SSLParameters sslParameters = sslEngine.getSSLParameters();
-        sslParameters.setEndpointIdentificationAlgorithm("HTTPS");
         sslEngine.setSSLParameters(sslParameters);
     }
 

http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/fault/ServerConnectivityErrorMessageTest.java

@@ -29,8 +29,10 @@
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelInitializer;
 import io.netty.channel.ChannelPipeline;
+import io.netty.channel.EventLoopGroup;
+import io.netty.channel.MultiThreadIoEventLoopGroup;
 import io.netty.channel.SimpleChannelInboundHandler;
-import io.netty.channel.nio.NioEventLoopGroup;
+import io.netty.channel.nio.NioIoHandler;
 import io.netty.channel.socket.ServerSocketChannel;
 import io.netty.channel.socket.nio.NioServerSocketChannel;
 import io.netty.handler.codec.http.DefaultHttpContent;
@@ -312,7 +314,7 @@ public RequestParams build(){
     }
 
     private static class Server extends ChannelInitializer<Channel> {
-        private final NioEventLoopGroup group = new NioEventLoopGroup();
+        private final EventLoopGroup group = new MultiThreadIoEventLoopGroup(NioIoHandler.newFactory());
         private CloseTime closeTime;
         private ServerBootstrap bootstrap;
         private ServerSocketChannel serverSock;

pom.xml

@@ -115,7 +115,7 @@
         <equalsverifier.version>3.15.1</equalsverifier.version>
         <!-- Update netty-open-ssl-version accordingly whenever we update netty version-->
         <!-- https://github.com/netty/netty/blob/4.1/pom.xml search "tcnative.version" -->
-        <netty.version>4.1.118.Final</netty.version>
+        <netty.version>4.2.2.Final</netty.version>
         <unitils.version>3.4.6</unitils.version>
         <xmlunit.version>1.3</xmlunit.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -139,7 +139,7 @@
         <jimfs.version>1.1</jimfs.version>
         <testng.version>7.1.0</testng.version> <!-- TCK Tests -->
         <commons-lang.verson>2.6</commons-lang.verson>
-        <netty-open-ssl-version>2.0.70.Final</netty-open-ssl-version>
+        <netty-open-ssl-version>2.0.72.Final</netty-open-ssl-version>
         <dynamodb-local.version>1.25.0</dynamodb-local.version>
         <sqllite.version>1.0.392</sqllite.version>
         <blockhound.version>1.0.8.RELEASE</blockhound.version>

test/http-client-tests/pom.xml

@@ -120,8 +120,8 @@
         </dependency>
         <dependency>
             <groupId>org.bouncycastle</groupId>
-            <artifactId>bcpkix-jdk15on</artifactId>
-            <version>1.70</version>
+            <artifactId>bcpkix-jdk18on</artifactId>
+            <version>1.80</version>
             <scope>compile</scope>
         </dependency>
         <dependency>

test/protocol-tests/pom.xml

@@ -292,8 +292,8 @@
         </dependency>
         <dependency>
             <groupId>org.bouncycastle</groupId>
-            <artifactId>bcpkix-jdk15on</artifactId>
-            <version>1.70</version>
+            <artifactId>bcpkix-jdk18on</artifactId>
+            <version>1.80</version>
             <scope>test</scope>
         </dependency>
         <dependency>