Add support for server worker executor.

krisztiankocsis · krisztiankocsis · commit f4fdb897aaec · 2017-01-02T02:33:17.000+01:00
diff --git a/jooby-jetty/src/main/java/org/jooby/internal/jetty/JettyServer.java b/jooby-jetty/src/main/java/org/jooby/internal/jetty/JettyServer.java
@@ -22,6 +22,7 @@
 import java.lang.reflect.Method;
 import java.util.Arrays;
 import java.util.Map;
+import java.util.concurrent.Executor;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -69,11 +70,13 @@ public class JettyServer implements org.jooby.spi.Server {
   private final Logger log = LoggerFactory.getLogger(org.jooby.spi.Server.class);
 
   private Server server;
+  private Executor executor;
 
   @Inject
   public JettyServer(final HttpHandler handler, final Config conf,
       final Provider<SSLContext> sslCtx) {
     this.server = server(handler, conf, sslCtx);
+    this.executor = this.server.getThreadPool();
   }
 
   private Server server(final HttpHandler handler, final Config conf,
@@ -194,6 +197,12 @@ public void stop() throws Exception {
     server.stop();
   }
 
+  @Override
+  public Executor executor()
+  {
+    return executor;
+  }
+
   private void tryOption(final Object source, final Config config, final Method option) {
     Try.run(() -> {
       String optionName = option.getName().replace("set", "");
diff --git a/jooby-netty/src/main/java/org/jooby/internal/netty/NettyServer.java b/jooby-netty/src/main/java/org/jooby/internal/netty/NettyServer.java
@@ -26,6 +26,7 @@
 import java.lang.reflect.ParameterizedType;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.concurrent.Executor;
 import java.util.concurrent.ThreadFactory;
 import java.util.function.BiConsumer;
 
@@ -152,6 +153,12 @@ public void join() throws InterruptedException {
     ch.closeFuture().sync();
   }
 
+  @Override
+  public Executor executor()
+  {
+    return executor;
+  }
+
   @SuppressWarnings({"rawtypes", "unchecked" })
   private void configure(final Config config, final String path,
       final BiConsumer<ChannelOption<Object>, Object> setter) {
diff --git a/jooby-undertow/src/main/java/org/jooby/internal/undertow/UndertowServer.java b/jooby-undertow/src/main/java/org/jooby/internal/undertow/UndertowServer.java
@@ -20,6 +20,7 @@
 
 import java.lang.reflect.Field;
 import java.util.Map;
+import java.util.concurrent.Executor;
 import java.util.concurrent.TimeUnit;
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
@@ -54,6 +55,7 @@ private interface SetOption {
   private static final Logger log = LoggerFactory.getLogger(org.jooby.spi.Server.class);
 
   private Undertow server;
+  private Executor executor;
 
   private final GracefulShutdownHandler shutdown;
 
@@ -85,6 +87,8 @@ public UndertowServer(final org.jooby.spi.HttpHandler dispatcher, final Config c
 
     this.server = ubuilder.setHandler(shutdown)
         .build();
+
+    this.executor = server.getWorker();
   }
 
   private String host(final String host) {
@@ -206,4 +210,10 @@ public void stop() throws Exception {
     server.stop();
   }
 
+  @Override
+  public Executor executor()
+  {
+    return executor;
+  }
+
 }
diff --git a/jooby/src/main/java/org/jooby/Jooby.java b/jooby/src/main/java/org/jooby/Jooby.java
@@ -108,6 +108,7 @@
 import org.jooby.internal.ParameterNameProvider;
 import org.jooby.internal.RequestScope;
 import org.jooby.internal.RouteMetadata;
+import org.jooby.internal.ServerExecutorProvider;
 import org.jooby.internal.ServerLookup;
 import org.jooby.internal.ServerSessionManager;
 import org.jooby.internal.SessionManager;
@@ -2358,6 +2359,24 @@ public Jooby executor(final Executor executor) {
     return this;
   }
 
+  /**
+   * Set a named executor to use from {@link Deferred Deferred API}. Useful for override the
+   * default/global executor.
+   *
+   * Default executor runs each task in the thread that invokes {@link Executor#execute execute},
+   * that's a Jooby worker thread. A worker thread in Jooby can block.
+   *
+   * @param name Name of the executor.
+   * @param provider Provider for the executor.
+   * @return This jooby instance.
+   */
+  public Jooby executor(final String name, final Class<? extends javax.inject.Provider<Executor>> provider) {
+    this.executors.add(binder -> {
+      binder.bind(Key.get(Executor.class, Names.named(name))).toProvider(provider).in(Singleton.class);
+    });
+    return this;
+  }
+
   /**
    * Set a named executor to use from {@link Deferred Deferred API}. Useful for override the
    * default/global executor.
@@ -2565,6 +2584,7 @@ private Injector bootstrap(final Config args,
       executor(MoreExecutors.directExecutor());
     }
     executor("direct", MoreExecutors.directExecutor());
+    executor("server", ServerExecutorProvider.class);
 
     /** Some basic xss functions. */
     xss(finalEnv);
diff --git a/jooby/src/main/java/org/jooby/internal/ServerExecutorProvider.java b/jooby/src/main/java/org/jooby/internal/ServerExecutorProvider.java
@@ -0,0 +1,43 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.jooby.internal;
+
+import org.jooby.spi.Server;
+
+import javax.inject.Inject;
+import javax.inject.Provider;
+import java.util.concurrent.Executor;
+
+import static java.util.Objects.requireNonNull;
+
+public class ServerExecutorProvider implements Provider<Executor> {
+
+  private Executor executor;
+
+  @Inject
+  public ServerExecutorProvider(final Server server) {
+    executor = requireNonNull(server, "Server is required.").executor();
+  }
+
+  @Override
+  public Executor get() {
+    return executor;
+  }
+
+}
diff --git a/jooby/src/main/java/org/jooby/spi/Server.java b/jooby/src/main/java/org/jooby/spi/Server.java
@@ -18,6 +18,7 @@
  */
 package org.jooby.spi;
 
+import java.util.concurrent.Executor;
 
 /**
  * A HTTP web server.
@@ -48,4 +49,11 @@ public interface Server {
    */
   void join() throws InterruptedException;
 
+  /**
+   * Obtain the executor for worker threads.
+   *
+   * @return The executor for worker threads.
+   */
+  Executor executor();
+
 }
