Merge branch '3.2.x' into 3.3.x

Closes gh-42893
This commit is contained in:
Phillip Webb 2024-10-25 18:18:27 -07:00
commit a7f11eb712
1 changed files with 6 additions and 6 deletions

View File

@ -1,5 +1,5 @@
/*
* Copyright 2012-2023 the original author or authors.
* Copyright 2012-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.
@ -48,7 +48,7 @@ public class HttpWebServiceMessageSenderBuilder {
/**
* Set the connection timeout.
* @param connectTimeout the connection timeout
* @return a new builder instance
* @return the current builder instance
*/
public HttpWebServiceMessageSenderBuilder setConnectTimeout(Duration connectTimeout) {
this.connectTimeout = connectTimeout;
@ -58,7 +58,7 @@ public class HttpWebServiceMessageSenderBuilder {
/**
* Set the read timeout.
* @param readTimeout the read timeout
* @return a new builder instance
* @return the current builder instance
*/
public HttpWebServiceMessageSenderBuilder setReadTimeout(Duration readTimeout) {
this.readTimeout = readTimeout;
@ -68,7 +68,7 @@ public class HttpWebServiceMessageSenderBuilder {
/**
* Set an {@link SslBundle} that will be used to configure a secure connection.
* @param sslBundle the SSL bundle
* @return a new builder instance
* @return the current builder instance
*/
public HttpWebServiceMessageSenderBuilder sslBundle(SslBundle sslBundle) {
this.sslBundle = sslBundle;
@ -79,7 +79,7 @@ public class HttpWebServiceMessageSenderBuilder {
* Set the {@code Supplier} of {@link ClientHttpRequestFactory} that should be called
* to create the HTTP-based {@link WebServiceMessageSender}.
* @param requestFactorySupplier the supplier for the request factory
* @return a new builder instance
* @return the current builder instance
*/
public HttpWebServiceMessageSenderBuilder requestFactory(
Supplier<ClientHttpRequestFactory> requestFactorySupplier) {
@ -93,7 +93,7 @@ public class HttpWebServiceMessageSenderBuilder {
* {@link ClientHttpRequestFactory} that should be called to create the HTTP-based
* {@link WebServiceMessageSender}.
* @param requestFactoryFunction the function for the request factory
* @return a new builder instance
* @return the current builder instance
* @since 3.0.0
*/
public HttpWebServiceMessageSenderBuilder requestFactory(