fuhouyin/spring-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
43,324 Commits 22 Branches 339 Tags
Commit Graph

680 Commits

Author SHA1 Message Date
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
a37a7228b8 Merge pull request #34833 from chinmoy12c 
* gh-34833:
  Polish "Add content buffering support to MockServerRestTemplateCustomizer"
  Add content buffering support to MockServerRestTemplateCustomizer

Closes gh-34833
 2023-04-17 18:05:29 +01: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
d442bfbeff Polish 2023-04-10 16:22:11 -07:00
Phillip Webb
b6777524f7 Merge branch '2.7.x' into 3.0.x 2023-03-23 23:00:50 -07:00
Mortitz Halbritter
bece347987 Polish 2023-03-23 22:59:26 -07: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
Krzysztof Krason
0e68cae57f Use instanceof patterns 
See gh-33987
 2023-01-26 20:36:25 -08: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
fad88232b9 Update copyright year of changed files 2023-01-17 10:12:38 -08:00
Phillip Webb
a889c539ab Merge branch '2.7.x' 2023-01-17 10:12:25 -08:00
Phillip Webb
71ff90a6a5 Polish 2023-01-17 10:11:47 -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
Moritz Halbritter
887c00e9fc Polish OutputCapture 2023-01-11 11:37:00 +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
lishangbu
f5d0171fcc Avoid NPE when @SpringBootConfiguration not found in test 
See gh-33371
 2022-12-01 11:19:59 +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