From 5ddae556c6e99e5cf9bc766fac4f41c7c5c02188 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Fri, 29 Jul 2022 19:42:27 +0000 Subject: [PATCH 1/3] Update SNAPSHOT to 4.0.0-M4 --- docs/pom.xml | 2 +- pom.xml | 14 +++++++------- spring-cloud-consul-binder/pom.xml | 2 +- spring-cloud-consul-config/pom.xml | 2 +- spring-cloud-consul-core/pom.xml | 2 +- spring-cloud-consul-dependencies/pom.xml | 4 ++-- spring-cloud-consul-discovery/pom.xml | 2 +- spring-cloud-consul-integration-tests/pom.xml | 2 +- .../spring-cloud-consul-bootstrap-tests/pom.xml | 2 +- .../pom.xml | 2 +- .../spring-cloud-consul-configdata-tests/pom.xml | 2 +- spring-cloud-starter-consul-all/pom.xml | 2 +- spring-cloud-starter-consul-bus/pom.xml | 2 +- spring-cloud-starter-consul-config/pom.xml | 2 +- spring-cloud-starter-consul-discovery/pom.xml | 2 +- spring-cloud-starter-consul/pom.xml | 2 +- 16 files changed, 23 insertions(+), 23 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index baf6d7fa..f428b936 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 4.0.0-SNAPSHOT + 4.0.0-M4 spring-cloud-consul-docs jar diff --git a/pom.xml b/pom.xml index 51b40781..462b5ec7 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 4.0.0-SNAPSHOT + 4.0.0-M4 pom Spring Cloud Consul Spring Cloud Consul @@ -14,18 +14,18 @@ org.springframework.cloud spring-cloud-build - 4.0.0-SNAPSHOT + 4.0.0-M4 - 4.0.0-SNAPSHOT - 4.0.0-SNAPSHOT - 4.0.0-SNAPSHOT + 4.0.0-M4 + 4.0.0-M4 + 4.0.0-M4 1.0.3.RELEASE - 4.0.0-SNAPSHOT - 4.0.0-SNAPSHOT + 4.0.0-M4 + 4.0.0-M4 1.16.3 diff --git a/spring-cloud-consul-binder/pom.xml b/spring-cloud-consul-binder/pom.xml index 5ba95c1d..751709c0 100644 --- a/spring-cloud-consul-binder/pom.xml +++ b/spring-cloud-consul-binder/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul - 4.0.0-SNAPSHOT + 4.0.0-M4 .. diff --git a/spring-cloud-consul-config/pom.xml b/spring-cloud-consul-config/pom.xml index c41ef4dd..701dbe32 100644 --- a/spring-cloud-consul-config/pom.xml +++ b/spring-cloud-consul-config/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul - 4.0.0-SNAPSHOT + 4.0.0-M4 .. diff --git a/spring-cloud-consul-core/pom.xml b/spring-cloud-consul-core/pom.xml index 1deb80f1..8f1e86f4 100644 --- a/spring-cloud-consul-core/pom.xml +++ b/spring-cloud-consul-core/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul - 4.0.0-SNAPSHOT + 4.0.0-M4 .. diff --git a/spring-cloud-consul-dependencies/pom.xml b/spring-cloud-consul-dependencies/pom.xml index 856e5c15..49594963 100644 --- a/spring-cloud-consul-dependencies/pom.xml +++ b/spring-cloud-consul-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 4.0.0-SNAPSHOT + 4.0.0-M4 spring-cloud-consul-dependencies - 4.0.0-SNAPSHOT + 4.0.0-M4 pom spring-cloud-consul-dependencies Spring Cloud Consul Dependencies diff --git a/spring-cloud-consul-discovery/pom.xml b/spring-cloud-consul-discovery/pom.xml index f2b88936..19b2fcdd 100644 --- a/spring-cloud-consul-discovery/pom.xml +++ b/spring-cloud-consul-discovery/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul - 4.0.0-SNAPSHOT + 4.0.0-M4 .. diff --git a/spring-cloud-consul-integration-tests/pom.xml b/spring-cloud-consul-integration-tests/pom.xml index b916c872..f9d53f54 100644 --- a/spring-cloud-consul-integration-tests/pom.xml +++ b/spring-cloud-consul-integration-tests/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 4.0.0-SNAPSHOT + 4.0.0-M4 .. spring-cloud-consul-integration-tests diff --git a/spring-cloud-consul-integration-tests/spring-cloud-consul-bootstrap-tests/pom.xml b/spring-cloud-consul-integration-tests/spring-cloud-consul-bootstrap-tests/pom.xml index 236f5963..e060cfd3 100644 --- a/spring-cloud-consul-integration-tests/spring-cloud-consul-bootstrap-tests/pom.xml +++ b/spring-cloud-consul-integration-tests/spring-cloud-consul-bootstrap-tests/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul-integration-tests - 4.0.0-SNAPSHOT + 4.0.0-M4 .. diff --git a/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-retry-tests/pom.xml b/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-retry-tests/pom.xml index 50f81cca..761827da 100644 --- a/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-retry-tests/pom.xml +++ b/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-retry-tests/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul-integration-tests - 4.0.0-SNAPSHOT + 4.0.0-M4 .. diff --git a/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-tests/pom.xml b/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-tests/pom.xml index c4eb5f7c..e862c029 100644 --- a/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-tests/pom.xml +++ b/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-tests/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul-integration-tests - 4.0.0-SNAPSHOT + 4.0.0-M4 .. diff --git a/spring-cloud-starter-consul-all/pom.xml b/spring-cloud-starter-consul-all/pom.xml index 7c4c0af0..163b574d 100644 --- a/spring-cloud-starter-consul-all/pom.xml +++ b/spring-cloud-starter-consul-all/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 4.0.0-SNAPSHOT + 4.0.0-M4 .. spring-cloud-starter-consul-all diff --git a/spring-cloud-starter-consul-bus/pom.xml b/spring-cloud-starter-consul-bus/pom.xml index 7cafccc1..f52a8e90 100644 --- a/spring-cloud-starter-consul-bus/pom.xml +++ b/spring-cloud-starter-consul-bus/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 4.0.0-SNAPSHOT + 4.0.0-M4 .. spring-cloud-starter-consul-bus diff --git a/spring-cloud-starter-consul-config/pom.xml b/spring-cloud-starter-consul-config/pom.xml index a6a7184a..ceefc64f 100644 --- a/spring-cloud-starter-consul-config/pom.xml +++ b/spring-cloud-starter-consul-config/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 4.0.0-SNAPSHOT + 4.0.0-M4 .. spring-cloud-starter-consul-config diff --git a/spring-cloud-starter-consul-discovery/pom.xml b/spring-cloud-starter-consul-discovery/pom.xml index 63f05b05..d6fe565f 100644 --- a/spring-cloud-starter-consul-discovery/pom.xml +++ b/spring-cloud-starter-consul-discovery/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 4.0.0-SNAPSHOT + 4.0.0-M4 .. spring-cloud-starter-consul-discovery diff --git a/spring-cloud-starter-consul/pom.xml b/spring-cloud-starter-consul/pom.xml index 57f3b42d..0d18fdc2 100644 --- a/spring-cloud-starter-consul/pom.xml +++ b/spring-cloud-starter-consul/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 4.0.0-SNAPSHOT + 4.0.0-M4 .. spring-cloud-starter-consul From c28b319305bb650aa52110b38150add2877bd001 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Fri, 29 Jul 2022 19:45:13 +0000 Subject: [PATCH 2/3] Going back to snapshots --- docs/pom.xml | 2 +- pom.xml | 14 +++++++------- spring-cloud-consul-binder/pom.xml | 2 +- spring-cloud-consul-config/pom.xml | 2 +- spring-cloud-consul-core/pom.xml | 2 +- spring-cloud-consul-dependencies/pom.xml | 4 ++-- spring-cloud-consul-discovery/pom.xml | 2 +- spring-cloud-consul-integration-tests/pom.xml | 2 +- .../spring-cloud-consul-bootstrap-tests/pom.xml | 2 +- .../pom.xml | 2 +- .../spring-cloud-consul-configdata-tests/pom.xml | 2 +- spring-cloud-starter-consul-all/pom.xml | 2 +- spring-cloud-starter-consul-bus/pom.xml | 2 +- spring-cloud-starter-consul-config/pom.xml | 2 +- spring-cloud-starter-consul-discovery/pom.xml | 2 +- spring-cloud-starter-consul/pom.xml | 2 +- 16 files changed, 23 insertions(+), 23 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index f428b936..baf6d7fa 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 4.0.0-M4 + 4.0.0-SNAPSHOT spring-cloud-consul-docs jar diff --git a/pom.xml b/pom.xml index 462b5ec7..51b40781 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 4.0.0-M4 + 4.0.0-SNAPSHOT pom Spring Cloud Consul Spring Cloud Consul @@ -14,18 +14,18 @@ org.springframework.cloud spring-cloud-build - 4.0.0-M4 + 4.0.0-SNAPSHOT - 4.0.0-M4 - 4.0.0-M4 - 4.0.0-M4 + 4.0.0-SNAPSHOT + 4.0.0-SNAPSHOT + 4.0.0-SNAPSHOT 1.0.3.RELEASE - 4.0.0-M4 - 4.0.0-M4 + 4.0.0-SNAPSHOT + 4.0.0-SNAPSHOT 1.16.3 diff --git a/spring-cloud-consul-binder/pom.xml b/spring-cloud-consul-binder/pom.xml index 751709c0..5ba95c1d 100644 --- a/spring-cloud-consul-binder/pom.xml +++ b/spring-cloud-consul-binder/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul - 4.0.0-M4 + 4.0.0-SNAPSHOT .. diff --git a/spring-cloud-consul-config/pom.xml b/spring-cloud-consul-config/pom.xml index 701dbe32..c41ef4dd 100644 --- a/spring-cloud-consul-config/pom.xml +++ b/spring-cloud-consul-config/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul - 4.0.0-M4 + 4.0.0-SNAPSHOT .. diff --git a/spring-cloud-consul-core/pom.xml b/spring-cloud-consul-core/pom.xml index 8f1e86f4..1deb80f1 100644 --- a/spring-cloud-consul-core/pom.xml +++ b/spring-cloud-consul-core/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul - 4.0.0-M4 + 4.0.0-SNAPSHOT .. diff --git a/spring-cloud-consul-dependencies/pom.xml b/spring-cloud-consul-dependencies/pom.xml index 49594963..856e5c15 100644 --- a/spring-cloud-consul-dependencies/pom.xml +++ b/spring-cloud-consul-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 4.0.0-M4 + 4.0.0-SNAPSHOT spring-cloud-consul-dependencies - 4.0.0-M4 + 4.0.0-SNAPSHOT pom spring-cloud-consul-dependencies Spring Cloud Consul Dependencies diff --git a/spring-cloud-consul-discovery/pom.xml b/spring-cloud-consul-discovery/pom.xml index 19b2fcdd..f2b88936 100644 --- a/spring-cloud-consul-discovery/pom.xml +++ b/spring-cloud-consul-discovery/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul - 4.0.0-M4 + 4.0.0-SNAPSHOT .. diff --git a/spring-cloud-consul-integration-tests/pom.xml b/spring-cloud-consul-integration-tests/pom.xml index f9d53f54..b916c872 100644 --- a/spring-cloud-consul-integration-tests/pom.xml +++ b/spring-cloud-consul-integration-tests/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 4.0.0-M4 + 4.0.0-SNAPSHOT .. spring-cloud-consul-integration-tests diff --git a/spring-cloud-consul-integration-tests/spring-cloud-consul-bootstrap-tests/pom.xml b/spring-cloud-consul-integration-tests/spring-cloud-consul-bootstrap-tests/pom.xml index e060cfd3..236f5963 100644 --- a/spring-cloud-consul-integration-tests/spring-cloud-consul-bootstrap-tests/pom.xml +++ b/spring-cloud-consul-integration-tests/spring-cloud-consul-bootstrap-tests/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul-integration-tests - 4.0.0-M4 + 4.0.0-SNAPSHOT .. diff --git a/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-retry-tests/pom.xml b/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-retry-tests/pom.xml index 761827da..50f81cca 100644 --- a/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-retry-tests/pom.xml +++ b/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-retry-tests/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul-integration-tests - 4.0.0-M4 + 4.0.0-SNAPSHOT .. diff --git a/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-tests/pom.xml b/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-tests/pom.xml index e862c029..c4eb5f7c 100644 --- a/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-tests/pom.xml +++ b/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-tests/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul-integration-tests - 4.0.0-M4 + 4.0.0-SNAPSHOT .. diff --git a/spring-cloud-starter-consul-all/pom.xml b/spring-cloud-starter-consul-all/pom.xml index 163b574d..7c4c0af0 100644 --- a/spring-cloud-starter-consul-all/pom.xml +++ b/spring-cloud-starter-consul-all/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 4.0.0-M4 + 4.0.0-SNAPSHOT .. spring-cloud-starter-consul-all diff --git a/spring-cloud-starter-consul-bus/pom.xml b/spring-cloud-starter-consul-bus/pom.xml index f52a8e90..7cafccc1 100644 --- a/spring-cloud-starter-consul-bus/pom.xml +++ b/spring-cloud-starter-consul-bus/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 4.0.0-M4 + 4.0.0-SNAPSHOT .. spring-cloud-starter-consul-bus diff --git a/spring-cloud-starter-consul-config/pom.xml b/spring-cloud-starter-consul-config/pom.xml index ceefc64f..a6a7184a 100644 --- a/spring-cloud-starter-consul-config/pom.xml +++ b/spring-cloud-starter-consul-config/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 4.0.0-M4 + 4.0.0-SNAPSHOT .. spring-cloud-starter-consul-config diff --git a/spring-cloud-starter-consul-discovery/pom.xml b/spring-cloud-starter-consul-discovery/pom.xml index d6fe565f..63f05b05 100644 --- a/spring-cloud-starter-consul-discovery/pom.xml +++ b/spring-cloud-starter-consul-discovery/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 4.0.0-M4 + 4.0.0-SNAPSHOT .. spring-cloud-starter-consul-discovery diff --git a/spring-cloud-starter-consul/pom.xml b/spring-cloud-starter-consul/pom.xml index 0d18fdc2..57f3b42d 100644 --- a/spring-cloud-starter-consul/pom.xml +++ b/spring-cloud-starter-consul/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 4.0.0-M4 + 4.0.0-SNAPSHOT .. spring-cloud-starter-consul From b76d500bca5ac2a2dadbe41250928daf9e7cea6f Mon Sep 17 00:00:00 2001 From: Ryan Date: Mon, 1 Aug 2022 17:08:06 +0100 Subject: [PATCH 3/3] Extract consul client builder to distinct bean (#790) * extract consul client builder to distinct bean rather than static instantiation to allow injection of custom clients * use supplier to allow new builder to be instantiated every call * rename variable * re-order imports to resolve checkstyle issues * fix compilation issues --- .../ConsulConfigDataLocationResolver.java | 3 ++- .../cloud/consul/ConsulAutoConfiguration.java | 25 +++++++++++++++---- .../ConsulConfigServerBootstrapper.java | 3 ++- 3 files changed, 24 insertions(+), 7 deletions(-) diff --git a/spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulConfigDataLocationResolver.java b/spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulConfigDataLocationResolver.java index 1ebf3edc..0a0621e9 100644 --- a/spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulConfigDataLocationResolver.java +++ b/spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulConfigDataLocationResolver.java @@ -184,7 +184,8 @@ public class ConsulConfigDataLocationResolver implements ConfigDataLocationResol protected ConsulClient createConsulClient(BootstrapContext context) { ConsulProperties properties = context.get(ConsulProperties.class); - return ConsulAutoConfiguration.createConsulClient(properties); + return ConsulAutoConfiguration.createConsulClient(properties, + ConsulAutoConfiguration.createConsulRawClientBuilder()); } protected ConsulProperties loadProperties(ConfigDataLocationResolverContext resolverContext, diff --git a/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/ConsulAutoConfiguration.java b/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/ConsulAutoConfiguration.java index fa983841..3717cbc7 100644 --- a/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/ConsulAutoConfiguration.java +++ b/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/ConsulAutoConfiguration.java @@ -16,9 +16,12 @@ package org.springframework.cloud.consul; +import java.util.function.Supplier; + import com.ecwid.consul.transport.TLSConfig; import com.ecwid.consul.v1.ConsulClient; import com.ecwid.consul.v1.ConsulRawClient; +import com.ecwid.consul.v1.ConsulRawClient.Builder; import org.aspectj.lang.annotation.Aspect; import org.springframework.boot.actuate.autoconfigure.endpoint.condition.ConditionalOnAvailableEndpoint; @@ -54,16 +57,28 @@ public class ConsulAutoConfiguration { @Bean @ConditionalOnMissingBean - public ConsulClient consulClient(ConsulProperties consulProperties) { - return createConsulClient(consulProperties); + public Supplier consulRawClientBuilderSupplier() { + return createConsulRawClientBuilder(); } - public static ConsulClient createConsulClient(ConsulProperties consulProperties) { + @Bean + @ConditionalOnMissingBean + public ConsulClient consulClient(ConsulProperties consulProperties, + Supplier consulRawClientBuilderSupplier) { + return createConsulClient(consulProperties, consulRawClientBuilderSupplier); + } + + public static Supplier createConsulRawClientBuilder() { + return Builder::builder; + } + + public static ConsulClient createConsulClient(ConsulProperties consulProperties, + Supplier consulRawClientBuilderSupplier) { + ConsulRawClient.Builder builder = consulRawClientBuilderSupplier.get(); final String agentPath = consulProperties.getPath(); final String agentHost = StringUtils.hasLength(consulProperties.getScheme()) ? consulProperties.getScheme() + "://" + consulProperties.getHost() : consulProperties.getHost(); - final ConsulRawClient.Builder builder = ConsulRawClient.Builder.builder().setHost(agentHost) - .setPort(consulProperties.getPort()); + builder.setHost(agentHost).setPort(consulProperties.getPort()); if (consulProperties.getTls() != null) { ConsulProperties.TLSConfig tls = consulProperties.getTls(); diff --git a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/configclient/ConsulConfigServerBootstrapper.java b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/configclient/ConsulConfigServerBootstrapper.java index 30a35d5d..e93717b6 100644 --- a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/configclient/ConsulConfigServerBootstrapper.java +++ b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/configclient/ConsulConfigServerBootstrapper.java @@ -59,7 +59,8 @@ public class ConsulConfigServerBootstrapper implements BootstrapRegistryInitiali return null; } ConsulProperties consulProperties = context.get(ConsulProperties.class); - return ConsulAutoConfiguration.createConsulClient(consulProperties); + return ConsulAutoConfiguration.createConsulClient(consulProperties, + ConsulAutoConfiguration.createConsulRawClientBuilder()); }); registry.registerIfAbsent(ConsulDiscoveryClient.class, context -> { Binder binder = context.get(Binder.class);