Merge branch '6.1.x'

Author: bclozel

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

@@ -55,21 +55,23 @@ public URI getURI() {
 	protected ClientHttpResponse executeInternal(HttpHeaders headers, byte[] bufferedOutput) throws IOException {
 		this.request.getHeaders().putAll(headers);
 
-		if (this.request instanceof StreamingHttpOutputMessage streamingHttpOutputMessage) {
-			streamingHttpOutputMessage.setBody(new StreamingHttpOutputMessage.Body() {
-				@Override
-				public void writeTo(OutputStream outputStream) throws IOException {
-					StreamUtils.copy(bufferedOutput, outputStream);
-				}
+		if (bufferedOutput.length > 0) {
+			if (this.request instanceof StreamingHttpOutputMessage streamingHttpOutputMessage) {
+				streamingHttpOutputMessage.setBody(new StreamingHttpOutputMessage.Body() {
+					@Override
+					public void writeTo(OutputStream outputStream) throws IOException {
+						StreamUtils.copy(bufferedOutput, outputStream);
+					}
 
-				@Override
-				public boolean repeatable() {
-					return true;
-				}
-			});
-		}
-		else {
-			StreamUtils.copy(bufferedOutput, this.request.getBody());
+					@Override
+					public boolean repeatable() {
+						return true;
+					}
+				});
+			}
+			else {
+				StreamUtils.copy(bufferedOutput, this.request.getBody());
+			}
 		}
 
 		ClientHttpResponse response = this.request.execute();

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

@@ -0,0 +1,31 @@
+/*
+ * Copyright 2002-2024 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.http.client;
+
+/**
+ * Tests for {@link BufferingClientHttpRequestWrapper} for clients
+ * not supporting non-null, empty request bodies for GET requests.
+ */
+class BufferingClientHttpRequestFactoryWithOkHttpTests extends AbstractHttpRequestFactoryTests {
+
+	@Override
+	@SuppressWarnings("removal")
+	protected ClientHttpRequestFactory createRequestFactory() {
+		return new BufferingClientHttpRequestFactory(new OkHttp3ClientHttpRequestFactory());
+	}
+
+}