Fix incorrect Content-Type inference for POST/PUT/PATCH requests without body

Signed-off-by: banseok1216 <bansuk1216@naver.com>

Author: banseok1216

spring-restdocs-core/src/main/java/org/springframework/restdocs/http/HttpRequestSnippet.java

@@ -83,13 +83,6 @@ private String getPath(OperationRequest request) {
 		return path;
 	}
 
-	private boolean includeParametersInUri(OperationRequest request) {
-		HttpMethod method = request.getMethod();
-		return (method != HttpMethod.PUT && method != HttpMethod.POST && method != HttpMethod.PATCH)
-				|| (request.getContent().length > 0 && !MediaType.APPLICATION_FORM_URLENCODED
-					.isCompatibleWith(request.getHeaders().getContentType()));
-	}
-
 	private List<Map<String, String>> getHeaders(OperationRequest request) {
 		List<Map<String, String>> headers = new ArrayList<>();
 
@@ -113,9 +106,6 @@ private List<Map<String, String>> getHeaders(OperationRequest request) {
 			headers.add(header(HttpHeaders.COOKIE, String.join("; ", cookies)));
 		}
 
-		if (requiresFormEncodingContentTypeHeader(request)) {
-			headers.add(header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_FORM_URLENCODED_VALUE));
-		}
 		return headers;
 	}
 
@@ -176,11 +166,6 @@ private void writeMultipartEnd(PrintWriter writer) {
 		writer.printf("--%s--", MULTIPART_BOUNDARY);
 	}
 
-	private boolean requiresFormEncodingContentTypeHeader(OperationRequest request) {
-		return request.getHeaders().get(HttpHeaders.CONTENT_TYPE) == null && isPutPostOrPatch(request)
-				&& !includeParametersInUri(request);
-	}
-
 	private Map<String, String> header(String name, String value) {
 		Map<String, String> header = new HashMap<>();
 		header.put("name", name);

spring-restdocs-core/src/test/java/org/springframework/restdocs/http/HttpRequestSnippetTests.java

@@ -244,6 +244,24 @@ void deleteWithQueryString(OperationBuilder operationBuilder, AssertableSnippets
 			.isHttpRequest((request) -> request.delete("/foo?a=alpha&b=bravo").header("Host", "localhost"));
 	}
 
+	@RenderedSnippetTest
+	void postFormUrlEncodedRequestIsDocumentedWhenContentTypeIsExplicit(
+			OperationBuilder operationBuilder, AssertableSnippets snippets) throws IOException {
+		String body = "a=alpha&b=bravo";
+		new HttpRequestSnippet().document(operationBuilder.request("http://localhost/foo")
+				.method("POST")
+				.header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_FORM_URLENCODED_VALUE)
+				.content(body)
+				.build());
+		assertThat(snippets.httpRequest()).isHttpRequest((request) -> request
+				.post("/foo")
+				.header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_FORM_URLENCODED_VALUE)
+				.header(HttpHeaders.HOST, "localhost")
+				.header(HttpHeaders.CONTENT_LENGTH, body.getBytes().length)
+				.content(body)
+		);
+	}
+
 	private String createPart(String content) {
 		return this.createPart(content, true);
 	}