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 8b0dd0022c2b CAMEL-22872: camel-core - Missing doc for model onWhen /
predicateValidator
8b0dd0022c2b is described below
commit 8b0dd0022c2b263f20429363fa870563bc43b0b4
Author: Claus Ibsen <[email protected]>
AuthorDate: Mon Jan 19 13:45:50 2026 +0100
CAMEL-22872: camel-core - Missing doc for model onWhen / predicateValidator
---
.../generated/resources/org/apache/camel/catalog/models/onWhen.json | 2 +-
.../resources/org/apache/camel/catalog/models/predicateValidator.json | 2 +-
.../generated/resources/META-INF/org/apache/camel/model/onWhen.json | 2 +-
.../META-INF/org/apache/camel/model/validator/predicateValidator.json | 2 +-
.../src/main/java/org/apache/camel/model/OnWhenDefinition.java | 3 +++
.../apache/camel/model/validator/PredicateValidatorDefinition.java | 3 +++
.../org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java | 4 ++--
.../camel-yaml-dsl/src/generated/resources/schema/camelYamlDsl.json | 2 ++
8 files changed, 14 insertions(+), 6 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/onWhen.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/onWhen.json
index 006aa138a429..bdca35b11fb2 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/onWhen.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/onWhen.json
@@ -15,6 +15,6 @@
"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" },
"note": { "index": 1, "kind": "attribute", "displayName": "Note", "group":
"common", "required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "description": "Sets
the note of this node" },
"description": { "index": 2, "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" },
- "expression": { "index": 3, "kind": "expression", "displayName":
"Expression", "group": "common", "required": true, "type": "object",
"javaType": "org.apache.camel.model.language.ExpressionDefinition", "oneOf": [
"constant", "csimple", "datasonnet", "exchangeProperty", "groovy", "header",
"hl7terser", "java", "joor", "jq", "js", "jsonpath", "language", "method",
"mvel", "ognl", "python", "ref", "simple", "spel", "tokenize", "variable",
"wasm", "xpath", "xquery", "xtokenize" ], "depre [...]
+ "expression": { "index": 3, "kind": "expression", "displayName":
"Expression", "group": "common", "required": true, "type": "object",
"javaType": "org.apache.camel.model.language.ExpressionDefinition", "oneOf": [
"constant", "csimple", "datasonnet", "exchangeProperty", "groovy", "header",
"hl7terser", "java", "joor", "jq", "js", "jsonpath", "language", "method",
"mvel", "ognl", "python", "ref", "simple", "spel", "tokenize", "variable",
"wasm", "xpath", "xquery", "xtokenize" ], "depre [...]
}
}
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/predicateValidator.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/predicateValidator.json
index 72636450c47d..2aba6433d1d3 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/predicateValidator.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/predicateValidator.json
@@ -12,7 +12,7 @@
"output": false
},
"properties": {
- "expression": { "index": 0, "kind": "expression", "displayName":
"Expression", "group": "common", "required": true, "type": "object",
"javaType": "org.apache.camel.model.language.ExpressionDefinition", "oneOf": [
"constant", "csimple", "datasonnet", "exchangeProperty", "groovy", "header",
"hl7terser", "java", "joor", "jq", "js", "jsonpath", "language", "method",
"mvel", "ognl", "python", "ref", "simple", "spel", "tokenize", "variable",
"wasm", "xpath", "xquery", "xtokenize" ], "depre [...]
+ "expression": { "index": 0, "kind": "expression", "displayName":
"Expression", "group": "common", "required": true, "type": "object",
"javaType": "org.apache.camel.model.language.ExpressionDefinition", "oneOf": [
"constant", "csimple", "datasonnet", "exchangeProperty", "groovy", "header",
"hl7terser", "java", "joor", "jq", "js", "jsonpath", "language", "method",
"mvel", "ognl", "python", "ref", "simple", "spel", "tokenize", "variable",
"wasm", "xpath", "xquery", "xtokenize" ], "depre [...]
"type": { "index": 1, "kind": "attribute", "displayName": "Type", "group":
"common", "required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "description": "Set
the data type name. If you specify 'xml:XYZ', the validator will be picked up
if message type is 'xml:XYZ'. If you specify just 'xml', the validator matches
with all of 'xml' message type like 'xml:ABC' or 'xml:DEF'." }
}
}
diff --git
a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/onWhen.json
b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/onWhen.json
index 006aa138a429..bdca35b11fb2 100644
---
a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/onWhen.json
+++
b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/onWhen.json
@@ -15,6 +15,6 @@
"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" },
"note": { "index": 1, "kind": "attribute", "displayName": "Note", "group":
"common", "required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "description": "Sets
the note of this node" },
"description": { "index": 2, "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" },
- "expression": { "index": 3, "kind": "expression", "displayName":
"Expression", "group": "common", "required": true, "type": "object",
"javaType": "org.apache.camel.model.language.ExpressionDefinition", "oneOf": [
"constant", "csimple", "datasonnet", "exchangeProperty", "groovy", "header",
"hl7terser", "java", "joor", "jq", "js", "jsonpath", "language", "method",
"mvel", "ognl", "python", "ref", "simple", "spel", "tokenize", "variable",
"wasm", "xpath", "xquery", "xtokenize" ], "depre [...]
+ "expression": { "index": 3, "kind": "expression", "displayName":
"Expression", "group": "common", "required": true, "type": "object",
"javaType": "org.apache.camel.model.language.ExpressionDefinition", "oneOf": [
"constant", "csimple", "datasonnet", "exchangeProperty", "groovy", "header",
"hl7terser", "java", "joor", "jq", "js", "jsonpath", "language", "method",
"mvel", "ognl", "python", "ref", "simple", "spel", "tokenize", "variable",
"wasm", "xpath", "xquery", "xtokenize" ], "depre [...]
}
}
diff --git
a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/validator/predicateValidator.json
b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/validator/predicateValidator.json
index 72636450c47d..2aba6433d1d3 100644
---
a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/validator/predicateValidator.json
+++
b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/validator/predicateValidator.json
@@ -12,7 +12,7 @@
"output": false
},
"properties": {
- "expression": { "index": 0, "kind": "expression", "displayName":
"Expression", "group": "common", "required": true, "type": "object",
"javaType": "org.apache.camel.model.language.ExpressionDefinition", "oneOf": [
"constant", "csimple", "datasonnet", "exchangeProperty", "groovy", "header",
"hl7terser", "java", "joor", "jq", "js", "jsonpath", "language", "method",
"mvel", "ognl", "python", "ref", "simple", "spel", "tokenize", "variable",
"wasm", "xpath", "xquery", "xtokenize" ], "depre [...]
+ "expression": { "index": 0, "kind": "expression", "displayName":
"Expression", "group": "common", "required": true, "type": "object",
"javaType": "org.apache.camel.model.language.ExpressionDefinition", "oneOf": [
"constant", "csimple", "datasonnet", "exchangeProperty", "groovy", "header",
"hl7terser", "java", "joor", "jq", "js", "jsonpath", "language", "method",
"mvel", "ognl", "python", "ref", "simple", "spel", "tokenize", "variable",
"wasm", "xpath", "xquery", "xtokenize" ], "depre [...]
"type": { "index": 1, "kind": "attribute", "displayName": "Type", "group":
"common", "required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "description": "Set
the data type name. If you specify 'xml:XYZ', the validator will be picked up
if message type is 'xml:XYZ'. If you specify just 'xml', the validator matches
with all of 'xml' message type like 'xml:ABC' or 'xml:DEF'." }
}
}
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/model/OnWhenDefinition.java
b/core/camel-core-model/src/main/java/org/apache/camel/model/OnWhenDefinition.java
index 2a52d8c34951..12d7c9eae35e 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/model/OnWhenDefinition.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/model/OnWhenDefinition.java
@@ -101,6 +101,9 @@ public class OnWhenDefinition extends
OptionalIdentifiedDefinition<OnWhenDefinit
return expression;
}
+ /**
+ * The predicate to use
+ */
public void setExpression(ExpressionDefinition expression) {
// favour using the helper to set the expression as it can unwrap some
// unwanted builders when using Java DSL
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/model/validator/PredicateValidatorDefinition.java
b/core/camel-core-model/src/main/java/org/apache/camel/model/validator/PredicateValidatorDefinition.java
index a5f52fab8058..99ceaa3c35e3 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/model/validator/PredicateValidatorDefinition.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/model/validator/PredicateValidatorDefinition.java
@@ -54,6 +54,9 @@ public class PredicateValidatorDefinition extends
ValidatorDefinition {
return expression;
}
+ /**
+ * The predicate to use for validation.
+ */
public void setExpression(ExpressionDefinition expression) {
// favour using the helper to set the expression as it can unwrap some
// unwanted builders when using Java DSL
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 55362f1523a5..08363b3d9f42 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
@@ -11191,7 +11191,7 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
properties = {
@YamlProperty(name = "__extends", type =
"object:org.apache.camel.model.language.ExpressionDefinition", oneOf =
"expression"),
@YamlProperty(name = "description", type = "string",
description = "Sets the description of this node", displayName = "Description"),
- @YamlProperty(name = "expression", type =
"object:org.apache.camel.model.language.ExpressionDefinition", displayName =
"Expression", oneOf = "expression"),
+ @YamlProperty(name = "expression", type =
"object:org.apache.camel.model.language.ExpressionDefinition", description =
"The predicate to use", displayName = "Expression", oneOf = "expression"),
@YamlProperty(name = "id", type = "string", description =
"Sets the id of this node", displayName = "Id"),
@YamlProperty(name = "note", type = "string", description
= "Sets the note of this node", displayName = "Note")
}
@@ -12861,7 +12861,7 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
description = "To use a predicate to perform validation on the
route level.",
deprecated = false,
properties = {
- @YamlProperty(name = "expression", type =
"object:org.apache.camel.model.language.ExpressionDefinition", displayName =
"Expression", oneOf = "expression"),
+ @YamlProperty(name = "expression", type =
"object:org.apache.camel.model.language.ExpressionDefinition", description =
"The predicate to use for validation.", displayName = "Expression", oneOf =
"expression"),
@YamlProperty(name = "type", type = "string", description
= "Set the data type name. If you specify 'xml:XYZ', the validator will be
picked up if message type is 'xml:XYZ'. If you specify just 'xml', the
validator matches with all of 'xml' message type like 'xml:ABC' or 'xml:DEF'.",
displayName = "Type")
}
)
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 55547c75d209..bc3977fe557c 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
@@ -3910,6 +3910,7 @@
"properties" : {
"expression" : {
"title" : "Expression",
+ "description" : "The predicate to use",
"$ref" :
"#/items/definitions/org.apache.camel.model.language.ExpressionDefinition"
}
}
@@ -18103,6 +18104,7 @@
"properties" : {
"expression" : {
"title" : "Expression",
+ "description" : "The predicate to use for validation.",
"$ref" :
"#/items/definitions/org.apache.camel.model.language.ExpressionDefinition"
}
}
