Skip to content

Commit 0b9667c

Browse files
committed
Drop setResolvePlaceholders()
Remove setResolvePlaceholders() from PropertySourcesPropertyValues and instead rely only on the constructor. See gh-6964
1 parent 7896ec5 commit 0b9667c

File tree

2 files changed

+1
-11
lines changed

2 files changed

+1
-11
lines changed

spring-boot/src/main/java/org/springframework/boot/bind/PropertySourcesPropertyValues.java

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public class PropertySourcesPropertyValues implements PropertyValues {
5656

5757
private final ConcurrentHashMap<String, PropertySource<?>> collectionOwners = new ConcurrentHashMap<String, PropertySource<?>>();
5858

59-
private boolean resolvePlaceholders = true;
59+
private final boolean resolvePlaceholders;
6060

6161
/**
6262
* Create a new PropertyValues from the given PropertySources.
@@ -106,15 +106,6 @@ public PropertySourcesPropertyValues(PropertySources propertySources,
106106
}
107107
}
108108

109-
/**
110-
* Flag to indicate that placeholders should be replaced during binding. Default is
111-
* true.
112-
* @param resolvePlaceholders flag value
113-
*/
114-
public void setResolvePlaceholders(boolean resolvePlaceholders) {
115-
this.resolvePlaceholders = resolvePlaceholders;
116-
}
117-
118109
private void processPropertySource(PropertySource<?> source,
119110
PropertySourcesPropertyResolver resolver) {
120111
if (source instanceof CompositePropertySource) {

spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/ConnectorStartFailedException.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ public class ConnectorStartFailedException extends EmbeddedServletContainerExcep
3434
/**
3535
* Creates a new {@code ConnectorStartFailedException} for a connector that's
3636
* configured to listen on the given {@code port}.
37-
*
3837
* @param port the port
3938
*/
4039
public ConnectorStartFailedException(int port) {

0 commit comments

Comments
 (0)