Renamed methods in the HTTP components.

rapidoid · Jan 18, 2016 · be1fbbe · be1fbbe
1 parent 42825de
commit be1fbbe
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 25 deletions.
diff --git a/rapidoid-http-fast/src/main/java/org/rapidoid/http/fast/FastHttp.java b/rapidoid-http-fast/src/main/java/org/rapidoid/http/fast/FastHttp.java
@@ -20,12 +20,6 @@
  * #L%
  */
 
-import java.io.Serializable;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
 import org.rapidoid.buffer.Buf;
@@ -52,6 +46,12 @@
 import org.rapidoid.wire.Wire;
 import org.rapidoid.wrap.BoolWrap;
 
+import java.io.Serializable;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 @Authors("Nikolche Mihajlovski")
 @Since("4.3.0")
 public class FastHttp implements Protocol, HttpMetadata {
@@ -456,7 +456,7 @@ public FastHttpListener getListener() {
 		return listener;
 	}
 
-	public synchronized void clearHandlers() {
+	public synchronized void resetConfig() {
 		path1 = path2 = path3 = null;
 		handler1 = handler2 = handler3 = null;
 		getHandlers.clear();

diff --git a/rapidoid-http-fast/src/main/java/org/rapidoid/http/fast/On.java b/rapidoid-http-fast/src/main/java/org/rapidoid/http/fast/On.java
@@ -99,8 +99,8 @@ public static synchronized ServerSetup req(FastHttpHandler handler) {
 		return setup().req(handler);
 	}
 
-	public static synchronized ServerSetup controllers(Object... controllers) {
-		return setup().controllers(controllers);
+	public static synchronized ServerSetup req(Object... controllers) {
+		return setup().req(controllers);
 	}
 
 	public static synchronized ServerSetup port(int port) {

diff --git a/rapidoid-http-fast/src/main/java/org/rapidoid/http/fast/ServerSetup.java b/rapidoid-http-fast/src/main/java/org/rapidoid/http/fast/ServerSetup.java
@@ -1,12 +1,11 @@
 package org.rapidoid.http.fast;
 
-import java.util.Map;
-
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
 import org.rapidoid.commons.MediaType;
 import org.rapidoid.config.Conf;
 import org.rapidoid.http.fast.handler.DelegatingFastParamsAwareHttpHandler;
+import org.rapidoid.http.fast.handler.FastHttpErrorHandler;
 import org.rapidoid.http.fast.handler.FastHttpHandler;
 import org.rapidoid.http.fast.handler.PojoHandler;
 import org.rapidoid.http.fast.listener.FastHttpListener;
@@ -17,6 +16,9 @@
 import org.rapidoid.pojo.PojoDispatcher;
 import org.rapidoid.u.U;
 
+import java.util.List;
+import java.util.Map;
+
 /*
  * #%L
  * rapidoid-http-fast
@@ -126,8 +128,25 @@ public ServerSetup req(FastHttpHandler handler) {
 		return this;
 	}
 
-	public ServerSetup controllers(Object... controllers) {
-		PojoDispatcher dispatcher = POJO.dispatcher(controllers);
+	public ServerSetup req(Object... controllers) {
+		List<Object> pojos = U.list();
+
+		for (Object controller : controllers) {
+
+			if (controller instanceof ReqHandler) {
+				ReqHandler handler = (ReqHandler) controller;
+				req(handler);
+
+			} else if (controller instanceof FastHttpHandler) {
+				FastHttpHandler handler = (FastHttpHandler) controller;
+				req(handler);
+
+			} else {
+				pojos.add(controller);
+			}
+		}
+
+		PojoDispatcher dispatcher = POJO.dispatcher(pojos.toArray());
 
 		for (FastHttp http : httpImpls()) {
 			http.addGenericHandler(new PojoHandler(http, dispatcher));
@@ -176,7 +195,7 @@ public ServerSetup halt() {
 	}
 
 	private void reset() {
-		fastHttp.clearHandlers();
+		fastHttp.resetConfig();
 		listening = false;
 		fastHttp = null;
 		wrappers = null;

diff --git a/rapidoid-integration-tests/src/test/java/org/rapidoid/http/HttpRootPojoControllerTest.java b/rapidoid-integration-tests/src/test/java/org/rapidoid/http/HttpRootPojoControllerTest.java
@@ -36,7 +36,7 @@ public class HttpRootPojoControllerTest extends HttpTestCommons {
 
 	@Test
 	public void testRootPojoHandler() {
-		On.controllers(new Object() {
+		On.req(new Object() {
 
 			@GET(uri = "/a")
 			public Object theFoo() {

diff --git a/rapidoid-integration-tests/src/test/java/org/rapidoid/http/HttpServerRestartTest.java b/rapidoid-integration-tests/src/test/java/org/rapidoid/http/HttpServerRestartTest.java
@@ -34,7 +34,7 @@ public void shouldHandleRestarts() {
 		On.get("/").html("a");
 		eq(get("/"), "a");
 
-		On.getDefaultSetup().http().clearHandlers();
+		On.getDefaultSetup().http().resetConfig();
 
 		On.get("/").html("b");
 		eq(get("/"), "b");

diff --git a/rapidoid-integration-tests/src/test/java/org/rapidoid/http/HttpTestCommons.java b/rapidoid-integration-tests/src/test/java/org/rapidoid/http/HttpTestCommons.java
@@ -20,12 +20,6 @@
  * #L%
  */
 
-import java.io.File;
-import java.io.IOException;
-import java.net.URISyntaxException;
-import java.util.List;
-import java.util.Map;
-
 import org.apache.commons.io.FileUtils;
 import org.apache.http.client.ClientProtocolException;
 import org.junit.After;
@@ -44,14 +38,20 @@
 import org.rapidoid.u.U;
 import org.rapidoid.util.D;
 
+import java.io.File;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.util.List;
+import java.util.Map;
+
 @Authors("Nikolche Mihajlovski")
 @Since("2.0.0")
 public abstract class HttpTestCommons extends TestCommons {
 
 	private static final boolean ADJUST_RESULTS = false;
 
-	private static final List<String> HTTP_VERBS = U.list("GET", "DELETE", "OPTIONS", "TRACE", "POST", "PUT", "PATCH"); // FIXME
-																														// HEAD
+	// FIXME HEAD
+	private static final List<String> HTTP_VERBS = U.list("GET", "DELETE", "OPTIONS", "TRACE", "POST", "PUT", "PATCH");
 
 	@Before
 	public void openContext() {
@@ -63,7 +63,7 @@ public void openContext() {
 
 		HTTP.STATEFUL_CLIENT.reset();
 
-		On.getDefaultSetup().http().clearHandlers();
+		On.getDefaultSetup().http().resetConfig();
 		// On.getDefaultSetup().listen();
 
 		U.sleep(300);