This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit db7957bc311dff31f89ee8284275ea80b087fc49
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Sat Aug 29 10:38:46 2020 +0200
Update consul
---
.../component/consul/cloud/ConsulServiceDiscovery.java | 7 +------
.../apache/camel/component/consul/ConsulTestSupport.java | 2 +-
.../endpoint/dsl/ConsulEndpointBuilderFactory.java | 16 +++-------------
parent/pom.xml | 2 +-
4 files changed, 6 insertions(+), 21 deletions(-)
diff --git
a/components/camel-consul/src/main/java/org/apache/camel/component/consul/cloud/ConsulServiceDiscovery.java
b/components/camel-consul/src/main/java/org/apache/camel/component/consul/cloud/ConsulServiceDiscovery.java
index 72303bf..da3bde4 100644
---
a/components/camel-consul/src/main/java/org/apache/camel/component/consul/cloud/ConsulServiceDiscovery.java
+++
b/components/camel-consul/src/main/java/org/apache/camel/component/consul/cloud/ConsulServiceDiscovery.java
@@ -72,9 +72,8 @@ public final class ConsulServiceDiscovery extends
DefaultServiceDiscovery {
ObjectHelper.ifNotEmpty(service.getServiceId(), val ->
meta.put(ServiceDefinition.SERVICE_META_ID, val));
ObjectHelper.ifNotEmpty(service.getServiceName(), val ->
meta.put(ServiceDefinition.SERVICE_META_NAME, val));
ObjectHelper.ifNotEmpty(service.getNode(), val ->
meta.put("service.node", val));
+ ObjectHelper.ifNotEmpty(service.getServiceMeta(), meta::putAll);
- // Consul < 1.0.7 does not have a concept of meta-data so meta is
- // retrieved using tags
List<String> tags = service.getServiceTags();
if (tags != null) {
for (String tag : service.getServiceTags()) {
@@ -87,10 +86,6 @@ public final class ConsulServiceDiscovery extends
DefaultServiceDiscovery {
}
}
- // From Consul => 1.0.7, a new meta data attribute has been introduced
- // and it is now taken ito account
- service.getServiceMeta().ifPresent(serviceMeta ->
serviceMeta.forEach(meta::put));
-
return new DefaultServiceDefinition(
serviceName, service.getServiceAddress(),
service.getServicePort(), meta,
new DefaultServiceHealth(
diff --git
a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulTestSupport.java
b/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulTestSupport.java
index b152e31..67cd02a 100644
---
a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulTestSupport.java
+++
b/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulTestSupport.java
@@ -28,7 +28,7 @@ import org.apache.camel.test.testcontainers.junit5.Wait;
import org.testcontainers.containers.GenericContainer;
public class ConsulTestSupport extends ContainerAwareTestSupport {
- public static final String CONTAINER_IMAGE = "consul:1.6.2";
+ public static final String CONTAINER_IMAGE = "consul:1.8.3";
public static final String CONTAINER_NAME = "consul";
public static final String KV_PREFIX = "/camel";
diff --git
a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ConsulEndpointBuilderFactory.java
b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ConsulEndpointBuilderFactory.java
index 9377f80..289e7fc 100644
---
a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ConsulEndpointBuilderFactory.java
+++
b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ConsulEndpointBuilderFactory.java
@@ -575,7 +575,7 @@ public interface ConsulEndpointBuilderFactory {
* Group: advanced
*/
default AdvancedConsulEndpointConsumerBuilder consistencyMode(
- ConsistencyMode consistencyMode) {
+ Object consistencyMode) {
doSetProperty("consistencyMode", consistencyMode);
return this;
}
@@ -1122,7 +1122,7 @@ public interface ConsulEndpointBuilderFactory {
* Group: advanced
*/
default AdvancedConsulEndpointProducerBuilder consistencyMode(
- ConsistencyMode consistencyMode) {
+ Object consistencyMode) {
doSetProperty("consistencyMode", consistencyMode);
return this;
}
@@ -1586,7 +1586,7 @@ public interface ConsulEndpointBuilderFactory {
* Group: advanced
*/
default AdvancedConsulEndpointBuilder consistencyMode(
- ConsistencyMode consistencyMode) {
+ Object consistencyMode) {
doSetProperty("consistencyMode", consistencyMode);
return this;
}
@@ -1679,16 +1679,6 @@ public interface ConsulEndpointBuilderFactory {
}
}
- /**
- * Proxy enum for <code>com.orbitz.consul.option.ConsistencyMode</code>
- * enum.
- */
- enum ConsistencyMode {
- DEFAULT,
- STALE,
- CONSISTENT;
- }
-
public interface ConsulBuilders {
/**
* Consul (camel-consul)
diff --git a/parent/pom.xml b/parent/pom.xml
index 8aaa282..0a48990 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -132,7 +132,7 @@
<commons-validator-version>1.7</commons-validator-version>
<compress-lzf-version>1.0.4</compress-lzf-version>
<conscrypt-uber-version>2.2.1</conscrypt-uber-version>
- <consul-client-version>1.3.3</consul-client-version>
+ <consul-client-version>1.4.2</consul-client-version>
<cobertura-maven-plugin-version>2.7</cobertura-maven-plugin-version>
<corda-version>4.5</corda-version>
<couchbase-client-version>3.0.6</couchbase-client-version>
