Andy Wilkinson
486ceecc9a
Use the bean factory to get the type produced by a factory bean
...
Previously, we only looked at the OBJECT_TYPE_ATTRIBUTE on the
factory bean's definition. This did not work for situations
where the information's provided by the definition's target type
rather than the attribute.
Rather than manually considering the target type in addition to
the existing consideration of the attribute, we now ask the bean
factory for the type that will be produced by the factory bean
instead. This should insulate us from any changes and
enhancements in Framework in the future.
Fixes gh-40234
2024-05-21 15:27:59 +01:00
Moritz Halbritter
2183b47e62
Merge branch '3.1.x' into 3.2.x
...
Closes gh-40612
2024-05-02 11:53:21 +02:00
Moritz Halbritter
1534bc8ad2
Polish "Avoid using OkHttp3ClientHttpRequestFactory in test"
...
See gh-40611
2024-05-02 11:45:23 +02:00
Stéphane Nicoll
20042576e9
Avoid using OkHttp3ClientHttpRequestFactory in test
...
See gh-40611
2024-05-02 11:45:20 +02:00
Phillip Webb
38af8cd362
Merge branch '3.1.x' into 3.2.x
2024-04-18 12:52:54 -07:00
Phillip Webb
20db2b54c7
Update copyright year of changed files
2024-04-18 12:52:29 -07:00
Scott Frederick
1c2a43d1e6
Merge branch '3.1.x' into 3.2.x
...
Closes gh-40165
2024-04-03 16:30:41 -05:00
Felix
8a42935dad
Apply instanceof pattern matching
...
See gh-40085
2024-04-03 16:30:01 -05:00
Phillip Webb
12de6aa46a
Merge branch '3.1.x' into 3.2.x
2024-02-21 15:27:27 -08:00
Scott Frederick
720e9cef16
Make RestTemplateBuilder more compatible with RestClient.Builder
...
When Spring Framework builds a `RestClient` from a `RestTemplate`, it
will use any `UriTemplateHandler` that has been set on the
`RestTemplate` if the provided `UriTemplateHandler` is also a
`UriBuilderFactory`. Prior to this commit, Spring Boot's
`RestTemplateBuilder#rootUri` set a `UriTemplateHandler` on the created
`RestTemplate`, but it was not a `UriBuilderFactory` so `RestClient`
would not consider it.
With this commit, `RestTemplateBuilder#rootUri` sets a
`UriTemplateHandler` that is also a `UriBuilderFactory` so that any
root URI that is set on the `RestTemplateBuilder` will be applied to a
`RestClient` also.
Fixes gh-39317
2024-02-13 13:10:55 -06:00
Moritz Halbritter
4387b79831
Merge branch '3.1.x' into 3.2.x
2024-02-12 10:18:46 +01:00
Moritz Halbritter
8ffcfc9b77
Harmonize style of igored exceptions across the codebase
2024-02-12 10:14:20 +01:00
Moritz Halbritter
c47430d842
Merge branch '3.1.x' into 3.2.x
2024-01-25 11:06:25 +01:00
Moritz Halbritter
df755db1f3
Ensure that remaining mocks are closed before initializing a test
...
Closes gh-39271
2024-01-25 10:57:45 +01:00
Moritz Halbritter
36b70d7b16
Merge branch '3.1.x' into 3.2.x
2024-01-25 10:19:37 +01:00
Moritz Halbritter
930669888a
Add more integration tests for MockitoTestExecutionListener
2024-01-25 10:18:59 +01:00
Moritz Halbritter
46304a7821
Merge branch '3.1.x' into 3.2.x
...
Closes gh-39272
2024-01-23 09:24:29 +01:00
Moritz Halbritter
c87d5eeb28
Ensure that remaining mocks are closed before initializing a test
...
Closes gh-39271
2024-01-23 09:17:17 +01:00
Andy Wilkinson
7087897507
Merge branch '3.1.x' into 3.2.x
...
Closes gh-39091
2024-01-11 10:33:57 +00:00
Andy Wilkinson
45c32854a5
Fix Checkstyle upgrade
...
Closes gh-38746
2024-01-10 15:37:38 +00:00
Phillip Webb
246a0e6f21
Merge branch '3.1.x'
...
Closes gh-38878
2023-12-19 23:10:49 -08:00
Yanming Zhou
8cb8999772
Ban call of URLEncoder.encode/URLDecoder.decode(String,String)
...
Add ArchUnit rules to ban the use of `URLEncoder` calls with String
charsets and use `Charset` calls instead.
See gh-38740
2023-12-19 23:10:18 -08:00
Phillip Webb
5354ad15b3
Merge branch '3.1.x'
...
Closes gh-38877
2023-12-19 22:51:48 -08:00
Yanming Zhou
8599e5a986
Remove unnecessary toString()
calls
...
See gh-38739
2023-12-19 22:38:34 -08:00
Yanming Zhou
84f7c2dba9
Remove unnecessary final
modifiers
...
See gh-38739
2023-12-19 22:38:14 -08:00
Moritz Halbritter
6330190913
Merge branch '3.1.x'
...
Closes gh-38728
2023-12-11 09:44:19 +01:00
Yanming Zhou
ebfbc0ef05
Cleanup kotlin sources
...
1. remove unused imports
2. remove redundant semicolon
3. remove empty class body
4. remove redundant 'constructor' keyword
5. remove redundant 'Unit' return type
6. use non-null type if possible
See gh-38708
2023-12-11 09:23:42 +01:00
Moritz Halbritter
4a851c1c90
Merge branch '3.1.x'
2023-11-08 09:53:53 +01:00
Moritz Halbritter
357c2124c4
Merge branch '3.0.x' into 3.1.x
2023-11-08 09:53:40 +01:00
Moritz Halbritter
0a6b723098
Merge branch '2.7.x' into 3.0.x
2023-11-08 09:53:29 +01:00
Moritz Halbritter
66ed4fe519
Remove system property dependency from MockBeanContextCachingTests
...
Now this test can be run regardless of the
'spring.test.context.cache.maxSize' system property value.
See gh-38236
2023-11-08 09:49:35 +01:00
Phillip Webb
690cfa220a
Provide a way to create custom ApplicationContextFactory
...
Update `SpringBootContextLoader` so that `getApplicationContextFactory`
is now a protected that may be overridden to provide a custom
`ApplicationContextFactory` instance.
Closes gh-38205
2023-11-07 11:53:10 -08:00
Phillip Webb
d638bbb0ba
Merge branch '3.1.x'
...
Closes gh-37967
2023-10-19 21:25:44 -07:00
Phillip Webb
1d456e09d2
Merge branch '3.0.x' into 3.1.x
...
Closes gh-37966
2023-10-19 21:12:52 -07:00
Phillip Webb
a0b999c8b4
Merge branch '2.7.x' into 3.0.x
...
Closes gh-37965
2023-10-19 20:55:51 -07:00
Phillip Webb
abdad1cabe
Constently use assertThatExceptionOf... assertions
...
Closes gh-37964
2023-10-19 20:17:26 -07:00
Andy Wilkinson
029c28d923
Merge branch '3.1.x'
...
Closes gh-37925
2023-10-18 11:30:35 +01:00
Andy Wilkinson
8f18b116de
Merge branch '3.0.x' into 3.1.x
...
Closes gh-37924
2023-10-18 11:17:41 +01:00
Andy Wilkinson
ece239f421
Merge branch '2.7.x' into 3.0.x
...
Closes gh-37923
2023-10-18 11:01:23 +01:00
Andy Wilkinson
4cc3aec587
Consider @ComponentScan in imports context cache key
...
Fixes gh-31577
2023-10-18 10:40:23 +01:00
Scott Frederick
ff99de49c4
Configure a RestClient.Builder with RestClientTest
...
This commit adds support for configuring a `RestClient.Builder` and
`MockRestServiceServer` support for the `RestClient` when using
`@RestClientTest` sliced tests.
Closes gh-37033
2023-09-29 15:07:38 -05:00
Phillip Webb
8edec21a6f
Update copyright year of changed files
2023-08-13 20:44:44 -07:00
Andy Wilkinson
3c12f39adb
Merge branch '3.1.x'
...
Closes gh-36860
2023-08-09 12:27:50 +01:00
Andy Wilkinson
30bfc34b5b
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36859
2023-08-09 12:27:41 +01:00
Andy Wilkinson
b411fffb30
Merge branch '2.7.x' into 3.0.x
...
Closes gh-36858
2023-08-09 12:27:27 +01:00
Andy Wilkinson
21de3fba3c
Describe quirks of JUL and Log4j2 in OutputCaptureExtension javadoc
...
Closes gh-32562
2023-08-09 12:25:26 +01:00
Stephane Nicoll
421448233f
Remove invalid check for String-based FactoryBean.OBJECT_TYPE_ATTRIBUTE
...
Closes gh-36659
2023-08-09 11:18:25 +02:00
Stephane Nicoll
b46e81c230
Start building against Spring Framework 6.1.0-M4 snapshots
...
See gh-36678
2023-08-09 11:18:25 +02:00
Moritz Halbritter
ed9169501e
Polish
2023-08-08 13:12:47 +02:00
Moritz Halbritter
1a8b8ce26e
Revert "Revise synchronized blocks"
...
This reverts commit 497bbf9c2d
.
2023-08-03 17:26:31 +02:00