You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2022/08/13 07:37:19 UTC
[camel-spring-boot] branch main updated: [create-pull-request] automated change (#606)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
The following commit(s) were added to refs/heads/main by this push:
new fd5ff33a174 [create-pull-request] automated change (#606)
fd5ff33a174 is described below
commit fd5ff33a1749ed1441de574ffcb0a4a33f0a5611
Author: github-actions[bot] <41...@users.noreply.github.com>
AuthorDate: Sat Aug 13 09:37:15 2022 +0200
[create-pull-request] automated change (#606)
Co-authored-by: oscerd <os...@users.noreply.github.com>
---
.../springboot/catalog/components/consul.json | 6 ---
.../springboot/catalog/components/stream.json | 4 +-
.../camel/springboot/catalog/others/console.json | 2 +-
.../springboot/catalog/others/management.json | 1 +
.../camel-consul-starter/src/main/docs/consul.json | 60 ----------------------
.../springboot/ConsulComponentConfiguration.java | 51 ------------------
6 files changed, 5 insertions(+), 119 deletions(-)
diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/consul.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/consul.json
index 4a323f2a0af..c2e1b330cd2 100644
--- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/consul.json
+++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/consul.json
@@ -23,16 +23,13 @@
},
"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" },
"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" },
- "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 [...]
@@ -88,16 +85,13 @@
"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" },
"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" },
- "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/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/stream.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/stream.json
index fde8b422c22..71a397ee080 100644
--- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/stream.json
+++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/stream.json
@@ -31,12 +31,14 @@
"CamelStreamComplete": { "kind": "header", "displayName": "", "group": "consumer", "label": "consumer", "required": false, "javaType": "boolean", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "Is complete", "constantName": "org.apache.camel.component.stream.StreamConstants#STREAM_COMPLETE" }
},
"properties": {
- "kind": { "kind": "path", "displayName": "Kind", "group": "common", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "enum": [ "in", "out", "err", "header", "file" ], "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "Kind of stream to use such as System.in or System.out." },
+ "kind": { "kind": "path", "displayName": "Kind", "group": "common", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "enum": [ "in", "out", "err", "header", "file", "http" ], "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "Kind of stream to use such as System.in, System.out, a file, or a http url." },
"encoding": { "kind": "parameter", "displayName": "Encoding", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "You can configure the encoding (is a charset name) to use text-based streams (for example, message body is a String object). If not provided, Camel uses the JVM default Charset." },
"fileName": { "kind": "parameter", "displayName": "File Name", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "When using the stream:file URI format, this option specifies the filename to stream to\/from." },
"fileWatcher": { "kind": "parameter", "displayName": "File Watcher", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "To use JVM file watcher to listen for file change events to support re-loading files that may be overwritten, somewhat like tail --retry" },
"groupLines": { "kind": "parameter", "displayName": "Group Lines", "group": "consumer", "label": "consumer", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "description": "To group X number of lines in the consumer. For example to group 10 lines and therefore only spit out an Exchange with 10 lines, instead of 1 Exchange per line." },
"groupStrategy": { "kind": "parameter", "displayName": "Group Strategy", "group": "consumer", "label": "consumer", "required": false, "type": "object", "javaType": "org.apache.camel.component.stream.GroupStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "Allows to use a custom GroupStrategy to control how to group lines." },
+ "httpHeaders": { "kind": "parameter", "displayName": "Http Headers", "group": "consumer", "label": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "When using stream:http format, this option specifies optional http headers, such as Accept: application\/json. Multiple headers can be separated by comma." },
+ "httpUrl": { "kind": "parameter", "displayName": "Http Url", "group": "consumer", "label": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "When using stream:http format, this option specifies the http url to stream from." },
"initialPromptDelay": { "kind": "parameter", "displayName": "Initial Prompt Delay", "group": "consumer", "label": "consumer", "required": false, "type": "integer", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 2000, "description": "Initial delay in milliseconds before showing the message prompt. This delay occurs only once. Can be used during system startup to avoid message prompts being written while other logging is done to the system [...]
"promptDelay": { "kind": "parameter", "displayName": "Prompt Delay", "group": "consumer", "label": "consumer", "required": false, "type": "integer", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "description": "Optional delay in milliseconds before showing the message prompt." },
"promptMessage": { "kind": "parameter", "displayName": "Prompt Message", "group": "consumer", "label": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Message prompt to use when reading from stream:in; for example, you could set this to Enter a command:" },
diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/others/console.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/others/console.json
index 01c63b30451..d26914b3883 100644
--- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/others/console.json
+++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/others/console.json
@@ -6,7 +6,7 @@
"description": "Camel Developer Console",
"deprecated": false,
"firstVersion": "3.15.0",
- "label": "core",
+ "label": "core,monitoring",
"supportLevel": "Stable",
"groupId": "org.apache.camel.springboot",
"artifactId": "camel-console-starter",
diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/others/management.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/others/management.json
index d2fe1d69159..db2c37bed33 100644
--- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/others/management.json
+++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/others/management.json
@@ -6,6 +6,7 @@
"description": "Camel Management",
"deprecated": false,
"firstVersion": "3.0.0",
+ "label": "core,management",
"supportLevel": "Stable",
"groupId": "org.apache.camel.springboot",
"artifactId": "camel-management-starter",
diff --git a/components-starter/camel-consul-starter/src/main/docs/consul.json b/components-starter/camel-consul-starter/src/main/docs/consul.json
index ee9cfdfda83..791fb21e7f3 100644
--- a/components-starter/camel-consul-starter/src/main/docs/consul.json
+++ b/components-starter/camel-consul-starter/src/main/docs/consul.json
@@ -62,12 +62,6 @@
"description": "Connect timeout for OkHttpClient",
"sourceType": "org.apache.camel.component.consul.springboot.cloud.ConsulServiceRegistryConfiguration"
},
- {
- "name": "camel.cloud.consul.connect-timeout-millis",
- "type": "java.lang.Long",
- "description": "Use connectTimeout instead",
- "sourceType": "org.apache.camel.component.consul.springboot.cloud.ConsulServiceRegistryConfiguration"
- },
{
"name": "camel.cloud.consul.consistency-mode",
"type": "com.orbitz.consul.option.ConsistencyMode",
@@ -158,12 +152,6 @@
"description": "Read timeout for OkHttpClient",
"sourceType": "org.apache.camel.component.consul.springboot.cloud.ConsulServiceRegistryConfiguration"
},
- {
- "name": "camel.cloud.consul.read-timeout-millis",
- "type": "java.lang.Long",
- "description": "Use readTimeout instead.",
- "sourceType": "org.apache.camel.component.consul.springboot.cloud.ConsulServiceRegistryConfiguration"
- },
{
"name": "camel.cloud.consul.recursive",
"type": "java.lang.Boolean",
@@ -207,12 +195,6 @@
"description": "Write timeout for OkHttpClient",
"sourceType": "org.apache.camel.component.consul.springboot.cloud.ConsulServiceRegistryConfiguration"
},
- {
- "name": "camel.cloud.consul.write-timeout-millis",
- "type": "java.lang.Long",
- "description": "Use writeTimeout instead.",
- "sourceType": "org.apache.camel.component.consul.springboot.cloud.ConsulServiceRegistryConfiguration"
- },
{
"name": "camel.cluster.consul.acl-token",
"type": "java.lang.String",
@@ -238,12 +220,6 @@
"description": "Connect timeout for OkHttpClient",
"sourceType": "org.apache.camel.component.consul.springboot.cluster.ConsulClusterServiceConfiguration"
},
- {
- "name": "camel.cluster.consul.connect-timeout-millis",
- "type": "java.lang.Long",
- "description": "Use connectTimeout instead",
- "sourceType": "org.apache.camel.component.consul.springboot.cluster.ConsulClusterServiceConfiguration"
- },
{
"name": "camel.cluster.consul.consistency-mode",
"type": "com.orbitz.consul.option.ConsistencyMode",
@@ -313,12 +289,6 @@
"description": "Read timeout for OkHttpClient",
"sourceType": "org.apache.camel.component.consul.springboot.cluster.ConsulClusterServiceConfiguration"
},
- {
- "name": "camel.cluster.consul.read-timeout-millis",
- "type": "java.lang.Long",
- "description": "Use readTimeout instead.",
- "sourceType": "org.apache.camel.component.consul.springboot.cluster.ConsulClusterServiceConfiguration"
- },
{
"name": "camel.cluster.consul.recursive",
"type": "java.lang.Boolean",
@@ -384,12 +354,6 @@
"description": "Write timeout for OkHttpClient",
"sourceType": "org.apache.camel.component.consul.springboot.cluster.ConsulClusterServiceConfiguration"
},
- {
- "name": "camel.cluster.consul.write-timeout-millis",
- "type": "java.lang.Long",
- "description": "Use writeTimeout instead.",
- "sourceType": "org.apache.camel.component.consul.springboot.cluster.ConsulClusterServiceConfiguration"
- },
{
"name": "camel.component.consul.acl-token",
"type": "java.lang.String",
@@ -580,30 +544,6 @@
"sourceType": "org.apache.camel.component.consul.springboot.cluster.ConsulClusterServiceConfiguration",
"deprecated": true,
"deprecation": {}
- },
- {
- "name": "camel.component.consul.connect-timeout-millis",
- "type": "java.lang.Long",
- "description": "Connect timeout for OkHttpClient. Deprecation note: Use connectTimeout instead",
- "sourceType": "org.apache.camel.component.consul.springboot.ConsulComponentConfiguration",
- "deprecated": true,
- "deprecation": {}
- },
- {
- "name": "camel.component.consul.read-timeout-millis",
- "type": "java.lang.Long",
- "description": "Read timeout for OkHttpClient. Deprecation note: Use readTimeout instead",
- "sourceType": "org.apache.camel.component.consul.springboot.ConsulComponentConfiguration",
- "deprecated": true,
- "deprecation": {}
- },
- {
- "name": "camel.component.consul.write-timeout-millis",
- "type": "java.lang.Long",
- "description": "Write timeout for OkHttpClient. Deprecation note: Use writeTimeout instead. The option is a java.lang.Long type.",
- "sourceType": "org.apache.camel.component.consul.springboot.ConsulComponentConfiguration",
- "deprecated": true,
- "deprecation": {}
}
],
"hints": []
diff --git a/components-starter/camel-consul-starter/src/main/java/org/apache/camel/component/consul/springboot/ConsulComponentConfiguration.java b/components-starter/camel-consul-starter/src/main/java/org/apache/camel/component/consul/springboot/ConsulComponentConfiguration.java
index 364ba0385be..f6e59185dc5 100644
--- a/components-starter/camel-consul-starter/src/main/java/org/apache/camel/component/consul/springboot/ConsulComponentConfiguration.java
+++ b/components-starter/camel-consul-starter/src/main/java/org/apache/camel/component/consul/springboot/ConsulComponentConfiguration.java
@@ -27,7 +27,6 @@ import org.apache.camel.component.consul.ConsulConfiguration;
import org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon;
import org.apache.camel.support.jsse.SSLContextParameters;
import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.boot.context.properties.DeprecatedConfigurationProperty;
/**
* Integrate with Consul service discovery and configuration store.
@@ -50,12 +49,6 @@ public class ConsulComponentConfiguration
* type.
*/
private Duration connectTimeout;
- /**
- * Connect timeout for OkHttpClient. Deprecation note: Use connectTimeout
- * instead
- */
- @Deprecated
- private Long connectTimeoutMillis;
/**
* Reference to a com.orbitz.consul.Consul in the registry. The option is a
* com.orbitz.consul.Consul type.
@@ -74,11 +67,6 @@ public class ConsulComponentConfiguration
* Read timeout for OkHttpClient. The option is a java.time.Duration type.
*/
private Duration readTimeout;
- /**
- * Read timeout for OkHttpClient. Deprecation note: Use readTimeout instead
- */
- @Deprecated
- private Long readTimeoutMillis;
/**
* Set tags. You can separate multiple tags by comma.
*/
@@ -91,12 +79,6 @@ public class ConsulComponentConfiguration
* Write timeout for OkHttpClient. The option is a java.time.Duration type.
*/
private Duration writeTimeout;
- /**
- * Write timeout for OkHttpClient. Deprecation note: Use writeTimeout
- * instead. The option is a java.lang.Long type.
- */
- @Deprecated
- private Long writeTimeoutMillis;
/**
* Allows for bridging the consumer to the Camel routing Error Handler,
* which mean any exceptions occurred while the consumer is trying to pickup
@@ -200,17 +182,6 @@ public class ConsulComponentConfiguration
this.connectTimeout = connectTimeout;
}
- @Deprecated
- @DeprecatedConfigurationProperty
- public Long getConnectTimeoutMillis() {
- return connectTimeoutMillis;
- }
-
- @Deprecated
- public void setConnectTimeoutMillis(Long connectTimeoutMillis) {
- this.connectTimeoutMillis = connectTimeoutMillis;
- }
-
public Consul getConsulClient() {
return consulClient;
}
@@ -243,17 +214,6 @@ public class ConsulComponentConfiguration
this.readTimeout = readTimeout;
}
- @Deprecated
- @DeprecatedConfigurationProperty
- public Long getReadTimeoutMillis() {
- return readTimeoutMillis;
- }
-
- @Deprecated
- public void setReadTimeoutMillis(Long readTimeoutMillis) {
- this.readTimeoutMillis = readTimeoutMillis;
- }
-
public String getTags() {
return tags;
}
@@ -278,17 +238,6 @@ public class ConsulComponentConfiguration
this.writeTimeout = writeTimeout;
}
- @Deprecated
- @DeprecatedConfigurationProperty
- public Long getWriteTimeoutMillis() {
- return writeTimeoutMillis;
- }
-
- @Deprecated
- public void setWriteTimeoutMillis(Long writeTimeoutMillis) {
- this.writeTimeoutMillis = writeTimeoutMillis;
- }
-
public Boolean getBridgeErrorHandler() {
return bridgeErrorHandler;
}