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 2022/10/21 06:09:03 UTC

[camel-spring-boot] branch camel-spring-boot-3.18.x updated (74371d78be6 -> 76577465ff0)

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a change to branch camel-spring-boot-3.18.x
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git


    from 74371d78be6 Regen
     new c5f3c0ae0c2 Upgrade to spring boot 2.7.5
     new 76577465ff0 Regen

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../org/apache/camel/springboot/catalog/components/cxf.json  |  1 +
 .../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 ++++++++++++
 pom.xml                                                      |  2 +-
 6 files changed, 23 insertions(+), 2 deletions(-)


[camel-spring-boot] 01/02: Upgrade to spring boot 2.7.5

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch camel-spring-boot-3.18.x
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git

commit c5f3c0ae0c219e434a9a8368cd503292d74c20c6
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Oct 21 07:28:55 2022 +0200

    Upgrade to spring boot 2.7.5
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 64b2877f2d4..016fac91d91 100644
--- a/pom.xml
+++ b/pom.xml
@@ -108,7 +108,7 @@
         <compiler.fork>false</compiler.fork>
 
         <!-- Spring-Boot target version -->
-        <spring-boot-version>2.7.4</spring-boot-version>
+        <spring-boot-version>2.7.5</spring-boot-version>
 
         <!-- Camel target version -->
         <camel-version>3.18.3-SNAPSHOT</camel-version>


[camel-spring-boot] 02/02: Regen

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch camel-spring-boot-3.18.x
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git

commit 76577465ff0e12b3a3a4eaf2d6bd52828fe42124
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Oct 21 08:08:52 2022 +0200

    Regen
---
 .../org/apache/camel/springboot/catalog/components/cxf.json  |  1 +
 .../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 ++++++++++++
 5 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/cxf.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/cxf.json
index faa0890e069..d364534be7c 100644
--- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/cxf.json
+++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/cxf.json
@@ -63,6 +63,7 @@
     "mergeProtocolHeaders": { "kind": "parameter", "displayName": "Merge Protocol Headers", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to merge protocol headers. If enabled then propagating headers between Camel and CXF becomes more consistent and similar. For more details see CAMEL-6393." },
     "mtomEnabled": { "kind": "parameter", "displayName": "Mtom Enabled", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "To enable MTOM (attachments). This requires to use POJO or PAYLOAD data format mode." },
     "properties": { "kind": "parameter", "displayName": "Properties", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.util.Map<java.lang.String, java.lang.Object>", "prefix": "properties.", "multiValue": true, "deprecated": false, "autowired": false, "secret": false, "description": "To set additional CXF options using the key\/value pairs from the Map. For example to turn on stacktraces in SOAP faults, properties.faultStackTraceEnabled=true" },
+    "schemaValidationEnabled": { "kind": "parameter", "displayName": "Schema Validation Enabled", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "false", "description": "Enable schema validation for request and response. Disabled by default for performance reason" },
     "skipPayloadMessagePartCheck": { "kind": "parameter", "displayName": "Skip Payload Message Part Check", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Sets whether SOAP message validation should be disabled." },
     "loggingFeatureEnabled": { "kind": "parameter", "displayName": "Logging Feature Enabled", "group": "logging", "label": "logging", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "This option enables CXF Logging Feature which writes inbound and outbound SOAP messages to log." },
     "loggingSizeLimit": { "kind": "parameter", "displayName": "Logging Size Limit", "group": "logging", "label": "logging", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 49152, "description": "To limit the total size of number of bytes the logger will output when logging feature has been enabled and -1 for no limit." },
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 837be646e73..de49572f43f 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 &#42;\/&#42; 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 ee6303e85a7..3ff6e939bb0 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;
     }