Merge branch '6.0.x'

# Conflicts:
#	spring-context/src/test/java/org/springframework/context/annotation/PropertySourceAnnotationTests.java
This commit is contained in:
Juergen Hoeller
2023-08-14 19:29:14 +02:00
7 changed files with 31 additions and 28 deletions

View File

@@ -197,8 +197,7 @@ public class PayloadMethodArgumentResolver implements HandlerMethodArgumentResol
/**
* Validate the payload if applicable.
* <p>The default implementation checks for {@code @jakarta.validation.Valid},
* Spring's {@link Validated},
* and custom annotations whose name starts with "Valid".
* Spring's {@link Validated}, and custom annotations whose name starts with "Valid".
* @param message the currently processed message
* @param parameter the method parameter
* @param target the target payload object