Make server worker executor optional.

krisztiankocsis · krisztiankocsis · commit a055f07cf585 · 2017-01-02T02:54:52.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.Optional;
 import java.util.concurrent.Executor;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
@@ -198,9 +199,9 @@ public void stop() throws Exception {
   }
 
   @Override
-  public Executor executor()
+  public Optional<Executor> executor()
   {
-    return executor;
+    return Optional.of(executor);
   }
 
   private void tryOption(final Object source, final Config config, final Method option) {
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.Optional;
 import java.util.concurrent.Executor;
 import java.util.concurrent.ThreadFactory;
 import java.util.function.BiConsumer;
@@ -154,9 +155,9 @@ public void join() throws InterruptedException {
   }
 
   @Override
-  public Executor executor()
+  public Optional<Executor> executor()
   {
-    return executor;
+    return Optional.of(executor);
   }
 
   @SuppressWarnings({"rawtypes", "unchecked" })
diff --git a/jooby-servlet/src/main/java/org/jooby/servlet/ServletContainer.java b/jooby-servlet/src/main/java/org/jooby/servlet/ServletContainer.java
@@ -20,6 +20,9 @@
 
 import org.jooby.spi.Server;
 
+import java.util.Optional;
+import java.util.concurrent.Executor;
+
 /**
  * NOOP server for servlets.
  *
@@ -44,4 +47,9 @@ public void stop() throws Exception {
   public void join() throws InterruptedException {
   }
 
+  @Override
+  public Optional<Executor> executor() {
+    return Optional.empty();
+  }
+
 }
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.Optional;
 import java.util.concurrent.Executor;
 import java.util.concurrent.TimeUnit;
 import java.util.function.BiConsumer;
@@ -211,9 +212,9 @@ public void stop() throws Exception {
   }
 
   @Override
-  public Executor executor()
+  public Optional<Executor> executor()
   {
-    return executor;
+    return Optional.of(executor);
   }
 
 }
diff --git a/jooby/src/main/java/org/jooby/internal/ServerExecutorProvider.java b/jooby/src/main/java/org/jooby/internal/ServerExecutorProvider.java
@@ -18,6 +18,7 @@
  */
 package org.jooby.internal;
 
+import com.google.common.util.concurrent.MoreExecutors;
 import org.jooby.spi.Server;
 
 import javax.inject.Inject;
@@ -32,7 +33,8 @@ public class ServerExecutorProvider implements Provider<Executor> {
 
   @Inject
   public ServerExecutorProvider(final Server server) {
-    executor = requireNonNull(server, "Server is required.").executor();
+    executor = requireNonNull(server, "Server is required.")
+      .executor().orElse(MoreExecutors.directExecutor());
   }
 
   @Override
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.Optional;
 import java.util.concurrent.Executor;
 
 /**
@@ -54,6 +55,6 @@ public interface Server {
    *
    * @return The executor for worker threads.
    */
-  Executor executor();
+  Optional<Executor> executor();
 
 }
diff --git a/jooby/src/test/java/org/jooby/issues/Issue430.java b/jooby/src/test/java/org/jooby/issues/Issue430.java
@@ -4,6 +4,9 @@
 import org.jooby.spi.Server;
 import org.junit.Test;
 
+import java.util.Optional;
+import java.util.concurrent.Executor;
+
 public class Issue430 {
 
   public static class NOOP implements Server {
@@ -20,6 +23,11 @@ public void stop() throws Exception {
     public void join() throws InterruptedException {
     }
 
+    @Override
+    public Optional<Executor> executor() {
+      return Optional.empty();
+    }
+
   }
 
   @Test

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@`
`22`	`22`	`import java.lang.reflect.Method;`
`23`	`23`	`import java.util.Arrays;`
`24`	`24`	`import java.util.Map;`
	`25`	`+import java.util.Optional;`
`25`	`26`	`import java.util.concurrent.Executor;`
`26`	`27`	`import java.util.concurrent.TimeUnit;`
`27`	`28`	`import java.util.function.Function;`
`@@ -198,9 +199,9 @@ public void stop() throws Exception {`
`198`	`199`	`}`
`199`	`200`
`200`	`201`	`@Override`
`201`		`- public Executor executor()`
	`202`	`+ public Optional<Executor> executor()`
`202`	`203`	`{`
`203`		`- return executor;`
	`204`	`+ return Optional.of(executor);`
`204`	`205`	`}`
`205`	`206`
`206`	`207`	`private void tryOption(final Object source, final Config config, final Method option) {`
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@`
`26`	`26`	`import java.lang.reflect.ParameterizedType;`
`27`	`27`	`import java.util.Map;`
`28`	`28`	`import java.util.Map.Entry;`
	`29`	`+import java.util.Optional;`
`29`	`30`	`import java.util.concurrent.Executor;`
`30`	`31`	`import java.util.concurrent.ThreadFactory;`
`31`	`32`	`import java.util.function.BiConsumer;`
`@@ -154,9 +155,9 @@ public void join() throws InterruptedException {`
`154`	`155`	`}`
`155`	`156`
`156`	`157`	`@Override`
`157`		`- public Executor executor()`
	`158`	`+ public Optional<Executor> executor()`
`158`	`159`	`{`
`159`		`- return executor;`
	`160`	`+ return Optional.of(executor);`
`160`	`161`	`}`
`161`	`162`
`162`	`163`	`@SuppressWarnings({"rawtypes", "unchecked" })`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,9 @@`
`20`	`20`
`21`	`21`	`import org.jooby.spi.Server;`
`22`	`22`
	`23`	`+import java.util.Optional;`
	`24`	`+import java.util.concurrent.Executor;`
	`25`	`+`
`23`	`26`	`/**`
`24`	`27`	`* NOOP server for servlets.`
`25`	`28`	`*`
`@@ -44,4 +47,9 @@ public void stop() throws Exception {`
`44`	`47`	`public void join() throws InterruptedException {`
`45`	`48`	`}`
`46`	`49`
	`50`	`+ @Override`
	`51`	`+ public Optional<Executor> executor() {`
	`52`	`+ return Optional.empty();`
	`53`	`+ }`
	`54`	`+`
`47`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@`
`20`	`20`
`21`	`21`	`import java.lang.reflect.Field;`
`22`	`22`	`import java.util.Map;`
	`23`	`+import java.util.Optional;`
`23`	`24`	`import java.util.concurrent.Executor;`
`24`	`25`	`import java.util.concurrent.TimeUnit;`
`25`	`26`	`import java.util.function.BiConsumer;`
`@@ -211,9 +212,9 @@ public void stop() throws Exception {`
`211`	`212`	`}`
`212`	`213`
`213`	`214`	`@Override`
`214`		`- public Executor executor()`
	`215`	`+ public Optional<Executor> executor()`
`215`	`216`	`{`
`216`		`- return executor;`
	`217`	`+ return Optional.of(executor);`
`217`	`218`	`}`
`218`	`219`
`219`	`220`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@`
`18`	`18`	`*/`
`19`	`19`	`package org.jooby.spi;`
`20`	`20`
	`21`	`+import java.util.Optional;`
`21`	`22`	`import java.util.concurrent.Executor;`
`22`	`23`
`23`	`24`	`/**`
`@@ -54,6 +55,6 @@ public interface Server {`
`54`	`55`	`*`
`55`	`56`	`* @return The executor for worker threads.`
`56`	`57`	`*/`
`57`		`- Executor executor();`
	`58`	`+ Optional<Executor> executor();`
`58`	`59`
`59`	`60`	`}`