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 d721c47e2507 CAMEL-16861: Update docs
d721c47e2507 is described below
commit d721c47e2507d9f213ba623f283e283c3b7c908f
Author: Claus Ibsen <[email protected]>
AuthorDate: Wed Feb 18 12:30:09 2026 +0100
CAMEL-16861: Update docs
---
.../main/docs/modules/eips/pages/validate-eip.adoc | 44 +++++++++----------
.../eips/pages/weightedLoadBalancer-eip.adoc | 22 +++++++++-
.../main/docs/modules/eips/pages/wireTap-eip.adoc | 51 ++++++++++++++--------
.../apache/camel/model/LoadBalanceDefinition.java | 26 +++++++++--
.../apache/camel/model/ProcessorDefinition.java | 4 +-
.../org/apache/camel/model/ValidateDefinition.java | 4 ++
6 files changed, 103 insertions(+), 48 deletions(-)
diff --git
a/core/camel-core-engine/src/main/docs/modules/eips/pages/validate-eip.adoc
b/core/camel-core-engine/src/main/docs/modules/eips/pages/validate-eip.adoc
index f8943d71685a..893cc6d3525b 100644
--- a/core/camel-core-engine/src/main/docs/modules/eips/pages/validate-eip.adoc
+++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/validate-eip.adoc
@@ -49,9 +49,9 @@ XML::
<route>
<from uri="file:inbox"/>
<validate>
- <simple>${body} regex ^\\w{10}\\,\\d{2}\\,\\w{24}$</simple>
+ <simple>${body} regex '^\\w{10}\\,\\d{2}\\,\\w{24}$'</simple>
</validate>
- <to uri="bean:myServiceBean" method="processLine"/>
+ <to uri="bean:myServiceBean?method=processLine"/>
</route>
----
@@ -59,16 +59,16 @@ YAML::
+
[source,yaml]
----
-- from:
- uri: file:inbox
- steps:
- - validate:
- expression:
- simple: ${body} regex "^\\w{10}\\,\\d{2}\\,\\w{24}$"
- - to:
- uri: bean:myServiceBean
- parameters:
- method: processLine
+- route:
+ from:
+ uri: file:inbox
+ steps:
+ - validate:
+ expression:
+ simple:
+ expression: "${body} regex '^\\w{10}\\,\\d{2}\\,\\w{24}$'"
+ - to:
+ uri: bean:myServiceBean?method=processLine
----
====
@@ -111,15 +111,15 @@ YAML::
+
[source,yaml]
----
-- from:
- uri: file:inbox
- steps:
- - validate:
- expression:
- simple: ${header.bar} > 100
- - to:
- uri: bean:myServiceBean
- parameters:
- method: processLine
+- route:
+ from:
+ uri: file:inbox
+ steps:
+ - validate:
+ expression:
+ simple:
+ expression: "${header.bar} > 100"
+ - to:
+ uri: bean:myServiceBean.processLine
----
====
diff --git
a/core/camel-core-engine/src/main/docs/modules/eips/pages/weightedLoadBalancer-eip.adoc
b/core/camel-core-engine/src/main/docs/modules/eips/pages/weightedLoadBalancer-eip.adoc
index d88a31a66cad..06d27b7629a3 100644
---
a/core/camel-core-engine/src/main/docs/modules/eips/pages/weightedLoadBalancer-eip.adoc
+++
b/core/camel-core-engine/src/main/docs/modules/eips/pages/weightedLoadBalancer-eip.adoc
@@ -36,7 +36,7 @@ Java::
[source,java]
----
from("direct:start")
- .loadBalance().weighted(false, "4,2,1")
+ .loadBalance().weighted("4,2,1")
.to("seda:x")
.to("seda:y")
.to("seda:z")
@@ -57,4 +57,24 @@ XML::
</loadBalance>
</route>
----
+
+YAML::
++
+[source,yaml]
+----
+- route:
+ from:
+ uri: direct:start
+ steps:
+ - loadBalance:
+ steps:
+ - weightedLoadBalancer:
+ distributionRatio: "4,2,1"
+ - 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/wireTap-eip.adoc
b/core/camel-core-engine/src/main/docs/modules/eips/pages/wireTap-eip.adoc
index 65145d4bc5ed..5da6c2a580ec 100644
--- a/core/camel-core-engine/src/main/docs/modules/eips/pages/wireTap-eip.adoc
+++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/wireTap-eip.adoc
@@ -85,18 +85,30 @@ YAML::
+
[source,yaml]
----
-- from:
- uri: direct:start
- steps:
- - wireTap:
- uri: direct:tap
- - to:
- uri: log:result
-- from:
- uri: direct:tap
- steps:
- - to:
- uri: log:log
+- route:
+ from:
+ uri: direct:start
+ steps:
+ - to:
+ uri: log:foo
+ - wireTap:
+ uri: direct:tap
+ - to:
+ uri: log:result
+- route:
+ from:
+ uri: direct:tap
+ steps:
+ - delay:
+ expression:
+ constant:
+ expression: 1000
+ - setBody:
+ expression:
+ constant:
+ expression: Tapped
+ - to:
+ uri: log:tap
----
====
@@ -134,13 +146,14 @@ YAML::
+
[source,yaml]
----
-- from:
- uri: direct:start
- steps:
- - wireTap:
- uri: jms:queue:backup-${header.id}
- - to:
- uri: bean:doSomething
+- route:
+ from:
+ uri: direct:start
+ steps:
+ - wireTap:
+ uri: "jms:queue:backup-${header.id}"
+ - to:
+ uri: bean:doSomething
----
====
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 b91cd59cfc3e..5ccda459380d 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
@@ -155,7 +155,9 @@ public class LoadBalanceDefinition extends
OutputDefinition<LoadBalanceDefinitio
FailoverLoadBalancerDefinition def = new
FailoverLoadBalancerDefinition();
def.setExceptionTypes(Arrays.asList(exceptions));
def.setMaximumFailoverAttempts(Integer.toString(maximumFailoverAttempts));
- def.setRoundRobin(Boolean.toString(roundRobin));
+ if (roundRobin) {
+ def.setRoundRobin(Boolean.toString(roundRobin));
+ }
def.setInheritErrorHandler(inheritErrorHandler);
setLoadBalancerType(def);
return this;
@@ -180,13 +182,27 @@ public class LoadBalanceDefinition extends
OutputDefinition<LoadBalanceDefinitio
FailoverLoadBalancerDefinition def = new
FailoverLoadBalancerDefinition();
def.setExceptionTypes(Arrays.asList(exceptions));
def.setMaximumFailoverAttempts(Integer.toString(maximumFailoverAttempts));
- def.setRoundRobin(Boolean.toString(roundRobin));
- def.setSticky(Boolean.toString(sticky));
+ if (roundRobin) {
+ def.setRoundRobin(Boolean.toString(roundRobin));
+ }
+ if (sticky) {
+ def.setSticky(Boolean.toString(sticky));
+ }
def.setInheritErrorHandler(inheritErrorHandler);
setLoadBalancerType(def);
return this;
}
+ /**
+ * Uses weighted load balancer
+ *
+ * @param distributionRatio String of weighted ratios for distribution of
messages.
+ * @return the builder
+ */
+ public LoadBalanceDefinition weighted(String distributionRatio) {
+ return weighted(false, distributionRatio, ",");
+ }
+
/**
* Uses weighted load balancer
*
@@ -208,7 +224,9 @@ public class LoadBalanceDefinition extends
OutputDefinition<LoadBalanceDefinitio
*/
public LoadBalanceDefinition weighted(boolean roundRobin, String
distributionRatio, String distributionRatioDelimiter) {
WeightedLoadBalancerDefinition def = new
WeightedLoadBalancerDefinition();
- def.setRoundRobin(Boolean.toString(roundRobin));
+ if (roundRobin) {
+ def.setRoundRobin(Boolean.toString(roundRobin));
+ }
def.setDistributionRatio(distributionRatio);
def.setDistributionRatioDelimiter(distributionRatioDelimiter);
setLoadBalancerType(def);
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/model/ProcessorDefinition.java
b/core/camel-core-model/src/main/java/org/apache/camel/model/ProcessorDefinition.java
index 4294361765fd..dea739b3952f 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/model/ProcessorDefinition.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/model/ProcessorDefinition.java
@@ -1423,10 +1423,10 @@ public abstract class ProcessorDefinition<Type extends
ProcessorDefinition<Type>
* Creates a validation expression which only if it is <tt>true</tt> then
the exchange is forwarded to the
* destination. Otherwise a {@link
org.apache.camel.support.processor.PredicateValidationException} is thrown.
*
- * @param expression the expression
+ * @param expression the predicate
* @return the builder
*/
- public Type validate(@AsPredicate Expression expression) {
+ public Type validate(@AsPredicate ExpressionDefinition expression) {
ValidateDefinition answer = new ValidateDefinition(expression);
addOutput(answer);
return asType();
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/model/ValidateDefinition.java
b/core/camel-core-model/src/main/java/org/apache/camel/model/ValidateDefinition.java
index 5c4561eeb035..a21a4ddb846c 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/model/ValidateDefinition.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/model/ValidateDefinition.java
@@ -54,6 +54,10 @@ public class ValidateDefinition extends ExpressionNode {
this.predicateExceptionFactory = source.predicateExceptionFactory;
}
+ public ValidateDefinition(ExpressionDefinition expression) {
+ super(expression);
+ }
+
public ValidateDefinition(Expression expression) {
super(expression);
}
