From 201f1fcc25851cf9ae4f022a90c60938eefd0d08 Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Wed, 8 May 2019 16:44:31 +0200 Subject: [PATCH] Merge branch '2.1.x' # Conflicts: # pom.xml # spring-cloud-consul-dependencies/pom.xml --- .../config/ConsulConfigAutoConfiguration.java | 6 ++++-- .../ConsulConfigBootstrapConfiguration.java | 3 ++- ...nsulPropertySourceLocatorFailFastTests.java | 12 +++++++----- .../consul/ConditionalOnConsulEnabled.java | 3 ++- .../ConsulDiscoveryClientConfiguration.java | 11 ++++++++--- .../RibbonConsulAutoConfiguration.java | 3 ++- ...entConfigServiceBootstrapConfiguration.java | 3 ++- ...toServiceRegistrationAutoConfiguration.java | 6 ++++-- ...ConsulServiceRegistryAutoConfiguration.java | 3 ++- .../ConsulDiscoveryClientAclTests.java | 9 +++++---- .../ConsulDiscoveryClientCustomizedTests.java | 13 +++++++------ ...sulDiscoveryClientDefaultQueryTagTests.java | 9 +++++---- .../ConsulDiscoveryClientHttpsTests.java | 9 ++++++--- .../discovery/ConsulDiscoveryClientTests.java | 9 ++++++--- .../ConsulLoadbalancerClientTests.java | 8 +++++--- .../discovery/ConsulServerListAclTests.java | 9 +++++---- .../discovery/TtlSchedulerRemoveTests.java | 11 ++++++----- .../consul/discovery/TtlSchedulerTests.java | 13 +++++++------ ...lDiscoveryClientBootstrapConfiguration.java | 3 ++- ...CheckTtlDeregisterCriticalServiceTests.java | 11 +++++++---- ...utoRegistrationHealthCheckHeadersTests.java | 8 +++++--- ...istrationHealthCheckTlsSkipVerifyTests.java | 9 ++++++--- ...AutoServiceDeRegistrationDisabledTests.java | 9 +++++---- ...egistrationCustomizedAgentAddressTests.java | 12 +++++++----- ...gistrationCustomizedDiscoveryPortTests.java | 6 ++++-- ...gistrationCustomizedInstanceGroupTests.java | 10 ++++++---- ...egistrationCustomizedInstanceZoneTests.java | 12 +++++++----- ...onCustomizedManagementServicePortTests.java | 16 +++++++++------- ...erviceRegistrationCustomizedPropsTests.java | 18 ++++++++++-------- ...RegistrationCustomizedServiceNameTests.java | 10 ++++++---- ...istrationCustomizedServletContextTests.java | 10 ++++++---- ...AutoServiceRegistrationCustomizedTests.java | 5 +++-- ...toServiceRegistrationDefaultCheckTests.java | 13 +++++++------ ...utoServiceRegistrationDefaultPortTests.java | 7 ++++--- ...ulAutoServiceRegistrationDisabledTests.java | 7 ++++--- ...eRegistrationManagementCustomizerTests.java | 7 ++++--- ...strationManagementDisabledServiceTests.java | 14 ++++++++------ ...viceRegistrationManagementServiceTests.java | 10 ++++++---- ...nsulAutoServiceRegistrationNonWebTests.java | 6 +++--- .../ConsulAutoServiceRegistrationTests.java | 4 ++-- .../ConsulServiceRegistryCheckTtlTests.java | 8 +++++--- .../ConsulServiceRegistryTests.java | 3 ++- 42 files changed, 213 insertions(+), 145 deletions(-) diff --git a/spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulConfigAutoConfiguration.java b/spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulConfigAutoConfiguration.java index 3ef3b888..6d3c7dcc 100644 --- a/spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulConfigAutoConfiguration.java +++ b/spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulConfigAutoConfiguration.java @@ -46,7 +46,8 @@ public class ConsulConfigAutoConfiguration { protected static class ConsulRefreshConfiguration { @Bean - @ConditionalOnProperty(name = "spring.cloud.consul.config.watch.enabled", matchIfMissing = true) + @ConditionalOnProperty(name = "spring.cloud.consul.config.watch.enabled", + matchIfMissing = true) public ConfigWatch configWatch(ConsulConfigProperties properties, ConsulPropertySourceLocator locator, ConsulClient consul, @Qualifier(CONFIG_WATCH_TASK_SCHEDULER_NAME) TaskScheduler taskScheduler) { @@ -55,7 +56,8 @@ public class ConsulConfigAutoConfiguration { } @Bean(name = CONFIG_WATCH_TASK_SCHEDULER_NAME) - @ConditionalOnProperty(name = "spring.cloud.consul.config.watch.enabled", matchIfMissing = true) + @ConditionalOnProperty(name = "spring.cloud.consul.config.watch.enabled", + matchIfMissing = true) public TaskScheduler configWatchTaskScheduler() { return new ThreadPoolTaskScheduler(); } diff --git a/spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulConfigBootstrapConfiguration.java b/spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulConfigBootstrapConfiguration.java index deb5e831..c468a05c 100644 --- a/spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulConfigBootstrapConfiguration.java +++ b/spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulConfigBootstrapConfiguration.java @@ -39,7 +39,8 @@ public class ConsulConfigBootstrapConfiguration { @Configuration @EnableConfigurationProperties @Import(ConsulAutoConfiguration.class) - @ConditionalOnProperty(name = "spring.cloud.consul.config.enabled", matchIfMissing = true) + @ConditionalOnProperty(name = "spring.cloud.consul.config.enabled", + matchIfMissing = true) protected static class ConsulPropertySourceConfiguration { @Autowired diff --git a/spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulPropertySourceLocatorFailFastTests.java b/spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulPropertySourceLocatorFailFastTests.java index 4a3dc48a..8c94d1c5 100644 --- a/spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulPropertySourceLocatorFailFastTests.java +++ b/spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulPropertySourceLocatorFailFastTests.java @@ -30,11 +30,13 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen * @author Spencer Gibb */ @RunWith(SpringRunner.class) -@SpringBootTest(classes = ConsulPropertySourceLocatorFailFastTests.Config.class, properties = { - "spring.application.name=testConsulPropertySourceLocatorFailFast", - "spring.cloud.consul.host=53210a7c-4809-42cb-8b30-057d2db85fcc", - "spring.cloud.consul.port=65530", "spring.cloud.consul.retry.maxAttempts=0", - "spring.cloud.consul.config.failFast=false" }, webEnvironment = RANDOM_PORT) +@SpringBootTest(classes = ConsulPropertySourceLocatorFailFastTests.Config.class, + properties = { "spring.application.name=testConsulPropertySourceLocatorFailFast", + "spring.cloud.consul.host=53210a7c-4809-42cb-8b30-057d2db85fcc", + "spring.cloud.consul.port=65530", + "spring.cloud.consul.retry.maxAttempts=0", + "spring.cloud.consul.config.failFast=false" }, + webEnvironment = RANDOM_PORT) public class ConsulPropertySourceLocatorFailFastTests { @Test diff --git a/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/ConditionalOnConsulEnabled.java b/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/ConditionalOnConsulEnabled.java index 898afb9e..d617f517 100644 --- a/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/ConditionalOnConsulEnabled.java +++ b/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/ConditionalOnConsulEnabled.java @@ -49,7 +49,8 @@ public @interface ConditionalOnConsulEnabled { /** * Consul property is enabled. */ - @ConditionalOnProperty(value = "spring.cloud.consul.enabled", matchIfMissing = true) + @ConditionalOnProperty(value = "spring.cloud.consul.enabled", + matchIfMissing = true) static class FoundProperty { } diff --git a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientConfiguration.java b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientConfiguration.java index e97cd7bb..4fdc23f7 100644 --- a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientConfiguration.java +++ b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientConfiguration.java @@ -40,7 +40,8 @@ import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; */ @Configuration @ConditionalOnConsulEnabled -@ConditionalOnProperty(value = "spring.cloud.consul.discovery.enabled", matchIfMissing = true) +@ConditionalOnProperty(value = "spring.cloud.consul.discovery.enabled", + matchIfMissing = true) @ConditionalOnDiscoveryEnabled @EnableConfigurationProperties @AutoConfigureBefore({ SimpleDiscoveryClientAutoConfiguration.class, @@ -86,7 +87,9 @@ public class ConsulDiscoveryClientConfiguration { @Bean @ConditionalOnMissingBean - @ConditionalOnProperty(name = "spring.cloud.consul.discovery.catalog-services-watch.enabled", matchIfMissing = true) + @ConditionalOnProperty( + name = "spring.cloud.consul.discovery.catalog-services-watch.enabled", + matchIfMissing = true) public ConsulCatalogWatch consulCatalogWatch( ConsulDiscoveryProperties discoveryProperties, @Qualifier(CATALOG_WATCH_TASK_SCHEDULER_NAME) TaskScheduler taskScheduler) { @@ -95,7 +98,9 @@ public class ConsulDiscoveryClientConfiguration { } @Bean(name = CATALOG_WATCH_TASK_SCHEDULER_NAME) - @ConditionalOnProperty(name = "spring.cloud.consul.discovery.catalog-services-watch.enabled", matchIfMissing = true) + @ConditionalOnProperty( + name = "spring.cloud.consul.discovery.catalog-services-watch.enabled", + matchIfMissing = true) public TaskScheduler catalogWatchTaskScheduler() { return new ThreadPoolTaskScheduler(); } diff --git a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/RibbonConsulAutoConfiguration.java b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/RibbonConsulAutoConfiguration.java index 0fae9860..8b6f95ee 100644 --- a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/RibbonConsulAutoConfiguration.java +++ b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/RibbonConsulAutoConfiguration.java @@ -33,7 +33,8 @@ import org.springframework.context.annotation.Configuration; @EnableConfigurationProperties @ConditionalOnConsulEnabled @ConditionalOnBean(SpringClientFactory.class) -@ConditionalOnProperty(value = "spring.cloud.consul.ribbon.enabled", matchIfMissing = true) +@ConditionalOnProperty(value = "spring.cloud.consul.ribbon.enabled", + matchIfMissing = true) @AutoConfigureAfter(RibbonAutoConfiguration.class) @RibbonClients(defaultConfiguration = ConsulRibbonClientConfiguration.class) public class RibbonConsulAutoConfiguration { diff --git a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/configclient/ConsulDiscoveryClientConfigServiceBootstrapConfiguration.java b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/configclient/ConsulDiscoveryClientConfigServiceBootstrapConfiguration.java index 392e672e..a56b98ec 100644 --- a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/configclient/ConsulDiscoveryClientConfigServiceBootstrapConfiguration.java +++ b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/configclient/ConsulDiscoveryClientConfigServiceBootstrapConfiguration.java @@ -30,7 +30,8 @@ import org.springframework.context.annotation.Configuration; * @author Spencer Gibb */ @ConditionalOnClass(ConfigServicePropertySourceLocator.class) -@ConditionalOnProperty(value = "spring.cloud.config.discovery.enabled", matchIfMissing = false) +@ConditionalOnProperty(value = "spring.cloud.config.discovery.enabled", + matchIfMissing = false) @Configuration @ImportAutoConfiguration({ ConsulAutoConfiguration.class, ConsulDiscoveryClientConfiguration.class }) diff --git a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationAutoConfiguration.java b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationAutoConfiguration.java index aedb1286..4ea03318 100644 --- a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationAutoConfiguration.java +++ b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationAutoConfiguration.java @@ -41,9 +41,11 @@ import org.springframework.context.annotation.Configuration; */ @Configuration @ConditionalOnBean(AutoServiceRegistrationProperties.class) -@ConditionalOnMissingBean(type = "org.springframework.cloud.consul.discovery.ConsulLifecycle") +@ConditionalOnMissingBean( + type = "org.springframework.cloud.consul.discovery.ConsulLifecycle") @ConditionalOnConsulEnabled -@ConditionalOnProperty(value = "spring.cloud.service-registry.auto-registration.enabled", matchIfMissing = true) +@ConditionalOnProperty(value = "spring.cloud.service-registry.auto-registration.enabled", + matchIfMissing = true) @AutoConfigureAfter({ AutoServiceRegistrationConfiguration.class, ConsulServiceRegistryAutoConfiguration.class }) public class ConsulAutoServiceRegistrationAutoConfiguration { diff --git a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/serviceregistry/ConsulServiceRegistryAutoConfiguration.java b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/serviceregistry/ConsulServiceRegistryAutoConfiguration.java index 70502b73..8e0f881e 100644 --- a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/serviceregistry/ConsulServiceRegistryAutoConfiguration.java +++ b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/serviceregistry/ConsulServiceRegistryAutoConfiguration.java @@ -36,7 +36,8 @@ import org.springframework.context.annotation.Configuration; */ @Configuration @ConditionalOnConsulEnabled -@ConditionalOnProperty(value = "spring.cloud.service-registry.enabled", matchIfMissing = true) +@ConditionalOnProperty(value = "spring.cloud.service-registry.enabled", + matchIfMissing = true) @AutoConfigureBefore(ServiceRegistryAutoConfiguration.class) public class ConsulServiceRegistryAutoConfiguration { diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientAclTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientAclTests.java index 5962af00..0b3d06ed 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientAclTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientAclTests.java @@ -37,10 +37,11 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen * @author Spencer Gibb */ @RunWith(SpringRunner.class) -@SpringBootTest(classes = ConsulDiscoveryClientAclTests.MyTestConfig.class, properties = { - "spring.application.name=testConsulDiscoveryAcl", - "spring.cloud.consul.discovery.preferIpAddress=true", - "consul.token=2d2e6b3b-1c82-40ab-8171-54609d8ad304" }, webEnvironment = RANDOM_PORT) +@SpringBootTest(classes = ConsulDiscoveryClientAclTests.MyTestConfig.class, + properties = { "spring.application.name=testConsulDiscoveryAcl", + "spring.cloud.consul.discovery.preferIpAddress=true", + "consul.token=2d2e6b3b-1c82-40ab-8171-54609d8ad304" }, + webEnvironment = RANDOM_PORT) public class ConsulDiscoveryClientAclTests { @Autowired diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientCustomizedTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientCustomizedTests.java index e0cd8306..de963890 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientCustomizedTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientCustomizedTests.java @@ -39,12 +39,13 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen * @author Tim Ysewyn */ @RunWith(SpringRunner.class) -@SpringBootTest(classes = ConsulDiscoveryClientCustomizedTests.MyTestConfig.class, properties = { - "spring.application.name=testConsulDiscovery2", - "spring.cloud.consul.discovery.instanceId=testConsulDiscovery2Id", - "spring.cloud.consul.discovery.hostname=testConsulDiscovery2Host", - "spring.cloud.consul.discovery.registerHealthCheck=false", - "spring.cloud.consul.discovery.tags=plaintag,foo=bar,foo2=bar2=baz2" }, webEnvironment = RANDOM_PORT) +@SpringBootTest(classes = ConsulDiscoveryClientCustomizedTests.MyTestConfig.class, + properties = { "spring.application.name=testConsulDiscovery2", + "spring.cloud.consul.discovery.instanceId=testConsulDiscovery2Id", + "spring.cloud.consul.discovery.hostname=testConsulDiscovery2Host", + "spring.cloud.consul.discovery.registerHealthCheck=false", + "spring.cloud.consul.discovery.tags=plaintag,foo=bar,foo2=bar2=baz2" }, + webEnvironment = RANDOM_PORT) public class ConsulDiscoveryClientCustomizedTests { @Autowired diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientDefaultQueryTagTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientDefaultQueryTagTests.java index 9011e080..cd140865 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientDefaultQueryTagTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientDefaultQueryTagTests.java @@ -42,10 +42,11 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen * @author Piotr Wielgolaski */ @RunWith(SpringRunner.class) -@SpringBootTest(webEnvironment = MOCK, classes = ConsulDiscoveryClientDefaultQueryTagTests.TestConfig.class, properties = { - "spring.application.name=consulServiceDefaultTag", - "spring.cloud.consul.discovery.catalogServicesWatch.enabled=false", - "spring.cloud.consul.discovery.defaultQueryTag=intg" }) +@SpringBootTest(webEnvironment = MOCK, + classes = ConsulDiscoveryClientDefaultQueryTagTests.TestConfig.class, + properties = { "spring.application.name=consulServiceDefaultTag", + "spring.cloud.consul.discovery.catalogServicesWatch.enabled=false", + "spring.cloud.consul.discovery.defaultQueryTag=intg" }) @DirtiesContext public class ConsulDiscoveryClientDefaultQueryTagTests { diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientHttpsTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientHttpsTests.java index 45e7be4d..9dee8d28 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientHttpsTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientHttpsTests.java @@ -36,9 +36,12 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen * @author Glen Lockhart */ @RunWith(SpringRunner.class) -@SpringBootTest(properties = { "spring.application.name=testConsulDiscoveryHttps", - "spring.cloud.consul.discovery.prefer-ip-address=true", - "spring.cloud.consul.discovery.scheme=https" }, classes = ConsulDiscoveryClientHttpsTests.MyTestConfig.class, webEnvironment = RANDOM_PORT) +@SpringBootTest( + properties = { "spring.application.name=testConsulDiscoveryHttps", + "spring.cloud.consul.discovery.prefer-ip-address=true", + "spring.cloud.consul.discovery.scheme=https" }, + classes = ConsulDiscoveryClientHttpsTests.MyTestConfig.class, + webEnvironment = RANDOM_PORT) public class ConsulDiscoveryClientHttpsTests { @Autowired diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientTests.java index a02fbb03..719173ec 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientTests.java @@ -40,9 +40,12 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen * @author Joe Athman */ @RunWith(SpringRunner.class) -@SpringBootTest(properties = { "spring.application.name=testConsulDiscovery", - "spring.cloud.consul.discovery.prefer-ip-address=true", - "spring.cloud.consul.discovery.tags=foo=bar" }, classes = ConsulDiscoveryClientTests.MyTestConfig.class, webEnvironment = RANDOM_PORT) +@SpringBootTest( + properties = { "spring.application.name=testConsulDiscovery", + "spring.cloud.consul.discovery.prefer-ip-address=true", + "spring.cloud.consul.discovery.tags=foo=bar" }, + classes = ConsulDiscoveryClientTests.MyTestConfig.class, + webEnvironment = RANDOM_PORT) public class ConsulDiscoveryClientTests { @Autowired diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulLoadbalancerClientTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulLoadbalancerClientTests.java index 9c892362..0e04eeee 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulLoadbalancerClientTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulLoadbalancerClientTests.java @@ -39,9 +39,11 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen * @author Spencer Gibb */ @RunWith(SpringRunner.class) -@SpringBootTest(properties = { "spring.application.name=testConsulLoadBalancer", - "spring.cloud.consul.discovery.prefer-ip-address=true", - "spring.cloud.consul.discovery.tags=foo=bar" }, webEnvironment = RANDOM_PORT) +@SpringBootTest( + properties = { "spring.application.name=testConsulLoadBalancer", + "spring.cloud.consul.discovery.prefer-ip-address=true", + "spring.cloud.consul.discovery.tags=foo=bar" }, + webEnvironment = RANDOM_PORT) public class ConsulLoadbalancerClientTests { @Autowired diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulServerListAclTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulServerListAclTests.java index 37f96bc2..20a9e89e 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulServerListAclTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulServerListAclTests.java @@ -37,10 +37,11 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen * @author b omee */ @RunWith(SpringRunner.class) -@SpringBootTest(classes = ConsulServerListAclTests.TestConfig.class, properties = { - "spring.application.name=testConsulServerListAcl", - "spring.cloud.consul.discovery.preferIpAddress=true", - "consul.token=2d2e6b3b-1c82-40ab-8171-54609d8ad304" }, webEnvironment = RANDOM_PORT) +@SpringBootTest(classes = ConsulServerListAclTests.TestConfig.class, + properties = { "spring.application.name=testConsulServerListAcl", + "spring.cloud.consul.discovery.preferIpAddress=true", + "consul.token=2d2e6b3b-1c82-40ab-8171-54609d8ad304" }, + webEnvironment = RANDOM_PORT) public class ConsulServerListAclTests { @Autowired diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/TtlSchedulerRemoveTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/TtlSchedulerRemoveTests.java index b9bf9c19..e4300863 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/TtlSchedulerRemoveTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/TtlSchedulerRemoveTests.java @@ -43,11 +43,12 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen * @author Stéphane Leroy */ @RunWith(SpringRunner.class) -@SpringBootTest(classes = TtlSchedulerRemoveTests.TtlSchedulerRemoveTestConfig.class, properties = { - "spring.application.name=ttlSchedulerRemove", - "spring.cloud.consul.discovery.instance-id=ttlSchedulerRemove-id", - "spring.cloud.consul.discovery.heartbeat.enabled=true", - "spring.cloud.consul.discovery.heartbeat.ttlValue=2" }, webEnvironment = RANDOM_PORT) +@SpringBootTest(classes = TtlSchedulerRemoveTests.TtlSchedulerRemoveTestConfig.class, + properties = { "spring.application.name=ttlSchedulerRemove", + "spring.cloud.consul.discovery.instance-id=ttlSchedulerRemove-id", + "spring.cloud.consul.discovery.heartbeat.enabled=true", + "spring.cloud.consul.discovery.heartbeat.ttlValue=2" }, + webEnvironment = RANDOM_PORT) public class TtlSchedulerRemoveTests { @Autowired diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/TtlSchedulerTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/TtlSchedulerTests.java index 8bc4d526..d28cf7b6 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/TtlSchedulerTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/TtlSchedulerTests.java @@ -42,12 +42,13 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen * @author Stéphane Leroy */ @RunWith(SpringRunner.class) -@SpringBootTest(classes = TtlSchedulerTests.TtlSchedulerTestConfig.class, properties = { - "spring.application.name=ttlScheduler", - "spring.cloud.consul.discovery.instance-id=ttlScheduler-id", - "spring.cloud.consul.discovery.heartbeat.enabled=true", - "spring.cloud.consul.discovery.heartbeat.ttlValue=2", - "management.server.port=0" }, webEnvironment = RANDOM_PORT) +@SpringBootTest(classes = TtlSchedulerTests.TtlSchedulerTestConfig.class, + properties = { "spring.application.name=ttlScheduler", + "spring.cloud.consul.discovery.instance-id=ttlScheduler-id", + "spring.cloud.consul.discovery.heartbeat.enabled=true", + "spring.cloud.consul.discovery.heartbeat.ttlValue=2", + "management.server.port=0" }, + webEnvironment = RANDOM_PORT) public class TtlSchedulerTests { @Autowired diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/configclient/TestConsulDiscoveryClientBootstrapConfiguration.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/configclient/TestConsulDiscoveryClientBootstrapConfiguration.java index 9e80fdf7..dc0617a6 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/configclient/TestConsulDiscoveryClientBootstrapConfiguration.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/configclient/TestConsulDiscoveryClientBootstrapConfiguration.java @@ -29,7 +29,8 @@ import org.springframework.context.annotation.Configuration; import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.mock; -@ConditionalOnProperty(value = "spring.cloud.consul.discovery.test.enabled", matchIfMissing = false) +@ConditionalOnProperty(value = "spring.cloud.consul.discovery.test.enabled", + matchIfMissing = false) @Configuration public class TestConsulDiscoveryClientBootstrapConfiguration { diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoRegistrationCheckTtlDeregisterCriticalServiceTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoRegistrationCheckTtlDeregisterCriticalServiceTests.java index c45c72b1..8fcebad4 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoRegistrationCheckTtlDeregisterCriticalServiceTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoRegistrationCheckTtlDeregisterCriticalServiceTests.java @@ -35,10 +35,13 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Niko Tung */ @RunWith(SpringRunner.class) -@SpringBootTest(classes = ConsulAutoRegistrationCheckTtlDeregisterCriticalServiceTests.TestConfig.class, properties = { - "spring.application.name=myConsulServiceRegistryHealthCheckTtlDeregisterCriticalServiceAfter-N", - "spring.cloud.consul.discovery.health-check-critical-timeout=1m", - "spring.cloud.consul.discovery.heartbeat.enabled=true" }, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) +@SpringBootTest( + classes = ConsulAutoRegistrationCheckTtlDeregisterCriticalServiceTests.TestConfig.class, + properties = { + "spring.application.name=myConsulServiceRegistryHealthCheckTtlDeregisterCriticalServiceAfter-N", + "spring.cloud.consul.discovery.health-check-critical-timeout=1m", + "spring.cloud.consul.discovery.heartbeat.enabled=true" }, + webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) public class ConsulAutoRegistrationCheckTtlDeregisterCriticalServiceTests { @Autowired diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoRegistrationHealthCheckHeadersTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoRegistrationHealthCheckHeadersTests.java index de06d89f..7f72f119 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoRegistrationHealthCheckHeadersTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoRegistrationHealthCheckHeadersTests.java @@ -37,9 +37,11 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen * @author Lomesh Patel */ @RunWith(SpringRunner.class) -@SpringBootTest(classes = ConsulAutoRegistrationHealthCheckHeadersTests.TestConfig.class, properties = { - "spring.application.name=myTestService-DiscoveryHealthCheckTlsSkipVerify", - "spring.cloud.consul.discovery.health-check-headers.X-Config-Token=ACCESSTOKEN" }, webEnvironment = RANDOM_PORT) +@SpringBootTest(classes = ConsulAutoRegistrationHealthCheckHeadersTests.TestConfig.class, + properties = { + "spring.application.name=myTestService-DiscoveryHealthCheckTlsSkipVerify", + "spring.cloud.consul.discovery.health-check-headers.X-Config-Token=ACCESSTOKEN" }, + webEnvironment = RANDOM_PORT) public class ConsulAutoRegistrationHealthCheckHeadersTests { @Autowired diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoRegistrationHealthCheckTlsSkipVerifyTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoRegistrationHealthCheckTlsSkipVerifyTests.java index cac10585..1e61db24 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoRegistrationHealthCheckTlsSkipVerifyTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoRegistrationHealthCheckTlsSkipVerifyTests.java @@ -37,9 +37,12 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen * @author Patrick Hi */ @RunWith(SpringRunner.class) -@SpringBootTest(classes = ConsulAutoRegistrationHealthCheckTlsSkipVerifyTests.TestConfig.class, properties = { - "spring.application.name=myTestService-DiscoveryHealthCheckTlsSkipVerify", - "spring.cloud.consul.discovery.health-check-tls-skip-verify=true" }, webEnvironment = RANDOM_PORT) +@SpringBootTest( + classes = ConsulAutoRegistrationHealthCheckTlsSkipVerifyTests.TestConfig.class, + properties = { + "spring.application.name=myTestService-DiscoveryHealthCheckTlsSkipVerify", + "spring.cloud.consul.discovery.health-check-tls-skip-verify=true" }, + webEnvironment = RANDOM_PORT) public class ConsulAutoRegistrationHealthCheckTlsSkipVerifyTests { @Autowired diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceDeRegistrationDisabledTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceDeRegistrationDisabledTests.java index 4aa80133..4e2177d0 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceDeRegistrationDisabledTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceDeRegistrationDisabledTests.java @@ -41,10 +41,11 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen * @author Jon Freedman */ @RunWith(SpringRunner.class) -@SpringBootTest(classes = ConsulAutoServiceRegistrationDisabledTests.TestConfig.class, properties = { - "spring.application.name=myTestNotDeRegisteredService", - "spring.cloud.consul.discovery.instanceId=myTestNotDeRegisteredService-D", - "spring.cloud.consul.discovery.deregister=false" }, webEnvironment = RANDOM_PORT) +@SpringBootTest(classes = ConsulAutoServiceRegistrationDisabledTests.TestConfig.class, + properties = { "spring.application.name=myTestNotDeRegisteredService", + "spring.cloud.consul.discovery.instanceId=myTestNotDeRegisteredService-D", + "spring.cloud.consul.discovery.deregister=false" }, + webEnvironment = RANDOM_PORT) public class ConsulAutoServiceDeRegistrationDisabledTests { @Autowired diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedAgentAddressTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedAgentAddressTests.java index b8f47b99..3f4f2193 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedAgentAddressTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedAgentAddressTests.java @@ -41,11 +41,13 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen * @author Spencer Gibb */ @RunWith(SpringRunner.class) -@SpringBootTest(classes = ConsulAutoServiceRegistrationCustomizedAgentAddressTests.TestConfig.class, properties = { - "spring.application.name=myTestService-AA", - "spring.cloud.consul.discovery.instanceId=myTestService1-AA", - "spring.cloud.consul.discovery.serviceName=myprefix-${spring.application.name}", - "spring.cloud.consul.discovery.preferAgentAddress=true" }, webEnvironment = RANDOM_PORT) +@SpringBootTest( + classes = ConsulAutoServiceRegistrationCustomizedAgentAddressTests.TestConfig.class, + properties = { "spring.application.name=myTestService-AA", + "spring.cloud.consul.discovery.instanceId=myTestService1-AA", + "spring.cloud.consul.discovery.serviceName=myprefix-${spring.application.name}", + "spring.cloud.consul.discovery.preferAgentAddress=true" }, + webEnvironment = RANDOM_PORT) public class ConsulAutoServiceRegistrationCustomizedAgentAddressTests { @Autowired diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedDiscoveryPortTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedDiscoveryPortTests.java index 44854c9e..07180a40 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedDiscoveryPortTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedDiscoveryPortTests.java @@ -40,8 +40,10 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen * @author Spencer Gibb */ @RunWith(SpringRunner.class) -@SpringBootTest(classes = ConsulAutoServiceRegistrationCustomizedDiscoveryPortTests.TestConfig.class, properties = { - "spring.application.name=myTestService-DiscoveryPort" }, webEnvironment = DEFINED_PORT) +@SpringBootTest( + classes = ConsulAutoServiceRegistrationCustomizedDiscoveryPortTests.TestConfig.class, + properties = { "spring.application.name=myTestService-DiscoveryPort" }, + webEnvironment = DEFINED_PORT) public class ConsulAutoServiceRegistrationCustomizedDiscoveryPortTests { @Autowired diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedInstanceGroupTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedInstanceGroupTests.java index ba97dcd7..41634dc0 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedInstanceGroupTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedInstanceGroupTests.java @@ -45,10 +45,12 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen * @author Jin Zhang */ @RunWith(SpringRunner.class) -@SpringBootTest(classes = ConsulAutoServiceRegistrationCustomizedInstanceGroupTests.TestConfig.class, properties = { - "spring.application.name=myTestService-WithGroup", - "spring.cloud.consul.discovery.instanceId=myTestService1-WithGroup", - "spring.cloud.consul.discovery.instanceGroup=test" }, webEnvironment = RANDOM_PORT) +@SpringBootTest( + classes = ConsulAutoServiceRegistrationCustomizedInstanceGroupTests.TestConfig.class, + properties = { "spring.application.name=myTestService-WithGroup", + "spring.cloud.consul.discovery.instanceId=myTestService1-WithGroup", + "spring.cloud.consul.discovery.instanceGroup=test" }, + webEnvironment = RANDOM_PORT) public class ConsulAutoServiceRegistrationCustomizedInstanceGroupTests { @Autowired diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedInstanceZoneTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedInstanceZoneTests.java index 6ea8c6cd..b322cd83 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedInstanceZoneTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedInstanceZoneTests.java @@ -40,11 +40,13 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen * @author Sixian Liu */ @RunWith(SpringRunner.class) -@SpringBootTest(classes = ConsulAutoServiceRegistrationCustomizedInstanceZoneTests.TestConfig.class, properties = { - "spring.application.name=myTestService-WithZone", - "spring.cloud.consul.discovery.instanceId=myTestService1-WithZone", - "spring.cloud.consul.discovery.instanceZone=zone1", - "spring.cloud.consul.discovery.defaultZoneMetadataName=myZone" }, webEnvironment = RANDOM_PORT) +@SpringBootTest( + classes = ConsulAutoServiceRegistrationCustomizedInstanceZoneTests.TestConfig.class, + properties = { "spring.application.name=myTestService-WithZone", + "spring.cloud.consul.discovery.instanceId=myTestService1-WithZone", + "spring.cloud.consul.discovery.instanceZone=zone1", + "spring.cloud.consul.discovery.defaultZoneMetadataName=myZone" }, + webEnvironment = RANDOM_PORT) public class ConsulAutoServiceRegistrationCustomizedInstanceZoneTests { @Autowired diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedManagementServicePortTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedManagementServicePortTests.java index 2c7e9ad1..acc8bd5f 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedManagementServicePortTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedManagementServicePortTests.java @@ -45,13 +45,15 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen * @author Lomesh Patel (lomeshpatel) */ @RunWith(SpringRunner.class) -@SpringBootTest(classes = ConsulAutoServiceRegistrationCustomizedManagementServicePortTests.TestConfig.class, properties = { - "spring.application.name=myTestService-GG", - "spring.cloud.consul.discovery.instanceId=myTestService1-GG", - "spring.cloud.consul.discovery.registerHealthCheck=false", - "spring.cloud.consul.discovery.managementPort=4452", - "spring.cloud.consul.discovery.serviceName=myprefix-${spring.application.name}", - "management.server.port=0" }, webEnvironment = RANDOM_PORT) +@SpringBootTest( + classes = ConsulAutoServiceRegistrationCustomizedManagementServicePortTests.TestConfig.class, + properties = { "spring.application.name=myTestService-GG", + "spring.cloud.consul.discovery.instanceId=myTestService1-GG", + "spring.cloud.consul.discovery.registerHealthCheck=false", + "spring.cloud.consul.discovery.managementPort=4452", + "spring.cloud.consul.discovery.serviceName=myprefix-${spring.application.name}", + "management.server.port=0" }, + webEnvironment = RANDOM_PORT) public class ConsulAutoServiceRegistrationCustomizedManagementServicePortTests { @Autowired diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedPropsTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedPropsTests.java index aa4fc209..1d125cc8 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedPropsTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedPropsTests.java @@ -45,14 +45,16 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen * @author Venil Noronha */ @RunWith(SpringRunner.class) -@SpringBootTest(classes = ConsulAutoServiceRegistrationCustomizedPropsTests.TestPropsConfig.class, properties = { - "spring.application.name=myTestService-B", - "spring.cloud.consul.discovery.instanceId=myTestService1-B", - "spring.cloud.consul.discovery.port=4452", - "spring.cloud.consul.discovery.hostname=myhost", - "spring.cloud.consul.discovery.ipAddress=10.0.0.1", - "spring.cloud.consul.discovery.registerHealthCheck=false", - "spring.cloud.consul.discovery.failFast=false" }, webEnvironment = RANDOM_PORT) +@SpringBootTest( + classes = ConsulAutoServiceRegistrationCustomizedPropsTests.TestPropsConfig.class, + properties = { "spring.application.name=myTestService-B", + "spring.cloud.consul.discovery.instanceId=myTestService1-B", + "spring.cloud.consul.discovery.port=4452", + "spring.cloud.consul.discovery.hostname=myhost", + "spring.cloud.consul.discovery.ipAddress=10.0.0.1", + "spring.cloud.consul.discovery.registerHealthCheck=false", + "spring.cloud.consul.discovery.failFast=false" }, + webEnvironment = RANDOM_PORT) public class ConsulAutoServiceRegistrationCustomizedPropsTests { @Autowired diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedServiceNameTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedServiceNameTests.java index 5907dd6d..5793cb2c 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedServiceNameTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedServiceNameTests.java @@ -40,10 +40,12 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen * @author Spencer Gibb */ @RunWith(SpringRunner.class) -@SpringBootTest(classes = ConsulAutoServiceRegistrationCustomizedServiceNameTests.TestConfig.class, properties = { - "spring.application.name=myTestService-CC", - "spring.cloud.consul.discovery.instanceId=myTestService1-CC", - "spring.cloud.consul.discovery.serviceName=myprefix-${spring.application.name}" }, webEnvironment = RANDOM_PORT) +@SpringBootTest( + classes = ConsulAutoServiceRegistrationCustomizedServiceNameTests.TestConfig.class, + properties = { "spring.application.name=myTestService-CC", + "spring.cloud.consul.discovery.instanceId=myTestService1-CC", + "spring.cloud.consul.discovery.serviceName=myprefix-${spring.application.name}" }, + webEnvironment = RANDOM_PORT) public class ConsulAutoServiceRegistrationCustomizedServiceNameTests { @Autowired diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedServletContextTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedServletContextTests.java index 1cc72d22..b703520f 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedServletContextTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedServletContextTests.java @@ -38,10 +38,12 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen * @author Piotr Wielgolaski */ @RunWith(SpringRunner.class) -@SpringBootTest(classes = ConsulAutoServiceRegistrationCustomizedServletContextTests.TestConfig.class, properties = { - "spring.application.name=myTestService-WithServletContext", - "spring.cloud.consul.discovery.instanceId=myTestService1-WithServletContext", - "server.servlet.context-path=/customContext" }, webEnvironment = RANDOM_PORT) +@SpringBootTest( + classes = ConsulAutoServiceRegistrationCustomizedServletContextTests.TestConfig.class, + properties = { "spring.application.name=myTestService-WithServletContext", + "spring.cloud.consul.discovery.instanceId=myTestService1-WithServletContext", + "server.servlet.context-path=/customContext" }, + webEnvironment = RANDOM_PORT) public class ConsulAutoServiceRegistrationCustomizedServletContextTests { @Autowired diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedTests.java index 3e2b7e7f..9d9b9de3 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedTests.java @@ -38,8 +38,9 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen * @author Marcin Biegan */ @RunWith(SpringRunner.class) -@SpringBootTest(classes = ConsulAutoServiceRegistrationCustomizedTests.MyTestConfig.class, properties = { - "spring.application.name=testCustomAutoServiceRegistration" }, webEnvironment = RANDOM_PORT) +@SpringBootTest(classes = ConsulAutoServiceRegistrationCustomizedTests.MyTestConfig.class, + properties = { "spring.application.name=testCustomAutoServiceRegistration" }, + webEnvironment = RANDOM_PORT) public class ConsulAutoServiceRegistrationCustomizedTests { @Autowired diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationDefaultCheckTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationDefaultCheckTests.java index fc34bb35..d7bb979f 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationDefaultCheckTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationDefaultCheckTests.java @@ -34,12 +34,13 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen * @deprecated remove in Edgware */ @RunWith(SpringRunner.class) -@SpringBootTest(classes = TestPropsConfig.class, properties = { - "spring.application.name=myTestServiceDefaultChecks", - "spring.cloud.consul.discovery.instanceId=myTestServiceDefaultChecks", - "spring.cloud.consul.discovery.healthCheckCriticalTimeout=30m", - "spring.cloud.consul.discovery.healthCheckInterval=19s", - "spring.cloud.consul.discovery.healthCheckTimeout=12s" }, webEnvironment = RANDOM_PORT) +@SpringBootTest(classes = TestPropsConfig.class, + properties = { "spring.application.name=myTestServiceDefaultChecks", + "spring.cloud.consul.discovery.instanceId=myTestServiceDefaultChecks", + "spring.cloud.consul.discovery.healthCheckCriticalTimeout=30m", + "spring.cloud.consul.discovery.healthCheckInterval=19s", + "spring.cloud.consul.discovery.healthCheckTimeout=12s" }, + webEnvironment = RANDOM_PORT) public class ConsulAutoServiceRegistrationDefaultCheckTests { @Autowired diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationDefaultPortTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationDefaultPortTests.java index 29421b95..c1ce4523 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationDefaultPortTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationDefaultPortTests.java @@ -40,9 +40,10 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen * @author Spencer Gibb */ @RunWith(SpringRunner.class) -@SpringBootTest(classes = ConsulAutoServiceRegistrationDefaultPortTests.TestConfig.class, properties = { - "spring.application.name=myTestService2-DD", - "spring.cloud.consul.discovery.instanceId=myTestService2-DD" }, webEnvironment = RANDOM_PORT) +@SpringBootTest(classes = ConsulAutoServiceRegistrationDefaultPortTests.TestConfig.class, + properties = { "spring.application.name=myTestService2-DD", + "spring.cloud.consul.discovery.instanceId=myTestService2-DD" }, + webEnvironment = RANDOM_PORT) public class ConsulAutoServiceRegistrationDefaultPortTests { @Autowired diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationDisabledTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationDisabledTests.java index 4409ed80..a54db03d 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationDisabledTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationDisabledTests.java @@ -40,9 +40,10 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen * @author Spencer Gibb */ @RunWith(SpringRunner.class) -@SpringBootTest(classes = ConsulAutoServiceRegistrationDisabledTests.TestConfig.class, properties = { - "spring.application.name=myTestNotRegisteredService2", - "spring.cloud.service-registry.auto-registration.enabled=false" }, webEnvironment = RANDOM_PORT) +@SpringBootTest(classes = ConsulAutoServiceRegistrationDisabledTests.TestConfig.class, + properties = { "spring.application.name=myTestNotRegisteredService2", + "spring.cloud.service-registry.auto-registration.enabled=false" }, + webEnvironment = RANDOM_PORT) public class ConsulAutoServiceRegistrationDisabledTests { @Autowired diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationManagementCustomizerTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationManagementCustomizerTests.java index b8f63a7d..46941eb5 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationManagementCustomizerTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationManagementCustomizerTests.java @@ -43,10 +43,11 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen @RunWith(SpringRunner.class) @SpringBootTest(classes = { ConsulAutoServiceRegistrationManagementCustomizerTests.TestConfig.class, - ConsulAutoServiceRegistrationManagementCustomizerTests.ManagementConfig.class }, properties = { - "spring.application.name=myTestService-SS", + ConsulAutoServiceRegistrationManagementCustomizerTests.ManagementConfig.class }, + properties = { "spring.application.name=myTestService-SS", "spring.cloud.consul.discovery.registerHealthCheck=false", - "management.server.port=4453" }, webEnvironment = RANDOM_PORT) + "management.server.port=4453" }, + webEnvironment = RANDOM_PORT) public class ConsulAutoServiceRegistrationManagementCustomizerTests { @Autowired diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationManagementDisabledServiceTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationManagementDisabledServiceTests.java index 412365bc..53f047c1 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationManagementDisabledServiceTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationManagementDisabledServiceTests.java @@ -42,12 +42,14 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen * @author Dmitry Zhikharev (jihor) */ @RunWith(SpringRunner.class) -@SpringBootTest(classes = ConsulAutoServiceRegistrationManagementDisabledServiceTests.TestConfig.class, properties = { - "spring.application.name=myTestService-NM", - "spring.cloud.consul.discovery.instanceId=myTestService1-NM", - "spring.cloud.service-registry.auto-registration.register-management=false", - "spring.cloud.consul.discovery.managementPort=4453", - "management.port=0" }, webEnvironment = RANDOM_PORT) +@SpringBootTest( + classes = ConsulAutoServiceRegistrationManagementDisabledServiceTests.TestConfig.class, + properties = { "spring.application.name=myTestService-NM", + "spring.cloud.consul.discovery.instanceId=myTestService1-NM", + "spring.cloud.service-registry.auto-registration.register-management=false", + "spring.cloud.consul.discovery.managementPort=4453", + "management.port=0" }, + webEnvironment = RANDOM_PORT) public class ConsulAutoServiceRegistrationManagementDisabledServiceTests { @Autowired diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationManagementServiceTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationManagementServiceTests.java index 1ef7b87b..a630bf26 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationManagementServiceTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationManagementServiceTests.java @@ -43,10 +43,12 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen * @author Lomesh Patel (lomeshpatel) */ @RunWith(SpringRunner.class) -@SpringBootTest(classes = ConsulAutoServiceRegistrationManagementServiceTests.TestConfig.class, properties = { - "spring.application.name=myTestService-EE", - "spring.cloud.consul.discovery.registerHealthCheck=false", - "management.server.port=4452" }, webEnvironment = RANDOM_PORT) +@SpringBootTest( + classes = ConsulAutoServiceRegistrationManagementServiceTests.TestConfig.class, + properties = { "spring.application.name=myTestService-EE", + "spring.cloud.consul.discovery.registerHealthCheck=false", + "management.server.port=4452" }, + webEnvironment = RANDOM_PORT) public class ConsulAutoServiceRegistrationManagementServiceTests { @Autowired diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationNonWebTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationNonWebTests.java index 9fdb34fe..1aa7e69e 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationNonWebTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationNonWebTests.java @@ -38,9 +38,9 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen * @author Spencer Gibb */ @RunWith(SpringRunner.class) -@SpringBootTest(classes = ConsulAutoServiceRegistrationNonWebTests.TestConfig.class, properties = { - "spring.application.name=consulNonWebTest", - "server.port=32111" }, webEnvironment = NONE) +@SpringBootTest(classes = ConsulAutoServiceRegistrationNonWebTests.TestConfig.class, + properties = { "spring.application.name=consulNonWebTest", "server.port=32111" }, + webEnvironment = NONE) public class ConsulAutoServiceRegistrationNonWebTests { @Autowired diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationTests.java index 0a276ea6..55222af2 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationTests.java @@ -44,8 +44,8 @@ import static org.springframework.cloud.consul.serviceregistry.ConsulAutoRegistr * @author Venil Noronha */ @RunWith(SpringRunner.class) -@SpringBootTest(properties = { - "spring.application.name=myTestService1-FF::something" }, webEnvironment = RANDOM_PORT) +@SpringBootTest(properties = { "spring.application.name=myTestService1-FF::something" }, + webEnvironment = RANDOM_PORT) public class ConsulAutoServiceRegistrationTests { @Autowired diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulServiceRegistryCheckTtlTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulServiceRegistryCheckTtlTests.java index 5e54bca8..824be1c2 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulServiceRegistryCheckTtlTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulServiceRegistryCheckTtlTests.java @@ -41,9 +41,11 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Alexey Savchuk */ @RunWith(SpringRunner.class) -@SpringBootTest(classes = ConsulServiceRegistryCheckTtlTests.TestConfig.class, properties = { - "spring.application.name=myConsulServiceRegistryCheckTtlTestService-S", - "spring.cloud.consul.discovery.heartbeat.enabled=true" }, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) +@SpringBootTest(classes = ConsulServiceRegistryCheckTtlTests.TestConfig.class, + properties = { + "spring.application.name=myConsulServiceRegistryCheckTtlTestService-S", + "spring.cloud.consul.discovery.heartbeat.enabled=true" }, + webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) public class ConsulServiceRegistryCheckTtlTests { @LocalServerPort diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulServiceRegistryTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulServiceRegistryTests.java index 45bf7429..ed4d6027 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulServiceRegistryTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulServiceRegistryTests.java @@ -41,7 +41,8 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen * @author Spencer Gibb */ @RunWith(SpringRunner.class) -@SpringBootTest(properties = "spring.cloud.consul.discovery.query-passing=true", webEnvironment = RANDOM_PORT) +@SpringBootTest(properties = "spring.cloud.consul.discovery.query-passing=true", + webEnvironment = RANDOM_PORT) public class ConsulServiceRegistryTests { @Autowired(required = false)