You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by or...@apache.org on 2022/08/11 11:23:05 UTC
[camel] branch main updated (8c33b7beb1a -> e6558c05796)
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
from 8c33b7beb1a CAMEL-18380: camel-kafka: Support using TypeConverter as a fallback in the header serializer (#8146)
new f2d2db87219 CAMEL-15520: removed the deprecated option connectTimeoutMillis from camel-consul
new 4c5e57c9d6e CAMEL-15520: removed the deprecated option readTimeoutMillis from camel-consul
new e6558c05796 CAMEL-15520: removed the deprecated option writeTimeoutMillis from camel-consul
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../apache/camel/catalog/components/consul.json | 6 -
.../consul/ConsulComponentConfigurer.java | 18 --
.../component/consul/ConsulEndpointConfigurer.java | 18 --
.../component/consul/ConsulEndpointUriFactory.java | 5 +-
.../ConsulServiceDiscoveryFactoryConfigurer.java | 36 +--
.../org/apache/camel/component/consul/consul.json | 6 -
.../consul/ConsulClientConfiguration.java | 60 +---
.../cloud/ConsulServiceDiscoveryFactory.java | 26 +-
.../consul/cloud/ConsulServiceRegistry.java | 25 +-
.../consul/cluster/ConsulClusterService.java | 26 +-
.../ROOT/pages/camel-3x-upgrade-guide-3_19.adoc | 19 ++
.../dsl/ConsulComponentBuilderFactory.java | 54 ----
.../endpoint/dsl/ConsulEndpointBuilderFactory.java | 312 ---------------------
13 files changed, 81 insertions(+), 530 deletions(-)
[camel] 03/03: CAMEL-15520: removed the deprecated option writeTimeoutMillis from camel-consul
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit e6558c05796ba64b13a1078bf904f1e7c634de7f
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Thu Aug 11 11:13:57 2022 +0200
CAMEL-15520: removed the deprecated option writeTimeoutMillis from camel-consul
---
.../apache/camel/catalog/components/consul.json | 2 -
.../consul/ConsulComponentConfigurer.java | 6 --
.../component/consul/ConsulEndpointConfigurer.java | 6 --
.../component/consul/ConsulEndpointUriFactory.java | 3 +-
.../ConsulServiceDiscoveryFactoryConfigurer.java | 12 +--
.../org/apache/camel/component/consul/consul.json | 2 -
.../consul/ConsulClientConfiguration.java | 24 +----
.../cloud/ConsulServiceDiscoveryFactory.java | 8 +-
.../consul/cloud/ConsulServiceRegistry.java | 8 +-
.../consul/cluster/ConsulClusterService.java | 8 +-
.../ROOT/pages/camel-3x-upgrade-guide-3_19.adoc | 5 +-
.../dsl/ConsulComponentBuilderFactory.java | 18 ----
.../endpoint/dsl/ConsulEndpointBuilderFactory.java | 104 ---------------------
13 files changed, 25 insertions(+), 181 deletions(-)
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/consul.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/consul.json
index c8174d824c7..a07a8caf31a 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/consul.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/consul.json
@@ -30,7 +30,6 @@
"tags": { "kind": "property", "displayName": "Tags", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "Set tags. You can separate multiple tags by comma." },
"url": { "kind": "property", "displayName": "Url", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "The Consul agent URL" },
"writeTimeout": { "kind": "property", "displayName": "Write Timeout", "group": "common", "label": "", "required": false, "type": "object", "javaType": "java.time.Duration", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "Write timeout for OkHttpClient" },
- "writeTimeoutMillis": { "kind": "property", "displayName": "Write Timeout Millis", "group": "common", "label": "", "required": false, "type": "duration", "javaType": "java.lang.Long", "deprecated": true, "deprecationNote": "Use writeTimeout instead", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "Write timeout for OkHttpClient. Deprecation note: Use writeTimeout [...]
"bridgeErrorHandler": { "kind": "property", "displayName": "Bridge Error Handler", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a me [...]
"action": { "kind": "property", "displayName": "Action", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "The default action. Can be overridden by CamelConsulAction" },
"lazyStartProducer": { "kind": "property", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during star [...]
@@ -93,7 +92,6 @@
"tags": { "kind": "parameter", "displayName": "Tags", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "Set tags. You can separate multiple tags by comma." },
"url": { "kind": "parameter", "displayName": "Url", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "The Consul agent URL" },
"writeTimeout": { "kind": "parameter", "displayName": "Write Timeout", "group": "common", "label": "", "required": false, "type": "object", "javaType": "java.time.Duration", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "Write timeout for OkHttpClient" },
- "writeTimeoutMillis": { "kind": "parameter", "displayName": "Write Timeout Millis", "group": "common", "label": "", "required": false, "type": "duration", "javaType": "java.lang.Long", "deprecated": true, "deprecationNote": "Use writeTimeout instead", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "Write timeout for OkHttpClient. Deprecation note: Use writeTimeou [...]
"bridgeErrorHandler": { "kind": "parameter", "displayName": "Bridge Error Handler", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now [...]
"exceptionHandler": { "kind": "parameter", "displayName": "Exception Handler", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.spi.ExceptionHandler", "optionalPrefix": "consumer.", "deprecated": false, "autowired": false, "secret": false, "description": "To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the con [...]
"exchangePattern": { "kind": "parameter", "displayName": "Exchange Pattern", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.ExchangePattern", "enum": [ "InOnly", "InOut", "InOptionalOut" ], "deprecated": false, "autowired": false, "secret": false, "description": "Sets the exchange pattern when the consumer creates an exchange." },
diff --git a/components/camel-consul/src/generated/java/org/apache/camel/component/consul/ConsulComponentConfigurer.java b/components/camel-consul/src/generated/java/org/apache/camel/component/consul/ConsulComponentConfigurer.java
index c7839a542d0..0819ebb118d 100644
--- a/components/camel-consul/src/generated/java/org/apache/camel/component/consul/ConsulComponentConfigurer.java
+++ b/components/camel-consul/src/generated/java/org/apache/camel/component/consul/ConsulComponentConfigurer.java
@@ -72,8 +72,6 @@ public class ConsulComponentConfigurer extends PropertyConfigurerSupport impleme
case "valueAsString": getOrCreateConfiguration(target).setValueAsString(property(camelContext, boolean.class, value)); return true;
case "writetimeout":
case "writeTimeout": getOrCreateConfiguration(target).setWriteTimeout(property(camelContext, java.time.Duration.class, value)); return true;
- case "writetimeoutmillis":
- case "writeTimeoutMillis": getOrCreateConfiguration(target).setWriteTimeoutMillis(property(camelContext, java.lang.Long.class, value)); return true;
default: return false;
}
}
@@ -125,8 +123,6 @@ public class ConsulComponentConfigurer extends PropertyConfigurerSupport impleme
case "valueAsString": return boolean.class;
case "writetimeout":
case "writeTimeout": return java.time.Duration.class;
- case "writetimeoutmillis":
- case "writeTimeoutMillis": return java.lang.Long.class;
default: return null;
}
}
@@ -179,8 +175,6 @@ public class ConsulComponentConfigurer extends PropertyConfigurerSupport impleme
case "valueAsString": return getOrCreateConfiguration(target).isValueAsString();
case "writetimeout":
case "writeTimeout": return getOrCreateConfiguration(target).getWriteTimeout();
- case "writetimeoutmillis":
- case "writeTimeoutMillis": return getOrCreateConfiguration(target).getWriteTimeoutMillis();
default: return null;
}
}
diff --git a/components/camel-consul/src/generated/java/org/apache/camel/component/consul/ConsulEndpointConfigurer.java b/components/camel-consul/src/generated/java/org/apache/camel/component/consul/ConsulEndpointConfigurer.java
index 678568a4732..ca6f3e29f30 100644
--- a/components/camel-consul/src/generated/java/org/apache/camel/component/consul/ConsulEndpointConfigurer.java
+++ b/components/camel-consul/src/generated/java/org/apache/camel/component/consul/ConsulEndpointConfigurer.java
@@ -64,8 +64,6 @@ public class ConsulEndpointConfigurer extends PropertyConfigurerSupport implemen
case "valueAsString": target.getConfiguration().setValueAsString(property(camelContext, boolean.class, value)); return true;
case "writetimeout":
case "writeTimeout": target.getConfiguration().setWriteTimeout(property(camelContext, java.time.Duration.class, value)); return true;
- case "writetimeoutmillis":
- case "writeTimeoutMillis": target.getConfiguration().setWriteTimeoutMillis(property(camelContext, java.lang.Long.class, value)); return true;
default: return false;
}
}
@@ -116,8 +114,6 @@ public class ConsulEndpointConfigurer extends PropertyConfigurerSupport implemen
case "valueAsString": return boolean.class;
case "writetimeout":
case "writeTimeout": return java.time.Duration.class;
- case "writetimeoutmillis":
- case "writeTimeoutMillis": return java.lang.Long.class;
default: return null;
}
}
@@ -169,8 +165,6 @@ public class ConsulEndpointConfigurer extends PropertyConfigurerSupport implemen
case "valueAsString": return target.getConfiguration().isValueAsString();
case "writetimeout":
case "writeTimeout": return target.getConfiguration().getWriteTimeout();
- case "writetimeoutmillis":
- case "writeTimeoutMillis": return target.getConfiguration().getWriteTimeoutMillis();
default: return null;
}
}
diff --git a/components/camel-consul/src/generated/java/org/apache/camel/component/consul/ConsulEndpointUriFactory.java b/components/camel-consul/src/generated/java/org/apache/camel/component/consul/ConsulEndpointUriFactory.java
index b91bf4a2d4e..01757c757a0 100644
--- a/components/camel-consul/src/generated/java/org/apache/camel/component/consul/ConsulEndpointUriFactory.java
+++ b/components/camel-consul/src/generated/java/org/apache/camel/component/consul/ConsulEndpointUriFactory.java
@@ -21,7 +21,7 @@ public class ConsulEndpointUriFactory extends org.apache.camel.support.component
private static final Set<String> SECRET_PROPERTY_NAMES;
private static final Set<String> MULTI_VALUE_PREFIXES;
static {
- Set<String> props = new HashSet<>(27);
+ Set<String> props = new HashSet<>(26);
props.add("aclToken");
props.add("action");
props.add("apiEndpoint");
@@ -48,7 +48,6 @@ public class ConsulEndpointUriFactory extends org.apache.camel.support.component
props.add("userName");
props.add("valueAsString");
props.add("writeTimeout");
- props.add("writeTimeoutMillis");
PROPERTY_NAMES = Collections.unmodifiableSet(props);
Set<String> secretProps = new HashSet<>(3);
secretProps.add("aclToken");
diff --git a/components/camel-consul/src/generated/java/org/apache/camel/component/consul/cloud/ConsulServiceDiscoveryFactoryConfigurer.java b/components/camel-consul/src/generated/java/org/apache/camel/component/consul/cloud/ConsulServiceDiscoveryFactoryConfigurer.java
index 957912e24d4..f5bae5e910d 100644
--- a/components/camel-consul/src/generated/java/org/apache/camel/component/consul/cloud/ConsulServiceDiscoveryFactoryConfigurer.java
+++ b/components/camel-consul/src/generated/java/org/apache/camel/component/consul/cloud/ConsulServiceDiscoveryFactoryConfigurer.java
@@ -39,8 +39,8 @@ public class ConsulServiceDiscoveryFactoryConfigurer extends org.apache.camel.su
case "Url": target.setUrl(property(camelContext, java.lang.String.class, value)); return true;
case "username":
case "UserName": target.setUserName(property(camelContext, java.lang.String.class, value)); return true;
- case "writetimeoutmillis":
- case "WriteTimeoutMillis": target.setWriteTimeoutMillis(property(camelContext, java.lang.Long.class, value)); return true;
+ case "writetimeout":
+ case "WriteTimeout": target.setWriteTimeout(property(camelContext, java.time.Duration.class, value)); return true;
default: return false;
}
}
@@ -66,8 +66,8 @@ public class ConsulServiceDiscoveryFactoryConfigurer extends org.apache.camel.su
case "Url": return java.lang.String.class;
case "username":
case "UserName": return java.lang.String.class;
- case "writetimeoutmillis":
- case "WriteTimeoutMillis": return java.lang.Long.class;
+ case "writetimeout":
+ case "WriteTimeout": return java.time.Duration.class;
default: return null;
}
}
@@ -94,8 +94,8 @@ public class ConsulServiceDiscoveryFactoryConfigurer extends org.apache.camel.su
case "Url": return target.getUrl();
case "username":
case "UserName": return target.getUserName();
- case "writetimeoutmillis":
- case "WriteTimeoutMillis": return target.getWriteTimeoutMillis();
+ case "writetimeout":
+ case "WriteTimeout": return target.getWriteTimeout();
default: return null;
}
}
diff --git a/components/camel-consul/src/generated/resources/org/apache/camel/component/consul/consul.json b/components/camel-consul/src/generated/resources/org/apache/camel/component/consul/consul.json
index c8174d824c7..a07a8caf31a 100644
--- a/components/camel-consul/src/generated/resources/org/apache/camel/component/consul/consul.json
+++ b/components/camel-consul/src/generated/resources/org/apache/camel/component/consul/consul.json
@@ -30,7 +30,6 @@
"tags": { "kind": "property", "displayName": "Tags", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "Set tags. You can separate multiple tags by comma." },
"url": { "kind": "property", "displayName": "Url", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "The Consul agent URL" },
"writeTimeout": { "kind": "property", "displayName": "Write Timeout", "group": "common", "label": "", "required": false, "type": "object", "javaType": "java.time.Duration", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "Write timeout for OkHttpClient" },
- "writeTimeoutMillis": { "kind": "property", "displayName": "Write Timeout Millis", "group": "common", "label": "", "required": false, "type": "duration", "javaType": "java.lang.Long", "deprecated": true, "deprecationNote": "Use writeTimeout instead", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "Write timeout for OkHttpClient. Deprecation note: Use writeTimeout [...]
"bridgeErrorHandler": { "kind": "property", "displayName": "Bridge Error Handler", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a me [...]
"action": { "kind": "property", "displayName": "Action", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "The default action. Can be overridden by CamelConsulAction" },
"lazyStartProducer": { "kind": "property", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during star [...]
@@ -93,7 +92,6 @@
"tags": { "kind": "parameter", "displayName": "Tags", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "Set tags. You can separate multiple tags by comma." },
"url": { "kind": "parameter", "displayName": "Url", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "The Consul agent URL" },
"writeTimeout": { "kind": "parameter", "displayName": "Write Timeout", "group": "common", "label": "", "required": false, "type": "object", "javaType": "java.time.Duration", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "Write timeout for OkHttpClient" },
- "writeTimeoutMillis": { "kind": "parameter", "displayName": "Write Timeout Millis", "group": "common", "label": "", "required": false, "type": "duration", "javaType": "java.lang.Long", "deprecated": true, "deprecationNote": "Use writeTimeout instead", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "Write timeout for OkHttpClient. Deprecation note: Use writeTimeou [...]
"bridgeErrorHandler": { "kind": "parameter", "displayName": "Bridge Error Handler", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now [...]
"exceptionHandler": { "kind": "parameter", "displayName": "Exception Handler", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.spi.ExceptionHandler", "optionalPrefix": "consumer.", "deprecated": false, "autowired": false, "secret": false, "description": "To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the con [...]
"exchangePattern": { "kind": "parameter", "displayName": "Exchange Pattern", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.ExchangePattern", "enum": [ "InOnly", "InOut", "InOptionalOut" ], "deprecated": false, "autowired": false, "secret": false, "description": "Sets the exchange pattern when the consumer creates an exchange." },
diff --git a/components/camel-consul/src/main/java/org/apache/camel/component/consul/ConsulClientConfiguration.java b/components/camel-consul/src/main/java/org/apache/camel/component/consul/ConsulClientConfiguration.java
index 6367a8f9df5..b5dd71dddc7 100644
--- a/components/camel-consul/src/main/java/org/apache/camel/component/consul/ConsulClientConfiguration.java
+++ b/components/camel-consul/src/main/java/org/apache/camel/component/consul/ConsulClientConfiguration.java
@@ -29,7 +29,6 @@ import com.orbitz.consul.Consul;
import com.orbitz.consul.option.ConsistencyMode;
import org.apache.camel.CamelContext;
import org.apache.camel.RuntimeCamelException;
-import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.UriParam;
import org.apache.camel.spi.UriParams;
import org.apache.camel.support.jsse.SSLContextParameters;
@@ -63,10 +62,6 @@ public abstract class ConsulClientConfiguration implements Cloneable {
private Duration connectTimeout;
@UriParam
private Duration readTimeout;
- @Deprecated
- @Metadata(deprecationNote = "Use writeTimeout instead")
- @UriParam(javaType = "java.time.Duration")
- private Long writeTimeoutMillis;
@UriParam
private Duration writeTimeout;
@UriParam(defaultValue = "true")
@@ -244,19 +239,6 @@ public abstract class ConsulClientConfiguration implements Cloneable {
this.readTimeout = readTimeout;
}
- public Long getWriteTimeoutMillis() {
- return writeTimeoutMillis;
- }
-
- /**
- * Write timeout for OkHttpClient
- *
- * @deprecated Use writeTimeout instead.
- */
- public void setWriteTimeoutMillis(Long writeTimeoutMillis) {
- this.writeTimeoutMillis = writeTimeoutMillis;
- }
-
public Duration getWriteTimeout() {
return writeTimeout;
}
@@ -339,15 +321,13 @@ public abstract class ConsulClientConfiguration implements Cloneable {
if (ObjectHelper.isNotEmpty(connectTimeout)) {
builder.withConnectTimeoutMillis(connectTimeout.toMillis());
}
-
+
if (ObjectHelper.isNotEmpty(readTimeout)) {
builder.withConnectTimeoutMillis(readTimeout.toMillis());
}
-
+
if (ObjectHelper.isNotEmpty(writeTimeout)) {
builder.withConnectTimeoutMillis(writeTimeout.toMillis());
- } else if (ObjectHelper.isNotEmpty(writeTimeoutMillis)) {
- builder.withWriteTimeoutMillis(writeTimeoutMillis);
}
return builder.build();
diff --git a/components/camel-consul/src/main/java/org/apache/camel/component/consul/cloud/ConsulServiceDiscoveryFactory.java b/components/camel-consul/src/main/java/org/apache/camel/component/consul/cloud/ConsulServiceDiscoveryFactory.java
index eb646039509..3360c86c496 100644
--- a/components/camel-consul/src/main/java/org/apache/camel/component/consul/cloud/ConsulServiceDiscoveryFactory.java
+++ b/components/camel-consul/src/main/java/org/apache/camel/component/consul/cloud/ConsulServiceDiscoveryFactory.java
@@ -107,12 +107,12 @@ public class ConsulServiceDiscoveryFactory implements ServiceDiscoveryFactory {
configuration.setReadTimeout(readTimeout);
}
- public Long getWriteTimeoutMillis() {
- return configuration.getWriteTimeoutMillis();
+ public Duration getWriteTimeout() {
+ return configuration.getWriteTimeout();
}
- public void setWriteTimeoutMillis(Long writeTimeoutMillis) {
- configuration.setWriteTimeoutMillis(writeTimeoutMillis);
+ public void setWriteTimeout(Duration writeTimeout) {
+ configuration.setWriteTimeout(writeTimeout);
}
public Integer getBlockSeconds() {
diff --git a/components/camel-consul/src/main/java/org/apache/camel/component/consul/cloud/ConsulServiceRegistry.java b/components/camel-consul/src/main/java/org/apache/camel/component/consul/cloud/ConsulServiceRegistry.java
index e0b46428b20..7ac3b3fda04 100644
--- a/components/camel-consul/src/main/java/org/apache/camel/component/consul/cloud/ConsulServiceRegistry.java
+++ b/components/camel-consul/src/main/java/org/apache/camel/component/consul/cloud/ConsulServiceRegistry.java
@@ -132,12 +132,12 @@ public class ConsulServiceRegistry extends AbstractServiceRegistry {
configuration.setReadTimeout(readTimeout);
}
- public Long getWriteTimeoutMillis() {
- return configuration.getWriteTimeoutMillis();
+ public Duration getWriteTimeout() {
+ return configuration.getWriteTimeout();
}
- public void setWriteTimeoutMillis(Long writeTimeoutMillis) {
- configuration.setWriteTimeoutMillis(writeTimeoutMillis);
+ public void setWriteTimeout(Duration writeTimeout) {
+ configuration.setWriteTimeout(writeTimeout);
}
public Integer getBlockSeconds() {
diff --git a/components/camel-consul/src/main/java/org/apache/camel/component/consul/cluster/ConsulClusterService.java b/components/camel-consul/src/main/java/org/apache/camel/component/consul/cluster/ConsulClusterService.java
index bc552d2fe68..83ae3773d46 100644
--- a/components/camel-consul/src/main/java/org/apache/camel/component/consul/cluster/ConsulClusterService.java
+++ b/components/camel-consul/src/main/java/org/apache/camel/component/consul/cluster/ConsulClusterService.java
@@ -113,12 +113,12 @@ public final class ConsulClusterService extends AbstractCamelClusterService<Cons
configuration.setReadTimeout(readTimeout);
}
- public Long getWriteTimeoutMillis() {
- return configuration.getWriteTimeoutMillis();
+ public Duration getWriteTimeout() {
+ return configuration.getWriteTimeout();
}
- public void setWriteTimeoutMillis(Long writeTimeoutMillis) {
- configuration.setWriteTimeoutMillis(writeTimeoutMillis);
+ public void setWriteTimeout(Duration writeTimeout) {
+ configuration.setWriteTimeout(writeTimeout);
}
public Integer getBlockSeconds() {
diff --git a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_19.adoc b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_19.adoc
index 35331a80634..9eb82a5c0ed 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_19.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_19.adoc
@@ -48,7 +48,7 @@ The URI format for consumer operations has changed. All consumer URIs now use th
=== camel-consul
-The deprecated options were removed and should be replaced by the following options
+The deprecated options were removed and should be replaced by the following options:
|===
|Deprecated |Replace with
@@ -58,5 +58,8 @@ The deprecated options were removed and should be replaced by the following opti
|`readTimeoutMillis`
|`readTimeout`
+
+|`writeTimeoutMillis`
+|`writeTimeout`
|===
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ConsulComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ConsulComponentBuilderFactory.java
index 546d1de6a9c..602dc5f7c24 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ConsulComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ConsulComponentBuilderFactory.java
@@ -169,23 +169,6 @@ public interface ConsulComponentBuilderFactory {
doSetProperty("writeTimeout", writeTimeout);
return this;
}
- /**
- * Write timeout for OkHttpClient. Deprecation note: Use writeTimeout
- * instead.
- *
- * The option is a: <code>java.lang.Long</code> type.
- *
- * Group: common
- *
- * @param writeTimeoutMillis the value to set
- * @return the dsl builder
- */
- @Deprecated
- default ConsulComponentBuilder writeTimeoutMillis(
- java.lang.Long writeTimeoutMillis) {
- doSetProperty("writeTimeoutMillis", writeTimeoutMillis);
- return this;
- }
/**
* Allows for bridging the consumer to the Camel routing Error Handler,
* which mean any exceptions occurred while the consumer is trying to
@@ -515,7 +498,6 @@ public interface ConsulComponentBuilderFactory {
case "tags": getOrCreateConfiguration((ConsulComponent) component).setTags((java.lang.String) value); return true;
case "url": getOrCreateConfiguration((ConsulComponent) component).setUrl((java.lang.String) value); return true;
case "writeTimeout": getOrCreateConfiguration((ConsulComponent) component).setWriteTimeout((java.time.Duration) value); return true;
- case "writeTimeoutMillis": getOrCreateConfiguration((ConsulComponent) component).setWriteTimeoutMillis((java.lang.Long) value); return true;
case "bridgeErrorHandler": ((ConsulComponent) component).setBridgeErrorHandler((boolean) value); return true;
case "action": getOrCreateConfiguration((ConsulComponent) component).setAction((java.lang.String) value); return true;
case "lazyStartProducer": ((ConsulComponent) component).setLazyStartProducer((boolean) value); return true;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ConsulEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ConsulEndpointBuilderFactory.java
index 24b1c1e60b9..68c5f1328e6 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ConsulEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ConsulEndpointBuilderFactory.java
@@ -240,41 +240,6 @@ public interface ConsulEndpointBuilderFactory {
doSetProperty("writeTimeout", writeTimeout);
return this;
}
- /**
- * Write timeout for OkHttpClient. Deprecation note: Use writeTimeout
- * instead.
- *
- * The option is a: <code>java.lang.Long</code> type.
- *
- * Group: common
- *
- * @param writeTimeoutMillis the value to set
- * @return the dsl builder
- */
- @Deprecated
- default ConsulEndpointConsumerBuilder writeTimeoutMillis(
- Long writeTimeoutMillis) {
- doSetProperty("writeTimeoutMillis", writeTimeoutMillis);
- return this;
- }
- /**
- * Write timeout for OkHttpClient. Deprecation note: Use writeTimeout
- * instead.
- *
- * The option will be converted to a
- * <code>java.lang.Long</code> type.
- *
- * Group: common
- *
- * @param writeTimeoutMillis the value to set
- * @return the dsl builder
- */
- @Deprecated
- default ConsulEndpointConsumerBuilder writeTimeoutMillis(
- String writeTimeoutMillis) {
- doSetProperty("writeTimeoutMillis", writeTimeoutMillis);
- return this;
- }
/**
* Sets the ACL token to be used with Consul.
*
@@ -877,41 +842,6 @@ public interface ConsulEndpointBuilderFactory {
doSetProperty("writeTimeout", writeTimeout);
return this;
}
- /**
- * Write timeout for OkHttpClient. Deprecation note: Use writeTimeout
- * instead.
- *
- * The option is a: <code>java.lang.Long</code> type.
- *
- * Group: common
- *
- * @param writeTimeoutMillis the value to set
- * @return the dsl builder
- */
- @Deprecated
- default ConsulEndpointProducerBuilder writeTimeoutMillis(
- Long writeTimeoutMillis) {
- doSetProperty("writeTimeoutMillis", writeTimeoutMillis);
- return this;
- }
- /**
- * Write timeout for OkHttpClient. Deprecation note: Use writeTimeout
- * instead.
- *
- * The option will be converted to a
- * <code>java.lang.Long</code> type.
- *
- * Group: common
- *
- * @param writeTimeoutMillis the value to set
- * @return the dsl builder
- */
- @Deprecated
- default ConsulEndpointProducerBuilder writeTimeoutMillis(
- String writeTimeoutMillis) {
- doSetProperty("writeTimeoutMillis", writeTimeoutMillis);
- return this;
- }
/**
* The default action. Can be overridden by CamelConsulAction.
*
@@ -1401,40 +1331,6 @@ public interface ConsulEndpointBuilderFactory {
doSetProperty("writeTimeout", writeTimeout);
return this;
}
- /**
- * Write timeout for OkHttpClient. Deprecation note: Use writeTimeout
- * instead.
- *
- * The option is a: <code>java.lang.Long</code> type.
- *
- * Group: common
- *
- * @param writeTimeoutMillis the value to set
- * @return the dsl builder
- */
- @Deprecated
- default ConsulEndpointBuilder writeTimeoutMillis(Long writeTimeoutMillis) {
- doSetProperty("writeTimeoutMillis", writeTimeoutMillis);
- return this;
- }
- /**
- * Write timeout for OkHttpClient. Deprecation note: Use writeTimeout
- * instead.
- *
- * The option will be converted to a
- * <code>java.lang.Long</code> type.
- *
- * Group: common
- *
- * @param writeTimeoutMillis the value to set
- * @return the dsl builder
- */
- @Deprecated
- default ConsulEndpointBuilder writeTimeoutMillis(
- String writeTimeoutMillis) {
- doSetProperty("writeTimeoutMillis", writeTimeoutMillis);
- return this;
- }
/**
* Sets the ACL token to be used with Consul.
*
[camel] 02/03: CAMEL-15520: removed the deprecated option readTimeoutMillis from camel-consul
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 4c5e57c9d6e389475cc3aa4a17d957f327541828
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Thu Aug 11 11:06:50 2022 +0200
CAMEL-15520: removed the deprecated option readTimeoutMillis from camel-consul
---
.../apache/camel/catalog/components/consul.json | 2 -
.../consul/ConsulComponentConfigurer.java | 6 --
.../component/consul/ConsulEndpointConfigurer.java | 6 --
.../component/consul/ConsulEndpointUriFactory.java | 3 +-
.../ConsulServiceDiscoveryFactoryConfigurer.java | 12 +--
.../org/apache/camel/component/consul/consul.json | 2 -
.../consul/ConsulClientConfiguration.java | 20 +---
.../cloud/ConsulServiceDiscoveryFactory.java | 8 +-
.../consul/cloud/ConsulServiceRegistry.java | 8 +-
.../consul/cluster/ConsulClusterService.java | 8 +-
.../ROOT/pages/camel-3x-upgrade-guide-3_19.adoc | 3 +
.../dsl/ConsulComponentBuilderFactory.java | 18 ----
.../endpoint/dsl/ConsulEndpointBuilderFactory.java | 103 ---------------------
13 files changed, 23 insertions(+), 176 deletions(-)
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/consul.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/consul.json
index b46bd080f2e..c8174d824c7 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/consul.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/consul.json
@@ -27,7 +27,6 @@
"key": { "kind": "property", "displayName": "Key", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "The default key. Can be overridden by CamelConsulKey" },
"pingInstance": { "kind": "property", "displayName": "Ping Instance", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "Configure if the AgentClient should attempt a ping before returning the Consul instance" },
"readTimeout": { "kind": "property", "displayName": "Read Timeout", "group": "common", "label": "", "required": false, "type": "object", "javaType": "java.time.Duration", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "Read timeout for OkHttpClient" },
- "readTimeoutMillis": { "kind": "property", "displayName": "Read Timeout Millis", "group": "common", "label": "", "required": false, "type": "integer", "javaType": "java.lang.Long", "deprecated": true, "deprecationNote": "Use readTimeout instead", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "Read timeout for OkHttpClient. Deprecation note: Use readTimeout instead" },
"tags": { "kind": "property", "displayName": "Tags", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "Set tags. You can separate multiple tags by comma." },
"url": { "kind": "property", "displayName": "Url", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "The Consul agent URL" },
"writeTimeout": { "kind": "property", "displayName": "Write Timeout", "group": "common", "label": "", "required": false, "type": "object", "javaType": "java.time.Duration", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "Write timeout for OkHttpClient" },
@@ -91,7 +90,6 @@
"key": { "kind": "parameter", "displayName": "Key", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "The default key. Can be overridden by CamelConsulKey" },
"pingInstance": { "kind": "parameter", "displayName": "Ping Instance", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "Configure if the AgentClient should attempt a ping before returning the Consul instance" },
"readTimeout": { "kind": "parameter", "displayName": "Read Timeout", "group": "common", "label": "", "required": false, "type": "object", "javaType": "java.time.Duration", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "Read timeout for OkHttpClient" },
- "readTimeoutMillis": { "kind": "parameter", "displayName": "Read Timeout Millis", "group": "common", "label": "", "required": false, "type": "integer", "javaType": "java.lang.Long", "deprecated": true, "deprecationNote": "Use readTimeout instead", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "Read timeout for OkHttpClient. Deprecation note: Use readTimeout instead" },
"tags": { "kind": "parameter", "displayName": "Tags", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "Set tags. You can separate multiple tags by comma." },
"url": { "kind": "parameter", "displayName": "Url", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "The Consul agent URL" },
"writeTimeout": { "kind": "parameter", "displayName": "Write Timeout", "group": "common", "label": "", "required": false, "type": "object", "javaType": "java.time.Duration", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "Write timeout for OkHttpClient" },
diff --git a/components/camel-consul/src/generated/java/org/apache/camel/component/consul/ConsulComponentConfigurer.java b/components/camel-consul/src/generated/java/org/apache/camel/component/consul/ConsulComponentConfigurer.java
index 5b3327e8352..c7839a542d0 100644
--- a/components/camel-consul/src/generated/java/org/apache/camel/component/consul/ConsulComponentConfigurer.java
+++ b/components/camel-consul/src/generated/java/org/apache/camel/component/consul/ConsulComponentConfigurer.java
@@ -59,8 +59,6 @@ public class ConsulComponentConfigurer extends PropertyConfigurerSupport impleme
case "pingInstance": getOrCreateConfiguration(target).setPingInstance(property(camelContext, boolean.class, value)); return true;
case "readtimeout":
case "readTimeout": getOrCreateConfiguration(target).setReadTimeout(property(camelContext, java.time.Duration.class, value)); return true;
- case "readtimeoutmillis":
- case "readTimeoutMillis": getOrCreateConfiguration(target).setReadTimeoutMillis(property(camelContext, java.lang.Long.class, value)); return true;
case "recursive": getOrCreateConfiguration(target).setRecursive(property(camelContext, boolean.class, value)); return true;
case "sslcontextparameters":
case "sslContextParameters": getOrCreateConfiguration(target).setSslContextParameters(property(camelContext, org.apache.camel.support.jsse.SSLContextParameters.class, value)); return true;
@@ -114,8 +112,6 @@ public class ConsulComponentConfigurer extends PropertyConfigurerSupport impleme
case "pingInstance": return boolean.class;
case "readtimeout":
case "readTimeout": return java.time.Duration.class;
- case "readtimeoutmillis":
- case "readTimeoutMillis": return java.lang.Long.class;
case "recursive": return boolean.class;
case "sslcontextparameters":
case "sslContextParameters": return org.apache.camel.support.jsse.SSLContextParameters.class;
@@ -170,8 +166,6 @@ public class ConsulComponentConfigurer extends PropertyConfigurerSupport impleme
case "pingInstance": return getOrCreateConfiguration(target).isPingInstance();
case "readtimeout":
case "readTimeout": return getOrCreateConfiguration(target).getReadTimeout();
- case "readtimeoutmillis":
- case "readTimeoutMillis": return getOrCreateConfiguration(target).getReadTimeoutMillis();
case "recursive": return getOrCreateConfiguration(target).isRecursive();
case "sslcontextparameters":
case "sslContextParameters": return getOrCreateConfiguration(target).getSslContextParameters();
diff --git a/components/camel-consul/src/generated/java/org/apache/camel/component/consul/ConsulEndpointConfigurer.java b/components/camel-consul/src/generated/java/org/apache/camel/component/consul/ConsulEndpointConfigurer.java
index b22a768c04b..678568a4732 100644
--- a/components/camel-consul/src/generated/java/org/apache/camel/component/consul/ConsulEndpointConfigurer.java
+++ b/components/camel-consul/src/generated/java/org/apache/camel/component/consul/ConsulEndpointConfigurer.java
@@ -53,8 +53,6 @@ public class ConsulEndpointConfigurer extends PropertyConfigurerSupport implemen
case "pingInstance": target.getConfiguration().setPingInstance(property(camelContext, boolean.class, value)); return true;
case "readtimeout":
case "readTimeout": target.getConfiguration().setReadTimeout(property(camelContext, java.time.Duration.class, value)); return true;
- case "readtimeoutmillis":
- case "readTimeoutMillis": target.getConfiguration().setReadTimeoutMillis(property(camelContext, java.lang.Long.class, value)); return true;
case "recursive": target.getConfiguration().setRecursive(property(camelContext, boolean.class, value)); return true;
case "sslcontextparameters":
case "sslContextParameters": target.getConfiguration().setSslContextParameters(property(camelContext, org.apache.camel.support.jsse.SSLContextParameters.class, value)); return true;
@@ -107,8 +105,6 @@ public class ConsulEndpointConfigurer extends PropertyConfigurerSupport implemen
case "pingInstance": return boolean.class;
case "readtimeout":
case "readTimeout": return java.time.Duration.class;
- case "readtimeoutmillis":
- case "readTimeoutMillis": return java.lang.Long.class;
case "recursive": return boolean.class;
case "sslcontextparameters":
case "sslContextParameters": return org.apache.camel.support.jsse.SSLContextParameters.class;
@@ -162,8 +158,6 @@ public class ConsulEndpointConfigurer extends PropertyConfigurerSupport implemen
case "pingInstance": return target.getConfiguration().isPingInstance();
case "readtimeout":
case "readTimeout": return target.getConfiguration().getReadTimeout();
- case "readtimeoutmillis":
- case "readTimeoutMillis": return target.getConfiguration().getReadTimeoutMillis();
case "recursive": return target.getConfiguration().isRecursive();
case "sslcontextparameters":
case "sslContextParameters": return target.getConfiguration().getSslContextParameters();
diff --git a/components/camel-consul/src/generated/java/org/apache/camel/component/consul/ConsulEndpointUriFactory.java b/components/camel-consul/src/generated/java/org/apache/camel/component/consul/ConsulEndpointUriFactory.java
index d42d077adec..b91bf4a2d4e 100644
--- a/components/camel-consul/src/generated/java/org/apache/camel/component/consul/ConsulEndpointUriFactory.java
+++ b/components/camel-consul/src/generated/java/org/apache/camel/component/consul/ConsulEndpointUriFactory.java
@@ -21,7 +21,7 @@ public class ConsulEndpointUriFactory extends org.apache.camel.support.component
private static final Set<String> SECRET_PROPERTY_NAMES;
private static final Set<String> MULTI_VALUE_PREFIXES;
static {
- Set<String> props = new HashSet<>(28);
+ Set<String> props = new HashSet<>(27);
props.add("aclToken");
props.add("action");
props.add("apiEndpoint");
@@ -41,7 +41,6 @@ public class ConsulEndpointUriFactory extends org.apache.camel.support.component
props.add("password");
props.add("pingInstance");
props.add("readTimeout");
- props.add("readTimeoutMillis");
props.add("recursive");
props.add("sslContextParameters");
props.add("tags");
diff --git a/components/camel-consul/src/generated/java/org/apache/camel/component/consul/cloud/ConsulServiceDiscoveryFactoryConfigurer.java b/components/camel-consul/src/generated/java/org/apache/camel/component/consul/cloud/ConsulServiceDiscoveryFactoryConfigurer.java
index 517cd9a1b8e..957912e24d4 100644
--- a/components/camel-consul/src/generated/java/org/apache/camel/component/consul/cloud/ConsulServiceDiscoveryFactoryConfigurer.java
+++ b/components/camel-consul/src/generated/java/org/apache/camel/component/consul/cloud/ConsulServiceDiscoveryFactoryConfigurer.java
@@ -31,8 +31,8 @@ public class ConsulServiceDiscoveryFactoryConfigurer extends org.apache.camel.su
case "Datacenter": target.setDatacenter(property(camelContext, java.lang.String.class, value)); return true;
case "password":
case "Password": target.setPassword(property(camelContext, java.lang.String.class, value)); return true;
- case "readtimeoutmillis":
- case "ReadTimeoutMillis": target.setReadTimeoutMillis(property(camelContext, java.lang.Long.class, value)); return true;
+ case "readtimeout":
+ case "ReadTimeout": target.setReadTimeout(property(camelContext, java.time.Duration.class, value)); return true;
case "sslcontextparameters":
case "SslContextParameters": target.setSslContextParameters(property(camelContext, org.apache.camel.support.jsse.SSLContextParameters.class, value)); return true;
case "url":
@@ -58,8 +58,8 @@ public class ConsulServiceDiscoveryFactoryConfigurer extends org.apache.camel.su
case "Datacenter": return java.lang.String.class;
case "password":
case "Password": return java.lang.String.class;
- case "readtimeoutmillis":
- case "ReadTimeoutMillis": return java.lang.Long.class;
+ case "readtimeout":
+ case "ReadTimeout": return java.time.Duration.class;
case "sslcontextparameters":
case "SslContextParameters": return org.apache.camel.support.jsse.SSLContextParameters.class;
case "url":
@@ -86,8 +86,8 @@ public class ConsulServiceDiscoveryFactoryConfigurer extends org.apache.camel.su
case "Datacenter": return target.getDatacenter();
case "password":
case "Password": return target.getPassword();
- case "readtimeoutmillis":
- case "ReadTimeoutMillis": return target.getReadTimeoutMillis();
+ case "readtimeout":
+ case "ReadTimeout": return target.getReadTimeout();
case "sslcontextparameters":
case "SslContextParameters": return target.getSslContextParameters();
case "url":
diff --git a/components/camel-consul/src/generated/resources/org/apache/camel/component/consul/consul.json b/components/camel-consul/src/generated/resources/org/apache/camel/component/consul/consul.json
index b46bd080f2e..c8174d824c7 100644
--- a/components/camel-consul/src/generated/resources/org/apache/camel/component/consul/consul.json
+++ b/components/camel-consul/src/generated/resources/org/apache/camel/component/consul/consul.json
@@ -27,7 +27,6 @@
"key": { "kind": "property", "displayName": "Key", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "The default key. Can be overridden by CamelConsulKey" },
"pingInstance": { "kind": "property", "displayName": "Ping Instance", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "Configure if the AgentClient should attempt a ping before returning the Consul instance" },
"readTimeout": { "kind": "property", "displayName": "Read Timeout", "group": "common", "label": "", "required": false, "type": "object", "javaType": "java.time.Duration", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "Read timeout for OkHttpClient" },
- "readTimeoutMillis": { "kind": "property", "displayName": "Read Timeout Millis", "group": "common", "label": "", "required": false, "type": "integer", "javaType": "java.lang.Long", "deprecated": true, "deprecationNote": "Use readTimeout instead", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "Read timeout for OkHttpClient. Deprecation note: Use readTimeout instead" },
"tags": { "kind": "property", "displayName": "Tags", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "Set tags. You can separate multiple tags by comma." },
"url": { "kind": "property", "displayName": "Url", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "The Consul agent URL" },
"writeTimeout": { "kind": "property", "displayName": "Write Timeout", "group": "common", "label": "", "required": false, "type": "object", "javaType": "java.time.Duration", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "Write timeout for OkHttpClient" },
@@ -91,7 +90,6 @@
"key": { "kind": "parameter", "displayName": "Key", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "The default key. Can be overridden by CamelConsulKey" },
"pingInstance": { "kind": "parameter", "displayName": "Ping Instance", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "Configure if the AgentClient should attempt a ping before returning the Consul instance" },
"readTimeout": { "kind": "parameter", "displayName": "Read Timeout", "group": "common", "label": "", "required": false, "type": "object", "javaType": "java.time.Duration", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "Read timeout for OkHttpClient" },
- "readTimeoutMillis": { "kind": "parameter", "displayName": "Read Timeout Millis", "group": "common", "label": "", "required": false, "type": "integer", "javaType": "java.lang.Long", "deprecated": true, "deprecationNote": "Use readTimeout instead", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "Read timeout for OkHttpClient. Deprecation note: Use readTimeout instead" },
"tags": { "kind": "parameter", "displayName": "Tags", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "Set tags. You can separate multiple tags by comma." },
"url": { "kind": "parameter", "displayName": "Url", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "The Consul agent URL" },
"writeTimeout": { "kind": "parameter", "displayName": "Write Timeout", "group": "common", "label": "", "required": false, "type": "object", "javaType": "java.time.Duration", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "Write timeout for OkHttpClient" },
diff --git a/components/camel-consul/src/main/java/org/apache/camel/component/consul/ConsulClientConfiguration.java b/components/camel-consul/src/main/java/org/apache/camel/component/consul/ConsulClientConfiguration.java
index a57b07875b1..6367a8f9df5 100644
--- a/components/camel-consul/src/main/java/org/apache/camel/component/consul/ConsulClientConfiguration.java
+++ b/components/camel-consul/src/main/java/org/apache/camel/component/consul/ConsulClientConfiguration.java
@@ -61,10 +61,6 @@ public abstract class ConsulClientConfiguration implements Cloneable {
@UriParam
private Duration connectTimeout;
- @Deprecated
- @Metadata(deprecationNote = "Use readTimeout instead")
- @UriParam
- private Long readTimeoutMillis;
@UriParam
private Duration readTimeout;
@Deprecated
@@ -237,19 +233,6 @@ public abstract class ConsulClientConfiguration implements Cloneable {
this.connectTimeout = connectTimeout;
}
- public Long getReadTimeoutMillis() {
- return readTimeoutMillis;
- }
-
- /**
- * Read timeout for OkHttpClient
- *
- * @deprecated Use readTimeout instead.
- */
- public void setReadTimeoutMillis(Long readTimeoutMillis) {
- this.readTimeoutMillis = readTimeoutMillis;
- }
-
public Duration getReadTimeout() {
return readTimeout;
}
@@ -359,9 +342,8 @@ public abstract class ConsulClientConfiguration implements Cloneable {
if (ObjectHelper.isNotEmpty(readTimeout)) {
builder.withConnectTimeoutMillis(readTimeout.toMillis());
- } else if (ObjectHelper.isNotEmpty(readTimeoutMillis)) {
- builder.withReadTimeoutMillis(readTimeoutMillis);
}
+
if (ObjectHelper.isNotEmpty(writeTimeout)) {
builder.withConnectTimeoutMillis(writeTimeout.toMillis());
} else if (ObjectHelper.isNotEmpty(writeTimeoutMillis)) {
diff --git a/components/camel-consul/src/main/java/org/apache/camel/component/consul/cloud/ConsulServiceDiscoveryFactory.java b/components/camel-consul/src/main/java/org/apache/camel/component/consul/cloud/ConsulServiceDiscoveryFactory.java
index 20b626e5822..eb646039509 100644
--- a/components/camel-consul/src/main/java/org/apache/camel/component/consul/cloud/ConsulServiceDiscoveryFactory.java
+++ b/components/camel-consul/src/main/java/org/apache/camel/component/consul/cloud/ConsulServiceDiscoveryFactory.java
@@ -99,12 +99,12 @@ public class ConsulServiceDiscoveryFactory implements ServiceDiscoveryFactory {
configuration.setConnectTimeout(connectTimeout);
}
- public Long getReadTimeoutMillis() {
- return configuration.getReadTimeoutMillis();
+ public Duration getReadTimeout() {
+ return configuration.getReadTimeout();
}
- public void setReadTimeoutMillis(Long readTimeoutMillis) {
- configuration.setReadTimeoutMillis(readTimeoutMillis);
+ public void setReadTimeout(Duration readTimeout) {
+ configuration.setReadTimeout(readTimeout);
}
public Long getWriteTimeoutMillis() {
diff --git a/components/camel-consul/src/main/java/org/apache/camel/component/consul/cloud/ConsulServiceRegistry.java b/components/camel-consul/src/main/java/org/apache/camel/component/consul/cloud/ConsulServiceRegistry.java
index 11c005e0f27..e0b46428b20 100644
--- a/components/camel-consul/src/main/java/org/apache/camel/component/consul/cloud/ConsulServiceRegistry.java
+++ b/components/camel-consul/src/main/java/org/apache/camel/component/consul/cloud/ConsulServiceRegistry.java
@@ -124,12 +124,12 @@ public class ConsulServiceRegistry extends AbstractServiceRegistry {
configuration.setConnectTimeout(connectTimeout);
}
- public Long getReadTimeoutMillis() {
- return configuration.getReadTimeoutMillis();
+ public Duration getReadTimeout() {
+ return configuration.getReadTimeout();
}
- public void setReadTimeoutMillis(Long readTimeoutMillis) {
- configuration.setReadTimeoutMillis(readTimeoutMillis);
+ public void setReadTimeout(Duration readTimeout) {
+ configuration.setReadTimeout(readTimeout);
}
public Long getWriteTimeoutMillis() {
diff --git a/components/camel-consul/src/main/java/org/apache/camel/component/consul/cluster/ConsulClusterService.java b/components/camel-consul/src/main/java/org/apache/camel/component/consul/cluster/ConsulClusterService.java
index 9689d58459e..bc552d2fe68 100644
--- a/components/camel-consul/src/main/java/org/apache/camel/component/consul/cluster/ConsulClusterService.java
+++ b/components/camel-consul/src/main/java/org/apache/camel/component/consul/cluster/ConsulClusterService.java
@@ -105,12 +105,12 @@ public final class ConsulClusterService extends AbstractCamelClusterService<Cons
configuration.setConnectTimeout(connectTimeout);
}
- public Long getReadTimeoutMillis() {
- return configuration.getReadTimeoutMillis();
+ public Duration getReadTimeout() {
+ return configuration.getReadTimeout();
}
- public void setReadTimeoutMillis(Long readTimeoutMillis) {
- configuration.setReadTimeoutMillis(readTimeoutMillis);
+ public void setReadTimeout(Duration readTimeout) {
+ configuration.setReadTimeout(readTimeout);
}
public Long getWriteTimeoutMillis() {
diff --git a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_19.adoc b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_19.adoc
index 7f725549299..35331a80634 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_19.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_19.adoc
@@ -55,5 +55,8 @@ The deprecated options were removed and should be replaced by the following opti
|`connectTimeoutMillis`
|`connectTimeout`
+
+|`readTimeoutMillis`
+|`readTimeout`
|===
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ConsulComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ConsulComponentBuilderFactory.java
index 4f164e377fc..546d1de6a9c 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ConsulComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ConsulComponentBuilderFactory.java
@@ -126,23 +126,6 @@ public interface ConsulComponentBuilderFactory {
doSetProperty("readTimeout", readTimeout);
return this;
}
- /**
- * Read timeout for OkHttpClient. Deprecation note: Use readTimeout
- * instead.
- *
- * The option is a: <code>java.lang.Long</code> type.
- *
- * Group: common
- *
- * @param readTimeoutMillis the value to set
- * @return the dsl builder
- */
- @Deprecated
- default ConsulComponentBuilder readTimeoutMillis(
- java.lang.Long readTimeoutMillis) {
- doSetProperty("readTimeoutMillis", readTimeoutMillis);
- return this;
- }
/**
* Set tags. You can separate multiple tags by comma.
*
@@ -529,7 +512,6 @@ public interface ConsulComponentBuilderFactory {
case "key": getOrCreateConfiguration((ConsulComponent) component).setKey((java.lang.String) value); return true;
case "pingInstance": getOrCreateConfiguration((ConsulComponent) component).setPingInstance((boolean) value); return true;
case "readTimeout": getOrCreateConfiguration((ConsulComponent) component).setReadTimeout((java.time.Duration) value); return true;
- case "readTimeoutMillis": getOrCreateConfiguration((ConsulComponent) component).setReadTimeoutMillis((java.lang.Long) value); return true;
case "tags": getOrCreateConfiguration((ConsulComponent) component).setTags((java.lang.String) value); return true;
case "url": getOrCreateConfiguration((ConsulComponent) component).setUrl((java.lang.String) value); return true;
case "writeTimeout": getOrCreateConfiguration((ConsulComponent) component).setWriteTimeout((java.time.Duration) value); return true;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ConsulEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ConsulEndpointBuilderFactory.java
index 30c69a046d8..24b1c1e60b9 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ConsulEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ConsulEndpointBuilderFactory.java
@@ -182,41 +182,6 @@ public interface ConsulEndpointBuilderFactory {
doSetProperty("readTimeout", readTimeout);
return this;
}
- /**
- * Read timeout for OkHttpClient. Deprecation note: Use readTimeout
- * instead.
- *
- * The option is a: <code>java.lang.Long</code> type.
- *
- * Group: common
- *
- * @param readTimeoutMillis the value to set
- * @return the dsl builder
- */
- @Deprecated
- default ConsulEndpointConsumerBuilder readTimeoutMillis(
- Long readTimeoutMillis) {
- doSetProperty("readTimeoutMillis", readTimeoutMillis);
- return this;
- }
- /**
- * Read timeout for OkHttpClient. Deprecation note: Use readTimeout
- * instead.
- *
- * The option will be converted to a
- * <code>java.lang.Long</code> type.
- *
- * Group: common
- *
- * @param readTimeoutMillis the value to set
- * @return the dsl builder
- */
- @Deprecated
- default ConsulEndpointConsumerBuilder readTimeoutMillis(
- String readTimeoutMillis) {
- doSetProperty("readTimeoutMillis", readTimeoutMillis);
- return this;
- }
/**
* Set tags. You can separate multiple tags by comma.
*
@@ -854,41 +819,6 @@ public interface ConsulEndpointBuilderFactory {
doSetProperty("readTimeout", readTimeout);
return this;
}
- /**
- * Read timeout for OkHttpClient. Deprecation note: Use readTimeout
- * instead.
- *
- * The option is a: <code>java.lang.Long</code> type.
- *
- * Group: common
- *
- * @param readTimeoutMillis the value to set
- * @return the dsl builder
- */
- @Deprecated
- default ConsulEndpointProducerBuilder readTimeoutMillis(
- Long readTimeoutMillis) {
- doSetProperty("readTimeoutMillis", readTimeoutMillis);
- return this;
- }
- /**
- * Read timeout for OkHttpClient. Deprecation note: Use readTimeout
- * instead.
- *
- * The option will be converted to a
- * <code>java.lang.Long</code> type.
- *
- * Group: common
- *
- * @param readTimeoutMillis the value to set
- * @return the dsl builder
- */
- @Deprecated
- default ConsulEndpointProducerBuilder readTimeoutMillis(
- String readTimeoutMillis) {
- doSetProperty("readTimeoutMillis", readTimeoutMillis);
- return this;
- }
/**
* Set tags. You can separate multiple tags by comma.
*
@@ -1413,39 +1343,6 @@ public interface ConsulEndpointBuilderFactory {
doSetProperty("readTimeout", readTimeout);
return this;
}
- /**
- * Read timeout for OkHttpClient. Deprecation note: Use readTimeout
- * instead.
- *
- * The option is a: <code>java.lang.Long</code> type.
- *
- * Group: common
- *
- * @param readTimeoutMillis the value to set
- * @return the dsl builder
- */
- @Deprecated
- default ConsulEndpointBuilder readTimeoutMillis(Long readTimeoutMillis) {
- doSetProperty("readTimeoutMillis", readTimeoutMillis);
- return this;
- }
- /**
- * Read timeout for OkHttpClient. Deprecation note: Use readTimeout
- * instead.
- *
- * The option will be converted to a
- * <code>java.lang.Long</code> type.
- *
- * Group: common
- *
- * @param readTimeoutMillis the value to set
- * @return the dsl builder
- */
- @Deprecated
- default ConsulEndpointBuilder readTimeoutMillis(String readTimeoutMillis) {
- doSetProperty("readTimeoutMillis", readTimeoutMillis);
- return this;
- }
/**
* Set tags. You can separate multiple tags by comma.
*
[camel] 01/03: CAMEL-15520: removed the deprecated option connectTimeoutMillis from camel-consul
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit f2d2db87219837cdb4b7e305bcf2b31b1195e1fe
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Thu Aug 11 10:53:57 2022 +0200
CAMEL-15520: removed the deprecated option connectTimeoutMillis from camel-consul
---
.../apache/camel/catalog/components/consul.json | 2 -
.../consul/ConsulComponentConfigurer.java | 6 --
.../component/consul/ConsulEndpointConfigurer.java | 6 --
.../component/consul/ConsulEndpointUriFactory.java | 3 +-
.../ConsulServiceDiscoveryFactoryConfigurer.java | 12 +--
.../org/apache/camel/component/consul/consul.json | 2 -
.../consul/ConsulClientConfiguration.java | 20 +---
.../cloud/ConsulServiceDiscoveryFactory.java | 10 +-
.../consul/cloud/ConsulServiceRegistry.java | 9 +-
.../consul/cluster/ConsulClusterService.java | 10 +-
.../ROOT/pages/camel-3x-upgrade-guide-3_19.adoc | 13 +++
.../dsl/ConsulComponentBuilderFactory.java | 18 ----
.../endpoint/dsl/ConsulEndpointBuilderFactory.java | 105 ---------------------
13 files changed, 38 insertions(+), 178 deletions(-)
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/consul.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/consul.json
index 106b59dcaa1..b46bd080f2e 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/consul.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/consul.json
@@ -23,7 +23,6 @@
},
"componentProperties": {
"connectTimeout": { "kind": "property", "displayName": "Connect Timeout", "group": "common", "label": "", "required": false, "type": "object", "javaType": "java.time.Duration", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "Connect timeout for OkHttpClient" },
- "connectTimeoutMillis": { "kind": "property", "displayName": "Connect Timeout Millis", "group": "common", "label": "", "required": false, "type": "integer", "javaType": "java.lang.Long", "deprecated": true, "deprecationNote": "Use connectTimeout instead", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "Connect timeout for OkHttpClient. Deprecation note: Use conne [...]
"consulClient": { "kind": "property", "displayName": "Consul Client", "group": "common", "label": "common", "required": false, "type": "object", "javaType": "com.orbitz.consul.Consul", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "Reference to a com.orbitz.consul.Consul in the registry." },
"key": { "kind": "property", "displayName": "Key", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "The default key. Can be overridden by CamelConsulKey" },
"pingInstance": { "kind": "property", "displayName": "Ping Instance", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "Configure if the AgentClient should attempt a ping before returning the Consul instance" },
@@ -88,7 +87,6 @@
"properties": {
"apiEndpoint": { "kind": "path", "displayName": "Api Endpoint", "group": "common", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The API endpoint" },
"connectTimeout": { "kind": "parameter", "displayName": "Connect Timeout", "group": "common", "label": "", "required": false, "type": "object", "javaType": "java.time.Duration", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "Connect timeout for OkHttpClient" },
- "connectTimeoutMillis": { "kind": "parameter", "displayName": "Connect Timeout Millis", "group": "common", "label": "", "required": false, "type": "integer", "javaType": "java.lang.Long", "deprecated": true, "deprecationNote": "Use connectTimeout instead", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "Connect timeout for OkHttpClient. Deprecation note: Use conn [...]
"consulClient": { "kind": "parameter", "displayName": "Consul Client", "group": "common", "label": "common", "required": false, "type": "object", "javaType": "com.orbitz.consul.Consul", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "Reference to a com.orbitz.consul.Consul in the registry." },
"key": { "kind": "parameter", "displayName": "Key", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "The default key. Can be overridden by CamelConsulKey" },
"pingInstance": { "kind": "parameter", "displayName": "Ping Instance", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "Configure if the AgentClient should attempt a ping before returning the Consul instance" },
diff --git a/components/camel-consul/src/generated/java/org/apache/camel/component/consul/ConsulComponentConfigurer.java b/components/camel-consul/src/generated/java/org/apache/camel/component/consul/ConsulComponentConfigurer.java
index 03457c8449d..5b3327e8352 100644
--- a/components/camel-consul/src/generated/java/org/apache/camel/component/consul/ConsulComponentConfigurer.java
+++ b/components/camel-consul/src/generated/java/org/apache/camel/component/consul/ConsulComponentConfigurer.java
@@ -40,8 +40,6 @@ public class ConsulComponentConfigurer extends PropertyConfigurerSupport impleme
case "configuration": target.setConfiguration(property(camelContext, org.apache.camel.component.consul.ConsulConfiguration.class, value)); return true;
case "connecttimeout":
case "connectTimeout": getOrCreateConfiguration(target).setConnectTimeout(property(camelContext, java.time.Duration.class, value)); return true;
- case "connecttimeoutmillis":
- case "connectTimeoutMillis": getOrCreateConfiguration(target).setConnectTimeoutMillis(property(camelContext, java.lang.Long.class, value)); return true;
case "consistencymode":
case "consistencyMode": getOrCreateConfiguration(target).setConsistencyMode(property(camelContext, com.orbitz.consul.option.ConsistencyMode.class, value)); return true;
case "consulclient":
@@ -97,8 +95,6 @@ public class ConsulComponentConfigurer extends PropertyConfigurerSupport impleme
case "configuration": return org.apache.camel.component.consul.ConsulConfiguration.class;
case "connecttimeout":
case "connectTimeout": return java.time.Duration.class;
- case "connecttimeoutmillis":
- case "connectTimeoutMillis": return java.lang.Long.class;
case "consistencymode":
case "consistencyMode": return com.orbitz.consul.option.ConsistencyMode.class;
case "consulclient":
@@ -155,8 +151,6 @@ public class ConsulComponentConfigurer extends PropertyConfigurerSupport impleme
case "configuration": return target.getConfiguration();
case "connecttimeout":
case "connectTimeout": return getOrCreateConfiguration(target).getConnectTimeout();
- case "connecttimeoutmillis":
- case "connectTimeoutMillis": return getOrCreateConfiguration(target).getConnectTimeoutMillis();
case "consistencymode":
case "consistencyMode": return getOrCreateConfiguration(target).getConsistencyMode();
case "consulclient":
diff --git a/components/camel-consul/src/generated/java/org/apache/camel/component/consul/ConsulEndpointConfigurer.java b/components/camel-consul/src/generated/java/org/apache/camel/component/consul/ConsulEndpointConfigurer.java
index 2c4c86da335..b22a768c04b 100644
--- a/components/camel-consul/src/generated/java/org/apache/camel/component/consul/ConsulEndpointConfigurer.java
+++ b/components/camel-consul/src/generated/java/org/apache/camel/component/consul/ConsulEndpointConfigurer.java
@@ -30,8 +30,6 @@ public class ConsulEndpointConfigurer extends PropertyConfigurerSupport implemen
case "bridgeErrorHandler": target.setBridgeErrorHandler(property(camelContext, boolean.class, value)); return true;
case "connecttimeout":
case "connectTimeout": target.getConfiguration().setConnectTimeout(property(camelContext, java.time.Duration.class, value)); return true;
- case "connecttimeoutmillis":
- case "connectTimeoutMillis": target.getConfiguration().setConnectTimeoutMillis(property(camelContext, java.lang.Long.class, value)); return true;
case "consistencymode":
case "consistencyMode": target.getConfiguration().setConsistencyMode(property(camelContext, com.orbitz.consul.option.ConsistencyMode.class, value)); return true;
case "consulclient":
@@ -86,8 +84,6 @@ public class ConsulEndpointConfigurer extends PropertyConfigurerSupport implemen
case "bridgeErrorHandler": return boolean.class;
case "connecttimeout":
case "connectTimeout": return java.time.Duration.class;
- case "connecttimeoutmillis":
- case "connectTimeoutMillis": return java.lang.Long.class;
case "consistencymode":
case "consistencyMode": return com.orbitz.consul.option.ConsistencyMode.class;
case "consulclient":
@@ -143,8 +139,6 @@ public class ConsulEndpointConfigurer extends PropertyConfigurerSupport implemen
case "bridgeErrorHandler": return target.isBridgeErrorHandler();
case "connecttimeout":
case "connectTimeout": return target.getConfiguration().getConnectTimeout();
- case "connecttimeoutmillis":
- case "connectTimeoutMillis": return target.getConfiguration().getConnectTimeoutMillis();
case "consistencymode":
case "consistencyMode": return target.getConfiguration().getConsistencyMode();
case "consulclient":
diff --git a/components/camel-consul/src/generated/java/org/apache/camel/component/consul/ConsulEndpointUriFactory.java b/components/camel-consul/src/generated/java/org/apache/camel/component/consul/ConsulEndpointUriFactory.java
index 9047ca44d6f..d42d077adec 100644
--- a/components/camel-consul/src/generated/java/org/apache/camel/component/consul/ConsulEndpointUriFactory.java
+++ b/components/camel-consul/src/generated/java/org/apache/camel/component/consul/ConsulEndpointUriFactory.java
@@ -21,14 +21,13 @@ public class ConsulEndpointUriFactory extends org.apache.camel.support.component
private static final Set<String> SECRET_PROPERTY_NAMES;
private static final Set<String> MULTI_VALUE_PREFIXES;
static {
- Set<String> props = new HashSet<>(29);
+ Set<String> props = new HashSet<>(28);
props.add("aclToken");
props.add("action");
props.add("apiEndpoint");
props.add("blockSeconds");
props.add("bridgeErrorHandler");
props.add("connectTimeout");
- props.add("connectTimeoutMillis");
props.add("consistencyMode");
props.add("consulClient");
props.add("datacenter");
diff --git a/components/camel-consul/src/generated/java/org/apache/camel/component/consul/cloud/ConsulServiceDiscoveryFactoryConfigurer.java b/components/camel-consul/src/generated/java/org/apache/camel/component/consul/cloud/ConsulServiceDiscoveryFactoryConfigurer.java
index f9afa315b10..517cd9a1b8e 100644
--- a/components/camel-consul/src/generated/java/org/apache/camel/component/consul/cloud/ConsulServiceDiscoveryFactoryConfigurer.java
+++ b/components/camel-consul/src/generated/java/org/apache/camel/component/consul/cloud/ConsulServiceDiscoveryFactoryConfigurer.java
@@ -25,8 +25,8 @@ public class ConsulServiceDiscoveryFactoryConfigurer extends org.apache.camel.su
case "AclToken": target.setAclToken(property(camelContext, java.lang.String.class, value)); return true;
case "blockseconds":
case "BlockSeconds": target.setBlockSeconds(property(camelContext, java.lang.Integer.class, value)); return true;
- case "connecttimeoutmillis":
- case "ConnectTimeoutMillis": target.setConnectTimeoutMillis(property(camelContext, java.lang.Long.class, value)); return true;
+ case "connecttimeout":
+ case "ConnectTimeout": target.setConnectTimeout(property(camelContext, java.time.Duration.class, value)); return true;
case "datacenter":
case "Datacenter": target.setDatacenter(property(camelContext, java.lang.String.class, value)); return true;
case "password":
@@ -52,8 +52,8 @@ public class ConsulServiceDiscoveryFactoryConfigurer extends org.apache.camel.su
case "AclToken": return java.lang.String.class;
case "blockseconds":
case "BlockSeconds": return java.lang.Integer.class;
- case "connecttimeoutmillis":
- case "ConnectTimeoutMillis": return java.lang.Long.class;
+ case "connecttimeout":
+ case "ConnectTimeout": return java.time.Duration.class;
case "datacenter":
case "Datacenter": return java.lang.String.class;
case "password":
@@ -80,8 +80,8 @@ public class ConsulServiceDiscoveryFactoryConfigurer extends org.apache.camel.su
case "AclToken": return target.getAclToken();
case "blockseconds":
case "BlockSeconds": return target.getBlockSeconds();
- case "connecttimeoutmillis":
- case "ConnectTimeoutMillis": return target.getConnectTimeoutMillis();
+ case "connecttimeout":
+ case "ConnectTimeout": return target.getConnectTimeout();
case "datacenter":
case "Datacenter": return target.getDatacenter();
case "password":
diff --git a/components/camel-consul/src/generated/resources/org/apache/camel/component/consul/consul.json b/components/camel-consul/src/generated/resources/org/apache/camel/component/consul/consul.json
index 106b59dcaa1..b46bd080f2e 100644
--- a/components/camel-consul/src/generated/resources/org/apache/camel/component/consul/consul.json
+++ b/components/camel-consul/src/generated/resources/org/apache/camel/component/consul/consul.json
@@ -23,7 +23,6 @@
},
"componentProperties": {
"connectTimeout": { "kind": "property", "displayName": "Connect Timeout", "group": "common", "label": "", "required": false, "type": "object", "javaType": "java.time.Duration", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "Connect timeout for OkHttpClient" },
- "connectTimeoutMillis": { "kind": "property", "displayName": "Connect Timeout Millis", "group": "common", "label": "", "required": false, "type": "integer", "javaType": "java.lang.Long", "deprecated": true, "deprecationNote": "Use connectTimeout instead", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "Connect timeout for OkHttpClient. Deprecation note: Use conne [...]
"consulClient": { "kind": "property", "displayName": "Consul Client", "group": "common", "label": "common", "required": false, "type": "object", "javaType": "com.orbitz.consul.Consul", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "Reference to a com.orbitz.consul.Consul in the registry." },
"key": { "kind": "property", "displayName": "Key", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "The default key. Can be overridden by CamelConsulKey" },
"pingInstance": { "kind": "property", "displayName": "Ping Instance", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "Configure if the AgentClient should attempt a ping before returning the Consul instance" },
@@ -88,7 +87,6 @@
"properties": {
"apiEndpoint": { "kind": "path", "displayName": "Api Endpoint", "group": "common", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The API endpoint" },
"connectTimeout": { "kind": "parameter", "displayName": "Connect Timeout", "group": "common", "label": "", "required": false, "type": "object", "javaType": "java.time.Duration", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "Connect timeout for OkHttpClient" },
- "connectTimeoutMillis": { "kind": "parameter", "displayName": "Connect Timeout Millis", "group": "common", "label": "", "required": false, "type": "integer", "javaType": "java.lang.Long", "deprecated": true, "deprecationNote": "Use connectTimeout instead", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "Connect timeout for OkHttpClient. Deprecation note: Use conn [...]
"consulClient": { "kind": "parameter", "displayName": "Consul Client", "group": "common", "label": "common", "required": false, "type": "object", "javaType": "com.orbitz.consul.Consul", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "Reference to a com.orbitz.consul.Consul in the registry." },
"key": { "kind": "parameter", "displayName": "Key", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "The default key. Can be overridden by CamelConsulKey" },
"pingInstance": { "kind": "parameter", "displayName": "Ping Instance", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "Configure if the AgentClient should attempt a ping before returning the Consul instance" },
diff --git a/components/camel-consul/src/main/java/org/apache/camel/component/consul/ConsulClientConfiguration.java b/components/camel-consul/src/main/java/org/apache/camel/component/consul/ConsulClientConfiguration.java
index 0c690eed183..a57b07875b1 100644
--- a/components/camel-consul/src/main/java/org/apache/camel/component/consul/ConsulClientConfiguration.java
+++ b/components/camel-consul/src/main/java/org/apache/camel/component/consul/ConsulClientConfiguration.java
@@ -59,10 +59,6 @@ public abstract class ConsulClientConfiguration implements Cloneable {
@UriParam(label = "security", secret = true)
private String password;
- @Deprecated
- @Metadata(deprecationNote = "Use connectTimeout instead")
- @UriParam
- private Long connectTimeoutMillis;
@UriParam
private Duration connectTimeout;
@Deprecated
@@ -230,19 +226,6 @@ public abstract class ConsulClientConfiguration implements Cloneable {
return ObjectHelper.isNotEmpty(userName) && ObjectHelper.isNotEmpty(password);
}
- public Long getConnectTimeoutMillis() {
- return connectTimeoutMillis;
- }
-
- /**
- * Connect timeout for OkHttpClient
- *
- * @deprecated use connectTimeout instead
- */
- public void setConnectTimeoutMillis(Long connectTimeoutMillis) {
- this.connectTimeoutMillis = connectTimeoutMillis;
- }
-
public Duration getConnectTimeout() {
return connectTimeout;
}
@@ -372,9 +355,8 @@ public abstract class ConsulClientConfiguration implements Cloneable {
}
if (ObjectHelper.isNotEmpty(connectTimeout)) {
builder.withConnectTimeoutMillis(connectTimeout.toMillis());
- } else if (ObjectHelper.isNotEmpty(connectTimeoutMillis)) {
- builder.withConnectTimeoutMillis(connectTimeoutMillis);
}
+
if (ObjectHelper.isNotEmpty(readTimeout)) {
builder.withConnectTimeoutMillis(readTimeout.toMillis());
} else if (ObjectHelper.isNotEmpty(readTimeoutMillis)) {
diff --git a/components/camel-consul/src/main/java/org/apache/camel/component/consul/cloud/ConsulServiceDiscoveryFactory.java b/components/camel-consul/src/main/java/org/apache/camel/component/consul/cloud/ConsulServiceDiscoveryFactory.java
index ea0d7276d90..20b626e5822 100644
--- a/components/camel-consul/src/main/java/org/apache/camel/component/consul/cloud/ConsulServiceDiscoveryFactory.java
+++ b/components/camel-consul/src/main/java/org/apache/camel/component/consul/cloud/ConsulServiceDiscoveryFactory.java
@@ -16,6 +16,8 @@
*/
package org.apache.camel.component.consul.cloud;
+import java.time.Duration;
+
import org.apache.camel.CamelContext;
import org.apache.camel.cloud.ServiceDiscovery;
import org.apache.camel.cloud.ServiceDiscoveryFactory;
@@ -89,12 +91,12 @@ public class ConsulServiceDiscoveryFactory implements ServiceDiscoveryFactory {
configuration.setPassword(password);
}
- public Long getConnectTimeoutMillis() {
- return configuration.getConnectTimeoutMillis();
+ public Duration getConnectTimeout() {
+ return configuration.getConnectTimeout();
}
- public void setConnectTimeoutMillis(Long connectTimeoutMillis) {
- configuration.setConnectTimeoutMillis(connectTimeoutMillis);
+ public void setConnectTimeout(Duration connectTimeout) {
+ configuration.setConnectTimeout(connectTimeout);
}
public Long getReadTimeoutMillis() {
diff --git a/components/camel-consul/src/main/java/org/apache/camel/component/consul/cloud/ConsulServiceRegistry.java b/components/camel-consul/src/main/java/org/apache/camel/component/consul/cloud/ConsulServiceRegistry.java
index b6fefcd3c80..11c005e0f27 100644
--- a/components/camel-consul/src/main/java/org/apache/camel/component/consul/cloud/ConsulServiceRegistry.java
+++ b/components/camel-consul/src/main/java/org/apache/camel/component/consul/cloud/ConsulServiceRegistry.java
@@ -16,6 +16,7 @@
*/
package org.apache.camel.component.consul.cloud;
+import java.time.Duration;
import java.util.Objects;
import java.util.Optional;
import java.util.Set;
@@ -115,12 +116,12 @@ public class ConsulServiceRegistry extends AbstractServiceRegistry {
configuration.setPassword(password);
}
- public Long getConnectTimeoutMillis() {
- return configuration.getConnectTimeoutMillis();
+ public Duration getConnectTimeout() {
+ return configuration.getConnectTimeout();
}
- public void setConnectTimeoutMillis(Long connectTimeoutMillis) {
- configuration.setConnectTimeoutMillis(connectTimeoutMillis);
+ public void setConnectTimeout(Duration connectTimeout) {
+ configuration.setConnectTimeout(connectTimeout);
}
public Long getReadTimeoutMillis() {
diff --git a/components/camel-consul/src/main/java/org/apache/camel/component/consul/cluster/ConsulClusterService.java b/components/camel-consul/src/main/java/org/apache/camel/component/consul/cluster/ConsulClusterService.java
index 550ebcc985e..9689d58459e 100644
--- a/components/camel-consul/src/main/java/org/apache/camel/component/consul/cluster/ConsulClusterService.java
+++ b/components/camel-consul/src/main/java/org/apache/camel/component/consul/cluster/ConsulClusterService.java
@@ -16,6 +16,8 @@
*/
package org.apache.camel.component.consul.cluster;
+import java.time.Duration;
+
import org.apache.camel.support.cluster.AbstractCamelClusterService;
import org.apache.camel.support.jsse.SSLContextParameters;
import org.apache.camel.util.ObjectHelper;
@@ -95,12 +97,12 @@ public final class ConsulClusterService extends AbstractCamelClusterService<Cons
configuration.setPassword(password);
}
- public Long getConnectTimeoutMillis() {
- return configuration.getConnectTimeoutMillis();
+ public Duration getConnectTimeout() {
+ return configuration.getConnectTimeout();
}
- public void setConnectTimeoutMillis(Long connectTimeoutMillis) {
- configuration.setConnectTimeoutMillis(connectTimeoutMillis);
+ public void setConnectTimeout(Duration connectTimeout) {
+ configuration.setConnectTimeout(connectTimeout);
}
public Long getReadTimeoutMillis() {
diff --git a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_19.adoc b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_19.adoc
index b9440888adf..7f725549299 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_19.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_19.adoc
@@ -44,3 +44,16 @@ spec:
=== camel-salesforce
The URI format for consumer operations has changed. All consumer URIs now use the `subscribe` operation. E.g., `salesforce:subscribe:<topic_name>`, `salesforce:subscribe:event/<event_name>`, `salesforce:subscribe:data/ChangeEvents`.
+
+
+=== camel-consul
+
+The deprecated options were removed and should be replaced by the following options
+
+|===
+|Deprecated |Replace with
+
+|`connectTimeoutMillis`
+|`connectTimeout`
+|===
+
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ConsulComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ConsulComponentBuilderFactory.java
index 085adc0d9e7..4f164e377fc 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ConsulComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ConsulComponentBuilderFactory.java
@@ -65,23 +65,6 @@ public interface ConsulComponentBuilderFactory {
doSetProperty("connectTimeout", connectTimeout);
return this;
}
- /**
- * Connect timeout for OkHttpClient. Deprecation note: Use
- * connectTimeout instead.
- *
- * The option is a: <code>java.lang.Long</code> type.
- *
- * Group: common
- *
- * @param connectTimeoutMillis the value to set
- * @return the dsl builder
- */
- @Deprecated
- default ConsulComponentBuilder connectTimeoutMillis(
- java.lang.Long connectTimeoutMillis) {
- doSetProperty("connectTimeoutMillis", connectTimeoutMillis);
- return this;
- }
/**
* Reference to a com.orbitz.consul.Consul in the registry.
*
@@ -542,7 +525,6 @@ public interface ConsulComponentBuilderFactory {
Object value) {
switch (name) {
case "connectTimeout": getOrCreateConfiguration((ConsulComponent) component).setConnectTimeout((java.time.Duration) value); return true;
- case "connectTimeoutMillis": getOrCreateConfiguration((ConsulComponent) component).setConnectTimeoutMillis((java.lang.Long) value); return true;
case "consulClient": getOrCreateConfiguration((ConsulComponent) component).setConsulClient((com.orbitz.consul.Consul) value); return true;
case "key": getOrCreateConfiguration((ConsulComponent) component).setKey((java.lang.String) value); return true;
case "pingInstance": getOrCreateConfiguration((ConsulComponent) component).setPingInstance((boolean) value); return true;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ConsulEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ConsulEndpointBuilderFactory.java
index 2d82a3a40be..30c69a046d8 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ConsulEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ConsulEndpointBuilderFactory.java
@@ -74,41 +74,6 @@ public interface ConsulEndpointBuilderFactory {
doSetProperty("connectTimeout", connectTimeout);
return this;
}
- /**
- * Connect timeout for OkHttpClient. Deprecation note: Use
- * connectTimeout instead.
- *
- * The option is a: <code>java.lang.Long</code> type.
- *
- * Group: common
- *
- * @param connectTimeoutMillis the value to set
- * @return the dsl builder
- */
- @Deprecated
- default ConsulEndpointConsumerBuilder connectTimeoutMillis(
- Long connectTimeoutMillis) {
- doSetProperty("connectTimeoutMillis", connectTimeoutMillis);
- return this;
- }
- /**
- * Connect timeout for OkHttpClient. Deprecation note: Use
- * connectTimeout instead.
- *
- * The option will be converted to a
- * <code>java.lang.Long</code> type.
- *
- * Group: common
- *
- * @param connectTimeoutMillis the value to set
- * @return the dsl builder
- */
- @Deprecated
- default ConsulEndpointConsumerBuilder connectTimeoutMillis(
- String connectTimeoutMillis) {
- doSetProperty("connectTimeoutMillis", connectTimeoutMillis);
- return this;
- }
/**
* Reference to a com.orbitz.consul.Consul in the registry.
*
@@ -781,41 +746,6 @@ public interface ConsulEndpointBuilderFactory {
doSetProperty("connectTimeout", connectTimeout);
return this;
}
- /**
- * Connect timeout for OkHttpClient. Deprecation note: Use
- * connectTimeout instead.
- *
- * The option is a: <code>java.lang.Long</code> type.
- *
- * Group: common
- *
- * @param connectTimeoutMillis the value to set
- * @return the dsl builder
- */
- @Deprecated
- default ConsulEndpointProducerBuilder connectTimeoutMillis(
- Long connectTimeoutMillis) {
- doSetProperty("connectTimeoutMillis", connectTimeoutMillis);
- return this;
- }
- /**
- * Connect timeout for OkHttpClient. Deprecation note: Use
- * connectTimeout instead.
- *
- * The option will be converted to a
- * <code>java.lang.Long</code> type.
- *
- * Group: common
- *
- * @param connectTimeoutMillis the value to set
- * @return the dsl builder
- */
- @Deprecated
- default ConsulEndpointProducerBuilder connectTimeoutMillis(
- String connectTimeoutMillis) {
- doSetProperty("connectTimeoutMillis", connectTimeoutMillis);
- return this;
- }
/**
* Reference to a com.orbitz.consul.Consul in the registry.
*
@@ -1376,41 +1306,6 @@ public interface ConsulEndpointBuilderFactory {
doSetProperty("connectTimeout", connectTimeout);
return this;
}
- /**
- * Connect timeout for OkHttpClient. Deprecation note: Use
- * connectTimeout instead.
- *
- * The option is a: <code>java.lang.Long</code> type.
- *
- * Group: common
- *
- * @param connectTimeoutMillis the value to set
- * @return the dsl builder
- */
- @Deprecated
- default ConsulEndpointBuilder connectTimeoutMillis(
- Long connectTimeoutMillis) {
- doSetProperty("connectTimeoutMillis", connectTimeoutMillis);
- return this;
- }
- /**
- * Connect timeout for OkHttpClient. Deprecation note: Use
- * connectTimeout instead.
- *
- * The option will be converted to a
- * <code>java.lang.Long</code> type.
- *
- * Group: common
- *
- * @param connectTimeoutMillis the value to set
- * @return the dsl builder
- */
- @Deprecated
- default ConsulEndpointBuilder connectTimeoutMillis(
- String connectTimeoutMillis) {
- doSetProperty("connectTimeoutMillis", connectTimeoutMillis);
- return this;
- }
/**
* Reference to a com.orbitz.consul.Consul in the registry.
*