Merge pull request #5 from SeanMollet/master

Set isBlocking true if the input type uses a handler that blocks.
noboomu · Oct 3, 2018 · 7e481ec · 7e481ec
2 parents 52702bd + c28771d
commit 7e481ec
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/src/main/java/io/sinistral/proteus/server/ServerResponse.java b/src/main/java/io/sinistral/proteus/server/ServerResponse.java
@@ -253,6 +253,12 @@ public ServerResponse<T> throwable(Throwable throwable)
 		return this;
 	}
 
+        public ServerResponse<T> status(Response.Status status)
+	{
+		this.status = status.getStatusCode();
+                return this;
+        }
+
 	public ServerResponse<T> status(int status)
 	{
 		this.status = status;

diff --git a/src/main/java/io/sinistral/proteus/server/handlers/HandlerGenerator.java b/src/main/java/io/sinistral/proteus/server/handlers/HandlerGenerator.java
@@ -466,6 +466,12 @@ else if (t.equals(HttpServerExchange.class) || t.equals(ServerRequest.class))
 
 			endpointInfo.setConsumes(consumesContentType);
 
+            //The handler for these two inputs types is blocking, so we set the flag
+            if (endpointInfo.getConsumes().equals("application/x-www-form-urlencoded")
+                    || endpointInfo.getConsumes().equals("multipart/form-data")) {
+                isBlocking = true;
+            }
+
 			endpointInfo.setPathTemplate(methodPath);
 
 			endpointInfo.setControllerMethod(m.getName());