root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity
53,552 Commits 28 Branches 362 Tags 294 MiB
Commit Graph

521 Commits

Author SHA1 Message Date
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 6697db257c Merge branch '3.2.x' 
Closes gh-40614
 2024-05-02 11:56:21 +02: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
Moritz Halbritter acf758aea9 Merge branch '3.2.x' 2024-01-25 11:06:36 +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 9146ce5515 Merge branch '3.2.x' 2024-01-25 10:19:49 +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 43296d019e Merge branch '3.2.x' 
Closes gh-39273
 2024-01-23 09:27:25 +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 17e9f0cb8e Merge branch '3.2.x' 
Closes gh-39093
 2024-01-11 11:36:38 +00: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
Andy Wilkinson a1c7c0bccc Upgrade to AssertJ 3.25.1 
Closes gh-38997
 2024-01-04 17:26:35 +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 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
Stephane Nicoll 421448233f Remove invalid check for String-based FactoryBean.OBJECT_TYPE_ATTRIBUTE 
Closes gh-36659
 2023-08-09 11:18:25 +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
Stephane Nicoll 191ac10009 Deprecate support for OkHttp 
Closes gh-36632
 2023-08-01 16:45:13 +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 b2985676aa Merge branch '3.1.x' 
Closes gh-36210
 2023-07-04 12:19:47 +01:00
Phillip Webb 97ef8f38a4 Merge branch '3.0.x' into 3.1.x 
Closes gh-36209
 2023-07-04 12:19:20 +01:00
Phillip Webb ab7e4da703 Merge branch '2.7.x' into 3.0.x 
Closes gh-36208
 2023-07-04 12:18:52 +01:00
Laurent Martelli 9baf23ccd5 Test that ImportsContextCustomizer can support @AliasFor 
Add test to ensure that `ImportsContextCustomizer` can support
`@AliasFor` annotations.

See gh-34917
 2023-07-04 12:17:58 +01:00
Andy Wilkinson b645eb32ac Remove deprecated code that was to be removed in 3.2 
Closes gh-36034
 2023-06-23 18:14:22 +01:00
Andy Wilkinson ca5bd37e81 Upgrade to Spring Framework 6.1.0-M1 
Closes gh-35977
Closes gh-35980
 2023-06-19 18:12:16 +01:00
Andy Wilkinson fd4b7d7f7a Merge branch '3.0.x' 
Closes gh-35330
 2023-05-05 18:22:20 +01:00
Andy Wilkinson ce96cc3026 Merge branch '2.7.x' into 3.0.x 
Closes gh-35329
 2023-05-05 18:22:05 +01:00
Andy Wilkinson 6dc84b1645 Ignore non-singleton factory beans when resetting mocks 
Closes gh-35324
 2023-05-05 18:21:04 +01:00
Marc Leroux b61834c92d Replace Mockito argument captors with assertArg 
See gh-35015
 2023-05-05 11:34:55 +02:00
Phillip Webb 2b261e6ebd Apply TestTypeExcludeFilter in regular applications 
Add `ExcludeFilterApplicationContextInitializer` to register the
`TestTypeExcludeFilter` for regular applications.

Prior to this commit, the filter was only registered using the
`ExcludeFilterContextCustomizerFactory` which meant that test components
were filtered in tests but not when using `SpringApplication.from` with
a test classpath.

Fixes gh-35206
 2023-04-29 21:10:02 -07:00
Andy Wilkinson 3f93a4ece6 Polish "Add content buffering support to MockServerRestTemplateCustomizer" 
See gh-34833
 2023-04-17 18:03:44 +01:00
Chinmoy Chakraborty b065e04be7 Add content buffering support to MockServerRestTemplateCustomizer 
See gh-34833
 2023-04-17 18:02:53 +01:00
Phillip Webb 0b15962aca Merge branch '2.7.x' into 3.0.x 2023-02-22 18:36:16 -08:00
Phillip Webb a5902d7a00 Update copyright year of changed files 2023-02-22 18:35:17 -08:00
Phillip Webb c4de86c244 Merge branch '2.7.x' into 3.0.x 2023-02-21 23:17:57 -08:00
Phillip Webb df5898a146 Reformat code following spring-javaformat upgrade 2023-02-21 22:53:27 -08:00
Andy Wilkinson 118f736260 Merge branch '2.7.x' into 3.0.x 
Closes gh-34044
 2023-02-01 17:32:39 +00:00
Andy Wilkinson 9940fcfe77 Reset mocks produced by FactoryBeans 
An unwanted side-effect of the changes made in c6bdd136 to fix
gh-7271 is that a mock produced by a factory bean is not reset. To
allow such a mock to be reset without regressing the fix we now call
getBean(…) as we did before c6bdd136, however the call is now
performed in a defensive manner falling back to getSingleton(…) when
it fails.

