Closes gh-5318
This commit is contained in:
Johnny Lim 2016-03-03 10:37:17 +09:00 committed by Stephane Nicoll
parent 7029ba521d
commit a6c83787ef
6 changed files with 8 additions and 9 deletions

View File

@ -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.

View File

@ -31,7 +31,6 @@ public class ResourcePropertiesTests {
@Test
public void resourceChainNoCustomization() {
System.out.println(this.properties.getChain().getEnabled());
assertThat(this.properties.getChain().getEnabled()).isNull();
}

View File

@ -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: `<prefix>-<fqn>`, where `<prefix>` is the environment key prefix
specified in the `@ConfigurationProperties` annotation and <fqn> 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

View File

@ -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;

View File

@ -71,7 +71,7 @@ public class ContextIdApplicationContextInitializer implements
* <li>{@code server.port}</li>
* <li>{@code PORT}</li>
* </ul>
* 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}}}}";

View File

@ -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);
}