See gh-18192
This commit is contained in:
Johnny Lim
2019-09-10 22:29:34 +09:00
committed by Stephane Nicoll
parent 99960b0c26
commit 5b41c3b608
15 changed files with 24 additions and 22 deletions

View File

@@ -130,7 +130,7 @@ public class Binder {
* @param propertyEditorInitializer initializer used to configure the property editors
* that can convert values (or {@code null} if no initialization is required). Often
* used to call {@link ConfigurableListableBeanFactory#copyRegisteredEditorsTo}.
* @param defaultBindHandler the default bind handler to use if non is specified when
* @param defaultBindHandler the default bind handler to use if none is specified when
* binding
* @since 2.2.0
*/
@@ -469,7 +469,7 @@ public class Binder {
* Create a new {@link Binder} instance from the specified environment.
* @param environment the environment source (must have attached
* {@link ConfigurationPropertySources})
* @param defaultBindHandler the default bind handler to use if non is specified when
* @param defaultBindHandler the default bind handler to use if none is specified when
* binding
* @return a {@link Binder} instance
* @since 2.2.0

View File

@@ -211,7 +211,7 @@ class BinderTests {
}
@Test
void bindWhenHasCustomDefultHandlerShouldTriggerOnSuccess() {
void bindWhenHasCustomDefaultHandlerShouldTriggerOnSuccess() {
this.sources.add(new MockConfigurationPropertySource("foo.value", "bar", "line1"));
BindHandler handler = mock(BindHandler.class, Answers.CALLS_REAL_METHODS);
Binder binder = new Binder(this.sources, null, null, null, handler);

View File

@@ -170,8 +170,8 @@ class SpringApplicationJsonEnvironmentPostProcessorTests {
assertThat(this.environment.getPropertySources()).containsSequence(custom, json, servlet, jndi);
}
private void testServletPropertySource(String servletContextPropertySourceName) {
this.environment.getPropertySources().addFirst(getPropertySource(servletContextPropertySourceName, "servlet"));
private void testServletPropertySource(String servletPropertySourceName) {
this.environment.getPropertySources().addFirst(getPropertySource(servletPropertySourceName, "servlet"));
TestPropertySourceUtils.addInlinedPropertiesToEnvironment(this.environment,
"SPRING_APPLICATION_JSON={\"foo\":\"bar\"}");
this.processor.postProcessEnvironment(this.environment, null);