Fix Netty4ClientHttpRequestFactory POST/PUT requests

This commit ensures that POST/PUT requests sent by the Netty client have
a Content-Length header set.

Integration tests have been refactored to use mockwebserver instead of
Jetty and have been parameterized to run on all available supported
clients.

Issue: SPR-14860

Author: bclozel

spring-web/src/main/java/org/springframework/http/client/Netty4ClientHttpRequest.java

@@ -48,6 +48,7 @@
  *
  * @author Arjen Poutsma
  * @author Rossen Stoyanchev
+ * @author Brian Clozel
  * @since 4.1.2
  */
 class Netty4ClientHttpRequest extends AbstractAsyncClientHttpRequest implements ClientHttpRequest {
@@ -130,10 +131,15 @@ private FullHttpRequest createFullHttpRequest(HttpHeaders headers) {
 		io.netty.handler.codec.http.HttpMethod nettyMethod =
 				io.netty.handler.codec.http.HttpMethod.valueOf(this.method.name());
 
+		String authority = this.uri.getRawAuthority();
+		String path = this.uri.toString().substring(this.uri.toString().indexOf(authority) + authority.length());
 		FullHttpRequest nettyRequest = new DefaultFullHttpRequest(
-				HttpVersion.HTTP_1_1, nettyMethod, this.uri.toString(), this.body.buffer());
+				HttpVersion.HTTP_1_1, nettyMethod, path, this.body.buffer());
 
 		nettyRequest.headers().set(HttpHeaders.HOST, this.uri.getHost());
+		if (this.body.buffer().readableBytes() > 0) {
+			nettyRequest.headers().set(HttpHeaders.CONTENT_LENGTH, this.body.buffer().readableBytes());
+		}
 		nettyRequest.headers().set(HttpHeaders.CONNECTION, "close");
 
 		for (Map.Entry<String, List<String>> entry : headers.entrySet()) {

spring-web/src/test/java/org/springframework/http/client/AbstractAsyncHttpRequestFactoryTestCase.java

@@ -39,7 +39,7 @@
 import org.springframework.util.concurrent.ListenableFuture;
 import org.springframework.util.concurrent.ListenableFutureCallback;
 
-public abstract class AbstractAsyncHttpRequestFactoryTestCase extends AbstractJettyServerTestCase {
+public abstract class AbstractAsyncHttpRequestFactoryTestCase extends AbstractMockWebServerTestCase {
 
 	protected AsyncClientHttpRequestFactory factory;
 

spring-web/src/test/java/org/springframework/http/client/AbstractHttpRequestFactoryTestCase.java

@@ -39,7 +39,7 @@
 /**
  * @author Arjen Poutsma
  */
-public abstract class AbstractHttpRequestFactoryTestCase extends AbstractJettyServerTestCase {
+public abstract class AbstractHttpRequestFactoryTestCase extends AbstractMockWebServerTestCase {
 
 	protected ClientHttpRequestFactory factory;
 
@@ -127,6 +127,8 @@ public void multipleWrites() throws Exception {
 				@Override
 				public void writeTo(OutputStream outputStream) throws IOException {
 					StreamUtils.copy(body, outputStream);
+					outputStream.flush();
+					outputStream.close();
 				}
 			});
 		}
@@ -135,12 +137,7 @@ public void writeTo(OutputStream outputStream) throws IOException {
 		}
 
 		ClientHttpResponse response = request.execute();
-		try {
-			FileCopyUtils.copy(body, request.getBody());
-		}
-		finally {
-			response.close();
-		}
+		FileCopyUtils.copy(body, request.getBody());
 	}
 
 	@Test(expected = UnsupportedOperationException.class)

spring-web/src/test/java/org/springframework/http/client/AbstractJettyServerTestCase.java

@@ -0,0 +1,95 @@
+package org.springframework.http.client;
+
+import java.util.Collections;
+
+import okhttp3.mockwebserver.Dispatcher;
+import okhttp3.mockwebserver.MockResponse;
+import okhttp3.mockwebserver.MockWebServer;
+import okhttp3.mockwebserver.RecordedRequest;
+import org.hamcrest.Matchers;
+import org.junit.After;
+import org.junit.Before;
+
+import org.springframework.http.MediaType;
+import org.springframework.util.StringUtils;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+/**
+ * @author Brian Clozel
+ */
+public class AbstractMockWebServerTestCase {
+
+	private MockWebServer server;
+
+	protected int port;
+
+	protected String baseUrl;
+
+	protected static final MediaType textContentType =
+			new MediaType("text", "plain", Collections.singletonMap("charset", "UTF-8"));
+
+	@Before
+	public void setUp() throws Exception {
+		this.server = new MockWebServer();
+		this.server.setDispatcher(new TestDispatcher());
+		this.server.start();
+		this.port = this.server.getPort();
+		this.baseUrl = "http://localhost:" + this.port;
+	}
+
+	@After
+	public void tearDown() throws Exception {
+		this.server.shutdown();
+	}
+
+	protected class TestDispatcher extends Dispatcher {
+		@Override
+		public MockResponse dispatch(RecordedRequest request) throws InterruptedException {
+			try {
+				if (request.getPath().equals("/echo")) {
+					MockResponse response = new MockResponse()
+							.setHeaders(request.getHeaders())
+							.setHeader("Content-Length", request.getBody().size())
+							.setResponseCode(200)
+							.setBody(request.getBody());
+					request.getBody().flush();
+					return response;
+				}
+				else if(request.getPath().equals("/status/ok")) {
+					return new MockResponse();
+				}
+				else if(request.getPath().equals("/status/notfound")) {
+					return new MockResponse().setResponseCode(404);
+				}
+				else if(request.getPath().startsWith("/params")) {
+					assertThat(request.getPath(), Matchers.containsString("param1=value"));
+					assertThat(request.getPath(), Matchers.containsString("param2=value1&param2=value2"));
+					return new MockResponse();
+				}
+				else if(request.getPath().equals("/methods/post")) {
+					assertThat(request.getMethod(), Matchers.is("POST"));
+					String transferEncoding = request.getHeader("Transfer-Encoding");
+					if(StringUtils.hasLength(transferEncoding)) {
+						assertThat(transferEncoding, Matchers.is("chunked"));
+					}
+					else {
+						long contentLength = Long.parseLong(request.getHeader("Content-Length"));
+						assertThat("Invalid content-length",
+								request.getBody().size(), Matchers.is(contentLength));
+					}
+					return new MockResponse().setResponseCode(200);
+				}
+				else if(request.getPath().startsWith("/methods/")) {
+					String expectedMethod = request.getPath().replace("/methods/","").toUpperCase();
+					assertThat(request.getMethod(), Matchers.is(expectedMethod));
+					return new MockResponse();
+				}
+				return new MockResponse().setResponseCode(404);
+			}
+			catch (Throwable exc) {
+				return new MockResponse().setResponseCode(500).setBody(exc.toString());
+			}
+		}
+	}
+}