Merge pull request #691 from jooby-project/690

performance improvement + reduce number of worker threads fix  #690

Author: jknack

coverage-report/src/test/java/org/jooby/issues/Issue128.java

@@ -16,21 +16,21 @@ public class Issue128 extends ServerFeature {
 
   @Test
   public void fakePutViaParamUrl() throws Exception {
-    request().post("/fake/put?_method=put")
+    request().post("/fake/put?_method=PUT")
         .expect("PUT");
   }
 
   @Test
   public void fakePutViaFormParam() throws Exception {
     request().post("/fake/put")
-        .form().add("_method", "PuT")
+        .form().add("_method", "PUT")
         .expect("PUT");
   }
 
   @Test
   public void fakePostViaHeader() throws Exception {
     request().post("/fake/put")
-        .header("_method", "put")
+        .header("_method", "PUT")
         .expect("PUT");
   }
 

coverage-report/src/test/java/org/jooby/issues/Issue346.java

@@ -6,13 +6,17 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+import java.util.HashMap;
+import java.util.Map;
 
 import org.jooby.Request;
 import org.jooby.mvc.GET;
 import org.jooby.mvc.Path;
 import org.jooby.test.ServerFeature;
 import org.junit.Test;
 
+import com.google.common.collect.ImmutableMap;
+
 public class Issue346 extends ServerFeature {
 
   @Target({ElementType.METHOD, ElementType.TYPE, ElementType.ANNOTATION_TYPE })
@@ -56,30 +60,52 @@ public Object admin(final Request req) {
 
   {
     use("/1", (req, rsp) -> {
-      assertEquals("{priority=1.0, changefreq=always}", req.route().attributes().toString());
+      assertEquals(ImmutableMap.of("priority", 1.0, "changefreq", "always"),
+          req.route().attributes());
     });
 
     use("/2", (req, rsp) -> {
-      assertEquals("{priority=0.5, changefreq=always}", req.route().attributes().toString());
+      assertEquals(ImmutableMap.of("priority", 0.5, "changefreq", "always"),
+          req.route().attributes());
     });
 
     use("/3", (req, rsp) -> {
-      assertEquals("{role=admin, priority=0.5, changefreq=always}",
-          req.route().attributes().toString());
+      assertEquals(ImmutableMap.of("priority", 0.5, "changefreq", "always", "role", "admin"),
+          req.route().attributes());
     });
     use(Resource.class);
   }
 
   @Test
   public void mvcAttrs() throws Exception {
     request().get("/1")
-        .expect("{priority=1.0, changefreq=always}");
+        .expect(value -> {
+          Map<String, Object> hash = toMap(value.substring(1, value.length() - 1));
+          assertEquals(ImmutableMap.of("priority", "1.0", "changefreq", "always"), hash);
+        });
 
     request().get("/2")
-        .expect("{priority=0.5, changefreq=always}");
+        .expect(value -> {
+          Map<String, Object> hash = toMap(value.substring(1, value.length() - 1));
+          assertEquals(ImmutableMap.of("priority", "0.5", "changefreq", "always"), hash);
+        });
 
     request().get("/3")
-        .expect("{role=admin, priority=0.5, changefreq=always}");
+        .expect(value -> {
+          Map<String, Object> hash = toMap(value.substring(1, value.length() - 1));
+          assertEquals(ImmutableMap.of("priority", "0.5", "changefreq", "always", "role", "admin"),
+              hash);
+        });
+  }
+
+  private Map<String, Object> toMap(final String value) {
+    Map<String, Object> hash = new HashMap<>();
+    String[] pairs = value.split(",");
+    for (String pair : pairs) {
+      String[] keyandvalue = pair.trim().split("=");
+      hash.put(keyandvalue[0], keyandvalue[1]);
+    }
+    return hash;
   }
 
 }

jooby-undertow/src/main/java/org/jooby/internal/undertow/UndertowRequest.java

@@ -53,31 +53,28 @@
 import io.undertow.util.AttachmentKey;
 import io.undertow.util.HeaderValues;
 import io.undertow.util.HttpString;
-import javaslang.Lazy;
-import javaslang.control.Try;
 
 public class UndertowRequest implements NativeRequest {
 
   public static final AttachmentKey<NativeWebSocket> SOCKET = AttachmentKey
       .create(NativeWebSocket.class);
 
+  private static final FormData NO_FORM = new FormData(0);
+
   private HttpServerExchange exchange;
 
-  private Config config;
+  private Config conf;
 
-  private final Lazy<FormData> form;
+  private FormData form;
 
-  private final String path;
+  private String path;
 
   private Supplier<BlockingHttpExchange> blocking;
 
-  public UndertowRequest(final HttpServerExchange exchange, final Config conf)
-      throws IOException {
+  public UndertowRequest(final HttpServerExchange exchange, final Config conf) throws IOException {
     this.exchange = exchange;
     this.blocking = Suppliers.memoize(() -> this.exchange.startBlocking());
-    this.config = conf;
-    this.form = Lazy.of(() -> Try.of(() -> parseForm(exchange, conf.getString("application.tmpdir"),
-        conf.getString("application.charset"))).get());
+    this.conf = conf;
     this.path = URLDecoder.decode(exchange.getRequestPath(), "UTF-8");
   }
 
@@ -106,7 +103,7 @@ public String rawPath() {
   public List<String> paramNames() {
     ImmutableList.Builder<String> builder = ImmutableList.<String> builder();
     builder.addAll(exchange.getQueryParameters().keySet());
-    FormData formdata = this.form.get();
+    FormData formdata = parseForm();
     formdata.forEach(v -> {
       // excludes upload from param names.
       if (!formdata.getFirst(v).isFile()) {
@@ -125,7 +122,7 @@ public List<String> params(final String name) {
       query.stream().forEach(builder::add);
     }
     // form params
-    Optional.ofNullable(form.get().get(name)).ifPresent(values -> {
+    Optional.ofNullable(parseForm().get(name)).ifPresent(values -> {
       values.stream().forEach(value -> {
         if (!value.isFile()) {
           builder.add(value.getValue());
@@ -164,7 +161,7 @@ public List<Cookie> cookies() {
   @Override
   public List<NativeUpload> files(final String name) {
     Builder<NativeUpload> builder = ImmutableList.builder();
-    Deque<FormValue> values = form.get().get(name);
+    Deque<FormValue> values = parseForm().get(name);
     if (values != null) {
       values.forEach(value -> {
         if (value.isFile()) {
@@ -204,7 +201,7 @@ public boolean secure() {
   @SuppressWarnings("unchecked")
   public <T> T upgrade(final Class<T> type) throws Exception {
     if (type == NativeWebSocket.class) {
-      UndertowWebSocket ws = new UndertowWebSocket(config);
+      UndertowWebSocket ws = new UndertowWebSocket(conf);
       exchange.putAttachment(SOCKET, ws);
       return (T) ws;
     }
@@ -222,28 +219,35 @@ public void startAsync(final Executor executor, final Runnable runnable) {
     exchange.dispatch(executor, runnable);
   }
 
-  private FormData parseForm(final HttpServerExchange exchange, final String tmpdir,
-      final String charset) throws IOException {
-    String value = exchange.getRequestHeaders().getFirst("Content-Type");
-    if (value != null) {
-      MediaType type = MediaType.valueOf(value);
-      if (MediaType.form.name().equals(type.name())) {
-        blocking.get();
-        return new FormEncodedDataDefinition()
-            .setDefaultEncoding(charset)
-            .create(exchange)
-            .parseBlocking();
-      } else if (MediaType.multipart.name().equals(type.name())) {
-        blocking.get();
-        return new MultiPartParserDefinition()
-            .setTempFileLocation(new File(tmpdir).toPath())
-            .setDefaultEncoding(charset)
-            .create(exchange)
-            .parseBlocking();
-
+  private FormData parseForm() {
+    if (form == null) {
+      form = NO_FORM;
+      try {
+        String tmpdir = conf.getString("application.tmpdir");
+        String charset = conf.getString("application.charset");
+        String value = exchange.getRequestHeaders().getFirst("Content-Type");
+        if (value != null) {
+          MediaType type = MediaType.valueOf(value);
+          if (MediaType.form.name().equals(type.name())) {
+            blocking.get();
+            form = new FormEncodedDataDefinition()
+                .setDefaultEncoding(charset)
+                .create(exchange)
+                .parseBlocking();
+          } else if (MediaType.multipart.name().equals(type.name())) {
+            blocking.get();
+            form = new MultiPartParserDefinition()
+                .setTempFileLocation(new File(tmpdir).toPath())
+                .setDefaultEncoding(charset)
+                .create(exchange)
+                .parseBlocking();
+
+          }
+        }
+      } catch (IOException x) {
       }
     }
-    return new FormData(0);
+    return form;
   }
 
   private static Cookie cookie(final io.undertow.server.handlers.Cookie c) {

jooby-undertow/src/main/java/org/jooby/internal/undertow/UndertowResponse.java

@@ -30,7 +30,6 @@
 
 import org.jooby.spi.NativeResponse;
 import org.jooby.spi.NativeWebSocket;
-import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.google.common.collect.ImmutableList;
@@ -44,9 +43,6 @@
 
 public class UndertowResponse implements NativeResponse {
 
-  /** The logging system. */
-  private final Logger log = LoggerFactory.getLogger(NativeResponse.class);
-
   private HttpServerExchange exchange;
 
   private volatile boolean endExchange = true;
@@ -70,13 +66,13 @@ public Optional<String> header(final String name) {
 
   @Override
   public void header(final String name, final String value) {
-    exchange.getResponseHeaders().put(new HttpString(name), value);
+    exchange.getResponseHeaders().put(HttpString.tryFromString(name), value);
   }
 
   @Override
   public void header(final String name, final Iterable<String> values) {
     HeaderMap headers = exchange.getResponseHeaders();
-    headers.putAll(new HttpString(name), ImmutableList.copyOf(values));
+    headers.putAll(HttpString.tryFromString(name), ImmutableList.copyOf(values));
   }
 
   @Override
@@ -103,7 +99,8 @@ public void send(final FileChannel channel) throws Exception {
   }
 
   @Override
-  public void send(final FileChannel channel, final long position, final long count) throws Exception {
+  public void send(final FileChannel channel, final long position, final long count)
+      throws Exception {
     endExchange = false;
     channel.position(position);
     new ChunkedStream(count).send(channel, exchange, new LogIoCallback(IoCallback.END_EXCHANGE));
@@ -138,7 +135,7 @@ public void end() {
           ((UndertowWebSocket) ws).connect(channel);
         }).handleRequest(exchange);
       } catch (Exception ex) {
-        log.error("Upgrade result in exception", ex);
+        LoggerFactory.getLogger(NativeResponse.class).error("Upgrade result in exception", ex);
       } finally {
         exchange.removeAttachment(UndertowRequest.SOCKET);
       }