root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Deprecate setProperties on ConfigurationFactory 

Deprecate `PropertiesConfigurationFactory.setProperties()` since it was
only being used in tests.

Fixes gh-5930
This commit is contained in:
Phillip Webb 2016-05-13 19:00:34 -07:00
parent c15c146021
commit 66b69f4346
4 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot/src/main/java/org/springframework/boot/bind/PropertiesConfigurationFactory.java
View File

@ -35,6 +35,7 @@ import org.springframework.beans.factory.InitializingBean;
import org.springframework.context.MessageSource; import org.springframework.context.MessageSource;
import org.springframework.context.MessageSourceAware; import org.springframework.context.MessageSourceAware;
import org.springframework.core.convert.ConversionService; import org.springframework.core.convert.ConversionService;
import org.springframework.core.env.PropertiesPropertySource;
import org.springframework.core.env.PropertySources; import org.springframework.core.env.PropertySources;
import org.springframework.util.Assert; import org.springframework.util.Assert;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
@ -161,7 +162,10 @@ public class PropertiesConfigurationFactory<T>
/** /**
* Set the properties. * Set the properties.
* @param properties the properties * @param properties the properties
* @deprecated as of 1.4 in favor of {@link #setPropertySources(PropertySources)
* setPropertySources} that contains a {@link PropertiesPropertySource}.
*/ */
@Deprecated
public void setProperties(Properties properties) { public void setProperties(Properties properties) {
this.properties = properties; this.properties = properties;
} }

1
spring-boot/src/test/java/org/springframework/boot/bind/PropertiesConfigurationFactoryMapTests.java
View File

@ -95,6 +95,7 @@ public class PropertiesConfigurationFactoryMapTests {
return bindFoo(values); return bindFoo(values);
} }
@Deprecated
private Foo bindFoo(final String values) throws Exception { private Foo bindFoo(final String values) throws Exception {
this.factory.setProperties(PropertiesLoaderUtils this.factory.setProperties(PropertiesLoaderUtils
.loadProperties(new ByteArrayResource(values.getBytes()))); .loadProperties(new ByteArrayResource(values.getBytes())));

1
spring-boot/src/test/java/org/springframework/boot/bind/PropertiesConfigurationFactoryParameterizedTests.java
View File

@ -102,6 +102,7 @@ public class PropertiesConfigurationFactoryParameterizedTests {
return bindFoo(values); return bindFoo(values);
} }
@Deprecated
private Foo bindFoo(final String values) throws Exception { private Foo bindFoo(final String values) throws Exception {
Properties properties = PropertiesLoaderUtils Properties properties = PropertiesLoaderUtils
.loadProperties(new ByteArrayResource(values.getBytes())); .loadProperties(new ByteArrayResource(values.getBytes()));

1
spring-boot/src/test/java/org/springframework/boot/bind/PropertiesConfigurationFactoryTests.java
View File

@ -169,6 +169,7 @@ public class PropertiesConfigurationFactoryTests {
return bindFoo(values); return bindFoo(values);
} }
@Deprecated
private Foo bindFoo(final String values) throws Exception { private Foo bindFoo(final String values) throws Exception {
this.factory.setProperties(PropertiesLoaderUtils this.factory.setProperties(PropertiesLoaderUtils
.loadProperties(new ByteArrayResource(values.getBytes()))); .loadProperties(new ByteArrayResource(values.getBytes())));