Introducing non-decorated handlers.

rapidoid-commons/src/main/resources/rapidoid-classes.txt

@@ -329,7 +329,7 @@ org.rapidoid.http.handler.lambda.SixParamLambdaHandler
 org.rapidoid.http.handler.lambda.ThreeParamLambdaHandler
 org.rapidoid.http.handler.lambda.TwoParamLambdaHandler
 org.rapidoid.http.handler.MethodReqHandler
-org.rapidoid.http.handler.NonBlockingHttpHandler
+org.rapidoid.http.handler.NonDecoratedHttpHandler
 org.rapidoid.http.handler.optimized.CallableHttpHandler
 org.rapidoid.http.handler.optimized.DelegatingParamsAwareReqHandler
 org.rapidoid.http.handler.optimized.DelegatingParamsAwareReqRespHandler

rapidoid-http-fast/src/main/java/org/rapidoid/http/RouteConfig.java

@@ -58,4 +58,9 @@ public interface RouteConfig {
 	String zone();
 
 	RouteOptions zone(String zone);
+
+	boolean decorated();
+
+	RouteOptions decorated(boolean decorated);
+
 }

rapidoid-http-fast/src/main/java/org/rapidoid/http/handler/NonBlockingHttpHandler.java → rapidoid-http-fast/src/main/java/org/rapidoid/http/handler/NonDecoratedHttpHandler.java

@@ -34,15 +34,15 @@
 
 @Authors("Nikolche Mihajlovski")
 @Since("5.2.0")
-public class NonBlockingHttpHandler extends AbstractHttpHandler {
+public class NonDecoratedHttpHandler extends AbstractHttpHandler {
 
-	private final Callable<?> nonBlockingLogic;
+	private final Callable<?> logic;
 	private final boolean returnsJson;
 
-	public NonBlockingHttpHandler(RouteOptions options, Callable<?> nonBlockingLogic) {
+	public NonDecoratedHttpHandler(RouteOptions options, Callable<?> logic) {
 		super(options);
 
-		this.nonBlockingLogic = nonBlockingLogic;
+		this.logic = logic;
 		this.returnsJson = options.contentType() == MediaType.JSON;
 	}
 
@@ -51,7 +51,7 @@ public HttpStatus handle(Channel ctx, boolean isKeepAlive, Req req, Object extra
 		Object result;
 
 		try {
-			result = nonBlockingLogic.call();
+			result = logic.call();
 
 		} catch (Exception e) {
 			HttpIO.write200(ctx, isKeepAlive, contentType, "Internal server error!".getBytes());

rapidoid-http-fast/src/main/java/org/rapidoid/http/impl/RouteOptions.java

@@ -10,6 +10,7 @@
 import org.rapidoid.http.RouteConfig;
 import org.rapidoid.u.U;
 
+import java.util.Arrays;
 import java.util.Set;
 
 /*
@@ -44,6 +45,8 @@ public class RouteOptions extends RapidoidThing implements RouteConfig {
 
 	private volatile String zone;
 
+	private volatile boolean decorated;
+
 	private volatile TransactionMode transactionMode = TransactionMode.NONE;
 
 	private final Set<String> roles = Coll.synchronizedSet();
@@ -139,6 +142,17 @@ public RouteOptions zone(String zone) {
 		return this;
 	}
 
+	@Override
+	public boolean decorated() {
+		return decorated;
+	}
+
+	@Override
+	public RouteOptions decorated(boolean decorated) {
+		this.decorated = decorated;
+		return this;
+	}
+
 	public RouteOptions copy() {
 		RouteOptions copy = new RouteOptions();
 
@@ -149,6 +163,7 @@ public RouteOptions copy() {
 		copy.roles(U.arrayOf(String.class, roles));
 		copy.wrappers(wrappers());
 		copy.zone(zone());
+		copy.decorated(decorated());
 
 		return copy;
 	}
@@ -161,12 +176,14 @@ public boolean equals(Object o) {
 		RouteOptions that = (RouteOptions) o;
 
 		if (mvc != that.mvc) return false;
+		if (decorated != that.decorated) return false;
 		if (contentType != null ? !contentType.equals(that.contentType) : that.contentType != null) return false;
 		if (view != null ? !view.equals(that.view) : that.view != null) return false;
 		if (zone != null ? !zone.equals(that.zone) : that.zone != null) return false;
 		if (transactionMode != that.transactionMode) return false;
 		if (roles != null ? !roles.equals(that.roles) : that.roles != null) return false;
-		return wrappers != null ? wrappers.equals(that.wrappers) : that.wrappers == null;
+		return Arrays.equals(wrappers, that.wrappers);
+
 	}
 
 	@Override
@@ -175,9 +192,10 @@ public int hashCode() {
 		result = 31 * result + (view != null ? view.hashCode() : 0);
 		result = 31 * result + (mvc ? 1 : 0);
 		result = 31 * result + (zone != null ? zone.hashCode() : 0);
+		result = 31 * result + (decorated ? 1 : 0);
 		result = 31 * result + (transactionMode != null ? transactionMode.hashCode() : 0);
 		result = 31 * result + (roles != null ? roles.hashCode() : 0);
-		result = 31 * result + (wrappers != null ? wrappers.hashCode() : 0);
+		result = 31 * result + Arrays.hashCode(wrappers);
 		return result;
 	}
 }

rapidoid-http-server/src/main/java/org/rapidoid/http/handler/HttpHandlers.java

@@ -106,7 +106,12 @@ public static void registerPredefined(FastHttp http, HttpRoutes routes, String v
 
 	@SuppressWarnings("unchecked")
 	public static void register(FastHttp http, HttpRoutes routes, String verb, String path, RouteOptions options, Callable<?> handler) {
-		routes.on(verb, path, new CallableHttpHandler(http, routes, options, (Callable<Object>) handler));
+
+		HttpHandler httpHandler = options.decorated() ?
+			new CallableHttpHandler(http, routes, options, handler) :
+			new NonDecoratedHttpHandler(options, handler);
+
+		routes.on(verb, path, httpHandler);
 	}
 
 	public static void register(FastHttp http, HttpRoutes routes, String verb, String path, RouteOptions options, NParamLambda lambda) {

rapidoid-http-server/src/main/java/org/rapidoid/setup/OnRoute.java

@@ -4,7 +4,6 @@
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
 import org.rapidoid.annotation.TransactionMode;
-import org.rapidoid.http.MediaType;
 import org.rapidoid.http.*;
 import org.rapidoid.http.handler.HttpHandlers;
 import org.rapidoid.http.impl.RouteOptions;
@@ -397,4 +396,9 @@ public OnRoute zone(String zone) {
 		return this;
 	}
 
+	public OnRoute decorated(boolean decorated) {
+		options.decorated(decorated);
+		return this;
+	}
+
 }