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 61bee1f828e Upgrade jgroups and jgrups-raft
61bee1f828e is described below
commit 61bee1f828e1adc88f416399fb3c645f2eddca2d
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Thu Jul 13 07:55:25 2023 +0200
Upgrade jgroups and jgrups-raft
---
.../camel/springboot/catalog/components/jgroups-raft.json | 15 +++++++--------
.../src/main/docs/jgroups-raft.json | 4 ++--
.../springboot/JGroupsRaftComponentConfiguration.java | 5 ++---
.../raft/springboot/JGroupsRaftComponentConverter.java | 4 ++--
4 files changed, 13 insertions(+), 15 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/jgroups-raft.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/jgroups-raft.json
index be9739a9bd6..037bdc6649c 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/jgroups-raft.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/jgroups-raft.json
@@ -25,7 +25,7 @@
"channelProperties": { "index": 0, "kind": "property", "displayName":
"Channel Properties", "group": "common", "label": "", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": "raft.xml", "description":
"Specifies configuration properties of the RaftHandle JChannel used by the
endpoint (ignored if raftHandle ref is provided)." },
"raftHandle": { "index": 1, "kind": "property", "displayName": "Raft
Handle", "group": "common", "label": "", "required": false, "type": "object",
"javaType": "org.jgroups.raft.RaftHandle", "deprecated": false, "autowired":
false, "secret": false, "description": "RaftHandle to use." },
"raftId": { "index": 2, "kind": "property", "displayName": "Raft Id",
"group": "common", "label": "", "required": true, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "Unique raftId to use." },
- "stateMachine": { "index": 3, "kind": "property", "displayName": "State
Machine", "group": "common", "label": "", "required": false, "type": "object",
"javaType": "org.jgroups.protocols.raft.StateMachine", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": "NopStateMachine",
"description": "StateMachine to use." },
+ "stateMachine": { "index": 3, "kind": "property", "displayName": "State
Machine", "group": "common", "label": "", "required": false, "type": "object",
"javaType": "org.jgroups.raft.StateMachine", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": "NopStateMachine", "description":
"StateMachine to use." },
"bridgeErrorHandler": { "index": 4, "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 proce [...]
"lazyStartProducer": { "index": 5, "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 [...]
"autowiredEnabled": { "index": 6, "kind": "property", "displayName":
"Autowired Enabled", "group": "advanced", "label": "advanced", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": true, "description":
"Whether autowiring is enabled. This is used for automatic autowiring options
(the option must be marked as autowired) by looking up in the registry to find
if there is a single instance of matching t [...]
@@ -37,13 +37,12 @@
"JGROUPSRAFT_IS_LEADER": { "index": 3, "kind": "header", "displayName":
"", "group": "consumer", "label": "consumer", "required": false, "javaType":
"boolean", "deprecated": false, "deprecationNote": "", "autowired": false,
"secret": false, "description": "Whether the node is the Raft Leader or not.",
"constantName":
"org.apache.camel.component.jgroups.raft.JGroupsRaftConstants#HEADER_JGROUPSRAFT_IS_LEADER"
},
"JGROUPSRAFT_LAST_APPLIED": { "index": 4, "kind": "header", "displayName":
"", "group": "consumer", "label": "consumer", "required": false, "javaType":
"int", "deprecated": false, "deprecationNote": "", "autowired": false,
"secret": false, "description": "The index of the last log entry that was
appended to the log.", "constantName":
"org.apache.camel.component.jgroups.raft.JGroupsRaftConstants#HEADER_JGROUPSRAFT_LAST_APPLIED"
},
"JGROUPSRAFT_LEADER_ADDRESS": { "index": 5, "kind": "header",
"displayName": "", "group": "consumer", "label": "consumer", "required": false,
"javaType": "org.jgroups.Address", "deprecated": false, "deprecationNote": "",
"autowired": false, "secret": false, "description": "The Address ot Raft Leader
or not.", "constantName":
"org.apache.camel.component.jgroups.raft.JGroupsRaftConstants#HEADER_JGROUPSRAFT_LEADER_ADDRESS"
},
- "JGROUPSRAFT_LOG_SIZE_BYTE": { "index": 6, "kind": "header",
"displayName": "", "group": "consumer", "label": "consumer", "required": false,
"javaType": "int", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "description": "The Raft log size in bytes.",
"constantName":
"org.apache.camel.component.jgroups.raft.JGroupsRaftConstants#HEADER_JGROUPSRAFT_LOG_SIZE_BYTE"
},
- "JGROUPSRAFT_RAFT_ID": { "index": 7, "kind": "header", "displayName": "",
"group": "consumer", "label": "consumer", "required": false, "javaType":
"String", "deprecated": false, "deprecationNote": "", "autowired": false,
"secret": false, "description": "The Raft id of the node.", "constantName":
"org.apache.camel.component.jgroups.raft.JGroupsRaftConstants#HEADER_JGROUPSRAFT_RAFT_ID"
},
- "JGROUPSRAFT_EVENT_TYPE": { "index": 8, "kind": "header", "displayName":
"", "group": "consumer", "label": "consumer", "required": false, "javaType":
"org.apache.camel.component.jgroups.raft.JGroupsRaftEventType", "enum": [
"LEADER", "FOLLOWER", "CANDIDATE", "APPLY", "READ_CONTENT_FROM",
"WRITE_CONTENT_TO" ], "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "description": "The event type", "constantName":
"org.apache.camel.component.jgroups.raft.JGroup [...]
- "JGROUPSRAFT_SET_OFFSET": { "index": 9, "kind": "header", "displayName":
"", "group": "producer", "label": "producer", "required": false, "javaType":
"Integer", "deprecated": false, "deprecationNote": "", "autowired": false,
"secret": false, "description": "Offset to use in the byte buffer to be
set().", "constantName":
"org.apache.camel.component.jgroups.raft.JGroupsRaftConstants#HEADER_JGROUPSRAFT_SET_OFFSET"
},
- "JGROUPSRAFT_SET_LENGTH": { "index": 10, "kind": "header", "displayName":
"", "group": "producer", "label": "producer", "required": false, "javaType":
"Integer", "deprecated": false, "deprecationNote": "", "autowired": false,
"secret": false, "description": "Length to use in the byte buffer to be
set().", "constantName":
"org.apache.camel.component.jgroups.raft.JGroupsRaftConstants#HEADER_JGROUPSRAFT_SET_LENGTH"
},
- "JGROUPSRAFT_SET_TIMEOUT": { "index": 11, "kind": "header", "displayName":
"", "group": "producer", "label": "producer", "required": false, "javaType":
"Long", "deprecated": false, "deprecationNote": "", "autowired": false,
"secret": false, "description": "Timeout to be used in set() operation.",
"constantName":
"org.apache.camel.component.jgroups.raft.JGroupsRaftConstants#HEADER_JGROUPSRAFT_SET_TIMEOUT"
},
- "JGROUPSRAFT_SET_TIMEUNIT": { "index": 12, "kind": "header",
"displayName": "", "group": "producer", "label": "producer", "required": false,
"javaType": "java.util.concurrent.TimeUnit", "enum": [ "NANOSECONDS",
"MICROSECONDS", "MILLISECONDS", "SECONDS", "MINUTES", "HOURS", "DAYS" ],
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "description": "Timeunit to be used in set() operation.",
"constantName": "org.apache.camel.component.jgroups.raft.JGroupsR [...]
+ "JGROUPSRAFT_RAFT_ID": { "index": 6, "kind": "header", "displayName": "",
"group": "consumer", "label": "consumer", "required": false, "javaType":
"String", "deprecated": false, "deprecationNote": "", "autowired": false,
"secret": false, "description": "The Raft id of the node.", "constantName":
"org.apache.camel.component.jgroups.raft.JGroupsRaftConstants#HEADER_JGROUPSRAFT_RAFT_ID"
},
+ "JGROUPSRAFT_EVENT_TYPE": { "index": 7, "kind": "header", "displayName":
"", "group": "consumer", "label": "consumer", "required": false, "javaType":
"org.apache.camel.component.jgroups.raft.JGroupsRaftEventType", "enum": [
"LEADER", "FOLLOWER", "APPLY", "READ_CONTENT_FROM", "WRITE_CONTENT_TO" ],
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "description": "The event type", "constantName":
"org.apache.camel.component.jgroups.raft.JGroupsRaftConstant [...]
+ "JGROUPSRAFT_SET_OFFSET": { "index": 8, "kind": "header", "displayName":
"", "group": "producer", "label": "producer", "required": false, "javaType":
"Integer", "deprecated": false, "deprecationNote": "", "autowired": false,
"secret": false, "description": "Offset to use in the byte buffer to be
set().", "constantName":
"org.apache.camel.component.jgroups.raft.JGroupsRaftConstants#HEADER_JGROUPSRAFT_SET_OFFSET"
},
+ "JGROUPSRAFT_SET_LENGTH": { "index": 9, "kind": "header", "displayName":
"", "group": "producer", "label": "producer", "required": false, "javaType":
"Integer", "deprecated": false, "deprecationNote": "", "autowired": false,
"secret": false, "description": "Length to use in the byte buffer to be
set().", "constantName":
"org.apache.camel.component.jgroups.raft.JGroupsRaftConstants#HEADER_JGROUPSRAFT_SET_LENGTH"
},
+ "JGROUPSRAFT_SET_TIMEOUT": { "index": 10, "kind": "header", "displayName":
"", "group": "producer", "label": "producer", "required": false, "javaType":
"Long", "deprecated": false, "deprecationNote": "", "autowired": false,
"secret": false, "description": "Timeout to be used in set() operation.",
"constantName":
"org.apache.camel.component.jgroups.raft.JGroupsRaftConstants#HEADER_JGROUPSRAFT_SET_TIMEOUT"
},
+ "JGROUPSRAFT_SET_TIMEUNIT": { "index": 11, "kind": "header",
"displayName": "", "group": "producer", "label": "producer", "required": false,
"javaType": "java.util.concurrent.TimeUnit", "enum": [ "NANOSECONDS",
"MICROSECONDS", "MILLISECONDS", "SECONDS", "MINUTES", "HOURS", "DAYS" ],
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "description": "Timeunit to be used in set() operation.",
"constantName": "org.apache.camel.component.jgroups.raft.JGroupsR [...]
},
"properties": {
"clusterName": { "index": 0, "kind": "path", "displayName": "Cluster
Name", "group": "common", "label": "", "required": true, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "deprecationNote": "",
"autowired": false, "secret": false, "description": "The name of the
JGroupsraft cluster the component should connect to." },
diff --git
a/components-starter/camel-jgroups-raft-starter/src/main/docs/jgroups-raft.json
b/components-starter/camel-jgroups-raft-starter/src/main/docs/jgroups-raft.json
index 9f77ef6d4b5..08642ede83e 100644
---
a/components-starter/camel-jgroups-raft-starter/src/main/docs/jgroups-raft.json
+++
b/components-starter/camel-jgroups-raft-starter/src/main/docs/jgroups-raft.json
@@ -102,8 +102,8 @@
},
{
"name": "camel.component.jgroups-raft.state-machine",
- "type": "org.jgroups.protocols.raft.StateMachine",
- "description": "StateMachine to use. The option is a
org.jgroups.protocols.raft.StateMachine type.",
+ "type": "org.jgroups.raft.StateMachine",
+ "description": "StateMachine to use. The option is a
org.jgroups.raft.StateMachine type.",
"sourceType":
"org.apache.camel.component.jgroups.raft.springboot.JGroupsRaftComponentConfiguration"
}
],
diff --git
a/components-starter/camel-jgroups-raft-starter/src/main/java/org/apache/camel/component/jgroups/raft/springboot/JGroupsRaftComponentConfiguration.java
b/components-starter/camel-jgroups-raft-starter/src/main/java/org/apache/camel/component/jgroups/raft/springboot/JGroupsRaftComponentConfiguration.java
index 0cc23f8eb7d..a1822110723 100644
---
a/components-starter/camel-jgroups-raft-starter/src/main/java/org/apache/camel/component/jgroups/raft/springboot/JGroupsRaftComponentConfiguration.java
+++
b/components-starter/camel-jgroups-raft-starter/src/main/java/org/apache/camel/component/jgroups/raft/springboot/JGroupsRaftComponentConfiguration.java
@@ -17,8 +17,8 @@
package org.apache.camel.component.jgroups.raft.springboot;
import org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon;
-import org.jgroups.protocols.raft.StateMachine;
import org.jgroups.raft.RaftHandle;
+import org.jgroups.raft.StateMachine;
import org.springframework.boot.context.properties.ConfigurationProperties;
/**
@@ -50,8 +50,7 @@ public class JGroupsRaftComponentConfiguration
*/
private String raftId;
/**
- * StateMachine to use. The option is a
- * org.jgroups.protocols.raft.StateMachine type.
+ * StateMachine to use. The option is a org.jgroups.raft.StateMachine type.
*/
private StateMachine stateMachine;
/**
diff --git
a/components-starter/camel-jgroups-raft-starter/src/main/java/org/apache/camel/component/jgroups/raft/springboot/JGroupsRaftComponentConverter.java
b/components-starter/camel-jgroups-raft-starter/src/main/java/org/apache/camel/component/jgroups/raft/springboot/JGroupsRaftComponentConverter.java
index 9f203065656..a7b2bd84148 100644
---
a/components-starter/camel-jgroups-raft-starter/src/main/java/org/apache/camel/component/jgroups/raft/springboot/JGroupsRaftComponentConverter.java
+++
b/components-starter/camel-jgroups-raft-starter/src/main/java/org/apache/camel/component/jgroups/raft/springboot/JGroupsRaftComponentConverter.java
@@ -40,7 +40,7 @@ public class JGroupsRaftComponentConverter implements
GenericConverter {
public Set<ConvertiblePair> getConvertibleTypes() {
Set<ConvertiblePair> answer = new LinkedHashSet<>();
answer.add(new ConvertiblePair(String.class,
org.jgroups.raft.RaftHandle.class));
- answer.add(new ConvertiblePair(String.class,
org.jgroups.protocols.raft.StateMachine.class));
+ answer.add(new ConvertiblePair(String.class,
org.jgroups.raft.StateMachine.class));
return answer;
}
@@ -58,7 +58,7 @@ public class JGroupsRaftComponentConverter implements
GenericConverter {
ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
switch (targetType.getName()) {
case "org.jgroups.raft.RaftHandle": return
applicationContext.getBean(ref, org.jgroups.raft.RaftHandle.class);
- case "org.jgroups.protocols.raft.StateMachine": return
applicationContext.getBean(ref, org.jgroups.protocols.raft.StateMachine.class);
+ case "org.jgroups.raft.StateMachine": return
applicationContext.getBean(ref, org.jgroups.raft.StateMachine.class);
}
return null;
}
