From a77fee9f18e12b002cb633ed7d607c1e12d0e5c5 Mon Sep 17 00:00:00 2001 From: Hugo Flambo Date: Mon, 21 Apr 2014 16:47:45 +0200 Subject: [PATCH] Fix typo and use *PropertySource* instead *ProperySource* Fixes gh-705 --- .../main/asciidoc/spring-boot-features.adoc | 4 +-- .../config/ConfigFileApplicationListener.java | 2 +- .../main/resources/META-INF/spring.factories | 2 +- .../ConfigFileApplicationListenerTests.java | 26 +++++++++---------- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc b/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc index ada30fb82f..2fb3dc7486 100644 --- a/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc +++ b/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc @@ -199,7 +199,7 @@ sensible overriding of values, properties are considered in the the following or . Command line arguments. . Java System properties (`System.getProperties()`). . 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. . Application properties outside of your packaged jar (`application.properties` including YAML and profile variants). @@ -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 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 strings, e.g. diff --git a/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigFileApplicationListener.java b/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigFileApplicationListener.java index b032e60bfb..177c3b375d 100644 --- a/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigFileApplicationListener.java +++ b/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigFileApplicationListener.java @@ -218,7 +218,7 @@ public class ConfigFileApplicationListener implements /** * {@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 BeanFactoryPostProcessor, Ordered { diff --git a/spring-boot/src/main/resources/META-INF/spring.factories b/spring-boot/src/main/resources/META-INF/spring.factories index 88e62a7cb0..46229bdfb2 100644 --- a/spring-boot/src/main/resources/META-INF/spring.factories +++ b/spring-boot/src/main/resources/META-INF/spring.factories @@ -1,4 +1,4 @@ -# ProperySource Loaders +# PropertySource Loaders org.springframework.boot.env.PropertySourceLoader=\ org.springframework.boot.env.PropertiesPropertySourceLoader,\ org.springframework.boot.env.YamlPropertySourceLoader diff --git a/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigFileApplicationListenerTests.java b/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigFileApplicationListenerTests.java index fb74716914..358de5e987 100644 --- a/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigFileApplicationListenerTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigFileApplicationListenerTests.java @@ -388,10 +388,10 @@ public class ConfigFileApplicationListenerTests { this.initializer.onApplicationEvent(this.event); String property = this.environment.getProperty("my.property"); assertThat(property, equalTo("fromspecificlocation")); - assertThat(this.environment, containsProperySource("applicationConfig: " + assertThat(this.environment, containsPropertySource("applicationConfig: " + "[classpath:specificlocation.properties]")); // The default property source is still there - assertThat(this.environment, containsProperySource("applicationConfig: " + assertThat(this.environment, containsPropertySource("applicationConfig: " + "[classpath:/application.properties]")); assertThat(this.environment.getProperty("foo"), equalTo("bucket")); } @@ -402,7 +402,7 @@ public class ConfigFileApplicationListenerTests { EnvironmentTestUtils.addEnvironment(this.environment, "spring.config.location:" + location); this.initializer.onApplicationEvent(this.event); - assertThat(this.environment, containsProperySource("applicationConfig: [" + assertThat(this.environment, containsPropertySource("applicationConfig: [" + location + "]")); } @@ -412,7 +412,7 @@ public class ConfigFileApplicationListenerTests { EnvironmentTestUtils.addEnvironment(this.environment, "spring.config.location:" + location); this.initializer.onApplicationEvent(this.event); - assertThat(this.environment, containsProperySource("applicationConfig: [file:" + assertThat(this.environment, containsPropertySource("applicationConfig: [file:" + location + "]")); } @@ -423,7 +423,7 @@ public class ConfigFileApplicationListenerTests { ConfigurableApplicationContext context = application.run(); String property = context.getEnvironment().getProperty("my.property"); assertThat(property, equalTo("fromspecificlocation")); - assertThat(context.getEnvironment(), containsProperySource("class path resource " + assertThat(context.getEnvironment(), containsPropertySource("class path resource " + "[specificlocation.properties]")); context.close(); } @@ -439,7 +439,7 @@ public class ConfigFileApplicationListenerTests { ConfigurableApplicationContext context = application.run(); String property = context.getEnvironment().getProperty("my.property"); assertThat(property, equalTo("fromspecificlocation")); - assertThat(context.getEnvironment(), containsProperySource("class path resource " + assertThat(context.getEnvironment(), containsPropertySource("class path resource " + "[specificlocation.properties]")); context.close(); } @@ -452,7 +452,7 @@ public class ConfigFileApplicationListenerTests { ConfigurableApplicationContext context = application.run(); String property = context.getEnvironment().getProperty("my.property"); assertThat(property, equalTo("fromspecificlocation")); - assertThat(context.getEnvironment(), containsProperySource("foo")); + assertThat(context.getEnvironment(), containsPropertySource("foo")); context.close(); } @@ -465,9 +465,9 @@ public class ConfigFileApplicationListenerTests { .run("--spring.profiles.active=myprofile"); String property = context.getEnvironment().getProperty("my.property"); assertThat(property, equalTo("frompropertiesfile")); - assertThat(context.getEnvironment(), containsProperySource("class path resource " + assertThat(context.getEnvironment(), containsPropertySource("class path resource " + "[enableprofile.properties]")); - assertThat(context.getEnvironment(), not(containsProperySource("classpath:/" + assertThat(context.getEnvironment(), not(containsPropertySource("classpath:/" + "enableprofile-myprofile.properties"))); context.close(); } @@ -480,7 +480,7 @@ public class ConfigFileApplicationListenerTests { ConfigurableApplicationContext context = application.run(); String property = context.getEnvironment().getProperty("my.property"); assertThat(property, equalTo("fromapplicationproperties")); - assertThat(context.getEnvironment(), not(containsProperySource("classpath:" + assertThat(context.getEnvironment(), not(containsPropertySource("classpath:" + "/enableprofile-myprofile.properties"))); context.close(); } @@ -493,7 +493,7 @@ public class ConfigFileApplicationListenerTests { ConfigurableApplicationContext context = application.run(); String property = context.getEnvironment().getProperty("my.property"); assertThat(property, equalTo("frommorepropertiesfile")); - assertThat(context.getEnvironment(), containsProperySource("class path resource " + assertThat(context.getEnvironment(), containsPropertySource("class path resource " + "[specificlocation.properties]")); context.close(); } @@ -506,7 +506,7 @@ public class ConfigFileApplicationListenerTests { ConfigurableApplicationContext context = application.run(); String property = context.getEnvironment().getProperty("my.property"); assertThat(property, equalTo("frommorepropertiesfile")); - assertThat(context.getEnvironment(), containsProperySource("foo")); + assertThat(context.getEnvironment(), containsPropertySource("foo")); context.close(); } @@ -545,7 +545,7 @@ public class ConfigFileApplicationListenerTests { assertThat((Boolean) field.get(application), equalTo(false)); } - private static Matcher containsProperySource( + private static Matcher containsPropertySource( final String sourceName) { return new TypeSafeDiagnosingMatcher() { @Override