From 524edaea5171b7f0ba5cf1322560c2d5a310ad36 Mon Sep 17 00:00:00 2001 From: Johnny Lim Date: Tue, 23 Aug 2016 22:08:22 +0900 Subject: [PATCH] Polish Closes gh-6728 --- .../boot/actuate/hypermedia/LimitedEnvironmentEndpoint.java | 1 - .../boot/actuate/endpoint/DataSourcePublicMetrics.java | 2 +- .../jdbc/JdbcTemplateAutoConfigurationTests.java | 2 +- spring-boot-docs/src/main/asciidoc/howto.adoc | 4 ++-- spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc | 2 +- .../test/autoconfigure/properties/SkipPropertyMapping.java | 2 +- .../properties/AnnotationsPropertySourceTests.java | 4 +--- .../analyzer/BeanNotOfRequiredTypeFailureAnalyzer.java | 2 +- 8 files changed, 8 insertions(+), 11 deletions(-) diff --git a/spring-boot-actuator-docs/src/restdoc/java/org/springframework/boot/actuate/hypermedia/LimitedEnvironmentEndpoint.java b/spring-boot-actuator-docs/src/restdoc/java/org/springframework/boot/actuate/hypermedia/LimitedEnvironmentEndpoint.java index b6730e9adf..443c06cd0f 100644 --- a/spring-boot-actuator-docs/src/restdoc/java/org/springframework/boot/actuate/hypermedia/LimitedEnvironmentEndpoint.java +++ b/spring-boot-actuator-docs/src/restdoc/java/org/springframework/boot/actuate/hypermedia/LimitedEnvironmentEndpoint.java @@ -73,7 +73,6 @@ public class LimitedEnvironmentEndpoint extends EnvironmentEndpoint { @Override public Object sanitize(String name, Object object) { - System.out.println(name); if (name.equals("gopherProxySet")) { return object; } diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/DataSourcePublicMetrics.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/DataSourcePublicMetrics.java index a038ed3b05..26300687de 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/DataSourcePublicMetrics.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/DataSourcePublicMetrics.java @@ -112,7 +112,7 @@ public class DataSourcePublicMetrics implements PublicMetrics { /** * Attempt to locate the primary {@link DataSource} (i.e. either the only data source - * available or the one amongst the candidates marked as {@link Primary}. Return + * available or the one amongst the candidates marked as {@link Primary}). Return * {@code null} if there no primary data source could be found. * @return the primary datasource */ diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/JdbcTemplateAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/JdbcTemplateAutoConfigurationTests.java index eacc3da1fa..58a6caf36c 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/JdbcTemplateAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/JdbcTemplateAutoConfigurationTests.java @@ -38,7 +38,7 @@ import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate; import static org.assertj.core.api.Assertions.assertThat; /** - * Tests for {@link DataSourceAutoConfiguration}. + * Tests for {@link JdbcTemplateAutoConfiguration}. * * @author Dave Syer * @author Stephane Nicoll diff --git a/spring-boot-docs/src/main/asciidoc/howto.adoc b/spring-boot-docs/src/main/asciidoc/howto.adoc index c24965ec21..a08c204754 100644 --- a/spring-boot-docs/src/main/asciidoc/howto.adoc +++ b/spring-boot-docs/src/main/asciidoc/howto.adoc @@ -1243,7 +1243,7 @@ modules when you add new features to your application. If you want to replace the default `ObjectMapper` completely, either define a `@Bean` of that type and mark it as `@Primary`, or, if you prefer the builder-based -approachd, define a `Jackson2ObjectMapperBuilder` `@Bean`. Note that in either case this +approach, define a `Jackson2ObjectMapperBuilder` `@Bean`. Note that in either case this will disable all auto-configuration of the `ObjectMapper. If you provide any `@Beans` of type `MappingJackson2HttpMessageConverter` then @@ -2766,7 +2766,7 @@ Check {spring-boot-maven-plugin-site}/examples/run-debug.html[this example] for [[howto-remote-debug-gradle-run]] === Remote debug a Spring Boot application started with Gradle To attach a remote debugger to a Spring Boot application started with Gradle you can use -the `jvmArgs` property of bootRun task OR `--debug-jvm` command line option. +the `jvmArgs` property of `bootRun` task or `--debug-jvm` command line option. `build.gradle`: 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 f969deda27..6ecb8b23dd 100644 --- a/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc +++ b/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc @@ -5507,7 +5507,7 @@ public class MyTest { assertThat(headers.getLocation().toString(), containsString("myotherhost")); } - @TestConfig + @TestConfiguration static class Config { @Bean diff --git a/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/properties/SkipPropertyMapping.java b/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/properties/SkipPropertyMapping.java index 77651bef2b..73d91bc0b5 100644 --- a/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/properties/SkipPropertyMapping.java +++ b/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/properties/SkipPropertyMapping.java @@ -25,7 +25,7 @@ package org.springframework.boot.test.autoconfigure.properties; public enum SkipPropertyMapping { /** - * Skip the mapping the property. + * Skip mapping the property. */ YES, diff --git a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/properties/AnnotationsPropertySourceTests.java b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/properties/AnnotationsPropertySourceTests.java index 5aa7dff7a0..5d5778bd1c 100644 --- a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/properties/AnnotationsPropertySourceTests.java +++ b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/properties/AnnotationsPropertySourceTests.java @@ -362,9 +362,7 @@ public class AnnotationsPropertySourceTests { static @interface AttributeWithAliasAnnotation { @AliasFor(annotation = AliasedAttributeAnnotation.class, attribute = "value") - String value() - - default "foo"; + String value() default "foo"; String someOtherAttribute() default "shouldNotBeMapped"; diff --git a/spring-boot/src/main/java/org/springframework/boot/diagnostics/analyzer/BeanNotOfRequiredTypeFailureAnalyzer.java b/spring-boot/src/main/java/org/springframework/boot/diagnostics/analyzer/BeanNotOfRequiredTypeFailureAnalyzer.java index daae801c6d..98eeeee745 100644 --- a/spring-boot/src/main/java/org/springframework/boot/diagnostics/analyzer/BeanNotOfRequiredTypeFailureAnalyzer.java +++ b/spring-boot/src/main/java/org/springframework/boot/diagnostics/analyzer/BeanNotOfRequiredTypeFailureAnalyzer.java @@ -26,7 +26,7 @@ import org.springframework.boot.diagnostics.FailureAnalysis; /** * An {@link AbstractFailureAnalyzer} that performs analysis of failures caused by a - * {@link BeanNotOfRequiredTypeFailureAnalyzer}. + * {@link BeanNotOfRequiredTypeException}. * * @author Andy Wilkinson */