Skip to content

Commit 8b1b9ef

Browse files
committed
Stop redefining placeholder syntax constants in PlaceholderConfigurerSupport
1 parent efdaae0 commit 8b1b9ef

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import org.springframework.beans.factory.BeanNameAware;
2323
import org.springframework.lang.Nullable;
2424
import org.springframework.util.StringValueResolver;
25+
import org.springframework.util.SystemPropertyUtils;
2526

2627
/**
2728
* Abstract base class for property resource configurers that resolve placeholders
@@ -92,16 +93,16 @@ public abstract class PlaceholderConfigurerSupport extends PropertyResourceConfi
9293
implements BeanNameAware, BeanFactoryAware {
9394

9495
/** Default placeholder prefix: {@value}. */
95-
public static final String DEFAULT_PLACEHOLDER_PREFIX = "${";
96+
public static final String DEFAULT_PLACEHOLDER_PREFIX = SystemPropertyUtils.PLACEHOLDER_PREFIX;
9697

9798
/** Default placeholder suffix: {@value}. */
98-
public static final String DEFAULT_PLACEHOLDER_SUFFIX = "}";
99+
public static final String DEFAULT_PLACEHOLDER_SUFFIX = SystemPropertyUtils.PLACEHOLDER_SUFFIX;
99100

100101
/** Default value separator: {@value}. */
101-
public static final String DEFAULT_VALUE_SEPARATOR = ":";
102+
public static final String DEFAULT_VALUE_SEPARATOR = SystemPropertyUtils.VALUE_SEPARATOR;
102103

103104
/** Default escape character: {@code '\'}. */
104-
public static final Character DEFAULT_ESCAPE_CHARACTER = '\\';
105+
public static final Character DEFAULT_ESCAPE_CHARACTER = SystemPropertyUtils.ESCAPE_CHARACTER;
105106

106107

107108
/** Defaults to {@value #DEFAULT_PLACEHOLDER_PREFIX}. */

0 commit comments

Comments
 (0)