From a6c83787ef1040c1e2393a00ebc075f9076b9d68 Mon Sep 17 00:00:00 2001 From: Johnny Lim Date: Thu, 3 Mar 2016 10:37:17 +0900 Subject: [PATCH] Polish Closes gh-5318 --- CONTRIBUTING.adoc | 2 +- .../boot/autoconfigure/web/ResourcePropertiesTests.java | 1 - .../src/main/asciidoc/spring-boot-features.adoc | 6 +++--- .../main/java/org/springframework/boot/ExitCodeEvent.java | 2 +- .../context/ContextIdApplicationContextInitializer.java | 2 +- .../NoUniqueBeanDefinitionExceptionFailureAnalyzer.java | 4 ++-- 6 files changed, 8 insertions(+), 9 deletions(-) diff --git a/CONTRIBUTING.adoc b/CONTRIBUTING.adoc index a61cae6054..f9d1ebda36 100755 --- a/CONTRIBUTING.adoc +++ b/CONTRIBUTING.adoc @@ -7,7 +7,7 @@ something, or simply want to hack on the code this document should help you get == Code of Conduct This project adheres to the Contributor Covenant link:CODE_OF_CONDUCT.adoc[code of -conduct]. By participating, you are expected to uphold this code. Please report +conduct]. By participating, you are expected to uphold this code. Please report unacceptable behavior to spring-code-of-conduct@pivotal.io. diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/ResourcePropertiesTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/ResourcePropertiesTests.java index f855ca9e3e..a3fdf00956 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/ResourcePropertiesTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/ResourcePropertiesTests.java @@ -31,7 +31,6 @@ public class ResourcePropertiesTests { @Test public void resourceChainNoCustomization() { - System.out.println(this.properties.getChain().getEnabled()); assertThat(this.properties.getChain().getEnabled()).isNull(); } 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 50d5094163..bcfca72e2b 100644 --- a/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc +++ b/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc @@ -772,7 +772,7 @@ definitions by simply listing the properties classes directly in the [NOTE] ==== -When `@ConfigurationProperties` bean are registered that way, the bean will have a +When `@ConfigurationProperties` bean is registered that way, the bean will have a conventional name: `-`, where `` is the environment key prefix specified in the `@ConfigurationProperties` annotation and the fully qualified name of the bean. If the annotation does not provide any prefix, only the fully qualified @@ -2002,7 +2002,7 @@ password, printed at INFO level when the application starts up) Using default security password: 78fa095d-3f4c-48b1-ad50-e24c31d5cf35 ---- -NOTE: If you fine tune your logging configuration, ensure that the +NOTE: If you fine-tune your logging configuration, ensure that the `org.springframework.boot.autoconfigure.security` category is set to log `INFO` messages, otherwise the default password will not be printed. @@ -2372,7 +2372,7 @@ loadable. See {sc-spring-boot-autoconfigure}/jdbc/DataSourceProperties.{sc-ext}[`DataSourceProperties`] for more of the supported options. These are the standard options that work regardless of -the actual implementation. It is also possible to fine tune implementation-specific +the actual implementation. It is also possible to fine-tune implementation-specific settings using their respective prefix (`+spring.datasource.tomcat*+`, `+spring.datasource.hikari+`, `+spring.datasource.dbcp*+` and `+spring.datasource.dbcp2*+`), refer to the documentation of the connection pool diff --git a/spring-boot/src/main/java/org/springframework/boot/ExitCodeEvent.java b/spring-boot/src/main/java/org/springframework/boot/ExitCodeEvent.java index a16af1c4d2..6a18bc2851 100644 --- a/spring-boot/src/main/java/org/springframework/boot/ExitCodeEvent.java +++ b/spring-boot/src/main/java/org/springframework/boot/ExitCodeEvent.java @@ -41,7 +41,7 @@ public class ExitCodeEvent extends ApplicationEvent { /** * Return the exit code that will be used to exit the JVM. - * @return the the exit code + * @return the exit code */ public int getExitCode() { return this.exitCode; diff --git a/spring-boot/src/main/java/org/springframework/boot/context/ContextIdApplicationContextInitializer.java b/spring-boot/src/main/java/org/springframework/boot/context/ContextIdApplicationContextInitializer.java index 8ae509feb9..3b05893871 100644 --- a/spring-boot/src/main/java/org/springframework/boot/context/ContextIdApplicationContextInitializer.java +++ b/spring-boot/src/main/java/org/springframework/boot/context/ContextIdApplicationContextInitializer.java @@ -71,7 +71,7 @@ public class ContextIdApplicationContextInitializer implements *
  • {@code server.port}
    • *
  • {@code PORT}
    • * - * This order allows favors a platform defined index over any user defined value. + * This order favors a platform defined index over any user defined value. */ private static final String INDEX_PATTERN = "${vcap.application.instance_index:${spring.application.index:${server.port:${PORT:null}}}}"; diff --git a/spring-boot/src/main/java/org/springframework/boot/diagnostics/analyzer/NoUniqueBeanDefinitionExceptionFailureAnalyzer.java b/spring-boot/src/main/java/org/springframework/boot/diagnostics/analyzer/NoUniqueBeanDefinitionExceptionFailureAnalyzer.java index 811eebc8e9..618c082695 100644 --- a/spring-boot/src/main/java/org/springframework/boot/diagnostics/analyzer/NoUniqueBeanDefinitionExceptionFailureAnalyzer.java +++ b/spring-boot/src/main/java/org/springframework/boot/diagnostics/analyzer/NoUniqueBeanDefinitionExceptionFailureAnalyzer.java @@ -80,13 +80,13 @@ class NoUniqueBeanDefinitionExceptionFailureAnalyzer } catch (NoSuchBeanDefinitionException ex) { message.append(String.format( - "\t- %s: a programtically registered singleton", beanName)); + "\t- %s: a programmatically registered singleton", beanName)); } } return new FailureAnalysis(message.toString(), "Consider marking one of the beans as @Primary, updating the consumer to" - + " accept multiple beans, or using @Qualifer to identify the" + + " accept multiple beans, or using @Qualifier to identify the" + " bean that should be consumed", cause); }