Andy Wilkinson
f4e05c91c7
Use converter beans in preference to ObjectToObjectConverter
...
Previously, with the converter beans in a conversion service that
appears after the bean factory's conversion service, they would not
be called for a conversion that could be handled by the
ObjectToObjectConverter in the bean factory's conversion service.
This commit creates a new FormattingConversionService that is empty
except for the converter beans and places it first in the list.
It's followed by the bean factory's conversion service. The shared
application conversion service is added to the end of the list to
pick up any conversions that the previous two services could not
handle. This should maintain backwards compatibility with the
previous arrangement where the converter beans were added to an
application conversion service that went after the bean factory's
conversion service.
Fixes gh-34631
2023-07-07 08:33:15 +01:00
Jonatan Ivanov
6041fe9b7a
Merge pull request #36270 from spencergibb
...
* pr/36270:
Skip int conversion in ClientHttpRequestFactories
Closes gh-36270
2023-07-06 16:15:01 -07:00
Spencer Gibb
62674de472
Skip int conversion in ClientHttpRequestFactories
...
@poutsma added `JdkClientHttpRequestFactory.setReadTimeout(Duration)`
so the conversion to and from int is no longer needed.
See gh-36270
2023-07-06 16:09:31 -07:00
Andy Wilkinson
a460f7474f
Merge branch '3.1.x'
...
Closes gh-36269
2023-07-06 19:45:14 +01:00
Andy Wilkinson
b7099094b9
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36268
2023-07-06 19:42:47 +01:00
Andy Wilkinson
4d70b83e80
Improve javadoc of ClientHttpRequestFactories
...
Closes gh-36267
2023-07-06 19:42:17 +01:00
Andy Wilkinson
1191282004
Merge pull request #36118 from poutsma
...
* gh-36118:
Polish "Support JDK HttpClient in ClientHttpRequestFactories"
Support JDK HttpClient in ClientHttpRequestFactories
Closes gh-36118
2023-07-06 19:34:53 +01:00
Andy Wilkinson
bb2c4cc742
Polish "Support JDK HttpClient in ClientHttpRequestFactories"
...
See gh-36118
2023-07-06 17:59:15 +01:00
Arjen Poutsma
3bbfee5e93
Support JDK HttpClient in ClientHttpRequestFactories
...
See gh-36118
2023-07-06 17:52:36 +01:00
Andy Wilkinson
46aeeab148
Merge branch '3.1.x'
...
Closes gh-36244
2023-07-06 12:31:17 +01:00
Andy Wilkinson
ea91b2f861
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36247
2023-07-06 12:30:09 +01:00
Andy Wilkinson
7ae030adad
Merge branch '2.7.x' into 3.0.x
...
Closes gh-36245
2023-07-06 12:29:38 +01:00
Andy Wilkinson
76cd102aa6
Upgrade CI images to ubuntu:jammy-20230624
...
Closes gh-36246
2023-07-06 12:28:22 +01:00
Andy Wilkinson
3b90919313
Polish RestClient auto-config and tests
...
For consistency, replace webClient and WebClient with restClient and
RestClient. This also address a bean name clash between
RestClientAutoConfiguration's RestClient.Builder bean and
WebClientAutoConfiguration's WebClient.Builder bean that were both
previously named webClientBuilder.
2023-07-06 12:22:54 +01:00
Andy Wilkinson
3a07f4df80
Merge branch '3.1.x'
...
Closes gh-36260
2023-07-06 12:12:08 +01:00
Andy Wilkinson
e1459c922e
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36259
2023-07-06 12:11:55 +01:00
Andy Wilkinson
f63e84c25f
Merge branch '2.7.x' into 3.0.x
...
Closes gh-36258
2023-07-06 12:11:43 +01:00
Andy Wilkinson
4e4da9fce0
Disable parallel execution for PR builds on GitHub Actions
...
Closes gh-36257
2023-07-06 12:11:08 +01:00
Andy Wilkinson
486879e2ef
Merge pull request #36249 from spencergibb
...
* gh-36249:
Add RestClientAutoConfiguration to AutoConfiguration.imports
Closes gh-36249
2023-07-06 11:39:10 +01:00
Spencer Gibb
89880a773c
Add RestClientAutoConfiguration to AutoConfiguration.imports
...
See gh-36249
2023-07-06 11:38:48 +01:00
Andy Wilkinson
7088d0e04a
Merge branch '3.1.x'
...
Closes gh-36256
2023-07-06 11:33:42 +01:00
Andy Wilkinson
64eaca4db3
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36255
2023-07-06 11:32:33 +01:00
Andy Wilkinson
81510441aa
Merge branch '2.7.x' into 3.0.x
...
Closes gh-36254
2023-07-06 11:25:52 +01:00
Andy Wilkinson
142a3983a0
Check that AutoConfiguration classes are listed in imports file
...
Closes gh-36253
2023-07-06 11:19:03 +01:00
Phillip Webb
f978051127
Merge pull request #36213 from poutsma
...
* pr/36213:
Add RestClient SSL support
Overhaul reference documentation for RestClient
Add RestClient HttpMessageConverters support
Polish 'Add initial support for RestClient'
Add initial support for RestClient
Closes gh-36213
2023-07-05 21:29:03 +01:00
Phillip Webb
cfdc173e34
Add RestClient SSL support
...
Add `RestClientSsl` support class to help apply an `SslBundle` to a
`RestClient.Builder`.
See gh-36213
2023-07-05 21:22:52 +01:00
Phillip Webb
7c1b168ed6
Overhaul reference documentation for RestClient
...
Reorder "Calling REST services" documentation and add a new section
covering `RestClient`.
See gh-36213
2023-07-05 21:22:49 +01:00
Phillip Webb
5e01c66552
Add RestClient HttpMessageConverters support
...
Update `RestClientAutoConfiguration` to apply `HttpMessageConverters`
configuration.
See gh-36213
2023-07-05 21:17:42 +01:00
Phillip Webb
2d2f050262
Polish 'Add initial support for RestClient'
...
See gh-36213
2023-07-05 21:17:23 +01:00
Arjen Poutsma
a1a5acf128
Add initial support for RestClient
...
Introduce initial support for Spring Framework's `RestClient`, in the
form of a `RestClientCustomizer` and `RestClientAutoConfiguration`.
See gh-36213
2023-07-05 21:16:02 +01:00
Phillip Webb
8b3070e027
Merge branch '3.1.x'
2023-07-05 21:00:12 +01:00
Phillip Webb
034803ee2f
Polish
2023-07-05 20:59:39 +01:00
Andy Wilkinson
fc8a8d363f
Polish
2023-07-05 15:50:32 +01:00
Andy Wilkinson
83d5d89efc
Merge pull request #35874 from romangr
...
* gh-35874:
Polish "Support custom token validators for OAuth2"
Support custom token validators for OAuth2
Closes gh-35874
2023-07-05 15:17:54 +01:00
Andy Wilkinson
4feaa28fd1
Polish "Support custom token validators for OAuth2"
...
See gh-35874
2023-07-05 14:01:08 +01:00
Roman Golovin
7500dab321
Support custom token validators for OAuth2
...
See gh-35874
2023-07-05 11:48:48 +01:00
Andy Wilkinson
ce8253ea95
Merge branch '3.1.x'
...
Closes gh-36238
2023-07-05 09:51:35 +01:00
Andy Wilkinson
c9f8d92656
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36237
2023-07-05 09:47:43 +01:00
Andy Wilkinson
e17aff09cc
Merge pull request #36167 from izeye
...
* gh-36167:
Polish "Use Stream.toList()"
Use Stream.toList()
Closes gh-36167
2023-07-05 09:42:15 +01:00
Andy Wilkinson
0e815d2342
Polish "Use Stream.toList()"
...
See gh-36167
2023-07-05 09:39:38 +01:00
Johnny Lim
0fa58c04e7
Use Stream.toList()
...
See gh-36167
2023-07-05 09:38:19 +01:00
Andy Wilkinson
12cd753652
Merge branch '3.1.x'
...
Closes gh-36236
2023-07-05 09:20:19 +01:00
Andy Wilkinson
20cfc3c9d0
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36235
2023-07-05 09:19:49 +01:00
Andy Wilkinson
bdead8d0e3
Merge pull request #36168 from eddumelendez
...
* gh-36168:
Use spring-amqp-bom
Closes gh-36168
2023-07-05 09:19:37 +01:00
Eddú Meléndez
f57e6a1fa5
Use spring-amqp-bom
...
See gh-36168
2023-07-05 09:19:24 +01:00
Andy Wilkinson
62eb3d3051
Merge branch '3.1.x'
...
Closes gh-36234
2023-07-05 09:12:59 +01:00
Andy Wilkinson
0bfc3c3872
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36233
2023-07-05 09:12:47 +01:00
Andy Wilkinson
e28aa19ec5
Merge pull request #36225 from quaff
...
* gh-36225:
Polish formatting in "Running Spring Batch Jobs on Startup"
Closes gh-36225
2023-07-05 09:12:35 +01:00
Yanming Zhou
9439494923
Polish formatting in "Running Spring Batch Jobs on Startup"
...
See gh-36225
2023-07-05 09:12:07 +01:00
Andy Wilkinson
2de6447a79
Merge branch '3.1.x'
...
Closes gh-36232
2023-07-05 09:09:39 +01:00