Consistently declare ignoreUnresolvablePlaceholders as last argument

Author: sbrannen

spring-beans/src/main/java/org/springframework/beans/factory/config/PropertyPlaceholderConfigurer.java

@@ -235,7 +235,7 @@ private class PlaceholderResolvingStringValueResolver implements StringValueReso
 		public PlaceholderResolvingStringValueResolver(Properties props) {
 			this.helper = new PropertyPlaceholderHelper(
 					placeholderPrefix, placeholderSuffix, valueSeparator,
-					ignoreUnresolvablePlaceholders, escapeCharacter);
+					escapeCharacter, ignoreUnresolvablePlaceholders);
 			this.resolver = new PropertyPlaceholderConfigurerResolver(props);
 		}
 

spring-core/src/main/java/org/springframework/core/env/AbstractPropertyResolver.java

@@ -248,7 +248,7 @@ protected String resolveNestedPlaceholders(String value) {
 
 	private PropertyPlaceholderHelper createPlaceholderHelper(boolean ignoreUnresolvablePlaceholders) {
 		return new PropertyPlaceholderHelper(this.placeholderPrefix, this.placeholderSuffix,
-				this.valueSeparator, ignoreUnresolvablePlaceholders, this.escapeCharacter);
+				this.valueSeparator, this.escapeCharacter, ignoreUnresolvablePlaceholders);
 	}
 
 	private String doResolvePlaceholders(String text, PropertyPlaceholderHelper helper) {

spring-core/src/main/java/org/springframework/util/PlaceholderParser.java

@@ -89,15 +89,15 @@ final class PlaceholderParser {
 	 * Create an instance using the specified input for the parser.
 	 * @param prefix the prefix that denotes the start of a placeholder
 	 * @param suffix the suffix that denotes the end of a placeholder
-	 * @param ignoreUnresolvablePlaceholders whether unresolvable placeholders
-	 * should be ignored ({@code true}) or cause an exception ({@code false})
 	 * @param separator the separating character between the placeholder
 	 * variable and the associated default value, if any
 	 * @param escape the character to use at the beginning of a placeholder
 	 * prefix or separator to escape it and render it as is
+	 * @param ignoreUnresolvablePlaceholders whether unresolvable placeholders
+	 * should be ignored ({@code true}) or cause an exception ({@code false})
 	 */
-	PlaceholderParser(String prefix, String suffix, boolean ignoreUnresolvablePlaceholders,
-			@Nullable String separator, @Nullable Character escape) {
+	PlaceholderParser(String prefix, String suffix, @Nullable String separator,
+			@Nullable Character escape, boolean ignoreUnresolvablePlaceholders) {
 		this.prefix = prefix;
 		this.suffix = suffix;
 		String simplePrefixForSuffix = wellKnownSimplePrefixes.get(this.suffix);

spring-core/src/main/java/org/springframework/util/PropertyPlaceholderHelper.java

@@ -46,7 +46,7 @@ public class PropertyPlaceholderHelper {
 	 * @param placeholderSuffix the suffix that denotes the end of a placeholder
 	 */
 	public PropertyPlaceholderHelper(String placeholderPrefix, String placeholderSuffix) {
-		this(placeholderPrefix, placeholderSuffix, null, true, null);
+		this(placeholderPrefix, placeholderSuffix, null, null, true);
 	}
 
 	/**
@@ -64,7 +64,7 @@ public PropertyPlaceholderHelper(String placeholderPrefix, String placeholderSuf
 	public PropertyPlaceholderHelper(String placeholderPrefix, String placeholderSuffix,
 			@Nullable String valueSeparator, boolean ignoreUnresolvablePlaceholders) {
 
-		this(placeholderPrefix, placeholderSuffix, valueSeparator, ignoreUnresolvablePlaceholders, null);
+		this(placeholderPrefix, placeholderSuffix, valueSeparator, null, ignoreUnresolvablePlaceholders);
 	}
 
 	/**
@@ -73,20 +73,20 @@ public PropertyPlaceholderHelper(String placeholderPrefix, String placeholderSuf
 	 * @param placeholderSuffix the suffix that denotes the end of a placeholder
 	 * @param valueSeparator the separating character between the placeholder variable
 	 * and the associated default value, if any
-	 * @param ignoreUnresolvablePlaceholders indicates whether unresolvable placeholders should
-	 * be ignored ({@code true}) or cause an exception ({@code false})
 	 * @param escapeCharacter the escape character to use to ignore placeholder prefix
 	 * or value separator, if any
+	 * @param ignoreUnresolvablePlaceholders indicates whether unresolvable placeholders should
+	 * be ignored ({@code true}) or cause an exception ({@code false})
 	 * @since 6.2
 	 */
 	public PropertyPlaceholderHelper(String placeholderPrefix, String placeholderSuffix,
-			@Nullable String valueSeparator, boolean ignoreUnresolvablePlaceholders,
-			@Nullable Character escapeCharacter) {
+			@Nullable String valueSeparator, @Nullable Character escapeCharacter,
+			boolean ignoreUnresolvablePlaceholders) {
 
 		Assert.notNull(placeholderPrefix, "'placeholderPrefix' must not be null");
 		Assert.notNull(placeholderSuffix, "'placeholderSuffix' must not be null");
 		this.parser = new PlaceholderParser(placeholderPrefix, placeholderSuffix,
-				ignoreUnresolvablePlaceholders, valueSeparator, escapeCharacter);
+				valueSeparator, escapeCharacter, ignoreUnresolvablePlaceholders);
 	}
 
 

spring-core/src/main/java/org/springframework/util/SystemPropertyUtils.java

@@ -50,11 +50,11 @@ public abstract class SystemPropertyUtils {
 
 	private static final PropertyPlaceholderHelper strictHelper =
 			new PropertyPlaceholderHelper(PLACEHOLDER_PREFIX, PLACEHOLDER_SUFFIX, VALUE_SEPARATOR,
-					false, ESCAPE_CHARACTER);
+					ESCAPE_CHARACTER, false);
 
 	private static final PropertyPlaceholderHelper nonStrictHelper =
 			new PropertyPlaceholderHelper(PLACEHOLDER_PREFIX, PLACEHOLDER_SUFFIX, VALUE_SEPARATOR,
-					true, ESCAPE_CHARACTER);
+					ESCAPE_CHARACTER, true);
 
 
 	/**

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

@@ -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 @@ void textWithInvalidPlaceholderIsMerged() {
 	@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 @@ void parseWithFallbackUsingPlaceholder() {
 	@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 @@ static Stream<Arguments> escapedSeparators() {
 	@Nested
 	class ExceptionTests {
 
-		private final PlaceholderParser parser = new PlaceholderParser("${", "}", false, ":", null);
+		private final PlaceholderParser parser = new PlaceholderParser("${", "}", ":", null, false);
 
 		@Test
 		void textWithCircularReference() {

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

@@ -115,15 +115,15 @@ void unresolvedPlaceholderAsError() {
 		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));
 	}
 
 	@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")

spring-messaging/src/main/java/org/springframework/messaging/simp/annotation/support/SendToMethodReturnValueHandler.java

@@ -68,7 +68,7 @@ public class SendToMethodReturnValueHandler implements HandlerMethodReturnValueH
 
 	private String defaultUserDestinationPrefix = "/queue";
 
-	private final PropertyPlaceholderHelper placeholderHelper = new PropertyPlaceholderHelper("{", "}", null, false, null);
+	private final PropertyPlaceholderHelper placeholderHelper = new PropertyPlaceholderHelper("{", "}", null, null, false);
 
 	@Nullable
 	private MessageHeaderInitializer headerInitializer;

spring-test/src/main/java/org/springframework/test/web/servlet/setup/StandaloneMockMvcBuilder.java

@@ -586,7 +586,7 @@ private static class StaticStringValueResolver implements StringValueResolver {
 		private final PlaceholderResolver resolver;
 
 		public StaticStringValueResolver(Map<String, String> values) {
-			this.helper = new PropertyPlaceholderHelper("${", "}", ":", false, null);
+			this.helper = new PropertyPlaceholderHelper("${", "}", ":", null, false);
 			this.resolver = values::get;
 		}
 

spring-web/src/main/java/org/springframework/web/util/ServletContextPropertyUtils.java

@@ -40,12 +40,12 @@ public abstract class ServletContextPropertyUtils {
 	private static final PropertyPlaceholderHelper strictHelper =
 			new PropertyPlaceholderHelper(SystemPropertyUtils.PLACEHOLDER_PREFIX,
 					SystemPropertyUtils.PLACEHOLDER_SUFFIX, SystemPropertyUtils.VALUE_SEPARATOR,
-					false, SystemPropertyUtils.ESCAPE_CHARACTER);
+					SystemPropertyUtils.ESCAPE_CHARACTER, false);
 
 	private static final PropertyPlaceholderHelper nonStrictHelper =
 			new PropertyPlaceholderHelper(SystemPropertyUtils.PLACEHOLDER_PREFIX,
 					SystemPropertyUtils.PLACEHOLDER_SUFFIX, SystemPropertyUtils.VALUE_SEPARATOR,
-					true, SystemPropertyUtils.ESCAPE_CHARACTER);
+					SystemPropertyUtils.ESCAPE_CHARACTER, true);
 
 
 	/**