More netty 4.2 cleanup (#2000)

Author: jguerra

zuul-core/src/test/java/com/netflix/zuul/netty/connectionpool/PerServerConnectionPoolTest.java

@@ -42,11 +42,13 @@
 import io.netty.bootstrap.ServerBootstrap;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelInitializer;
-import io.netty.channel.DefaultEventLoopGroup;
 import io.netty.channel.EventLoop;
+import io.netty.channel.MultiThreadIoEventLoopGroup;
+import io.netty.channel.MultithreadEventLoopGroup;
 import io.netty.channel.embedded.EmbeddedChannel;
 import io.netty.channel.local.LocalAddress;
 import io.netty.channel.local.LocalChannel;
+import io.netty.channel.local.LocalIoHandler;
 import io.netty.channel.local.LocalServerChannel;
 import io.netty.handler.codec.DecoderException;
 import io.netty.util.concurrent.Promise;
@@ -71,8 +73,8 @@
 class PerServerConnectionPoolTest {
 
     private static LocalAddress LOCAL_ADDRESS;
-    private static DefaultEventLoopGroup ORIGIN_EVENT_LOOP_GROUP;
-    private static DefaultEventLoopGroup CLIENT_EVENT_LOOP_GROUP;
+    private static MultithreadEventLoopGroup ORIGIN_EVENT_LOOP_GROUP;
+    private static MultithreadEventLoopGroup CLIENT_EVENT_LOOP_GROUP;
     private static EventLoop CLIENT_EVENT_LOOP;
     private static Class<? extends Channel> PREVIOUS_CHANNEL_TYPE;
 
@@ -102,10 +104,10 @@ class PerServerConnectionPoolTest {
     static void staticSetup() throws InterruptedException {
         LOCAL_ADDRESS = new LocalAddress(UUID.randomUUID().toString());
 
-        CLIENT_EVENT_LOOP_GROUP = new DefaultEventLoopGroup(1);
+        CLIENT_EVENT_LOOP_GROUP = new MultiThreadIoEventLoopGroup(1, LocalIoHandler.newFactory());
         CLIENT_EVENT_LOOP = CLIENT_EVENT_LOOP_GROUP.next();
 
-        ORIGIN_EVENT_LOOP_GROUP = new DefaultEventLoopGroup(1);
+        ORIGIN_EVENT_LOOP_GROUP = new MultiThreadIoEventLoopGroup(1, LocalIoHandler.newFactory());
         ServerBootstrap bootstrap = new ServerBootstrap()
                 .group(ORIGIN_EVENT_LOOP_GROUP)
                 .localAddress(LOCAL_ADDRESS)

zuul-core/src/test/java/com/netflix/zuul/netty/filter/BaseZuulFilterRunnerTest.java

@@ -36,9 +36,10 @@
 import com.netflix.zuul.message.util.HttpRequestBuilder;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelInboundHandlerAdapter;
-import io.netty.channel.DefaultEventLoopGroup;
-import io.netty.channel.EventLoopGroup;
+import io.netty.channel.MultiThreadIoEventLoopGroup;
+import io.netty.channel.MultithreadEventLoopGroup;
 import io.netty.channel.local.LocalChannel;
+import io.netty.channel.local.LocalIoHandler;
 import io.netty.handler.codec.http.HttpContent;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
@@ -68,7 +69,7 @@ public class BaseZuulFilterRunnerTest {
 
     private ZuulMessage message;
     private TestBaseZuulFilterRunner runner;
-    private EventLoopGroup group;
+    private MultithreadEventLoopGroup group;
     private TestResumer resumer;
     private ErrorCapturingHandler errorCapturingHandler;
 
@@ -78,7 +79,7 @@ public void setup() {
         SessionContext sessionContext = new SessionContext();
         message = new HttpRequestBuilder(sessionContext).build();
 
-        group = new DefaultEventLoopGroup(1);
+        group = new MultiThreadIoEventLoopGroup(1, LocalIoHandler.newFactory());
         LocalChannel localChannel = new LocalChannel();
         errorCapturingHandler = new ErrorCapturingHandler();
         localChannel.pipeline().addLast(new ChannelInboundHandlerAdapter());

zuul-core/src/test/java/com/netflix/zuul/netty/filter/EventExecutorSchedulerTest.java

@@ -22,8 +22,10 @@
 import static org.junit.jupiter.api.Assertions.fail;
 
 import com.google.common.util.concurrent.Uninterruptibles;
-import io.netty.channel.DefaultEventLoopGroup;
 import io.netty.channel.EventLoop;
+import io.netty.channel.MultiThreadIoEventLoopGroup;
+import io.netty.channel.MultithreadEventLoopGroup;
+import io.netty.channel.nio.NioIoHandler;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -40,13 +42,13 @@
  */
 class EventExecutorSchedulerTest {
 
-    private DefaultEventLoopGroup group;
+    private MultithreadEventLoopGroup group;
     private EventLoop eventLoop;
     private EventExecutorScheduler scheduler;
 
     @BeforeEach
     void setUp() {
-        group = new DefaultEventLoopGroup(1);
+        group = new MultiThreadIoEventLoopGroup(1, NioIoHandler.newFactory());
         eventLoop = group.next();
         scheduler = new EventExecutorScheduler(eventLoop);
     }

zuul-core/src/test/java/com/netflix/zuul/netty/server/ClientConnectionsShutdownTest.java

@@ -43,11 +43,13 @@
 import io.netty.channel.ChannelOutboundHandlerAdapter;
 import io.netty.channel.ChannelPromise;
 import io.netty.channel.DefaultEventLoop;
-import io.netty.channel.DefaultEventLoopGroup;
+import io.netty.channel.MultiThreadIoEventLoopGroup;
+import io.netty.channel.MultithreadEventLoopGroup;
 import io.netty.channel.group.ChannelGroup;
 import io.netty.channel.group.DefaultChannelGroup;
 import io.netty.channel.local.LocalAddress;
 import io.netty.channel.local.LocalChannel;
+import io.netty.channel.local.LocalIoHandler;
 import io.netty.channel.local.LocalServerChannel;
 import io.netty.util.concurrent.EventExecutor;
 import io.netty.util.concurrent.Promise;
@@ -72,16 +74,16 @@ class ClientConnectionsShutdownTest {
 
     // using LocalChannels instead of EmbeddedChannels to re-create threading behavior in an actual deployment
     private static LocalAddress LOCAL_ADDRESS;
-    private static DefaultEventLoopGroup SERVER_EVENT_LOOP;
-    private static DefaultEventLoopGroup CLIENT_EVENT_LOOP;
+    private static MultithreadEventLoopGroup SERVER_EVENT_LOOP;
+    private static MultithreadEventLoopGroup CLIENT_EVENT_LOOP;
     private static DefaultEventLoop EVENT_LOOP;
 
     @BeforeAll
     static void staticSetup() throws InterruptedException {
         LOCAL_ADDRESS = new LocalAddress(UUID.randomUUID().toString());
 
-        CLIENT_EVENT_LOOP = new DefaultEventLoopGroup(4);
-        SERVER_EVENT_LOOP = new DefaultEventLoopGroup(4);
+        CLIENT_EVENT_LOOP = new MultiThreadIoEventLoopGroup(4, LocalIoHandler.newFactory());
+        SERVER_EVENT_LOOP = new MultiThreadIoEventLoopGroup(4, LocalIoHandler.newFactory());
         ServerBootstrap serverBootstrap = new ServerBootstrap()
                 .group(SERVER_EVENT_LOOP)
                 .localAddress(LOCAL_ADDRESS)