root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Merge branch '6.1.x'

This commit is contained in:
Sam Brannen 2024-09-04 17:30:49 +02:00
parent 2f56a59ba0 caaa86d6cf
commit 907859f2f3
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
framework-docs/modules/ROOT/pages/web/webmvc/mvc-controller/ann-methods/requestparam.adoc
View File

@ -61,7 +61,7 @@ Kotlin::
By default, method parameters that use this annotation are required, but you can specify that By default, method parameters that use this annotation are required, but you can specify that
a method parameter is optional by setting the `@RequestParam` annotation's `required` flag to a method parameter is optional by setting the `@RequestParam` annotation's `required` flag to
`false` or by declaring the argument with an `java.util.Optional` wrapper. `false` or by declaring the argument with a `java.util.Optional` wrapper.
Type conversion is automatically applied if the target method parameter type is not Type conversion is automatically applied if the target method parameter type is not
`String`. See xref:web/webmvc/mvc-controller/ann-methods/typeconversion.adoc[Type Conversion]. `String`. See xref:web/webmvc/mvc-controller/ann-methods/typeconversion.adoc[Type Conversion].
@ -86,7 +86,7 @@ Java::
// ... // ...
@PostMapping(value = "/process", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE) @PostMapping(path = "/process", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE)
public String processForm(@RequestParam MultiValueMap<String, String> params) { public String processForm(@RequestParam MultiValueMap<String, String> params) {
// ... // ...
} }

2
spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests.java
View File

@ -609,7 +609,7 @@ abstract class AbstractProxyTargetClassConfig {
@Aspect @Aspect
static class SupplierAdvice { static class SupplierAdvice {
@Around("execution(public * org.springframework.aop.aspectj.autoproxy..*.*(..))") @Around("execution(* java.util.function.Supplier+.get())")
Object aroundSupplier(ProceedingJoinPoint joinPoint) throws Throwable { Object aroundSupplier(ProceedingJoinPoint joinPoint) throws Throwable {
return "advised: " + joinPoint.proceed(); return "advised: " + joinPoint.proceed();
} }