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

Synthesize parameter annotations from interface methods as well 

Issue: SPR-17460
This commit is contained in:
Juergen Hoeller 2018-11-12 16:23:14 +01:00
parent 818c2aa3b9
commit c58da71006
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-web/src/main/java/org/springframework/web/method/HandlerMethod.java
View File

@ -494,7 +494,7 @@ public class HandlerMethod {
}
}
if (!existingType) {
merged.add(paramAnn);
merged.add(adaptAnnotation(paramAnn));
}
}
anns = merged.toArray(new Annotation[0]);

22
spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapterIntegrationTests.java
View File

@ -411,9 +411,9 @@ public class RequestMappingHandlerAdapterIntegrationTests {
private interface HandlerIfc {
String handleInInterface(
@CookieValue("cookie") int cookie,
@PathVariable("pathvar") String pathvar,
@RequestHeader("header") String header,
@CookieValue("cookie") int cookieV,
@PathVariable("pathvar") String pathvarV,
@RequestHeader("header") String headerV,
@RequestHeader(defaultValue = "#{systemProperties.systemHeader}") String systemHeader,
@RequestHeader Map<String, Object> headerMap,
@RequestParam("dateParam") Date dateParam,
@ -459,9 +459,9 @@ public class RequestMappingHandlerAdapterIntegrationTests {
}
public String handle(
@CookieValue("cookie") int cookie,
@PathVariable("pathvar") String pathvar,
@RequestHeader("header") String header,
@CookieValue("cookie") int cookieV,
@PathVariable("pathvar") String pathvarV,
@RequestHeader("header") String headerV,
@RequestHeader(defaultValue = "#{systemProperties.systemHeader}") String systemHeader,
@RequestHeader Map<String, Object> headerMap,
@RequestParam("dateParam") Date dateParam,
@ -481,7 +481,7 @@ public class RequestMappingHandlerAdapterIntegrationTests {
Model model,
UriComponentsBuilder builder) {
model.addAttribute("cookie", cookie).addAttribute("pathvar", pathvar).addAttribute("header", header)
model.addAttribute("cookie", cookieV).addAttribute("pathvar", pathvarV).addAttribute("header", headerV)
.addAttribute("systemHeader", systemHeader).addAttribute("headerMap", headerMap)
.addAttribute("dateParam", dateParam).addAttribute("paramMap", paramMap)
.addAttribute("paramByConvention", paramByConvention).addAttribute("value", value)
@ -498,9 +498,9 @@ public class RequestMappingHandlerAdapterIntegrationTests {
@Override
public String handleInInterface(
int cookie,
String pathvar,
String header,
int cookieV,
String pathvarV,
String headerV,
String systemHeader,
Map<String, Object> headerMap,
Date dateParam,
@ -520,7 +520,7 @@ public class RequestMappingHandlerAdapterIntegrationTests {
Model model,
UriComponentsBuilder builder) {
model.addAttribute("cookie", cookie).addAttribute("pathvar", pathvar).addAttribute("header", header)
model.addAttribute("cookie", cookieV).addAttribute("pathvar", pathvarV).addAttribute("header", headerV)
.addAttribute("systemHeader", systemHeader).addAttribute("headerMap", headerMap)
.addAttribute("dateParam", dateParam).addAttribute("paramMap", paramMap)
.addAttribute("paramByConvention", paramByConvention).addAttribute("value", value)