This is an automated email from the ASF dual-hosted git repository. acosentino 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 f4413caf247 Regen for commit 2f757c4b6a33978277ec9c426f2d6f8a844a9d45 f4413caf247 is described below commit f4413caf247f2d9523d4230e0fdfa4f06a62bc37 Author: davsclaus <davscl...@users.noreply.github.com> AuthorDate: Wed Oct 19 17:05:35 2022 +0000 Regen for commit 2f757c4b6a33978277ec9c426f2d6f8a844a9d45 Signed-off-by: GitHub <nore...@github.com> --- .../org/apache/camel/catalog/languages/jsonpath.json | 1 + .../resources/org/apache/camel/catalog/models/jsonpath.json | 1 + .../org/apache/camel/catalog/schemas/camel-spring.xsd | 11 +++++++++++ .../resources/org/apache/camel/jsonpath/jsonpath.json | 1 + .../java/org/apache/camel/jsonpath/JsonPathExpression.java | 3 ++- .../resources/org/apache/camel/model/language/jsonpath.json | 1 + .../main/java/org/apache/camel/builder/ExpressionClause.java | 6 +++--- .../org/apache/camel/builder/ExpressionClauseSupport.java | 6 +++--- .../main/java/org/apache/camel/model/ProcessorDefinition.java | 8 ++++---- .../generated/java/org/apache/camel/xml/in/ModelParser.java | 1 + .../camel/dsl/yaml/deserializers/ModelDeserializers.java | 6 ++++++ .../src/generated/resources/schema/camel-yaml-dsl.json | 3 +++ .../src/generated/resources/schema/camelYamlDsl.json | 3 +++ 13 files changed, 40 insertions(+), 11 deletions(-) diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/jsonpath.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/jsonpath.json index cbd08abf4b9..5c29847023b 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/jsonpath.json +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/jsonpath.json @@ -22,6 +22,7 @@ "allowSimple": { "kind": "attribute", "displayName": "Allow Simple", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to allow in inlined Simple exceptions in the JSONPath expression" }, "allowEasyPredicate": { "kind": "attribute", "displayName": "Allow Easy Predicate", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to allow using the easy predicate parser to pre-parse predicates." }, "writeAsString": { "kind": "attribute", "displayName": "Write As String", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to write the output of each row\/element as a JSON String value instead of a Map\/POJO value." }, + "unpackArray": { "kind": "attribute", "displayName": "Unpack Array", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to unpack a single element json-array into an object." }, "headerName": { "kind": "attribute", "displayName": "Header Name", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Name of header to use as input, instead of the message body" }, "option": { "kind": "attribute", "displayName": "Option", "label": "advanced", "required": false, "type": "enum", "javaType": "java.lang.String", "enum": [ "DEFAULT_PATH_LEAF_TO_NULL", "ALWAYS_RETURN_LIST", "AS_PATH_LIST", "SUPPRESS_EXCEPTIONS", "REQUIRE_PROPERTIES" ], "deprecated": false, "autowired": false, "secret": false, "description": "To configure additional options on JSONPath. Multiple values can be separated by comma." }, "trim": { "kind": "attribute", "displayName": "Trim", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" }, diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/jsonpath.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/jsonpath.json index 108923ff497..a20f08e33cc 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/jsonpath.json +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/jsonpath.json @@ -19,6 +19,7 @@ "allowSimple": { "kind": "attribute", "displayName": "Allow Simple", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to allow in inlined Simple exceptions in the JSONPath expression" }, "allowEasyPredicate": { "kind": "attribute", "displayName": "Allow Easy Predicate", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to allow using the easy predicate parser to pre-parse predicates." }, "writeAsString": { "kind": "attribute", "displayName": "Write As String", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to write the output of each row\/element as a JSON String value instead of a Map\/POJO value." }, + "unpackArray": { "kind": "attribute", "displayName": "Unpack Array", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to unpack a single element json-array into an object." }, "headerName": { "kind": "attribute", "displayName": "Header Name", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Name of header to use as input, instead of the message body" }, "option": { "kind": "attribute", "displayName": "Option", "label": "advanced", "required": false, "type": "enum", "javaType": "java.lang.String", "enum": [ "DEFAULT_PATH_LEAF_TO_NULL", "ALWAYS_RETURN_LIST", "AS_PATH_LIST", "SUPPRESS_EXCEPTIONS", "REQUIRE_PROPERTIES" ], "deprecated": false, "autowired": false, "secret": false, "description": "To configure additional options on JSONPath. Multiple values can be separated by comma." }, "trim": { "kind": "attribute", "displayName": "Trim", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" }, 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 db8ac4fbcf7..837f1fd8ac0 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 @@ -20337,6 +20337,17 @@ of a Map/POJO value. Default value: false </xs:annotation> </xs:attribute> + <xs:attribute name="unpackArray" type="xs:string"> + <xs:annotation> + <xs:documentation xml:lang="en"> + <![CDATA[ +Whether to unpack a single element json-array into an object. Default value: +false + ]]> + </xs:documentation> + </xs:annotation> + </xs:attribute> + <xs:attribute name="headerName" type="xs:string"> <xs:annotation> <xs:documentation xml:lang="en"> diff --git a/components/camel-jsonpath/src/generated/resources/org/apache/camel/jsonpath/jsonpath.json b/components/camel-jsonpath/src/generated/resources/org/apache/camel/jsonpath/jsonpath.json index cbd08abf4b9..5c29847023b 100644 --- a/components/camel-jsonpath/src/generated/resources/org/apache/camel/jsonpath/jsonpath.json +++ b/components/camel-jsonpath/src/generated/resources/org/apache/camel/jsonpath/jsonpath.json @@ -22,6 +22,7 @@ "allowSimple": { "kind": "attribute", "displayName": "Allow Simple", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to allow in inlined Simple exceptions in the JSONPath expression" }, "allowEasyPredicate": { "kind": "attribute", "displayName": "Allow Easy Predicate", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to allow using the easy predicate parser to pre-parse predicates." }, "writeAsString": { "kind": "attribute", "displayName": "Write As String", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to write the output of each row\/element as a JSON String value instead of a Map\/POJO value." }, + "unpackArray": { "kind": "attribute", "displayName": "Unpack Array", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to unpack a single element json-array into an object." }, "headerName": { "kind": "attribute", "displayName": "Header Name", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Name of header to use as input, instead of the message body" }, "option": { "kind": "attribute", "displayName": "Option", "label": "advanced", "required": false, "type": "enum", "javaType": "java.lang.String", "enum": [ "DEFAULT_PATH_LEAF_TO_NULL", "ALWAYS_RETURN_LIST", "AS_PATH_LIST", "SUPPRESS_EXCEPTIONS", "REQUIRE_PROPERTIES" ], "deprecated": false, "autowired": false, "secret": false, "description": "To configure additional options on JSONPath. Multiple values can be separated by comma." }, "trim": { "kind": "attribute", "displayName": "Trim", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" }, diff --git a/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JsonPathExpression.java b/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JsonPathExpression.java index cb595abccc4..f4218e3c4e4 100644 --- a/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JsonPathExpression.java +++ b/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JsonPathExpression.java @@ -162,7 +162,8 @@ public class JsonPathExpression extends ExpressionAdapter { boolean singleElement = result instanceof List && ((List) result).size() == 1; if (singleElement && !resultIsCollection) { result = ((List) result).get(0); - LOG.trace("Unwrapping result: {} from single element List before converting to: {}", result, resultType); + LOG.trace("Unwrapping result: {} from single element List before converting to: {}", result, + resultType); } } return exchange.getContext().getTypeConverter().convertTo(resultType, exchange, result); diff --git a/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/jsonpath.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/jsonpath.json index 108923ff497..a20f08e33cc 100644 --- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/jsonpath.json +++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/jsonpath.json @@ -19,6 +19,7 @@ "allowSimple": { "kind": "attribute", "displayName": "Allow Simple", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to allow in inlined Simple exceptions in the JSONPath expression" }, "allowEasyPredicate": { "kind": "attribute", "displayName": "Allow Easy Predicate", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to allow using the easy predicate parser to pre-parse predicates." }, "writeAsString": { "kind": "attribute", "displayName": "Write As String", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to write the output of each row\/element as a JSON String value instead of a Map\/POJO value." }, + "unpackArray": { "kind": "attribute", "displayName": "Unpack Array", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to unpack a single element json-array into an object." }, "headerName": { "kind": "attribute", "displayName": "Header Name", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Name of header to use as input, instead of the message body" }, "option": { "kind": "attribute", "displayName": "Option", "label": "advanced", "required": false, "type": "enum", "javaType": "java.lang.String", "enum": [ "DEFAULT_PATH_LEAF_TO_NULL", "ALWAYS_RETURN_LIST", "AS_PATH_LIST", "SUPPRESS_EXCEPTIONS", "REQUIRE_PROPERTIES" ], "deprecated": false, "autowired": false, "secret": false, "description": "To configure additional options on JSONPath. Multiple values can be separated by comma." }, "trim": { "kind": "attribute", "displayName": "Trim", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" }, diff --git a/core/camel-core-model/src/main/java/org/apache/camel/builder/ExpressionClause.java b/core/camel-core-model/src/main/java/org/apache/camel/builder/ExpressionClause.java index 309c6b75233..5cab2fd8bea 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/builder/ExpressionClause.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/builder/ExpressionClause.java @@ -574,9 +574,9 @@ public class ExpressionClause<T> implements Expression, Predicate { * Evaluates a <a href="http://camel.apache.org/jsonpath.html">Json Path expression</a> with unpacking a * single-element array into an object enabled. * - * @param text the expression to be evaluated - * @param resultType the return type expected by the expression - * @return the builder to continue processing the DSL + * @param text the expression to be evaluated + * @param resultType the return type expected by the expression + * @return the builder to continue processing the DSL */ public T jsonpathUnpack(String text, Class<?> resultType) { return delegate.jsonpathUnpack(text, resultType); diff --git a/core/camel-core-model/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java b/core/camel-core-model/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java index a9262005c75..dcbd67aa941 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java @@ -684,9 +684,9 @@ public class ExpressionClauseSupport<T> implements ExpressionFactoryAware, Predi * Evaluates a <a href="http://camel.apache.org/jsonpath.html">Json Path expression</a> with unpacking a * single-element array into an object enabled. * - * @param text the expression to be evaluated - * @param resultType the return type expected by the expression - * @return the builder to continue processing the DSL + * @param text the expression to be evaluated + * @param resultType the return type expected by the expression + * @return the builder to continue processing the DSL */ public T jsonpathUnpack(String text, Class<?> resultType) { JsonPathExpression expression = new JsonPathExpression(text); 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 91868e4ec96..0f9adf65346 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 @@ -588,8 +588,8 @@ public abstract class ProcessorDefinition<Type extends ProcessorDefinition<Type> } /** - * <a href="http://camel.apache.org/exchange-pattern.html">ExchangePattern:</a> set the {@link ExchangePattern} - * into the {@link Exchange}. + * <a href="http://camel.apache.org/exchange-pattern.html">ExchangePattern:</a> set the {@link ExchangePattern} into + * the {@link Exchange}. * <p/> * The pattern set on the {@link Exchange} will be changed from this point going foward. * @@ -602,8 +602,8 @@ public abstract class ProcessorDefinition<Type extends ProcessorDefinition<Type> } /** - * <a href="http://camel.apache.org/exchange-pattern.html">ExchangePattern:</a> set the {@link ExchangePattern} - * into the {@link Exchange}. + * <a href="http://camel.apache.org/exchange-pattern.html">ExchangePattern:</a> set the {@link ExchangePattern} into + * the {@link Exchange}. * <p/> * The pattern set on the {@link Exchange} will be changed from this point going foward. * 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 5c900c99536..30c3630d034 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 @@ -2672,6 +2672,7 @@ public class ModelParser extends BaseParser { case "option": def.setOption(val); break; case "resultType": def.setResultTypeName(val); break; case "suppressExceptions": def.setSuppressExceptions(val); break; + case "unpackArray": def.setUnpackArray(val); break; case "writeAsString": def.setWriteAsString(val); break; default: return expressionDefinitionAttributeHandler().accept(def, key, val); } 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 54db58cc40b..5ebe38e8012 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 @@ -7443,6 +7443,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport { @YamlProperty(name = "result-type", type = "string"), @YamlProperty(name = "suppress-exceptions", type = "boolean"), @YamlProperty(name = "trim", type = "boolean"), + @YamlProperty(name = "unpack-array", type = "boolean"), @YamlProperty(name = "write-as-string", type = "boolean") } ) @@ -7510,6 +7511,11 @@ public final class ModelDeserializers extends YamlDeserializerSupport { target.setTrim(val); break; } + case "unpack-array": { + String val = asText(node); + target.setUnpackArray(val); + break; + } case "write-as-string": { String val = asText(node); target.setWriteAsString(val); diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camel-yaml-dsl.json b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camel-yaml-dsl.json index cb5ce245240..a91af3ef824 100644 --- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camel-yaml-dsl.json +++ b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camel-yaml-dsl.json @@ -6438,6 +6438,9 @@ "trim" : { "type" : "boolean" }, + "unpack-array" : { + "type" : "boolean" + }, "write-as-string" : { "type" : "boolean" } 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 a64e3495c40..012dd696d24 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 @@ -6339,6 +6339,9 @@ "trim" : { "type" : "boolean" }, + "unpackArray" : { + "type" : "boolean" + }, "writeAsString" : { "type" : "boolean" }