From 53e5d67cdeb628d82b297173bc17b08860174540 Mon Sep 17 00:00:00 2001 From: Johnny Lim Date: Fri, 5 May 2017 03:00:40 +0900 Subject: [PATCH] Polish Closes gh-9103 --- .../src/main/asciidoc/spring-boot-features.adoc | 2 +- .../boot/test/autoconfigure/data/ldap/ExampleEntry.java | 2 +- .../org/springframework/boot/loader/jar/HandlerTests.java | 2 +- .../boot/context/properties/bind/BindHandler.java | 2 +- .../boot/context/properties/bind/Bindable.java | 4 ++-- .../properties/source/ConfigurationPropertyName.java | 2 +- .../boot/web/reactive/result/view/MustacheView.java | 4 ++-- .../boot/context/properties/bind/ArrayBinderTests.java | 2 +- .../boot/context/properties/bind/BindableTests.java | 6 +++--- .../boot/context/properties/bind/JavaBeanBinderTests.java | 2 +- .../handler/IgnoreNestedPropertiesBindHandlerTests.java | 4 ++-- .../AliasedIterableConfigurationPropertySourceTests.java | 2 +- .../source/ConfigurationPropertyNameAliasesTests.java | 2 +- .../source/ConfigurationPropertySourcesTests.java | 2 +- .../properties/source/ConfigurationPropertyTests.java | 2 +- 15 files changed, 20 insertions(+), 20 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 0b2e81ad0ac..60ad2d365d6 100644 --- a/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc +++ b/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc @@ -3262,7 +3262,7 @@ http://projects.spring.io/spring-data[projects.spring.io/spring-data]. === Redis http://redis.io/[Redis] is a cache, message broker and richly-featured key-value store. Spring Boot offers basic auto-configuration for the -https://github.com/xetorthio/jedis/[Jedis] and and https://github.com/mp911de/lettuce/[Lettuce] +https://github.com/xetorthio/jedis/[Jedis] and https://github.com/mp911de/lettuce/[Lettuce] client library and abstractions on top of it provided by https://github.com/spring-projects/spring-data-redis[Spring Data Redis]. diff --git a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/ldap/ExampleEntry.java b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/ldap/ExampleEntry.java index c89fbe2e168..cff33ce8b81 100644 --- a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/ldap/ExampleEntry.java +++ b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/ldap/ExampleEntry.java @@ -22,7 +22,7 @@ import org.springframework.ldap.odm.annotations.Entry; import org.springframework.ldap.odm.annotations.Id; /** - * Example entrey used with {@link DataLdapTest} tests. + * Example entry used with {@link DataLdapTest} tests. * * @author Eddú Meléndez */ diff --git a/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/jar/HandlerTests.java b/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/jar/HandlerTests.java index 2fc34b35b10..501eb69ef1d 100644 --- a/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/jar/HandlerTests.java +++ b/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/jar/HandlerTests.java @@ -128,7 +128,7 @@ public class HandlerTests { } @Test - public void hashcodesAreEqualForUrlsThatReferenceSameFileViaNestedArchiveAndFromRootOfJar() + public void hashCodesAreEqualForUrlsThatReferenceSameFileViaNestedArchiveAndFromRootOfJar() throws MalformedURLException { assertThat(this.handler .hashCode(new URL("jar:file:/test.jar!/BOOT-INF/classes!/foo.txt"))) diff --git a/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/BindHandler.java b/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/BindHandler.java index 3efd7391b1e..49983f30e6d 100644 --- a/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/BindHandler.java +++ b/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/BindHandler.java @@ -63,7 +63,7 @@ public interface BindHandler { /** * Called when binding fails for any reason (including failures from - * {@link #onSuccess} calls). Implementations may chose to swallow exceptions and + * {@link #onSuccess} calls). Implementations may choose to swallow exceptions and * return an alternative result. * @param name the name of the element being bound * @param target the item being bound diff --git a/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/Bindable.java b/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/Bindable.java index 884b89db8d8..6bb4af413a8 100644 --- a/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/Bindable.java +++ b/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/Bindable.java @@ -32,7 +32,7 @@ import org.springframework.util.ObjectUtils; * Source that can be bound by a {@link Binder}. * * @param The source type - * @author Philip Webb + * @author Phillip Webb * @author Madhura Bhave * @since 2.0.0 * @see Bindable#of(Class) @@ -195,7 +195,7 @@ public final class Bindable { } /** - * Create a new {@link Bindable} {@link Map} of the specified kay and value type. + * Create a new {@link Bindable} {@link Map} of the specified key and value type. * @param the key type * @param the value type * @param keyType the map key type diff --git a/spring-boot/src/main/java/org/springframework/boot/context/properties/source/ConfigurationPropertyName.java b/spring-boot/src/main/java/org/springframework/boot/context/properties/source/ConfigurationPropertyName.java index 98c412984fe..60ffefb5446 100644 --- a/spring-boot/src/main/java/org/springframework/boot/context/properties/source/ConfigurationPropertyName.java +++ b/spring-boot/src/main/java/org/springframework/boot/context/properties/source/ConfigurationPropertyName.java @@ -443,7 +443,7 @@ public final class ConfigurationPropertyName }, /** - * The uniform configuration form (used for equals/hashcode; lower-case with only + * The uniform configuration form (used for equals/hashCode; lower-case with only * alphanumeric characters). *
    *
  • "{@code foo-bar}" = "{@code foobar}"
    • diff --git a/spring-boot/src/main/java/org/springframework/boot/web/reactive/result/view/MustacheView.java b/spring-boot/src/main/java/org/springframework/boot/web/reactive/result/view/MustacheView.java index 5abe18c8dea..6d66cb96b8c 100644 --- a/spring-boot/src/main/java/org/springframework/boot/web/reactive/result/view/MustacheView.java +++ b/spring-boot/src/main/java/org/springframework/boot/web/reactive/result/view/MustacheView.java @@ -91,8 +91,8 @@ public class MustacheView extends AbstractUrlBasedView { writer.flush(); } } - catch (Throwable exc) { - return Mono.error(exc); + catch (Throwable ex) { + return Mono.error(ex); } return exchange.getResponse().writeWith(Flux.just(dataBuffer)); } diff --git a/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/ArrayBinderTests.java b/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/ArrayBinderTests.java index ec6222257fe..960001c2df9 100644 --- a/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/ArrayBinderTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/ArrayBinderTests.java @@ -87,7 +87,7 @@ public class ArrayBinderTests { } @Test - public void bindToArrayShouldReturnPrimativeArray() throws Exception { + public void bindToArrayShouldReturnPrimitiveArray() throws Exception { MockConfigurationPropertySource source = new MockConfigurationPropertySource(); source.put("foo[0]", "1"); source.put("foo[1]", "2"); diff --git a/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/BindableTests.java b/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/BindableTests.java index 6ef83cd5c19..5d726ee9be5 100644 --- a/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/BindableTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/BindableTests.java @@ -113,7 +113,7 @@ public class BindableTests { } @Test - public void getBoxedTypeWhenPrimativeShouldReturnBoxedType() throws Exception { + public void getBoxedTypeWhenPrimitiveShouldReturnBoxedType() throws Exception { Bindable bindable = Bindable.of(int.class); assertThat(bindable.getType()).isEqualTo(ResolvableType.forClass(int.class)); assertThat(bindable.getBoxedType()) @@ -121,7 +121,7 @@ public class BindableTests { } @Test - public void getBoxedTypeWhenPrimativeArrayShouldReturnBoxedType() throws Exception { + public void getBoxedTypeWhenPrimitiveArrayShouldReturnBoxedType() throws Exception { Bindable bindable = Bindable.of(int[].class); assertThat(bindable.getType().getComponentType()) .isEqualTo(ResolvableType.forClass(int.class)); @@ -156,7 +156,7 @@ public class BindableTests { } @Test - public void equalsAndHashcode() throws Exception { + public void equalsAndHashCode() throws Exception { Annotation annotation = AnnotationUtils .synthesizeAnnotation(TestAnnotation.class); Bindable bindable1 = Bindable.of(String.class).withExistingValue("foo") diff --git a/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/JavaBeanBinderTests.java b/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/JavaBeanBinderTests.java index 01b0343c1d1..199bd279f24 100644 --- a/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/JavaBeanBinderTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/JavaBeanBinderTests.java @@ -439,7 +439,7 @@ public class JavaBeanBinderTests { } @Test - public void bindtoInstanceWithExistingValueShouldReturnUnbound() throws Exception { + public void bindToInstanceWithExistingValueShouldReturnUnbound() throws Exception { MockConfigurationPropertySource source = new MockConfigurationPropertySource(); this.sources.add(source); ExampleNestedBean existingValue = new ExampleNestedBean(); diff --git a/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/handler/IgnoreNestedPropertiesBindHandlerTests.java b/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/handler/IgnoreNestedPropertiesBindHandlerTests.java index f58d5c76fa0..1234dd1b7cf 100644 --- a/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/handler/IgnoreNestedPropertiesBindHandlerTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/handler/IgnoreNestedPropertiesBindHandlerTests.java @@ -51,14 +51,14 @@ public class IgnoreNestedPropertiesBindHandlerTests { } @Test - public void bindWhenNotIngoringNestedShouldBindAll() throws Exception { + public void bindWhenNotIgnoringNestedShouldBindAll() throws Exception { Example bound = this.binder.bind("example", Bindable.of(Example.class)).get(); assertThat(bound.getFoo()).isEqualTo("foovalue"); assertThat(bound.getNested().getBar()).isEqualTo("barvalue"); } @Test - public void bindWhenIngoringNestedShouldFilterNested() throws Exception { + public void bindWhenIgnoringNestedShouldFilterNested() throws Exception { Example bound = this.binder.bind("example", Bindable.of(Example.class), new IgnoreNestedPropertiesBindHandler()).get(); assertThat(bound.getFoo()).isEqualTo("foovalue"); diff --git a/spring-boot/src/test/java/org/springframework/boot/context/properties/source/AliasedIterableConfigurationPropertySourceTests.java b/spring-boot/src/test/java/org/springframework/boot/context/properties/source/AliasedIterableConfigurationPropertySourceTests.java index ad559564dbb..f3f3689416b 100644 --- a/spring-boot/src/test/java/org/springframework/boot/context/properties/source/AliasedIterableConfigurationPropertySourceTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/context/properties/source/AliasedIterableConfigurationPropertySourceTests.java @@ -30,7 +30,7 @@ public class AliasedIterableConfigurationPropertySourceTests extends AliasedConfigurationPropertySourceTests { @Test - public void streamShouldInclueAliases() throws Exception { + public void streamShouldIncludeAliases() throws Exception { MockConfigurationPropertySource source = new MockConfigurationPropertySource(); source.put("foo.bar", "bing"); source.put("foo.baz", "biff"); diff --git a/spring-boot/src/test/java/org/springframework/boot/context/properties/source/ConfigurationPropertyNameAliasesTests.java b/spring-boot/src/test/java/org/springframework/boot/context/properties/source/ConfigurationPropertyNameAliasesTests.java index 551e6eec388..f81cdd6b895 100644 --- a/spring-boot/src/test/java/org/springframework/boot/context/properties/source/ConfigurationPropertyNameAliasesTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/context/properties/source/ConfigurationPropertyNameAliasesTests.java @@ -69,7 +69,7 @@ public class ConfigurationPropertyNameAliasesTests { } @Test - public void addAlaisesFromNameShouldAddMapping() throws Exception { + public void addAliasesFromNameShouldAddMapping() throws Exception { ConfigurationPropertyNameAliases aliases = new ConfigurationPropertyNameAliases(); aliases.addAliases(ConfigurationPropertyName.of("foo"), ConfigurationPropertyName.of("bar"), ConfigurationPropertyName.of("baz")); diff --git a/spring-boot/src/test/java/org/springframework/boot/context/properties/source/ConfigurationPropertySourcesTests.java b/spring-boot/src/test/java/org/springframework/boot/context/properties/source/ConfigurationPropertySourcesTests.java index c8c3981ce8b..8e40299a2f9 100644 --- a/spring-boot/src/test/java/org/springframework/boot/context/properties/source/ConfigurationPropertySourcesTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/context/properties/source/ConfigurationPropertySourcesTests.java @@ -111,7 +111,7 @@ public class ConfigurationPropertySourcesTests { } @Test - public void attachShouldAddAdapterAtBegining() throws Exception { + public void attachShouldAddAdapterAtBeginning() throws Exception { MutablePropertySources sources = new MutablePropertySources(); sources.addLast(new SystemEnvironmentPropertySource("system", Collections.singletonMap("SERVER_PORT", "1234"))); diff --git a/spring-boot/src/test/java/org/springframework/boot/context/properties/source/ConfigurationPropertyTests.java b/spring-boot/src/test/java/org/springframework/boot/context/properties/source/ConfigurationPropertyTests.java index 5e84e3e1e37..443018f58df 100644 --- a/spring-boot/src/test/java/org/springframework/boot/context/properties/source/ConfigurationPropertyTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/context/properties/source/ConfigurationPropertyTests.java @@ -67,7 +67,7 @@ public class ConfigurationPropertyTests { } @Test - public void getPropertyOrginShouldReturnValuePropertyOrigin() throws Exception { + public void getPropertyOriginShouldReturnValuePropertyOrigin() throws Exception { Origin origin = mock(Origin.class); OriginProvider property = ConfigurationProperty.of(NAME, "foo", origin); assertThat(property.getOrigin()).isEqualTo(origin);