Merge branch '2.7.x' into 3.0.x

Closes gh-36629
This commit is contained in:
Andy Wilkinson
2023-07-28 11:31:49 +01:00

View File

@@ -30,8 +30,6 @@ import java.util.Set;
import java.util.function.Function;
import java.util.function.Supplier;
import reactor.netty.http.client.HttpClientRequest;
import org.springframework.beans.BeanUtils;
import org.springframework.http.client.ClientHttpRequest;
import org.springframework.http.client.ClientHttpRequestFactory;
@@ -397,7 +395,7 @@ public class RestTemplateBuilder {
/**
* Add a default header that will be set if not already present on the outgoing
* {@link HttpClientRequest}.
* {@link ClientHttpRequest}.
* @param name the name of the header
* @param values the header values
* @return a new builder instance