socket update

Robo4J · May 11, 2018 · e946f46 · e946f46
1 parent 545dca7
commit e946f46
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 165 deletions.
diff --git a/robo4j-socket-http/src/main/java/com/robo4j/socket/http/HttpMessage.java b/robo4j-socket-http/src/main/java/com/robo4j/socket/http/HttpMessage.java
diff --git a/robo4j-socket-http/src/main/java/com/robo4j/socket/http/HttpMessageWrapper.java b/robo4j-socket-http/src/main/java/com/robo4j/socket/http/HttpMessageWrapper.java
diff --git a/...t-http/src/main/java/com/robo4j/socket/http/channel/OutboundHttpSocketChannelHandler.java b/...t-http/src/main/java/com/robo4j/socket/http/channel/OutboundHttpSocketChannelHandler.java
@@ -49,7 +49,7 @@ public OutboundHttpSocketChannelHandler(ByteChannel byteChannel, HttpDecoratedRe
 	@Override
 	public void start() {
 		// FIXME: 1/24/18 (miro) -> client context
-		final ClientPathDTO pathMethod = new ClientPathDTO(message.getPath(), message.getMethod(),
+		final ClientPathDTO pathMethod = new ClientPathDTO(message.getPathMethod().getPath(), message.getPathMethod().getMethod(),
 				message.getCallbacks());
 
 		//@formatter:off

diff --git a/robo4j-socket-http/src/main/java/com/robo4j/socket/http/message/HttpDecoratedRequest.java b/robo4j-socket-http/src/main/java/com/robo4j/socket/http/message/HttpDecoratedRequest.java
@@ -18,7 +18,7 @@
 package com.robo4j.socket.http.message;
 
 import com.robo4j.socket.http.HttpHeaderFieldNames;
-import com.robo4j.socket.http.HttpMethod;
+import com.robo4j.socket.http.units.PathHttpMethod;
 import com.robo4j.socket.http.util.RoboHttpUtils;
 
 import java.util.Map;
@@ -54,12 +54,8 @@ public HttpDenominator getDenominator() {
 		return denominator;
 	}
 
-	public HttpMethod getMethod() {
-		return denominator.getMethod();
-	}
-
-	public String getPath() {
-		return denominator.getPath();
+	public PathHttpMethod getPathMethod(){
+		return denominator.getPathHttpMethod();
 	}
 
 	public String getHost() {

diff --git a/robo4j-socket-http/src/main/java/com/robo4j/socket/http/message/HttpRequestDenominator.java b/robo4j-socket-http/src/main/java/com/robo4j/socket/http/message/HttpRequestDenominator.java
@@ -19,6 +19,7 @@
 
 import com.robo4j.socket.http.HttpMethod;
 import com.robo4j.socket.http.HttpVersion;
+import com.robo4j.socket.http.units.PathHttpMethod;
 import com.robo4j.util.Utf8Constant;
 
 import static com.robo4j.util.Utf8Constant.UTF8_SOLIDUS;
@@ -30,8 +31,7 @@
 public class HttpRequestDenominator implements HttpDenominator {
 
 	private final StringBuilder sb = new StringBuilder();
-	private final HttpMethod method;
-	private final String path;
+	private final PathHttpMethod pathHttpMethod;
 	private final HttpVersion version;
 
 	/**
@@ -43,8 +43,7 @@ public class HttpRequestDenominator implements HttpDenominator {
 	 *            http version
 	 */
 	public HttpRequestDenominator(HttpMethod method, HttpVersion version) {
-		this.method = method;
-		this.path = UTF8_SOLIDUS;
+		this.pathHttpMethod = new PathHttpMethod(UTF8_SOLIDUS, method);
 		this.version = version;
 	}
 
@@ -58,17 +57,12 @@ public HttpRequestDenominator(HttpMethod method, HttpVersion version) {
 	 *            http version
 	 */
 	public HttpRequestDenominator(HttpMethod method, String path, HttpVersion version) {
-		this.method = method;
-		this.path = path;
+		this.pathHttpMethod = new PathHttpMethod(path, method);
 		this.version = version;
 	}
 
-	public HttpMethod getMethod() {
-		return method;
-	}
-
-	public String getPath() {
-		return path;
+	public PathHttpMethod getPathHttpMethod() {
+		return pathHttpMethod;
 	}
 
 	@Override
@@ -83,15 +77,13 @@ public String getVersion() {
 	 */
 	@Override
 	public String generate() {
-		assert method != null;
-		assert path != null;
 		assert version != null;
-		return sb.append(method.getName()).append(Utf8Constant.UTF8_SPACE).append(path).append(Utf8Constant.UTF8_SPACE)
+		return sb.append(pathHttpMethod.getMethod().getName()).append(Utf8Constant.UTF8_SPACE).append(pathHttpMethod.getPath()).append(Utf8Constant.UTF8_SPACE)
 				.append(getVersion()).toString();
 	}
 
 	@Override
 	public String toString() {
-		return "HttpRequestDenominator{" + "method=" + method + ", path='" + path + '\'' + ", version=" + version + '}';
+		return "HttpRequestDenominator{" + "pathHttpMethod=" + pathHttpMethod + '\'' + ", version=" + version + '}';
 	}
 }
diff --git a/robo4j-socket-http/src/main/java/com/robo4j/socket/http/request/RoboRequestCallable.java b/robo4j-socket-http/src/main/java/com/robo4j/socket/http/request/RoboRequestCallable.java
@@ -21,7 +21,6 @@
 import com.robo4j.logging.SimpleLoggingUtil;
 import com.robo4j.socket.http.enums.StatusCode;
 import com.robo4j.socket.http.message.HttpDecoratedRequest;
-import com.robo4j.socket.http.units.PathHttpMethod;
 import com.robo4j.socket.http.units.ServerContext;
 import com.robo4j.socket.http.units.ServerPathConfig;
 
@@ -55,7 +54,7 @@ public RoboRequestCallable(RoboContext context, ServerContext serverContext, Htt
 	public HttpResponseProcess call() throws Exception {
 
 		final HttpResponseProcessBuilder resultBuilder = HttpResponseProcessBuilder.Builder();
-		final ServerPathConfig pathConfig = serverContext.getPathConfig(new PathHttpMethod(decoratedRequest.getPath(), decoratedRequest.getMethod()));
+		final ServerPathConfig pathConfig = serverContext.getPathConfig(decoratedRequest.getPathMethod());
 
 		if (isValidPath(pathConfig)) {
 			resultBuilder.setMethod(pathConfig.getMethod());
@@ -89,7 +88,7 @@ public HttpResponseProcess call() throws Exception {
 				break;
 			default:
 				resultBuilder.setCode(StatusCode.BAD_REQUEST);
-				SimpleLoggingUtil.debug(getClass(), "not implemented method: " + decoratedRequest.getMethod());
+				SimpleLoggingUtil.debug(getClass(), "not implemented method: " + decoratedRequest.getPathMethod());
 			}
 		} else {
 			resultBuilder.setCode(StatusCode.BAD_REQUEST);
@@ -98,8 +97,8 @@ public HttpResponseProcess call() throws Exception {
 	}
 
 	private boolean isValidPath(ServerPathConfig pathConfig) {
-		return pathConfig != null && decoratedRequest.getMethod() != null
-				&& decoratedRequest.getMethod().equals(pathConfig.getMethod());
+		return pathConfig != null && decoratedRequest.getPathMethod() != null
+				&& decoratedRequest.getPathMethod().getMethod().equals(pathConfig.getMethod());
 	}
 
 }
diff --git a/robo4j-socket-http/src/main/java/com/robo4j/socket/http/units/PathHttpMethod.java b/robo4j-socket-http/src/main/java/com/robo4j/socket/http/units/PathHttpMethod.java
@@ -43,6 +43,14 @@ public HttpMethod getMethod() {
 		return method;
 	}
 
+	@Override
+	public String toString() {
+		return "PathHttpMethod{" +
+				"path='" + path + '\'' +
+				", method=" + method +
+				'}';
+	}
+
 	@Override
 	public boolean equals(Object o) {
 		if (this == o)
@@ -55,7 +63,6 @@ public boolean equals(Object o) {
 
 	@Override
 	public int hashCode() {
-
 		return Objects.hash(path, method);
 	}
 }
diff --git a/robo4j-socket-http/src/test/java/com/robo4j/socket/http/request/ByteBufferTests.java b/robo4j-socket-http/src/test/java/com/robo4j/socket/http/request/ByteBufferTests.java
@@ -94,7 +94,7 @@ public void byteBufferFromRequestTest() {
 
         Assert.assertNotNull(postMessage);
         Assert.assertTrue(postMessage.length() == decoratedRequest.getLength());
-        Assert.assertTrue(clientPath.equals(decoratedRequest.getPath()));
+        Assert.assertTrue(clientPath.equals(decoratedRequest.getPathMethod().getPath()));
         Assert.assertTrue(bodyMessage.equals(decoratedRequest.getMessage()));
     }