Commit a77fee9f authored by Hugo Flambo's avatar Hugo Flambo Committed by Dave Syer

Fix typo and use *PropertySource* instead *ProperySource*

Fixes gh-705
parent f7c16764
...@@ -199,7 +199,7 @@ sensible overriding of values, properties are considered in the the following or ...@@ -199,7 +199,7 @@ sensible overriding of values, properties are considered in the the following or
. Command line arguments. . Command line arguments.
. Java System properties (`System.getProperties()`). . Java System properties (`System.getProperties()`).
. OS environment variables. . OS environment variables.
. A `RandomValueProperySource` that only has properties in `random.*`. . A `RandomValuePropertySource` that only has properties in `random.*`.
. `@PropertySource` annotations on your `@Configuration` classes. . `@PropertySource` annotations on your `@Configuration` classes.
. Application properties outside of your packaged jar (`application.properties` . Application properties outside of your packaged jar (`application.properties`
including YAML and profile variants). including YAML and profile variants).
...@@ -231,7 +231,7 @@ default `name`. When running in production, an `application.properties` can be p ...@@ -231,7 +231,7 @@ default `name`. When running in production, an `application.properties` can be p
outside of your jar that overrides `name`; and for one-off testing, you can launch with outside of your jar that overrides `name`; and for one-off testing, you can launch with
a specific command line switch (e.g. `java -jar app.jar --name="Spring"`). a specific command line switch (e.g. `java -jar app.jar --name="Spring"`).
The `RandomValueProperySource` is useful for injecting random values The `RandomValuePropertySource` is useful for injecting random values
(e.g. into secrets or test cases). It can produce integers, longs or (e.g. into secrets or test cases). It can produce integers, longs or
strings, e.g. strings, e.g.
......
...@@ -218,7 +218,7 @@ public class ConfigFileApplicationListener implements ...@@ -218,7 +218,7 @@ public class ConfigFileApplicationListener implements
/** /**
* {@link BeanFactoryPostProcessor} to re-order our property sources below any * {@link BeanFactoryPostProcessor} to re-order our property sources below any
* {@code @ProperySource} items added by the {@link ConfigurationClassPostProcessor}. * {@code @PropertySource} items added by the {@link ConfigurationClassPostProcessor}.
*/ */
private class PropertySourceOrderingPostProcessor implements private class PropertySourceOrderingPostProcessor implements
BeanFactoryPostProcessor, Ordered { BeanFactoryPostProcessor, Ordered {
......
# ProperySource Loaders # PropertySource Loaders
org.springframework.boot.env.PropertySourceLoader=\ org.springframework.boot.env.PropertySourceLoader=\
org.springframework.boot.env.PropertiesPropertySourceLoader,\ org.springframework.boot.env.PropertiesPropertySourceLoader,\
org.springframework.boot.env.YamlPropertySourceLoader org.springframework.boot.env.YamlPropertySourceLoader
......
...@@ -388,10 +388,10 @@ public class ConfigFileApplicationListenerTests { ...@@ -388,10 +388,10 @@ public class ConfigFileApplicationListenerTests {
this.initializer.onApplicationEvent(this.event); this.initializer.onApplicationEvent(this.event);
String property = this.environment.getProperty("my.property"); String property = this.environment.getProperty("my.property");
assertThat(property, equalTo("fromspecificlocation")); assertThat(property, equalTo("fromspecificlocation"));
assertThat(this.environment, containsProperySource("applicationConfig: " assertThat(this.environment, containsPropertySource("applicationConfig: "
+ "[classpath:specificlocation.properties]")); + "[classpath:specificlocation.properties]"));
// The default property source is still there // The default property source is still there
assertThat(this.environment, containsProperySource("applicationConfig: " assertThat(this.environment, containsPropertySource("applicationConfig: "
+ "[classpath:/application.properties]")); + "[classpath:/application.properties]"));
assertThat(this.environment.getProperty("foo"), equalTo("bucket")); assertThat(this.environment.getProperty("foo"), equalTo("bucket"));
} }
...@@ -402,7 +402,7 @@ public class ConfigFileApplicationListenerTests { ...@@ -402,7 +402,7 @@ public class ConfigFileApplicationListenerTests {
EnvironmentTestUtils.addEnvironment(this.environment, "spring.config.location:" EnvironmentTestUtils.addEnvironment(this.environment, "spring.config.location:"
+ location); + location);
this.initializer.onApplicationEvent(this.event); this.initializer.onApplicationEvent(this.event);
assertThat(this.environment, containsProperySource("applicationConfig: [" assertThat(this.environment, containsPropertySource("applicationConfig: ["
+ location + "]")); + location + "]"));
} }
...@@ -412,7 +412,7 @@ public class ConfigFileApplicationListenerTests { ...@@ -412,7 +412,7 @@ public class ConfigFileApplicationListenerTests {
EnvironmentTestUtils.addEnvironment(this.environment, "spring.config.location:" EnvironmentTestUtils.addEnvironment(this.environment, "spring.config.location:"
+ location); + location);
this.initializer.onApplicationEvent(this.event); this.initializer.onApplicationEvent(this.event);
assertThat(this.environment, containsProperySource("applicationConfig: [file:" assertThat(this.environment, containsPropertySource("applicationConfig: [file:"
+ location + "]")); + location + "]"));
} }
...@@ -423,7 +423,7 @@ public class ConfigFileApplicationListenerTests { ...@@ -423,7 +423,7 @@ public class ConfigFileApplicationListenerTests {
ConfigurableApplicationContext context = application.run(); ConfigurableApplicationContext context = application.run();
String property = context.getEnvironment().getProperty("my.property"); String property = context.getEnvironment().getProperty("my.property");
assertThat(property, equalTo("fromspecificlocation")); assertThat(property, equalTo("fromspecificlocation"));
assertThat(context.getEnvironment(), containsProperySource("class path resource " assertThat(context.getEnvironment(), containsPropertySource("class path resource "
+ "[specificlocation.properties]")); + "[specificlocation.properties]"));
context.close(); context.close();
} }
...@@ -439,7 +439,7 @@ public class ConfigFileApplicationListenerTests { ...@@ -439,7 +439,7 @@ public class ConfigFileApplicationListenerTests {
ConfigurableApplicationContext context = application.run(); ConfigurableApplicationContext context = application.run();
String property = context.getEnvironment().getProperty("my.property"); String property = context.getEnvironment().getProperty("my.property");
assertThat(property, equalTo("fromspecificlocation")); assertThat(property, equalTo("fromspecificlocation"));
assertThat(context.getEnvironment(), containsProperySource("class path resource " assertThat(context.getEnvironment(), containsPropertySource("class path resource "
+ "[specificlocation.properties]")); + "[specificlocation.properties]"));
context.close(); context.close();
} }
...@@ -452,7 +452,7 @@ public class ConfigFileApplicationListenerTests { ...@@ -452,7 +452,7 @@ public class ConfigFileApplicationListenerTests {
ConfigurableApplicationContext context = application.run(); ConfigurableApplicationContext context = application.run();
String property = context.getEnvironment().getProperty("my.property"); String property = context.getEnvironment().getProperty("my.property");
assertThat(property, equalTo("fromspecificlocation")); assertThat(property, equalTo("fromspecificlocation"));
assertThat(context.getEnvironment(), containsProperySource("foo")); assertThat(context.getEnvironment(), containsPropertySource("foo"));
context.close(); context.close();
} }
...@@ -465,9 +465,9 @@ public class ConfigFileApplicationListenerTests { ...@@ -465,9 +465,9 @@ public class ConfigFileApplicationListenerTests {
.run("--spring.profiles.active=myprofile"); .run("--spring.profiles.active=myprofile");
String property = context.getEnvironment().getProperty("my.property"); String property = context.getEnvironment().getProperty("my.property");
assertThat(property, equalTo("frompropertiesfile")); assertThat(property, equalTo("frompropertiesfile"));
assertThat(context.getEnvironment(), containsProperySource("class path resource " assertThat(context.getEnvironment(), containsPropertySource("class path resource "
+ "[enableprofile.properties]")); + "[enableprofile.properties]"));
assertThat(context.getEnvironment(), not(containsProperySource("classpath:/" assertThat(context.getEnvironment(), not(containsPropertySource("classpath:/"
+ "enableprofile-myprofile.properties"))); + "enableprofile-myprofile.properties")));
context.close(); context.close();
} }
...@@ -480,7 +480,7 @@ public class ConfigFileApplicationListenerTests { ...@@ -480,7 +480,7 @@ public class ConfigFileApplicationListenerTests {
ConfigurableApplicationContext context = application.run(); ConfigurableApplicationContext context = application.run();
String property = context.getEnvironment().getProperty("my.property"); String property = context.getEnvironment().getProperty("my.property");
assertThat(property, equalTo("fromapplicationproperties")); assertThat(property, equalTo("fromapplicationproperties"));
assertThat(context.getEnvironment(), not(containsProperySource("classpath:" assertThat(context.getEnvironment(), not(containsPropertySource("classpath:"
+ "/enableprofile-myprofile.properties"))); + "/enableprofile-myprofile.properties")));
context.close(); context.close();
} }
...@@ -493,7 +493,7 @@ public class ConfigFileApplicationListenerTests { ...@@ -493,7 +493,7 @@ public class ConfigFileApplicationListenerTests {
ConfigurableApplicationContext context = application.run(); ConfigurableApplicationContext context = application.run();
String property = context.getEnvironment().getProperty("my.property"); String property = context.getEnvironment().getProperty("my.property");
assertThat(property, equalTo("frommorepropertiesfile")); assertThat(property, equalTo("frommorepropertiesfile"));
assertThat(context.getEnvironment(), containsProperySource("class path resource " assertThat(context.getEnvironment(), containsPropertySource("class path resource "
+ "[specificlocation.properties]")); + "[specificlocation.properties]"));
context.close(); context.close();
} }
...@@ -506,7 +506,7 @@ public class ConfigFileApplicationListenerTests { ...@@ -506,7 +506,7 @@ public class ConfigFileApplicationListenerTests {
ConfigurableApplicationContext context = application.run(); ConfigurableApplicationContext context = application.run();
String property = context.getEnvironment().getProperty("my.property"); String property = context.getEnvironment().getProperty("my.property");
assertThat(property, equalTo("frommorepropertiesfile")); assertThat(property, equalTo("frommorepropertiesfile"));
assertThat(context.getEnvironment(), containsProperySource("foo")); assertThat(context.getEnvironment(), containsPropertySource("foo"));
context.close(); context.close();
} }
...@@ -545,7 +545,7 @@ public class ConfigFileApplicationListenerTests { ...@@ -545,7 +545,7 @@ public class ConfigFileApplicationListenerTests {
assertThat((Boolean) field.get(application), equalTo(false)); assertThat((Boolean) field.get(application), equalTo(false));
} }
private static Matcher<? super ConfigurableEnvironment> containsProperySource( private static Matcher<? super ConfigurableEnvironment> containsPropertySource(
final String sourceName) { final String sourceName) {
return new TypeSafeDiagnosingMatcher<ConfigurableEnvironment>() { return new TypeSafeDiagnosingMatcher<ConfigurableEnvironment>() {
@Override @Override
......
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