Skip to content

MessageSourceMessageInterpolator does not replace a parameter when the message matches its code #45212

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

MessageSourceMessageInterpolator does not replace a parameter when the message matches its code #45212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions ...t/src/main/java/org/springframework/boot/validation/MessageSourceMessageInterpolator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2012-2023 the original author or authors.
* Copyright 2012-2025 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.
Expand Down Expand Up @@ -34,6 +34,8 @@
*/
class MessageSourceMessageInterpolator implements MessageInterpolator {

private static final String DEFAULT_MESSAGE = MessageSourceMessageInterpolator.class.getName();

private static final char PREFIX = '{';

private static final char SUFFIX = '}';
Expand Down Expand Up @@ -115,13 +117,11 @@ else if (buf.charAt(i) == SUFFIX) {

private String replaceParameter(String parameter, Locale locale, Set<String> visitedParameters) {
parameter = replaceParameters(parameter, locale, visitedParameters);
String value = this.messageSource.getMessage(parameter, null, null, locale);
return (value != null && !isUsingCodeAsDefaultMessage(value, parameter))
? replaceParameters(value, locale, visitedParameters) : null;
}

private boolean isUsingCodeAsDefaultMessage(String value, String parameter) {
return value.equals(parameter);
String value = this.messageSource.getMessage(parameter, null, DEFAULT_MESSAGE, locale);
if (value == null || value.equals(DEFAULT_MESSAGE)) {
return null;
}
return replaceParameters(value, locale, visitedParameters);
}

}
6 changes: 3 additions & 3 deletions .../test/java/org/springframework/boot/validation/MessageSourceMessageInterpolatorTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2012-2023 the original author or authors.
* Copyright 2012-2025 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.
Expand Down Expand Up @@ -62,8 +62,8 @@ void interpolateWhenParametersAreUnknownShouldLeaveThemUnchanged() {
void interpolateWhenParametersAreUnknownUsingCodeAsDefaultShouldLeaveThemUnchanged() {
this.messageSource.setUseCodeAsDefaultMessage(true);
this.messageSource.addMessage("top", Locale.getDefault(), "{child}+{child}");
assertThat(this.interpolator.interpolate("{foo}{top}{bar}", this.context))
.isEqualTo("{foo}{child}+{child}{bar}");
this.messageSource.addMessage("foo", Locale.getDefault(), "foo");
assertThat(this.interpolator.interpolate("{foo}{top}{bar}", this.context)).isEqualTo("foo{child}+{child}{bar}");
}

@Test
Expand Down