This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
The following commit(s) were added to refs/heads/master by this push: new 3a08b7b [create-pull-request] automated change 3a08b7b is described below commit 3a08b7bcdd5ae47cd59e8fa601c7857cfbaab8a6 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Tue Aug 11 01:26:27 2020 +0000 [create-pull-request] automated change --- .../catalog/components/atmosphere-websocket.json | 1 + .../camel/springboot/catalog/components/http.json | 8 ++ .../camel/springboot/catalog/components/https.json | 8 ++ .../springboot/catalog/components/resteasy.json | 8 ++ .../springboot/catalog/components/salesforce.json | 2 +- .../springboot/catalog/components/vertx-http.json | 9 ++ .../src/main/docs/http-starter.adoc | 10 +- .../springboot/HttpComponentConfiguration.java | 84 ++++++++++++++++ .../src/main/docs/resteasy-starter.adoc | 9 +- .../springboot/ResteasyComponentConfiguration.java | 84 ++++++++++++++++ .../src/main/docs/salesforce-starter.adoc | 2 +- .../SalesforceComponentConfiguration.java | 5 - .../src/main/docs/vertx-http-starter.adoc | 13 ++- .../VertxHttpComponentConfiguration.java | 110 +++++++++++++++++++++ docs/modules/ROOT/pages/http-starter.adoc | 10 +- docs/modules/ROOT/pages/resteasy-starter.adoc | 9 +- docs/modules/ROOT/pages/salesforce-starter.adoc | 2 +- docs/modules/ROOT/pages/vertx-http-starter.adoc | 13 ++- tooling/camel-spring-boot-dependencies/pom.xml | 5 + 19 files changed, 372 insertions(+), 20 deletions(-) diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/atmosphere-websocket.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/atmosphere-websocket.json index 73a5bf3..d9360ed 100644 --- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/atmosphere-websocket.json +++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/atmosphere-websocket.json @@ -72,6 +72,7 @@ "mapHttpMessageFormUrlEncodedBody": { "kind": "parameter", "displayName": "Map Http Message Form Url Encoded Body", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "description": "If this option is true then IN exchange Form Encoded body of the exchange will be mapped to HTTP. Setting this to false will avoid the HTTP Form Encoded body mapping." }, "mapHttpMessageHeaders": { "kind": "parameter", "displayName": "Map Http Message Headers", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "description": "If this option is true then IN exchange Headers of the exchange will be mapped to HTTP headers. Setting this to false will avoid the HTTP Headers mapping." }, "synchronous": { "kind": "parameter", "displayName": "Synchronous", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "false", "description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported)." }, + "proxyAuthNtHost": { "kind": "parameter", "displayName": "Proxy Auth Nt Host", "group": "proxy", "label": "producer,proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Proxy authentication domain (workstation name) to use with NTML" }, "proxyAuthScheme": { "kind": "parameter", "displayName": "Proxy Auth Scheme", "group": "proxy", "label": "producer,proxy", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "http", "https" ], "deprecated": false, "secret": false, "description": "Proxy authentication scheme to use" }, "proxyHost": { "kind": "parameter", "displayName": "Proxy Host", "group": "proxy", "label": "producer,proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Proxy hostname to use" }, "proxyPort": { "kind": "parameter", "displayName": "Proxy Port", "group": "proxy", "label": "producer,proxy", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "description": "Proxy port to use" }, diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/http.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/http.json index 4beae03..e83ee55 100644 --- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/http.json +++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/http.json @@ -36,6 +36,13 @@ "httpContext": { "kind": "property", "displayName": "Http Context", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.http.protocol.HttpContext", "deprecated": false, "secret": false, "description": "To use a custom org.apache.http.protocol.HttpContext when executing requests." }, "maxTotalConnections": { "kind": "property", "displayName": "Max Total Connections", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "defaultValue": "200", "description": "The maximum number of connections." }, "headerFilterStrategy": { "kind": "property", "displayName": "Header Filter Strategy", "group": "filter", "label": "filter", "required": false, "type": "object", "javaType": "org.apache.camel.spi.HeaderFilterStrategy", "deprecated": false, "secret": false, "description": "To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message." }, + "proxyAuthDomain": { "kind": "property", "displayName": "Proxy Auth Domain", "group": "proxy", "label": "producer,proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Proxy authentication domain to use" }, + "proxyAuthHost": { "kind": "property", "displayName": "Proxy Auth Host", "group": "proxy", "label": "producer,proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Proxy authentication host" }, + "proxyAuthMethod": { "kind": "property", "displayName": "Proxy Auth Method", "group": "proxy", "label": "producer,proxy", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "Basic", "Digest", "NTLM" ], "deprecated": false, "secret": false, "description": "Proxy authentication method to use" }, + "proxyAuthNtHost": { "kind": "property", "displayName": "Proxy Auth Nt Host", "group": "proxy", "label": "producer,proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Proxy authentication domain (workstation name) to use with NTML" }, + "proxyAuthPassword": { "kind": "property", "displayName": "Proxy Auth Password", "group": "proxy", "label": "producer,proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "description": "Proxy authentication password" }, + "proxyAuthPort": { "kind": "property", "displayName": "Proxy Auth Port", "group": "proxy", "label": "producer,proxy", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "description": "Proxy authentication port" }, + "proxyAuthUsername": { "kind": "property", "displayName": "Proxy Auth Username", "group": "proxy", "label": "producer,proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "description": "Proxy authentication username" }, "sslContextParameters": { "kind": "property", "displayName": "Ssl Context Parameters", "group": "security", "label": "security", "required": false, "type": "object", "javaType": "org.apache.camel.support.jsse.SSLContextParameters", "deprecated": false, "secret": false, "description": "To configure security using SSLContextParameters. Important: Only one instance of org.apache.camel.support.jsse.SSLContextParameters is supported per HttpComponent. If you need to use 2 or more differen [...] "useGlobalSslContextParameters": { "kind": "property", "displayName": "Use Global Ssl Context Parameters", "group": "security", "label": "security", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "false", "description": "Enable usage of global SSL context parameters." }, "x509HostnameVerifier": { "kind": "property", "displayName": "X509 Hostname Verifier", "group": "security", "label": "security", "required": false, "type": "object", "javaType": "javax.net.ssl.HostnameVerifier", "deprecated": false, "secret": false, "description": "To use a custom X509HostnameVerifier such as DefaultHostnameVerifier or NoopHostnameVerifier." }, @@ -82,6 +89,7 @@ "proxyAuthDomain": { "kind": "parameter", "displayName": "Proxy Auth Domain", "group": "proxy", "label": "producer,proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Proxy authentication domain to use with NTML" }, "proxyAuthHost": { "kind": "parameter", "displayName": "Proxy Auth Host", "group": "proxy", "label": "producer,proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Proxy authentication host" }, "proxyAuthMethod": { "kind": "parameter", "displayName": "Proxy Auth Method", "group": "proxy", "label": "producer,proxy", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "Basic", "Digest", "NTLM" ], "deprecated": false, "secret": false, "description": "Proxy authentication method to use" }, + "proxyAuthNtHost": { "kind": "parameter", "displayName": "Proxy Auth Nt Host", "group": "proxy", "label": "producer,proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Proxy authentication domain (workstation name) to use with NTML" }, "proxyAuthPassword": { "kind": "parameter", "displayName": "Proxy Auth Password", "group": "proxy", "label": "producer,proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "description": "Proxy authentication password" }, "proxyAuthPort": { "kind": "parameter", "displayName": "Proxy Auth Port", "group": "proxy", "label": "producer,proxy", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "description": "Proxy authentication port" }, "proxyAuthScheme": { "kind": "parameter", "displayName": "Proxy Auth Scheme", "group": "proxy", "label": "producer,proxy", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "http", "https" ], "deprecated": false, "secret": false, "description": "Proxy authentication scheme to use" }, diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/https.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/https.json index 3c30bbf..92069cf 100644 --- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/https.json +++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/https.json @@ -36,6 +36,13 @@ "httpContext": { "kind": "property", "displayName": "Http Context", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.http.protocol.HttpContext", "deprecated": false, "secret": false, "description": "To use a custom org.apache.http.protocol.HttpContext when executing requests." }, "maxTotalConnections": { "kind": "property", "displayName": "Max Total Connections", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "defaultValue": "200", "description": "The maximum number of connections." }, "headerFilterStrategy": { "kind": "property", "displayName": "Header Filter Strategy", "group": "filter", "label": "filter", "required": false, "type": "object", "javaType": "org.apache.camel.spi.HeaderFilterStrategy", "deprecated": false, "secret": false, "description": "To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message." }, + "proxyAuthDomain": { "kind": "property", "displayName": "Proxy Auth Domain", "group": "proxy", "label": "producer,proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Proxy authentication domain to use" }, + "proxyAuthHost": { "kind": "property", "displayName": "Proxy Auth Host", "group": "proxy", "label": "producer,proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Proxy authentication host" }, + "proxyAuthMethod": { "kind": "property", "displayName": "Proxy Auth Method", "group": "proxy", "label": "producer,proxy", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "Basic", "Digest", "NTLM" ], "deprecated": false, "secret": false, "description": "Proxy authentication method to use" }, + "proxyAuthNtHost": { "kind": "property", "displayName": "Proxy Auth Nt Host", "group": "proxy", "label": "producer,proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Proxy authentication domain (workstation name) to use with NTML" }, + "proxyAuthPassword": { "kind": "property", "displayName": "Proxy Auth Password", "group": "proxy", "label": "producer,proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "description": "Proxy authentication password" }, + "proxyAuthPort": { "kind": "property", "displayName": "Proxy Auth Port", "group": "proxy", "label": "producer,proxy", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "description": "Proxy authentication port" }, + "proxyAuthUsername": { "kind": "property", "displayName": "Proxy Auth Username", "group": "proxy", "label": "producer,proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "description": "Proxy authentication username" }, "sslContextParameters": { "kind": "property", "displayName": "Ssl Context Parameters", "group": "security", "label": "security", "required": false, "type": "object", "javaType": "org.apache.camel.support.jsse.SSLContextParameters", "deprecated": false, "secret": false, "description": "To configure security using SSLContextParameters. Important: Only one instance of org.apache.camel.support.jsse.SSLContextParameters is supported per HttpComponent. If you need to use 2 or more differen [...] "useGlobalSslContextParameters": { "kind": "property", "displayName": "Use Global Ssl Context Parameters", "group": "security", "label": "security", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "false", "description": "Enable usage of global SSL context parameters." }, "x509HostnameVerifier": { "kind": "property", "displayName": "X509 Hostname Verifier", "group": "security", "label": "security", "required": false, "type": "object", "javaType": "javax.net.ssl.HostnameVerifier", "deprecated": false, "secret": false, "description": "To use a custom X509HostnameVerifier such as DefaultHostnameVerifier or NoopHostnameVerifier." }, @@ -82,6 +89,7 @@ "proxyAuthDomain": { "kind": "parameter", "displayName": "Proxy Auth Domain", "group": "proxy", "label": "producer,proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Proxy authentication domain to use with NTML" }, "proxyAuthHost": { "kind": "parameter", "displayName": "Proxy Auth Host", "group": "proxy", "label": "producer,proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Proxy authentication host" }, "proxyAuthMethod": { "kind": "parameter", "displayName": "Proxy Auth Method", "group": "proxy", "label": "producer,proxy", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "Basic", "Digest", "NTLM" ], "deprecated": false, "secret": false, "description": "Proxy authentication method to use" }, + "proxyAuthNtHost": { "kind": "parameter", "displayName": "Proxy Auth Nt Host", "group": "proxy", "label": "producer,proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Proxy authentication domain (workstation name) to use with NTML" }, "proxyAuthPassword": { "kind": "parameter", "displayName": "Proxy Auth Password", "group": "proxy", "label": "producer,proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "description": "Proxy authentication password" }, "proxyAuthPort": { "kind": "parameter", "displayName": "Proxy Auth Port", "group": "proxy", "label": "producer,proxy", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "description": "Proxy authentication port" }, "proxyAuthScheme": { "kind": "parameter", "displayName": "Proxy Auth Scheme", "group": "proxy", "label": "producer,proxy", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "http", "https" ], "deprecated": false, "secret": false, "description": "Proxy authentication scheme to use" }, diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/resteasy.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/resteasy.json index f967776..055512c 100644 --- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/resteasy.json +++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/resteasy.json @@ -30,6 +30,13 @@ "basicPropertyBinding": { "kind": "property", "displayName": "Basic Property Binding", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities" }, "httpBinding": { "kind": "property", "displayName": "Http Binding", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.http.common.HttpBinding", "deprecated": false, "secret": false, "description": "To use a custom HttpBinding to control the mapping between Camel message and HttpClient." }, "headerFilterStrategy": { "kind": "property", "displayName": "Header Filter Strategy", "group": "filter", "label": "filter", "required": false, "type": "object", "javaType": "org.apache.camel.spi.HeaderFilterStrategy", "deprecated": false, "secret": false, "description": "To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message." }, + "proxyAuthDomain": { "kind": "property", "displayName": "Proxy Auth Domain", "group": "proxy", "label": "producer,proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Proxy authentication domain to use" }, + "proxyAuthHost": { "kind": "property", "displayName": "Proxy Auth Host", "group": "proxy", "label": "producer,proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Proxy authentication host" }, + "proxyAuthMethod": { "kind": "property", "displayName": "Proxy Auth Method", "group": "proxy", "label": "producer,proxy", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "Basic", "Digest", "NTLM" ], "deprecated": false, "secret": false, "description": "Proxy authentication method to use" }, + "proxyAuthNtHost": { "kind": "property", "displayName": "Proxy Auth Nt Host", "group": "proxy", "label": "producer,proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Proxy authentication domain (workstation name) to use with NTML" }, + "proxyAuthPassword": { "kind": "property", "displayName": "Proxy Auth Password", "group": "proxy", "label": "producer,proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "description": "Proxy authentication password" }, + "proxyAuthPort": { "kind": "property", "displayName": "Proxy Auth Port", "group": "proxy", "label": "producer,proxy", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "description": "Proxy authentication port" }, + "proxyAuthUsername": { "kind": "property", "displayName": "Proxy Auth Username", "group": "proxy", "label": "producer,proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "description": "Proxy authentication username" }, "sslContextParameters": { "kind": "property", "displayName": "Ssl Context Parameters", "group": "security", "label": "security", "required": false, "type": "object", "javaType": "org.apache.camel.support.jsse.SSLContextParameters", "deprecated": false, "secret": false, "description": "To configure security using SSLContextParameters. Important: Only one instance of org.apache.camel.support.jsse.SSLContextParameters is supported per HttpComponent. If you need to use 2 or more differen [...] "useGlobalSslContextParameters": { "kind": "property", "displayName": "Use Global Ssl Context Parameters", "group": "security", "label": "security", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "false", "description": "Enable usage of global SSL context parameters." }, "x509HostnameVerifier": { "kind": "property", "displayName": "X509 Hostname Verifier", "group": "security", "label": "security", "required": false, "type": "object", "javaType": "javax.net.ssl.HostnameVerifier", "deprecated": false, "secret": false, "description": "To use a custom X509HostnameVerifier such as DefaultHostnameVerifier or NoopHostnameVerifier." } @@ -81,6 +88,7 @@ "proxyAuthDomain": { "kind": "parameter", "displayName": "Proxy Auth Domain", "group": "proxy", "label": "producer,proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Proxy authentication domain to use with NTML" }, "proxyAuthHost": { "kind": "parameter", "displayName": "Proxy Auth Host", "group": "proxy", "label": "producer,proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Proxy authentication host" }, "proxyAuthMethod": { "kind": "parameter", "displayName": "Proxy Auth Method", "group": "proxy", "label": "producer,proxy", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "Basic", "Digest", "NTLM" ], "deprecated": false, "secret": false, "description": "Proxy authentication method to use" }, + "proxyAuthNtHost": { "kind": "parameter", "displayName": "Proxy Auth Nt Host", "group": "proxy", "label": "producer,proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Proxy authentication domain (workstation name) to use with NTML" }, "proxyAuthPassword": { "kind": "parameter", "displayName": "Proxy Auth Password", "group": "proxy", "label": "producer,proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "description": "Proxy authentication password" }, "proxyAuthPort": { "kind": "parameter", "displayName": "Proxy Auth Port", "group": "proxy", "label": "producer,proxy", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "description": "Proxy authentication port" }, "proxyAuthScheme": { "kind": "parameter", "displayName": "Proxy Auth Scheme", "group": "proxy", "label": "producer,proxy", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "http", "https" ], "deprecated": false, "secret": false, "description": "Proxy authentication scheme to use" }, diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/salesforce.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/salesforce.json index 892a2d7..1d609d8 100644 --- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/salesforce.json +++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/salesforce.json @@ -49,7 +49,7 @@ "notifyForOperationUndelete": { "kind": "property", "displayName": "Notify For Operation Undelete", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.salesforce.SalesforceEndpointConfig", "configurationField": "config", "description": "Notify for un-delete operation, defaults to false (API version = 29.0)" }, "notifyForOperationUpdate": { "kind": "property", "displayName": "Notify For Operation Update", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.salesforce.SalesforceEndpointConfig", "configurationField": "config", "description": "Notify for update operation, defaults to false (API version = 29.0)" }, "objectMapper": { "kind": "property", "displayName": "Object Mapper", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.fasterxml.jackson.databind.ObjectMapper", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.salesforce.SalesforceEndpointConfig", "configurationField": "config", "description": "Custom Jackson ObjectMapper to use when serializing\/deserializing Salesforce objects." }, - "packages": { "kind": "property", "displayName": "Packages", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": true, "secret": false, "description": "In what packages are the generated DTO classes. Typically the classes would be generated using camel-salesforce-maven-plugin. Set it if using the generated DTOs to gain the benefit of using short SObject names in parameters\/header values. Multiple packages can be se [...] + "packages": { "kind": "property", "displayName": "Packages", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "In what packages are the generated DTO classes. Typically the classes would be generated using camel-salesforce-maven-plugin. Set it if using the generated DTOs to gain the benefit of using short SObject names in parameters\/header values. Multiple packages can be s [...] "rawPayload": { "kind": "property", "displayName": "Raw Payload", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.salesforce.SalesforceEndpointConfig", "configurationField": "config", "description": "Use raw payload String for request and response (either JSON or XML depending on format), instead of DTOs, false by default" }, "reportId": { "kind": "property", "displayName": "Report Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.salesforce.SalesforceEndpointConfig", "configurationField": "config", "description": "Salesforce1 Analytics report Id" }, "reportMetadata": { "kind": "property", "displayName": "Report Metadata", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.salesforce.api.dto.analytics.reports.ReportMetadata", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.salesforce.SalesforceEndpointConfig", "configurationField": "config", "description": "Salesforce1 Analytics report metadata for filtering" }, diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/vertx-http.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/vertx-http.json index d441bee..4b7063d 100644 --- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/vertx-http.json +++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/vertx-http.json @@ -28,6 +28,15 @@ "vertxHttpBinding": { "kind": "property", "displayName": "Vertx Http Binding", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.vertx.http.VertxHttpBinding", "deprecated": false, "secret": false, "description": "A custom VertxHttpBinding which can control how to bind between Vert.x and Camel" }, "vertxOptions": { "kind": "property", "displayName": "Vertx Options", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "io.vertx.core.VertxOptions", "deprecated": false, "secret": false, "description": "To provide a custom set of vertx options for configuring vertx" }, "headerFilterStrategy": { "kind": "property", "displayName": "Header Filter Strategy", "group": "filter", "label": "filter", "required": false, "type": "object", "javaType": "org.apache.camel.spi.HeaderFilterStrategy", "deprecated": false, "secret": false, "description": "To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message." }, + "proxyHost": { "kind": "property", "displayName": "Proxy Host", "group": "proxy", "label": "proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The proxy server host address" }, + "proxyPassword": { "kind": "property", "displayName": "Proxy Password", "group": "proxy", "label": "proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The proxy server password if authentication is required" }, + "proxyPort": { "kind": "property", "displayName": "Proxy Port", "group": "proxy", "label": "proxy", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "description": "The proxy server port" }, + "proxyType": { "kind": "property", "displayName": "Proxy Type", "group": "proxy", "label": "proxy", "required": false, "type": "object", "javaType": "io.vertx.core.net.ProxyType", "enum": [ "HTTP", "SOCKS4", "SOCKS5" ], "deprecated": false, "secret": false, "description": "The proxy server type" }, + "proxyUsername": { "kind": "property", "displayName": "Proxy Username", "group": "proxy", "label": "proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The proxy server username if authentication is required" }, + "basicAuthPassword": { "kind": "property", "displayName": "Basic Auth Password", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The password to use for basic authentication" }, + "basicAuthUsername": { "kind": "property", "displayName": "Basic Auth Username", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The user name to use for basic authentication" }, + "bearerToken": { "kind": "property", "displayName": "Bearer Token", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The bearer token to use for bearer token authentication" }, + "sslContextParameters": { "kind": "property", "displayName": "Ssl Context Parameters", "group": "security", "label": "security", "required": false, "type": "object", "javaType": "org.apache.camel.support.jsse.SSLContextParameters", "deprecated": false, "secret": false, "description": "To configure security using SSLContextParameters" }, "useGlobalSslContextParameters": { "kind": "property", "displayName": "Use Global Ssl Context Parameters", "group": "security", "label": "security", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "false", "description": "Enable usage of global SSL context parameters" } }, "properties": { diff --git a/components-starter/camel-http-starter/src/main/docs/http-starter.adoc b/components-starter/camel-http-starter/src/main/docs/http-starter.adoc index 4f1d67b..9e5d776 100644 --- a/components-starter/camel-http-starter/src/main/docs/http-starter.adoc +++ b/components-starter/camel-http-starter/src/main/docs/http-starter.adoc @@ -17,7 +17,7 @@ When using http with Spring Boot make sure to use the following Maven dependency ---- -The component supports 20 options, which are listed below. +The component supports 27 options, which are listed below. @@ -40,10 +40,16 @@ The component supports 20 options, which are listed below. | *camel.component.http.http-context* | To use a custom org.apache.http.protocol.HttpContext when executing requests. The option is a org.apache.http.protocol.HttpContext type. | | String | *camel.component.http.lazy-start-producer* | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then [...] | *camel.component.http.max-total-connections* | The maximum number of connections. | 200 | Integer +| *camel.component.http.proxy-auth-domain* | Proxy authentication domain to use | | String +| *camel.component.http.proxy-auth-host* | Proxy authentication host | | String +| *camel.component.http.proxy-auth-method* | Proxy authentication method to use | | String +| *camel.component.http.proxy-auth-nt-host* | Proxy authentication domain (workstation name) to use with NTML | | String +| *camel.component.http.proxy-auth-password* | Proxy authentication password | | String +| *camel.component.http.proxy-auth-port* | Proxy authentication port | | Integer +| *camel.component.http.proxy-auth-username* | Proxy authentication username | | String | *camel.component.http.socket-timeout* | Defines the socket timeout in milliseconds, which is the timeout for waiting for data or, put differently, a maximum period inactivity between two consecutive data packets). A timeout value of zero is interpreted as an infinite timeout. A negative value is interpreted as undefined (system default). | -1 | Integer | *camel.component.http.ssl-context-parameters* | To configure security using SSLContextParameters. Important: Only one instance of org.apache.camel.support.jsse.SSLContextParameters is supported per HttpComponent. If you need to use 2 or more different instances, you need to define a new HttpComponent per instance you need. The option is a org.apache.camel.support.jsse.SSLContextParameters type. | | String | *camel.component.http.use-global-ssl-context-parameters* | Enable usage of global SSL context parameters. | false | Boolean | *camel.component.http.x509-hostname-verifier* | To use a custom X509HostnameVerifier such as DefaultHostnameVerifier or NoopHostnameVerifier. The option is a javax.net.ssl.HostnameVerifier type. | | String |=== - // spring-boot-auto-configure options: END diff --git a/components-starter/camel-http-starter/src/main/java/org/apache/camel/component/http/springboot/HttpComponentConfiguration.java b/components-starter/camel-http-starter/src/main/java/org/apache/camel/component/http/springboot/HttpComponentConfiguration.java index 3f5e0bf..b59c8b2 100644 --- a/components-starter/camel-http-starter/src/main/java/org/apache/camel/component/http/springboot/HttpComponentConfiguration.java +++ b/components-starter/camel-http-starter/src/main/java/org/apache/camel/component/http/springboot/HttpComponentConfiguration.java @@ -118,6 +118,34 @@ public class HttpComponentConfiguration */ private String headerFilterStrategy; /** + * Proxy authentication domain to use + */ + private String proxyAuthDomain; + /** + * Proxy authentication host + */ + private String proxyAuthHost; + /** + * Proxy authentication method to use + */ + private String proxyAuthMethod; + /** + * Proxy authentication domain (workstation name) to use with NTML + */ + private String proxyAuthNtHost; + /** + * Proxy authentication password + */ + private String proxyAuthPassword; + /** + * Proxy authentication port + */ + private Integer proxyAuthPort; + /** + * Proxy authentication username + */ + private String proxyAuthUsername; + /** * To configure security using SSLContextParameters. Important: Only one * instance of org.apache.camel.support.jsse.SSLContextParameters is * supported per HttpComponent. If you need to use 2 or more different @@ -262,6 +290,62 @@ public class HttpComponentConfiguration this.headerFilterStrategy = headerFilterStrategy; } + public String getProxyAuthDomain() { + return proxyAuthDomain; + } + + public void setProxyAuthDomain(String proxyAuthDomain) { + this.proxyAuthDomain = proxyAuthDomain; + } + + public String getProxyAuthHost() { + return proxyAuthHost; + } + + public void setProxyAuthHost(String proxyAuthHost) { + this.proxyAuthHost = proxyAuthHost; + } + + public String getProxyAuthMethod() { + return proxyAuthMethod; + } + + public void setProxyAuthMethod(String proxyAuthMethod) { + this.proxyAuthMethod = proxyAuthMethod; + } + + public String getProxyAuthNtHost() { + return proxyAuthNtHost; + } + + public void setProxyAuthNtHost(String proxyAuthNtHost) { + this.proxyAuthNtHost = proxyAuthNtHost; + } + + public String getProxyAuthPassword() { + return proxyAuthPassword; + } + + public void setProxyAuthPassword(String proxyAuthPassword) { + this.proxyAuthPassword = proxyAuthPassword; + } + + public Integer getProxyAuthPort() { + return proxyAuthPort; + } + + public void setProxyAuthPort(Integer proxyAuthPort) { + this.proxyAuthPort = proxyAuthPort; + } + + public String getProxyAuthUsername() { + return proxyAuthUsername; + } + + public void setProxyAuthUsername(String proxyAuthUsername) { + this.proxyAuthUsername = proxyAuthUsername; + } + public String getSslContextParameters() { return sslContextParameters; } diff --git a/components-starter/camel-resteasy-starter/src/main/docs/resteasy-starter.adoc b/components-starter/camel-resteasy-starter/src/main/docs/resteasy-starter.adoc index 9d60a8d..7757014 100644 --- a/components-starter/camel-resteasy-starter/src/main/docs/resteasy-starter.adoc +++ b/components-starter/camel-resteasy-starter/src/main/docs/resteasy-starter.adoc @@ -17,7 +17,7 @@ When using resteasy with Spring Boot make sure to use the following Maven depend ---- -The component supports 11 options, which are listed below. +The component supports 18 options, which are listed below. @@ -31,6 +31,13 @@ The component supports 11 options, which are listed below. | *camel.component.resteasy.header-filter-strategy* | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message. The option is a org.apache.camel.spi.HeaderFilterStrategy type. | | String | *camel.component.resteasy.http-binding* | To use a custom HttpBinding to control the mapping between Camel message and HttpClient. The option is a org.apache.camel.http.common.HttpBinding type. | | String | *camel.component.resteasy.lazy-start-producer* | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed t [...] +| *camel.component.resteasy.proxy-auth-domain* | Proxy authentication domain to use | | String +| *camel.component.resteasy.proxy-auth-host* | Proxy authentication host | | String +| *camel.component.resteasy.proxy-auth-method* | Proxy authentication method to use | | String +| *camel.component.resteasy.proxy-auth-nt-host* | Proxy authentication domain (workstation name) to use with NTML | | String +| *camel.component.resteasy.proxy-auth-password* | Proxy authentication password | | String +| *camel.component.resteasy.proxy-auth-port* | Proxy authentication port | | Integer +| *camel.component.resteasy.proxy-auth-username* | Proxy authentication username | | String | *camel.component.resteasy.proxy-consumers-classes* | Proxy classes for consumer endpoints. Multiple classes can be separated by comma. | | String | *camel.component.resteasy.ssl-context-parameters* | To configure security using SSLContextParameters. Important: Only one instance of org.apache.camel.support.jsse.SSLContextParameters is supported per HttpComponent. If you need to use 2 or more different instances, you need to define a new HttpComponent per instance you need. The option is a org.apache.camel.support.jsse.SSLContextParameters type. | | String | *camel.component.resteasy.use-global-ssl-context-parameters* | Enable usage of global SSL context parameters. | false | Boolean diff --git a/components-starter/camel-resteasy-starter/src/main/java/org/apache/camel/component/resteasy/springboot/ResteasyComponentConfiguration.java b/components-starter/camel-resteasy-starter/src/main/java/org/apache/camel/component/resteasy/springboot/ResteasyComponentConfiguration.java index ffb3ede..4a544d7 100644 --- a/components-starter/camel-resteasy-starter/src/main/java/org/apache/camel/component/resteasy/springboot/ResteasyComponentConfiguration.java +++ b/components-starter/camel-resteasy-starter/src/main/java/org/apache/camel/component/resteasy/springboot/ResteasyComponentConfiguration.java @@ -87,6 +87,34 @@ public class ResteasyComponentConfiguration */ private String headerFilterStrategy; /** + * Proxy authentication domain to use + */ + private String proxyAuthDomain; + /** + * Proxy authentication host + */ + private String proxyAuthHost; + /** + * Proxy authentication method to use + */ + private String proxyAuthMethod; + /** + * Proxy authentication domain (workstation name) to use with NTML + */ + private String proxyAuthNtHost; + /** + * Proxy authentication password + */ + private String proxyAuthPassword; + /** + * Proxy authentication port + */ + private Integer proxyAuthPort; + /** + * Proxy authentication username + */ + private String proxyAuthUsername; + /** * To configure security using SSLContextParameters. Important: Only one * instance of org.apache.camel.support.jsse.SSLContextParameters is * supported per HttpComponent. If you need to use 2 or more different @@ -161,6 +189,62 @@ public class ResteasyComponentConfiguration this.headerFilterStrategy = headerFilterStrategy; } + public String getProxyAuthDomain() { + return proxyAuthDomain; + } + + public void setProxyAuthDomain(String proxyAuthDomain) { + this.proxyAuthDomain = proxyAuthDomain; + } + + public String getProxyAuthHost() { + return proxyAuthHost; + } + + public void setProxyAuthHost(String proxyAuthHost) { + this.proxyAuthHost = proxyAuthHost; + } + + public String getProxyAuthMethod() { + return proxyAuthMethod; + } + + public void setProxyAuthMethod(String proxyAuthMethod) { + this.proxyAuthMethod = proxyAuthMethod; + } + + public String getProxyAuthNtHost() { + return proxyAuthNtHost; + } + + public void setProxyAuthNtHost(String proxyAuthNtHost) { + this.proxyAuthNtHost = proxyAuthNtHost; + } + + public String getProxyAuthPassword() { + return proxyAuthPassword; + } + + public void setProxyAuthPassword(String proxyAuthPassword) { + this.proxyAuthPassword = proxyAuthPassword; + } + + public Integer getProxyAuthPort() { + return proxyAuthPort; + } + + public void setProxyAuthPort(Integer proxyAuthPort) { + this.proxyAuthPort = proxyAuthPort; + } + + public String getProxyAuthUsername() { + return proxyAuthUsername; + } + + public void setProxyAuthUsername(String proxyAuthUsername) { + this.proxyAuthUsername = proxyAuthUsername; + } + public String getSslContextParameters() { return sslContextParameters; } diff --git a/components-starter/camel-salesforce-starter/src/main/docs/salesforce-starter.adoc b/components-starter/camel-salesforce-starter/src/main/docs/salesforce-starter.adoc index 51cfc72..289c893 100644 --- a/components-starter/camel-salesforce-starter/src/main/docs/salesforce-starter.adoc +++ b/components-starter/camel-salesforce-starter/src/main/docs/salesforce-starter.adoc @@ -77,6 +77,7 @@ The component supports 73 options, which are listed below. | *camel.component.salesforce.notify-for-operation-update* | Notify for update operation, defaults to false (API version = 29.0) | | Boolean | *camel.component.salesforce.notify-for-operations* | Notify for operations, options are ALL, CREATE, EXTENDED, UPDATE (API version 29.0) | | NotifyForOperationsEnum | *camel.component.salesforce.object-mapper* | Custom Jackson ObjectMapper to use when serializing/deserializing Salesforce objects. The option is a com.fasterxml.jackson.databind.ObjectMapper type. | | String +| *camel.component.salesforce.packages* | In what packages are the generated DTO classes. Typically the classes would be generated using camel-salesforce-maven-plugin. Set it if using the generated DTOs to gain the benefit of using short SObject names in parameters/header values. Multiple packages can be separated by comma. | | String | *camel.component.salesforce.password* | Password used in OAuth flow to gain access to access token. It's easy to get started with password OAuth flow, but in general one should avoid it as it is deemed less secure than other flows. Make sure that you append security token to the end of the password if using one. | | String | *camel.component.salesforce.raw-payload* | Use raw payload String for request and response (either JSON or XML depending on format), instead of DTOs, false by default | false | Boolean | *camel.component.salesforce.refresh-token* | Refresh token already obtained in the refresh token OAuth flow. One needs to setup a web application and configure a callback URL to receive the refresh token, or configure using the builtin callback at \https://login.salesforce.com/services/oauth2/success or \https://test.salesforce.com/services/oauth2/success and then retrive the refresh_token from the URL at the end of the flow. Note that in development organizations Salesforce allows hos [...] @@ -96,6 +97,5 @@ The component supports 73 options, which are listed below. | *camel.component.salesforce.update-topic* | Whether to update an existing Push Topic when using the Streaming API, defaults to false | false | Boolean | *camel.component.salesforce.use-global-ssl-context-parameters* | Enable usage of global SSL context parameters | false | Boolean | *camel.component.salesforce.user-name* | Username used in OAuth flow to gain access to access token. It's easy to get started with password OAuth flow, but in general one should avoid it as it is deemed less secure than other flows. | | String -| *camel.component.salesforce.packages* | *Deprecated* In what packages are the generated DTO classes. Typically the classes would be generated using camel-salesforce-maven-plugin. Set it if using the generated DTOs to gain the benefit of using short SObject names in parameters/header values. Multiple packages can be separated by comma. | | String |=== // spring-boot-auto-configure options: END diff --git a/components-starter/camel-salesforce-starter/src/main/java/org/apache/camel/component/salesforce/springboot/SalesforceComponentConfiguration.java b/components-starter/camel-salesforce-starter/src/main/java/org/apache/camel/component/salesforce/springboot/SalesforceComponentConfiguration.java index 4d86138..e65d86d 100644 --- a/components-starter/camel-salesforce-starter/src/main/java/org/apache/camel/component/salesforce/springboot/SalesforceComponentConfiguration.java +++ b/components-starter/camel-salesforce-starter/src/main/java/org/apache/camel/component/salesforce/springboot/SalesforceComponentConfiguration.java @@ -28,7 +28,6 @@ import org.apache.camel.component.salesforce.internal.dto.NotifyForFieldsEnum; import org.apache.camel.component.salesforce.internal.dto.NotifyForOperationsEnum; import org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon; import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.boot.context.properties.DeprecatedConfigurationProperty; /** * Communicate with Salesforce using Java DTOs. @@ -173,7 +172,6 @@ public class SalesforceComponentConfiguration * the generated DTOs to gain the benefit of using short SObject names in * parameters/header values. Multiple packages can be separated by comma. */ - @Deprecated private String packages; /** * Use raw payload String for request and response (either JSON or XML @@ -628,13 +626,10 @@ public class SalesforceComponentConfiguration this.objectMapper = objectMapper; } - @Deprecated - @DeprecatedConfigurationProperty public String getPackages() { return packages; } - @Deprecated public void setPackages(String packages) { this.packages = packages; } diff --git a/components-starter/camel-vertx-http-starter/src/main/docs/vertx-http-starter.adoc b/components-starter/camel-vertx-http-starter/src/main/docs/vertx-http-starter.adoc index 4cc06ae..a2b897a 100644 --- a/components-starter/camel-vertx-http-starter/src/main/docs/vertx-http-starter.adoc +++ b/components-starter/camel-vertx-http-starter/src/main/docs/vertx-http-starter.adoc @@ -17,7 +17,7 @@ When using vertx-http with Spring Boot make sure to use the following Maven depe ---- -The component supports 9 options, which are listed below. +The component supports 18 options, which are listed below. @@ -25,15 +25,22 @@ The component supports 9 options, which are listed below. |=== | Name | Description | Default | Type | *camel.component.vertx-http.allow-java-serialized-object* | Whether to allow java serialization when a request has the Content-Type application/x-java-serialized-object This is disabled by default. If you enable this, be aware that Java will deserialize the incoming data from the request. This can be a potential security risk. | false | Boolean +| *camel.component.vertx-http.basic-auth-password* | The password to use for basic authentication | | String +| *camel.component.vertx-http.basic-auth-username* | The user name to use for basic authentication | | String | *camel.component.vertx-http.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean +| *camel.component.vertx-http.bearer-token* | The bearer token to use for bearer token authentication | | String | *camel.component.vertx-http.enabled* | Whether to enable auto configuration of the vertx-http component. This is enabled by default. | | Boolean | *camel.component.vertx-http.header-filter-strategy* | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message. The option is a org.apache.camel.spi.HeaderFilterStrategy type. | | String | *camel.component.vertx-http.lazy-start-producer* | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed [...] +| *camel.component.vertx-http.proxy-host* | The proxy server host address | | String +| *camel.component.vertx-http.proxy-password* | The proxy server password if authentication is required | | String +| *camel.component.vertx-http.proxy-port* | The proxy server port | | Integer +| *camel.component.vertx-http.proxy-type* | The proxy server type | | ProxyType +| *camel.component.vertx-http.proxy-username* | The proxy server username if authentication is required | | String +| *camel.component.vertx-http.ssl-context-parameters* | To configure security using SSLContextParameters. The option is a org.apache.camel.support.jsse.SSLContextParameters type. | | String | *camel.component.vertx-http.use-global-ssl-context-parameters* | Enable usage of global SSL context parameters | false | Boolean | *camel.component.vertx-http.vertx* | To use an existing vertx instead of creating a new instance. The option is a io.vertx.core.Vertx type. | | String | *camel.component.vertx-http.vertx-http-binding* | A custom VertxHttpBinding which can control how to bind between Vert.x and Camel. The option is a org.apache.camel.component.vertx.http.VertxHttpBinding type. | | String | *camel.component.vertx-http.vertx-options* | To provide a custom set of vertx options for configuring vertx. The option is a io.vertx.core.VertxOptions type. | | String |=== - - // spring-boot-auto-configure options: END diff --git a/components-starter/camel-vertx-http-starter/src/main/java/org/apache/camel/component/vertx/http/springboot/VertxHttpComponentConfiguration.java b/components-starter/camel-vertx-http-starter/src/main/java/org/apache/camel/component/vertx/http/springboot/VertxHttpComponentConfiguration.java index 5726a9c..128302d 100644 --- a/components-starter/camel-vertx-http-starter/src/main/java/org/apache/camel/component/vertx/http/springboot/VertxHttpComponentConfiguration.java +++ b/components-starter/camel-vertx-http-starter/src/main/java/org/apache/camel/component/vertx/http/springboot/VertxHttpComponentConfiguration.java @@ -17,6 +17,7 @@ package org.apache.camel.component.vertx.http.springboot; import javax.annotation.Generated; +import io.vertx.core.net.ProxyType; import org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon; import org.springframework.boot.context.properties.ConfigurationProperties; @@ -82,6 +83,43 @@ public class VertxHttpComponentConfiguration */ private String headerFilterStrategy; /** + * The proxy server host address + */ + private String proxyHost; + /** + * The proxy server password if authentication is required + */ + private String proxyPassword; + /** + * The proxy server port + */ + private Integer proxyPort; + /** + * The proxy server type + */ + private ProxyType proxyType; + /** + * The proxy server username if authentication is required + */ + private String proxyUsername; + /** + * The password to use for basic authentication + */ + private String basicAuthPassword; + /** + * The user name to use for basic authentication + */ + private String basicAuthUsername; + /** + * The bearer token to use for bearer token authentication + */ + private String bearerToken; + /** + * To configure security using SSLContextParameters. The option is a + * org.apache.camel.support.jsse.SSLContextParameters type. + */ + private String sslContextParameters; + /** * Enable usage of global SSL context parameters */ private Boolean useGlobalSslContextParameters = false; @@ -142,6 +180,78 @@ public class VertxHttpComponentConfiguration this.headerFilterStrategy = headerFilterStrategy; } + public String getProxyHost() { + return proxyHost; + } + + public void setProxyHost(String proxyHost) { + this.proxyHost = proxyHost; + } + + public String getProxyPassword() { + return proxyPassword; + } + + public void setProxyPassword(String proxyPassword) { + this.proxyPassword = proxyPassword; + } + + public Integer getProxyPort() { + return proxyPort; + } + + public void setProxyPort(Integer proxyPort) { + this.proxyPort = proxyPort; + } + + public ProxyType getProxyType() { + return proxyType; + } + + public void setProxyType(ProxyType proxyType) { + this.proxyType = proxyType; + } + + public String getProxyUsername() { + return proxyUsername; + } + + public void setProxyUsername(String proxyUsername) { + this.proxyUsername = proxyUsername; + } + + public String getBasicAuthPassword() { + return basicAuthPassword; + } + + public void setBasicAuthPassword(String basicAuthPassword) { + this.basicAuthPassword = basicAuthPassword; + } + + public String getBasicAuthUsername() { + return basicAuthUsername; + } + + public void setBasicAuthUsername(String basicAuthUsername) { + this.basicAuthUsername = basicAuthUsername; + } + + public String getBearerToken() { + return bearerToken; + } + + public void setBearerToken(String bearerToken) { + this.bearerToken = bearerToken; + } + + public String getSslContextParameters() { + return sslContextParameters; + } + + public void setSslContextParameters(String sslContextParameters) { + this.sslContextParameters = sslContextParameters; + } + public Boolean getUseGlobalSslContextParameters() { return useGlobalSslContextParameters; } diff --git a/docs/modules/ROOT/pages/http-starter.adoc b/docs/modules/ROOT/pages/http-starter.adoc index 4f1d67b..9e5d776 100644 --- a/docs/modules/ROOT/pages/http-starter.adoc +++ b/docs/modules/ROOT/pages/http-starter.adoc @@ -17,7 +17,7 @@ When using http with Spring Boot make sure to use the following Maven dependency ---- -The component supports 20 options, which are listed below. +The component supports 27 options, which are listed below. @@ -40,10 +40,16 @@ The component supports 20 options, which are listed below. | *camel.component.http.http-context* | To use a custom org.apache.http.protocol.HttpContext when executing requests. The option is a org.apache.http.protocol.HttpContext type. | | String | *camel.component.http.lazy-start-producer* | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then [...] | *camel.component.http.max-total-connections* | The maximum number of connections. | 200 | Integer +| *camel.component.http.proxy-auth-domain* | Proxy authentication domain to use | | String +| *camel.component.http.proxy-auth-host* | Proxy authentication host | | String +| *camel.component.http.proxy-auth-method* | Proxy authentication method to use | | String +| *camel.component.http.proxy-auth-nt-host* | Proxy authentication domain (workstation name) to use with NTML | | String +| *camel.component.http.proxy-auth-password* | Proxy authentication password | | String +| *camel.component.http.proxy-auth-port* | Proxy authentication port | | Integer +| *camel.component.http.proxy-auth-username* | Proxy authentication username | | String | *camel.component.http.socket-timeout* | Defines the socket timeout in milliseconds, which is the timeout for waiting for data or, put differently, a maximum period inactivity between two consecutive data packets). A timeout value of zero is interpreted as an infinite timeout. A negative value is interpreted as undefined (system default). | -1 | Integer | *camel.component.http.ssl-context-parameters* | To configure security using SSLContextParameters. Important: Only one instance of org.apache.camel.support.jsse.SSLContextParameters is supported per HttpComponent. If you need to use 2 or more different instances, you need to define a new HttpComponent per instance you need. The option is a org.apache.camel.support.jsse.SSLContextParameters type. | | String | *camel.component.http.use-global-ssl-context-parameters* | Enable usage of global SSL context parameters. | false | Boolean | *camel.component.http.x509-hostname-verifier* | To use a custom X509HostnameVerifier such as DefaultHostnameVerifier or NoopHostnameVerifier. The option is a javax.net.ssl.HostnameVerifier type. | | String |=== - // spring-boot-auto-configure options: END diff --git a/docs/modules/ROOT/pages/resteasy-starter.adoc b/docs/modules/ROOT/pages/resteasy-starter.adoc index 9d60a8d..7757014 100644 --- a/docs/modules/ROOT/pages/resteasy-starter.adoc +++ b/docs/modules/ROOT/pages/resteasy-starter.adoc @@ -17,7 +17,7 @@ When using resteasy with Spring Boot make sure to use the following Maven depend ---- -The component supports 11 options, which are listed below. +The component supports 18 options, which are listed below. @@ -31,6 +31,13 @@ The component supports 11 options, which are listed below. | *camel.component.resteasy.header-filter-strategy* | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message. The option is a org.apache.camel.spi.HeaderFilterStrategy type. | | String | *camel.component.resteasy.http-binding* | To use a custom HttpBinding to control the mapping between Camel message and HttpClient. The option is a org.apache.camel.http.common.HttpBinding type. | | String | *camel.component.resteasy.lazy-start-producer* | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed t [...] +| *camel.component.resteasy.proxy-auth-domain* | Proxy authentication domain to use | | String +| *camel.component.resteasy.proxy-auth-host* | Proxy authentication host | | String +| *camel.component.resteasy.proxy-auth-method* | Proxy authentication method to use | | String +| *camel.component.resteasy.proxy-auth-nt-host* | Proxy authentication domain (workstation name) to use with NTML | | String +| *camel.component.resteasy.proxy-auth-password* | Proxy authentication password | | String +| *camel.component.resteasy.proxy-auth-port* | Proxy authentication port | | Integer +| *camel.component.resteasy.proxy-auth-username* | Proxy authentication username | | String | *camel.component.resteasy.proxy-consumers-classes* | Proxy classes for consumer endpoints. Multiple classes can be separated by comma. | | String | *camel.component.resteasy.ssl-context-parameters* | To configure security using SSLContextParameters. Important: Only one instance of org.apache.camel.support.jsse.SSLContextParameters is supported per HttpComponent. If you need to use 2 or more different instances, you need to define a new HttpComponent per instance you need. The option is a org.apache.camel.support.jsse.SSLContextParameters type. | | String | *camel.component.resteasy.use-global-ssl-context-parameters* | Enable usage of global SSL context parameters. | false | Boolean diff --git a/docs/modules/ROOT/pages/salesforce-starter.adoc b/docs/modules/ROOT/pages/salesforce-starter.adoc index 51cfc72..289c893 100644 --- a/docs/modules/ROOT/pages/salesforce-starter.adoc +++ b/docs/modules/ROOT/pages/salesforce-starter.adoc @@ -77,6 +77,7 @@ The component supports 73 options, which are listed below. | *camel.component.salesforce.notify-for-operation-update* | Notify for update operation, defaults to false (API version = 29.0) | | Boolean | *camel.component.salesforce.notify-for-operations* | Notify for operations, options are ALL, CREATE, EXTENDED, UPDATE (API version 29.0) | | NotifyForOperationsEnum | *camel.component.salesforce.object-mapper* | Custom Jackson ObjectMapper to use when serializing/deserializing Salesforce objects. The option is a com.fasterxml.jackson.databind.ObjectMapper type. | | String +| *camel.component.salesforce.packages* | In what packages are the generated DTO classes. Typically the classes would be generated using camel-salesforce-maven-plugin. Set it if using the generated DTOs to gain the benefit of using short SObject names in parameters/header values. Multiple packages can be separated by comma. | | String | *camel.component.salesforce.password* | Password used in OAuth flow to gain access to access token. It's easy to get started with password OAuth flow, but in general one should avoid it as it is deemed less secure than other flows. Make sure that you append security token to the end of the password if using one. | | String | *camel.component.salesforce.raw-payload* | Use raw payload String for request and response (either JSON or XML depending on format), instead of DTOs, false by default | false | Boolean | *camel.component.salesforce.refresh-token* | Refresh token already obtained in the refresh token OAuth flow. One needs to setup a web application and configure a callback URL to receive the refresh token, or configure using the builtin callback at \https://login.salesforce.com/services/oauth2/success or \https://test.salesforce.com/services/oauth2/success and then retrive the refresh_token from the URL at the end of the flow. Note that in development organizations Salesforce allows hos [...] @@ -96,6 +97,5 @@ The component supports 73 options, which are listed below. | *camel.component.salesforce.update-topic* | Whether to update an existing Push Topic when using the Streaming API, defaults to false | false | Boolean | *camel.component.salesforce.use-global-ssl-context-parameters* | Enable usage of global SSL context parameters | false | Boolean | *camel.component.salesforce.user-name* | Username used in OAuth flow to gain access to access token. It's easy to get started with password OAuth flow, but in general one should avoid it as it is deemed less secure than other flows. | | String -| *camel.component.salesforce.packages* | *Deprecated* In what packages are the generated DTO classes. Typically the classes would be generated using camel-salesforce-maven-plugin. Set it if using the generated DTOs to gain the benefit of using short SObject names in parameters/header values. Multiple packages can be separated by comma. | | String |=== // spring-boot-auto-configure options: END diff --git a/docs/modules/ROOT/pages/vertx-http-starter.adoc b/docs/modules/ROOT/pages/vertx-http-starter.adoc index 4cc06ae..a2b897a 100644 --- a/docs/modules/ROOT/pages/vertx-http-starter.adoc +++ b/docs/modules/ROOT/pages/vertx-http-starter.adoc @@ -17,7 +17,7 @@ When using vertx-http with Spring Boot make sure to use the following Maven depe ---- -The component supports 9 options, which are listed below. +The component supports 18 options, which are listed below. @@ -25,15 +25,22 @@ The component supports 9 options, which are listed below. |=== | Name | Description | Default | Type | *camel.component.vertx-http.allow-java-serialized-object* | Whether to allow java serialization when a request has the Content-Type application/x-java-serialized-object This is disabled by default. If you enable this, be aware that Java will deserialize the incoming data from the request. This can be a potential security risk. | false | Boolean +| *camel.component.vertx-http.basic-auth-password* | The password to use for basic authentication | | String +| *camel.component.vertx-http.basic-auth-username* | The user name to use for basic authentication | | String | *camel.component.vertx-http.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean +| *camel.component.vertx-http.bearer-token* | The bearer token to use for bearer token authentication | | String | *camel.component.vertx-http.enabled* | Whether to enable auto configuration of the vertx-http component. This is enabled by default. | | Boolean | *camel.component.vertx-http.header-filter-strategy* | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message. The option is a org.apache.camel.spi.HeaderFilterStrategy type. | | String | *camel.component.vertx-http.lazy-start-producer* | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed [...] +| *camel.component.vertx-http.proxy-host* | The proxy server host address | | String +| *camel.component.vertx-http.proxy-password* | The proxy server password if authentication is required | | String +| *camel.component.vertx-http.proxy-port* | The proxy server port | | Integer +| *camel.component.vertx-http.proxy-type* | The proxy server type | | ProxyType +| *camel.component.vertx-http.proxy-username* | The proxy server username if authentication is required | | String +| *camel.component.vertx-http.ssl-context-parameters* | To configure security using SSLContextParameters. The option is a org.apache.camel.support.jsse.SSLContextParameters type. | | String | *camel.component.vertx-http.use-global-ssl-context-parameters* | Enable usage of global SSL context parameters | false | Boolean | *camel.component.vertx-http.vertx* | To use an existing vertx instead of creating a new instance. The option is a io.vertx.core.Vertx type. | | String | *camel.component.vertx-http.vertx-http-binding* | A custom VertxHttpBinding which can control how to bind between Vert.x and Camel. The option is a org.apache.camel.component.vertx.http.VertxHttpBinding type. | | String | *camel.component.vertx-http.vertx-options* | To provide a custom set of vertx options for configuring vertx. The option is a io.vertx.core.VertxOptions type. | | String |=== - - // spring-boot-auto-configure options: END diff --git a/tooling/camel-spring-boot-dependencies/pom.xml b/tooling/camel-spring-boot-dependencies/pom.xml index 5d5b963..1d29ba8 100644 --- a/tooling/camel-spring-boot-dependencies/pom.xml +++ b/tooling/camel-spring-boot-dependencies/pom.xml @@ -3109,6 +3109,11 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> + <artifactId>camel-minio</artifactId> + <version>3.5.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.apache.camel</groupId> <artifactId>camel-mllp</artifactId> <version>3.5.0-SNAPSHOT</version> </dependency>