Commit Graph

703 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
Phillip Webb
5d0640a356 Use MergedAnnotations for @AliasFor support
Update `ImportsContextCustomizer` to use `MergedAnnotations` so
that `@AliasFor` can be supported.

See gh-34917
2023-07-04 12:17:58 +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
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