Refactored request handler to throw a better exception

mustafamotiwala · mustafamotiwala · commit cfa09d683ada · 2019-04-05T13:59:11.000+08:00
diff --git a/modules/jooby-undertow/src/main/java/org/jooby/internal/undertow/UndertowRequest.java b/modules/jooby-undertow/src/main/java/org/jooby/internal/undertow/UndertowRequest.java
@@ -215,7 +215,7 @@
 import java.util.concurrent.Executor;
 import java.util.stream.Collectors;
 
-import io.undertow.server.handlers.form.FormDataParser;
+import io.undertow.server.handlers.form.*;
 import org.jooby.Cookie;
 import org.jooby.MediaType;
 import org.jooby.Router;
@@ -233,10 +233,7 @@
 
 import io.undertow.server.BlockingHttpExchange;
 import io.undertow.server.HttpServerExchange;
-import io.undertow.server.handlers.form.FormData;
 import io.undertow.server.handlers.form.FormData.FormValue;
-import io.undertow.server.handlers.form.FormEncodedDataDefinition;
-import io.undertow.server.handlers.form.MultiPartParserDefinition;
 import io.undertow.util.AttachmentKey;
 import io.undertow.util.HeaderValues;
 import io.undertow.util.HttpString;
@@ -410,25 +407,22 @@ private FormData parseForm() {
       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()
+
+        FormEncodedDataDefinition encodedParser = new FormEncodedDataDefinition().setDefaultEncoding(charset);
+        MultiPartParserDefinition multiPartParser = new MultiPartParserDefinition()
                 .setTempFileLocation(new File(tmpdir).toPath())
-                .setDefaultEncoding(charset)
-                .create(exchange)
-                .parseBlocking();
-          }
-        }
-      } catch (IOException x) {
+                .setDefaultEncoding(charset);
+        blocking.get();
+        FormDataParser parser = FormParserFactory
+                .builder(false)
+                .addParser(encodedParser)
+                .addParser(multiPartParser)
+                .build()
+                .createParser(exchange);
+
+        form = parser != null ? parser.parseBlocking() : NO_FORM;
+      } catch (IOException iox) {
+        throw new IllegalArgumentException("Bad Request...", iox);
       }
     }
     return form;