Closes gh-33830
 2023-02-01 17:22:36 +00:00
Moritz Halbritter 0a080736d8 Merge branch '2.7.x' into 3.0.x 
Closes gh-34017
 2023-01-31 10:50:30 +01:00
Johnny Lim 5eeb429e44 Polish 
See gh-33966
 2023-01-31 10:48:30 +01:00
Johnny Lim bc7fc90550 Replace Base64Utils with JDK's Base64 
See gh-33967
 2023-01-31 10:20:06 +01:00
Phillip Webb 5120242996 Merge branch '2.7.x' into 3.0.x 2023-01-26 19:41:42 -08:00
Krzysztof Krason a8958471f6 Switch anonymous inner classes to lambdas 
See gh-33987
 2023-01-26 19:34:22 -08:00
Phillip Webb 71efc55bf9 Merge branch '2.7.x' 2023-01-18 16:31:53 -08:00
Phillip Webb 7c508fa324 Update copyright year of changed files 2023-01-18 15:37:58 -08:00
Moritz Halbritter 94f4a4396c Merge branch '2.7.x' 
Closes gh-33880
 2023-01-18 17:35:52 +01:00
Moritz Halbritter e8d809fe65 Replace 'via' with 'over' or 'through' in the documentation 
Closes gh-33878
 2023-01-18 16:56:42 +01:00
Phillip Webb a889c539ab Merge branch '2.7.x' 2023-01-17 10:12:25 -08:00
Phillip Webb a0fe8241a7 Update copyright year of changed files 2023-01-17 10:07:03 -08:00
Moritz Halbritter 679495a1ff Merge branch '2.7.x' 
Closes gh-33792
 2023-01-12 13:24:20 +01:00
Moritz Halbritter d652491e20 Fix stack overflow in SpringBootMockResolver 
Closes gh-32632
 2023-01-12 13:24:09 +01:00
Phillip Webb a2ac38e203 Update copyright year of changed files 2023-01-09 15:46:07 -08:00
Krzysztof Krason cf6493f65c Simplify AssertJ assertions and also make them more readable 
See gh-33653
 2023-01-09 11:10:20 +01:00
Anugrah Singhal 3191c678c3 Remove Jetty/Netty/ApacheHttpClient checks for WebClient 
See gh-33640
 2023-01-09 10:43:44 +01:00
Phillip Webb f588793445 Update copyright year of changed files 2022-12-22 01:00:42 -08:00
Phillip Webb 0254619782 Merge branch '2.7.x' 2022-12-22 00:59:40 -08:00
Phillip Webb e4772cf3b7 Update copyright year of changed files 2022-12-22 00:59:32 -08:00
Moritz Halbritter 725337f976 Make fields final 
Closes gh-33537
 2022-12-16 14:28:44 +01:00
Moritz Halbritter 6edb6fa091 Polish "Add test for beforeEach of OutputExtension" 
See gh-33419
 2022-12-01 11:44:04 +01:00
nowjin 5f532a40f9 Add test for beforeEach of OutputExtension 
See gh-33419
 2022-12-01 11:41:28 +01:00
Moritz Halbritter c1bd9310ea Polish "Add test for beforeEach of OutputExtension" 
See gh-33419
 2022-12-01 11:37:18 +01:00
nowjin 94193c9df2 Add test for beforeEach of OutputExtension 
See gh-33419
 2022-12-01 11:35:53 +01:00
Johnny Lim 90589fd6d4 Polish 
See gh-33384
 2022-12-01 11:32:39 +01:00
Phillip Webb e1efdadfe3 Merge branch '2.7.x' 
Closes gh-33416
 2022-11-29 14:09:57 -08:00
Phillip Webb 711e2528fb Polish 'Improve test coverage for OutputCaptureRule' 
See gh-33405
 2022-11-29 14:09:26 -08:00
nowjin af7a03b4c9 Improve test coverage for OutputCaptureRule 
See gh-33405
 2022-11-29 14:09:05 -08:00
Andy Wilkinson 5dc589e7ae Merge branch '2.7.x' 
Closes gh-33263
 2022-11-18 15:56:30 +00:00
Andy Wilkinson 6bf35e3dd0 Merge branch '2.6.x' into 2.7.x 
Closes gh-33262
 2022-11-18 15:49:12 +00:00
Andy Wilkinson 0c8ae65bd4 Switch of the banner when SpringBootTest runs an app with a parent 
Closes gh-33079
 2022-11-18 15:43:41 +00:00
Phillip Webb fafbefa35c Ensure @ContextHierarchy is never used with UseMainMethod 
Fixes gh-33078
 2022-11-17 10:16:24 -08:00
Johnny Lim 6027508cf7 Polish 
See gh-33108
 2022-11-16 10:00:36 +01:00