Commit 0b9667c2 authored by Phillip Webb's avatar Phillip Webb

Drop setResolvePlaceholders()

Remove setResolvePlaceholders() from PropertySourcesPropertyValues
and instead rely only on the constructor.

See gh-6964
parent 7896ec5a
...@@ -56,7 +56,7 @@ public class PropertySourcesPropertyValues implements PropertyValues { ...@@ -56,7 +56,7 @@ public class PropertySourcesPropertyValues implements PropertyValues {
private final ConcurrentHashMap<String, PropertySource<?>> collectionOwners = new ConcurrentHashMap<String, PropertySource<?>>(); private final ConcurrentHashMap<String, PropertySource<?>> collectionOwners = new ConcurrentHashMap<String, PropertySource<?>>();
private boolean resolvePlaceholders = true; private final boolean resolvePlaceholders;
/** /**
* Create a new PropertyValues from the given PropertySources. * Create a new PropertyValues from the given PropertySources.
...@@ -106,15 +106,6 @@ public class PropertySourcesPropertyValues implements PropertyValues { ...@@ -106,15 +106,6 @@ public class PropertySourcesPropertyValues implements PropertyValues {
} }
} }
/**
* Flag to indicate that placeholders should be replaced during binding. Default is
* true.
* @param resolvePlaceholders flag value
*/
public void setResolvePlaceholders(boolean resolvePlaceholders) {
this.resolvePlaceholders = resolvePlaceholders;
}
private void processPropertySource(PropertySource<?> source, private void processPropertySource(PropertySource<?> source,
PropertySourcesPropertyResolver resolver) { PropertySourcesPropertyResolver resolver) {
if (source instanceof CompositePropertySource) { if (source instanceof CompositePropertySource) {
......
...@@ -34,7 +34,6 @@ public class ConnectorStartFailedException extends EmbeddedServletContainerExcep ...@@ -34,7 +34,6 @@ public class ConnectorStartFailedException extends EmbeddedServletContainerExcep
/** /**
* Creates a new {@code ConnectorStartFailedException} for a connector that's * Creates a new {@code ConnectorStartFailedException} for a connector that's
* configured to listen on the given {@code port}. * configured to listen on the given {@code port}.
*
* @param port the port * @param port the port
*/ */
public ConnectorStartFailedException(int port) { public ConnectorStartFailedException(int port) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment