diff --git a/spring-web/src/main/java/org/springframework/web/bind/annotation/DeleteMapping.java b/spring-web/src/main/java/org/springframework/web/bind/annotation/DeleteMapping.java index 1bfa31a8672c4314d715ef9fcb0e5432d53afc4b..b9e0ee913cc1e512b8b2ed715e3ef9042ecf6198 100644 --- a/spring-web/src/main/java/org/springframework/web/bind/annotation/DeleteMapping.java +++ b/spring-web/src/main/java/org/springframework/web/bind/annotation/DeleteMapping.java @@ -33,8 +33,7 @@ import static org.springframework.web.bind.annotation.RequestMethod.DELETE; *

Specifically, {@code @DeleteMapping} is a composed annotation that * acts as a shortcut for {@code @RequestMapping(method = RequestMethod.DELETE)}. * Furthermore, this annotation does not support the - * {@link RequestMapping#method method}, {@link RequestMapping#name name}, - * {@link RequestMapping#headers headers}, {@link RequestMapping#consumes consumes}, + * {@link RequestMapping#method method}, {@link RequestMapping#consumes consumes}, * and {@link RequestMapping#produces produces} attributes of {@code @RequestMapping}. * * @author Sam Brannen @@ -51,6 +50,12 @@ import static org.springframework.web.bind.annotation.RequestMethod.DELETE; @RequestMapping(method = DELETE) public @interface DeleteMapping { + /** + * Alias for {@link RequestMapping#name}. + */ + @AliasFor(annotation = RequestMapping.class) + String name() default ""; + /** * Alias for {@link RequestMapping#value}. */ @@ -69,4 +74,10 @@ public @interface DeleteMapping { @AliasFor(annotation = RequestMapping.class) String[] params() default {}; + /** + * Alias for {@link RequestMapping#headers}. + */ + @AliasFor(annotation = RequestMapping.class) + String[] headers() default {}; + } diff --git a/spring-web/src/main/java/org/springframework/web/bind/annotation/GetMapping.java b/spring-web/src/main/java/org/springframework/web/bind/annotation/GetMapping.java index 1b91143266d114fed7eda3fe289c6afa13d5dbcb..c6d127c9d557dad9001374a5f1075d0f9a59531f 100644 --- a/spring-web/src/main/java/org/springframework/web/bind/annotation/GetMapping.java +++ b/spring-web/src/main/java/org/springframework/web/bind/annotation/GetMapping.java @@ -33,9 +33,8 @@ import static org.springframework.web.bind.annotation.RequestMethod.GET; *

Specifically, {@code @GetMapping} is a composed annotation that * acts as a shortcut for {@code @RequestMapping(method = RequestMethod.GET)}. * Furthermore, this annotation does not support the - * {@link RequestMapping#method method}, {@link RequestMapping#name name}, - * {@link RequestMapping#headers headers}, and {@link RequestMapping#consumes - * consumes} attributes of {@code @RequestMapping}. + * {@link RequestMapping#method method} and {@link RequestMapping#consumes consumes} + * attributes of {@code @RequestMapping}. * * @author Sam Brannen * @since 4.3 @@ -51,6 +50,12 @@ import static org.springframework.web.bind.annotation.RequestMethod.GET; @RequestMapping(method = GET) public @interface GetMapping { + /** + * Alias for {@link RequestMapping#name}. + */ + @AliasFor(annotation = RequestMapping.class) + String name() default ""; + /** * Alias for {@link RequestMapping#value}. */ @@ -69,6 +74,12 @@ public @interface GetMapping { @AliasFor(annotation = RequestMapping.class) String[] params() default {}; + /** + * Alias for {@link RequestMapping#headers}. + */ + @AliasFor(annotation = RequestMapping.class) + String[] headers() default {}; + /** * Alias for {@link RequestMapping#produces}. */ diff --git a/spring-web/src/main/java/org/springframework/web/bind/annotation/PatchMapping.java b/spring-web/src/main/java/org/springframework/web/bind/annotation/PatchMapping.java index 5235bc9d0eb2066afed34aa5bd199206416358c8..7f371340de23812e08c0124abeca2de86f3d4b32 100644 --- a/spring-web/src/main/java/org/springframework/web/bind/annotation/PatchMapping.java +++ b/spring-web/src/main/java/org/springframework/web/bind/annotation/PatchMapping.java @@ -33,9 +33,8 @@ import static org.springframework.web.bind.annotation.RequestMethod.PATCH; *

Specifically, {@code @PatchMapping} is a composed annotation that * acts as a shortcut for {@code @RequestMapping(method = RequestMethod.PATCH)}. * Furthermore, this annotation does not support the - * {@link RequestMapping#method method}, {@link RequestMapping#name name}, - * {@link RequestMapping#headers headers}, and {@link RequestMapping#produces - * produces} attributes of {@code @RequestMapping}. + * {@link RequestMapping#method method} and {@link RequestMapping#produces produces} + * attributes of {@code @RequestMapping}. * * @author Sam Brannen * @since 4.3 @@ -51,6 +50,12 @@ import static org.springframework.web.bind.annotation.RequestMethod.PATCH; @RequestMapping(method = PATCH) public @interface PatchMapping { + /** + * Alias for {@link RequestMapping#name}. + */ + @AliasFor(annotation = RequestMapping.class) + String name() default ""; + /** * Alias for {@link RequestMapping#value}. */ @@ -69,6 +74,12 @@ public @interface PatchMapping { @AliasFor(annotation = RequestMapping.class) String[] params() default {}; + /** + * Alias for {@link RequestMapping#headers}. + */ + @AliasFor(annotation = RequestMapping.class) + String[] headers() default {}; + /** * Alias for {@link RequestMapping#consumes}. */ diff --git a/spring-web/src/main/java/org/springframework/web/bind/annotation/PostMapping.java b/spring-web/src/main/java/org/springframework/web/bind/annotation/PostMapping.java index 2b2db362bc48ed09c26e13ac007dcc16f11de339..c15fdf2ff42f84c4c933b1a98db4403997e28008 100644 --- a/spring-web/src/main/java/org/springframework/web/bind/annotation/PostMapping.java +++ b/spring-web/src/main/java/org/springframework/web/bind/annotation/PostMapping.java @@ -33,9 +33,8 @@ import static org.springframework.web.bind.annotation.RequestMethod.POST; *

Specifically, {@code @PostMapping} is a composed annotation that * acts as a shortcut for {@code @RequestMapping(method = RequestMethod.POST)}. * Furthermore, this annotation does not support the - * {@link RequestMapping#method method}, {@link RequestMapping#name name}, - * {@link RequestMapping#headers headers}, and {@link RequestMapping#produces - * produces} attributes of {@code @RequestMapping}. + * {@link RequestMapping#method method} and {@link RequestMapping#produces produces} + * attributes of {@code @RequestMapping}. * * @author Sam Brannen * @since 4.3 @@ -51,6 +50,12 @@ import static org.springframework.web.bind.annotation.RequestMethod.POST; @RequestMapping(method = POST) public @interface PostMapping { + /** + * Alias for {@link RequestMapping#name}. + */ + @AliasFor(annotation = RequestMapping.class) + String name() default ""; + /** * Alias for {@link RequestMapping#value}. */ @@ -69,6 +74,12 @@ public @interface PostMapping { @AliasFor(annotation = RequestMapping.class) String[] params() default {}; + /** + * Alias for {@link RequestMapping#headers}. + */ + @AliasFor(annotation = RequestMapping.class) + String[] headers() default {}; + /** * Alias for {@link RequestMapping#consumes}. */ diff --git a/spring-web/src/main/java/org/springframework/web/bind/annotation/PutMapping.java b/spring-web/src/main/java/org/springframework/web/bind/annotation/PutMapping.java index dfd159810e79d4006d79cf5636dd61901a4763d5..eaec190a53b049b1783e32871b897eb58912ea6b 100644 --- a/spring-web/src/main/java/org/springframework/web/bind/annotation/PutMapping.java +++ b/spring-web/src/main/java/org/springframework/web/bind/annotation/PutMapping.java @@ -33,9 +33,8 @@ import static org.springframework.web.bind.annotation.RequestMethod.PUT; *

Specifically, {@code @PutMapping} is a composed annotation that * acts as a shortcut for {@code @RequestMapping(method = RequestMethod.PUT)}. * Furthermore, this annotation does not support the - * {@link RequestMapping#method method}, {@link RequestMapping#name name}, - * {@link RequestMapping#headers headers}, and {@link RequestMapping#produces - * produces} attributes of {@code @RequestMapping}. + * {@link RequestMapping#method method} and {@link RequestMapping#produces produces} + * attributes of {@code @RequestMapping}. * * @author Sam Brannen * @since 4.3 @@ -51,6 +50,12 @@ import static org.springframework.web.bind.annotation.RequestMethod.PUT; @RequestMapping(method = PUT) public @interface PutMapping { + /** + * Alias for {@link RequestMapping#name}. + */ + @AliasFor(annotation = RequestMapping.class) + String name() default ""; + /** * Alias for {@link RequestMapping#value}. */ @@ -69,6 +74,12 @@ public @interface PutMapping { @AliasFor(annotation = RequestMapping.class) String[] params() default {}; + /** + * Alias for {@link RequestMapping#headers}. + */ + @AliasFor(annotation = RequestMapping.class) + String[] headers() default {}; + /** * Alias for {@link RequestMapping#consumes}. */