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 2024/01/02 11:22:19 UTC

(camel) branch main updated (7e768d10d61 -> 54867f9194d)

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

davsclaus pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


    from 7e768d10d61 CAMEL-20284: camel-ignite - Enable tests on JDK21
     new 6c27e967071 camel-ftp: Logging level for JSCH should be limited to its supported enum values. Thanks to Carl Kabitz for reporting.
     new 54867f9194d 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/catalog/components/sftp.json  |  2 +-
 .../apache/camel/component/file/remote/sftp.json   |  2 +-
 .../component/file/remote/SftpConfiguration.java   |  2 +-
 .../dsl/JsonValidatorEndpointBuilderFactory.java   | 32 ++++++++++++++++++++++
 4 files changed, 35 insertions(+), 3 deletions(-)


(camel) 01/02: camel-ftp: Logging level for JSCH should be limited to its supported enum values. Thanks to Carl Kabitz for reporting.

Posted by da...@apache.org.
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

commit 6c27e96707166d6ea4001d31b3c1855baaa0fc6b
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Jan 2 12:21:57 2024 +0100

    camel-ftp: Logging level for JSCH should be limited to its supported enum values. Thanks to Carl Kabitz for reporting.
---
 .../generated/resources/org/apache/camel/catalog/components/sftp.json   | 2 +-
 .../resources/org/apache/camel/component/file/remote/sftp.json          | 2 +-
 .../java/org/apache/camel/component/file/remote/SftpConfiguration.java  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/sftp.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/sftp.json
