root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Merge pull request #9438 from izeye:polish-20170609 

* pr/9438:
  Polish
This commit is contained in:
Stephane Nicoll 2017-06-09 08:55:15 +03:00
parent fe3e1cf1d3 bbab520926
commit a7f51c0d14
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchDataAutoConfigurationTests.java
View File

@ -56,7 +56,7 @@ public class ElasticsearchDataAutoConfigurationTests {
ElasticsearchAutoConfiguration.class, ElasticsearchAutoConfiguration.class,
ElasticsearchDataAutoConfiguration.class); ElasticsearchDataAutoConfiguration.class);
this.context.refresh(); this.context.refresh();
asssertHasSingleBean(ElasticsearchTemplate.class); assertHasSingleBean(ElasticsearchTemplate.class);
} }
@Test @Test
@ -70,7 +70,7 @@ public class ElasticsearchDataAutoConfigurationTests {
ElasticsearchAutoConfiguration.class, ElasticsearchAutoConfiguration.class,
ElasticsearchDataAutoConfiguration.class); ElasticsearchDataAutoConfiguration.class);
this.context.refresh(); this.context.refresh();
asssertHasSingleBean(SimpleElasticsearchMappingContext.class); assertHasSingleBean(SimpleElasticsearchMappingContext.class);
} }
@Test @Test
@ -84,10 +84,10 @@ public class ElasticsearchDataAutoConfigurationTests {
ElasticsearchAutoConfiguration.class, ElasticsearchAutoConfiguration.class,
ElasticsearchDataAutoConfiguration.class); ElasticsearchDataAutoConfiguration.class);
this.context.refresh(); this.context.refresh();
asssertHasSingleBean(ElasticsearchConverter.class); assertHasSingleBean(ElasticsearchConverter.class);
} }
private void asssertHasSingleBean(Class<?> type) { private void assertHasSingleBean(Class<?> type) {
assertThat(this.context.getBeanNamesForType(type)).hasSize(1); assertThat(this.context.getBeanNamesForType(type)).hasSize(1);
} }

2
spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc
View File

@ -714,7 +714,7 @@ content into your application; rather pick only the properties that you need.
spring.h2.console.settings.trace=false # Enable trace output. spring.h2.console.settings.trace=false # Enable trace output.
spring.h2.console.settings.web-allow-others=false # Enable remote access. spring.h2.console.settings.web-allow-others=false # Enable remote access.
# InfluxDB ({sc-spring-boot-autoconfigure}/influx/InfluxProperties.{sc-ext}[InfluxProperties]) # InfluxDB ({sc-spring-boot-autoconfigure}/influx/InfluxDbProperties.{sc-ext}[InfluxDbProperties])
spring.influx.password= # Login password. spring.influx.password= # Login password.
spring.influx.url= # Url of the InfluxDB instance to connect to. spring.influx.url= # Url of the InfluxDB instance to connect to.
spring.influx.user= # Login user. spring.influx.user= # Login user.

2
spring-boot-docs/src/main/asciidoc/howto.adoc
View File

@ -620,7 +620,7 @@ typically in `application.properties` or `application.yml`. For example:
server.ssl.key-password=another-secret server.ssl.key-password=another-secret
---- ----
See {sc-spring-boot}/context/embedded/Ssl.{sc-ext}[`Ssl`] for details of all of the See {sc-spring-boot}/web/server/Ssl.{sc-ext}[`Ssl`] for details of all of the
supported properties. supported properties.
Using configuration like the example above means the application will no longer support Using configuration like the example above means the application will no longer support

2
spring-boot/src/test/java/org/springframework/boot/env/SystemEnvironmentPropertySourceEnvironmentPostProcessorTests.java vendored
View File

@ -44,7 +44,7 @@ public class SystemEnvironmentPropertySourceEnvironmentPostProcessorTests {
} }
@Test @Test
public void postProcessShouldReplaceSystemEnviromentPropertySource() public void postProcessShouldReplaceSystemEnvironmentPropertySource()
throws Exception { throws Exception {
SystemEnvironmentPropertySourceEnvironmentPostProcessor postProcessor = new SystemEnvironmentPropertySourceEnvironmentPostProcessor(); SystemEnvironmentPropertySourceEnvironmentPostProcessor postProcessor = new SystemEnvironmentPropertySourceEnvironmentPostProcessor();
postProcessor.postProcessEnvironment(this.environment, null); postProcessor.postProcessEnvironment(this.environment, null);