Enabled async request handling by default.

rapidoid-app/src/main/java/org/rapidoid/app/AppHandler.java

@@ -38,9 +38,6 @@
 import org.rapidoid.http.Handler;
 import org.rapidoid.http.HttpExchange;
 import org.rapidoid.http.HttpExchangeImpl;
-import org.rapidoid.http.HttpExchangeInternals;
-import org.rapidoid.http.HttpNotFoundException;
-import org.rapidoid.io.CustomizableClassLoader;
 import org.rapidoid.io.Res;
 import org.rapidoid.jackson.JSON;
 import org.rapidoid.plugins.templates.Templates;
@@ -59,49 +56,12 @@ public class AppHandler implements Handler {
 
 	private static final Pattern DIRECTIVE = Pattern.compile("\\s*\\Q<!--#\\E\\s*(\\{.+\\})\\s*\\Q-->\\E\\s*");
 
-	private CustomizableClassLoader classLoader;
-
-	public AppHandler() {
-		this(null);
-	}
-
-	public AppHandler(CustomizableClassLoader classLoader) {
-		this.classLoader = classLoader;
-	}
-
 	@Override
 	public Object handle(final HttpExchange x) throws Exception {
-
-		HttpExchangeInternals xi = (HttpExchangeInternals) x;
-		xi.setClassLoader(classLoader);
-
-		Object result;
-
-		try {
-			result = processReq(x);
-		} catch (Exception e) {
-			if (UTILS.rootCause(e) instanceof HttpNotFoundException) {
-				throw U.rte(e);
-			} else {
-				// Log.error("Exception occured while processing request!", UTILS.rootCause(e));
-				throw U.rte(e);
-			}
-		}
-
-		return result;
-	}
-
-	public Object processReq(HttpExchange x) {
-		Object result = dispatch((HttpExchangeImpl) x);
-
-		if (result != null) {
-			return result;
-		} else {
-			throw x.notFound();
-		}
+		return dispatch((HttpExchangeImpl) x);
 	}
 
-	public Object dispatch(HttpExchangeImpl x) {
+	private Object dispatch(HttpExchangeImpl x) {
 
 		// static files
 
@@ -140,7 +100,7 @@ public Object dispatch(HttpExchangeImpl x) {
 
 		Map<String, Object> config = null;
 
-		// dispatch REST services or views (as POJO methods)
+		// dispatch REST services or PAGES (as POJO methods)
 
 		if (result == null) {
 			DispatchResult dres = doDispatch(dispatcher, new WebReq(x));
@@ -189,6 +149,12 @@ private void bindInputs(HttpExchangeImpl x) {
 	public static Object view(HttpExchange x, Object result, boolean hasEvent, Map<String, Object> config) {
 		// serve dynamic pages from file templates
 
+		// FIXME enable
+		// if (Cls.bool(config.get("raw"))) {
+		// x.html();
+		// return result;
+		// }
+
 		if (serveDynamicPage(x, result, hasEvent, config)) {
 			return x;
 		}
@@ -236,6 +202,7 @@ public static boolean serveDynamicPage(HttpExchange x, Object result, boolean ha
 		model.put("embedded", hasEvent || x.param("_embedded", null) != null);
 
 		// the @Page configuration overrides the previous
+
 		if (config != null) {
 			model.putAll(config);
 		}

rapidoid-app/src/main/java/org/rapidoid/app/AppReloadHandler.java

@@ -27,6 +27,7 @@
 import org.rapidoid.annotation.Since;
 import org.rapidoid.http.Handler;
 import org.rapidoid.http.HttpExchange;
+import org.rapidoid.http.HttpExchangeImpl;
 import org.rapidoid.io.CustomizableClassLoader;
 import org.rapidoid.io.IO;
 import org.rapidoid.lambda.Mapper;
@@ -62,7 +63,9 @@ public Object handle(HttpExchange x) throws Exception {
 		CustomizableClassLoader classLoader = new CustomizableClassLoader(this,
 				(Predicate<String>) Predicate.ALWAYS_TRUE, true);
 
-		AppHandler handler = new AppHandler(classLoader);
+		((HttpExchangeImpl) x).setClassLoader(classLoader);
+
+		AppHandler handler = new AppHandler();
 		return handler.handle(x);
 	}
 

rapidoid-app/src/main/java/org/rapidoid/app/Apps.java

@@ -86,7 +86,7 @@ public static HTTPServer serve(WebApp app, String[] args, Object... config) {
 		OAuth.register(app);
 		HttpBuiltins.register(app);
 
-		app.getRouter().serve(new AppHandler());
+		app.getRouter().serve(new AsyncAppHandler());
 
 		return server.start();
 	}

rapidoid-app/src/main/java/org/rapidoid/app/AsyncAppHandler.java

@@ -0,0 +1,58 @@
+package org.rapidoid.app;
+
+/*
+ * #%L
+ * rapidoid-app
+ * %%
+ * Copyright (C) 2014 - 2015 Nikolche Mihajlovski and contributors
+ * %%
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * #L%
+ */
+
+import org.rapidoid.annotation.Authors;
+import org.rapidoid.annotation.Since;
+import org.rapidoid.http.Handler;
+import org.rapidoid.http.HttpExchange;
+import org.rapidoid.http.HttpExchangeInternals;
+import org.rapidoid.io.CustomizableClassLoader;
+import org.rapidoid.job.Jobs;
+
+@Authors("Nikolche Mihajlovski")
+@Since("2.0.0")
+public class AsyncAppHandler implements Handler {
+
+	private final CustomizableClassLoader classLoader;
+
+	private final Handler handler;
+
+	public AsyncAppHandler() {
+		this(null);
+	}
+
+	public AsyncAppHandler(CustomizableClassLoader classLoader) {
+		this.classLoader = classLoader;
+		this.handler = new AppHandler();
+	}
+
+	@Override
+	public Object handle(final HttpExchange x) throws Exception {
+		HttpExchangeInternals xi = (HttpExchangeInternals) x;
+		xi.setClassLoader(classLoader);
+
+		Jobs.execute(x.asAsyncJob(handler));
+
+		return x;
+	}
+
+}

rapidoid-buffer/src/main/java/org/rapidoid/buffer/BufGroup.java

@@ -54,7 +54,7 @@ public ByteBuffer call() {
 	}
 
 	public BufGroup(int factor) {
-		this(factor, false);
+		this(factor, true);
 	}
 
 	public Buf newBuf(String name) {

rapidoid-http/src/main/java/org/rapidoid/http/Handler.java → rapidoid-http-api/src/main/java/org/rapidoid/http/Handler.java

@@ -5,7 +5,7 @@
 
 /*
  * #%L
- * rapidoid-http
+ * rapidoid-http-api
  * %%
  * Copyright (C) 2014 - 2015 Nikolche Mihajlovski and contributors
  * %%

rapidoid-http-api/src/main/java/org/rapidoid/http/HttpExchange.java

@@ -35,7 +35,7 @@
 
 @Authors("Nikolche Mihajlovski")
 @Since("2.0.0")
-public interface HttpExchange {
+public interface HttpExchange extends Runnable {
 
 	/* REQUEST METHODS: */
 
@@ -266,4 +266,6 @@ HttpExchange response(@P("httpResponseCode") int httpResponseCode, @P("response"
 
 	Object model();
 
+	Runnable asAsyncJob(Handler handler);
+
 }

rapidoid-http/src/main/java/org/rapidoid/http/HttpExchangeImpl.java

@@ -149,6 +149,7 @@ public class HttpExchangeImpl extends DefaultExchange<HttpExchangeImpl> implemen
 
 	private ClassLoader classLoader;
 	private SessionStore sessionStore;
+	private Handler handler;
 
 	private final Callable<Map<String, Object>> lazyData = new Callable<Map<String, Object>>() {
 		@Override
@@ -232,6 +233,7 @@ public synchronized void reset() {
 
 		classLoader = null;
 		sessionStore = null;
+		handler = null;
 
 		session = null;
 		cookiepack = null;
@@ -756,6 +758,7 @@ public synchronized HttpExchange sendFile(File file) {
 		U.must(file.exists());
 		setContentType(MediaType.getByFileName(file.getAbsolutePath()));
 		write(file);
+		done();
 		return this;
 	}
 
@@ -764,13 +767,15 @@ public synchronized HttpExchange sendFile(Res resource) {
 		U.must(resource.exists());
 		setContentType(MediaType.getByFileName(resource.getShortName()));
 		write(resource.getBytes());
+		done();
 		return this;
 	}
 
 	@Override
 	public synchronized HttpExchange sendFile(MediaType mediaType, byte[] bytes) {
 		setContentType(mediaType);
 		write(bytes);
+		done();
 		return this;
 	}
 
@@ -1315,7 +1320,8 @@ public HttpExchange renderPage(Object model) {
 		}
 
 		pageTemplate().render(this.outputStream(), model, model());
-		return this;
+
+		return done();
 	}
 
 	@Override
@@ -1384,7 +1390,7 @@ public synchronized HttpExchangeImpl setHome(String home) {
 		return this;
 	}
 
-	public String renderState() {
+	public synchronized String renderState() {
 		try {
 			return JSON.jacksonStringify(serializeLocals());
 		} catch (Exception e) {
@@ -1393,4 +1399,31 @@ public String renderState() {
 		}
 	}
 
+	@Override
+	public synchronized Runnable asAsyncJob(Handler handler) {
+		this.handler = handler;
+		return this.async();
+	}
+
+	@Override
+	public synchronized void run() {
+		runInAsyncContext();
+	}
+
+	private void runInAsyncContext() {
+		Object result;
+
+		try {
+			U.notNull(handler, "async handler");
+			result = handler.handle(this);
+		} catch (Throwable e) {
+			HttpProtocol.handleError(this, e);
+			return;
+		}
+
+		if (result != null && !(result instanceof HttpExchange)) {
+			HttpProtocol.processResponse(this, result);
+		}
+	}
+
 }

rapidoid-http/src/main/java/org/rapidoid/http/HttpProtocol.java

@@ -219,23 +219,27 @@ public static void handleError(HttpExchangeImpl x, Throwable e) {
 			x.error(e);
 			x.completeResponse();
 		}
+
+		x.done();
 	}
 
 	public static void processResponse(HttpExchange xch, Object res) {
 
 		HttpExchangeImpl x = (HttpExchangeImpl) xch;
 
-		if (x.isLowLevelProcessing() || x.isAsync() || res == xch) {
+		if (x.isLowLevelProcessing() || res instanceof HttpExchange) {
 			return;
 		}
 
 		if (res != null) {
 			x.result(res);
 		} else {
-			if (!x.hasContentType()) {
-				x.html();
+			if (!x.isAsync()) {
+				if (!x.hasContentType()) {
+					x.html();
+				}
+				throw x.notFound();
 			}
-			throw x.notFound();
 		}
 	}
 

rapidoid-http/src/test/java/org/rapidoid/webapp/JobsTest.java

@@ -1,6 +1,7 @@
 package org.rapidoid.webapp;
 
 import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import org.junit.Test;
@@ -55,13 +56,13 @@ public void run() {
 				Ctxs.ctx().setApp(app);
 				ensureProperContext(user, app);
 
-				ScheduledFuture<?> future = Jobs.execute(new Runnable() {
+				ScheduledFuture<?> future = Jobs.schedule(new Runnable() {
 					@Override
 					public void run() {
 						ensureProperContext(user, app);
 						counter.incrementAndGet();
 					}
-				});
+				}, 100, TimeUnit.MILLISECONDS);
 
 				try {
 					future.get();

rapidoid-main/src/main/java/org/rapidoid/main/AppTool.java

@@ -25,7 +25,7 @@
 
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
-import org.rapidoid.app.AppHandler;
+import org.rapidoid.app.AsyncAppHandler;
 import org.rapidoid.config.Conf;
 import org.rapidoid.io.Res;
 import org.rapidoid.jackson.YAML;
@@ -44,7 +44,7 @@ public class AppTool {
 
 	public static WebApp createRootApp() {
 		RootWebApp app = WebAppGroup.root();
-		app.getRouter().generic(new AppHandler());
+		app.getRouter().generic(new AsyncAppHandler());
 
 		String menufile = "menu.yaml";
 		String firstMenuFile = Conf.configPath() + "/" + menufile;