From a4717eee216ac539db24c7c66581f2e41f9e5caa Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Thu, 18 Jan 2018 11:19:37 -0500 Subject: [PATCH] Make sure fail-fast property follows new boot 2.0 conventions --- docs/src/main/asciidoc/spring-cloud-config.adoc | 4 ++-- ...nfigServiceBootstrapConfigurationNoSpringRetryTests.java | 6 +++--- ...overyClientConfigServiceBootstrapConfigurationTests.java | 6 +++--- .../src/test/java/sample/ApplicationFailFastTests.java | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/docs/src/main/asciidoc/spring-cloud-config.adoc b/docs/src/main/asciidoc/spring-cloud-config.adoc index 6f3db748..be3b5079 100644 --- a/docs/src/main/asciidoc/spring-cloud-config.adoc +++ b/docs/src/main/asciidoc/spring-cloud-config.adoc @@ -1328,7 +1328,7 @@ eureka: In some cases, it may be desirable to fail startup of a service if it cannot connect to the Config Server. If this is the desired behavior, set the bootstrap configuration property -`spring.cloud.config.failFast=true` and the client will halt with +`spring.cloud.config.fail-fast=true` and the client will halt with an Exception. [[config-client-retry]] @@ -1336,7 +1336,7 @@ an Exception. If you expect that the config server may occasionally be unavailable when your app starts, you can ask it to keep trying after a failure. First you need -to set `spring.cloud.config.failFast=true`, and then you need to add +to set `spring.cloud.config.fail-fast=true`, and then you need to add `spring-retry` and `spring-boot-starter-aop` to your classpath. The default behaviour is to retry 6 times with an initial backoff interval of 1000ms and an exponential multiplier of 1.1 for subsequent backoffs. You can configure these diff --git a/spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/DiscoveryClientConfigServiceBootstrapConfigurationNoSpringRetryTests.java b/spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/DiscoveryClientConfigServiceBootstrapConfigurationNoSpringRetryTests.java index 0c31cac2..578dc210 100644 --- a/spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/DiscoveryClientConfigServiceBootstrapConfigurationNoSpringRetryTests.java +++ b/spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/DiscoveryClientConfigServiceBootstrapConfigurationNoSpringRetryTests.java @@ -19,7 +19,7 @@ public class DiscoveryClientConfigServiceBootstrapConfigurationNoSpringRetryTest expectNoInstancesOfConfigServerException(); setup("spring.cloud.config.discovery.enabled=true", - "spring.cloud.config.failFast=true"); + "spring.cloud.config.fail-fast=true"); } @Test @@ -28,7 +28,7 @@ public class DiscoveryClientConfigServiceBootstrapConfigurationNoSpringRetryTest givenDiscoveryClientReturnsNoInfo(); setup("spring.cloud.config.discovery.enabled=true", - "spring.cloud.config.failFast=false"); + "spring.cloud.config.fail-fast=false"); expectDiscoveryClientConfigServiceBootstrapConfigurationIsSetup(); expectConfigClientPropertiesHasDefaultConfiguration(); @@ -41,7 +41,7 @@ public class DiscoveryClientConfigServiceBootstrapConfigurationNoSpringRetryTest givenDiscoveryClientReturnsInfo(); setup("spring.cloud.config.discovery.enabled=true", - "spring.cloud.config.failFast=true"); + "spring.cloud.config.fail-fast=true"); expectDiscoveryClientConfigServiceBootstrapConfigurationIsSetup(); expectConfigClientPropertiesHasConfigurationFromEureka(); diff --git a/spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/DiscoveryClientConfigServiceBootstrapConfigurationTests.java b/spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/DiscoveryClientConfigServiceBootstrapConfigurationTests.java index 76317297..60ba9e34 100644 --- a/spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/DiscoveryClientConfigServiceBootstrapConfigurationTests.java +++ b/spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/DiscoveryClientConfigServiceBootstrapConfigurationTests.java @@ -121,7 +121,7 @@ public class DiscoveryClientConfigServiceBootstrapConfigurationTests extends Bas setup("spring.cloud.config.discovery.enabled=true", "spring.cloud.config.retry.maxAttempts=3", "spring.cloud.config.retry.initialInterval=10", - "spring.cloud.config.failFast=true"); + "spring.cloud.config.fail-fast=true"); expectDiscoveryClientConfigServiceBootstrapConfigurationIsSetup(); verifyDiscoveryClientCalledThreeTimes(); @@ -154,7 +154,7 @@ public class DiscoveryClientConfigServiceBootstrapConfigurationTests extends Bas setup("spring.cloud.config.discovery.enabled=true", "spring.cloud.config.retry.maxAttempts=3", "spring.cloud.config.retry.initialInterval=10", - "spring.cloud.config.failFast=true"); + "spring.cloud.config.fail-fast=true"); } @Test @@ -165,7 +165,7 @@ public class DiscoveryClientConfigServiceBootstrapConfigurationTests extends Bas setup("spring.cloud.config.discovery.enabled=true", "spring.cloud.config.retry.maxAttempts=3", "spring.cloud.config.retry.initialInterval=10", - "spring.cloud.config.failFast=false"); + "spring.cloud.config.fail-fast=false"); expectDiscoveryClientConfigServiceBootstrapConfigurationIsSetup(); expectConfigClientPropertiesHasDefaultConfiguration(); diff --git a/spring-cloud-config-sample/src/test/java/sample/ApplicationFailFastTests.java b/spring-cloud-config-sample/src/test/java/sample/ApplicationFailFastTests.java index b2393fe9..9a09c09d 100644 --- a/spring-cloud-config-sample/src/test/java/sample/ApplicationFailFastTests.java +++ b/spring-cloud-config-sample/src/test/java/sample/ApplicationFailFastTests.java @@ -14,7 +14,7 @@ public class ApplicationFailFastTests { new SpringApplicationBuilder() .sources(Application.class) .run("--server.port=0", "--spring.cloud.config.enabled=true", - "--spring.cloud.config.failFast=true", + "--spring.cloud.config.fail-fast=true", "--spring.cloud.config.uri=http://server-host-doesnt-exist:1234"); fail("failFast option did not produce an exception"); } catch (Exception e) {