Merge branch 'vertx'

Author: jknack

jooby/src/main/java/io/jooby/Jooby.java

@@ -77,8 +77,7 @@ public class Jooby implements Router, Registry {
 
   private static Jooby owner;
   private static ExecutionMode BOOT_EXECUTION_MODE = ExecutionMode.DEFAULT;
-  private static OutputFactory OUTPUT_FACTORY;
-  private static ServerOptions SERVER_OPTIONS;
+  private static Server BOOT_SERVER;
 
   private RouterImpl router;
 
@@ -125,11 +124,18 @@ public Jooby() {
       lateExtensions = new ArrayList<>();
       // NOTE: fallback to default, this is required for direct instance creation of class
       // app bootstrap always ensures server instance.
-      router.setOutputFactory(Optional.ofNullable(OUTPUT_FACTORY).orElseGet(OutputFactory::create));
-      router.setServerOptions(Optional.ofNullable(SERVER_OPTIONS).orElseGet(ServerOptions::new));
+      router.setOutputFactory(
+          Optional.ofNullable(BOOT_SERVER)
+              .map(Server::getOutputFactory)
+              .orElseGet(OutputFactory::create));
+      router.setServerOptions(
+          Optional.ofNullable(BOOT_SERVER).map(Server::getOptions).orElseGet(ServerOptions::new));
     } else {
       copyState(owner, this);
     }
+    if (BOOT_SERVER != null) {
+      BOOT_SERVER.init(this);
+    }
   }
 
   @NonNull @Override
