Commit Graph

537 Commits

Author SHA1 Message Date
Moritz Halbritter
1d45016d8c Upgrade to spring-javaformat 0.0.43
Closes gh-41853
2024-08-14 16:32:41 +02:00
Scott Frederick
b43d97b359 Document the need to explicitly reset mock servers
When MockServerRestTemplateCustomizer and MockServerRestClientCustomizer
are used directly instead of via auto-configuration, it is necessary to
manually reset the MockRestServiceServer expectations between tests.

Closes gh-41848
2024-08-13 16:01:46 -05:00
Andy Wilkinson
5f666eec5b Reduce warnings reported by Eclipse
Closes gh-41598
2024-07-25 14:55:00 +01:00
Phillip Webb
57f452fec1 Disable ReactorResourceFactory use of global resources in tests
Add `ContextCustomizerFactory` to automatically disable the use of
`ReactorResourceFactory` global resources in tests.

Fixes gh-38199
2024-06-24 11:22:11 -07:00
Stéphane Nicoll
e9eeac9028 Use Spring Framework's NoOpResponseErrorHandler
See spring-projects/spring-framework#32750

Closes gh-41183
2024-06-20 18:28:36 +01:00
Phillip Webb
2a4582b084 Update copyright year of changed files 2024-06-19 22:54:40 -07:00
Piyal Ahmed
17adcfc180 Use constructor rather than Collection.addAll
See gh-41053
2024-06-11 09:39:45 -07:00
Donghoon Lee
8920c2f269 Fix typo in javadoc
See gh-41052
2024-06-11 15:01:06 +02:00
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
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
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
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
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
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
Moritz Halbritter
497bbf9c2d Revise synchronized blocks
- Replace synchronized with Lock when guarding long-running operations
- Remove unnecessary synchronization in FileSystemWatcher
- Replace HashMap with ConcurrentHashMap in Restarter
- Remove unnecessary locking on AtomicBoolean in
  SpringApplicationBuilder
- Remove unnecessary locking in SimpleFormatter

Closes gh-36670
2023-08-03 09:23:46 +02:00
Andy Wilkinson
d0d545468a Revert "Remove invalid check for String-based FactoryBean.OBJECT_TYPE_ATTRIBUTE"
This reverts commit 279f8221a5.

See gh-36659
2023-08-01 17:57:34 +01:00
Stephane Nicoll
279f8221a5 Remove invalid check for String-based FactoryBean.OBJECT_TYPE_ATTRIBUTE
Closes gh-36659
2023-08-01 16:50:56 +02:00
Johnny Lim
96c9915f12 Polish
See gh-36565
2023-07-26 10:00:56 +02:00
Andy Wilkinson
2de6447a79 Merge branch '3.1.x'
Closes gh-36232
2023-07-05 09:09:39 +01:00
Andy Wilkinson
bdb7fdc6fc Merge branch '3.0.x' into 3.1.x
Closes gh-36230
2023-07-05 09:09:26 +01:00
Andy Wilkinson
581c2633f8 Merge branch '2.7.x' into 3.0.x
Closes gh-36229
2023-07-05 09:09:07 +01:00
Andy Wilkinson
f4c996b432 Polish "Check for Class and ResolvableType object type attributes"
See gh-36224
2023-07-05 09:04:58 +01:00
Bernardo Bulgarelli
3a7185206e Check for Class and ResolvableType object type attributes
See gh-36224
2023-07-05 09:04:04 +01:00
Phillip Webb
7c942679ad Polish 'Switch ImportsContextCustomizer to use MergedAnnotations.search'
See gh-36211
2023-07-04 14:05:48 +01:00