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

Fix parameter replacement when message matches its code

Browse Source 
This commit addresses an issue where placeholders like {foo}
remain as {foo} if the message is the same as its code.

See gh-45212

Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
This commit is contained in:
Dmytro Nosan
2025-04-16 16:02:28 +03:00
committed by Andy Wilkinson
parent 7f0201361e
commit 83901a22b6
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/validation/MessageSourceMessageInterpolator.java
View File

@@ -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.
@@ -34,6 +34,8 @@ import org.springframework.context.i18n.LocaleContextHolder;
*/
class MessageSourceMessageInterpolator implements MessageInterpolator {
private static final String DEFAULT_MESSAGE = MessageSourceMessageInterpolator.class.getName();
private static final char PREFIX = '{';
private static final char SUFFIX = '}';
@@ -115,13 +117,11 @@ class MessageSourceMessageInterpolator implements MessageInterpolator {
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
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/validation/MessageSourceMessageInterpolatorTests.java
View File

@@ -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.
@@ -62,8 +62,8 @@ class MessageSourceMessageInterpolatorTests {
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