This is an automated email from the ASF dual-hosted git repository.
davsclaus 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 c71160d CAMEL-15387: camel-salesforce: Can't set Salesforce packages
via application properties. Regen
c71160d is described below
commit c71160df432b30150145bb314de839271ae5dae0
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Sun Aug 9 21:48:14 2020 +0200
CAMEL-15387: camel-salesforce: Can't set Salesforce packages via
application properties. Regen
---
.../apache/camel/springboot/catalog/components/salesforce.json | 2 +-
.../src/main/docs/salesforce-starter.adoc | 2 +-
.../salesforce/springboot/SalesforceComponentConfiguration.java | 8 ++++----
docs/modules/ROOT/pages/salesforce-starter.adoc | 2 +-
tooling/camel-spring-boot-dependencies/pom.xml | 5 +++++
5 files changed, 12 insertions(+), 7 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 d54e93b..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": "array", "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." },
+ "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/components-starter/camel-salesforce-starter/src/main/docs/salesforce-starter.adoc
b/components-starter/camel-salesforce-starter/src/main/docs/salesforce-starter.adoc
index 1801d64..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,7 +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. | | 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 [...]
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 8359483..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
@@ -170,9 +170,9 @@ public class SalesforceComponentConfiguration
* 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.
+ * parameters/header values. Multiple packages can be separated by comma.
*/
- private String[] packages;
+ private String packages;
/**
* Use raw payload String for request and response (either JSON or XML
* depending on format), instead of DTOs, false by default
@@ -626,11 +626,11 @@ public class SalesforceComponentConfiguration
this.objectMapper = objectMapper;
}
- public String[] getPackages() {
+ public String getPackages() {
return packages;
}
- public void setPackages(String[] packages) {
+ public void setPackages(String packages) {
this.packages = packages;
}
diff --git a/docs/modules/ROOT/pages/salesforce-starter.adoc
b/docs/modules/ROOT/pages/salesforce-starter.adoc
index 1801d64..289c893 100644
--- a/docs/modules/ROOT/pages/salesforce-starter.adoc
+++ b/docs/modules/ROOT/pages/salesforce-starter.adoc
@@ -77,7 +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. | | 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 [...]
diff --git a/tooling/camel-spring-boot-dependencies/pom.xml
b/tooling/camel-spring-boot-dependencies/pom.xml
index 5d5b963..0ac984c 100644
--- a/tooling/camel-spring-boot-dependencies/pom.xml
+++ b/tooling/camel-spring-boot-dependencies/pom.xml
@@ -1413,6 +1413,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel.springboot</groupId>
+ <artifactId>camel-reactive-executor-vertx-starter</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel.springboot</groupId>
<artifactId>camel-reactive-streams-starter</artifactId>
<version>${project.version}</version>
</dependency>
