From 533c418ad496622ca32efa3460adebcf7a48faed Mon Sep 17 00:00:00 2001 From: Johnny Lim Date: Tue, 27 Jun 2017 14:18:11 +0900 Subject: [PATCH] Polish Closes gh-9610 --- .../boot/autoconfigure/batch/JpaBatchConfigurer.java | 2 +- .../boot/autoconfigure/condition/OnClassCondition.java | 2 +- .../src/main/asciidoc/spring-boot-features.adoc | 2 +- .../boot/admin/SpringApplicationAdminMXBean.java | 2 +- .../boot/context/properties/bind/MapBinder.java | 2 +- .../properties/source/ConfigurationPropertyName.java | 6 +++--- .../properties/source/ConfigurationPropertySources.java | 4 ++-- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/JpaBatchConfigurer.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/JpaBatchConfigurer.java index a75251d8ce..0d694466c4 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/JpaBatchConfigurer.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/JpaBatchConfigurer.java @@ -41,9 +41,9 @@ public class JpaBatchConfigurer extends BasicBatchConfigurer { * Create a new {@link BasicBatchConfigurer} instance. * @param properties the batch properties * @param dataSource the underlying data source - * @param entityManagerFactory the entity manager factory (or {@code null}) * @param transactionManagerCustomizers transaction manager customizers (or * {@code null}) + * @param entityManagerFactory the entity manager factory (or {@code null}) */ protected JpaBatchConfigurer(BatchProperties properties, DataSource dataSource, TransactionManagerCustomizers transactionManagerCustomizers, diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnClassCondition.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnClassCondition.java index d63a21856a..6a3a42e556 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnClassCondition.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnClassCondition.java @@ -306,7 +306,7 @@ class OnClassCondition extends SpringBootCondition this.autoConfigurationMetadata); } - private ConditionOutcome[] getOutcomes(final String[] autoConfigurationClasses, + private ConditionOutcome[] getOutcomes(String[] autoConfigurationClasses, int start, int end, AutoConfigurationMetadata autoConfigurationMetadata) { ConditionOutcome[] outcomes = new ConditionOutcome[end - start]; for (int i = start; i < end; i++) { 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 76b621ee5c..4506098ae8 100644 --- a/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc +++ b/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc @@ -5434,7 +5434,7 @@ configuration is usually found. If you want to customize the primary configuration, you can use a nested `@TestConfiguration` class. Unlike a nested `@Configuration` class which would be used -instead of a your application's primary configuration, a nested `@TestConfiguration` class +instead of your application's primary configuration, a nested `@TestConfiguration` class will be used in addition to your application's primary configuration. NOTE: Spring's test framework will cache application contexts between tests. Therefore, as diff --git a/spring-boot/src/main/java/org/springframework/boot/admin/SpringApplicationAdminMXBean.java b/spring-boot/src/main/java/org/springframework/boot/admin/SpringApplicationAdminMXBean.java index 7fc93489d0..628f7c2d8e 100644 --- a/spring-boot/src/main/java/org/springframework/boot/admin/SpringApplicationAdminMXBean.java +++ b/spring-boot/src/main/java/org/springframework/boot/admin/SpringApplicationAdminMXBean.java @@ -17,7 +17,7 @@ package org.springframework.boot.admin; /** - * A MBean contract to control and monitor a running {@code SpringApplication} via JMX. + * An MBean contract to control and monitor a running {@code SpringApplication} via JMX. * Intended for internal use only. * * @author Stephane Nicoll diff --git a/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/MapBinder.java b/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/MapBinder.java index cdb7074bf7..abb657a2e7 100644 --- a/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/MapBinder.java +++ b/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/MapBinder.java @@ -134,7 +134,7 @@ class MapBinder extends AggregateBinder> { int start = this.root.getNumberOfElements() + 1; int size = name.getNumberOfElements(); for (int i = start; i < size; i++) { - if (name.IsNumericIndex(i)) { + if (name.isNumericIndex(i)) { return name.chop(i); } } 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 4249eef0cd..89fee1f2b6 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 @@ -95,7 +95,7 @@ public final class ConfigurationPropertyName } /** - * Return if the an element in the name is indexed. + * Return if the element in the name is indexed. * @param elementIndex the index of the element * @return {@code true} if the element is indexed */ @@ -104,11 +104,11 @@ public final class ConfigurationPropertyName } /** - * Return if the an element in the name is indexed and numeric. + * Return if the element in the name is indexed and numeric. * @param elementIndex the index of the element * @return {@code true} if the element is indexed and numeric */ - public boolean IsNumericIndex(int elementIndex) { + public boolean isNumericIndex(int elementIndex) { return isIndexed(elementIndex) && isNumeric(getElement(elementIndex, Form.ORIGINAL)); } diff --git a/spring-boot/src/main/java/org/springframework/boot/context/properties/source/ConfigurationPropertySources.java b/spring-boot/src/main/java/org/springframework/boot/context/properties/source/ConfigurationPropertySources.java index 3c1f3e7f3e..d8112bcc71 100644 --- a/spring-boot/src/main/java/org/springframework/boot/context/properties/source/ConfigurationPropertySources.java +++ b/spring-boot/src/main/java/org/springframework/boot/context/properties/source/ConfigurationPropertySources.java @@ -109,7 +109,7 @@ public final class ConfigurationPropertySources { * {@link StubPropertySource stub property sources}. Updates to the underlying source * will be automatically tracked. * @param sources the Spring property sources to adapt - * @return an {@link Iterable} containing a single newly adapted + * @return an {@link Iterable} containing newly adapted * {@link SpringConfigurationPropertySource} instances */ public static Iterable from( @@ -124,7 +124,7 @@ public final class ConfigurationPropertySources { * This method will flatten any nested property sources and will filter all * {@link StubPropertySource stub property sources}. * @param sources the Spring property sources to adapt - * @return an {@link Iterable} containing a single newly adapted + * @return an {@link Iterable} containing newly adapted * {@link SpringConfigurationPropertySource} instances */ public static Iterable from(