backport #2770 patch with empty body fix to 6.X (#2779)

* backport #2770 to 6.X

* fixed tests

---------

Co-authored-by: Tobias Polley <mail@tobias-polley.de>

Author: christiangoerdes

core/src/main/java/com/predic8/membrane/core/http/Request.java

@@ -28,7 +28,6 @@
 import static com.predic8.membrane.core.http.Header.*;
 import static com.predic8.membrane.core.http.MimeType.*;
 import static java.nio.charset.StandardCharsets.*;
-
 public class Request extends Message {
 
 	private static final Pattern pattern = Pattern.compile("(.+?) (.+?) HTTP/(.+?)$");
@@ -46,17 +45,6 @@ public class Request extends Message {
 	public static final String METHOD_OPTIONS = "OPTIONS";
 
 	private static final HashSet<String> methodsWithoutBody = Sets.newHashSet(METHOD_GET, METHOD_HEAD, METHOD_CONNECT);
-	private static final HashSet<String> methodsWithOptionalBody = Sets.newHashSet(
-			METHOD_DELETE,
-			/* some WebDAV methods, see http://www.ietf.org/rfc/rfc2518.txt */
-			METHOD_OPTIONS,
-			"PROPFIND",
-			"MKCOL",
-			"COPY",
-			"MOVE",
-			"LOCK",
-			"UNLOCK");
-
 
 	String method;
 	String uri;
@@ -154,15 +142,13 @@ public String getName() {
 
 	@Override
 	public boolean shouldNotContainBody() {
-		if (methodsWithoutBody.contains(method))
+		if (methodsWithoutBody.contains(method)) // GET, HEAD, CONNECT
 			return true;
-		if (methodsWithOptionalBody.contains(method)) {
-			if (header.hasContentLength())
-				return header.getContentLength() == 0;
-            return header.getFirstValue(TRANSFER_ENCODING) == null;
-        }
-    
-		return false;
+		if (isHTTP10())
+			return false;
+		if (header.hasContentLength())
+			return header.getContentLength() == 0;
+		return header.getFirstValue(TRANSFER_ENCODING) == null;
 	}
 
 	/**

core/src/test/java/com/predic8/membrane/core/exchangestore/LimitedMemoryExchangeStoreTest.java

@@ -23,6 +23,7 @@
 import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
+import java.net.URISyntaxException;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
@@ -62,12 +63,9 @@ private void assertStore(int pos, String value) {
 		assertEquals(value, store.getAllExchangesAsList().get(pos).getProperty("id"));
 	}
 
-	private Exchange getExchange(String id) throws IOException {
-		Exchange exc = new Exchange(null);
+	private Exchange getExchange(String id) throws IOException, URISyntaxException {
+		Exchange exc = Request.get("http://test/").buildExchange();
 		exc.setProperty("id", id);
-		Request req = new Request();
-		req.create("GET", "http://test", "HTTP/", new Header(), null);
-		exc.setRequest(req);
 		exc.setResponse(Response.ok().body("<xml />").build());
 		return exc;
 	}

core/src/test/java/com/predic8/membrane/core/http/RequestTest.java

@@ -21,6 +21,7 @@
 import java.net.*;
 
 import static com.predic8.membrane.core.Constants.*;
+import static com.predic8.membrane.core.http.Header.CONTENT_LENGTH;
 import static com.predic8.membrane.core.http.MimeType.TEXT_XML;
 import static com.predic8.membrane.core.http.Request.*;
 import static com.predic8.membrane.core.util.StringTestUtil.*;
@@ -145,9 +146,11 @@ void isNotEmpty() throws IOException, URISyntaxException {
 	}
 
 	@Test
-	void createFromStream() throws IOException {
-		Request req = new Request();
-		req.create("POST", "http://test", "HTTP/", new Header(), getResourceAsStream(this,"/getBank.xml"));
+	void createFromStream() throws IOException, URISyntaxException {
+		Request req = Request.post("http://test/")
+				.header(CONTENT_LENGTH, "1")
+				.body(getResourceAsStream(this,"/getBank.xml"))
+				.build();
 		assertFalse(req.isBodyEmpty());
 	}
 

core/src/test/java/com/predic8/membrane/core/interceptor/MessageAnalyserTest.java

@@ -19,7 +19,10 @@
 import org.junit.jupiter.api.*;
 
 import java.io.*;
+import java.net.URISyntaxException;
 
+import static com.predic8.membrane.core.http.Header.CONTENT_TYPE;
+import static com.predic8.membrane.core.http.MimeType.APPLICATION_XML;
 import static org.junit.jupiter.api.Assertions.*;
 
 public class MessageAnalyserTest {
@@ -66,12 +69,11 @@ private Exchange getResponse(String path) throws IOException {
 		return exc;
 	}
 
-	private Exchange getRequest(String path) throws IOException {
-		Exchange exc = new Exchange(null);
-		Request req = new Request();
-		req.create("POST", "http://test", "HTTP/", new Header(), getClass().getClassLoader().getResourceAsStream(path));
-		exc.setRequest(req);
-		return exc;
+	private Exchange getRequest(String path) throws IOException, URISyntaxException {
+		return Request.post("http://test/")
+				.header(CONTENT_TYPE, APPLICATION_XML)
+				.body(getClass().getClassLoader().getResourceAsStream(path))
+				.buildExchange();
 	}
 
 }

core/src/test/java/com/predic8/membrane/core/interceptor/soap/SoapOperationExtractorTest.java

@@ -14,6 +14,7 @@
 package com.predic8.membrane.core.interceptor.soap;
 
 import java.io.IOException;
+import java.net.URISyntaxException;
 
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
@@ -72,10 +73,11 @@ public void nonEmptyHeader() throws Exception {
 
 	}
 
-	private Exchange getExchange(String path) throws IOException {
+	private Exchange getExchange(String path) throws IOException, URISyntaxException {
 		Exchange exc = new Exchange(null);
-		Request req = new Request();
-		req.create("POST", "http://test", "HTTP/", new Header(), getClass().getClassLoader().getResourceAsStream(path));
+		Request req = Request.post("http://test/")
+				.body(getClass().getClassLoader().getResourceAsStream(path))
+				.build();
 		exc.setRequest(req);
 		return exc;
 	}