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 97895e5 Regen
97895e5 is described below
commit 97895e5ea6de2873b5664b4963a3c794231288c6
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Wed Dec 9 18:32:38 2020 +0100
Regen
---
.../springboot/catalog/components/salesforce.json | 6 ++--
.../src/main/docs/salesforce-starter.adoc | 3 +-
.../SalesforceComponentConfiguration.java | 36 ++++++++++++++--------
docs/modules/ROOT/pages/salesforce-starter.adoc | 3 +-
docs/modules/ROOT/pages/spring-boot.adoc | 2 +-
5 files changed, 33 insertions(+), 17 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 99f2b50..e466bac 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
@@ -25,7 +25,6 @@
"componentProperties": {
"apexMethod": { "kind": "property", "displayName": "Apex Method", "group":
"common", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"configurationClass":
"org.apache.camel.component.salesforce.SalesforceEndpointConfig",
"configurationField": "config", "description": "APEX method name" },
"apexQueryParams": { "kind": "property", "displayName": "Apex Query
Params", "group": "common", "label": "", "required": false, "type": "object",
"javaType": "java.util.Map<java.lang.String, java.lang.Object>", "deprecated":
false, "autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.salesforce.SalesforceEndpointConfig",
"configurationField": "config", "description": "Query params for APEX method" },
- "apexUrl": { "kind": "property", "displayName": "Apex Url", "group":
"common", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"configurationClass":
"org.apache.camel.component.salesforce.SalesforceEndpointConfig",
"configurationField": "config", "description": "APEX method URL" },
"apiVersion": { "kind": "property", "displayName": "Api Version", "group":
"common", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": "50.0", "configurationClass":
"org.apache.camel.component.salesforce.SalesforceEndpointConfig",
"configurationField": "config", "description": "Salesforce API version." },
"backoffIncrement": { "kind": "property", "displayName": "Backoff
Increment", "group": "common", "label": "", "required": false, "type":
"duration", "javaType": "long", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": "1000", "configurationClass":
"org.apache.camel.component.salesforce.SalesforceEndpointConfig",
"configurationField": "config", "description": "Backoff interval increment for
Streaming connection restart attempts for failures beyond CometD auto- [...]
"batchId": { "kind": "property", "displayName": "Batch Id", "group":
"common", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"configurationClass":
"org.apache.camel.component.salesforce.SalesforceEndpointConfig",
"configurationField": "config", "description": "Bulk API Batch ID" },
@@ -70,6 +69,8 @@
"httpClientProperties": { "kind": "property", "displayName": "Http Client
Properties", "group": "common (advanced)", "label": "common,advanced",
"required": false, "type": "object", "javaType":
"java.util.Map<java.lang.String, java.lang.Object>", "deprecated": false,
"autowired": false, "secret": false, "description": "Used to set any properties
that can be configured on the underlying HTTP client. Have a look at properties
of SalesforceHttpClient and the Jetty HttpClient for all ava [...]
"longPollingTransportProperties": { "kind": "property", "displayName":
"Long Polling Transport Properties", "group": "common (advanced)", "label":
"common,advanced", "required": false, "type": "object", "javaType":
"java.util.Map<java.lang.String, java.lang.Object>", "deprecated": false,
"autowired": false, "secret": false, "description": "Used to set any properties
that can be configured on the LongPollingTransport used by the BayeuxClient
(CometD) used by the streaming api" },
"bridgeErrorHandler": { "kind": "property", "displayName": "Bridge Error
Handler", "group": "consumer", "label": "consumer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "description": "Allows for bridging the
consumer to the Camel routing Error Handler, which mean any exceptions occurred
while the consumer is trying to pickup incoming messages, or the likes, will
now be processed as a me [...]
+ "apexUrl": { "kind": "property", "displayName": "Apex Url", "group":
"producer", "label": "producer", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.salesforce.SalesforceEndpointConfig",
"configurationField": "config", "description": "APEX method URL" },
+ "compositeMethod": { "kind": "property", "displayName": "Composite
Method", "group": "producer", "label": "producer", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": false, "configurationClass":
"org.apache.camel.component.salesforce.SalesforceEndpointConfig",
"configurationField": "config", "description": "Composite (raw) method." },
"lazyStartProducer": { "kind": "property", "displayName": "Lazy Start
Producer", "group": "producer", "label": "producer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "description": "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 star [...]
"autowiredEnabled": { "kind": "property", "displayName": "Autowired
Enabled", "group": "advanced", "label": "advanced", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": true, "description": "Whether autowiring is
enabled. This is used for automatic autowiring options (the option must be
marked as autowired) by looking up in the registry to find if there is a single
instance of matching type, which t [...]
"httpProxyExcludedAddresses": { "kind": "property", "displayName": "Http
Proxy Excluded 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 not be used." },
@@ -102,7 +103,6 @@
"topicName": { "kind": "path", "displayName": "Topic Name", "group":
"consumer", "label": "consumer", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "description": "The name of the topic\/channel to use" },
"apexMethod": { "kind": "parameter", "displayName": "Apex Method",
"group": "common", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.salesforce.SalesforceEndpointConfig",
"configurationField": "configuration", "description": "APEX method name" },
"apexQueryParams": { "kind": "parameter", "displayName": "Apex Query
Params", "group": "common", "label": "", "required": false, "type": "object",
"javaType": "java.util.Map<java.lang.String, java.lang.Object>", "deprecated":
false, "autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.salesforce.SalesforceEndpointConfig",
"configurationField": "configuration", "description": "Query params for APEX
method" },
- "apexUrl": { "kind": "parameter", "displayName": "Apex Url", "group":
"common", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"configurationClass":
"org.apache.camel.component.salesforce.SalesforceEndpointConfig",
"configurationField": "configuration", "description": "APEX method URL" },
"apiVersion": { "kind": "parameter", "displayName": "Api Version",
"group": "common", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": "50.0", "configurationClass":
"org.apache.camel.component.salesforce.SalesforceEndpointConfig",
"configurationField": "configuration", "description": "Salesforce API version."
},
"backoffIncrement": { "kind": "parameter", "displayName": "Backoff
Increment", "group": "common", "label": "", "required": false, "type":
"duration", "javaType": "long", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": "1000", "configurationClass":
"org.apache.camel.component.salesforce.SalesforceEndpointConfig",
"configurationField": "configuration", "description": "Backoff interval
increment for Streaming connection restart attempts for failures beyond Come
[...]
"batchId": { "kind": "parameter", "displayName": "Batch Id", "group":
"common", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"configurationClass":
"org.apache.camel.component.salesforce.SalesforceEndpointConfig",
"configurationField": "configuration", "description": "Bulk API Batch ID" },
@@ -142,6 +142,8 @@
"replayId": { "kind": "parameter", "displayName": "Replay Id", "group":
"consumer", "label": "consumer", "required": false, "type": "integer",
"javaType": "java.lang.Long", "deprecated": false, "autowired": false,
"secret": false, "description": "The replayId value to use when subscribing" },
"exceptionHandler": { "kind": "parameter", "displayName": "Exception
Handler", "group": "consumer (advanced)", "label": "consumer,advanced",
"required": false, "type": "object", "javaType":
"org.apache.camel.spi.ExceptionHandler", "optionalPrefix": "consumer.",
"deprecated": false, "autowired": false, "secret": false, "description": "To
let the consumer use a custom ExceptionHandler. Notice if the option
bridgeErrorHandler is enabled then this option is not in use. By default the
con [...]
"exchangePattern": { "kind": "parameter", "displayName": "Exchange
Pattern", "group": "consumer (advanced)", "label": "consumer,advanced",
"required": false, "type": "object", "javaType":
"org.apache.camel.ExchangePattern", "enum": [ "InOnly", "InOut",
"InOptionalOut" ], "deprecated": false, "autowired": false, "secret": false,
"description": "Sets the exchange pattern when the consumer creates an
exchange." },
+ "apexUrl": { "kind": "parameter", "displayName": "Apex Url", "group":
"producer", "label": "producer", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.salesforce.SalesforceEndpointConfig",
"configurationField": "configuration", "description": "APEX method URL" },
+ "compositeMethod": { "kind": "parameter", "displayName": "Composite
Method", "group": "producer", "label": "producer", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": false, "configurationClass":
"org.apache.camel.component.salesforce.SalesforceEndpointConfig",
"configurationField": "configuration", "description": "Composite (raw) method."
},
"lazyStartProducer": { "kind": "parameter", "displayName": "Lazy Start
Producer", "group": "producer", "label": "producer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "description": "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 sta [...]
"synchronous": { "kind": "parameter", "displayName": "Synchronous",
"group": "advanced", "label": "advanced", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "autowired": false, "secret":
false, "defaultValue": false, "description": "Sets whether synchronous
processing should be strictly used, or Camel is allowed to use asynchronous
processing (if supported)." }
}
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 f17a26c..227a2e5 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
@@ -17,7 +17,7 @@ When using salesforce with Spring Boot make sure to use the
following Maven depe
----
-The component supports 74 options, which are listed below.
+The component supports 75 options, which are listed below.
@@ -35,6 +35,7 @@ The component supports 74 options, which are listed below.
| *camel.component.salesforce.bridge-error-handler* | Allows for bridging the
consumer to the Camel routing Error Handler, which mean any exceptions occurred
while the consumer is trying to pickup incoming messages, or the likes, will
now be processed as a message and handled by the routing Error Handler. By
default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal
with exceptions, that will be logged at WARN or ERROR level and ignored. |
false | Boolean
| *camel.component.salesforce.client-id* | 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. | |
String
| *camel.component.salesforce.client-secret* | OAuth Consumer Secret of the
connected app configured in the Salesforce instance setup. | | String
+| *camel.component.salesforce.composite-method* | Composite (raw) method. | |
String
| *camel.component.salesforce.config* | Global endpoint configuration - use to
set values that are common to all endpoints. The option is a
org.apache.camel.component.salesforce.SalesforceEndpointConfig type. | |
SalesforceEndpointConfig
| *camel.component.salesforce.content-type* | Bulk API content type, one of
XML, CSV, ZIP_XML, ZIP_CSV | | ContentType
| *camel.component.salesforce.default-replay-id* | Default replayId setting if
no value is found in initialReplayIdMap | -1 | Long
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 fbfe2d6..f04b482 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
@@ -61,10 +61,6 @@ public class SalesforceComponentConfiguration
*/
private Map<String, Object> apexQueryParams;
/**
- * APEX method URL
- */
- private String apexUrl;
- /**
* Salesforce API version.
*/
private String apiVersion = "50.0";
@@ -274,6 +270,14 @@ public class SalesforceComponentConfiguration
*/
private Boolean bridgeErrorHandler = false;
/**
+ * APEX method URL
+ */
+ private String apexUrl;
+ /**
+ * Composite (raw) method.
+ */
+ private String compositeMethod;
+ /**
* 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
@@ -442,14 +446,6 @@ public class SalesforceComponentConfiguration
this.apexQueryParams = apexQueryParams;
}
- public String getApexUrl() {
- return apexUrl;
- }
-
- public void setApexUrl(String apexUrl) {
- this.apexUrl = apexUrl;
- }
-
public String getApiVersion() {
return apiVersion;
}
@@ -804,6 +800,22 @@ public class SalesforceComponentConfiguration
this.bridgeErrorHandler = bridgeErrorHandler;
}
+ public String getApexUrl() {
+ return apexUrl;
+ }
+
+ public void setApexUrl(String apexUrl) {
+ this.apexUrl = apexUrl;
+ }
+
+ public String getCompositeMethod() {
+ return compositeMethod;
+ }
+
+ public void setCompositeMethod(String compositeMethod) {
+ this.compositeMethod = compositeMethod;
+ }
+
public Boolean getLazyStartProducer() {
return lazyStartProducer;
}
diff --git a/docs/modules/ROOT/pages/salesforce-starter.adoc
b/docs/modules/ROOT/pages/salesforce-starter.adoc
index f17a26c..227a2e5 100644
--- a/docs/modules/ROOT/pages/salesforce-starter.adoc
+++ b/docs/modules/ROOT/pages/salesforce-starter.adoc
@@ -17,7 +17,7 @@ When using salesforce with Spring Boot make sure to use the
following Maven depe
----
-The component supports 74 options, which are listed below.
+The component supports 75 options, which are listed below.
@@ -35,6 +35,7 @@ The component supports 74 options, which are listed below.
| *camel.component.salesforce.bridge-error-handler* | Allows for bridging the
consumer to the Camel routing Error Handler, which mean any exceptions occurred
while the consumer is trying to pickup incoming messages, or the likes, will
now be processed as a message and handled by the routing Error Handler. By
default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal
with exceptions, that will be logged at WARN or ERROR level and ignored. |
false | Boolean
| *camel.component.salesforce.client-id* | 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. | |
String
| *camel.component.salesforce.client-secret* | OAuth Consumer Secret of the
connected app configured in the Salesforce instance setup. | | String
+| *camel.component.salesforce.composite-method* | Composite (raw) method. | |
String
| *camel.component.salesforce.config* | Global endpoint configuration - use to
set values that are common to all endpoints. The option is a
org.apache.camel.component.salesforce.SalesforceEndpointConfig type. | |
SalesforceEndpointConfig
| *camel.component.salesforce.content-type* | Bulk API content type, one of
XML, CSV, ZIP_XML, ZIP_CSV | | ContentType
| *camel.component.salesforce.default-replay-id* | Default replayId setting if
no value is found in initialReplayIdMap | -1 | Long
diff --git a/docs/modules/ROOT/pages/spring-boot.adoc
b/docs/modules/ROOT/pages/spring-boot.adoc
index 21d142c..1deda09 100644
--- a/docs/modules/ROOT/pages/spring-boot.adoc
+++ b/docs/modules/ROOT/pages/spring-boot.adoc
@@ -146,7 +146,7 @@ The component supports 160 options, which are listed below.
| *camel.health.registry-enabled* | Whether registry health check is enabled
Is default enabled | | Boolean
| *camel.health.routes-enabled* | Whether routes health check is enabled Is
default enabled | | Boolean
| *camel.language.enabled* | Global option to enable/disable language
auto-configuration, default is true. | true | Boolean
-| *camel.routetemplate.config* | | | List
+| *camel.routetemplate.config* | Route template configurations | | List
| *camel.springboot.allow-use-original-message* | Sets whether to allow access
to the original message from Camel's error handler, or from
org.apache.camel.spi.UnitOfWork.getOriginalInMessage(). Turning this off can
optimize performance, as defensive copy of the original message is not needed.
Default is false. | false | Boolean
| *camel.springboot.auto-startup* | Sets whether the object should
automatically start when Camel starts. Important: Currently only routes can be
disabled, as CamelContext's are always started. Note: When setting auto startup
false on CamelContext then that takes precedence and no routes is started. You
would need to start CamelContext explicit using the
org.apache.camel.CamelContext.start() method, to start the context, and then
you would need to start the routes manually using Camelcon [...]
| *camel.springboot.autowired-enabled* | Whether autowiring is enabled. This
is used for automatic autowiring options (the option must be marked as
autowired) by looking up in the registry to find if there is a single instance
of matching type, which then gets configured on the component. This can be used
for automatic configuring JDBC data sources, JMS connection factories, AWS
Clients, etc. Default is true. | true | Boolean
