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 2024/05/09 13:34:18 UTC
(camel) branch main updated: load balancer (#14091)
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.git
The following commit(s) were added to refs/heads/main by this push:
new 5a0136e8300 load balancer (#14091)
5a0136e8300 is described below
commit 5a0136e83005c891347cd06d53e41f77333f7c57
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu May 9 15:34:11 2024 +0200
load balancer (#14091)
CAMEL-20743: Load Balancer EIPs to be named with LoadBalancer to be consistent in naming style
---
.../org/apache/camel/catalog/models.properties | 12 ++--
.../{failover.json => failoverLoadBalancer.json} | 4 +-
.../apache/camel/catalog/models/loadBalance.json | 2 +-
.../camel/catalog/models/randomLoadBalancer.json | 4 +-
...roundRobin.json => roundRobinLoadBalancer.json} | 4 +-
.../{sticky.json => stickyLoadBalancer.json} | 4 +-
.../camel/catalog/models/topicLoadBalancer.json | 4 +-
.../camel/catalog/models/weightedLoadBalancer.json | 4 +-
.../apache/camel/catalog/schemas/camel-spring.xsd | 24 ++++----
.../jetty/JettySpringFailoverRoundRobinTest.xml | 2 +-
.../spring/JmsSpringLoadBalanceFailOverIT.xml | 2 +-
.../DoubleLoadBalancerMisconfigurationTest.xml | 4 +-
.../FailOverLoadBalanceAutoStartupFalseTest.xml | 2 +-
.../FailoverMaximumFailoverAttemptsTest.xml | 2 +-
.../processor/FailoverRoundRobinStickyTest.xml | 2 +-
.../spring/processor/FailoverRoundRobinTest.xml | 2 +-
.../camel/spring/processor/failOverLoadBalance.xml | 6 +-
.../OnExceptionLoadBalancerDoubleIssueTest.xml | 2 +-
.../camel/spring/processor/randomLoadBalance.xml | 2 +-
.../spring/processor/roundRobinLoadBalance.xml | 2 +-
.../camel/spring/processor/stickyLoadBalance.xml | 4 +-
.../camel/spring/processor/topicLoadBalance.xml | 2 +-
.../spring/processor/weightedRandomLoadBalance.xml | 2 +-
.../processor/weightedRoundRobinLoadBalance.xml | 2 +-
.../docs/modules/eips/examples/json/failover.json | 1 -
.../eips/examples/json/failoverLoadBalancer.json | 1 +
.../docs/modules/eips/examples/json/random.json | 1 -
.../eips/examples/json/randomLoadBalancer.json | 1 +
.../modules/eips/examples/json/roundRobin.json | 1 -
.../eips/examples/json/roundRobinLoadBalancer.json | 1 +
.../docs/modules/eips/examples/json/sticky.json | 1 -
.../eips/examples/json/stickyLoadBalancer.json | 1 +
.../docs/modules/eips/examples/json/topic.json | 1 -
.../eips/examples/json/topicLoadBalancer.json | 1 +
.../docs/modules/eips/examples/json/weighted.json | 1 -
.../eips/examples/json/weightedLoadBalancer.json | 1 +
.../src/main/docs/modules/eips/nav.adoc | 12 ++--
...over-eip.adoc => failoverLoadBalancer-eip.adoc} | 16 +++---
.../docs/modules/eips/pages/loadBalance-eip.adoc | 12 ++--
...random-eip.adoc => randomLoadBalancer-eip.adoc} | 8 +--
...in-eip.adoc => roundRobinLoadBalancer-eip.adoc} | 8 +--
...sticky-eip.adoc => stickyLoadBalancer-eip.adoc} | 10 ++--
.../{topic-eip.adoc => topicLoadBalancer-eip.adoc} | 10 ++--
...hted-eip.adoc => weightedLoadBalancer-eip.adoc} | 10 ++--
.../org/apache/camel/model/loadBalance.json | 2 +-
.../{failover.json => failoverLoadBalancer.json} | 4 +-
.../model/loadbalancer/randomLoadBalancer.json | 4 +-
...roundRobin.json => roundRobinLoadBalancer.json} | 4 +-
.../{sticky.json => stickyLoadBalancer.json} | 4 +-
.../model/loadbalancer/topicLoadBalancer.json | 4 +-
.../model/loadbalancer/weightedLoadBalancer.json | 4 +-
.../services/org/apache/camel/model.properties | 12 ++--
.../apache/camel/model/LoadBalanceDefinition.java | 12 ++--
.../FailoverLoadBalancerDefinition.java | 2 +-
.../loadbalancer/RandomLoadBalancerDefinition.java | 2 +-
.../RoundRobinLoadBalancerDefinition.java | 2 +-
.../loadbalancer/StickyLoadBalancerDefinition.java | 2 +-
.../loadbalancer/TopicLoadBalancerDefinition.java | 2 +-
.../WeightedLoadBalancerDefinition.java | 2 +-
.../camel/model/routeWithFailoverLoadBalance.xml | 4 +-
.../apache/camel/model/routeWithLoadBalance.xml | 2 +-
.../camel/model/routeWithRandomLoadBalance.xml | 2 +-
.../camel/model/routeWithStickyLoadBalance.xml | 4 +-
.../camel/model/routeWithTopicLoadBalance.xml | 2 +-
.../java/org/apache/camel/xml/in/ModelParser.java | 12 ++--
.../java/org/apache/camel/xml/out/ModelWriter.java | 24 ++++----
.../resources/routeWithFailoverLoadBalance.xml | 4 +-
.../src/test/resources/routeWithLoadBalance.xml | 2 +-
.../test/resources/routeWithRandomLoadBalance.xml | 2 +-
.../test/resources/routeWithStickyLoadBalance.xml | 4 +-
.../test/resources/routeWithTopicLoadBalance.xml | 2 +-
.../org/apache/camel/yaml/out/ModelWriter.java | 24 ++++----
.../ROOT/pages/camel-4x-upgrade-guide-4_7.adoc | 50 +++++++++++++++++
.../dsl/yaml/deserializers/ModelDeserializers.java | 65 +++++++++++++---------
.../deserializers/ModelDeserializersResolver.java | 19 ++++---
.../generated/resources/schema/camelYamlDsl.json | 60 ++++++++++----------
.../apache/camel/dsl/yaml/LoadBalanceTest.groovy | 6 +-
77 files changed, 309 insertions(+), 239 deletions(-)
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models.properties b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models.properties
index bc094223ff6..01bf90d409c 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models.properties
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models.properties
@@ -47,7 +47,7 @@ enrich
errorHandler
exchangeProperty
expression
-failover
+failoverLoadBalancer
faultToleranceConfiguration
fhirJson
fhirXml
@@ -123,7 +123,7 @@ propertyExpression
protobuf
put
python
-random
+randomLoadBalancer
recipientList
redeliveryPolicy
ref
@@ -145,7 +145,7 @@ restProperty
rests
resumable
rollback
-roundRobin
+roundRobinLoadBalancer
route
routeBuilder
routeConfiguration
@@ -184,7 +184,7 @@ split
springTransactionErrorHandler
staticServiceDiscovery
step
-sticky
+stickyLoadBalancer
stop
streamConfig
swiftMt
@@ -204,7 +204,7 @@ tidyMarkup
to
toD
tokenize
-topic
+topicLoadBalancer
transacted
transform
transformers
@@ -219,7 +219,7 @@ validators
value
variable
wasm
-weighted
+weightedLoadBalancer
when
whenSkipSendToEndpoint
wireTap
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/failover.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/failoverLoadBalancer.json
similarity index 97%
rename from catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/failover.json
rename to catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/failoverLoadBalancer.json
index 242e3d74542..ac052a46177 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/failover.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/failoverLoadBalancer.json
@@ -1,8 +1,8 @@
{
"model": {
"kind": "model",
- "name": "failover",
- "title": "Failover",
+ "name": "failoverLoadBalancer",
+ "title": "Failover Load Balancer",
"description": "In case of failures the exchange will be tried on the next endpoint.",
"deprecated": false,
"label": "eip,routing",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/loadBalance.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/loadBalance.json
index cde2ee0394c..ce2da300d4e 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/loadBalance.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/loadBalance.json
@@ -15,7 +15,7 @@
"id": { "index": 0, "kind": "attribute", "displayName": "Id", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the id of this node" },
"description": { "index": 1, "kind": "attribute", "displayName": "Description", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the description of this node" },
"disabled": { "index": 2, "kind": "attribute", "displayName": "Disabled", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to disable this EIP from the route during build time. Once an EIP has been disabled then it cannot be enabled later at runtime." },
- "loadBalancerType": { "index": 3, "kind": "element", "displayName": "Load Balancer Type", "group": "common", "required": true, "type": "object", "javaType": "org.apache.camel.model.LoadBalancerDefinition", "oneOf": [ "customLoadBalancer", "failover", "random", "roundRobin", "sticky", "topic", "weighted" ], "deprecated": false, "autowired": false, "secret": false, "description": "The load balancer to be used" },
+ "loadBalancerType": { "index": 3, "kind": "element", "displayName": "Load Balancer Type", "group": "common", "required": true, "type": "object", "javaType": "org.apache.camel.model.LoadBalancerDefinition", "oneOf": [ "customLoadBalancer", "failoverLoadBalancer", "randomLoadBalancer", "roundRobinLoadBalancer", "stickyLoadBalancer", "topicLoadBalancer", "weightedLoadBalancer" ], "deprecated": false, "autowired": false, "secret": false, "description": "The load balancer to be used" },
"outputs": { "index": 4, "kind": "element", "displayName": "Outputs", "group": "common", "required": true, "type": "array", "javaType": "java.util.List", "oneOf": [ "aggregate", "bean", "choice", "circuitBreaker", "claimCheck", "convertBodyTo", "convertHeaderTo", "convertVariableTo", "delay", "doCatch", "doFinally", "doTry", "dynamicRouter", "enrich", "filter", "idempotentConsumer", "intercept", "interceptFrom", "interceptSendToEndpoint", "kamelet", "loadBalance", "log", "loop", "mar [...]
"inheritErrorHandler": { "index": 5, "kind": "attribute", "displayName": "Inherit Error Handler", "group": "common", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Sets whether or not to inherit the configured error handler. The default value is true. You can use this to disable using the inherited error handler for a given DSL such as a load balancer where you wan [...]
}
diff --git a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/loadbalancer/random.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/randomLoadBalancer.json
similarity index 89%
rename from core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/loadbalancer/random.json
rename to catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/randomLoadBalancer.json
index 001036350fb..b69168d729f 100644
--- a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/loadbalancer/random.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/randomLoadBalancer.json
@@ -1,8 +1,8 @@
{
"model": {
"kind": "model",
- "name": "random",
- "title": "Random",
+ "name": "randomLoadBalancer",
+ "title": "Random Load Balancer",
"description": "The destination endpoints are selected randomly.",
"deprecated": false,
"label": "eip,routing",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/roundRobin.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/roundRobinLoadBalancer.json
similarity index 89%
rename from catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/roundRobin.json
rename to catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/roundRobinLoadBalancer.json
index cb289a4cf80..b589a5cb26e 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/roundRobin.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/roundRobinLoadBalancer.json
@@ -1,8 +1,8 @@
{
"model": {
"kind": "model",
- "name": "roundRobin",
- "title": "Round Robin",
+ "name": "roundRobinLoadBalancer",
+ "title": "Round Robin Load Balancer",
"description": "The destination endpoints are selected in a round-robin fashion. This is a well-known and classic policy, which spreads the load evenly.",
"deprecated": false,
"label": "eip,routing",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/sticky.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/stickyLoadBalancer.json
similarity index 94%
rename from catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/sticky.json
rename to catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/stickyLoadBalancer.json
index 121ce0f7159..8d0569aadfc 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/sticky.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/stickyLoadBalancer.json
@@ -1,8 +1,8 @@
{
"model": {
"kind": "model",
- "name": "sticky",
- "title": "Sticky",
+ "name": "stickyLoadBalancer",
+ "title": "Sticky Load Balancer",
"description": "Sticky load balancing using an expression to calculate a correlation key to perform the sticky load balancing.",
"deprecated": false,
"label": "eip,routing",
diff --git a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/loadbalancer/topic.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/topicLoadBalancer.json
similarity index 89%
rename from core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/loadbalancer/topic.json
rename to catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/topicLoadBalancer.json
index 7070f1d288b..ba975d129fb 100644
--- a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/loadbalancer/topic.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/topicLoadBalancer.json
@@ -1,8 +1,8 @@
{
"model": {
"kind": "model",
- "name": "topic",
- "title": "Topic",
+ "name": "topicLoadBalancer",
+ "title": "Topic Load Balancer",
"description": "Topic which sends to all destinations.",
"deprecated": false,
"label": "eip,routing",
diff --git a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/loadbalancer/weighted.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/weightedLoadBalancer.json
similarity index 96%
rename from core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/loadbalancer/weighted.json
rename to catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/weightedLoadBalancer.json
index 8a31ae21cae..e0fe2118cab 100644
--- a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/loadbalancer/weighted.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/weightedLoadBalancer.json
@@ -1,8 +1,8 @@
{
"model": {
"kind": "model",
- "name": "weighted",
- "title": "Weighted",
+ "name": "weightedLoadBalancer",
+ "title": "Weighted Load Balancer",
"description": "Uses a weighted load distribution ratio for each server with respect to others.",
"deprecated": false,
"label": "eip,routing",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
index 9b0e5d5c50f..31c2ec35868 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
@@ -499,7 +499,7 @@ A useful base class for an expression
</xs:annotation>
</xs:element>
<xs:element name="expressionDefinition" type="tns:expression"/>
- <xs:element name="failover" type="tns:failoverLoadBalancerDefinition">
+ <xs:element name="failoverLoadBalancer" type="tns:failoverLoadBalancerDefinition">
<xs:annotation>
<xs:documentation xml:lang="en">
<![CDATA[
@@ -1249,7 +1249,7 @@ Evaluates a Python expression.
</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="random" type="tns:randomLoadBalancerDefinition">
+ <xs:element name="randomLoadBalancer" type="tns:randomLoadBalancerDefinition">
<xs:annotation>
<xs:documentation xml:lang="en">
<![CDATA[
@@ -1465,7 +1465,7 @@ Forces a rollback by stopping routing the message
</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="roundRobin" type="tns:roundRobinLoadBalancerDefinition">
+ <xs:element name="roundRobinLoadBalancer" type="tns:roundRobinLoadBalancerDefinition">
<xs:annotation>
<xs:documentation xml:lang="en">
<![CDATA[
@@ -1871,7 +1871,7 @@ Routes the message to a sequence of processors which is grouped together as one
</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="sticky" type="tns:stickyLoadBalancerDefinition">
+ <xs:element name="stickyLoadBalancer" type="tns:stickyLoadBalancerDefinition">
<xs:annotation>
<xs:documentation xml:lang="en">
<![CDATA[
@@ -2078,7 +2078,7 @@ Tokenize text payloads using delimiter patterns.
</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="topic" type="tns:topicLoadBalancerDefinition">
+ <xs:element name="topicLoadBalancer" type="tns:topicLoadBalancerDefinition">
<xs:annotation>
<xs:documentation xml:lang="en">
<![CDATA[
@@ -2213,7 +2213,7 @@ Call a wasm (web assembly) function.
</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="weighted" type="tns:weightedLoadBalancerDefinition">
+ <xs:element name="weightedLoadBalancer" type="tns:weightedLoadBalancerDefinition">
<xs:annotation>
<xs:documentation xml:lang="en">
<![CDATA[
@@ -6842,12 +6842,12 @@ mynamecount=4&type=gold.
<xs:sequence>
<xs:choice minOccurs="0">
<xs:element ref="tns:customLoadBalancer"/>
- <xs:element ref="tns:failover"/>
- <xs:element ref="tns:random"/>
- <xs:element ref="tns:roundRobin"/>
- <xs:element ref="tns:sticky"/>
- <xs:element ref="tns:topic"/>
- <xs:element ref="tns:weighted"/>
+ <xs:element ref="tns:failoverLoadBalancer"/>
+ <xs:element ref="tns:randomLoadBalancer"/>
+ <xs:element ref="tns:roundRobinLoadBalancer"/>
+ <xs:element ref="tns:stickyLoadBalancer"/>
+ <xs:element ref="tns:topicLoadBalancer"/>
+ <xs:element ref="tns:weightedLoadBalancer"/>
</xs:choice>
<xs:choice maxOccurs="unbounded" minOccurs="0">
<xs:element ref="tns:aggregate"/>
diff --git a/components/camel-jetty/src/test/resources/org/apache/camel/component/jetty/JettySpringFailoverRoundRobinTest.xml b/components/camel-jetty/src/test/resources/org/apache/camel/component/jetty/JettySpringFailoverRoundRobinTest.xml
index 967983e282e..ff6ff7cc1f5 100644
--- a/components/camel-jetty/src/test/resources/org/apache/camel/component/jetty/JettySpringFailoverRoundRobinTest.xml
+++ b/components/camel-jetty/src/test/resources/org/apache/camel/component/jetty/JettySpringFailoverRoundRobinTest.xml
@@ -43,7 +43,7 @@
Also do not inherit error handler which means the failover LB will not fallback
and use error handler but trigger failover to next endpoint immediately -->
<loadBalance inheritErrorHandler="false">
- <failover roundRobin="true"/>
+ <failoverLoadBalancer roundRobin="true"/>
<!-- and this is the four endpoints we will load balance with failover -->
<to uri="ref:hbad"/>
<to uri="ref:hbad2"/>
diff --git a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/integration/spring/JmsSpringLoadBalanceFailOverIT.xml b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/integration/spring/JmsSpringLoadBalanceFailOverIT.xml
index b27df4a21be..002943454c1 100644
--- a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/integration/spring/JmsSpringLoadBalanceFailOverIT.xml
+++ b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/integration/spring/JmsSpringLoadBalanceFailOverIT.xml
@@ -44,7 +44,7 @@
<route>
<from uri="direct:start"/>
<loadBalance>
- <failover/>
+ <failoverLoadBalancer/>
<to uri="jms:queue:foo?transferException=true"/>
<to uri="jms:queue:bar?transferException=true"/>
</loadBalance>
diff --git a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/DoubleLoadBalancerMisconfigurationTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/DoubleLoadBalancerMisconfigurationTest.xml
index 5c6b062f92a..f6752987ca0 100644
--- a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/DoubleLoadBalancerMisconfigurationTest.xml
+++ b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/DoubleLoadBalancerMisconfigurationTest.xml
@@ -29,10 +29,10 @@
<route>
<from uri="direct:start"/>
<loadBalance>
- <random/>
+ <randomLoadBalancer/>
<!-- invalid configuration with nested load balancer -->
<loadBalance>
- <roundRobin/>
+ <roundRobinLoadBalancer/>
<to uri="mock:a"/>
<to uri="mock:b"/>
</loadBalance>
diff --git a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/FailOverLoadBalanceAutoStartupFalseTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/FailOverLoadBalanceAutoStartupFalseTest.xml
index a7ccdd963d4..31436ab5713 100644
--- a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/FailOverLoadBalanceAutoStartupFalseTest.xml
+++ b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/FailOverLoadBalanceAutoStartupFalseTest.xml
@@ -30,7 +30,7 @@
<route id="foo" autoStartup="false">
<from uri="direct:start"/>
<loadBalance inheritErrorHandler="true">
- <failover maximumFailoverAttempts="3" roundRobin="true"/>
+ <failoverLoadBalancer maximumFailoverAttempts="3" roundRobin="true"/>
<to uri="direct:x"/>
<to uri="direct:y"/>
<to uri="direct:z"/>
diff --git a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/FailoverMaximumFailoverAttemptsTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/FailoverMaximumFailoverAttemptsTest.xml
index b91a976e6f8..d86af7a9874 100644
--- a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/FailoverMaximumFailoverAttemptsTest.xml
+++ b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/FailoverMaximumFailoverAttemptsTest.xml
@@ -45,7 +45,7 @@
<loadBalance>
<!-- failover using stateful round robin,
which will at most failover 2 times before exhausting -->
- <failover maximumFailoverAttempts="2" roundRobin="true"/>
+ <failoverLoadBalancer maximumFailoverAttempts="2" roundRobin="true"/>
<to uri="direct:bad"/>
<to uri="direct:bad2"/>
<to uri="direct:bad3"/>
diff --git a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/FailoverRoundRobinStickyTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/FailoverRoundRobinStickyTest.xml
index 54470b16fb1..2965176e491 100644
--- a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/FailoverRoundRobinStickyTest.xml
+++ b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/FailoverRoundRobinStickyTest.xml
@@ -42,7 +42,7 @@
<!-- failover using stateful round robin and sticky mode,
which will keep retrying forever those 4 endpoints until success.
You can set the maximumFailoverAttempt to break out after X attempts -->
- <failover roundRobin="true" sticky="true"/>
+ <failoverLoadBalancer roundRobin="true" sticky="true"/>
<to uri="direct:bad"/>
<to uri="direct:bad2"/>
<to uri="direct:good"/>
diff --git a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/FailoverRoundRobinTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/FailoverRoundRobinTest.xml
index eb429d37762..ca0276a6e3d 100644
--- a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/FailoverRoundRobinTest.xml
+++ b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/FailoverRoundRobinTest.xml
@@ -42,7 +42,7 @@
<!-- failover using stateful round robin,
which will keep retrying forever those 4 endpoints until success.
You can set the maximumFailoverAttempt to break out after X attempts -->
- <failover roundRobin="true"/>
+ <failoverLoadBalancer roundRobin="true"/>
<to uri="direct:bad"/>
<to uri="direct:bad2"/>
<to uri="direct:good"/>
diff --git a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/failOverLoadBalance.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/failOverLoadBalance.xml
index 1b9c9231213..e71b896c9eb 100644
--- a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/failOverLoadBalance.xml
+++ b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/failOverLoadBalance.xml
@@ -32,7 +32,7 @@
<route errorHandlerRef="noErrorHandler">
<from uri="direct:exception"/>
<loadBalance>
- <failover/>
+ <failoverLoadBalancer/>
<to uri="direct:x"/>
<to uri="direct:y"/>
<to uri="direct:z"/>
@@ -41,9 +41,9 @@
<route errorHandlerRef="noErrorHandler">
<from uri="direct:customerException"/>
<loadBalance>
- <failover>
+ <failoverLoadBalancer>
<exception>org.apache.camel.processor.FailOverLoadBalanceTest$MyException</exception>
- </failover>
+ </failoverLoadBalancer>
<to uri="direct:x"/>
<to uri="direct:y"/>
<to uri="direct:z"/>
diff --git a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/onexception/OnExceptionLoadBalancerDoubleIssueTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/onexception/OnExceptionLoadBalancerDoubleIssueTest.xml
index 4fba84692e2..d05d7c5e5ea 100644
--- a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/onexception/OnExceptionLoadBalancerDoubleIssueTest.xml
+++ b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/onexception/OnExceptionLoadBalancerDoubleIssueTest.xml
@@ -43,7 +43,7 @@
<route>
<from uri="direct:error"/>
<loadBalance>
- <roundRobin id="round"/>
+ <roundRobinLoadBalancer id="round"/>
<to uri="mock:error"/>
<to uri="mock:error2"/>
<to uri="mock:error3"/>
diff --git a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/randomLoadBalance.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/randomLoadBalance.xml
index a08df8ad716..cc4f0821f7e 100644
--- a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/randomLoadBalance.xml
+++ b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/randomLoadBalance.xml
@@ -30,7 +30,7 @@
<route>
<from uri="direct:start"/>
<loadBalance>
- <random/>
+ <randomLoadBalancer/>
<to uri="mock:x"/>
<to uri="mock:y"/>
<to uri="mock:z"/>
diff --git a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/roundRobinLoadBalance.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/roundRobinLoadBalance.xml
index cf21876148b..53d48ce0f04 100644
--- a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/roundRobinLoadBalance.xml
+++ b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/roundRobinLoadBalance.xml
@@ -30,7 +30,7 @@
<route>
<from uri="direct:start"/>
<loadBalance>
- <roundRobin/>
+ <roundRobinLoadBalancer/>
<to uri="mock:x"/>
<to uri="mock:y"/>
<to uri="mock:z"/>
diff --git a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/stickyLoadBalance.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/stickyLoadBalance.xml
index 33cb420705a..275ffdf2297 100644
--- a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/stickyLoadBalance.xml
+++ b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/stickyLoadBalance.xml
@@ -30,9 +30,9 @@
<route>
<from uri="direct:start"/>
<loadBalance>
- <sticky>
+ <stickyLoadBalancer>
<correlationExpression><header>foo</header></correlationExpression>
- </sticky>
+ </stickyLoadBalancer>
<to uri="mock:x"/>
<to uri="mock:y"/>
<to uri="mock:z"/>
diff --git a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/topicLoadBalance.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/topicLoadBalance.xml
index b6e9c6d12b3..f3c7209f480 100644
--- a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/topicLoadBalance.xml
+++ b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/topicLoadBalance.xml
@@ -30,7 +30,7 @@
<route>
<from uri="direct:start"/>
<loadBalance>
- <topic/>
+ <topicLoadBalancer/>
<to uri="mock:x"/>
<to uri="mock:y"/>
<to uri="mock:z"/>
diff --git a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/weightedRandomLoadBalance.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/weightedRandomLoadBalance.xml
index 6885330a162..0e743e81bf1 100644
--- a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/weightedRandomLoadBalance.xml
+++ b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/weightedRandomLoadBalance.xml
@@ -32,7 +32,7 @@
<route>
<from uri="direct:start"/>
<loadBalance>
- <weighted roundRobin="false" distributionRatio="4, 2, 1" />
+ <weightedLoadBalancer roundRobin="false" distributionRatio="4, 2, 1" />
<to uri="mock:x"/>
<to uri="mock:y"/>
<to uri="mock:z"/>
diff --git a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/weightedRoundRobinLoadBalance.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/weightedRoundRobinLoadBalance.xml
index d8aa4921c88..9c6ecfbacb0 100644
--- a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/weightedRoundRobinLoadBalance.xml
+++ b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/weightedRoundRobinLoadBalance.xml
@@ -32,7 +32,7 @@
<route>
<from uri="direct:start"/>
<loadBalance>
- <weighted roundRobin="true" distributionRatio="4,2,1"/>
+ <weightedLoadBalancer roundRobin="true" distributionRatio="4,2,1"/>
<to uri="mock:x"/>
<to uri="mock:y"/>
<to uri="mock:z"/>
diff --git a/core/camel-core-engine/src/main/docs/modules/eips/examples/json/failover.json b/core/camel-core-engine/src/main/docs/modules/eips/examples/json/failover.json
deleted file mode 120000
index c838e40423c..00000000000
--- a/core/camel-core-engine/src/main/docs/modules/eips/examples/json/failover.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../../../camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/loadbalancer/failover.json
\ No newline at end of file
diff --git a/core/camel-core-engine/src/main/docs/modules/eips/examples/json/failoverLoadBalancer.json b/core/camel-core-engine/src/main/docs/modules/eips/examples/json/failoverLoadBalancer.json
new file mode 120000
index 00000000000..e91f6b6b89a
--- /dev/null
+++ b/core/camel-core-engine/src/main/docs/modules/eips/examples/json/failoverLoadBalancer.json
@@ -0,0 +1 @@
+../../../../../../../../camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/loadbalancer/failoverLoadBalancer.json
\ No newline at end of file
diff --git a/core/camel-core-engine/src/main/docs/modules/eips/examples/json/random.json b/core/camel-core-engine/src/main/docs/modules/eips/examples/json/random.json
deleted file mode 120000
index 8b3c7d69b7a..00000000000
--- a/core/camel-core-engine/src/main/docs/modules/eips/examples/json/random.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../../../camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/loadbalancer/random.json
\ No newline at end of file
diff --git a/core/camel-core-engine/src/main/docs/modules/eips/examples/json/randomLoadBalancer.json b/core/camel-core-engine/src/main/docs/modules/eips/examples/json/randomLoadBalancer.json
new file mode 120000
index 00000000000..82c37035bec
--- /dev/null
+++ b/core/camel-core-engine/src/main/docs/modules/eips/examples/json/randomLoadBalancer.json
@@ -0,0 +1 @@
+../../../../../../../../camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/loadbalancer/randomLoadBalancer.json
\ No newline at end of file
diff --git a/core/camel-core-engine/src/main/docs/modules/eips/examples/json/roundRobin.json b/core/camel-core-engine/src/main/docs/modules/eips/examples/json/roundRobin.json
deleted file mode 120000
index 7ca2bb15e2c..00000000000
--- a/core/camel-core-engine/src/main/docs/modules/eips/examples/json/roundRobin.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../../../camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/loadbalancer/roundRobin.json
\ No newline at end of file
diff --git a/core/camel-core-engine/src/main/docs/modules/eips/examples/json/roundRobinLoadBalancer.json b/core/camel-core-engine/src/main/docs/modules/eips/examples/json/roundRobinLoadBalancer.json
new file mode 120000
index 00000000000..d530251e64b
--- /dev/null
+++ b/core/camel-core-engine/src/main/docs/modules/eips/examples/json/roundRobinLoadBalancer.json
@@ -0,0 +1 @@
+../../../../../../../../camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/loadbalancer/roundRobinLoadBalancer.json
\ No newline at end of file
diff --git a/core/camel-core-engine/src/main/docs/modules/eips/examples/json/sticky.json b/core/camel-core-engine/src/main/docs/modules/eips/examples/json/sticky.json
deleted file mode 120000
index e7287b9fd49..00000000000
--- a/core/camel-core-engine/src/main/docs/modules/eips/examples/json/sticky.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../../../camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/loadbalancer/sticky.json
\ No newline at end of file
diff --git a/core/camel-core-engine/src/main/docs/modules/eips/examples/json/stickyLoadBalancer.json b/core/camel-core-engine/src/main/docs/modules/eips/examples/json/stickyLoadBalancer.json
new file mode 120000
index 00000000000..520fe23c176
--- /dev/null
+++ b/core/camel-core-engine/src/main/docs/modules/eips/examples/json/stickyLoadBalancer.json
@@ -0,0 +1 @@
+../../../../../../../../camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/loadbalancer/stickyLoadBalancer.json
\ No newline at end of file
diff --git a/core/camel-core-engine/src/main/docs/modules/eips/examples/json/topic.json b/core/camel-core-engine/src/main/docs/modules/eips/examples/json/topic.json
deleted file mode 120000
index c81c180447c..00000000000
--- a/core/camel-core-engine/src/main/docs/modules/eips/examples/json/topic.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../../../camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/loadbalancer/topic.json
\ No newline at end of file
diff --git a/core/camel-core-engine/src/main/docs/modules/eips/examples/json/topicLoadBalancer.json b/core/camel-core-engine/src/main/docs/modules/eips/examples/json/topicLoadBalancer.json
new file mode 120000
index 00000000000..af3398773c5
--- /dev/null
+++ b/core/camel-core-engine/src/main/docs/modules/eips/examples/json/topicLoadBalancer.json
@@ -0,0 +1 @@
+../../../../../../../../camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/loadbalancer/topicLoadBalancer.json
\ No newline at end of file
diff --git a/core/camel-core-engine/src/main/docs/modules/eips/examples/json/weighted.json b/core/camel-core-engine/src/main/docs/modules/eips/examples/json/weighted.json
deleted file mode 120000
index aea5ac76a95..00000000000
--- a/core/camel-core-engine/src/main/docs/modules/eips/examples/json/weighted.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../../../camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/loadbalancer/weighted.json
\ No newline at end of file
diff --git a/core/camel-core-engine/src/main/docs/modules/eips/examples/json/weightedLoadBalancer.json b/core/camel-core-engine/src/main/docs/modules/eips/examples/json/weightedLoadBalancer.json
new file mode 120000
index 00000000000..2fce7784303
--- /dev/null
+++ b/core/camel-core-engine/src/main/docs/modules/eips/examples/json/weightedLoadBalancer.json
@@ -0,0 +1 @@
+../../../../../../../../camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/loadbalancer/weightedLoadBalancer.json
\ No newline at end of file
diff --git a/core/camel-core-engine/src/main/docs/modules/eips/nav.adoc b/core/camel-core-engine/src/main/docs/modules/eips/nav.adoc
index 92143da8dd0..6d1dee3e69e 100644
--- a/core/camel-core-engine/src/main/docs/modules/eips/nav.adoc
+++ b/core/camel-core-engine/src/main/docs/modules/eips/nav.adoc
@@ -26,7 +26,7 @@
** xref:enrich-eip.adoc[Enrich]
** xref:eventDrivenConsumer-eip.adoc[Event Driven Consumer]
** xref:event-message.adoc[Event Message]
-** xref:failover-eip.adoc[Failover]
+** xref:failoverLoadBalancer-eip.adoc[Failover Load Balancer]
** xref:faultToleranceConfiguration-eip.adoc[Fault Tolerance Configuration]
** xref:fault-tolerance-eip.adoc[Fault Tolerance EIP]
** xref:filter-eip.adoc[Filter]
@@ -62,7 +62,7 @@
** xref:process-eip.adoc[Process]
** xref:process-manager.adoc[Process Manager]
** xref:publish-subscribe-channel.adoc[Publish Subscribe Channel]
-** xref:random-eip.adoc[Random]
+** xref:randomLoadBalancer-eip.adoc[Random Load Balancer]
** xref:recipientList-eip.adoc[Recipient List]
** xref:removeHeader-eip.adoc[Remove Header]
** xref:removeHeaders-eip.adoc[Remove Headers]
@@ -76,7 +76,7 @@
** xref:resume-strategies.adoc[Resume Strategies]
** xref:return-address.adoc[Return Address]
** xref:rollback-eip.adoc[Rollback]
-** xref:roundRobin-eip.adoc[Round Robin]
+** xref:roundRobinLoadBalancer-eip.adoc[Round Robin Load Balancer]
** xref:routingSlip-eip.adoc[Routing Slip]
** xref:saga-eip.adoc[Saga]
** xref:sample-eip.adoc[Sample]
@@ -94,17 +94,17 @@
** xref:sort-eip.adoc[Sort]
** xref:split-eip.adoc[Split]
** xref:step-eip.adoc[Step]
-** xref:sticky-eip.adoc[Sticky]
+** xref:stickyLoadBalancer-eip.adoc[Sticky Load Balancer]
** xref:stop-eip.adoc[Stop]
** xref:streamConfig-eip.adoc[StreamConfig]
** xref:threads-eip.adoc[Threads]
** xref:throttle-eip.adoc[Throttle]
** xref:to-eip.adoc[To]
** xref:toD-eip.adoc[To D]
-** xref:topic-eip.adoc[Topic]
+** xref:topicLoadBalancer-eip.adoc[Topic Load Balancer]
** xref:transactional-client.adoc[Transactional Client]
** xref:transform-eip.adoc[Transform]
** xref:unmarshal-eip.adoc[Unmarshal EIP]
** xref:validate-eip.adoc[Validate]
-** xref:weighted-eip.adoc[Weighted]
+** xref:weightedLoadBalancer-eip.adoc[Weighted Load Balancer]
** xref:wireTap-eip.adoc[Wire Tap]
diff --git a/core/camel-core-engine/src/main/docs/modules/eips/pages/failover-eip.adoc b/core/camel-core-engine/src/main/docs/modules/eips/pages/failoverLoadBalancer-eip.adoc
similarity index 92%
rename from core/camel-core-engine/src/main/docs/modules/eips/pages/failover-eip.adoc
rename to core/camel-core-engine/src/main/docs/modules/eips/pages/failoverLoadBalancer-eip.adoc
index f83f1cbc4dc..d5ff7c0c631 100644
--- a/core/camel-core-engine/src/main/docs/modules/eips/pages/failover-eip.adoc
+++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/failoverLoadBalancer-eip.adoc
@@ -1,6 +1,6 @@
-= Failover EIP
-:doctitle: Failover
-:shortname: failover
+= Failover Load Balancer EIP
+:doctitle: Failover Load Balancer
+:shortname: failoverLoadBalancer
:description: In case of failures the exchange will be tried on the next endpoint.
:since:
:supportlevel: Stable
@@ -47,7 +47,7 @@ XML::
<route>
<from uri="direct:start"/>
<loadBalance>
- <failover/>
+ <failoverLoadBalancer/>
<to uri="http:service1"/>
<to uri="http:service2"/>
<to uri="http:service3"/>
@@ -95,7 +95,7 @@ In XML, it is straightforward as shown:
<route>
<from uri="direct:start"/>
<loadBalance>
- <failover roundRobin="true" maximumFailoverAttempts="10"/>
+ <failoverLoadBalancer roundRobin="true" maximumFailoverAttempts="10"/>
<to uri="http:service1"/>
<to uri="http:service2"/>
<to uri="http:service3"/>
@@ -141,7 +141,7 @@ XML::
<route>
<from uri="direct:start"/>
<loadBalance>
- <failover roundRobin="true" maximumFailoverAttempts="10" stickyMode="true"/>
+ <failoverLoadBalancer roundRobin="true" maximumFailoverAttempts="10" stickyMode="true"/>
<to uri="http:service1"/>
<to uri="http:service2"/>
<to uri="http:service3"/>
@@ -173,10 +173,10 @@ And in XML DSL:
<route>
<from uri="direct:start"/>
<loadBalance>
- <failover>
+ <failoverLoadBalancer>
<exception>java.io.IOException</exception>
<exception>org.apache.camel.http.base.HttpOperationFailedException</exception>
- </failover>
+ </failoverLoadBalancer>
<to uri="http:service1"/>
<to uri="http:service2"/>
<to uri="http:service3"/>
diff --git a/core/camel-core-engine/src/main/docs/modules/eips/pages/loadBalance-eip.adoc b/core/camel-core-engine/src/main/docs/modules/eips/pages/loadBalance-eip.adoc
index 5db9d289db1..ebd30328011 100644
--- a/core/camel-core-engine/src/main/docs/modules/eips/pages/loadBalance-eip.adoc
+++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/loadBalance-eip.adoc
@@ -16,10 +16,10 @@ Camel provides the following policies out-of-the-box:
|=======================================================================
| Policy | Description
| xref:customLoadBalancer-eip.adoc[Custom Load Balancer] | To use a custom load balancer implementation.
-| xref:failover-eip.adoc[Fail-over Load Balancer] | In case of failures, the exchange will be tried on the next endpoint.
-| xref:roundRobin-eip.adoc[Round Robin Load Balancer] | The destination endpoints are selected in a round-robin fashion. This is a well-known and classic policy, which spreads the load evenly.
-| xref:random-eip.adoc[Random Load Balancer] | The destination endpoints are selected randomly.
-| xref:sticky-eip.adoc[Sticky Load Balancer] | Sticky load balancing using an xref:manual::expression.adoc[Expression] to calculate a correlation key to perform the sticky load balancing.
-| xref:topic-eip.adoc[Topic Load Balancer] | Topic which sends to all destinations.
-| xref:weighted-eip.adoc[Weighted Loader Balancer] | Use a weighted load distribution ratio for each server with respect to others.
+| xref:failoverLoadBalancer-eip.adoc[Fail-over Load Balancer] | In case of failures, the exchange will be tried on the next endpoint.
+| xref:roundRobinLoadBalancer-eip.adoc[Round Robin Load Balancer] | The destination endpoints are selected in a round-robin fashion. This is a well-known and classic policy, which spreads the load evenly.
+| xref:randomLoadBalancer-eip.adoc[Random Load Balancer] | The destination endpoints are selected randomly.
+| xref:stickyLoadBalancer-eip.adoc[Sticky Load Balancer] | Sticky load balancing using an xref:manual::expression.adoc[Expression] to calculate a correlation key to perform the sticky load balancing.
+| xref:topicLoadBalancer-eip.adoc[Topic Load Balancer] | Topic which sends to all destinations.
+| xref:weightedLoadBalancer-eip.adoc[Weighted Loader Balancer] | Use a weighted load distribution ratio for each server with respect to others.
|=======================================================================
diff --git a/core/camel-core-engine/src/main/docs/modules/eips/pages/random-eip.adoc b/core/camel-core-engine/src/main/docs/modules/eips/pages/randomLoadBalancer-eip.adoc
similarity index 89%
rename from core/camel-core-engine/src/main/docs/modules/eips/pages/random-eip.adoc
rename to core/camel-core-engine/src/main/docs/modules/eips/pages/randomLoadBalancer-eip.adoc
index 7958a92e20e..bdcf8902e45 100644
--- a/core/camel-core-engine/src/main/docs/modules/eips/pages/random-eip.adoc
+++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/randomLoadBalancer-eip.adoc
@@ -1,6 +1,6 @@
-= Random EIP
-:doctitle: Random
-:shortname: random
+= Random Load Balancer EIP
+:doctitle: Random Load Balancer
+:shortname: randomLoadBalancer
:description: The destination endpoints are selected randomly.
:since:
:supportlevel: Stable
@@ -48,7 +48,7 @@ XML::
<route>
<from uri="direct:start"/>
<loadBalance>
- <random/>
+ <randomLoadBalancer/>
<to uri="seda:x"/>
<to uri="seda:y"/>
<to uri="seda:z"/>
diff --git a/core/camel-core-engine/src/main/docs/modules/eips/pages/roundRobin-eip.adoc b/core/camel-core-engine/src/main/docs/modules/eips/pages/roundRobinLoadBalancer-eip.adoc
similarity index 89%
rename from core/camel-core-engine/src/main/docs/modules/eips/pages/roundRobin-eip.adoc
rename to core/camel-core-engine/src/main/docs/modules/eips/pages/roundRobinLoadBalancer-eip.adoc
index 3c6c7c9361b..1529d2fe347 100644
--- a/core/camel-core-engine/src/main/docs/modules/eips/pages/roundRobin-eip.adoc
+++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/roundRobinLoadBalancer-eip.adoc
@@ -1,6 +1,6 @@
-= Round Robin EIP
-:doctitle: Round Robin
-:shortname: roundRobin
+= Round Robin Load Balancer EIP
+:doctitle: Round Robin Load Balancer
+:shortname: roundRobinLoadBalancer
:description: The destination endpoints are selected in a round-robin fashion. This is a well-known and classic policy, which spreads the load evenly.
:since:
:supportlevel: Stable
@@ -46,7 +46,7 @@ In XML, you'll have a route like this:
<route>
<from uri="direct:start"/>
<loadBalance>
- <roundRobin/>
+ <roundRobinLoadBalancer/>
<to uri="seda:x"/>
<to uri="seda:y"/>
<to uri="seda:z"/>
diff --git a/core/camel-core-engine/src/main/docs/modules/eips/pages/sticky-eip.adoc b/core/camel-core-engine/src/main/docs/modules/eips/pages/stickyLoadBalancer-eip.adoc
similarity index 89%
rename from core/camel-core-engine/src/main/docs/modules/eips/pages/sticky-eip.adoc
rename to core/camel-core-engine/src/main/docs/modules/eips/pages/stickyLoadBalancer-eip.adoc
index f0fa4274595..4f83fc4106f 100644
--- a/core/camel-core-engine/src/main/docs/modules/eips/pages/sticky-eip.adoc
+++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/stickyLoadBalancer-eip.adoc
@@ -1,6 +1,6 @@
-= Sticky EIP
-:doctitle: Sticky
-:shortname: sticky
+= Sticky Load Balancer EIP
+:doctitle: Sticky Load Balancer
+:shortname: stickyLoadBalancer
:description: Sticky load balancing using an expression to calculate a correlation key to perform the sticky load balancing.
:since:
:supportlevel: Stable
@@ -48,11 +48,11 @@ XML::
<route>
<from uri="direct:start"/>
<loadBalance>
- <sticky>
+ <stickyLoadBalancer>
<correlationExpression>
<header>myKey</header>
</correlationExpression>
- </sticky>
+ </stickyLoadBalancer>
<to uri="seda:x"/>
<to uri="seda:y"/>
<to uri="seda:z"/>
diff --git a/core/camel-core-engine/src/main/docs/modules/eips/pages/topic-eip.adoc b/core/camel-core-engine/src/main/docs/modules/eips/pages/topicLoadBalancer-eip.adoc
similarity index 88%
rename from core/camel-core-engine/src/main/docs/modules/eips/pages/topic-eip.adoc
rename to core/camel-core-engine/src/main/docs/modules/eips/pages/topicLoadBalancer-eip.adoc
index 4f28ec3a80b..17b5e9e6e35 100644
--- a/core/camel-core-engine/src/main/docs/modules/eips/pages/topic-eip.adoc
+++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/topicLoadBalancer-eip.adoc
@@ -1,6 +1,6 @@
-= Topic EIP
-:doctitle: Topic
-:shortname: topic
+= Topic Load Balancer EIP
+:doctitle: Topic Load Balancer
+:shortname: topicLoadBalancer
:description: Topic which sends to all destinations.
:since:
:supportlevel: Stable
@@ -48,7 +48,7 @@ XML::
<route>
<from uri="direct:start"/>
<loadBalance>
- <topic/>
+ <topicLoadBalancer/>
<to uri="seda:x"/>
<to uri="seda:y"/>
<to uri="seda:z"/>
@@ -56,4 +56,4 @@ XML::
</route>
----
-====
\ No newline at end of file
+====
diff --git a/core/camel-core-engine/src/main/docs/modules/eips/pages/weighted-eip.adoc b/core/camel-core-engine/src/main/docs/modules/eips/pages/weightedLoadBalancer-eip.adoc
similarity index 88%
rename from core/camel-core-engine/src/main/docs/modules/eips/pages/weighted-eip.adoc
rename to core/camel-core-engine/src/main/docs/modules/eips/pages/weightedLoadBalancer-eip.adoc
index 3c9510f165c..d88a31a66ca 100644
--- a/core/camel-core-engine/src/main/docs/modules/eips/pages/weighted-eip.adoc
+++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/weightedLoadBalancer-eip.adoc
@@ -1,6 +1,6 @@
-= Weighted EIP
-:doctitle: Weighted
-:shortname: weighted
+= Weighted Load Balancer EIP
+:doctitle: Weighted Load Balancer
+:shortname: weightedLoadBalancer
:description: Uses a weighted load distribution ratio for each server with respect to others.
:since:
:supportlevel: Stable
@@ -50,11 +50,11 @@ XML::
<route>
<from uri="direct:start"/>
<loadBalance>
- <weighted distributionRatio="4 2 1"/>
+ <weightedLoadBalancer distributionRatio="4 2 1"/>
<to uri="seda:x"/>
<to uri="seda:y"/>
<to uri="seda:z"/>
</loadBalance>
</route>
----
-====
\ No newline at end of file
+====
diff --git a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/loadBalance.json b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/loadBalance.json
index cde2ee0394c..ce2da300d4e 100644
--- a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/loadBalance.json
+++ b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/loadBalance.json
@@ -15,7 +15,7 @@
"id": { "index": 0, "kind": "attribute", "displayName": "Id", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the id of this node" },
"description": { "index": 1, "kind": "attribute", "displayName": "Description", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the description of this node" },
"disabled": { "index": 2, "kind": "attribute", "displayName": "Disabled", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to disable this EIP from the route during build time. Once an EIP has been disabled then it cannot be enabled later at runtime." },
- "loadBalancerType": { "index": 3, "kind": "element", "displayName": "Load Balancer Type", "group": "common", "required": true, "type": "object", "javaType": "org.apache.camel.model.LoadBalancerDefinition", "oneOf": [ "customLoadBalancer", "failover", "random", "roundRobin", "sticky", "topic", "weighted" ], "deprecated": false, "autowired": false, "secret": false, "description": "The load balancer to be used" },
+ "loadBalancerType": { "index": 3, "kind": "element", "displayName": "Load Balancer Type", "group": "common", "required": true, "type": "object", "javaType": "org.apache.camel.model.LoadBalancerDefinition", "oneOf": [ "customLoadBalancer", "failoverLoadBalancer", "randomLoadBalancer", "roundRobinLoadBalancer", "stickyLoadBalancer", "topicLoadBalancer", "weightedLoadBalancer" ], "deprecated": false, "autowired": false, "secret": false, "description": "The load balancer to be used" },
"outputs": { "index": 4, "kind": "element", "displayName": "Outputs", "group": "common", "required": true, "type": "array", "javaType": "java.util.List", "oneOf": [ "aggregate", "bean", "choice", "circuitBreaker", "claimCheck", "convertBodyTo", "convertHeaderTo", "convertVariableTo", "delay", "doCatch", "doFinally", "doTry", "dynamicRouter", "enrich", "filter", "idempotentConsumer", "intercept", "interceptFrom", "interceptSendToEndpoint", "kamelet", "loadBalance", "log", "loop", "mar [...]
"inheritErrorHandler": { "index": 5, "kind": "attribute", "displayName": "Inherit Error Handler", "group": "common", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Sets whether or not to inherit the configured error handler. The default value is true. You can use this to disable using the inherited error handler for a given DSL such as a load balancer where you wan [...]
}
diff --git a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/loadbalancer/failover.json b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/loadbalancer/failoverLoadBalancer.json
similarity index 97%
rename from core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/loadbalancer/failover.json
rename to core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/loadbalancer/failoverLoadBalancer.json
index 242e3d74542..ac052a46177 100644
--- a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/loadbalancer/failover.json
+++ b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/loadbalancer/failoverLoadBalancer.json
@@ -1,8 +1,8 @@
{
"model": {
"kind": "model",
- "name": "failover",
- "title": "Failover",
+ "name": "failoverLoadBalancer",
+ "title": "Failover Load Balancer",
"description": "In case of failures the exchange will be tried on the next endpoint.",
"deprecated": false,
"label": "eip,routing",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/random.json b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/loadbalancer/randomLoadBalancer.json
similarity index 89%
rename from catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/random.json
rename to core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/loadbalancer/randomLoadBalancer.json
index 001036350fb..b69168d729f 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/random.json
+++ b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/loadbalancer/randomLoadBalancer.json
@@ -1,8 +1,8 @@
{
"model": {
"kind": "model",
- "name": "random",
- "title": "Random",
+ "name": "randomLoadBalancer",
+ "title": "Random Load Balancer",
"description": "The destination endpoints are selected randomly.",
"deprecated": false,
"label": "eip,routing",
diff --git a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/loadbalancer/roundRobin.json b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/loadbalancer/roundRobinLoadBalancer.json
similarity index 89%
rename from core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/loadbalancer/roundRobin.json
rename to core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/loadbalancer/roundRobinLoadBalancer.json
index cb289a4cf80..b589a5cb26e 100644
--- a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/loadbalancer/roundRobin.json
+++ b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/loadbalancer/roundRobinLoadBalancer.json
@@ -1,8 +1,8 @@
{
"model": {
"kind": "model",
- "name": "roundRobin",
- "title": "Round Robin",
+ "name": "roundRobinLoadBalancer",
+ "title": "Round Robin Load Balancer",
"description": "The destination endpoints are selected in a round-robin fashion. This is a well-known and classic policy, which spreads the load evenly.",
"deprecated": false,
"label": "eip,routing",
diff --git a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/loadbalancer/sticky.json b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/loadbalancer/stickyLoadBalancer.json
similarity index 94%
rename from core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/loadbalancer/sticky.json
rename to core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/loadbalancer/stickyLoadBalancer.json
index 121ce0f7159..8d0569aadfc 100644
--- a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/loadbalancer/sticky.json
+++ b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/loadbalancer/stickyLoadBalancer.json
@@ -1,8 +1,8 @@
{
"model": {
"kind": "model",
- "name": "sticky",
- "title": "Sticky",
+ "name": "stickyLoadBalancer",
+ "title": "Sticky Load Balancer",
"description": "Sticky load balancing using an expression to calculate a correlation key to perform the sticky load balancing.",
"deprecated": false,
"label": "eip,routing",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/topic.json b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/loadbalancer/topicLoadBalancer.json
similarity index 89%
rename from catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/topic.json
rename to core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/loadbalancer/topicLoadBalancer.json
index 7070f1d288b..ba975d129fb 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/topic.json
+++ b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/loadbalancer/topicLoadBalancer.json
@@ -1,8 +1,8 @@
{
"model": {
"kind": "model",
- "name": "topic",
- "title": "Topic",
+ "name": "topicLoadBalancer",
+ "title": "Topic Load Balancer",
"description": "Topic which sends to all destinations.",
"deprecated": false,
"label": "eip,routing",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/weighted.json b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/loadbalancer/weightedLoadBalancer.json
similarity index 96%
rename from catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/weighted.json
rename to core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/loadbalancer/weightedLoadBalancer.json
index 8a31ae21cae..e0fe2118cab 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/weighted.json
+++ b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/loadbalancer/weightedLoadBalancer.json
@@ -1,8 +1,8 @@
{
"model": {
"kind": "model",
- "name": "weighted",
- "title": "Weighted",
+ "name": "weightedLoadBalancer",
+ "title": "Weighted Load Balancer",
"description": "Uses a weighted load distribution ratio for each server with respect to others.",
"deprecated": false,
"label": "eip,routing",
diff --git a/core/camel-core-model/src/generated/resources/META-INF/services/org/apache/camel/model.properties b/core/camel-core-model/src/generated/resources/META-INF/services/org/apache/camel/model.properties
index b56f5bb3a42..062cb6455b5 100644
--- a/core/camel-core-model/src/generated/resources/META-INF/services/org/apache/camel/model.properties
+++ b/core/camel-core-model/src/generated/resources/META-INF/services/org/apache/camel/model.properties
@@ -48,7 +48,7 @@ enrich
errorHandler
exchangeProperty
expression
-failover
+failoverLoadBalancer
faultToleranceConfiguration
fhirJson
fhirXml
@@ -124,7 +124,7 @@ propertyExpression
protobuf
put
python
-random
+randomLoadBalancer
recipientList
redeliveryPolicy
ref
@@ -146,7 +146,7 @@ restProperty
rests
resumable
rollback
-roundRobin
+roundRobinLoadBalancer
route
routeBuilder
routeConfiguration
@@ -185,7 +185,7 @@ split
springTransactionErrorHandler
staticServiceDiscovery
step
-sticky
+stickyLoadBalancer
stop
streamConfig
swiftMt
@@ -205,7 +205,7 @@ tidyMarkup
to
toD
tokenize
-topic
+topicLoadBalancer
transacted
transform
transformers
@@ -220,7 +220,7 @@ validators
value
variable
wasm
-weighted
+weightedLoadBalancer
when
whenSkipSendToEndpoint
wireTap
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/LoadBalanceDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/LoadBalanceDefinition.java
index dd286978a89..e52a9630940 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/LoadBalanceDefinition.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/LoadBalanceDefinition.java
@@ -47,12 +47,12 @@ import org.apache.camel.spi.Metadata;
public class LoadBalanceDefinition extends OutputDefinition<LoadBalanceDefinition> {
@XmlElements({
@XmlElement(name = "customLoadBalancer", type = CustomLoadBalancerDefinition.class),
- @XmlElement(name = "failover", type = FailoverLoadBalancerDefinition.class),
- @XmlElement(name = "random", type = RandomLoadBalancerDefinition.class),
- @XmlElement(name = "roundRobin", type = RoundRobinLoadBalancerDefinition.class),
- @XmlElement(name = "sticky", type = StickyLoadBalancerDefinition.class),
- @XmlElement(name = "topic", type = TopicLoadBalancerDefinition.class),
- @XmlElement(name = "weighted", type = WeightedLoadBalancerDefinition.class) })
+ @XmlElement(name = "failoverLoadBalancer", type = FailoverLoadBalancerDefinition.class),
+ @XmlElement(name = "randomLoadBalancer", type = RandomLoadBalancerDefinition.class),
+ @XmlElement(name = "roundRobinLoadBalancer", type = RoundRobinLoadBalancerDefinition.class),
+ @XmlElement(name = "stickyLoadBalancer", type = StickyLoadBalancerDefinition.class),
+ @XmlElement(name = "topicLoadBalancer", type = TopicLoadBalancerDefinition.class),
+ @XmlElement(name = "weightedLoadBalancer", type = WeightedLoadBalancerDefinition.class) })
private LoadBalancerDefinition loadBalancerType;
public LoadBalanceDefinition() {
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/loadbalancer/FailoverLoadBalancerDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/loadbalancer/FailoverLoadBalancerDefinition.java
index ec6e5c0cf4e..b9a614f3874 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/loadbalancer/FailoverLoadBalancerDefinition.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/loadbalancer/FailoverLoadBalancerDefinition.java
@@ -33,7 +33,7 @@ import org.apache.camel.spi.Metadata;
* In case of failures the exchange will be tried on the next endpoint.
*/
@Metadata(label = "eip,routing")
-@XmlRootElement(name = "failover")
+@XmlRootElement(name = "failoverLoadBalancer")
@XmlAccessorType(XmlAccessType.FIELD)
public class FailoverLoadBalancerDefinition extends LoadBalancerDefinition {
@XmlTransient
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/loadbalancer/RandomLoadBalancerDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/loadbalancer/RandomLoadBalancerDefinition.java
index 54f8c4dff1a..b4792516f87 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/loadbalancer/RandomLoadBalancerDefinition.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/loadbalancer/RandomLoadBalancerDefinition.java
@@ -27,7 +27,7 @@ import org.apache.camel.spi.Metadata;
* The destination endpoints are selected randomly.
*/
@Metadata(label = "eip,routing")
-@XmlRootElement(name = "random")
+@XmlRootElement(name = "randomLoadBalancer")
@XmlAccessorType(XmlAccessType.FIELD)
public class RandomLoadBalancerDefinition extends LoadBalancerDefinition {
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/loadbalancer/RoundRobinLoadBalancerDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/loadbalancer/RoundRobinLoadBalancerDefinition.java
index 45f07a60d1f..6f5115f31a8 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/loadbalancer/RoundRobinLoadBalancerDefinition.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/loadbalancer/RoundRobinLoadBalancerDefinition.java
@@ -28,7 +28,7 @@ import org.apache.camel.spi.Metadata;
* spreads the load evenly.
*/
@Metadata(label = "eip,routing")
-@XmlRootElement(name = "roundRobin")
+@XmlRootElement(name = "roundRobinLoadBalancer")
@XmlAccessorType(XmlAccessType.FIELD)
public class RoundRobinLoadBalancerDefinition extends LoadBalancerDefinition {
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/loadbalancer/StickyLoadBalancerDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/loadbalancer/StickyLoadBalancerDefinition.java
index cd8fa9292bd..d4cac94195f 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/loadbalancer/StickyLoadBalancerDefinition.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/loadbalancer/StickyLoadBalancerDefinition.java
@@ -32,7 +32,7 @@ import org.apache.camel.spi.Metadata;
* Sticky load balancing using an expression to calculate a correlation key to perform the sticky load balancing.
*/
@Metadata(label = "eip,routing")
-@XmlRootElement(name = "sticky")
+@XmlRootElement(name = "stickyLoadBalancer")
@XmlAccessorType(XmlAccessType.FIELD)
public class StickyLoadBalancerDefinition extends LoadBalancerDefinition {
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/loadbalancer/TopicLoadBalancerDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/loadbalancer/TopicLoadBalancerDefinition.java
index 589b45b408e..24289cfa4bc 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/loadbalancer/TopicLoadBalancerDefinition.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/loadbalancer/TopicLoadBalancerDefinition.java
@@ -27,7 +27,7 @@ import org.apache.camel.spi.Metadata;
* Topic which sends to all destinations.
*/
@Metadata(label = "eip,routing")
-@XmlRootElement(name = "topic")
+@XmlRootElement(name = "topicLoadBalancer")
@XmlAccessorType(XmlAccessType.FIELD)
public class TopicLoadBalancerDefinition extends LoadBalancerDefinition {
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/loadbalancer/WeightedLoadBalancerDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/loadbalancer/WeightedLoadBalancerDefinition.java
index 6b336a49ab9..cd2df8d14f8 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/loadbalancer/WeightedLoadBalancerDefinition.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/loadbalancer/WeightedLoadBalancerDefinition.java
@@ -28,7 +28,7 @@ import org.apache.camel.spi.Metadata;
* Uses a weighted load distribution ratio for each server with respect to others.
*/
@Metadata(label = "eip,routing")
-@XmlRootElement(name = "weighted")
+@XmlRootElement(name = "weightedLoadBalancer")
@XmlAccessorType(XmlAccessType.FIELD)
public class WeightedLoadBalancerDefinition extends LoadBalancerDefinition {
diff --git a/core/camel-core/src/test/resources/org/apache/camel/model/routeWithFailoverLoadBalance.xml b/core/camel-core/src/test/resources/org/apache/camel/model/routeWithFailoverLoadBalance.xml
index 0df7b274803..b362eb50e48 100644
--- a/core/camel-core/src/test/resources/org/apache/camel/model/routeWithFailoverLoadBalance.xml
+++ b/core/camel-core/src/test/resources/org/apache/camel/model/routeWithFailoverLoadBalance.xml
@@ -21,10 +21,10 @@
<route>
<from uri="seda:a"/>
<loadBalance>
- <failover>
+ <failoverLoadBalancer>
<exception>java.io.IOException</exception>
<exception>java.text.ParseException</exception>
- </failover>
+ </failoverLoadBalancer>
<to uri="seda:b"/>
<to uri="seda:c"/>
<to uri="seda:d"/>
diff --git a/core/camel-core/src/test/resources/org/apache/camel/model/routeWithLoadBalance.xml b/core/camel-core/src/test/resources/org/apache/camel/model/routeWithLoadBalance.xml
index 5eab2263bcc..5170d55f34a 100644
--- a/core/camel-core/src/test/resources/org/apache/camel/model/routeWithLoadBalance.xml
+++ b/core/camel-core/src/test/resources/org/apache/camel/model/routeWithLoadBalance.xml
@@ -21,7 +21,7 @@
<route>
<from uri="seda:a"/>
<loadBalance>
- <roundRobin/>
+ <roundRobinLoadBalancer/>
<to uri="seda:b"/>
<to uri="seda:c"/>
<to uri="seda:d"/>
diff --git a/core/camel-core/src/test/resources/org/apache/camel/model/routeWithRandomLoadBalance.xml b/core/camel-core/src/test/resources/org/apache/camel/model/routeWithRandomLoadBalance.xml
index de26430fad1..0cbe11e2f2c 100644
--- a/core/camel-core/src/test/resources/org/apache/camel/model/routeWithRandomLoadBalance.xml
+++ b/core/camel-core/src/test/resources/org/apache/camel/model/routeWithRandomLoadBalance.xml
@@ -21,7 +21,7 @@
<route>
<from uri="seda:a"/>
<loadBalance>
- <random/>
+ <randomLoadBalancer/>
<to uri="seda:b"/>
<to uri="seda:c"/>
<to uri="seda:d"/>
diff --git a/core/camel-core/src/test/resources/org/apache/camel/model/routeWithStickyLoadBalance.xml b/core/camel-core/src/test/resources/org/apache/camel/model/routeWithStickyLoadBalance.xml
index f8b0e79025f..df18c216fa1 100644
--- a/core/camel-core/src/test/resources/org/apache/camel/model/routeWithStickyLoadBalance.xml
+++ b/core/camel-core/src/test/resources/org/apache/camel/model/routeWithStickyLoadBalance.xml
@@ -21,11 +21,11 @@
<route>
<from uri="seda:a"/>
<loadBalance>
- <sticky>
+ <stickyLoadBalancer>
<correlationExpression>
<language language="juel">in.header.foo == 'bar'</language>
</correlationExpression>
- </sticky>
+ </stickyLoadBalancer>
<to uri="seda:b"/>
<to uri="seda:c"/>
<to uri="seda:d"/>
diff --git a/core/camel-core/src/test/resources/org/apache/camel/model/routeWithTopicLoadBalance.xml b/core/camel-core/src/test/resources/org/apache/camel/model/routeWithTopicLoadBalance.xml
index 5ade532502f..0c543845e94 100644
--- a/core/camel-core/src/test/resources/org/apache/camel/model/routeWithTopicLoadBalance.xml
+++ b/core/camel-core/src/test/resources/org/apache/camel/model/routeWithTopicLoadBalance.xml
@@ -21,7 +21,7 @@
<route>
<from uri="seda:a"/>
<loadBalance>
- <topic/>
+ <topicLoadBalancer/>
<to uri="seda:b"/>
<to uri="seda:c"/>
<to uri="seda:d"/>
diff --git a/core/camel-xml-io/src/generated/java/org/apache/camel/xml/in/ModelParser.java b/core/camel-xml-io/src/generated/java/org/apache/camel/xml/in/ModelParser.java
index 5564146cccc..625fb53648a 100644
--- a/core/camel-xml-io/src/generated/java/org/apache/camel/xml/in/ModelParser.java
+++ b/core/camel-xml-io/src/generated/java/org/apache/camel/xml/in/ModelParser.java
@@ -473,12 +473,12 @@ public class ModelParser extends BaseParser {
protected LoadBalanceDefinition doParseLoadBalanceDefinition() throws IOException, XmlPullParserException {
return doParse(new LoadBalanceDefinition(), processorDefinitionAttributeHandler(), (def, key) -> switch (key) {
case "customLoadBalancer": def.setLoadBalancerType(doParseCustomLoadBalancerDefinition()); yield true;
- case "failover": def.setLoadBalancerType(doParseFailoverLoadBalancerDefinition()); yield true;
- case "random": def.setLoadBalancerType(doParseRandomLoadBalancerDefinition()); yield true;
- case "roundRobin": def.setLoadBalancerType(doParseRoundRobinLoadBalancerDefinition()); yield true;
- case "sticky": def.setLoadBalancerType(doParseStickyLoadBalancerDefinition()); yield true;
- case "topic": def.setLoadBalancerType(doParseTopicLoadBalancerDefinition()); yield true;
- case "weighted": def.setLoadBalancerType(doParseWeightedLoadBalancerDefinition()); yield true;
+ case "failoverLoadBalancer": def.setLoadBalancerType(doParseFailoverLoadBalancerDefinition()); yield true;
+ case "randomLoadBalancer": def.setLoadBalancerType(doParseRandomLoadBalancerDefinition()); yield true;
+ case "roundRobinLoadBalancer": def.setLoadBalancerType(doParseRoundRobinLoadBalancerDefinition()); yield true;
+ case "stickyLoadBalancer": def.setLoadBalancerType(doParseStickyLoadBalancerDefinition()); yield true;
+ case "topicLoadBalancer": def.setLoadBalancerType(doParseTopicLoadBalancerDefinition()); yield true;
+ case "weightedLoadBalancer": def.setLoadBalancerType(doParseWeightedLoadBalancerDefinition()); yield true;
default: yield outputDefinitionElementHandler().accept(def, key);
}, noValueHandler());
}
diff --git a/core/camel-xml-io/src/generated/java/org/apache/camel/xml/out/ModelWriter.java b/core/camel-xml-io/src/generated/java/org/apache/camel/xml/out/ModelWriter.java
index ab7fd692995..2cca764f818 100644
--- a/core/camel-xml-io/src/generated/java/org/apache/camel/xml/out/ModelWriter.java
+++ b/core/camel-xml-io/src/generated/java/org/apache/camel/xml/out/ModelWriter.java
@@ -664,22 +664,22 @@ public class ModelWriter extends BaseWriter {
doWriteCustomLoadBalancerDefinition("customLoadBalancer", def);
}
public void writeFailoverLoadBalancerDefinition(FailoverLoadBalancerDefinition def) throws IOException {
- doWriteFailoverLoadBalancerDefinition("failover", def);
+ doWriteFailoverLoadBalancerDefinition("failoverLoadBalancer", def);
}
public void writeRandomLoadBalancerDefinition(RandomLoadBalancerDefinition def) throws IOException {
- doWriteRandomLoadBalancerDefinition("random", def);
+ doWriteRandomLoadBalancerDefinition("randomLoadBalancer", def);
}
public void writeRoundRobinLoadBalancerDefinition(RoundRobinLoadBalancerDefinition def) throws IOException {
- doWriteRoundRobinLoadBalancerDefinition("roundRobin", def);
+ doWriteRoundRobinLoadBalancerDefinition("roundRobinLoadBalancer", def);
}
public void writeStickyLoadBalancerDefinition(StickyLoadBalancerDefinition def) throws IOException {
- doWriteStickyLoadBalancerDefinition("sticky", def);
+ doWriteStickyLoadBalancerDefinition("stickyLoadBalancer", def);
}
public void writeTopicLoadBalancerDefinition(TopicLoadBalancerDefinition def) throws IOException {
- doWriteTopicLoadBalancerDefinition("topic", def);
+ doWriteTopicLoadBalancerDefinition("topicLoadBalancer", def);
}
public void writeWeightedLoadBalancerDefinition(WeightedLoadBalancerDefinition def) throws IOException {
- doWriteWeightedLoadBalancerDefinition("weighted", def);
+ doWriteWeightedLoadBalancerDefinition("weightedLoadBalancer", def);
}
public void writeApiKeyDefinition(ApiKeyDefinition def) throws IOException {
doWriteApiKeyDefinition("apiKey", def);
@@ -1080,12 +1080,12 @@ public class ModelWriter extends BaseWriter {
doWriteElement(null, def.getLoadBalancerType(), (n, v) -> {
switch (v.getClass().getSimpleName()) {
case "CustomLoadBalancerDefinition" -> doWriteCustomLoadBalancerDefinition("customLoadBalancer", (CustomLoadBalancerDefinition) v);
- case "FailoverLoadBalancerDefinition" -> doWriteFailoverLoadBalancerDefinition("failover", (FailoverLoadBalancerDefinition) v);
- case "RandomLoadBalancerDefinition" -> doWriteRandomLoadBalancerDefinition("random", (RandomLoadBalancerDefinition) v);
- case "RoundRobinLoadBalancerDefinition" -> doWriteRoundRobinLoadBalancerDefinition("roundRobin", (RoundRobinLoadBalancerDefinition) v);
- case "StickyLoadBalancerDefinition" -> doWriteStickyLoadBalancerDefinition("sticky", (StickyLoadBalancerDefinition) v);
- case "TopicLoadBalancerDefinition" -> doWriteTopicLoadBalancerDefinition("topic", (TopicLoadBalancerDefinition) v);
- case "WeightedLoadBalancerDefinition" -> doWriteWeightedLoadBalancerDefinition("weighted", (WeightedLoadBalancerDefinition) v);
+ case "FailoverLoadBalancerDefinition" -> doWriteFailoverLoadBalancerDefinition("failoverLoadBalancer", (FailoverLoadBalancerDefinition) v);
+ case "RandomLoadBalancerDefinition" -> doWriteRandomLoadBalancerDefinition("randomLoadBalancer", (RandomLoadBalancerDefinition) v);
+ case "RoundRobinLoadBalancerDefinition" -> doWriteRoundRobinLoadBalancerDefinition("roundRobinLoadBalancer", (RoundRobinLoadBalancerDefinition) v);
+ case "StickyLoadBalancerDefinition" -> doWriteStickyLoadBalancerDefinition("stickyLoadBalancer", (StickyLoadBalancerDefinition) v);
+ case "TopicLoadBalancerDefinition" -> doWriteTopicLoadBalancerDefinition("topicLoadBalancer", (TopicLoadBalancerDefinition) v);
+ case "WeightedLoadBalancerDefinition" -> doWriteWeightedLoadBalancerDefinition("weightedLoadBalancer", (WeightedLoadBalancerDefinition) v);
}
});
doWriteList(null, null, def.getOutputs(), this::doWriteProcessorDefinitionRef);
diff --git a/core/camel-xml-io/src/test/resources/routeWithFailoverLoadBalance.xml b/core/camel-xml-io/src/test/resources/routeWithFailoverLoadBalance.xml
index 0df7b274803..b362eb50e48 100644
--- a/core/camel-xml-io/src/test/resources/routeWithFailoverLoadBalance.xml
+++ b/core/camel-xml-io/src/test/resources/routeWithFailoverLoadBalance.xml
@@ -21,10 +21,10 @@
<route>
<from uri="seda:a"/>
<loadBalance>
- <failover>
+ <failoverLoadBalancer>
<exception>java.io.IOException</exception>
<exception>java.text.ParseException</exception>
- </failover>
+ </failoverLoadBalancer>
<to uri="seda:b"/>
<to uri="seda:c"/>
<to uri="seda:d"/>
diff --git a/core/camel-xml-io/src/test/resources/routeWithLoadBalance.xml b/core/camel-xml-io/src/test/resources/routeWithLoadBalance.xml
index 5eab2263bcc..5170d55f34a 100644
--- a/core/camel-xml-io/src/test/resources/routeWithLoadBalance.xml
+++ b/core/camel-xml-io/src/test/resources/routeWithLoadBalance.xml
@@ -21,7 +21,7 @@
<route>
<from uri="seda:a"/>
<loadBalance>
- <roundRobin/>
+ <roundRobinLoadBalancer/>
<to uri="seda:b"/>
<to uri="seda:c"/>
<to uri="seda:d"/>
diff --git a/core/camel-xml-io/src/test/resources/routeWithRandomLoadBalance.xml b/core/camel-xml-io/src/test/resources/routeWithRandomLoadBalance.xml
index de26430fad1..0cbe11e2f2c 100644
--- a/core/camel-xml-io/src/test/resources/routeWithRandomLoadBalance.xml
+++ b/core/camel-xml-io/src/test/resources/routeWithRandomLoadBalance.xml
@@ -21,7 +21,7 @@
<route>
<from uri="seda:a"/>
<loadBalance>
- <random/>
+ <randomLoadBalancer/>
<to uri="seda:b"/>
<to uri="seda:c"/>
<to uri="seda:d"/>
diff --git a/core/camel-xml-io/src/test/resources/routeWithStickyLoadBalance.xml b/core/camel-xml-io/src/test/resources/routeWithStickyLoadBalance.xml
index f8b0e79025f..df18c216fa1 100644
--- a/core/camel-xml-io/src/test/resources/routeWithStickyLoadBalance.xml
+++ b/core/camel-xml-io/src/test/resources/routeWithStickyLoadBalance.xml
@@ -21,11 +21,11 @@
<route>
<from uri="seda:a"/>
<loadBalance>
- <sticky>
+ <stickyLoadBalancer>
<correlationExpression>
<language language="juel">in.header.foo == 'bar'</language>
</correlationExpression>
- </sticky>
+ </stickyLoadBalancer>
<to uri="seda:b"/>
<to uri="seda:c"/>
<to uri="seda:d"/>
diff --git a/core/camel-xml-io/src/test/resources/routeWithTopicLoadBalance.xml b/core/camel-xml-io/src/test/resources/routeWithTopicLoadBalance.xml
index 5ade532502f..0c543845e94 100644
--- a/core/camel-xml-io/src/test/resources/routeWithTopicLoadBalance.xml
+++ b/core/camel-xml-io/src/test/resources/routeWithTopicLoadBalance.xml
@@ -21,7 +21,7 @@
<route>
<from uri="seda:a"/>
<loadBalance>
- <topic/>
+ <topicLoadBalancer/>
<to uri="seda:b"/>
<to uri="seda:c"/>
<to uri="seda:d"/>
diff --git a/core/camel-yaml-io/src/generated/java/org/apache/camel/yaml/out/ModelWriter.java b/core/camel-yaml-io/src/generated/java/org/apache/camel/yaml/out/ModelWriter.java
index be92572e81c..45fe2a09adb 100644
--- a/core/camel-yaml-io/src/generated/java/org/apache/camel/yaml/out/ModelWriter.java
+++ b/core/camel-yaml-io/src/generated/java/org/apache/camel/yaml/out/ModelWriter.java
@@ -664,22 +664,22 @@ public class ModelWriter extends BaseWriter {
doWriteCustomLoadBalancerDefinition("customLoadBalancer", def);
}
public void writeFailoverLoadBalancerDefinition(FailoverLoadBalancerDefinition def) throws IOException {
- doWriteFailoverLoadBalancerDefinition("failover", def);
+ doWriteFailoverLoadBalancerDefinition("failoverLoadBalancer", def);
}
public void writeRandomLoadBalancerDefinition(RandomLoadBalancerDefinition def) throws IOException {
- doWriteRandomLoadBalancerDefinition("random", def);
+ doWriteRandomLoadBalancerDefinition("randomLoadBalancer", def);
}
public void writeRoundRobinLoadBalancerDefinition(RoundRobinLoadBalancerDefinition def) throws IOException {
- doWriteRoundRobinLoadBalancerDefinition("roundRobin", def);
+ doWriteRoundRobinLoadBalancerDefinition("roundRobinLoadBalancer", def);
}
public void writeStickyLoadBalancerDefinition(StickyLoadBalancerDefinition def) throws IOException {
- doWriteStickyLoadBalancerDefinition("sticky", def);
+ doWriteStickyLoadBalancerDefinition("stickyLoadBalancer", def);
}
public void writeTopicLoadBalancerDefinition(TopicLoadBalancerDefinition def) throws IOException {
- doWriteTopicLoadBalancerDefinition("topic", def);
+ doWriteTopicLoadBalancerDefinition("topicLoadBalancer", def);
}
public void writeWeightedLoadBalancerDefinition(WeightedLoadBalancerDefinition def) throws IOException {
- doWriteWeightedLoadBalancerDefinition("weighted", def);
+ doWriteWeightedLoadBalancerDefinition("weightedLoadBalancer", def);
}
public void writeApiKeyDefinition(ApiKeyDefinition def) throws IOException {
doWriteApiKeyDefinition("apiKey", def);
@@ -1080,12 +1080,12 @@ public class ModelWriter extends BaseWriter {
doWriteElement(null, def.getLoadBalancerType(), (n, v) -> {
switch (v.getClass().getSimpleName()) {
case "CustomLoadBalancerDefinition" -> doWriteCustomLoadBalancerDefinition("customLoadBalancer", (CustomLoadBalancerDefinition) v);
- case "FailoverLoadBalancerDefinition" -> doWriteFailoverLoadBalancerDefinition("failover", (FailoverLoadBalancerDefinition) v);
- case "RandomLoadBalancerDefinition" -> doWriteRandomLoadBalancerDefinition("random", (RandomLoadBalancerDefinition) v);
- case "RoundRobinLoadBalancerDefinition" -> doWriteRoundRobinLoadBalancerDefinition("roundRobin", (RoundRobinLoadBalancerDefinition) v);
- case "StickyLoadBalancerDefinition" -> doWriteStickyLoadBalancerDefinition("sticky", (StickyLoadBalancerDefinition) v);
- case "TopicLoadBalancerDefinition" -> doWriteTopicLoadBalancerDefinition("topic", (TopicLoadBalancerDefinition) v);
- case "WeightedLoadBalancerDefinition" -> doWriteWeightedLoadBalancerDefinition("weighted", (WeightedLoadBalancerDefinition) v);
+ case "FailoverLoadBalancerDefinition" -> doWriteFailoverLoadBalancerDefinition("failoverLoadBalancer", (FailoverLoadBalancerDefinition) v);
+ case "RandomLoadBalancerDefinition" -> doWriteRandomLoadBalancerDefinition("randomLoadBalancer", (RandomLoadBalancerDefinition) v);
+ case "RoundRobinLoadBalancerDefinition" -> doWriteRoundRobinLoadBalancerDefinition("roundRobinLoadBalancer", (RoundRobinLoadBalancerDefinition) v);
+ case "StickyLoadBalancerDefinition" -> doWriteStickyLoadBalancerDefinition("stickyLoadBalancer", (StickyLoadBalancerDefinition) v);
+ case "TopicLoadBalancerDefinition" -> doWriteTopicLoadBalancerDefinition("topicLoadBalancer", (TopicLoadBalancerDefinition) v);
+ case "WeightedLoadBalancerDefinition" -> doWriteWeightedLoadBalancerDefinition("weightedLoadBalancer", (WeightedLoadBalancerDefinition) v);
}
});
doWriteList(null, null, def.getOutputs(), this::doWriteProcessorDefinitionRef);
diff --git a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_7.adoc b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_7.adoc
index 17db7a4f4da..2f6577738ee 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_7.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_7.adoc
@@ -10,6 +10,56 @@ from both 4.0 to 4.1 and 4.1 to 4.2.
Add default values to `ThrottlingExceptionRoutePolicy` route policy.
+=== DSL
+
+The Load Balancer EIP has aligned naming and the following balancers has been renamed in XML and YAML DSL:
+
+|===
+|*Old Name* |*New Name*
+
+| failOver | failOverLoadBalancer
+| random | randomLoadBalancer
+| roundRobin | roundRobinLoadBalancer
+| sticky | stickyLoadBalancer
+| topic | topicLoadBalancer
+| weighted | weightedLoadBalancer
+|===
+
+For example in XML you need to change from:
+
+[source,xml]
+----
+<route>
+ <from uri="direct:start"/>
+ <loadBalance>
+ <failover>
+ <exception>java.io.IOException</exception>
+ </failover>
+ <to uri="direct:x"/>
+ <to uri="direct:y"/>
+ <to uri="direct:z"/>
+ </loadBalance>
+</route>
+----
+
+To:
+
+[source,xml]
+----
+<route>
+ <from uri="direct:start"/>
+ <loadBalance>
+ <failoverLoadBalancer>
+ <exception>java.io.IOException</exception>
+ </failoverLoadBalancer>
+ <to uri="direct:x"/>
+ <to uri="direct:y"/>
+ <to uri="direct:z"/>
+ </loadBalance>
+</route>
+----
+
+
=== camel-spring-security
The `camel-spring-security` component has been updated to improve readiness for Spring Security 7.x. Since Spring Security 5.8 the `AccessDecisionManager` interface and the related cooperating classes have been deprecated in favor of `AuthorizationManager` based patterns.
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java
index 8296d800a5b..f750c976e37 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java
@@ -5534,10 +5534,13 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
}
@YamlType(
- nodes = "failover",
+ nodes = {
+ "failover-load-balancer",
+ "failoverLoadBalancer"
+ },
types = org.apache.camel.model.loadbalancer.FailoverLoadBalancerDefinition.class,
order = org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1,
- displayName = "Failover",
+ displayName = "Failover Load Balancer",
description = "In case of failures the exchange will be tried on the next endpoint.",
deprecated = false,
properties = {
@@ -8869,15 +8872,15 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
@YamlProperty(name = "customLoadBalancer", type = "object:org.apache.camel.model.loadbalancer.CustomLoadBalancerDefinition", oneOf = "loadBalancerType"),
@YamlProperty(name = "description", type = "string", description = "Sets the description of this node", displayName = "Description"),
@YamlProperty(name = "disabled", type = "boolean", description = "Whether to disable this EIP from the route during build time. Once an EIP has been disabled then it cannot be enabled later at runtime.", displayName = "Disabled"),
- @YamlProperty(name = "failover", type = "object:org.apache.camel.model.loadbalancer.FailoverLoadBalancerDefinition", oneOf = "loadBalancerType"),
+ @YamlProperty(name = "failoverLoadBalancer", type = "object:org.apache.camel.model.loadbalancer.FailoverLoadBalancerDefinition", oneOf = "loadBalancerType"),
@YamlProperty(name = "id", type = "string", description = "Sets the id of this node", displayName = "Id"),
@YamlProperty(name = "inheritErrorHandler", type = "boolean", description = "Sets whether or not to inherit the configured error handler. The default value is true. You can use this to disable using the inherited error handler for a given DSL such as a load balancer where you want to use a custom error handler strategy.", displayName = "Inherit Error Handler"),
- @YamlProperty(name = "random", type = "object:org.apache.camel.model.loadbalancer.RandomLoadBalancerDefinition", oneOf = "loadBalancerType"),
- @YamlProperty(name = "roundRobin", type = "object:org.apache.camel.model.loadbalancer.RoundRobinLoadBalancerDefinition", oneOf = "loadBalancerType"),
+ @YamlProperty(name = "randomLoadBalancer", type = "object:org.apache.camel.model.loadbalancer.RandomLoadBalancerDefinition", oneOf = "loadBalancerType"),
+ @YamlProperty(name = "roundRobinLoadBalancer", type = "object:org.apache.camel.model.loadbalancer.RoundRobinLoadBalancerDefinition", oneOf = "loadBalancerType"),
@YamlProperty(name = "steps", type = "array:org.apache.camel.model.ProcessorDefinition"),
- @YamlProperty(name = "sticky", type = "object:org.apache.camel.model.loadbalancer.StickyLoadBalancerDefinition", oneOf = "loadBalancerType"),
- @YamlProperty(name = "topic", type = "object:org.apache.camel.model.loadbalancer.TopicLoadBalancerDefinition", oneOf = "loadBalancerType"),
- @YamlProperty(name = "weighted", type = "object:org.apache.camel.model.loadbalancer.WeightedLoadBalancerDefinition", oneOf = "loadBalancerType")
+ @YamlProperty(name = "stickyLoadBalancer", type = "object:org.apache.camel.model.loadbalancer.StickyLoadBalancerDefinition", oneOf = "loadBalancerType"),
+ @YamlProperty(name = "topicLoadBalancer", type = "object:org.apache.camel.model.loadbalancer.TopicLoadBalancerDefinition", oneOf = "loadBalancerType"),
+ @YamlProperty(name = "weightedLoadBalancer", type = "object:org.apache.camel.model.loadbalancer.WeightedLoadBalancerDefinition", oneOf = "loadBalancerType")
}
)
public static class LoadBalanceDefinitionDeserializer extends YamlDeserializerBase<LoadBalanceDefinition> {
@@ -8915,32 +8918,32 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
target.setLoadBalancerType(val);
break;
}
- case "failover": {
+ case "failoverLoadBalancer": {
org.apache.camel.model.loadbalancer.FailoverLoadBalancerDefinition val = asType(node, org.apache.camel.model.loadbalancer.FailoverLoadBalancerDefinition.class);
target.setLoadBalancerType(val);
break;
}
- case "random": {
+ case "randomLoadBalancer": {
org.apache.camel.model.loadbalancer.RandomLoadBalancerDefinition val = asType(node, org.apache.camel.model.loadbalancer.RandomLoadBalancerDefinition.class);
target.setLoadBalancerType(val);
break;
}
- case "roundRobin": {
+ case "roundRobinLoadBalancer": {
org.apache.camel.model.loadbalancer.RoundRobinLoadBalancerDefinition val = asType(node, org.apache.camel.model.loadbalancer.RoundRobinLoadBalancerDefinition.class);
target.setLoadBalancerType(val);
break;
}
- case "sticky": {
+ case "stickyLoadBalancer": {
org.apache.camel.model.loadbalancer.StickyLoadBalancerDefinition val = asType(node, org.apache.camel.model.loadbalancer.StickyLoadBalancerDefinition.class);
target.setLoadBalancerType(val);
break;
}
- case "topic": {
+ case "topicLoadBalancer": {
org.apache.camel.model.loadbalancer.TopicLoadBalancerDefinition val = asType(node, org.apache.camel.model.loadbalancer.TopicLoadBalancerDefinition.class);
target.setLoadBalancerType(val);
break;
}
- case "weighted": {
+ case "weightedLoadBalancer": {
org.apache.camel.model.loadbalancer.WeightedLoadBalancerDefinition val = asType(node, org.apache.camel.model.loadbalancer.WeightedLoadBalancerDefinition.class);
target.setLoadBalancerType(val);
break;
@@ -12464,10 +12467,13 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
}
@YamlType(
- nodes = "random",
+ nodes = {
+ "random-load-balancer",
+ "randomLoadBalancer"
+ },
types = org.apache.camel.model.loadbalancer.RandomLoadBalancerDefinition.class,
order = org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1,
- displayName = "Random",
+ displayName = "Random Load Balancer",
description = "The destination endpoints are selected randomly.",
deprecated = false,
properties = @YamlProperty(name = "id", type = "string", description = "The id of this node", displayName = "Id")
@@ -14691,12 +14697,12 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
@YamlType(
nodes = {
- "round-robin",
- "roundRobin"
+ "round-robin-load-balancer",
+ "roundRobinLoadBalancer"
},
types = org.apache.camel.model.loadbalancer.RoundRobinLoadBalancerDefinition.class,
order = org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1,
- displayName = "Round Robin",
+ displayName = "Round Robin Load Balancer",
description = "The destination endpoints are selected in a round-robin fashion. This is a well-known and classic policy, which spreads the load evenly.",
deprecated = false,
properties = @YamlProperty(name = "id", type = "string", description = "The id of this node", displayName = "Id")
@@ -17394,10 +17400,13 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
}
@YamlType(
- nodes = "sticky",
+ nodes = {
+ "sticky-load-balancer",
+ "stickyLoadBalancer"
+ },
types = org.apache.camel.model.loadbalancer.StickyLoadBalancerDefinition.class,
order = org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1,
- displayName = "Sticky",
+ displayName = "Sticky Load Balancer",
description = "Sticky load balancing using an expression to calculate a correlation key to perform the sticky load balancing.",
deprecated = false,
properties = {
@@ -18703,10 +18712,13 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
}
@YamlType(
- nodes = "topic",
+ nodes = {
+ "topic-load-balancer",
+ "topicLoadBalancer"
+ },
types = org.apache.camel.model.loadbalancer.TopicLoadBalancerDefinition.class,
order = org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1,
- displayName = "Topic",
+ displayName = "Topic Load Balancer",
description = "Topic which sends to all destinations.",
deprecated = false,
properties = @YamlProperty(name = "id", type = "string", description = "The id of this node", displayName = "Id")
@@ -20189,10 +20201,13 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
}
@YamlType(
- nodes = "weighted",
+ nodes = {
+ "weighted-load-balancer",
+ "weightedLoadBalancer"
+ },
types = org.apache.camel.model.loadbalancer.WeightedLoadBalancerDefinition.class,
order = org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1,
- displayName = "Weighted",
+ displayName = "Weighted Load Balancer",
description = "Uses a weighted load distribution ratio for each server with respect to others.",
deprecated = false,
properties = {
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializersResolver.java b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializersResolver.java
index 9970c40ebdb..c67370ff886 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializersResolver.java
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializersResolver.java
@@ -145,7 +145,8 @@ public final class ModelDeserializersResolver implements YamlDeserializerResolve
case "exchange-property": return new ModelDeserializers.ExchangePropertyExpressionDeserializer();
case "exchangeProperty": return new ModelDeserializers.ExchangePropertyExpressionDeserializer();
case "org.apache.camel.model.language.ExchangePropertyExpression": return new ModelDeserializers.ExchangePropertyExpressionDeserializer();
- case "failover": return new ModelDeserializers.FailoverLoadBalancerDefinitionDeserializer();
+ case "failover-load-balancer": return new ModelDeserializers.FailoverLoadBalancerDefinitionDeserializer();
+ case "failoverLoadBalancer": return new ModelDeserializers.FailoverLoadBalancerDefinitionDeserializer();
case "org.apache.camel.model.loadbalancer.FailoverLoadBalancerDefinition": return new ModelDeserializers.FailoverLoadBalancerDefinitionDeserializer();
case "fault-tolerance-configuration": return new ModelDeserializers.FaultToleranceConfigurationDefinitionDeserializer();
case "faultToleranceConfiguration": return new ModelDeserializers.FaultToleranceConfigurationDefinitionDeserializer();
@@ -328,7 +329,8 @@ public final class ModelDeserializersResolver implements YamlDeserializerResolve
case "org.apache.camel.model.rest.PutDefinition": return new ModelDeserializers.PutDefinitionDeserializer();
case "python": return new ModelDeserializers.PythonExpressionDeserializer();
case "org.apache.camel.model.language.PythonExpression": return new ModelDeserializers.PythonExpressionDeserializer();
- case "random": return new ModelDeserializers.RandomLoadBalancerDefinitionDeserializer();
+ case "random-load-balancer": return new ModelDeserializers.RandomLoadBalancerDefinitionDeserializer();
+ case "randomLoadBalancer": return new ModelDeserializers.RandomLoadBalancerDefinitionDeserializer();
case "org.apache.camel.model.loadbalancer.RandomLoadBalancerDefinition": return new ModelDeserializers.RandomLoadBalancerDefinitionDeserializer();
case "recipient-list": return new ModelDeserializers.RecipientListDefinitionDeserializer();
case "recipientList": return new ModelDeserializers.RecipientListDefinitionDeserializer();
@@ -390,8 +392,8 @@ public final class ModelDeserializersResolver implements YamlDeserializerResolve
case "org.apache.camel.model.ResumableDefinition": return new ModelDeserializers.ResumableDefinitionDeserializer();
case "rollback": return new ModelDeserializers.RollbackDefinitionDeserializer();
case "org.apache.camel.model.RollbackDefinition": return new ModelDeserializers.RollbackDefinitionDeserializer();
- case "round-robin": return new ModelDeserializers.RoundRobinLoadBalancerDefinitionDeserializer();
- case "roundRobin": return new ModelDeserializers.RoundRobinLoadBalancerDefinitionDeserializer();
+ case "round-robin-load-balancer": return new ModelDeserializers.RoundRobinLoadBalancerDefinitionDeserializer();
+ case "roundRobinLoadBalancer": return new ModelDeserializers.RoundRobinLoadBalancerDefinitionDeserializer();
case "org.apache.camel.model.loadbalancer.RoundRobinLoadBalancerDefinition": return new ModelDeserializers.RoundRobinLoadBalancerDefinitionDeserializer();
case "route-builder": return new ModelDeserializers.RouteBuilderDefinitionDeserializer();
case "routeBuilder": return new ModelDeserializers.RouteBuilderDefinitionDeserializer();
@@ -481,7 +483,8 @@ public final class ModelDeserializersResolver implements YamlDeserializerResolve
case "org.apache.camel.model.cloud.StaticServiceCallServiceDiscoveryConfiguration": return new ModelDeserializers.StaticServiceCallServiceDiscoveryConfigurationDeserializer();
case "step": return new ModelDeserializers.StepDefinitionDeserializer();
case "org.apache.camel.model.StepDefinition": return new ModelDeserializers.StepDefinitionDeserializer();
- case "sticky": return new ModelDeserializers.StickyLoadBalancerDefinitionDeserializer();
+ case "sticky-load-balancer": return new ModelDeserializers.StickyLoadBalancerDefinitionDeserializer();
+ case "stickyLoadBalancer": return new ModelDeserializers.StickyLoadBalancerDefinitionDeserializer();
case "org.apache.camel.model.loadbalancer.StickyLoadBalancerDefinition": return new ModelDeserializers.StickyLoadBalancerDefinitionDeserializer();
case "stop": return new ModelDeserializers.StopDefinitionDeserializer();
case "org.apache.camel.model.StopDefinition": return new ModelDeserializers.StopDefinitionDeserializer();
@@ -524,7 +527,8 @@ public final class ModelDeserializersResolver implements YamlDeserializerResolve
case "org.apache.camel.model.ToDynamicDefinition": return new ModelDeserializers.ToDynamicDefinitionDeserializer();
case "tokenize": return new ModelDeserializers.TokenizerExpressionDeserializer();
case "org.apache.camel.model.language.TokenizerExpression": return new ModelDeserializers.TokenizerExpressionDeserializer();
- case "topic": return new ModelDeserializers.TopicLoadBalancerDefinitionDeserializer();
+ case "topic-load-balancer": return new ModelDeserializers.TopicLoadBalancerDefinitionDeserializer();
+ case "topicLoadBalancer": return new ModelDeserializers.TopicLoadBalancerDefinitionDeserializer();
case "org.apache.camel.model.loadbalancer.TopicLoadBalancerDefinition": return new ModelDeserializers.TopicLoadBalancerDefinitionDeserializer();
case "transacted": return new ModelDeserializers.TransactedDefinitionDeserializer();
case "org.apache.camel.model.TransactedDefinition": return new ModelDeserializers.TransactedDefinitionDeserializer();
@@ -559,7 +563,8 @@ public final class ModelDeserializersResolver implements YamlDeserializerResolve
case "org.apache.camel.model.language.VariableExpression": return new ModelDeserializers.VariableExpressionDeserializer();
case "wasm": return new ModelDeserializers.WasmExpressionDeserializer();
case "org.apache.camel.model.language.WasmExpression": return new ModelDeserializers.WasmExpressionDeserializer();
- case "weighted": return new ModelDeserializers.WeightedLoadBalancerDefinitionDeserializer();
+ case "weighted-load-balancer": return new ModelDeserializers.WeightedLoadBalancerDefinitionDeserializer();
+ case "weightedLoadBalancer": return new ModelDeserializers.WeightedLoadBalancerDefinitionDeserializer();
case "org.apache.camel.model.loadbalancer.WeightedLoadBalancerDefinition": return new ModelDeserializers.WeightedLoadBalancerDefinitionDeserializer();
case "when": return new ModelDeserializers.WhenDefinitionDeserializer();
case "org.apache.camel.model.WhenDefinition": return new ModelDeserializers.WhenDefinitionDeserializer();
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camelYamlDsl.json b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camelYamlDsl.json
index 3153dd6ba84..c52e1f747e5 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camelYamlDsl.json
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camelYamlDsl.json
@@ -2491,64 +2491,64 @@
"anyOf" : [ {
"required" : [ "customLoadBalancer" ]
}, {
- "required" : [ "failover" ]
+ "required" : [ "failoverLoadBalancer" ]
}, {
- "required" : [ "random" ]
+ "required" : [ "randomLoadBalancer" ]
}, {
- "required" : [ "roundRobin" ]
+ "required" : [ "roundRobinLoadBalancer" ]
}, {
- "required" : [ "sticky" ]
+ "required" : [ "stickyLoadBalancer" ]
}, {
- "required" : [ "topic" ]
+ "required" : [ "topicLoadBalancer" ]
}, {
- "required" : [ "weighted" ]
+ "required" : [ "weightedLoadBalancer" ]
} ]
}
}, {
"type" : "object",
- "required" : [ "failover" ],
+ "required" : [ "failoverLoadBalancer" ],
"properties" : {
- "failover" : {
+ "failoverLoadBalancer" : {
"$ref" : "#/items/definitions/org.apache.camel.model.loadbalancer.FailoverLoadBalancerDefinition"
}
}
}, {
"type" : "object",
- "required" : [ "random" ],
+ "required" : [ "randomLoadBalancer" ],
"properties" : {
- "random" : {
+ "randomLoadBalancer" : {
"$ref" : "#/items/definitions/org.apache.camel.model.loadbalancer.RandomLoadBalancerDefinition"
}
}
}, {
"type" : "object",
- "required" : [ "roundRobin" ],
+ "required" : [ "roundRobinLoadBalancer" ],
"properties" : {
- "roundRobin" : {
+ "roundRobinLoadBalancer" : {
"$ref" : "#/items/definitions/org.apache.camel.model.loadbalancer.RoundRobinLoadBalancerDefinition"
}
}
}, {
"type" : "object",
- "required" : [ "sticky" ],
+ "required" : [ "stickyLoadBalancer" ],
"properties" : {
- "sticky" : {
+ "stickyLoadBalancer" : {
"$ref" : "#/items/definitions/org.apache.camel.model.loadbalancer.StickyLoadBalancerDefinition"
}
}
}, {
"type" : "object",
- "required" : [ "topic" ],
+ "required" : [ "topicLoadBalancer" ],
"properties" : {
- "topic" : {
+ "topicLoadBalancer" : {
"$ref" : "#/items/definitions/org.apache.camel.model.loadbalancer.TopicLoadBalancerDefinition"
}
}
}, {
"type" : "object",
- "required" : [ "weighted" ],
+ "required" : [ "weightedLoadBalancer" ],
"properties" : {
- "weighted" : {
+ "weightedLoadBalancer" : {
"$ref" : "#/items/definitions/org.apache.camel.model.loadbalancer.WeightedLoadBalancerDefinition"
}
}
@@ -2582,12 +2582,12 @@
}
},
"customLoadBalancer" : { },
- "failover" : { },
- "random" : { },
- "roundRobin" : { },
- "sticky" : { },
- "topic" : { },
- "weighted" : { }
+ "failoverLoadBalancer" : { },
+ "randomLoadBalancer" : { },
+ "roundRobinLoadBalancer" : { },
+ "stickyLoadBalancer" : { },
+ "topicLoadBalancer" : { },
+ "weightedLoadBalancer" : { }
}
},
"org.apache.camel.model.LogDefinition" : {
@@ -13992,7 +13992,7 @@
"required" : [ "ref" ]
},
"org.apache.camel.model.loadbalancer.FailoverLoadBalancerDefinition" : {
- "title" : "Failover",
+ "title" : "Failover Load Balancer",
"description" : "In case of failures the exchange will be tried on the next endpoint.",
"type" : "object",
"additionalProperties" : false,
@@ -14029,7 +14029,7 @@
}
},
"org.apache.camel.model.loadbalancer.RandomLoadBalancerDefinition" : {
- "title" : "Random",
+ "title" : "Random Load Balancer",
"description" : "The destination endpoints are selected randomly.",
"type" : "object",
"additionalProperties" : false,
@@ -14042,7 +14042,7 @@
}
},
"org.apache.camel.model.loadbalancer.RoundRobinLoadBalancerDefinition" : {
- "title" : "Round Robin",
+ "title" : "Round Robin Load Balancer",
"description" : "The destination endpoints are selected in a round-robin fashion. This is a well-known and classic policy, which spreads the load evenly.",
"type" : "object",
"additionalProperties" : false,
@@ -14055,7 +14055,7 @@
}
},
"org.apache.camel.model.loadbalancer.StickyLoadBalancerDefinition" : {
- "title" : "Sticky",
+ "title" : "Sticky Load Balancer",
"description" : "Sticky load balancing using an expression to calculate a correlation key to perform the sticky load balancing.",
"type" : "object",
"additionalProperties" : false,
@@ -14073,7 +14073,7 @@
}
},
"org.apache.camel.model.loadbalancer.TopicLoadBalancerDefinition" : {
- "title" : "Topic",
+ "title" : "Topic Load Balancer",
"description" : "Topic which sends to all destinations.",
"type" : "object",
"additionalProperties" : false,
@@ -14086,7 +14086,7 @@
}
},
"org.apache.camel.model.loadbalancer.WeightedLoadBalancerDefinition" : {
- "title" : "Weighted",
+ "title" : "Weighted Load Balancer",
"description" : "Uses a weighted load distribution ratio for each server with respect to others.",
"type" : "object",
"additionalProperties" : false,
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/LoadBalanceTest.groovy b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/LoadBalanceTest.groovy
index 26262850a73..94abb7d60a5 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/LoadBalanceTest.groovy
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/LoadBalanceTest.groovy
@@ -29,7 +29,7 @@ class LoadBalanceTest extends YamlTestSupport {
uri: "direct:start"
steps:
- loadBalance:
- weighted:
+ weightedLoadBalancer:
distributionRatio: "2,1"
roundRobin: false
steps:
@@ -63,7 +63,7 @@ class LoadBalanceTest extends YamlTestSupport {
uri: "direct:start"
steps:
- load-balance:
- weighted:
+ weightedLoadBalancer:
distributionRatio: "2,1"
roundRobin: false
steps:
@@ -86,7 +86,7 @@ class LoadBalanceTest extends YamlTestSupport {
uri: "direct:start"
steps:
- loadBalance:
- weighted:
+ weightedLoadBalancer:
distribution-ratio: "2,1"
roundRobin: false
steps: