26845 Commits

Author SHA1 Message Date
Stéphane Nicoll
e5ec38074b Merge branch '3.3.x'
Closes gh-42917
2024-10-29 13:39:31 +09:00
Stéphane Nicoll
5fcc585178 Merge branch '3.2.x' into 3.3.x
Closes gh-42916
2024-10-29 13:39:23 +09:00
Stéphane Nicoll
eba7a5a077 Update copyright year of changed files
See gh-42901
2024-10-29 13:35:35 +09:00
Tran Ngoc Nhan
ff855d9421 Remove redundant null check
See gh-42901
2024-10-29 13:33:55 +09:00
Stéphane Nicoll
cc443366fa Merge branch '3.3.x'
Closes gh-42915
2024-10-29 13:28:42 +09:00
Stéphane Nicoll
4401673d6d Merge branch '3.2.x' into 3.3.x
Closes gh-42914
2024-10-29 13:27:06 +09:00
Stéphane Nicoll
d4010d3be0 Polish "Prevent auth header to be included in Docker API call"
See gh-42910
2024-10-29 13:24:09 +09:00
YiXuan Ding
351018ea65 Prevent auth header to be included in Docker API call
See gh-42910
2024-10-29 13:16:08 +09:00
Phillip Webb
24202a0a78 Update copyright year of changed files 2024-10-25 18:21:53 -07:00
Phillip Webb
387b14183a Merge branch '3.3.x'
Closes gh-42896
2024-10-25 18:21:19 -07:00
Phillip Webb
6d2a75f27d Merge branch '3.2.x' into 3.3.x
Closes gh-42895
2024-10-25 18:21:14 -07:00
Yanming Zhou
4952fc7417 Remove unnecessary call of superclass constructor
See gh-42876
2024-10-25 18:20:44 -07:00
Phillip Webb
28ad767360 Merge branch '3.3.x'
Closes gh-42894
2024-10-25 18:18:38 -07:00
Phillip Webb
a7f11eb712 Merge branch '3.2.x' into 3.3.x
Closes gh-42893
2024-10-25 18:18:27 -07:00
YiXuan Ding
1730bf6f94 Update HttpWebServiceMessageSenderBuilder javadoc
Update the return javadoc from "@return a new builder instance" to
"@return the current builder instance".

See gh-42868
2024-10-25 18:18:05 -07:00
Phillip Webb
39da14ea80 Update web services documentation and samples
Closes gh-42887
2024-10-25 18:06:47 -07:00
Phillip Webb
2208c67f22 Add 'Global HTTP Client Configuration' reference docs section
Update documentation with information on how to configure the HTTP
client globally.

Closes gh-42888
2024-10-25 18:06:47 -07:00
Phillip Webb
e1b5935507 Allow customization of underlying ClientHttpRequestFactory components
Update `ClientHttpRequestFactoryBuilder` implementations for
`HttpComponents`, `Jdk`, `Jetty` and `Reactor` to allow customization
of the underlying components.

Closes gh-39035
2024-10-25 18:06:46 -07:00
Phillip Webb
97b20e9a98 Add additional tests for redirects with different HTTP methods
Closes gh-42879
2024-10-25 14:41:45 -07:00
Moritz Halbritter
85b1c55bb8 Polish 2024-10-25 13:40:21 +02:00
Phillip Webb
36a22fcd59 Unify HTTP client redirect behavior and provide configuration option
Update `ClientHttpRequestFactoryBuilder` implementations to ensure
that all libraries have consistent redirect follow behavior. Following
of redirects is enabled by default.

The `ClientHttpRequestFactorySettings` may be used to change if
redirects should be followed. The `spring.http.client.redirects`
property may also be used to update the default behavior.

Closes gh-42879
2024-10-25 02:45:36 -07:00
Phillip Webb
a92001130f Deprecate ClientHttpRequestFactories
Deprecate `ClientHttpRequestFactories` and refactor its internals to
delegate to the new `ClientHttpRequestFactoryBuilder` interface.

Closes gh-36266
2024-10-25 02:45:35 -07:00
Phillip Webb
3a8b2e4bc8 Add HttpClientAutoConfiguration and use it wherever possible
Add a new `HttpClientAutoConfiguration` class that provides
`ClientHttpRequestFactoryBuilder` and `ClientHttpRequestFactorySettings`
beans and new configuration properties.

The existing `RestTemplate`, `RestClient` and `WebServiceTemplate`
auto-configurations have been updated to make use of the new
HTTP client support.

Users may now set `spring.http.client` property to globally change
the `ClientHttpRequestFactory` used in their application.

Closes gh-36266
2024-10-25 02:45:35 -07:00
Phillip Webb
6356e904fc Update web services support to use ClientHttpRequestFactoryBuilder
Add a new `WebServiceMessageSenderFactory` factory interface to replace
`HttpWebServiceMessageSenderBuilder`. The factory provides a general
purpose way of creating `WebServiceMessageSender` instances, but most
typically will be `ClientHttpRequestMessageSender` created from a
`ClientHttpRequestFactoryBuilder`.

A new `httpMessageSenderFactory` method has been added to the
`WebServiceTemplateBuilder` class. This allows any sender to be
plugged into the template.

Closes gh-42886
2024-10-25 02:45:35 -07:00
Phillip Webb
022f3cb019 Add requestFactorySettings method to RestTemplateBuilder
Add a `requestFactorySettings` method to `RestTemplateBuilder` to make
it easier to apply an existing `ClientHttpRequestFactorySettings`
instance.

Closes gh-42885
2024-10-25 02:45:35 -07:00
Phillip Webb
367912707a Update RestTemplateBuilder to use ClientHttpRequestFactoryBuilder
Refactor the internals of `RestTemplateBuilder` so that the new
`ClientHttpRequestFactoryBuilder` is used to create
`ClientHttpRequestFactory` instance.

See gh-36266
2024-10-25 02:45:35 -07:00
Phillip Webb
78458afa17 Introduce ClientHttpRequestFactoryBuilder support
Add a new `ClientHttpRequestFactoryBuilder` interface to support the
creation of `ClientHttpRequestFactory` instances. The new code will
ultimately replace the existing `ClientHttpRequestFactories` class.

The `ClientHttpRequestFactoryBuilder` is a functional interface with
additional static factory methods for the various supported
`ClientHttpRequestFactory` types. Each type has it's own builder
which should allow us to support additional customization in the future.

Unlike `ClientHttpRequestFactories`, the builder aligns with Spring
Framework defaults and will detect the `JdkClientHttpRequestFactory`
in preference of `SimpleClientHttpRequestFactory`.

This commit also relocates `ClientHttpRequestFactorySettings` to bring
it into the new `http.client` package.

See gh-36266
2024-10-25 02:45:35 -07:00
Phillip Webb
0a4ac283d0 Rename RestTemplateBuilder 'set' methods
Rename `RestTemplateBuilder` methods for consistency:

* `setConnectTimeout` -> `connectTimeout`
* `setReadTimeout` -> `readTimeout`
* `setSslBundle` -> `sslBundle`

Closes gh-42884
2024-10-25 02:45:35 -07:00
Phillip Webb
8feba568da Polish 2024-10-25 02:45:35 -07:00
Dmytro Nosan
5be0049ed9 Add a test to verify that ReflectionHint for Hazelcast ClientConfig is present
See gh-42874
2024-10-25 08:44:26 +02:00
Moritz Halbritter
6fce6ffde7 Merge branch '3.3.x'
Closes gh-42882
2024-10-25 08:43:20 +02:00
Moritz Halbritter
8556001b4e Merge branch '3.2.x' into 3.3.x
Closes gh-42881
2024-10-25 08:42:58 +02:00
Johnny Lim
a1b4033d10 Move default value descriptions to description field
See gh-42848
2024-10-25 08:35:23 +02:00
Andy Wilkinson
924c807182 Merge branch '3.3.x'
Closes gh-42869
2024-10-24 09:28:51 +01:00
Andy Wilkinson
2bf3e5ab20 Document that embedded Tomcat must be 10.1.25 or later
Closes gh-42849
2024-10-24 09:28:18 +01:00
Andy Wilkinson
9df9d89b69 Upgrade to Spring Integration 6.4.0-RC1
Closes gh-42563
2024-10-24 09:23:14 +01:00
Andy Wilkinson
8c06886409 Upgrade to Spring Batch 5.2.0-RC1
Closes gh-42560
2024-10-24 09:23:13 +01:00
Andy Wilkinson
4fa254d745 Upgrade to Byte Buddy 1.15.7
Closes gh-42867
2024-10-24 09:23:13 +01:00
Andy Wilkinson
13e75dce1b Upgrade to Spring Integration 6.3.5
Closes gh-42549
2024-10-24 09:13:50 +01:00
Phillip Webb
005ea96307 Revert "Add spring-aop to work around Spring Framework mock detection issue"
This reverts commit 2a64cf6fb122eb0cf4810772fc20efa82950ac77.

Closes gh-42855
2024-10-23 12:36:36 -07:00
Andy Wilkinson
3b330ae09a Shut down management server once main server's shut down
Closes gh-41002
2024-10-23 12:08:03 -07:00
Phillip Webb
2a64cf6fb1 Add spring-aop to work around Spring Framework mock detection issue 2024-10-23 11:13:28 -07:00
Phillip Webb
0305d1e9d5 Adapt to upstream Spring Framework @MockitoBean changes 2024-10-23 11:11:55 -07:00
Phillip Webb
47fa83cafc Merge branch '3.3.x' 2024-10-23 10:14:59 -07:00
Phillip Webb
fc1ed0b340 Increase timeout in ZipkinWebClientSenderTests 2024-10-23 10:14:32 -07:00
Stéphane Nicoll
27e8f14c31 Polish "Add container support for ClickHouse"
See gh-42837
2024-10-23 18:15:43 +02:00
Eddú Meléndez
d9dfb0389e Add container support for ClickHouse
See gh-42837
2024-10-23 13:54:58 +02:00
Stéphane Nicoll
c6619dd306 Upgrade to Testcontainers 1.20.3
Closes gh-42847
2024-10-23 09:02:32 +02:00
Stéphane Nicoll
92a98d667c Upgrade to SQLite JDBC 3.47.0.0
Closes gh-42846
2024-10-23 09:02:32 +02:00
Moritz Halbritter
5e5f41b7a6 Merge branch '3.3.x'
Closes gh-42845
2024-10-23 08:27:51 +02:00