From f915ae197a97ed882d5bdf9d00b43a1c27926635 Mon Sep 17 00:00:00 2001 From: Johnny Lim Date: Wed, 4 Jan 2017 13:43:01 +0900 Subject: [PATCH] Polish --- .../boot/actuate/endpoint/LiquibaseEndpoint.java | 6 +++--- .../EnableAutoConfigurationImportSelector.java | 2 +- .../boot/autoconfigure/cache/CacheManagerCustomizers.java | 2 +- .../boot/autoconfigure/orm/jpa/DatabaseLookup.java | 2 +- .../transaction/TransactionManagerCustomizers.java | 2 +- .../ClassLoaderFilesResourcePatternResolverTests.java | 2 +- spring-boot-docs/src/main/asciidoc/howto.adoc | 2 +- .../WebMvcTestWebDriverCustomScopeIntegrationTests.java | 2 +- .../boot/test/web/client/TestRestTemplateTests.java | 2 +- .../org/springframework/boot/loader/tools/Repackager.java | 4 ++-- .../boot/yaml/SpringProfileDocumentMatcher.java | 2 +- 11 files changed, 14 insertions(+), 14 deletions(-) diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/LiquibaseEndpoint.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/LiquibaseEndpoint.java index a575daaa91..99c4f64251 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/LiquibaseEndpoint.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/LiquibaseEndpoint.java @@ -48,10 +48,10 @@ public class LiquibaseEndpoint extends AbstractEndpoint> { this(Collections.singletonMap("default", liquibase)); } - public LiquibaseEndpoint(Map liquibase) { + public LiquibaseEndpoint(Map liquibases) { super("liquibase"); - Assert.notEmpty(liquibase, "Liquibase must be specified"); - this.liquibases = liquibase; + Assert.notEmpty(liquibases, "Liquibases must be specified"); + this.liquibases = liquibases; } @Override diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/EnableAutoConfigurationImportSelector.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/EnableAutoConfigurationImportSelector.java index e818bdc9d2..ea167be8c6 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/EnableAutoConfigurationImportSelector.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/EnableAutoConfigurationImportSelector.java @@ -175,7 +175,7 @@ public class EnableAutoConfigurationImportSelector /** * Handle any invalid excludes that have been specified. - * @param invalidExcludes the list of invalid excludes (will always have at least on + * @param invalidExcludes the list of invalid excludes (will always have at least one * element) */ protected void handleInvalidExcludes(List invalidExcludes) { diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CacheManagerCustomizers.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CacheManagerCustomizers.java index 702a6a6f9b..57f66c7ee3 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CacheManagerCustomizers.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CacheManagerCustomizers.java @@ -73,7 +73,7 @@ public class CacheManagerCustomizers { } catch (ClassCastException ex) { // Possibly a lambda-defined customizer which we could not resolve the generic - // event type for + // cache manager type for if (logger.isDebugEnabled()) { logger.debug( "Non-matching cache manager type for customizer: " + customizer, diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/DatabaseLookup.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/DatabaseLookup.java index ef4ac3d0b9..390c4f04ab 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/DatabaseLookup.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/DatabaseLookup.java @@ -62,7 +62,7 @@ final class DatabaseLookup { /** * Return the most suitable {@link Database} for the given {@link DataSource}. * @param dataSource the source {@link DataSource} - * @return the most sutable {@link Database} + * @return the most suitable {@link Database} */ public static Database getDatabase(DataSource dataSource) { if (dataSource == null) { diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/TransactionManagerCustomizers.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/TransactionManagerCustomizers.java index b086ee60a9..9197627b99 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/TransactionManagerCustomizers.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/TransactionManagerCustomizers.java @@ -67,7 +67,7 @@ public class TransactionManagerCustomizers { } catch (ClassCastException ex) { // Possibly a lambda-defined customizer which we could not resolve the generic - // event type for + // transaction manager type for if (logger.isDebugEnabled()) { logger.debug("Non-matching transaction manager type for customizer: " + customizer, ex); diff --git a/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/ClassLoaderFilesResourcePatternResolverTests.java b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/ClassLoaderFilesResourcePatternResolverTests.java index c709ef822b..298079f485 100644 --- a/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/ClassLoaderFilesResourcePatternResolverTests.java +++ b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/ClassLoaderFilesResourcePatternResolverTests.java @@ -71,7 +71,7 @@ public class ClassLoaderFilesResourcePatternResolverTests { } @Test - public void getResourceWhenHasServeletContextShouldReturnServletResource() + public void getResourceWhenHasServletContextShouldReturnServletResource() throws Exception { GenericWebApplicationContext context = new GenericWebApplicationContext( new MockServletContext()); diff --git a/spring-boot-docs/src/main/asciidoc/howto.adoc b/spring-boot-docs/src/main/asciidoc/howto.adoc index a5ae46e926..5aa3c17c7c 100644 --- a/spring-boot-docs/src/main/asciidoc/howto.adoc +++ b/spring-boot-docs/src/main/asciidoc/howto.adoc @@ -2076,7 +2076,7 @@ add a special `{vendor}` placeholder to use vendor-specific scripts. Assume the ---- Rather than using `db/migration`, this configuration will set the folder to use according -to the type of the database (i.e. `db/migration/mysql` for MySql). The list of supported +to the type of the database (i.e. `db/migration/mysql` for MySQL). The list of supported database are available in {sc-spring-boot}/jdbc/DatabaseDriver.{sc-ext}[`DatabaseDriver`]. See also the Flyway class from flyway-core for details of available settings like schemas diff --git a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/WebMvcTestWebDriverCustomScopeIntegrationTests.java b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/WebMvcTestWebDriverCustomScopeIntegrationTests.java index 9bc91c3a1c..26221aba9f 100644 --- a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/WebMvcTestWebDriverCustomScopeIntegrationTests.java +++ b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/WebMvcTestWebDriverCustomScopeIntegrationTests.java @@ -57,7 +57,7 @@ public class WebMvcTestWebDriverCustomScopeIntegrationTests { } @Test - public void shouldBeADifferentWebClient() throws Exception { + public void shouldBeTheSameWebClient() throws Exception { assertThat(previousWebDriver).isNotNull().isSameAs(this.webDriver); } diff --git a/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/TestRestTemplateTests.java b/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/TestRestTemplateTests.java index 5b1549df13..75f25d289d 100644 --- a/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/TestRestTemplateTests.java +++ b/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/TestRestTemplateTests.java @@ -168,7 +168,7 @@ public class TestRestTemplateTests { @Test public void withBasicAuthReplacesBasicAuthInterceptorWhenAlreadyPresent() { TestRestTemplate original = new TestRestTemplate("foo", "bar") - .withBasicAuth("replace", "repalce"); + .withBasicAuth("replace", "replace"); TestRestTemplate basicAuth = original.withBasicAuth("user", "password"); assertThat(basicAuth.getRestTemplate().getMessageConverters()) .containsExactlyElementsOf( diff --git a/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Repackager.java b/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Repackager.java index 165a5bb0f8..acf24c6e83 100644 --- a/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Repackager.java +++ b/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Repackager.java @@ -126,8 +126,8 @@ public class Repackager { /** * Sets the layout factory for the jar. The factory can be used when no specific - * layout is specific. - * @param layoutFactory the layoutFactory to set + * layout is specified. + * @param layoutFactory the layout factory to set */ public void setLayoutFactory(LayoutFactory layoutFactory) { this.layoutFactory = layoutFactory; diff --git a/spring-boot/src/main/java/org/springframework/boot/yaml/SpringProfileDocumentMatcher.java b/spring-boot/src/main/java/org/springframework/boot/yaml/SpringProfileDocumentMatcher.java index 4d58a4a592..38d9551ef1 100644 --- a/spring-boot/src/main/java/org/springframework/boot/yaml/SpringProfileDocumentMatcher.java +++ b/spring-boot/src/main/java/org/springframework/boot/yaml/SpringProfileDocumentMatcher.java @@ -144,7 +144,7 @@ public class SpringProfileDocumentMatcher implements DocumentMatcher { } /** - * {@link ProfileMatcher} that matches when a value in {@code spring.profiles} is also + * {@link ProfilesMatcher} that matches when a value in {@code spring.profiles} is also * in {@code spring.profiles.active}. */ private static class ActiveProfilesMatcher extends ProfilesMatcher {