index 0a8bc1344c9..b5ac8cf9cc4 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/sftp.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/sftp.json
@@ -50,7 +50,7 @@
     "disconnect": { "index": 5, "kind": "parameter", "displayName": "Disconnect", "group": "common", "label": "common", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether or not to disconnect from remote FTP server right after use. Disconnect will only disconnect the current connection to the FTP server. If you have a consumer which you want to stop, then you need to stop th [...]
     "doneFileName": { "index": 6, "kind": "parameter", "displayName": "Done File Name", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Producer: If provided, then Camel will write a 2nd done file when the original file has been written. The done file will be empty. This option configures what file name to use. Either you can specify a fixed name. Or you can use  [...]
     "fileName": { "index": 7, "kind": "parameter", "displayName": "File Name", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Use Expression such as File Language to dynamically set the filename. For consumers, it's used as a filename filter. For producers, it's used to evaluate the filename to write. If an expression is set, it take precedence over the CamelFil [...]
-    "jschLoggingLevel": { "index": 8, "kind": "parameter", "displayName": "Jsch Logging Level", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.LoggingLevel", "enum": [ "TRACE", "DEBUG", "INFO", "WARN", "ERROR", "OFF" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "WARN", "configurationClass": "org.apache.camel.component.file.remote.SftpConfiguration", "configurationField": "configuration", "description": "T [...]
+    "jschLoggingLevel": { "index": 8, "kind": "parameter", "displayName": "Jsch Logging Level", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.LoggingLevel", "enum": [ "DEBUG", "INFO", "WARN", "ERROR" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "WARN", "configurationClass": "org.apache.camel.component.file.remote.SftpConfiguration", "configurationField": "configuration", "description": "The logging level [...]
     "passiveMode": { "index": 9, "kind": "parameter", "displayName": "Passive Mode", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.file.remote.SftpConfiguration", "configurationField": "configuration", "description": "Sets passive mode connections. Default is active mode connections." },
     "separator": { "index": 10, "kind": "parameter", "displayName": "Separator", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.file.remote.RemoteFileConfiguration.PathSeparator", "enum": [ "UNIX", "Windows", "Auto" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "UNIX", "configurationClass": "org.apache.camel.component.file.remote.SftpConfiguration", "configurationField": "configuration", "descrip [...]
     "fastExistsCheck": { "index": 11, "kind": "parameter", "displayName": "Fast Exists Check", "group": "common (advanced)", "label": "common,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "If set this option to be true, camel-ftp will use the list file directly to check if the file exists. Since some FTP server may not support to list the file directly, if the option  [...]
diff --git a/components/camel-ftp/src/generated/resources/org/apache/camel/component/file/remote/sftp.json b/components/camel-ftp/src/generated/resources/org/apache/camel/component/file/remote/sftp.json
index 0a8bc1344c9..b5ac8cf9cc4 100644
--- a/components/camel-ftp/src/generated/resources/org/apache/camel/component/file/remote/sftp.json
+++ b/components/camel-ftp/src/generated/resources/org/apache/camel/component/file/remote/sftp.json
@@ -50,7 +50,7 @@
     "disconnect": { "index": 5, "kind": "parameter", "displayName": "Disconnect", "group": "common", "label": "common", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether or not to disconnect from remote FTP server right after use. Disconnect will only disconnect the current connection to the FTP server. If you have a consumer which you want to stop, then you need to stop th [...]
     "doneFileName": { "index": 6, "kind": "parameter", "displayName": "Done File Name", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Producer: If provided, then Camel will write a 2nd done file when the original file has been written. The done file will be empty. This option configures what file name to use. Either you can specify a fixed name. Or you can use  [...]
     "fileName": { "index": 7, "kind": "parameter", "displayName": "File Name", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Use Expression such as File Language to dynamically set the filename. For consumers, it's used as a filename filter. For producers, it's used to evaluate the filename to write. If an expression is set, it take precedence over the CamelFil [...]
-    "jschLoggingLevel": { "index": 8, "kind": "parameter", "displayName": "Jsch Logging Level", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.LoggingLevel", "enum": [ "TRACE", "DEBUG", "INFO", "WARN", "ERROR", "OFF" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "WARN", "configurationClass": "org.apache.camel.component.file.remote.SftpConfiguration", "configurationField": "configuration", "description": "T [...]
+    "jschLoggingLevel": { "index": 8, "kind": "parameter", "displayName": "Jsch Logging Level", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.LoggingLevel", "enum": [ "DEBUG", "INFO", "WARN", "ERROR" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "WARN", "configurationClass": "org.apache.camel.component.file.remote.SftpConfiguration", "configurationField": "configuration", "description": "The logging level [...]
     "passiveMode": { "index": 9, "kind": "parameter", "displayName": "Passive Mode", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.file.remote.SftpConfiguration", "configurationField": "configuration", "description": "Sets passive mode connections. Default is active mode connections." },
     "separator": { "index": 10, "kind": "parameter", "displayName": "Separator", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.file.remote.RemoteFileConfiguration.PathSeparator", "enum": [ "UNIX", "Windows", "Auto" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "UNIX", "configurationClass": "org.apache.camel.component.file.remote.SftpConfiguration", "configurationField": "configuration", "descrip [...]
     "fastExistsCheck": { "index": 11, "kind": "parameter", "displayName": "Fast Exists Check", "group": "common (advanced)", "label": "common,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "If set this option to be true, camel-ftp will use the list file directly to check if the file exists. Since some FTP server may not support to list the file directly, if the option  [...]
diff --git a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpConfiguration.java b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpConfiguration.java
index 141483e7105..ca5c7209984 100644
--- a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpConfiguration.java
+++ b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpConfiguration.java
@@ -68,7 +68,7 @@ public class SftpConfiguration extends RemoteFileConfiguration {
     private int compression;
     @UriParam(label = "security")
     private String preferredAuthentications;
-    @UriParam(defaultValue = "WARN")
+    @UriParam(defaultValue = "WARN", enums = "DEBUG,INFO,WARN,ERROR")
     private LoggingLevel jschLoggingLevel = LoggingLevel.WARN;
     @UriParam(label = "advanced")
     private Integer bulkRequests;


(camel) 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 main
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 54867f9194d0d83e9885e86cc29a7bebd4d4a13c
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Jan 2 12:22:10 2024 +0100

    Regen
---
 .../dsl/JsonValidatorEndpointBuilderFactory.java   | 32 ++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JsonValidatorEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JsonValidatorEndpointBuilderFactory.java
index f2eebc6f233..252ceeb0f40 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JsonValidatorEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JsonValidatorEndpointBuilderFactory.java
@@ -255,6 +255,38 @@ public interface JsonValidatorEndpointBuilderFactory {
             doSetProperty("lazyStartProducer", lazyStartProducer);
             return this;
         }
+        /**
+         * Comma-separated list of Jackson DeserializationFeature enum values
+         * which will be disabled for parsing exchange body.
+         * 
+         * The option is a: &lt;code&gt;java.lang.String&lt;/code&gt; type.
+         * 
+         * Group: advanced
+         * 
+         * @param disabledDeserializationFeatures the value to set
+         * @return the dsl builder
+         */
+        default AdvancedJsonValidatorEndpointBuilder disabledDeserializationFeatures(
+                String disabledDeserializationFeatures) {
+            doSetProperty("disabledDeserializationFeatures", disabledDeserializationFeatures);
+            return this;
+        }
+        /**
+         * Comma-separated list of Jackson DeserializationFeature enum values
+         * which will be enabled for parsing exchange body.
+         * 
+         * The option is a: &lt;code&gt;java.lang.String&lt;/code&gt; type.
+         * 
+         * Group: advanced
+         * 
+         * @param enabledDeserializationFeatures the value to set
+         * @return the dsl builder
+         */
+        default AdvancedJsonValidatorEndpointBuilder enabledDeserializationFeatures(
+                String enabledDeserializationFeatures) {
+            doSetProperty("enabledDeserializationFeatures", enabledDeserializationFeatures);
+            return this;
+        }
         /**
          * To use a custom ValidatorErrorHandler. The default error handler
          * captures the errors and throws an exception.