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-spring-boot.git
The following commit(s) were added to refs/heads/main by this push: new be6dfd5d666 [create-pull-request] automated change be6dfd5d666 is described below commit be6dfd5d6665ef7f757548173614db7b92889edb Author: oscerd <osc...@users.noreply.github.com> AuthorDate: Thu Oct 20 01:32:57 2022 +0000 [create-pull-request] automated change --- .../camel/springboot/catalog/components/platform-http.json | 2 +- .../apache/camel/springboot/catalog/languages/jsonpath.json | 1 + .../camel-jsonpath-starter/src/main/docs/jsonpath.json | 7 +++++++ .../jsonpath/springboot/JsonPathLanguageConfiguration.java | 12 ++++++++++++ tooling/camel-spring-boot-dependencies/pom.xml | 5 +++++ 5 files changed, 26 insertions(+), 1 deletion(-) diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/platform-http.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/platform-http.json index aa3dd58215a..ac97a405bc6 100644 --- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/platform-http.json +++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/platform-http.json @@ -27,7 +27,7 @@ "engine": { "kind": "property", "displayName": "Engine", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.platform.http.spi.PlatformHttpEngine", "deprecated": false, "autowired": false, "secret": false, "description": "An HTTP Server engine implementation to serve the requests" } }, "properties": { - "path": { "kind": "path", "displayName": "Path", "group": "consumer", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The path under which this endpoint serves the HTTP requests" }, + "path": { "kind": "path", "displayName": "Path", "group": "consumer", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The path under which this endpoint serves the HTTP requests, for proxy use 'proxy'" }, "consumes": { "kind": "parameter", "displayName": "Consumes", "group": "consumer", "label": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The content type this endpoint accepts as an input, such as application\/xml or application\/json. null or *\/* mean no restriction." }, "httpMethodRestrict": { "kind": "parameter", "displayName": "Http Method Restrict", "group": "consumer", "label": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "A comma separated list of HTTP methods to serve, e.g. GET,POST . If no methods are specified, all methods will be served." }, "matchOnUriPrefix": { "kind": "parameter", "displayName": "Match On Uri Prefix", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether or not the consumer should try to find a target consumer by matching the URI prefix if no exact match is found." }, diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/languages/jsonpath.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/languages/jsonpath.json index 40a428d33b3..7ff44dee74d 100644 --- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/languages/jsonpath.json +++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/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/components-starter/camel-jsonpath-starter/src/main/docs/jsonpath.json b/components-starter/camel-jsonpath-starter/src/main/docs/jsonpath.json index 11c216d9cb5..ffd37aed658 100644 --- a/components-starter/camel-jsonpath-starter/src/main/docs/jsonpath.json +++ b/components-starter/camel-jsonpath-starter/src/main/docs/jsonpath.json @@ -64,6 +64,13 @@ "sourceType": "org.apache.camel.jsonpath.springboot.JsonPathLanguageConfiguration", "defaultValue": true }, + { + "name": "camel.language.jsonpath.unpack-array", + "type": "java.lang.Boolean", + "description": "Whether to unpack a single element json-array into an object.", + "sourceType": "org.apache.camel.jsonpath.springboot.JsonPathLanguageConfiguration", + "defaultValue": false + }, { "name": "camel.language.jsonpath.write-as-string", "type": "java.lang.Boolean", diff --git a/components-starter/camel-jsonpath-starter/src/main/java/org/apache/camel/jsonpath/springboot/JsonPathLanguageConfiguration.java b/components-starter/camel-jsonpath-starter/src/main/java/org/apache/camel/jsonpath/springboot/JsonPathLanguageConfiguration.java index 22bc0892277..4046c22743d 100644 --- a/components-starter/camel-jsonpath-starter/src/main/java/org/apache/camel/jsonpath/springboot/JsonPathLanguageConfiguration.java +++ b/components-starter/camel-jsonpath-starter/src/main/java/org/apache/camel/jsonpath/springboot/JsonPathLanguageConfiguration.java @@ -53,6 +53,10 @@ public class JsonPathLanguageConfiguration * instead of a Map/POJO value. */ private Boolean writeAsString = false; + /** + * Whether to unpack a single element json-array into an object. + */ + private Boolean unpackArray = false; /** * Name of header to use as input, instead of the message body */ @@ -100,6 +104,14 @@ public class JsonPathLanguageConfiguration this.writeAsString = writeAsString; } + public Boolean getUnpackArray() { + return unpackArray; + } + + public void setUnpackArray(Boolean unpackArray) { + this.unpackArray = unpackArray; + } + public String getHeaderName() { return headerName; } diff --git a/tooling/camel-spring-boot-dependencies/pom.xml b/tooling/camel-spring-boot-dependencies/pom.xml index ef6dfe7ae96..2b65cf3cde0 100644 --- a/tooling/camel-spring-boot-dependencies/pom.xml +++ b/tooling/camel-spring-boot-dependencies/pom.xml @@ -4932,6 +4932,11 @@ <artifactId>rabbitmq</artifactId> <version>1.17.5</version> </dependency> + <dependency> + <groupId>org.testcontainers</groupId> + <artifactId>redpanda</artifactId> + <version>1.17.5</version> + </dependency> <dependency> <groupId>org.testcontainers</groupId> <artifactId>testcontainers</artifactId>