netty: finish 4.2 upgrade

Author: jknack

modules/jooby-netty/pom.xml

@@ -49,9 +49,9 @@
     </dependency>
 
     <dependency>
-      <groupId>io.netty.incubator</groupId>
-      <artifactId>netty-incubator-transport-native-io_uring</artifactId>
-      <version>0.0.26.Final</version>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-transport-native-io_uring</artifactId>
+      <version>${netty.version}</version>
       <optional>true</optional>
     </dependency>
 

modules/jooby-netty/src/main/java/io/jooby/internal/netty/HttpChunkContentCompressor.java

@@ -21,11 +21,10 @@ public HttpChunkContentCompressor(int compressionLevel) {
   @Override
   public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise)
       throws Exception {
-    if (msg instanceof ByteBuf) {
+    if (msg instanceof ByteBuf buff) {
       // convert ByteBuf to HttpContent to make it work with compression. This is needed as we use
       // the
       // ChunkedWriteHandler to send files when compression is enabled.
-      ByteBuf buff = (ByteBuf) msg;
       if (buff.isReadable()) {
         // We only encode non empty buffers, as empty buffers can be used for determining when
         // the content has been flushed and it confuses the HttpContentCompressor

modules/jooby-netty/src/main/java/io/jooby/internal/netty/NettyTransport.java

@@ -8,19 +8,18 @@
 import io.netty.bootstrap.ServerBootstrap;
 import io.netty.channel.ChannelOption;
 import io.netty.channel.EventLoopGroup;
-import io.netty.channel.epoll.Epoll;
-import io.netty.channel.epoll.EpollChannelOption;
-import io.netty.channel.epoll.EpollEventLoopGroup;
-import io.netty.channel.epoll.EpollServerSocketChannel;
+import io.netty.channel.MultiThreadIoEventLoopGroup;
+import io.netty.channel.epoll.*;
 import io.netty.channel.kqueue.KQueue;
-import io.netty.channel.kqueue.KQueueEventLoopGroup;
+import io.netty.channel.kqueue.KQueueChannelOption;
+import io.netty.channel.kqueue.KQueueIoHandler;
 import io.netty.channel.kqueue.KQueueServerSocketChannel;
-import io.netty.channel.nio.NioEventLoopGroup;
+import io.netty.channel.nio.NioIoHandler;
 import io.netty.channel.socket.nio.NioServerSocketChannel;
-import io.netty.incubator.channel.uring.IOUring;
-import io.netty.incubator.channel.uring.IOUringChannelOption;
-import io.netty.incubator.channel.uring.IOUringEventLoopGroup;
-import io.netty.incubator.channel.uring.IOUringServerSocketChannel;
+import io.netty.channel.uring.IoUring;
+import io.netty.channel.uring.IoUringChannelOption;
+import io.netty.channel.uring.IoUringIoHandler;
+import io.netty.channel.uring.IoUringServerSocketChannel;
 import io.netty.util.concurrent.DefaultThreadFactory;
 
 public abstract class NettyTransport {
@@ -36,7 +35,7 @@ public ServerBootstrap configure(EventLoopGroup acceptor, EventLoopGroup eventlo
   public abstract EventLoopGroup createEventLoop(int threads, String threadName, int ioRatio);
 
   public static NettyTransport transport(ClassLoader loader) {
-    if (isIOUring(loader)) {
+    if (isIoUring(loader)) {
       return ioUring();
     } else if (isEpoll(loader)) {
       return epoll();
@@ -55,13 +54,13 @@ private static NettyTransport epoll() {
   }
 
   private static NettyTransport ioUring() {
-    return new IOUringTransport();
+    return new IoUringTransport();
   }
 
-  private static boolean isIOUring(ClassLoader loader) {
+  private static boolean isIoUring(ClassLoader loader) {
     try {
-      loader.loadClass("io.netty.incubator.channel.uring.IOUring");
-      return IOUring.isAvailable();
+      loader.loadClass("io.netty.channel.uring.IoUring");
+      return IoUring.isAvailable();
     } catch (ClassNotFoundException x) {
       return false;
     }
@@ -92,10 +91,8 @@ private static NettyTransport nio() {
   private static class JDKTransport extends NettyTransport {
     @Override
     public EventLoopGroup createEventLoop(int threads, String threadName, int ioRatio) {
-      NioEventLoopGroup loopGroup =
-          new NioEventLoopGroup(threads, new DefaultThreadFactory(threadName));
-      loopGroup.setIoRatio(ioRatio);
-      return loopGroup;
+      return new MultiThreadIoEventLoopGroup(
+          threads, new DefaultThreadFactory(threadName), NioIoHandler.newFactory());
     }
 
     @Override
@@ -104,29 +101,29 @@ public ServerBootstrap configure(EventLoopGroup acceptor, EventLoopGroup eventlo
     }
   }
 
-  private static class IOUringTransport extends NettyTransport {
+  private static class IoUringTransport extends NettyTransport {
 
     @Override
     public EventLoopGroup createEventLoop(int threads, String threadName, int ioRatio) {
-      IOUringEventLoopGroup loopGroup =
-          new IOUringEventLoopGroup(threads, new DefaultThreadFactory(threadName + "-io-uring"));
-      return loopGroup;
+      return new MultiThreadIoEventLoopGroup(
+          threads,
+          new DefaultThreadFactory(threadName + "-io-uring"),
+          IoUringIoHandler.newFactory());
     }
 
     @Override
     public ServerBootstrap configure(EventLoopGroup acceptor, EventLoopGroup eventloop) {
       return super.configure(acceptor, eventloop)
-          .channel(IOUringServerSocketChannel.class)
-          .option(IOUringChannelOption.SO_REUSEPORT, true);
+          .channel(IoUringServerSocketChannel.class)
+          .option(IoUringChannelOption.SO_REUSEPORT, true);
     }
   }
 
   private static class EpollTransport extends NettyTransport {
     @Override
     public EventLoopGroup createEventLoop(int threads, String threadName, int ioRatio) {
-      EpollEventLoopGroup loopGroup =
-          new EpollEventLoopGroup(threads, new DefaultThreadFactory(threadName + "-epoll"));
-      return loopGroup;
+      return new MultiThreadIoEventLoopGroup(
+          threads, new DefaultThreadFactory(threadName + "-epoll"), EpollIoHandler.newFactory());
     }
 
     @Override
@@ -140,15 +137,15 @@ public ServerBootstrap configure(EventLoopGroup acceptor, EventLoopGroup eventlo
   private static class KQueueTransport extends NettyTransport {
     @Override
     public EventLoopGroup createEventLoop(int threads, String threadName, int ioRatio) {
-      KQueueEventLoopGroup loopGroup =
-          new KQueueEventLoopGroup(threads, new DefaultThreadFactory(threadName + "-kqueue"));
-      loopGroup.setIoRatio(ioRatio);
-      return loopGroup;
+      return new MultiThreadIoEventLoopGroup(
+          threads, new DefaultThreadFactory(threadName + "-kqueue"), KQueueIoHandler.newFactory());
     }
 
     @Override
     public ServerBootstrap configure(EventLoopGroup acceptor, EventLoopGroup eventloop) {
-      return super.configure(acceptor, eventloop).channel(KQueueServerSocketChannel.class);
+      return super.configure(acceptor, eventloop)
+          .channel(KQueueServerSocketChannel.class)
+          .option(KQueueChannelOption.SO_REUSEPORT, true);
     }
   }
 }

modules/jooby-netty/src/main/java/io/jooby/netty/NettyServer.java

@@ -12,8 +12,7 @@
 import java.net.BindException;
 import java.util.Arrays;
 import java.util.List;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
+import java.util.concurrent.*;
 
 import javax.net.ssl.SSLContext;
 
@@ -55,7 +54,7 @@ public class NettyServer extends Server.Base {
 
   private EventLoopGroup acceptorloop;
   private EventLoopGroup eventloop;
-  private EventLoopGroup dateLoop;
+  private ScheduledExecutorService dateLoop;
   private ExecutorService worker;
 
   private NettyDataBufferFactory bufferFactory;
@@ -142,7 +141,7 @@ public Server start(@NonNull Jooby application) {
 
       /* Event loop: processing connections, parsing messages and doing engine's internal work */
       this.eventloop = transport.createEventLoop(options.getIoThreads(), "eventloop", _100);
-      this.dateLoop = transport.createEventLoop(1, "date-service", _100);
+      this.dateLoop = Executors.newSingleThreadScheduledExecutor();
       var dateService = new NettyDateService(dateLoop);
 
       /* File data factory: */
@@ -235,19 +234,22 @@ public synchronized Server stop() {
     // only for jooby build where close events may take longer.
     NettyWebSocket.all.clear();
 
-    shutdown(acceptorloop);
-    shutdown(eventloop);
-    shutdown(dateLoop);
+    // required after Netty 4.2
+    shutdown(acceptorloop, 0);
+    shutdown(eventloop, 2);
+    if (dateLoop != null) {
+      dateLoop.shutdown();
+    }
     if (worker != null) {
       worker.shutdown();
       worker = null;
     }
     return this;
   }
 
-  private void shutdown(EventLoopGroup eventLoopGroup) {
+  private void shutdown(EventLoopGroup eventLoopGroup, int quietPeriod) {
     if (eventLoopGroup != null) {
-      eventLoopGroup.shutdownGracefully();
+      eventLoopGroup.shutdownGracefully(quietPeriod, 15, TimeUnit.SECONDS);
     }
   }
 

modules/jooby-netty/src/main/java/module-info.java

@@ -24,9 +24,10 @@
   requires io.netty.common;
   requires io.netty.buffer;
   requires io.netty.codec;
+  requires io.netty.codec.compression;
   requires static io.netty.transport.classes.epoll;
   requires static io.netty.transport.classes.kqueue;
-  requires static io.netty.incubator.transport.classes.io_uring;
+  requires static io.netty.transport.classes.io_uring;
 
   provides Server with
       NettyServer;