Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polish

Browse Source
This commit is contained in:
Phillip Webb
2018-02-27 12:52:37 -08:00
parent c7ed5c3d4a
commit 3e4da3cc37
9 changed files with 140 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/context/properties/bind/AppSystemPropertiesTests.java
View File

@@ -41,36 +41,46 @@ public class AppSystemPropertiesTests {
@Test
public void bindWithDefaultUnit() {
this.contextRunner.withPropertyValues("app.system.session-timeout=40",
"app.system.read-timeout=5000").run(assertBinding(p -> {
assertThat(p.getSessionTimeout()).isEqualTo(Duration.ofSeconds(40));
assertThat(p.getReadTimeout()).isEqualTo(Duration.ofMillis(5000));
}));
this.contextRunner
.withPropertyValues("app.system.session-timeout=40",
"app.system.read-timeout=5000")
.run(assertBinding((properties) -> {
assertThat(properties.getSessionTimeout())
.isEqualTo(Duration.ofSeconds(40));
assertThat(properties.getReadTimeout())
.isEqualTo(Duration.ofMillis(5000));
}));
}
@Test
public void bindWithExplicitUnit() {
this.contextRunner.withPropertyValues("app.system.session-timeout=1h",
"app.system.read-timeout=5s").run(assertBinding(p -> {
assertThat(p.getSessionTimeout()).isEqualTo(Duration.ofMinutes(60));
assertThat(p.getReadTimeout()).isEqualTo(Duration.ofMillis(5000));
}));
"app.system.read-timeout=5s").run(assertBinding((properties) -> {
assertThat(properties.getSessionTimeout())
.isEqualTo(Duration.ofMinutes(60));
assertThat(properties.getReadTimeout())
.isEqualTo(Duration.ofMillis(5000));
}));
}
@Test
public void bindWithIso8601Format() {
this.contextRunner.withPropertyValues("app.system.session-timeout=PT15S",
"app.system.read-timeout=PT0.5S").run(assertBinding(p -> {
assertThat(p.getSessionTimeout()).isEqualTo(Duration.ofSeconds(15));
assertThat(p.getReadTimeout()).isEqualTo(Duration.ofMillis(500));
}));
this.contextRunner
.withPropertyValues("app.system.session-timeout=PT15S",
"app.system.read-timeout=PT0.5S")
.run(assertBinding((properties) -> {
assertThat(properties.getSessionTimeout())
.isEqualTo(Duration.ofSeconds(15));
assertThat(properties.getReadTimeout())
.isEqualTo(Duration.ofMillis(500));
}));
}
private ContextConsumer<AssertableApplicationContext> assertBinding(
Consumer<AppSystemProperties> appSystemProperties) {
Consumer<AppSystemProperties> properties) {
return (context) -> {
assertThat(context).hasSingleBean(AppSystemProperties.class);
appSystemProperties.accept(context.getBean(AppSystemProperties.class));
properties.accept(context.getBean(AppSystemProperties.class));
};
}

5
spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/web/client/SampleWebClientConfiguration.java
View File

@@ -35,11 +35,10 @@ import org.springframework.web.bind.annotation.RestController;
*/
@SpringBootConfiguration
@ImportAutoConfiguration({ ServletWebServerFactoryAutoConfiguration.class,
DispatcherServletAutoConfiguration.class,
JacksonAutoConfiguration.class, HttpMessageConvertersAutoConfiguration.class })
DispatcherServletAutoConfiguration.class, JacksonAutoConfiguration.class,
HttpMessageConvertersAutoConfiguration.class })
class SampleWebClientConfiguration {
@RestController
private static class ExampleController {

4
spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/web/client/SampleWebClientTests.java
View File

@@ -56,9 +56,7 @@ public class SampleWebClientTests {
@Bean
public RestTemplateBuilder restTemplateBuilder() {
return new RestTemplateBuilder()
.setConnectTimeout(1000)
.setReadTimeout(1000);
return new RestTemplateBuilder().setConnectTimeout(1000).setReadTimeout(1000);
}
}