diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/PlaceholderConfigurerSupport.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/PlaceholderConfigurerSupport.java index fc29a9eda9..9a11f7af3f 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/config/PlaceholderConfigurerSupport.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/PlaceholderConfigurerSupport.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2018 the original author or authors. + * Copyright 2002-2021 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. @@ -36,15 +36,16 @@ import org.springframework.util.StringValueResolver; * Example XML bean definition: * *
- * <bean id="dataSource" class="org.springframework.jdbc.datasource.DriverManagerDataSource"/>
- * <property name="driverClassName" value="${driver}"/>
- * <property name="url" value="jdbc:${dbname}"/>
+ * <bean id="dataSource" class="org.springframework.jdbc.datasource.DriverManagerDataSource">
+ * <property name="driverClassName" value="${driver}" />
+ * <property name="url" value="jdbc:${dbname}" />
* </bean>
*
*
* Example properties file:
*
- * driver=com.mysql.jdbc.Driver + *+ * driver=com.mysql.jdbc.Driver * dbname=mysql:mydb* * Annotated bean definitions may take advantage of property replacement using @@ -56,7 +57,8 @@ import org.springframework.util.StringValueResolver; * in bean references. Furthermore, placeholder values can also cross-reference * other placeholders, like: * - *rootPath=myrootdir + *+ * rootPath=myrootdir * subPath=${rootPath}/subdir* * In contrast to {@link PropertyOverrideConfigurer}, subclasses of this type allow @@ -71,13 +73,13 @@ import org.springframework.util.StringValueResolver; * *Default property values can be defined globally for each configurer instance * via the {@link #setProperties properties} property, or on a property-by-property basis - * using the default value separator which is {@code ":"} by default and - * customizable via {@link #setValueSeparator(String)}. + * using the value separator which is {@code ":"} by default and customizable via + * {@link #setValueSeparator(String)}. * *
Example XML property with default value: * *
- ** * @author Chris Beams+ * <property name="url" value="jdbc:${dbname:defaultdb}" /> *