@@ -874,7 +880,7 @@ public Jooby setStartupSummary(List<StartupSummary> startupSummary) {
    * @param server Server.
    * @return This application.
    */
-  public @NonNull Jooby start(@NonNull Server server) {
+  public Jooby start(@NonNull Server server) {
     Path tmpdir = getTmpdir();
     ensureTmpdir(tmpdir);
 
@@ -1301,14 +1307,12 @@ public static Jooby createApp(
 
     Jooby app;
     try {
-      Jooby.OUTPUT_FACTORY = server.getOutputFactory();
-      Jooby.SERVER_OPTIONS = server.getOptions();
+      Jooby.BOOT_SERVER = server;
       Jooby.BOOT_EXECUTION_MODE = executionMode;
       app = provider.get();
     } finally {
       Jooby.BOOT_EXECUTION_MODE = executionMode;
-      Jooby.OUTPUT_FACTORY = null;
-      Jooby.SERVER_OPTIONS = null;
+      Jooby.BOOT_SERVER = null;
     }
 
     return app;

jooby/src/main/java/io/jooby/Server.java

@@ -97,8 +97,6 @@ abstract class Base implements Server {
 
     private final AtomicBoolean stopping = new AtomicBoolean();
 
-    private boolean defaultOptions;
-
     protected void fireStart(@NonNull List<Jooby> applications, @NonNull Executor defaultWorker) {
       for (Jooby app : applications) {
         app.setDefaultWorker(defaultWorker).start(this);
@@ -141,7 +139,11 @@ public Server setOptions(@NonNull ServerOptions options) {
     }
   }
 
-  @NonNull OutputFactory getOutputFactory();
+  default Server init(Jooby application) {
+    return this;
+  }
+
+  OutputFactory getOutputFactory();
 
   /**
    * Set server options. This method should be called once, calling this method multiple times will
@@ -150,29 +152,29 @@ public Server setOptions(@NonNull ServerOptions options) {
    * @param options Server options.
    * @return This server.
    */
-  @NonNull Server setOptions(@NonNull ServerOptions options);
+  Server setOptions(@NonNull ServerOptions options);
 
   /**
    * Get server name.
    *
    * @return Server name.
    */
-  @NonNull String getName();
+  String getName();
 
   /**
    * Get server options.
    *
    * @return Server options.
    */
-  @NonNull ServerOptions getOptions();
+  ServerOptions getOptions();
 
   /**
    * Start an application.
    *
    * @param application Application to start.
    * @return This server.
    */
-  @NonNull Server start(@NonNull Jooby... application);
+  Server start(@NonNull Jooby... application);
 
   /**
    * Utility method to turn off odd logger. This helps to ensure same startup log lines across
@@ -182,7 +184,7 @@ public Server setOptions(@NonNull ServerOptions options) {
    *
    * @return Name of the logs we want to temporarily silent.
    */
-  default @NonNull List<String> getLoggerOff() {
+  default List<String> getLoggerOff() {
     return emptyList();
   }
 
@@ -191,7 +193,7 @@ public Server setOptions(@NonNull ServerOptions options) {
    *
    * @return Stop the server.
    */
-  @NonNull Server stop();
+  Server stop();
 
   /**
    * Add a connection lost predicate. On unexpected exception, this method allows to customize which

…/internal/netty/NettyEventLoopGroup.java …ernal/netty/NettyEventLoopGroupImpl.javamodules/jooby-netty/src/main/java/io/jooby/internal/netty/NettyEventLoopGroup.java renamed to modules/jooby-netty/src/main/java/io/jooby/internal/netty/NettyEventLoopGroupImpl.java modules/jooby-netty/src/main/java/io/jooby/internal/netty/NettyEventLoopGroup.java renamed to modules/jooby-netty/src/main/java/io/jooby/internal/netty/NettyEventLoopGroupImpl.java

@@ -7,14 +7,15 @@
 
 import java.util.concurrent.TimeUnit;
 
+import io.jooby.netty.NettyEventLoopGroup;
 import io.netty.channel.EventLoopGroup;
 
-public class NettyEventLoopGroup {
+public class NettyEventLoopGroupImpl implements NettyEventLoopGroup {
   private final EventLoopGroup parent;
   private final EventLoopGroup child;
   private boolean closed;
 
-  public NettyEventLoopGroup(NettyTransport transport, boolean single, int ioThreads) {
+  public NettyEventLoopGroupImpl(NettyTransport transport, boolean single, int ioThreads) {
     child = transport.createEventLoop(ioThreads, "eventloop", 100);
     if (single) {
       parent = child;

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

@@ -0,0 +1,16 @@
+/*
+ * Jooby https://jooby.io
+ * Apache License Version 2.0 https://jooby.io/LICENSE.txt
+ * Copyright 2014 Edgar Espina
+ */
+package io.jooby.netty;
+
+import io.netty.channel.EventLoopGroup;
+
+public interface NettyEventLoopGroup {
+  EventLoopGroup getParent();
+
+  EventLoopGroup getChild();
+
+  void shutdown();
+}

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

@@ -17,6 +17,7 @@
 import javax.net.ssl.SSLContext;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
+import edu.umd.cs.findbugs.annotations.Nullable;
 import io.jooby.*;
 import io.jooby.exception.StartupException;
 import io.jooby.internal.netty.*;
@@ -139,7 +140,11 @@ public Server start(@NonNull Jooby... application) {
       var classLoader = applications.get(0).getClassLoader();
 
       var transport = NettyTransport.transport(classLoader);
-      eventLoop = new NettyEventLoopGroup(transport, singleEventLoopGroup, options.getIoThreads());
+      eventLoop = createEventLoopGroup();
+      if (eventLoop == null) {
+        eventLoop =
+            new NettyEventLoopGroupImpl(transport, singleEventLoopGroup, options.getIoThreads());
+      }
 
       var outputFactory = (NettyOutputFactory) getOutputFactory();
       var allocator = outputFactory.getAllocator();
@@ -179,13 +184,17 @@ public Server start(@NonNull Jooby... application) {
     return this;
   }
 
+  protected @Nullable NettyEventLoopGroup createEventLoopGroup() {
+    return null;
+  }
+
   private ServerBootstrap newBootstrap(
       ByteBufAllocator allocator,
       NettyTransport transport,
       NettyPipeline factory,
       NettyEventLoopGroup group) {
     return transport
-        .configure(eventLoop.getParent(), eventLoop.getChild())
+        .configure(group.getParent(), group.getChild())
         .childHandler(factory)
         .childOption(ChannelOption.ALLOCATOR, allocator)
         .childOption(ChannelOption.SO_REUSEADDR, true)
@@ -226,20 +235,16 @@ public synchronized Server stop() {
     // only for jooby build where close events may take longer.
     NettyWebSocket.all.clear();
 
-    eventLoop.shutdown();
+    if (eventLoop != null) {
+      eventLoop.shutdown();
+    }
     if (worker != null) {
       worker.shutdown();
       worker = null;
     }
     return this;
   }
 
-  private void shutdown(EventLoopGroup eventLoopGroup, int quietPeriod) {
-    if (eventLoopGroup != null) {
-      eventLoopGroup.shutdownGracefully(quietPeriod, 15, TimeUnit.SECONDS);
-    }
-  }
-
   private SslContext wrap(
       SSLContext sslContext, ClientAuth clientAuth, String[] protocol, boolean http2) {
     ApplicationProtocolConfig protocolConfig;

modules/jooby-vertx-mysql-client/pom.xml

@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>io.jooby</groupId>
+    <artifactId>modules</artifactId>
+    <version>4.0.7</version>
+  </parent>
+  <artifactId>jooby-vertx-mysql-client</artifactId>
+  <name>jooby-vertx-mysql-client</name>
+
+  <properties>
+    <Module-Name>io.jooby.vertx.mysqlclient</Module-Name>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>io.jooby</groupId>
+      <artifactId>jooby-vertx-sql-client</artifactId>
+      <version>${jooby.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.vertx</groupId>
+      <artifactId>vertx-mysql-client</artifactId>
+      <version>5.0.4</version>
+    </dependency>
+
+    <!-- Test dependencies -->
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-engine</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.jacoco</groupId>
+      <artifactId>org.jacoco.agent</artifactId>
+      <classifier>runtime</classifier>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>${maven-jar-plugin.version}</version>
+        <configuration>
+          <archive>
+            <manifestEntries>
+              <Automatic-Module-Name>${Module-Name}</Automatic-Module-Name>
+            </manifestEntries>
+          </archive>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>