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-spring-boot.git
The following commit(s) were added to refs/heads/main by this push:
new 765ca33434a Regen
765ca33434a is described below
commit 765ca33434a5eeeca2f87313aceb9b8012f3e683
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Thu Oct 24 07:22:53 2024 +0200
Regen
---
.../springboot/catalog/components/salesforce.json | 45 +++++++++++-----------
.../src/main/docs/salesforce.json | 7 ++++
.../SalesforceComponentConfiguration.java | 13 +++++++
3 files changed, 43 insertions(+), 22 deletions(-)
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 ac9a2075889..266dbdd7d08 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
@@ -104,28 +104,29 @@
"httpProxyIncludedAddresses": { "index": 76, "kind": "property",
"displayName": "Http Proxy Included Addresses", "group": "proxy", "label":
"common,proxy", "required": false, "type": "object", "javaType":
"java.util.Set<java.lang.String>", "deprecated": false, "autowired": false,
"secret": false, "description": "A list of addresses for which HTTP proxy
server should be used." },
"httpProxyPort": { "index": 77, "kind": "property", "displayName": "Http
Proxy Port", "group": "proxy", "label": "common,proxy", "required": false,
"type": "integer", "javaType": "java.lang.Integer", "deprecated": false,
"autowired": false, "secret": false, "description": "Port number of the HTTP
proxy server to use." },
"httpProxySocks4": { "index": 78, "kind": "property", "displayName": "Http
Proxy Socks4", "group": "proxy", "label": "common,proxy", "required": false,
"type": "boolean", "javaType": "boolean", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": false, "description": "If set to true
the configures the HTTP proxy to use as a SOCKS4 proxy." },
- "authenticationType": { "index": 79, "kind": "property", "displayName":
"Authentication Type", "group": "security", "label": "common,security",
"required": false, "type": "object", "javaType":
"org.apache.camel.component.salesforce.AuthenticationType", "enum": [
"USERNAME_PASSWORD", "REFRESH_TOKEN", "CLIENT_CREDENTIALS", "JWT" ],
"deprecated": false, "autowired": false, "secret": false, "description":
"Explicit authentication method to be used, one of USERNAME_PASSWORD,
REFRESH_TOKEN [...]
- "clientId": { "index": 80, "kind": "property", "displayName": "Client Id",
"group": "security", "label": "common,security", "required": true, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": false, "description": "OAuth Consumer Key of the connected app
configured in the Salesforce instance setup. Typically a connected app needs to
be configured but one can be provided by installing a package." },
- "clientSecret": { "index": 81, "kind": "property", "displayName": "Client
Secret", "group": "security", "label": "common,security", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": true, "description": "OAuth Consumer Secret of
the connected app configured in the Salesforce instance setup." },
- "httpProxyAuthUri": { "index": 82, "kind": "property", "displayName":
"Http Proxy Auth Uri", "group": "security", "label": "common,proxy,security",
"required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "description": "Used
in authentication against the HTTP proxy server, needs to match the URI of the
proxy server in order for the httpProxyUsername and httpProxyPassword to be
used for authentication." },
- "httpProxyPassword": { "index": 83, "kind": "property", "displayName":
"Http Proxy Password", "group": "security", "label": "common,proxy,security",
"required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": true, "description":
"Password to use to authenticate against the HTTP proxy server." },
- "httpProxyRealm": { "index": 84, "kind": "property", "displayName": "Http
Proxy Realm", "group": "security", "label": "common,proxy,security",
"required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "description": "Realm
of the proxy server, used in preemptive Basic\/Digest authentication methods
against the HTTP proxy server." },
- "httpProxySecure": { "index": 85, "kind": "property", "displayName": "Http
Proxy Secure", "group": "security", "label": "common,proxy,security",
"required": false, "type": "boolean", "javaType": "boolean", "deprecated":
false, "autowired": false, "secret": false, "defaultValue": true,
"description": "If set to false disables the use of TLS when accessing the HTTP
proxy." },
- "httpProxyUseDigestAuth": { "index": 86, "kind": "property",
"displayName": "Http Proxy Use Digest Auth", "group": "security", "label":
"common,proxy,security", "required": false, "type": "boolean", "javaType":
"boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "description": "If set to true Digest authentication
will be used when authenticating to the HTTP proxy, otherwise Basic
authorization method will be used" },
- "httpProxyUsername": { "index": 87, "kind": "property", "displayName":
"Http Proxy Username", "group": "security", "label": "common,proxy,security",
"required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "description":
"Username to use to authenticate against the HTTP proxy server." },
- "instanceUrl": { "index": 88, "kind": "property", "displayName": "Instance
Url", "group": "security", "label": "common,security", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "URL of the Salesforce
instance used after authentication, by default received from Salesforce on
successful authentication" },
- "jwtAudience": { "index": 89, "kind": "property", "displayName": "Jwt
Audience", "group": "security", "label": "common,security", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "Value to use for the
Audience claim (aud) when using OAuth JWT flow. If not set, the login URL will
be used, which is appropriate in most cases." },
- "keystore": { "index": 90, "kind": "property", "displayName": "Keystore",
"group": "security", "label": "common,security", "required": false, "type":
"object", "javaType": "org.apache.camel.support.jsse.KeyStoreParameters",
"deprecated": false, "autowired": false, "secret": false, "description":
"KeyStore parameters to use in OAuth JWT flow. The KeyStore should contain only
one entry with private key and certificate. Salesforce does not verify the
certificate chain, so this can easil [...]
- "lazyLogin": { "index": 91, "kind": "property", "displayName": "Lazy
Login", "group": "security", "label": "common,security", "required": false,
"type": "boolean", "javaType": "boolean", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": false, "description": "If set to true
prevents the component from authenticating to Salesforce with the start of the
component. You would generally set this to the (default) false and authenticate
early and be immediately aware [...]
- "loginConfig": { "index": 92, "kind": "property", "displayName": "Login
Config", "group": "security", "label": "common,security", "required": false,
"type": "object", "javaType":
"org.apache.camel.component.salesforce.SalesforceLoginConfig", "deprecated":
false, "autowired": false, "secret": false, "description": "All authentication
configuration in one nested bean, all properties set there can be set directly
on the component as well" },
- "loginUrl": { "index": 93, "kind": "property", "displayName": "Login Url",
"group": "security", "label": "common,security", "required": true, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": "https:\/\/login.salesforce.com",
"description": "URL of the Salesforce instance used for authentication, by
default set to https:\/\/login.salesforce.com" },
- "password": { "index": 94, "kind": "property", "displayName": "Password",
"group": "security", "label": "common,security", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": true, "description": "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 secur [...]
- "pubSubHost": { "index": 95, "kind": "property", "displayName": "Pub Sub
Host", "group": "security", "label": "common,security", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "defaultValue":
"api.pubsub.salesforce.com", "description": "Pub\/Sub host" },
- "pubSubPort": { "index": 96, "kind": "property", "displayName": "Pub Sub
Port", "group": "security", "label": "common,security", "required": false,
"type": "integer", "javaType": "int", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": 7443, "description": "Pub\/Sub port" },
- "refreshToken": { "index": 97, "kind": "property", "displayName": "Refresh
Token", "group": "security", "label": "common,security", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": true, "description": "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:\/\/l [...]
- "sslContextParameters": { "index": 98, "kind": "property", "displayName":
"Ssl Context Parameters", "group": "security", "label": "common,security",
"required": false, "type": "object", "javaType":
"org.apache.camel.support.jsse.SSLContextParameters", "deprecated": false,
"autowired": false, "secret": false, "description": "SSL parameters to use, see
SSLContextParameters class for all available options." },
- "useGlobalSslContextParameters": { "index": 99, "kind": "property",
"displayName": "Use Global Ssl Context Parameters", "group": "security",
"label": "security", "required": false, "type": "boolean", "javaType":
"boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "description": "Enable usage of global SSL context
parameters" },
- "userName": { "index": 100, "kind": "property", "displayName": "User
Name", "group": "security", "label": "common,security", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "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." }
+ "pubsubAllowUseSystemProxy": { "index": 79, "kind": "property",
"displayName": "Pubsub Allow Use System Proxy", "group": "proxy", "label":
"common,proxy", "required": false, "type": "boolean", "javaType": "boolean",
"deprecated": false, "autowired": false, "secret": false, "defaultValue": true,
"description": "Allow the Pub\/Sub API client to use the proxy detected by
java.net.ProxySelector. If false then no proxy server will be used." },
+ "authenticationType": { "index": 80, "kind": "property", "displayName":
"Authentication Type", "group": "security", "label": "common,security",
"required": false, "type": "object", "javaType":
"org.apache.camel.component.salesforce.AuthenticationType", "enum": [
"USERNAME_PASSWORD", "REFRESH_TOKEN", "CLIENT_CREDENTIALS", "JWT" ],
"deprecated": false, "autowired": false, "secret": false, "description":
"Explicit authentication method to be used, one of USERNAME_PASSWORD,
REFRESH_TOKEN [...]
+ "clientId": { "index": 81, "kind": "property", "displayName": "Client Id",
"group": "security", "label": "common,security", "required": true, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": false, "description": "OAuth Consumer Key of the connected app
configured in the Salesforce instance setup. Typically a connected app needs to
be configured but one can be provided by installing a package." },
+ "clientSecret": { "index": 82, "kind": "property", "displayName": "Client
Secret", "group": "security", "label": "common,security", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": true, "description": "OAuth Consumer Secret of
the connected app configured in the Salesforce instance setup." },
+ "httpProxyAuthUri": { "index": 83, "kind": "property", "displayName":
"Http Proxy Auth Uri", "group": "security", "label": "common,proxy,security",
"required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "description": "Used
in authentication against the HTTP proxy server, needs to match the URI of the
proxy server in order for the httpProxyUsername and httpProxyPassword to be
used for authentication." },
+ "httpProxyPassword": { "index": 84, "kind": "property", "displayName":
"Http Proxy Password", "group": "security", "label": "common,proxy,security",
"required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": true, "description":
"Password to use to authenticate against the HTTP proxy server." },
+ "httpProxyRealm": { "index": 85, "kind": "property", "displayName": "Http
Proxy Realm", "group": "security", "label": "common,proxy,security",
"required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "description": "Realm
of the proxy server, used in preemptive Basic\/Digest authentication methods
against the HTTP proxy server." },
+ "httpProxySecure": { "index": 86, "kind": "property", "displayName": "Http
Proxy Secure", "group": "security", "label": "common,proxy,security",
"required": false, "type": "boolean", "javaType": "boolean", "deprecated":
false, "autowired": false, "secret": false, "defaultValue": true,
"description": "If set to false disables the use of TLS when accessing the HTTP
proxy." },
+ "httpProxyUseDigestAuth": { "index": 87, "kind": "property",
"displayName": "Http Proxy Use Digest Auth", "group": "security", "label":
"common,proxy,security", "required": false, "type": "boolean", "javaType":
"boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "description": "If set to true Digest authentication
will be used when authenticating to the HTTP proxy, otherwise Basic
authorization method will be used" },
+ "httpProxyUsername": { "index": 88, "kind": "property", "displayName":
"Http Proxy Username", "group": "security", "label": "common,proxy,security",
"required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "description":
"Username to use to authenticate against the HTTP proxy server." },
+ "instanceUrl": { "index": 89, "kind": "property", "displayName": "Instance
Url", "group": "security", "label": "common,security", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "URL of the Salesforce
instance used after authentication, by default received from Salesforce on
successful authentication" },
+ "jwtAudience": { "index": 90, "kind": "property", "displayName": "Jwt
Audience", "group": "security", "label": "common,security", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "Value to use for the
Audience claim (aud) when using OAuth JWT flow. If not set, the login URL will
be used, which is appropriate in most cases." },
+ "keystore": { "index": 91, "kind": "property", "displayName": "Keystore",
"group": "security", "label": "common,security", "required": false, "type":
"object", "javaType": "org.apache.camel.support.jsse.KeyStoreParameters",
"deprecated": false, "autowired": false, "secret": false, "description":
"KeyStore parameters to use in OAuth JWT flow. The KeyStore should contain only
one entry with private key and certificate. Salesforce does not verify the
certificate chain, so this can easil [...]
+ "lazyLogin": { "index": 92, "kind": "property", "displayName": "Lazy
Login", "group": "security", "label": "common,security", "required": false,
"type": "boolean", "javaType": "boolean", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": false, "description": "If set to true
prevents the component from authenticating to Salesforce with the start of the
component. You would generally set this to the (default) false and authenticate
early and be immediately aware [...]
+ "loginConfig": { "index": 93, "kind": "property", "displayName": "Login
Config", "group": "security", "label": "common,security", "required": false,
"type": "object", "javaType":
"org.apache.camel.component.salesforce.SalesforceLoginConfig", "deprecated":
false, "autowired": false, "secret": false, "description": "All authentication
configuration in one nested bean, all properties set there can be set directly
on the component as well" },
+ "loginUrl": { "index": 94, "kind": "property", "displayName": "Login Url",
"group": "security", "label": "common,security", "required": true, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": "https:\/\/login.salesforce.com",
"description": "URL of the Salesforce instance used for authentication, by
default set to https:\/\/login.salesforce.com" },
+ "password": { "index": 95, "kind": "property", "displayName": "Password",
"group": "security", "label": "common,security", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": true, "description": "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 secur [...]
+ "pubSubHost": { "index": 96, "kind": "property", "displayName": "Pub Sub
Host", "group": "security", "label": "common,security", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "defaultValue":
"api.pubsub.salesforce.com", "description": "Pub\/Sub host" },
+ "pubSubPort": { "index": 97, "kind": "property", "displayName": "Pub Sub
Port", "group": "security", "label": "common,security", "required": false,
"type": "integer", "javaType": "int", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": 7443, "description": "Pub\/Sub port" },
+ "refreshToken": { "index": 98, "kind": "property", "displayName": "Refresh
Token", "group": "security", "label": "common,security", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": true, "description": "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:\/\/l [...]
+ "sslContextParameters": { "index": 99, "kind": "property", "displayName":
"Ssl Context Parameters", "group": "security", "label": "common,security",
"required": false, "type": "object", "javaType":
"org.apache.camel.support.jsse.SSLContextParameters", "deprecated": false,
"autowired": false, "secret": false, "description": "SSL parameters to use, see
SSLContextParameters class for all available options." },
+ "useGlobalSslContextParameters": { "index": 100, "kind": "property",
"displayName": "Use Global Ssl Context Parameters", "group": "security",
"label": "security", "required": false, "type": "boolean", "javaType":
"boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "description": "Enable usage of global SSL context
parameters" },
+ "userName": { "index": 101, "kind": "property", "displayName": "User
Name", "group": "security", "label": "common,security", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "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." }
},
"headers": {
"CamelSalesforceReplayId": { "index": 0, "kind": "header", "displayName":
"", "group": "consumer", "label": "consumer", "required": false, "javaType":
"Object", "deprecated": false, "deprecationNote": "", "autowired": false,
"secret": false, "description": "The Streaming API replayId.", "constantName":
"org.apache.camel.component.salesforce.SalesforceConstants#HEADER_SALESFORCE_REPLAY_ID"
},
diff --git
a/components-starter/camel-salesforce-starter/src/main/docs/salesforce.json
b/components-starter/camel-salesforce-starter/src/main/docs/salesforce.json
index a4b98d094e8..5afa6be6cf6 100644
--- a/components-starter/camel-salesforce-starter/src/main/docs/salesforce.json
+++ b/components-starter/camel-salesforce-starter/src/main/docs/salesforce.json
@@ -489,6 +489,13 @@
"sourceType":
"org.apache.camel.component.salesforce.springboot.SalesforceComponentConfiguration",
"defaultValue": 7443
},
+ {
+ "name": "camel.component.salesforce.pubsub-allow-use-system-proxy",
+ "type": "java.lang.Boolean",
+ "description": "Allow the Pub\/Sub API client to use the proxy detected
by java.net.ProxySelector. If false then no proxy server will be used.",
+ "sourceType":
"org.apache.camel.component.salesforce.springboot.SalesforceComponentConfiguration",
+ "defaultValue": true
+ },
{
"name": "camel.component.salesforce.query-locator",
"type": "java.lang.String",
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 bc822e1f5e1..eab47dd12cc 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
@@ -448,6 +448,11 @@ public class SalesforceComponentConfiguration
* If set to true the configures the HTTP proxy to use as a SOCKS4 proxy.
*/
private Boolean httpProxySocks4 = false;
+ /**
+ * Allow the Pub/Sub API client to use the proxy detected by
+ * java.net.ProxySelector. If false then no proxy server will be used.
+ */
+ private Boolean pubsubAllowUseSystemProxy = true;
/**
* Explicit authentication method to be used, one of USERNAME_PASSWORD,
* REFRESH_TOKEN, CLIENT_CREDENTIALS, or JWT. Salesforce component can
@@ -1212,6 +1217,14 @@ public class SalesforceComponentConfiguration
this.httpProxySocks4 = httpProxySocks4;
}
+ public Boolean getPubsubAllowUseSystemProxy() {
+ return pubsubAllowUseSystemProxy;
+ }
+
+ public void setPubsubAllowUseSystemProxy(Boolean
pubsubAllowUseSystemProxy) {
+ this.pubsubAllowUseSystemProxy = pubsubAllowUseSystemProxy;
+ }
+
public AuthenticationType getAuthenticationType() {
return authenticationType;
}
