Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add consumes attribute to @GetMapping

Browse Source 
Issue: SPR-14988
This commit is contained in:
bedrin
2016-12-08 01:29:48 +03:00
committed by Rossen Stoyanchev
parent 1b0e95d7d8
commit 8315a4033f
3 changed files with 34 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestMappingHandlerMappingTests.java
View File

@@ -21,6 +21,7 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
@@ -147,6 +148,14 @@ public class RequestMappingHandlerMappingTests {
info.getProducesCondition().getProducibleMediaTypes().iterator().next().toString());
}
@Test // SPR-14988
public void getMappingOverridesConsumesFromTypeLevelAnnotation() throws Exception {
RequestMappingInfo requestMappingInfo = assertComposedAnnotationMapping(RequestMethod.GET);
assertArrayEquals(new MediaType[]{MediaType.ALL}, new ArrayList<>(
requestMappingInfo.getConsumesCondition().getConsumableMediaTypes()).toArray());
}
@Test
public void getMapping() throws Exception {
assertComposedAnnotationMapping(RequestMethod.GET);
@@ -201,6 +210,7 @@ public class RequestMappingHandlerMappingTests {
@Controller @SuppressWarnings("unused")
@RequestMapping(consumes = MediaType.APPLICATION_JSON_VALUE)
static class ComposedAnnotationController {
@RequestMapping
@@ -211,7 +221,7 @@ public class RequestMappingHandlerMappingTests {
public void postJson() {
}
@GetMapping("/get")
@GetMapping(value = "/get", consumes = MediaType.ALL_VALUE)
public void get() {
}