From f3db6b996d514b1b325b63e3f5b79b75e8142ef9 Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Tue, 8 Jun 2021 18:45:59 +0200 Subject: [PATCH] Polish contribution See gh-27031 --- .../web/bind/annotation/ResponseStatus.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/spring-web/src/main/java/org/springframework/web/bind/annotation/ResponseStatus.java b/spring-web/src/main/java/org/springframework/web/bind/annotation/ResponseStatus.java index 4505c5bf697..c1f241afcf3 100644 --- a/spring-web/src/main/java/org/springframework/web/bind/annotation/ResponseStatus.java +++ b/spring-web/src/main/java/org/springframework/web/bind/annotation/ResponseStatus.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -45,8 +45,9 @@ import org.springframework.http.HttpStatus; * a return type and avoid the use of {@code @ResponseStatus} altogether. * *

Note that a controller class may also be annotated with - * {@code @ResponseStatus} and is then inherited by all {@code @RequestMapping} - * and {@code @ExceptionHandler} methods. + * {@code @ResponseStatus} which is then inherited by all {@code @RequestMapping} + * and {@code @ExceptionHandler} methods in that class and its subclasses unless + * overridden by a local {@code @ResponseStatus} declaration on the method. * * @author Arjen Poutsma * @author Sam Brannen