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:08 UTC
[camel] 03/03: CAMEL-15520: removed the deprecated option writeTimeoutMillis from camel-consul
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.
*