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

Add MessageSource getters 

See gh-29574
This commit is contained in:
rstoyanchev 2022-11-28 10:59:29 +00:00
parent 8e9a553517
commit 6c8fb6c204
4 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
spring-web/src/main/java/org/springframework/web/ErrorResponse.java
View File

@ -268,6 +268,19 @@ public interface ErrorResponse {
*/ */
ErrorResponse build(); ErrorResponse build();
/**
* Build the {@code ErrorResponse} instance and also resolve the "detail"
* and "title" through the given {@link MessageSource}. Effectively a
* shortcut for calling {@link #build()} and then
* {@link ErrorResponse#updateAndGetBody(MessageSource, Locale)}.
* @since 6.0.3
*/
default ErrorResponse build(@Nullable MessageSource messageSource, Locale locale) {
ErrorResponse response = build();
response.updateAndGetBody(messageSource, locale);
return response;
}
} }
} }

9
spring-web/src/main/java/org/springframework/web/bind/MethodArgumentNotValidException.java
View File

@ -26,6 +26,7 @@ import org.springframework.core.MethodParameter;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.http.HttpStatusCode; import org.springframework.http.HttpStatusCode;
import org.springframework.http.ProblemDetail; import org.springframework.http.ProblemDetail;
import org.springframework.lang.Nullable;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
import org.springframework.validation.BindException; import org.springframework.validation.BindException;
import org.springframework.validation.BindingResult; import org.springframework.validation.BindingResult;
@ -126,12 +127,12 @@ public class MethodArgumentNotValidException extends BindException implements Er
* back on the error's default message. * back on the error's default message.
* @since 6.0 * @since 6.0
*/ */
@SuppressWarnings("ConstantConditions")
public static List<String> errorsToStringList( public static List<String> errorsToStringList(
List<? extends ObjectError> errors, MessageSource source, Locale locale) { List<? extends ObjectError> errors, @Nullable MessageSource source, Locale locale) {
return errorsToStringList(errors, error -> source.getMessage( return (source != null ?
error.getCode(), error.getArguments(), error.getDefaultMessage(), locale)); errorsToStringList(errors, error -> source.getMessage(error, locale)) :
errorsToStringList(errors));
} }
private static List<String> errorsToStringList( private static List<String> errorsToStringList(

5
spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/ResponseEntityExceptionHandler.java
View File

@ -75,6 +75,11 @@ public abstract class ResponseEntityExceptionHandler implements MessageSourceAwa
this.messageSource = messageSource; this.messageSource = messageSource;
} }
@Nullable
public MessageSource getMessageSource() {
return this.messageSource;
}
/** /**
* Handle all exceptions raised within Spring MVC handling of the request . * Handle all exceptions raised within Spring MVC handling of the request .

5
spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ResponseEntityExceptionHandler.java
View File

@ -96,6 +96,11 @@ public abstract class ResponseEntityExceptionHandler implements MessageSourceAwa
this.messageSource = messageSource; this.messageSource = messageSource;
} }
@Nullable
protected MessageSource getMessageSource() {
return this.messageSource;
}
/** /**
* Handle all exceptions raised within Spring MVC handling of the request . * Handle all exceptions raised within Spring MVC handling of the request .