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

Consistently declare ignoreUnresolvablePlaceholders as last argument

Browse Source
This commit is contained in:
Sam Brannen
2024-02-16 14:07:46 +01:00
parent 7c07c43201
commit ea4e7df9ca
10 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-core/src/test/java/org/springframework/util/PlaceholderParserTests.java
View File

@@ -47,7 +47,7 @@ class PlaceholderParserTests {
@Nested // Tests with only the basic placeholder feature enabled
class OnlyPlaceholderTests {
private final PlaceholderParser parser = new PlaceholderParser("${", "}", true, null, null);
private final PlaceholderParser parser = new PlaceholderParser("${", "}", null, null, true);
@ParameterizedTest(name = "{0} -> {1}")
@MethodSource("placeholders")
@@ -169,7 +169,7 @@ class PlaceholderParserTests {
@Nested // Tests with the use of a separator
class DefaultValueTests {
private final PlaceholderParser parser = new PlaceholderParser("${", "}", true, ":", null);
private final PlaceholderParser parser = new PlaceholderParser("${", "}", ":", null, true);
@ParameterizedTest(name = "{0} -> {1}")
@MethodSource("placeholders")
@@ -247,7 +247,7 @@ class PlaceholderParserTests {
@Nested // Tests with the use of the escape character
class EscapedTests {
private final PlaceholderParser parser = new PlaceholderParser("${", "}", true, ":", '\\');
private final PlaceholderParser parser = new PlaceholderParser("${", "}", ":", '\\', true);
@ParameterizedTest(name = "{0} -> {1}")
@MethodSource("escapedPlaceholders")
@@ -301,7 +301,7 @@ class PlaceholderParserTests {
@Nested
class ExceptionTests {
private final PlaceholderParser parser = new PlaceholderParser("${", "}", false, ":", null);
private final PlaceholderParser parser = new PlaceholderParser("${", "}", ":", null, false);
@Test
void textWithCircularReference() {

4
spring-core/src/test/java/org/springframework/util/PropertyPlaceholderHelperTests.java
View File

@@ -115,7 +115,7 @@ class PropertyPlaceholderHelperTests {
Properties props = new Properties();
props.setProperty("foo", "bar");
PropertyPlaceholderHelper helper = new PropertyPlaceholderHelper("${", "}", null, false, null);
PropertyPlaceholderHelper helper = new PropertyPlaceholderHelper("${", "}", null, null, false);
assertThatExceptionOfType(PlaceholderResolutionException.class).isThrownBy(() ->
helper.replacePlaceholders(text, props));
}
@@ -123,7 +123,7 @@ class PropertyPlaceholderHelperTests {
@Nested
class DefaultValueTests {
private final PropertyPlaceholderHelper helper = new PropertyPlaceholderHelper("${", "}", ":", true, null);
private final PropertyPlaceholderHelper helper = new PropertyPlaceholderHelper("${", "}", ":", null, true);
@ParameterizedTest(name = "{0} -> {1}")
@MethodSource("defaultValues")