Minor improvements and clean-up.

rapidoid · Aug 28, 2016 · c498043 · c498043
1 parent f9ba446
commit c498043
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 11 deletions.
diff --git a/rapidoid-http-fast/src/main/java/org/rapidoid/http/FastHttpProtocol.java b/rapidoid-http-fast/src/main/java/org/rapidoid/http/FastHttpProtocol.java
@@ -45,6 +45,7 @@ public FastHttpProtocol(HttpProcessor processor) {
 		this.processor = processor;
 	}
 
+	@Override
 	@SuppressWarnings("unchecked")
 	public void process(Channel channel) {
 		if (channel.isInitial()) {

diff --git a/rapidoid-http-fast/src/main/java/org/rapidoid/http/handler/AbstractAsyncHttpHandler.java b/rapidoid-http-fast/src/main/java/org/rapidoid/http/handler/AbstractAsyncHttpHandler.java
@@ -50,12 +50,10 @@ public abstract class AbstractAsyncHttpHandler extends AbstractHttpHandler {
 
 	private final FastHttp http;
 
-	private final HttpRoutes routes;
-
+	@SuppressWarnings("UnusedParameters")
 	public AbstractAsyncHttpHandler(FastHttp http, HttpRoutes routes, RouteOptions options) {
 		super(options);
 		this.http = http;
-		this.routes = routes;
 	}
 
 	@Override

diff --git a/rapidoid-http-fast/src/main/java/org/rapidoid/http/handler/NonBlockingHttpHandler.java b/rapidoid-http-fast/src/main/java/org/rapidoid/http/handler/NonBlockingHttpHandler.java
@@ -22,7 +22,6 @@
 
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
-import org.rapidoid.http.FastHttp;
 import org.rapidoid.http.HttpStatus;
 import org.rapidoid.http.MediaType;
 import org.rapidoid.http.Req;
@@ -37,14 +36,12 @@
 @Since("5.2.0")
 public class NonBlockingHttpHandler extends AbstractHttpHandler {
 
-	private final FastHttp http;
-	private final Callable<Object> nonBlockingLogic;
+	private final Callable<?> nonBlockingLogic;
 	private final boolean returnsJson;
 
-	public NonBlockingHttpHandler(FastHttp http, RouteOptions options, Callable<Object> nonBlockingLogic) {
+	public NonBlockingHttpHandler(RouteOptions options, Callable<?> nonBlockingLogic) {
 		super(options);
 
-		this.http = http;
 		this.nonBlockingLogic = nonBlockingLogic;
 		this.returnsJson = options.contentType() == MediaType.JSON;
 	}

diff --git a/rapidoid-http-fast/src/main/java/org/rapidoid/http/impl/HttpRoutesImpl.java b/rapidoid-http-fast/src/main/java/org/rapidoid/http/impl/HttpRoutesImpl.java
@@ -439,7 +439,7 @@ private void addOrRemove(boolean add, String verbs, String path, HttpHandler han
 			String tx = txm != TransactionMode.NONE ? AnsiColor.bold(txm.name()) : txm.name();
 
 			Log.info("Registering handler", "!setup", this.customization.name(), "!verbs", verbs, "!path", path,
-				"!roles", opts.roles(), "tx", tx, "handler", handler);
+				"!roles", opts.roles(), "tx", tx, "mvc", opts.mvc());
 		} else {
 			Log.info("Deregistering handler", "setup", this.customization.name(), "!verbs", verbs, "!path", path);
 		}

diff --git a/...id-http-server/src/main/java/org/rapidoid/http/handler/optimized/CallableHttpHandler.java b/...id-http-server/src/main/java/org/rapidoid/http/handler/optimized/CallableHttpHandler.java
@@ -35,9 +35,9 @@
 @Since("4.3.0")
 public class CallableHttpHandler extends AbstractAsyncHttpHandler {
 
-	private final Callable<Object> handler;
+	private final Callable<?> handler;
 
-	public CallableHttpHandler(FastHttp http, HttpRoutes routes, RouteOptions options, Callable<Object> handler) {
+	public CallableHttpHandler(FastHttp http, HttpRoutes routes, RouteOptions options, Callable<?> handler) {
 		super(http, routes, options);
 		this.handler = handler;
 	}

diff --git a/rapidoid-net/src/main/java/org/rapidoid/net/abstracts/ProtocolContext.java b/rapidoid-net/src/main/java/org/rapidoid/net/abstracts/ProtocolContext.java
@@ -60,6 +60,8 @@ public interface ProtocolContext<T> {
 
 	void setRequest(IRequest request);
 
+	boolean onSameThread();
+
 	/* PROTOCOL */
 
 	boolean isInitial();