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 88b5d817b11 CAMEL-22807: camel-cluster - Add bean metadata for tooling
88b5d817b11 is described below
commit 88b5d817b114c205a2eb0f81d73d2023f2316f69
Author: Claus Ibsen <[email protected]>
AuthorDate: Wed Dec 31 11:47:02 2025 +0100
CAMEL-22807: camel-cluster - Add bean metadata for tooling
---
.../camel/springboot/catalog/beans.properties | 9 +++++-
.../catalog/beans/ConsulClusterService.json | 16 ++++++++++
.../catalog/beans/FileLockClusterService.json | 16 ++++++++++
.../beans/InfinispanEmbeddedClusterService.json | 16 ++++++++++
.../beans/InfinispanRemoteClusterService.json | 16 ++++++++++
.../catalog/beans/JGroupsRaftClusterService.json | 16 ++++++++++
.../catalog/beans/KubernetesClusterService.json | 16 ++++++++++
.../catalog/beans/ZooKeeperClusterService.json | 16 ++++++++++
.../springboot/catalog/components/consul.json | 12 ++++----
.../src/main/docs/consul-cluster-service.json | 8 -----
.../ConsulClusterServiceAutoConfiguration.java | 10 +++----
.../camel-consul-starter/src/main/docs/consul.json | 14 ++-------
.../springboot/ConsulComponentConfiguration.java | 6 ++--
.../src/main/docs/infinispan-cluster-service.json | 5 ++++
.../KubernetesClusterServiceAutoConfiguration.java | 4 +--
...ernetesClusterServiceAutoConfigurationTest.java | 4 +--
.../src/main/docs/zookeeper-cluster-service.json | 21 ++++---------
.../ZooKeeperClusterServiceAutoConfiguration.java | 10 ++-----
.../ZooKeeperClusterServiceConfiguration.java | 34 ++--------------------
19 files changed, 155 insertions(+), 94 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/beans.properties
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/beans.properties
index c3e75dce7f1..839fc720ed3 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/beans.properties
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/beans.properties
@@ -2,22 +2,28 @@ CaffeineAggregationRepository
CaffeineIdempotentRepository
CassandraAggregationRepository
CassandraIdempotentRepository
+ConsulClusterService
CronScheduledRoutePolicy
EhcacheAggregationRepository
EhcacheIdempotentRepository
ElasticsearchBulkRequestAggregationStrategy
Etcd3AggregationRepository
+FileLockClusterService
HazelcastAggregationRepository
HazelcastIdempotentRepository
InfinispanEmbeddedAggregationRepository
+InfinispanEmbeddedClusterService
InfinispanEmbeddedIdempotentRepository
InfinispanRemoteAggregationRepository
+InfinispanRemoteClusterService
InfinispanRemoteIdempotentRepository
JCacheAggregationRepository
JCacheIdempotentRepository
+JGroupsRaftClusterService
JdbcAggregationRepository
JdbcMessageIdRepository
KafkaIdempotentRepository
+KubernetesClusterService
LevelDBAggregationRepository
LoggingHttpActivityListener
MongoDbIdempotentRepository
@@ -27,4 +33,5 @@ SpringRedisIdempotentRepository
TarAggregationStrategy
XsltAggregationStrategy
XsltSaxonAggregationStrategy
-ZipAggregationStrategy
\ No newline at end of file
+ZipAggregationStrategy
+ZooKeeperClusterService
\ No newline at end of file
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/beans/ConsulClusterService.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/beans/ConsulClusterService.json
new file mode 100644
index 00000000000..fa79298ada0
--- /dev/null
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/beans/ConsulClusterService.json
@@ -0,0 +1,16 @@
+{
+ "bean": {
+ "kind": "bean",
+ "name": "ConsulClusterService",
+ "javaType":
"org.apache.camel.component.consul.cluster.ConsulClusterService",
+ "interfaceType": "org.apache.camel.cluster.CamelClusterService",
+ "title": "Consul Cluster Service",
+ "description": "A consul based cluster locking",
+ "deprecated": false,
+ "groupId": "org.apache.camel.springboot",
+ "artifactId": "camel-consul-starter",
+ "version": "4.17.0-SNAPSHOT",
+ "properties": { "id": { "index": 0, "kind": "property", "displayName":
"Id", "required": true, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "description":
"Client id registered as _consul.service.registry.id" }, "url": { "index": 1,
"kind": "property", "displayName": "Url", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "description": "The Con [...]
+ }
+}
+
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/beans/FileLockClusterService.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/beans/FileLockClusterService.json
new file mode 100644
index 00000000000..cf39a0830fe
--- /dev/null
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/beans/FileLockClusterService.json
@@ -0,0 +1,16 @@
+{
+ "bean": {
+ "kind": "bean",
+ "name": "FileLockClusterService",
+ "javaType":
"org.apache.camel.component.file.cluster.FileLockClusterService",
+ "interfaceType": "org.apache.camel.cluster.CamelClusterService",
+ "title": "File Lock Cluster Service",
+ "description": "A file based cluster locking (read documentation to
understand limitations)",
+ "deprecated": false,
+ "groupId": "org.apache.camel.springboot",
+ "artifactId": "camel-file-starter",
+ "version": "4.17.0-SNAPSHOT",
+ "properties": { "root": { "index": 0, "kind": "property", "displayName":
"Root", "required": true, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "description": "The
root file path" }, "acquireLockDelay": { "index": 1, "kind": "property",
"displayName": "Acquire Lock Delay", "required": false, "type": "integer",
"javaType": "long", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": 1, "description": " [...]
+ }
+}
+
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/beans/InfinispanEmbeddedClusterService.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/beans/InfinispanEmbeddedClusterService.json
new file mode 100644
index 00000000000..dcb4cb39bcc
--- /dev/null
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/beans/InfinispanEmbeddedClusterService.json
@@ -0,0 +1,16 @@
+{
+ "bean": {
+ "kind": "bean",
+ "name": "InfinispanEmbeddedClusterService",
+ "javaType":
"org.apache.camel.component.infinispan.embedded.cluster.InfinispanEmbeddedClusterService",
+ "interfaceType": "org.apache.camel.cluster.CamelClusterService",
+ "title": "Infinispan Embedded Cluster Service",
+ "description": "Infinispan based embedded cluster locking",
+ "deprecated": false,
+ "groupId": "org.apache.camel.springboot",
+ "artifactId": "camel-infinispan-embedded-starter",
+ "version": "4.17.0-SNAPSHOT",
+ "properties": { "id": { "index": 0, "kind": "property", "displayName":
"Id", "required": true, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "description": "Node
id" }, "configurationUri": { "index": 1, "kind": "property", "displayName":
"Configuration Uri", "label": "advanced", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "description": "An [...]
+ }
+}
+
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/beans/InfinispanRemoteClusterService.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/beans/InfinispanRemoteClusterService.json
new file mode 100644
index 00000000000..1e33cc14cb9
--- /dev/null
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/beans/InfinispanRemoteClusterService.json
@@ -0,0 +1,16 @@
+{
+ "bean": {
+ "kind": "bean",
+ "name": "InfinispanRemoteClusterService",
+ "javaType":
"org.apache.camel.component.infinispan.remote.cluster.InfinispanRemoteClusterService",
+ "interfaceType": "org.apache.camel.cluster.CamelClusterService",
+ "title": "Infinispan Remote Cluster Service",
+ "description": "Infinispan based remote cluster locking",
+ "deprecated": false,
+ "groupId": "org.apache.camel.springboot",
+ "artifactId": "camel-infinispan-starter",
+ "version": "4.17.0-SNAPSHOT",
+ "properties": { "id": { "index": 0, "kind": "property", "displayName":
"Id", "required": true, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "description": "Node
id" }, "configurationUri": { "index": 1, "kind": "property", "displayName":
"Configuration Uri", "label": "advanced", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "description": "An [...]
+ }
+}
+
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/beans/JGroupsRaftClusterService.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/beans/JGroupsRaftClusterService.json
new file mode 100644
index 00000000000..452ad918624
--- /dev/null
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/beans/JGroupsRaftClusterService.json
@@ -0,0 +1,16 @@
+{
+ "bean": {
+ "kind": "bean",
+ "name": "JGroupsRaftClusterService",
+ "javaType":
"org.apache.camel.component.jgroups.raft.cluster.JGroupsRaftClusterService",
+ "interfaceType": "org.apache.camel.cluster.CamelClusterService",
+ "title": "JGroups Raft Cluster Service",
+ "description": "JGroups Raft based cluster locking",
+ "deprecated": false,
+ "groupId": "org.apache.camel.springboot",
+ "artifactId": "camel-jgroups-raft-starter",
+ "version": "4.17.0-SNAPSHOT",
+ "properties": { "id": { "index": 0, "kind": "property", "displayName":
"Id", "required": true, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "description":
"Unique Raft id" }, "jgroupsConfig": { "index": 1, "kind": "property",
"displayName": "Jgroups Config", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": "raft.xml", "descriptio [...]
+ }
+}
+
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/beans/KubernetesClusterService.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/beans/KubernetesClusterService.json
new file mode 100644
index 00000000000..e61859374b3
--- /dev/null
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/beans/KubernetesClusterService.json
@@ -0,0 +1,16 @@
+{
+ "bean": {
+ "kind": "bean",
+ "name": "KubernetesClusterService",
+ "javaType":
"org.apache.camel.component.kubernetes.cluster.KubernetesClusterService",
+ "interfaceType": "org.apache.camel.cluster.CamelClusterService",
+ "title": "Kubernetes Cluster Service",
+ "description": "Kubernetes based cluster locking",
+ "deprecated": true,
+ "groupId": "org.apache.camel.springboot",
+ "artifactId": "camel-kubernetes-starter",
+ "version": "4.17.0-SNAPSHOT",
+ "properties": { "masterUrl": { "index": 0, "kind": "property",
"displayName": "Master Url", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "URL to a remote Kubernetes API server. This should only be used
when your Camel application is connecting from outside Kubernetes. If you run
your Camel application inside Kubernetes, then you can use local or client as
the URL to tell Camel to run in l [...]
+ }
+}
+
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/beans/ZooKeeperClusterService.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/beans/ZooKeeperClusterService.json
new file mode 100644
index 00000000000..89c427ae2d0
--- /dev/null
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/beans/ZooKeeperClusterService.json
@@ -0,0 +1,16 @@
+{
+ "bean": {
+ "kind": "bean",
+ "name": "ZooKeeperClusterService",
+ "javaType":
"org.apache.camel.component.zookeeper.cluster.ZooKeeperClusterService",
+ "interfaceType": "org.apache.camel.cluster.CamelClusterService",
+ "title": "Zoo Keeper Cluster Service",
+ "description": "ZooKeeper based cluster locking",
+ "deprecated": false,
+ "groupId": "org.apache.camel.springboot",
+ "artifactId": "camel-zookeeper-starter",
+ "version": "4.17.0-SNAPSHOT",
+ "properties": { "nodes": { "index": 0, "kind": "property", "displayName":
"Nodes", "required": true, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "description": "The
Zookeeper server hosts (multiple servers can be separated by comma)" },
"basePath": { "index": 1, "kind": "property", "displayName": "Base Path",
"required": true, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "sec [...]
+ }
+}
+
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 f823147ab42..69ec77075d8 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
@@ -24,14 +24,14 @@
"remote": true
},
"componentProperties": {
- "connectTimeout": { "index": 0, "kind": "property", "displayName":
"Connect Timeout", "group": "common", "label": "", "required": false, "type":
"duration", "javaType": "java.time.Duration", "deprecated": false, "autowired":
false, "secret": false, "configurationClass":
"org.apache.camel.component.consul.ConsulConfiguration", "configurationField":
"configuration", "description": "Connect timeout for OkHttpClient" },
+ "connectTimeout": { "index": 0, "kind": "property", "displayName":
"Connect Timeout", "group": "common", "label": "", "required": false, "type":
"duration", "javaType": "java.time.Duration", "deprecated": false, "autowired":
false, "secret": false, "configurationClass":
"org.apache.camel.component.consul.ConsulConfiguration", "configurationField":
"configuration", "description": "Connect timeout" },
"key": { "index": 1, "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": { "index": 2, "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": { "index": 3, "kind": "property", "displayName": "Read
Timeout", "group": "common", "label": "", "required": false, "type":
"duration", "javaType": "java.time.Duration", "deprecated": false, "autowired":
false, "secret": false, "configurationClass":
"org.apache.camel.component.consul.ConsulConfiguration", "configurationField":
"configuration", "description": "Read timeout for OkHttpClient" },
+ "readTimeout": { "index": 3, "kind": "property", "displayName": "Read
Timeout", "group": "common", "label": "", "required": false, "type":
"duration", "javaType": "java.time.Duration", "deprecated": false, "autowired":
false, "secret": false, "configurationClass":
"org.apache.camel.component.consul.ConsulConfiguration", "configurationField":
"configuration", "description": "Read timeout" },
"tags": { "index": 4, "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": { "index": 5, "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" },
"valueAsString": { "index": 6, "kind": "property", "displayName": "Value
As String", "group": "common", "label": "", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.consul.ConsulConfiguration", "configurationField":
"configuration", "description": "Default to transform values retrieved from
Consul i.e. on KV endpoint to string." },
- "writeTimeout": { "index": 7, "kind": "property", "displayName": "Write
Timeout", "group": "common", "label": "", "required": false, "type":
"duration", "javaType": "java.time.Duration", "deprecated": false, "autowired":
false, "secret": false, "configurationClass":
"org.apache.camel.component.consul.ConsulConfiguration", "configurationField":
"configuration", "description": "Write timeout for OkHttpClient" },
+ "writeTimeout": { "index": 7, "kind": "property", "displayName": "Write
Timeout", "group": "common", "label": "", "required": false, "type":
"duration", "javaType": "java.time.Duration", "deprecated": false, "autowired":
false, "secret": false, "configurationClass":
"org.apache.camel.component.consul.ConsulConfiguration", "configurationField":
"configuration", "description": "Write timeout" },
"bridgeErrorHandler": { "index": 8, "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 (if possible) occurred while the Camel consumer is trying
to pickup incoming messages, or the like [...]
"action": { "index": 9, "kind": "property", "displayName": "Action",
"group": "producer", "label": "producer", "required": false, "type": "enum",
"javaType": "java.lang.String", "enum": [ "CHECKS", "SERVICES", "AGENT",
"REGISTER", "DEREGISTER" ], "deprecated": false, "autowired": false, "secret":
false, "configurationClass":
"org.apache.camel.component.consul.ConsulConfiguration", "configurationField":
"configuration", "description": "The default action. Can be overridden by
CamelCon [...]
"lazyStartProducer": { "index": 10, "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 fai [...]
@@ -86,14 +86,14 @@
},
"properties": {
"apiEndpoint": { "index": 0, "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": { "index": 1, "kind": "parameter", "displayName":
"Connect Timeout", "group": "common", "label": "", "required": false, "type":
"duration", "javaType": "java.time.Duration", "deprecated": false, "autowired":
false, "secret": false, "configurationClass":
"org.apache.camel.component.consul.ConsulConfiguration", "configurationField":
"configuration", "description": "Connect timeout for OkHttpClient" },
+ "connectTimeout": { "index": 1, "kind": "parameter", "displayName":
"Connect Timeout", "group": "common", "label": "", "required": false, "type":
"duration", "javaType": "java.time.Duration", "deprecated": false, "autowired":
false, "secret": false, "configurationClass":
"org.apache.camel.component.consul.ConsulConfiguration", "configurationField":
"configuration", "description": "Connect timeout" },
"key": { "index": 2, "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": { "index": 3, "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": { "index": 4, "kind": "parameter", "displayName": "Read
Timeout", "group": "common", "label": "", "required": false, "type":
"duration", "javaType": "java.time.Duration", "deprecated": false, "autowired":
false, "secret": false, "configurationClass":
"org.apache.camel.component.consul.ConsulConfiguration", "configurationField":
"configuration", "description": "Read timeout for OkHttpClient" },
+ "readTimeout": { "index": 4, "kind": "parameter", "displayName": "Read
Timeout", "group": "common", "label": "", "required": false, "type":
"duration", "javaType": "java.time.Duration", "deprecated": false, "autowired":
false, "secret": false, "configurationClass":
"org.apache.camel.component.consul.ConsulConfiguration", "configurationField":
"configuration", "description": "Read timeout" },
"tags": { "index": 5, "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": { "index": 6, "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" },
"valueAsString": { "index": 7, "kind": "parameter", "displayName": "Value
As String", "group": "common", "label": "", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.consul.ConsulConfiguration", "configurationField":
"configuration", "description": "Default to transform values retrieved from
Consul i.e. on KV endpoint to string." },
- "writeTimeout": { "index": 8, "kind": "parameter", "displayName": "Write
Timeout", "group": "common", "label": "", "required": false, "type":
"duration", "javaType": "java.time.Duration", "deprecated": false, "autowired":
false, "secret": false, "configurationClass":
"org.apache.camel.component.consul.ConsulConfiguration", "configurationField":
"configuration", "description": "Write timeout for OkHttpClient" },
+ "writeTimeout": { "index": 8, "kind": "parameter", "displayName": "Write
Timeout", "group": "common", "label": "", "required": false, "type":
"duration", "javaType": "java.time.Duration", "deprecated": false, "autowired":
false, "secret": false, "configurationClass":
"org.apache.camel.component.consul.ConsulConfiguration", "configurationField":
"configuration", "description": "Write timeout" },
"bridgeErrorHandler": { "index": 9, "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 (if possible) occurred
while the Camel consumer is trying to pickup incoming [...]
"exceptionHandler": { "index": 10, "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 de [...]
"exchangePattern": { "index": 11, "kind": "parameter", "displayName":
"Exchange Pattern", "group": "consumer (advanced)", "label":
"consumer,advanced", "required": false, "type": "enum", "javaType":
"org.apache.camel.ExchangePattern", "enum": [ "InOnly", "InOut" ],
"deprecated": false, "autowired": false, "secret": false, "description": "Sets
the exchange pattern when the consumer creates an exchange." },
diff --git
a/components-starter/camel-consul-cluster-service-starter/src/main/docs/consul-cluster-service.json
b/components-starter/camel-consul-cluster-service-starter/src/main/docs/consul-cluster-service.json
index e9795d18888..c3c75268bbf 100644
---
a/components-starter/camel-consul-cluster-service-starter/src/main/docs/consul-cluster-service.json
+++
b/components-starter/camel-consul-cluster-service-starter/src/main/docs/consul-cluster-service.json
@@ -176,14 +176,6 @@
"type": "java.time.Duration",
"description": "Write timeout for OkHttpClient",
"sourceType":
"org.apache.camel.component.consul.springboot.cluster.ConsulClusterServiceConfiguration"
- },
- {
- "name": "camel.cluster.consul.dc",
- "type": "java.lang.String",
- "description": "Use datacenter instead",
- "sourceType":
"org.apache.camel.component.consul.springboot.cluster.ConsulClusterServiceConfiguration",
- "deprecated": true,
- "deprecation": {}
}
],
"hints": [],
diff --git
a/components-starter/camel-consul-cluster-service-starter/src/main/java/org/apache/camel/component/consul/springboot/cluster/ConsulClusterServiceAutoConfiguration.java
b/components-starter/camel-consul-cluster-service-starter/src/main/java/org/apache/camel/component/consul/springboot/cluster/ConsulClusterServiceAutoConfiguration.java
index 9125d8d6037..7e2d63d2569 100644
---
a/components-starter/camel-consul-cluster-service-starter/src/main/java/org/apache/camel/component/consul/springboot/cluster/ConsulClusterServiceAutoConfiguration.java
+++
b/components-starter/camel-consul-cluster-service-starter/src/main/java/org/apache/camel/component/consul/springboot/cluster/ConsulClusterServiceAutoConfiguration.java
@@ -51,16 +51,16 @@ public class ConsulClusterServiceAutoConfiguration {
Optional.ofNullable(configuration.getAclToken()).ifPresent(service::setAclToken);
Optional.ofNullable(configuration.getDatacenter()).ifPresent(service::setDatacenter);
Optional.ofNullable(configuration.getBlockSeconds()).ifPresent(service::setBlockSeconds);
-
Optional.ofNullable(configuration.getConnectTimeout()).ifPresent(service::setConnectTimeout);
+ Optional.ofNullable(configuration.getConnectTimeout()).ifPresent(d ->
service.setConnectTimeout((int) d.toMillis()));
Optional.ofNullable(configuration.getUrl()).ifPresent(service::setUrl);
-
Optional.ofNullable(configuration.getSessionLockDelay()).ifPresent(service::setLockDelay);
+
Optional.of(configuration.getSessionLockDelay()).ifPresent(service::setSessionLockDelay);
Optional.ofNullable(configuration.getPassword()).ifPresent(service::setPassword);
-
Optional.ofNullable(configuration.getReadTimeout()).ifPresent(service::setReadTimeout);
+ Optional.ofNullable(configuration.getReadTimeout()).ifPresent(d ->
service.setReadTimeout((int) d.toMillis()));
Optional.ofNullable(configuration.getRootPath()).ifPresent(service::setRootPath);
Optional.ofNullable(configuration.getSslContextParameters()).ifPresent(service::setSslContextParameters);
-
Optional.ofNullable(configuration.getSessionTtl()).ifPresent(service::setTtl);
+
Optional.of(configuration.getSessionTtl()).ifPresent(service::setSessionTtl);
Optional.ofNullable(configuration.getUserName()).ifPresent(service::setUserName);
-
Optional.ofNullable(configuration.getWriteTimeout()).ifPresent(service::setWriteTimeout);
+ Optional.ofNullable(configuration.getWriteTimeout()).ifPresent(d ->
service.setWriteTimeout((int) d.toMillis()));
service.setConfiguration(configuration);
return service;
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 6a0e0b3c6a1..1fb3978fd57 100644
--- a/components-starter/camel-consul-starter/src/main/docs/consul.json
+++ b/components-starter/camel-consul-starter/src/main/docs/consul.json
@@ -202,7 +202,7 @@
{
"name": "camel.component.consul.connect-timeout",
"type": "java.time.Duration",
- "description": "Connect timeout for OkHttpClient",
+ "description": "Connect timeout",
"sourceType":
"org.apache.camel.component.consul.springboot.ConsulComponentConfiguration"
},
{
@@ -282,7 +282,7 @@
{
"name": "camel.component.consul.read-timeout",
"type": "java.time.Duration",
- "description": "Read timeout for OkHttpClient",
+ "description": "Read timeout",
"sourceType":
"org.apache.camel.component.consul.springboot.ConsulComponentConfiguration"
},
{
@@ -333,7 +333,7 @@
{
"name": "camel.component.consul.write-timeout",
"type": "java.time.Duration",
- "description": "Write timeout for OkHttpClient",
+ "description": "Write timeout",
"sourceType":
"org.apache.camel.component.consul.springboot.ConsulComponentConfiguration"
},
{
@@ -354,14 +354,6 @@
"deprecated": true,
"deprecation": {}
},
- {
- "name": "camel.cloud.consul.dc",
- "type": "java.lang.String",
- "description": "Use datacenter instead",
- "sourceType":
"org.apache.camel.component.consul.springboot.cloud.ConsulServiceRegistryConfiguration",
- "deprecated": true,
- "deprecation": {}
- },
{
"name": "camel.cloud.consul.deregister-after",
"type": "java.lang.Integer",
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 def11eb784f..8e61e05b3cf 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
@@ -42,7 +42,7 @@ public class ConsulComponentConfiguration
*/
private Boolean enabled;
/**
- * Connect timeout for OkHttpClient
+ * Connect timeout
*/
private Duration connectTimeout;
/**
@@ -55,7 +55,7 @@ public class ConsulComponentConfiguration
*/
private Boolean pingInstance = true;
/**
- * Read timeout for OkHttpClient
+ * Read timeout
*/
private Duration readTimeout;
/**
@@ -72,7 +72,7 @@ public class ConsulComponentConfiguration
*/
private Boolean valueAsString = false;
/**
- * Write timeout for OkHttpClient
+ * Write timeout
*/
private Duration writeTimeout;
/**
diff --git
a/components-starter/camel-infinispan-cluster-service-starter/src/main/docs/infinispan-cluster-service.json
b/components-starter/camel-infinispan-cluster-service-starter/src/main/docs/infinispan-cluster-service.json
index dd26356ad10..272ab62655c 100644
---
a/components-starter/camel-infinispan-cluster-service-starter/src/main/docs/infinispan-cluster-service.json
+++
b/components-starter/camel-infinispan-cluster-service-starter/src/main/docs/infinispan-cluster-service.json
@@ -28,6 +28,11 @@
"type": "java.util.Map<java.lang.String,java.lang.String>",
"sourceType":
"org.apache.camel.component.infinispan.remote.springboot.cluster.InfinispanRemoteClusterServiceConfiguration"
},
+ {
+ "name": "camel.cluster.infinispan.remote.configuration-uri",
+ "type": "java.lang.String",
+ "sourceType":
"org.apache.camel.component.infinispan.remote.springboot.cluster.InfinispanRemoteClusterServiceConfiguration"
+ },
{
"name": "camel.cluster.infinispan.remote.enabled",
"type": "java.lang.Boolean",
diff --git
a/components-starter/camel-kubernetes-cluster-service-starter/src/main/java/org/apache/camel/component/kubernetes/springboot/cluster/KubernetesClusterServiceAutoConfiguration.java
b/components-starter/camel-kubernetes-cluster-service-starter/src/main/java/org/apache/camel/component/kubernetes/springboot/cluster/KubernetesClusterServiceAutoConfiguration.java
index 4ad468d2dd8..131b58120fb 100644
---
a/components-starter/camel-kubernetes-cluster-service-starter/src/main/java/org/apache/camel/component/kubernetes/springboot/cluster/KubernetesClusterServiceAutoConfiguration.java
+++
b/components-starter/camel-kubernetes-cluster-service-starter/src/main/java/org/apache/camel/component/kubernetes/springboot/cluster/KubernetesClusterServiceAutoConfiguration.java
@@ -50,9 +50,9 @@ public class KubernetesClusterServiceAutoConfiguration {
Optional.ofNullable(configuration.getOrder()).ifPresent(service::setOrder);
Optional.ofNullable(configuration.getAttributes()).ifPresent(service::setAttributes);
Optional.ofNullable(configuration.getClusterLabels()).ifPresent(service::setClusterLabels);
-
Optional.ofNullable(configuration.getKubernetesNamespace()).ifPresent(service::setKubernetesNamespace);
+
Optional.ofNullable(configuration.getKubernetesNamespace()).ifPresent(service::setNamespace);
Optional.ofNullable(configuration.getConfigMapName()).ifPresent(service::setKubernetesResourceName);
-
Optional.ofNullable(configuration.getConnectionTimeoutMillis()).ifPresent(service::setConnectionTimeoutMillis);
+
Optional.ofNullable(configuration.getConnectionTimeoutMillis()).ifPresent(service::setConnectionTimeout);
Optional.ofNullable(configuration.getJitterFactor()).ifPresent(service::setJitterFactor);
Optional.ofNullable(configuration.getLeaseDurationMillis()).ifPresent(service::setLeaseDurationMillis);
Optional.ofNullable(configuration.getMasterUrl()).ifPresent(service::setMasterUrl);
diff --git
a/components-starter/camel-kubernetes-cluster-service-starter/src/test/java/org/apache/camel/component/kubernetes/springboot/test/cluster/KubernetesClusterServiceAutoConfigurationTest.java
b/components-starter/camel-kubernetes-cluster-service-starter/src/test/java/org/apache/camel/component/kubernetes/springboot/test/cluster/KubernetesClusterServiceAutoConfigurationTest.java
index 3b30d32ade1..6d5c4d2d4b0 100644
---
a/components-starter/camel-kubernetes-cluster-service-starter/src/test/java/org/apache/camel/component/kubernetes/springboot/test/cluster/KubernetesClusterServiceAutoConfigurationTest.java
+++
b/components-starter/camel-kubernetes-cluster-service-starter/src/test/java/org/apache/camel/component/kubernetes/springboot/test/cluster/KubernetesClusterServiceAutoConfigurationTest.java
@@ -71,8 +71,8 @@ public class KubernetesClusterServiceAutoConfigurationTest {
assertEquals("myid1", clusterService.getId());
assertEquals("http://myurl:9000";,
clusterService.getMasterUrl());
- assertEquals(Integer.valueOf(1234),
clusterService.getConnectionTimeoutMillis());
- assertEquals("ns1",
clusterService.getKubernetesNamespace());
+ assertEquals(Integer.valueOf(1234),
clusterService.getConnectionTimeout());
+ assertEquals("ns1", clusterService.getNamespace());
assertEquals("cm",
clusterService.getKubernetesResourceName());
assertEquals("mypod1", clusterService.getPodName());
diff --git
a/components-starter/camel-zookeeper-cluster-service-starter/src/main/docs/zookeeper-cluster-service.json
b/components-starter/camel-zookeeper-cluster-service-starter/src/main/docs/zookeeper-cluster-service.json
index e468ff03928..63b8b0484d9 100644
---
a/components-starter/camel-zookeeper-cluster-service-starter/src/main/docs/zookeeper-cluster-service.json
+++
b/components-starter/camel-zookeeper-cluster-service-starter/src/main/docs/zookeeper-cluster-service.json
@@ -16,7 +16,6 @@
{
"name": "camel.cluster.zookeeper.auth-info-list",
"type": "java.util.List<org.apache.curator.framework.AuthInfo>",
- "description": "List of AuthInfo objects with scheme and auth.",
"sourceType":
"org.apache.camel.component.zookeeper.springboot.cluster.ZooKeeperClusterServiceConfiguration"
},
{
@@ -35,9 +34,7 @@
{
"name": "camel.cluster.zookeeper.connection-timeout-unit",
"type": "java.util.concurrent.TimeUnit",
- "description": "Connection timeout TimeUnit. Default is
TimeUnit.MILLISECONDS.",
- "sourceType":
"org.apache.camel.component.zookeeper.springboot.cluster.ZooKeeperClusterServiceConfiguration",
- "defaultValue": "milliseconds"
+ "sourceType":
"org.apache.camel.component.zookeeper.springboot.cluster.ZooKeeperClusterServiceConfiguration"
},
{
"name": "camel.cluster.zookeeper.curator-framework",
@@ -68,9 +65,7 @@
{
"name": "camel.cluster.zookeeper.max-close-wait-unit",
"type": "java.util.concurrent.TimeUnit",
- "description": "MaxCloseWait TimeUnit. Default is
TimeUnit.MILLISECONDS.",
- "sourceType":
"org.apache.camel.component.zookeeper.springboot.cluster.ZooKeeperClusterServiceConfiguration",
- "defaultValue": "milliseconds"
+ "sourceType":
"org.apache.camel.component.zookeeper.springboot.cluster.ZooKeeperClusterServiceConfiguration"
},
{
"name": "camel.cluster.zookeeper.namespace",
@@ -100,9 +95,7 @@
{
"name": "camel.cluster.zookeeper.reconnect-base-sleep-time-unit",
"type": "java.util.concurrent.TimeUnit",
- "description": "ReconnectBaseSleepTime TimeUnit. Default is
TimeUnit.MILLISECONDS.",
- "sourceType":
"org.apache.camel.component.zookeeper.springboot.cluster.ZooKeeperClusterServiceConfiguration",
- "defaultValue": "milliseconds"
+ "sourceType":
"org.apache.camel.component.zookeeper.springboot.cluster.ZooKeeperClusterServiceConfiguration"
},
{
"name": "camel.cluster.zookeeper.reconnect-max-retries",
@@ -120,9 +113,7 @@
{
"name": "camel.cluster.zookeeper.reconnect-max-sleep-time-unit",
"type": "java.util.concurrent.TimeUnit",
- "description": "ReconnectMaxSleepTimeUnit TimeUnit. Default is
TimeUnit.MILLISECONDS.",
- "sourceType":
"org.apache.camel.component.zookeeper.springboot.cluster.ZooKeeperClusterServiceConfiguration",
- "defaultValue": "milliseconds"
+ "sourceType":
"org.apache.camel.component.zookeeper.springboot.cluster.ZooKeeperClusterServiceConfiguration"
},
{
"name": "camel.cluster.zookeeper.retry-policy",
@@ -140,9 +131,7 @@
{
"name": "camel.cluster.zookeeper.session-timeout-unit",
"type": "java.util.concurrent.TimeUnit",
- "description": "Session timeout TimeUnit. Default is
TimeUnit.MILLISECONDS.",
- "sourceType":
"org.apache.camel.component.zookeeper.springboot.cluster.ZooKeeperClusterServiceConfiguration",
- "defaultValue": "milliseconds"
+ "sourceType":
"org.apache.camel.component.zookeeper.springboot.cluster.ZooKeeperClusterServiceConfiguration"
}
],
"hints": [],
diff --git
a/components-starter/camel-zookeeper-cluster-service-starter/src/main/java/org/apache/camel/component/zookeeper/springboot/cluster/ZooKeeperClusterServiceAutoConfiguration.java
b/components-starter/camel-zookeeper-cluster-service-starter/src/main/java/org/apache/camel/component/zookeeper/springboot/cluster/ZooKeeperClusterServiceAutoConfiguration.java
index 0cebc9f1d09..97e93b82996 100644
---
a/components-starter/camel-zookeeper-cluster-service-starter/src/main/java/org/apache/camel/component/zookeeper/springboot/cluster/ZooKeeperClusterServiceAutoConfiguration.java
+++
b/components-starter/camel-zookeeper-cluster-service-starter/src/main/java/org/apache/camel/component/zookeeper/springboot/cluster/ZooKeeperClusterServiceAutoConfiguration.java
@@ -50,20 +50,14 @@ public class ZooKeeperClusterServiceAutoConfiguration {
Optional.ofNullable(configuration.getAttributes()).ifPresent(service::setAttributes);
Optional.ofNullable(configuration.getBasePath()).ifPresent(service::setBasePath);
Optional.ofNullable(configuration.getNamespace()).ifPresent(service::setNamespace);
-
Optional.ofNullable(configuration.getAuthInfoList()).ifPresent(service::setAuthInfoList);
-
Optional.of(configuration.getConnectionTimeout()).ifPresent(service::setConnectionTimeout);
-
Optional.ofNullable(configuration.getConnectionTimeoutUnit()).ifPresent(service::setConnectionTimeoutUnit);
+
Optional.of(configuration.getConnectionTimeout()).ifPresent(service::setConnectTimeout);
Optional.ofNullable(configuration.getCuratorFramework()).ifPresent(service::setCuratorFramework);
Optional.of(configuration.getMaxCloseWait()).ifPresent(service::setMaxCloseWait);
-
Optional.ofNullable(configuration.getMaxCloseWaitUnit()).ifPresent(service::setMaxCloseWaitUnit);
-
Optional.ofNullable(configuration.getNodes()).ifPresent(service::setNodes);
+ Optional.ofNullable(configuration.getNodes()).ifPresent(n ->
service.setNodes(String.join(",", n)));
Optional.of(configuration.getReconnectBaseSleepTime()).ifPresent(service::setReconnectBaseSleepTime);
- Optional.ofNullable(configuration.getReconnectBaseSleepTimeUnit())
- .ifPresent(service::setReconnectBaseSleepTimeUnit);
Optional.of(configuration.getReconnectMaxRetries()).ifPresent(service::setReconnectMaxRetries);
Optional.ofNullable(configuration.getRetryPolicy()).ifPresent(service::setRetryPolicy);
Optional.of(configuration.getSessionTimeout()).ifPresent(service::setSessionTimeout);
-
Optional.ofNullable(configuration.getSessionTimeoutUnit()).ifPresent(service::setSessionTimeoutUnit);
service.setConfiguration(configuration);
return service;
diff --git
a/components-starter/camel-zookeeper-cluster-service-starter/src/main/java/org/apache/camel/component/zookeeper/springboot/cluster/ZooKeeperClusterServiceConfiguration.java
b/components-starter/camel-zookeeper-cluster-service-starter/src/main/java/org/apache/camel/component/zookeeper/springboot/cluster/ZooKeeperClusterServiceConfiguration.java
index 9c8651a17eb..fa1659d537c 100644
---
a/components-starter/camel-zookeeper-cluster-service-starter/src/main/java/org/apache/camel/component/zookeeper/springboot/cluster/ZooKeeperClusterServiceConfiguration.java
+++
b/components-starter/camel-zookeeper-cluster-service-starter/src/main/java/org/apache/camel/component/zookeeper/springboot/cluster/ZooKeeperClusterServiceConfiguration.java
@@ -83,13 +83,13 @@ public class ZooKeeperClusterServiceConfiguration extends
ZooKeeperCuratorConfig
//
// Fields copied from ZooKeeperCuratorConfiguration to add
// javadoc which is used by spring-boot-configuration-processor
- // to generate descritpions for inherited properties
+ // to generate descriptions for inherited properties
// ------------------------------------------
/**
* The Zookeeper server hosts (multiple servers can be separated by comma).
*/
- private List<String> nodes;
+ private String nodes;
/**
* The base path to store in ZooKeeper.
@@ -106,11 +106,6 @@ public class ZooKeeperClusterServiceConfiguration extends
ZooKeeperCuratorConfig
*/
private long reconnectBaseSleepTime;
- /**
- * ReconnectBaseSleepTime TimeUnit. Default is TimeUnit.MILLISECONDS.
- */
- private TimeUnit reconnectBaseSleepTimeUnit = TimeUnit.MILLISECONDS;
-
/**
* Max number of times to retry.
*/
@@ -121,51 +116,26 @@ public class ZooKeeperClusterServiceConfiguration extends
ZooKeeperCuratorConfig
*/
private long reconnectMaxSleepTime = Integer.MAX_VALUE;
- /**
- * ReconnectMaxSleepTimeUnit TimeUnit. Default is TimeUnit.MILLISECONDS.
- */
- private TimeUnit reconnectMaxSleepTimeUnit = TimeUnit.MILLISECONDS;
-
/**
* Session timeout.
*/
private long sessionTimeout = 60000;
- /**
- * Session timeout TimeUnit. Default is TimeUnit.MILLISECONDS.
- */
- private TimeUnit sessionTimeoutUnit = TimeUnit.MILLISECONDS;
-
/**
* Connection timeout.
*/
private long connectionTimeout = 15000;
- /**
- * Connection timeout TimeUnit. Default is TimeUnit.MILLISECONDS.
- */
- private TimeUnit connectionTimeoutUnit = TimeUnit.MILLISECONDS;
-
/**
* Time to wait during close to join background threads.
*/
private long maxCloseWait = 1000;
- /**
- * MaxCloseWait TimeUnit. Default is TimeUnit.MILLISECONDS.
- */
- private TimeUnit maxCloseWaitUnit = TimeUnit.MILLISECONDS;
-
/**
* Zookeeper CuratorFramework-style client.
*/
private CuratorFramework curatorFramework;
- /**
- * List of AuthInfo objects with scheme and auth.
- */
- private List<AuthInfo> authInfoList;
-
/**
* Retry policy to use.
*/
