Merge branch '2.0.x'

Author: wilkinsona

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

@@ -134,7 +134,7 @@ private String getRequestBody(OperationRequest request) {
 		}
 		else if (isPutOrPost(request)) {
 			if (request.getParts().isEmpty()) {
-				String queryString = request.getParameters().toQueryString();
+				String queryString = request.getParameters().getUniqueParameters(request.getUri()).toQueryString();
 				if (StringUtils.hasText(queryString)) {
 					writer.println();
 					writer.print(queryString);
@@ -206,7 +206,8 @@ private void writeMultipartEnd(PrintWriter writer) {
 
 	private boolean requiresFormEncodingContentTypeHeader(OperationRequest request) {
 		return request.getHeaders().get(HttpHeaders.CONTENT_TYPE) == null && isPutOrPost(request)
-				&& (!request.getParameters().isEmpty() && !includeParametersInUri(request));
+				&& !request.getParameters().getUniqueParameters(request.getUri()).isEmpty()
+				&& !includeParametersInUri(request);
 	}
 
 	private Map<String, String> header(String name, String value) {

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

@@ -224,6 +224,14 @@ public void putRequestWithParameter() throws IOException {
 						.header("Content-Type", "application/x-www-form-urlencoded").content("b%26r=baz&a=alpha"));
 	}
 
+	@Test
+	public void putRequestWithTotallyOverlappingQueryStringAndParameters() throws IOException {
+		new HttpRequestSnippet().document(this.operationBuilder.request("http://localhost/foo?a=alpha&b=bravo")
+				.method("PUT").param("a", "alpha").param("b", "bravo").build());
+		assertThat(this.generatedSnippets.httpRequest())
+				.is(httpRequest(RequestMethod.PUT, "/foo?a=alpha&b=bravo").header(HttpHeaders.HOST, "localhost"));
+	}
+
 	@Test
 	public void multipartPost() throws IOException {
 		new HttpRequestSnippet().document(this.operationBuilder.request("http://localhost/upload").method("POST")