Better support for port and address config in the low-level HTTP layer.

rapidoid · Nov 1, 2015 · 1cdbd98 · 1cdbd98
1 parent 07294df
commit 1cdbd98
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 23 deletions.
diff --git a/rapidoid-demo/src/main/java/org/rapidoid/demo/http/Main.java b/rapidoid-demo/src/main/java/org/rapidoid/demo/http/Main.java
@@ -34,6 +34,8 @@ public class Main {
 	public static void main(String[] args) {
 		Conf.init(args);
 
+		On.port(8080);
+
 		On.get("/plaintext").plain("Hello world!");
 
 		On.get("/json").json(new Callable<Object>() {
@@ -42,8 +44,6 @@ public Object call() throws Exception {
 				return new Msg("Hello, World!");
 			}
 		});
-
-		On.listen(8080);
 	}
 
 }
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
@@ -22,8 +22,6 @@
 
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
-import org.rapidoid.config.Conf;
-import org.rapidoid.net.TCPServer;
 
 @Authors("Nikolche Mihajlovski")
 @Since("4.3.0")
@@ -47,7 +45,7 @@ public static ServerSetup custom() {
 	}
 
 	private static void initialize() {
-		listen(Conf.port());
+		DEFAULT_SERVER_SETUP.listen();
 	}
 
 	public static synchronized OnAction get(String path) {
@@ -74,12 +72,12 @@ public static synchronized OnPage page(String path) {
 		return setup().page(path);
 	}
 
-	public static synchronized TCPServer listen(int port) {
-		return DEFAULT_SERVER_SETUP.listen(port);
+	public static synchronized ServerSetup port(int port) {
+		return DEFAULT_SERVER_SETUP.port(port);
 	}
 
-	public static synchronized TCPServer listen(String address, int port) {
-		return DEFAULT_SERVER_SETUP.listen(address, port);
+	public static synchronized ServerSetup address(String address) {
+		return DEFAULT_SERVER_SETUP.address(address);
 	}
 
 }
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
@@ -2,6 +2,7 @@
 
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
+import org.rapidoid.config.Conf;
 import org.rapidoid.net.Serve;
 import org.rapidoid.net.TCPServer;
 
@@ -31,12 +32,12 @@ public class ServerSetup {
 
 	private final FastHttp fastHttp = new FastHttp();
 
-	public TCPServer listen(int port) {
-		return listen("*", port);
-	}
+	private int port = Conf.port();
+
+	private String address = "0.0.0.0";
 
-	public TCPServer listen(String address, int port) {
-		TCPServer server = Serve.server().protocol(fastHttp).port(port).build();
+	public TCPServer listen() {
+		TCPServer server = Serve.server().protocol(fastHttp).address(address).port(port).build();
 		server.start();
 		return server;
 	}
@@ -69,4 +70,14 @@ private FastHttp[] httpImpls() {
 		return new FastHttp[] { fastHttp };
 	}
 
+	public ServerSetup port(int port) {
+		this.port = port;
+		return this;
+	}
+
+	public ServerSetup address(String address) {
+		this.address = address;
+		return this;
+	}
+
 }
diff --git a/rapidoid-net/src/main/java/org/rapidoid/net/impl/TCPServerBuilder.java b/rapidoid-net/src/main/java/org/rapidoid/net/impl/TCPServerBuilder.java
@@ -32,6 +32,8 @@ public interface TCPServerBuilder extends Builder<TCPServer> {
 
 	TCPServerBuilder bufSize(int bufSize);
 
+	TCPServerBuilder address(String address);
+
 	TCPServerBuilder port(int port);
 
 	TCPServerBuilder workers(int workers);

diff --git a/rapidoid-rest/src/test/java/org/rapidoid/http/DynamicClientTest.java b/rapidoid-rest/src/test/java/org/rapidoid/http/DynamicClientTest.java
@@ -40,7 +40,7 @@ public class DynamicClientTest extends TestCommons {
 
 	@Test
 	public void testDynamic() {
-		On.get("/test-abc").html("abc-ok");
+		On.address("127.0.0.1").port(8989).get("/test-abc").html("abc-ok");
 
 		On.get("/nums").json("[1, 2, 3]");
 
@@ -58,8 +58,6 @@ public Object handle(Map<String, Object> params) throws Exception {
 			}
 		});
 
-		On.listen(8080);
-
 		eq(client.abc(), "abc-ok");
 		eq(client.numbers(), U.list(1, 2, 3));
 		eq(client.sizeOf("abcde"), 5);

diff --git a/rapidoid-rest/src/test/resources/rapidoid/endpoints/MyClient.yaml b/rapidoid-rest/src/test/resources/rapidoid/endpoints/MyClient.yaml
@@ -1,19 +1,19 @@
 abc:
-  GET: http://localhost:8080/test-abc
+  GET: http://localhost:8989/test-abc
 
 numbers:
-  GET: http://localhost:8080/nums
+  GET: http://localhost:8989/nums
 
 sizeOf:
-  GET: http://localhost:8080/size?s=%s
+  GET: http://localhost:8989/size?s=%s
 
 asyncSizeOf:
-  GET: http://localhost:8080/size?s=%s
+  GET: http://localhost:8989/size?s=%s
 
 theBean:
-  POST: http://localhost:8080/echo?aa=%s&bb=%s&cc=%s
+  POST: http://localhost:8989/echo?aa=%s&bb=%s&cc=%s
 
 asyncBean:
-  POST: http://localhost:8080/echo?aa=%s&bb=%s&cc=%s
+  POST: http://localhost:8989/echo?aa=%s&bb=%s&cc=%s
   data:
     aa: not-implemented