d411d4347f
Merge branch '3.3.x'
...
Closes gh-41222
2024-06-24 12:24:40 -07:00
726f71a1a8
Merge branch '3.2.x' into 3.3.x
...
Closes gh-41221
2024-06-24 12:24:27 -07:00
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
b593734edd
Merge branch '3.2.x' into 3.3.x
...
Closes gh-41191
2024-06-21 10:01:22 +01:00
17ca0421e7
Upgrade to HtmlUnit 4.2.0 and Selenium HtmlUnit 4.20
...
Closes gh-41178
Closes gh-41179
2024-06-20 20:18:23 +01:00
305bfb1641
Adapt to Mockito support in the Test Context Framework
...
This commit updates MockitoTestExecutionListener to not handle mocks
as this is already done in the listener provided by the core framework,
and registration can only happen once.
Integration tests have been left as-is to validate that the presence
of both listeners doesn't have an unwanted side effect.
See gh-41177
2024-06-20 20:18:07 +01:00
2053e13c09
Adapt to new Placeholder resolution API
...
See gh-41177
2024-06-20 20:18:07 +01:00
6110e0ff43
Merge branch '3.2.x'
...
Closes gh-41184
2024-06-20 19:30:12 +01:00
e9eeac9028
Use Spring Framework's NoOpResponseErrorHandler
...
See spring-projects/spring-framework#32750
Closes gh-41183
2024-06-20 18:28:36 +01:00
9dda006a18
Merge branch '3.2.x'
2024-06-19 22:55:00 -07:00
2a4582b084
Update copyright year of changed files
2024-06-19 22:54:40 -07:00
147240aa0c
Merge branch '3.2.x'
...
Closes gh-41080
2024-06-11 13:32:30 -07:00
bcbcafaab2
Polish "Use method references when possible in test code"
...
See gh-40974
2024-06-11 12:58:04 -07:00
207327d97c
Use method references when possible in test code
...
See gh-40974
2024-06-11 12:58:00 -07:00
255bcc28e6
Merge branch '3.2.x'
...
Closes gh-41077
2024-06-11 10:48:52 -07:00
17adcfc180
Use constructor rather than Collection.addAll
...
See gh-41053
2024-06-11 09:39:45 -07:00
000869c25d
Merge branch '3.2.x'
...
Closes gh-41065
2024-06-11 15:01:29 +02:00
8920c2f269
Fix typo in javadoc
...
See gh-41052
2024-06-11 15:01:06 +02:00
f355080dc8
Merge branch '3.2.x'
...
Closes gh-40855
2024-05-21 15:48:15 +01:00
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
6697db257c
Merge branch '3.2.x'
...
Closes gh-40614
2024-05-02 11:56:21 +02:00
2183b47e62
Merge branch '3.1.x' into 3.2.x
...
Closes gh-40612
2024-05-02 11:53:21 +02:00
1534bc8ad2
Polish "Avoid using OkHttp3ClientHttpRequestFactory in test"
...
See gh-40611
2024-05-02 11:45:23 +02:00
20042576e9
Avoid using OkHttp3ClientHttpRequestFactory in test
...
See gh-40611
2024-05-02 11:45:20 +02:00
6963bd884b
Merge branch '3.2.x'
2024-04-18 12:53:26 -07:00
38af8cd362
Merge branch '3.1.x' into 3.2.x
2024-04-18 12:52:54 -07:00
20db2b54c7
Update copyright year of changed files
2024-04-18 12:52:29 -07:00
813507b791
Merge branch '3.2.x'
...
Closes gh-40166
2024-04-03 16:32:13 -05:00
1c2a43d1e6
Merge branch '3.1.x' into 3.2.x
...
Closes gh-40165
2024-04-03 16:30:41 -05:00
8a42935dad
Apply instanceof pattern matching
...
See gh-40085
2024-04-03 16:30:01 -05:00
35b39d3a44
Make spring-test available to compile classpath of consumers of spring-boot-test
...
Closes gh-39901
2024-03-26 13:45:51 +01:00
102215ee96
Upgrade to HttpClient5 5.3.1
...
Closes gh-39703
2024-02-22 10:10:05 +00:00
f8a1dae835
Merge branch '3.2.x'
2024-02-21 15:27:57 -08:00
12de6aa46a
Merge branch '3.1.x' into 3.2.x
2024-02-21 15:27:27 -08:00
51991d6f41
Merge branch '3.2.x'
...
Closes gh-39536
2024-02-13 13:11:50 -06:00
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
7f55cae90f
Merge branch '3.2.x'
2024-02-12 10:19:46 +01:00
4387b79831
Merge branch '3.1.x' into 3.2.x
2024-02-12 10:18:46 +01:00
8ffcfc9b77
Harmonize style of igored exceptions across the codebase
2024-02-12 10:14:20 +01:00
acf758aea9
Merge branch '3.2.x'
2024-01-25 11:06:36 +01:00
c47430d842
Merge branch '3.1.x' into 3.2.x
2024-01-25 11:06:25 +01:00
df755db1f3
Ensure that remaining mocks are closed before initializing a test
...
Closes gh-39271
2024-01-25 10:57:45 +01:00
9146ce5515
Merge branch '3.2.x'
2024-01-25 10:19:49 +01:00
36b70d7b16
Merge branch '3.1.x' into 3.2.x
2024-01-25 10:19:37 +01:00
930669888a
Add more integration tests for MockitoTestExecutionListener
2024-01-25 10:18:59 +01:00
8f1a330dd5
Update copyright header of cleaned up code
...
See gh-39259
2024-01-23 10:18:50 -08:00
def7523398
Inline redundant if statements
...
See gh-39259
2024-01-23 09:07:35 -08:00
9cdd0c3776
Remove unnecessary semicolons
...
See gh-39259
2024-01-23 09:07:29 -08:00
43296d019e
Merge branch '3.2.x'
...
Closes gh-39273
2024-01-23 09:27:25 +01:00
46304a7821
Merge branch '3.1.x' into 3.2.x
...
Closes gh-39272
2024-01-23 09:24:29 +01:00
c87d5eeb28
Ensure that remaining mocks are closed before initializing a test
...
Closes gh-39271
2024-01-23 09:17:17 +01:00
17e9f0cb8e
Merge branch '3.2.x'
...
Closes gh-39093
2024-01-11 11:36:38 +00:00
7087897507
Merge branch '3.1.x' into 3.2.x
...
Closes gh-39091
2024-01-11 10:33:57 +00:00
45c32854a5
Fix Checkstyle upgrade
...
Closes gh-38746
2024-01-10 15:37:38 +00:00
28490738ae
Revert "Upgrade to HttpClient5 5.3"
...
This reverts commit 31f3f31ac1
2024-01-05 11:40:41 +00:00
31f3f31ac1
Upgrade to HttpClient5 5.3
...
Closes gh-39007
2024-01-04 17:32:10 +00:00
a1c7c0bccc
Upgrade to AssertJ 3.25.1
...
Closes gh-38997
2024-01-04 17:26:35 +00:00
246a0e6f21
Merge branch '3.1.x'
...
Closes gh-38878
2023-12-19 23:10:49 -08:00
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
5354ad15b3
Merge branch '3.1.x'
...
Closes gh-38877
2023-12-19 22:51:48 -08:00
8599e5a986
Remove unnecessary `toString()` calls
...
See gh-38739
2023-12-19 22:38:34 -08:00
84f7c2dba9
Remove unnecessary `final` modifiers
...
See gh-38739
2023-12-19 22:38:14 -08:00
6330190913
Merge branch '3.1.x'
...
Closes gh-38728
2023-12-11 09:44:19 +01:00
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
4a851c1c90
Merge branch '3.1.x'
2023-11-08 09:53:53 +01:00
357c2124c4
Merge branch '3.0.x' into 3.1.x
2023-11-08 09:53:40 +01:00
0a6b723098
Merge branch '2.7.x' into 3.0.x
2023-11-08 09:53:29 +01:00
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
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
d638bbb0ba
Merge branch '3.1.x'
...
Closes gh-37967
2023-10-19 21:25:44 -07:00
1d456e09d2
Merge branch '3.0.x' into 3.1.x
...
Closes gh-37966
2023-10-19 21:12:52 -07:00
a0b999c8b4
Merge branch '2.7.x' into 3.0.x
...
Closes gh-37965
2023-10-19 20:55:51 -07:00
abdad1cabe
Constently use assertThatExceptionOf... assertions
...
Closes gh-37964
2023-10-19 20:17:26 -07:00
029c28d923
Merge branch '3.1.x'
...
Closes gh-37925
2023-10-18 11:30:35 +01:00
8f18b116de
Merge branch '3.0.x' into 3.1.x
...
Closes gh-37924
2023-10-18 11:17:41 +01:00
ece239f421
Merge branch '2.7.x' into 3.0.x
...
Closes gh-37923
2023-10-18 11:01:23 +01:00
4cc3aec587
Consider @ComponentScan in imports context cache key
...
Fixes gh-31577
2023-10-18 10:40:23 +01:00
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
8edec21a6f
Update copyright year of changed files
2023-08-13 20:44:44 -07:00
3c12f39adb
Merge branch '3.1.x'
...
Closes gh-36860
2023-08-09 12:27:50 +01:00
30bfc34b5b
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36859
2023-08-09 12:27:41 +01:00
b411fffb30
Merge branch '2.7.x' into 3.0.x
...
Closes gh-36858
2023-08-09 12:27:27 +01:00
21de3fba3c
Describe quirks of JUL and Log4j2 in OutputCaptureExtension javadoc
...
Closes gh-32562
2023-08-09 12:25:26 +01:00
421448233f
Remove invalid check for String-based FactoryBean.OBJECT_TYPE_ATTRIBUTE
...
Closes gh-36659
2023-08-09 11:18:25 +02:00
b46e81c230
Start building against Spring Framework 6.1.0-M4 snapshots
...
See gh-36678
2023-08-09 11:18:25 +02:00
ed9169501e
Polish
2023-08-08 13:12:47 +02:00
1a8b8ce26e
Revert "Revise synchronized blocks"
...
This reverts commit 497bbf9c2d
2023-08-03 17:26:31 +02:00
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
d0d545468a
Revert "Remove invalid check for String-based FactoryBean.OBJECT_TYPE_ATTRIBUTE"
...
This reverts commit 279f8221a5
2023-08-01 17:57:34 +01:00
279f8221a5
Remove invalid check for String-based FactoryBean.OBJECT_TYPE_ATTRIBUTE
...
Closes gh-36659
2023-08-01 16:50:56 +02:00
191ac10009
Deprecate support for OkHttp
...
Closes gh-36632
2023-08-01 16:45:13 +02:00
96c9915f12
Polish
...
See gh-36565
2023-07-26 10:00:56 +02:00
2de6447a79
Merge branch '3.1.x'
...
Closes gh-36232
2023-07-05 09:09:39 +01:00
bdb7fdc6fc
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36230
2023-07-05 09:09:26 +01:00
581c2633f8
Merge branch '2.7.x' into 3.0.x
...
Closes gh-36229
2023-07-05 09:09:07 +01:00
f4c996b432
Polish "Check for Class and ResolvableType object type attributes"
...
See gh-36224
2023-07-05 09:04:58 +01:00
3a7185206e
Check for Class and ResolvableType object type attributes
...
See gh-36224
2023-07-05 09:04:04 +01:00
7c942679ad
Polish 'Switch ImportsContextCustomizer to use MergedAnnotations.search'
...
See gh-36211
2023-07-04 14:05:48 +01:00
4562189125
Switch ImportsContextCustomizer to use MergedAnnotations.search #36211
...
Use `MergedAnnotations.search` in `ImportsContextCustomizer` rather than
needing dedicated search logic.
See gh-36211
2023-07-04 13:58:53 +01:00
b2985676aa
Merge branch '3.1.x'
...
Closes gh-36210
2023-07-04 12:19:47 +01:00
Phillip Webb
Andy Wilkinson
Stéphane Nicoll
Ahmed Ashour
Piyal Ahmed
Moritz Halbritter
Donghoon Lee
Scott Frederick
Felix
Tobias Lippert
Yanming Zhou
Moritz Halbritter
Phillip Webb
Andy Wilkinson
Scott Frederick
Stephane Nicoll
Johnny Lim
Bernardo Bulgarelli
Laurent Martelli