You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2019/08/30 11:06:51 UTC
[camel] branch master updated (1b42227 -> d724089)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 1b42227 Fixed wong links in aws-mq page. Thanks to Christian Mueller for reporting this.
new 4206faf Upgrade Jgroups-raft to version 0.4.3.Final
new b914607 Upgrade Jgroups used by jgroups-raft to version 4.0.20.Final
new 3dd1088 Regen
new 3512dca Regen 2
new d724089 Fixed CS for Camel-Salesforce
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../src/main/docs/salesforce-component.adoc | 3 +-
.../component/salesforce/SalesforceEndpoint.java | 35 +++----
.../salesforce/api/FieldsToNullPropertyFilter.java | 10 +-
.../component/salesforce/api/dto/Attributes.java | 4 +-
.../camel/component/salesforce/api/dto/Limits.java | 13 ++-
.../salesforce/api/dto/bulk/StatusCode.java | 82 ++++++++--------
.../component/salesforce/api/utils/JsonUtils.java | 8 +-
.../salesforce/RestApiIntegrationTest.java | 14 +--
.../api/MultiSelectPicklistJsonTest.java | 4 +-
.../api/dto/composite/SObjectBatchTest.java | 105 +++------------------
.../api/dto/composite/SObjectTreeTest.java | 60 ++----------
.../component/salesforce/dto/generated/Task.java | 1 -
.../camel/maven/CamelSalesforceMojoOutputTest.java | 25 ++---
.../modules/ROOT/pages/aws-mq-component.adoc | 10 +-
.../modules/ROOT/pages/salesforce-component.adoc | 16 +++-
parent/pom.xml | 4 +-
16 files changed, 138 insertions(+), 256 deletions(-)
[camel] 02/05: Upgrade Jgroups used by jgroups-raft to version
4.0.20.Final
Posted by ac...@apache.org.
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.git
commit b914607b6ee5ca81f04a4c7149e26fcee8055f40
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Aug 30 12:03:11 2019 +0200
Upgrade Jgroups used by jgroups-raft to version 4.0.20.Final
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index cb540c3..de2ca0f 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -351,7 +351,7 @@
<jgit-version>5.4.2.201908231537-r</jgit-version>
<jgroups-version>4.1.4.Final</jgroups-version>
<jgroups-raft-version>0.4.3.Final</jgroups-raft-version>
- <jgroups-raft-jgroups-version>4.0.15.Final</jgroups-raft-jgroups-version>
+ <jgroups-raft-jgroups-version>4.0.20.Final</jgroups-raft-jgroups-version>
<jgroups-raft-leveldbjni-version>1.8</jgroups-raft-leveldbjni-version>
<jgroups-raft-mapdb-version>1.0.8</jgroups-raft-mapdb-version>
<jira-guava-version>20.0</jira-guava-version>
[camel] 01/05: Upgrade Jgroups-raft to version 0.4.3.Final
Posted by ac...@apache.org.
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.git
commit 4206fafe24b3842fd4521b65ac1a83affc879789
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Aug 30 12:01:54 2019 +0200
Upgrade Jgroups-raft to version 0.4.3.Final
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 9d937d1..cb540c3 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -350,7 +350,7 @@
<jettison-version>1.4.0</jettison-version>
<jgit-version>5.4.2.201908231537-r</jgit-version>
<jgroups-version>4.1.4.Final</jgroups-version>
- <jgroups-raft-version>0.4.2.Final</jgroups-raft-version>
+ <jgroups-raft-version>0.4.3.Final</jgroups-raft-version>
<jgroups-raft-jgroups-version>4.0.15.Final</jgroups-raft-jgroups-version>
<jgroups-raft-leveldbjni-version>1.8</jgroups-raft-leveldbjni-version>
<jgroups-raft-mapdb-version>1.0.8</jgroups-raft-mapdb-version>
[camel] 04/05: Regen 2
Posted by ac...@apache.org.
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.git
commit 3512dca668d594d1d6263088ddf1afeb870bd75c
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Aug 30 12:51:08 2019 +0200
Regen 2
---
components/readme.adoc | 103 +++++++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 100 insertions(+), 3 deletions(-)
diff --git a/components/readme.adoc b/components/readme.adoc
index 8ca15dd..3638b06 100644
--- a/components/readme.adoc
+++ b/components/readme.adoc
@@ -1,7 +1,7 @@
= Components
// components: START
-Number of Components: 268 in 207 JAR artifacts (0 deprecated)
+Number of Components: 297 in 235 JAR artifacts (0 deprecated)
[width="100%",cols="4,1,5",options="header"]
|===
@@ -22,6 +22,9 @@ Number of Components: 268 in 207 JAR artifacts (0 deprecated)
| link:camel-flink/src/main/docs/flink-component.adoc[Apache Flink] (camel-flink) +
`flink:endpointType` | 2.18 | The flink component can be used to send DataSet jobs to Apache Flink cluster.
+| link:camel-pulsar/src/main/docs/pulsar-component.adoc[Apache Pulsar] (camel-pulsar) +
+`pulsar:persistence://tenant/namespace/topic` | 2.24 | Camel Apache Pulsar Component
+
| link:camel-spark/src/main/docs/spark-component.adoc[Apache Spark] (camel-spark) +
`spark:endpointType` | 2.17 | The spark component can be used to send RDD or DataFrame jobs to Apache Spark cluster.
@@ -37,6 +40,9 @@ Number of Components: 268 in 207 JAR artifacts (0 deprecated)
| link:camel-atmos/src/main/docs/atmos-component.adoc[Atmos] (camel-atmos) +
`atmos:name/operation` | 2.15 | The atmos component is used for integrating with EMC's Atomos Storage.
+| link:camel-atmosphere-websocket/src/main/docs/atmosphere-websocket-component.adoc[Atmosphere Websocket] (camel-atmosphere-websocket) +
+`atmosphere-websocket:servicePath` | 2.14 | To exchange data with external Websocket clients using Atmosphere.
+
| link:camel-atom/src/main/docs/atom-component.adoc[Atom] (camel-atom) +
`atom:feedUri` | 1.2 | The atom component is used for consuming Atom RSS feeds.
@@ -61,6 +67,9 @@ Number of Components: 268 in 207 JAR artifacts (0 deprecated)
| link:camel-avro/src/main/docs/avro-component.adoc[Avro] (camel-avro) +
`avro:transport:host:port/messageName` | 2.10 | Working with Apache Avro for data serialization.
+| link:camel-aws-cw/src/main/docs/aws-cw-component.adoc[AWS CloudWatch] (camel-aws-cw) +
+`aws-cw:namespace` | 2.11 | The aws-cw component is used for sending metrics to an Amazon CloudWatch.
+
| link:camel-aws-ddb/src/main/docs/aws-ddb-component.adoc[AWS DynamoDB] (camel-aws-ddb) +
`aws-ddb:tableName` | 2.10 | The aws-ddb component is used for storing and retrieving data from Amazon's DynamoDB service.
@@ -103,6 +112,12 @@ Number of Components: 268 in 207 JAR artifacts (0 deprecated)
| link:camel-aws-ses/src/main/docs/aws-ses-component.adoc[AWS Simple Email Service] (camel-aws-ses) +
`aws-ses:from` | 2.9 | The aws-ses component is used for sending emails with Amazon's SES service.
+| link:camel-aws-sns/src/main/docs/aws-sns-component.adoc[AWS Simple Notification System] (camel-aws-sns) +
+`aws-sns:topicNameOrArn` | 2.8 | The aws-sns component is used for sending messages to an Amazon Simple Notification Topic.
+
+| link:camel-aws-sqs/src/main/docs/aws-sqs-component.adoc[AWS Simple Queue Service] (camel-aws-sqs) +
+`aws-sqs:queueNameOrArn` | 2.6 | The aws-sqs component is used for sending and receiving messages to Amazon's SQS service.
+
| link:camel-aws-swf/src/main/docs/aws-swf-component.adoc[AWS Simple Workflow] (camel-aws-swf) +
`aws-swf:type` | 2.13 | The aws-swf component is used for managing workflows from Amazon Simple Workflow.
@@ -166,6 +181,9 @@ Number of Components: 268 in 207 JAR artifacts (0 deprecated)
| link:camel-cometd/src/main/docs/cometd-component.adoc[CometD] (camel-cometd) +
`cometd:host:port/channelName` | 2.0 | The cometd component is a transport for working with the Jetty implementation of the cometd/bayeux protocol.
+| link:camel-consul/src/main/docs/consul-component.adoc[Consul] (camel-consul) +
+`consul:apiEndpoint` | 2.18 | The camel consul component allows you to work with Consul, a distributed, highly available, datacenter-aware, service discovery and configuration system.
+
| link:camel-controlbus/src/main/docs/controlbus-component.adoc[Control Bus] (camel-controlbus) +
`controlbus:command:language` | 2.11 | The controlbus component provides easy management of Camel applications based on the Control Bus EIP pattern.
@@ -250,6 +268,9 @@ Number of Components: 268 in 207 JAR artifacts (0 deprecated)
| link:camel-file/src/main/docs/file-component.adoc[File] (camel-file) +
`file:directoryName` | 1.0 | The file component is used for reading or writing files.
+| link:camel-file-watch/src/main/docs/file-watch-component.adoc[file-watch] (camel-file-watch) +
+`file-watch:path` | 3.0 | The file-watch is used to monitor file events in directory using java.nio.file.WatchService
+
| link:camel-flatpack/src/main/docs/flatpack-component.adoc[Flatpack] (camel-flatpack) +
`flatpack:type:resourceUri` | 1.4 | The flatpack component supports fixed width and delimited file parsing via the FlatPack library.
@@ -265,6 +286,9 @@ Number of Components: 268 in 207 JAR artifacts (0 deprecated)
| link:camel-ftp/src/main/docs/ftps-component.adoc[FTPS] (camel-ftp) +
`ftps:host:port/directoryName` | 2.2 | The \ftps (FTP secure SSL/TLS) component is used for uploading or downloading files from FTP servers.
+| link:camel-ganglia/src/main/docs/ganglia-component.adoc[Ganglia] (camel-ganglia) +
+`ganglia:host:port` | 2.15 | The ganglia component is used for sending metrics to the Ganglia monitoring system.
+
| link:camel-geocoder/src/main/docs/geocoder-component.adoc[Geocoder] (camel-geocoder) +
`geocoder:address:latlng` | 2.12 | The geocoder component is used for looking up geocodes (latitude and longitude) for a given address, or reverse lookup.
@@ -352,9 +376,15 @@ Number of Components: 268 in 207 JAR artifacts (0 deprecated)
| link:camel-hbase/src/main/docs/hbase-component.adoc[HBase] (camel-hbase) +
`hbase:tableName` | 2.10 | For reading/writing from/to an HBase store (Hadoop database).
+| link:camel-hdfs/src/main/docs/hdfs-component.adoc[HDFS] (camel-hdfs) +
+`hdfs:hostName:port/path` | 2.14 | For reading/writing from/to an HDFS filesystem using Hadoop 2.x.
+
| link:camel-hipchat/src/main/docs/hipchat-component.adoc[Hipchat] (camel-hipchat) +
`hipchat:protocol:host:port` | 2.15 | The hipchat component supports producing and consuming messages from/to Hipchat service.
+| link:camel-http/src/main/docs/http-component.adoc[HTTP] (camel-http) +
+`http:httpUri` | 2.3 | For calling out to external HTTP servers using Apache HTTP Client 4.x.
+
| link:camel-iec60870/src/main/docs/iec60870-client-component.adoc[IEC 60870 Client] (camel-iec60870) +
`iec60870-client:uriPath` | 2.20 | IEC 60870 component used for telecontrol (supervisory control and data acquisition) such as controlling electric power transmission grids and other geographically widespread control systems.
@@ -418,6 +448,9 @@ Number of Components: 268 in 207 JAR artifacts (0 deprecated)
| link:camel-jdbc/src/main/docs/jdbc-component.adoc[JDBC] (camel-jdbc) +
`jdbc:dataSourceName` | 1.2 | The jdbc component enables you to access databases through JDBC, where SQL queries are sent in the message body.
+| link:camel-jetty/src/main/docs/jetty-component.adoc[Jetty] (camel-jetty) +
+`jetty:httpUri` | 1.2 | The jetty component provides HTTP-based endpoints for consuming and producing HTTP requests.
+
| link:camel-websocket/src/main/docs/websocket-component.adoc[Jetty Websocket] (camel-websocket) +
`websocket:host:port/resourceUri` | 2.10 | The websocket component provides websocket endpoints with Jetty for communicating with clients using websocket.
@@ -454,6 +487,9 @@ Number of Components: 268 in 207 JAR artifacts (0 deprecated)
| link:camel-jt400/src/main/docs/jt400-component.adoc[JT400] (camel-jt400) +
`jt400:userID:password/systemName/objectPath.type` | 1.5 | The jt400 component allows you to exchanges messages with an AS/400 system using data queues or program call.
+| link:camel-kafka/src/main/docs/kafka-component.adoc[Kafka] (camel-kafka) +
+`kafka:topic` | 2.13 | The kafka component allows messages to be sent to (or consumed from) Apache Kafka brokers.
+
| link:camel-kubernetes/src/main/docs/kubernetes-config-maps-component.adoc[Kubernetes ConfigMap] (camel-kubernetes) +
`kubernetes-config-maps:masterUrl` | 2.17 | The Kubernetes Configmaps component provides a producer to execute kubernetes configmap operations.
@@ -532,12 +568,18 @@ Number of Components: 268 in 207 JAR artifacts (0 deprecated)
| link:camel-microprofile-metrics/src/main/docs/microprofile-metrics-component.adoc[MicroProfile Metrics] (camel-microprofile-metrics) +
`microprofile-metrics:metricType:metricName` | 3.0 | Camel metrics exposed with Eclipse MicroProfile Metrics
+| link:camel-mina/src/main/docs/mina-component.adoc[Mina] (camel-mina) +
+`mina:protocol:host:port` | 2.10 | Socket level networking using TCP or UDP with the Apache Mina 2.x library.
+
| link:camel-mllp/src/main/docs/mllp-component.adoc[MLLP] (camel-mllp) +
`mllp:hostname:port` | 2.17 | Provides functionality required by Healthcare providers to communicate with other systems using the MLLP protocol.
| link:camel-mock/src/main/docs/mock-component.adoc[Mock] (camel-mock) +
`mock:name` | 1.0 | The mock component is used for testing routes and mediation rules using mocks.
+| link:camel-mongodb/src/main/docs/mongodb-component.adoc[MongoDB] (camel-mongodb) +
+`mongodb:connectionBean` | 2.19 | Component for working with documents stored in MongoDB database.
+
| link:camel-mongodb-gridfs/src/main/docs/mongodb-gridfs-component.adoc[MongoDB GridFS] (camel-mongodb-gridfs) +
`mongodb-gridfs:connectionBean` | 2.18 | Component for working with MongoDB GridFS.
@@ -562,9 +604,24 @@ Number of Components: 268 in 207 JAR artifacts (0 deprecated)
| link:camel-nagios/src/main/docs/nagios-component.adoc[Nagios] (camel-nagios) +
`nagios:host:port` | 2.3 | To send passive checks to Nagios using JSendNSCA.
+| link:camel-nats/src/main/docs/nats-component.adoc[Nats] (camel-nats) +
+`nats:servers` | 2.17 | The nats component allows you produce and consume messages from NATS.
+
+| link:camel-netty/src/main/docs/netty-component.adoc[Netty] (camel-netty) +
+`netty:protocol:host:port` | 2.14 | Socket level networking using TCP or UDP with the Netty 4.x library.
+
+| link:camel-netty-http/src/main/docs/netty-http-component.adoc[Netty HTTP] (camel-netty-http) +
+`netty-http:protocol:host:port/path` | 2.14 | Netty HTTP server and client using the Netty 4.x library.
+
| link:camel-nsq/src/main/docs/nsq-component.adoc[NSQ] (camel-nsq) +
`nsq:servers` | 2.23 | Represents a nsq endpoint.
+| link:camel-olingo2/camel-olingo2-component/src/main/docs/olingo2-component.adoc[Olingo2] (camel-olingo2) +
+`olingo2:apiName/methodName` | 2.14 | Communicates with OData 2.0 services using Apache Olingo.
+
+| link:camel-olingo4/camel-olingo4-component/src/main/docs/olingo4-component.adoc[Olingo4] (camel-olingo4) +
+`olingo4:apiName/methodName` | 2.19 | Communicates with OData 4.0 services using Apache Olingo OData API.
+
| link:camel-milo/src/main/docs/milo-client-component.adoc[OPC UA Client] (camel-milo) +
`milo-client:endpointUri` | 2.19 | Connect to OPC UA servers using the binary protocol for acquiring telemetry data
@@ -625,6 +682,9 @@ Number of Components: 268 in 207 JAR artifacts (0 deprecated)
| link:camel-pubnub/src/main/docs/pubnub-component.adoc[PubNub] (camel-pubnub) +
`pubnub:channel` | 2.19 | To send and receive messages to PubNub data stream network for connected devices.
+| link:camel-quartz/src/main/docs/quartz-component.adoc[Quartz] (camel-quartz) +
+`quartz:groupName/triggerName` | 2.12 | Provides a scheduled delivery of messages using the Quartz 2.x scheduler.
+
| link:camel-quickfix/src/main/docs/quickfix-component.adoc[QuickFix] (camel-quickfix) +
`quickfix:configurationName` | 2.1 | The quickfix component allows to send Financial Interchange (FIX) messages to the QuickFix engine.
@@ -643,6 +703,12 @@ Number of Components: 268 in 207 JAR artifacts (0 deprecated)
| link:camel-rest/src/main/docs/rest-api-component.adoc[REST API] (camel-rest) +
`rest-api:path/contextIdPattern` | 2.16 | The rest-api component is used for providing Swagger API of the REST services which has been defined using the rest-dsl in Camel.
+| link:camel-rest-swagger/src/main/docs/rest-swagger-component.adoc[REST Swagger] (camel-rest-swagger) +
+`rest-swagger:specificationUri#operationId` | 2.19 | An awesome REST endpoint backed by Swagger specifications.
+
+| link:camel-restlet/src/main/docs/restlet-component.adoc[Restlet] (camel-restlet) +
+`restlet:protocol:host:port/uriPattern` | 2.0 | Component for consuming and producing Restful resources using Restlet.
+
| link:camel-rss/src/main/docs/rss-component.adoc[RSS] (camel-rss) +
`rss:feedUri` | 2.0 | The rss component is used for consuming RSS feeds.
@@ -673,6 +739,9 @@ Number of Components: 268 in 207 JAR artifacts (0 deprecated)
| link:camel-servicenow/camel-servicenow-component/src/main/docs/servicenow-component.adoc[ServiceNow] (camel-servicenow) +
`servicenow:instanceName` | 2.18 | The servicenow component is used to integrate Camel with ServiceNow cloud services.
+| link:camel-servlet/src/main/docs/servlet-component.adoc[Servlet] (camel-servlet) +
+`servlet:contextPath` | 2.0 | To use a HTTP Servlet as entry for Camel routes when running in a servlet container.
+
| link:camel-ftp/src/main/docs/sftp-component.adoc[SFTP] (camel-ftp) +
`sftp:host:port/directoryName` | 1.1 | The \sftp (FTP over SSH) component is used for uploading or downloading files from SFTP servers.
@@ -712,6 +781,9 @@ Number of Components: 268 in 207 JAR artifacts (0 deprecated)
| link:camel-spring-batch/src/main/docs/spring-batch-component.adoc[Spring Batch] (camel-spring-batch) +
`spring-batch:jobName` | 2.10 | The spring-batch component allows to send messages to Spring Batch for further processing.
+| link:camel-spring/src/main/docs/spring-event-component.adoc[Spring Event] (camel-spring) +
+`spring-event:name` | 1.4 | The spring-event component allows to listen for Spring Application Events.
+
| link:camel-spring-integration/src/main/docs/spring-integration-component.adoc[Spring Integration] (camel-spring-integration) +
`spring-integration:defaultChannel` | 1.4 | Bridges Camel with Spring Integration.
@@ -724,6 +796,12 @@ Number of Components: 268 in 207 JAR artifacts (0 deprecated)
| link:camel-spring-ws/src/main/docs/spring-ws-component.adoc[Spring WebService] (camel-spring-ws) +
`spring-ws:type:lookupKey:webServiceEndpointUri` | 2.6 | The spring-ws component is used for SOAP WebServices using Spring WebServices.
+| link:camel-sql/src/main/docs/sql-component.adoc[SQL] (camel-sql) +
+`sql:query` | 1.4 | The sql component allows you to work with databases using JDBC SQL queries.
+
+| link:camel-sql/src/main/docs/sql-stored-component.adoc[SQL Stored Procedure] (camel-sql) +
+`sql-stored:template` | 2.17 | The sql component allows you to work with databases using JDBC Stored Procedure queries.
+
| link:camel-ssh/src/main/docs/ssh-component.adoc[SSH] (camel-ssh) +
`ssh:host:port` | 2.10 | The ssh component enables access to SSH servers such that you can send an SSH command, and process the response.
@@ -733,6 +811,9 @@ Number of Components: 268 in 207 JAR artifacts (0 deprecated)
| link:camel-stomp/src/main/docs/stomp-component.adoc[Stomp] (camel-stomp) +
`stomp:destination` | 2.12 | The stomp component is used for communicating with Stomp compliant message brokers.
+| link:camel-stream/src/main/docs/stream-component.adoc[Stream] (camel-stream) +
+`stream:kind` | 1.3 | The stream: component provides access to the system-in, system-out and system-err streams as well as allowing streaming of file and URL.
+
| link:camel-stringtemplate/src/main/docs/string-template-component.adoc[String Template] (camel-stringtemplate) +
`string-template:resourceUri` | 1.2 | Transforms the message using a String template.
@@ -763,6 +844,9 @@ Number of Components: 268 in 207 JAR artifacts (0 deprecated)
| link:camel-twitter/src/main/docs/twitter-timeline-component.adoc[Twitter Timeline] (camel-twitter) +
`twitter-timeline:timelineType` | 2.10 | The Twitter Timeline component consumes twitter timeline or update the status of specific user.
+| link:camel-undertow/src/main/docs/undertow-component.adoc[Undertow] (camel-undertow) +
+`undertow:httpURI` | 2.16 | The undertow component provides HTTP and WebSocket based endpoints for consuming and producing HTTP/WebSocket requests.
+
| link:camel-validator/src/main/docs/validator-component.adoc[Validator] (camel-validator) +
`validator:resourceUri` | 1.1 | Validates the payload of a message using XML Schema and JAXP Validation.
@@ -796,6 +880,9 @@ Number of Components: 268 in 207 JAR artifacts (0 deprecated)
| link:camel-xmpp/src/main/docs/xmpp-component.adoc[XMPP] (camel-xmpp) +
`xmpp:host:port/participant` | 1.0 | To send and receive messages from a XMPP (chat) server.
+| link:camel-saxon/src/main/docs/xquery-component.adoc[XQuery] (camel-saxon) +
+`xquery:resourceUri` | 1.0 | Transforms the message using a XQuery template using Saxon.
+
| link:camel-xslt/src/main/docs/xslt-component.adoc[XSLT] (camel-xslt) +
`xslt:resourceUri` | 1.3 | Transforms the message using a XSLT template.
@@ -818,12 +905,14 @@ Number of Components: 268 in 207 JAR artifacts (0 deprecated)
== Data Formats
// dataformats: START
-Number of Data Formats: 43 in 35 JAR artifacts (0 deprecated)
+Number of Data Formats: 45 in 37 JAR artifacts (0 deprecated)
[width="100%",cols="4,1,5",options="header"]
|===
| Data Format | Available From | Description
+| link:camel-any23/src/main/docs/any23-dataformat.adoc[Any23] (camel-any23) | 3.0 | Any23 data format is used for parsing data to RDF.
+
| link:camel-asn1/src/main/docs/asn1-dataformat.adoc[ASN.1 File] (camel-asn1) | 2.20 | The ASN.1 data format is used for file transfer with telecommunications protocols.
| link:camel-avro/src/main/docs/avro-dataformat.adoc[Avro] (camel-avro) | 2.14 | The Avro data format is used for serialization and deserialization of messages using Apache Avro binary dataformat.
@@ -856,6 +945,8 @@ Number of Data Formats: 43 in 35 JAR artifacts (0 deprecated)
| link:camel-zip-deflater/src/main/docs/gzipdeflater-dataformat.adoc[GZip Deflater] (camel-zip-deflater) | 2.0 | The GZip data format is a message compression and de-compression format (which works with the popular gzip/gunzip tools).
+| link:camel-hl7/src/main/docs/hl7-dataformat.adoc[HL7] (camel-hl7) | 2.0 | The HL7 data format can be used to marshal or unmarshal HL7 (Health Care) model objects.
+
| link:camel-ical/src/main/docs/ical-dataformat.adoc[iCal] (camel-ical) | 2.12 | The iCal dataformat is used for working with iCalendar messages.
| link:camel-jacksonxml/src/main/docs/jacksonxml-dataformat.adoc[JacksonXML] (camel-jacksonxml) | 2.16 | JacksonXML data format is used for unmarshal a XML payload to POJO or to marshal POJO back to XML payload.
@@ -916,7 +1007,7 @@ Number of Data Formats: 43 in 35 JAR artifacts (0 deprecated)
== Expression Languages
// languages: START
-Number of Languages: 14 in 8 JAR artifacts (0 deprecated)
+Number of Languages: 17 in 11 JAR artifacts (0 deprecated)
[width="100%",cols="4,1,5",options="header"]
|===
@@ -934,6 +1025,8 @@ Number of Languages: 14 in 8 JAR artifacts (0 deprecated)
| link:camel-base/src/main/docs/header-language.adoc[Header] (camel-base) | 1.5 | To use a Camel Message header in expressions or predicates.
+| link:camel-hl7/src/main/docs/hl7terser-language.adoc[HL7 Terser] (camel-hl7) | 2.11 | To use HL7 terser scripts in Camel expressions or predicates.
+
| link:camel-jsonpath/src/main/docs/jsonpath-language.adoc[JsonPath] (camel-jsonpath) | 2.13 | To use JsonPath in Camel expressions or predicates.
| link:camel-mvel/src/main/docs/mvel-language.adoc[MVEL] (camel-mvel) | 2.0 | To use MVEL scripts in Camel expressions or predicates.
@@ -944,11 +1037,15 @@ Number of Languages: 14 in 8 JAR artifacts (0 deprecated)
| link:camel-base/src/main/docs/simple-language.adoc[Simple] (camel-base) | 1.1 | To use Camels built-in Simple language in Camel expressions or predicates.
+| link:camel-spring/src/main/docs/spel-language.adoc[SpEL] (camel-spring) | 2.7 | To use Spring Expression Language (SpEL) in Camel expressions or predicates.
+
| link:camel-base/src/main/docs/tokenize-language.adoc[Tokenize] (camel-base) | 2.0 | To use Camel message body or header with a tokenizer in Camel expressions or predicates.
| link:camel-jaxp/src/main/docs/xtokenize-language.adoc[XML Tokenize] (camel-jaxp) | 2.14 | To use Camel message body or header with a XML tokenizer in Camel expressions or predicates.
| link:camel-xpath/src/main/docs/xpath-language.adoc[XPath] (camel-xpath) | 1.1 | To use XPath (XML) in Camel expressions or predicates.
+
+| link:camel-saxon/src/main/docs/xquery-language.adoc[XQuery] (camel-saxon) | 1.0 | To use XQuery (XML) in Camel expressions or predicates.
|===
// languages: END
[camel] 05/05: Fixed CS for Camel-Salesforce
Posted by ac...@apache.org.
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.git
commit d7240892702b0eff3e35f023ff4fd41e5c6304a7
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Aug 30 13:06:22 2019 +0200
Fixed CS for Camel-Salesforce
---
.../component/salesforce/SalesforceEndpoint.java | 35 +++----
.../salesforce/api/FieldsToNullPropertyFilter.java | 10 +-
.../component/salesforce/api/dto/Attributes.java | 4 +-
.../camel/component/salesforce/api/dto/Limits.java | 13 ++-
.../salesforce/api/dto/bulk/StatusCode.java | 82 ++++++++--------
.../component/salesforce/api/utils/JsonUtils.java | 8 +-
.../salesforce/RestApiIntegrationTest.java | 14 +--
.../api/MultiSelectPicklistJsonTest.java | 4 +-
.../api/dto/composite/SObjectBatchTest.java | 105 +++------------------
.../api/dto/composite/SObjectTreeTest.java | 60 ++----------
.../component/salesforce/dto/generated/Task.java | 1 -
.../camel/maven/CamelSalesforceMojoOutputTest.java | 25 ++---
12 files changed, 118 insertions(+), 243 deletions(-)
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceEndpoint.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceEndpoint.java
index 163efce..95fa812 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceEndpoint.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceEndpoint.java
@@ -29,18 +29,19 @@ import org.apache.camel.support.SynchronousDelegateProducer;
import org.eclipse.jetty.client.HttpClient;
/**
- * The salesforce component is used for integrating Camel with the massive Salesforce API.
+ * The salesforce component is used for integrating Camel with the massive
+ * Salesforce API.
*/
@UriEndpoint(firstVersion = "2.12.0", scheme = "salesforce", title = "Salesforce", syntax = "salesforce:operationName:topicName", label = "api,cloud,crm")
public class SalesforceEndpoint extends DefaultEndpoint {
@UriPath(label = "producer", description = "The operation to use", enums = "getVersions,getResources,"
- + "getGlobalObjects,getBasicInfo,getDescription,getSObject,createSObject,updateSObject,deleteSObject,"
- + "getSObjectWithId,upsertSObject,deleteSObjectWithId,getBlobField,query,queryMore,queryAll,search,apexCall,"
- + "recent,createJob,getJob,closeJob,abortJob,createBatch,getBatch,getAllBatches,getRequest,getResults,"
- + "createBatchQuery,getQueryResultIds,getQueryResult,getRecentReports,getReportDescription,executeSyncReport,"
- + "executeAsyncReport,getReportInstances,getReportResults,limits,approval,approvals,composite-tree,"
- + "composite-batch,composite")
+ + "getGlobalObjects,getBasicInfo,getDescription,getSObject,createSObject,updateSObject,deleteSObject,"
+ + "getSObjectWithId,upsertSObject,deleteSObjectWithId,getBlobField,query,queryMore,queryAll,search,apexCall,"
+ + "recent,createJob,getJob,closeJob,abortJob,createBatch,getBatch,getAllBatches,getRequest,getResults,"
+ + "createBatchQuery,getQueryResultIds,getQueryResult,getRecentReports,getReportDescription,executeSyncReport,"
+ + "executeAsyncReport,getReportInstances,getReportResults,limits,approval,approvals,composite-tree,"
+ + "composite-batch,composite")
private final OperationName operationName;
@UriPath(label = "consumer", description = "The name of the topic/channel to use")
private final String topicName;
@@ -50,8 +51,7 @@ public class SalesforceEndpoint extends DefaultEndpoint {
@UriParam(label = "consumer", description = "The replayId value to use when subscribing")
private Long replayId;
- public SalesforceEndpoint(String uri, SalesforceComponent salesforceComponent,
- SalesforceEndpointConfig configuration, OperationName operationName, String topicName) {
+ public SalesforceEndpoint(String uri, SalesforceComponent salesforceComponent, SalesforceEndpointConfig configuration, OperationName operationName, String topicName) {
super(uri, salesforceComponent);
this.configuration = configuration;
@@ -61,7 +61,8 @@ public class SalesforceEndpoint extends DefaultEndpoint {
@Override
public Producer createProducer() throws Exception {
- // producer requires an operation, topicName must be the invalid operation name
+ // producer requires an operation, topicName must be the invalid
+ // operation name
if (operationName == null) {
throw new IllegalArgumentException(String.format("Invalid Operation %s", topicName));
}
@@ -76,10 +77,10 @@ public class SalesforceEndpoint extends DefaultEndpoint {
@Override
public Consumer createConsumer(Processor processor) throws Exception {
- // consumer requires a topicName, operation name must be the invalid topic name
+ // consumer requires a topicName, operation name must be the invalid
+ // topic name
if (topicName == null) {
- throw new IllegalArgumentException(String.format("Invalid topic name %s, matches a producer operation name",
- operationName.value()));
+ throw new IllegalArgumentException(String.format("Invalid topic name %s, matches a producer operation name", operationName.value()));
}
final SubscriptionHelper subscriptionHelper = getComponent().getSubscriptionHelper();
@@ -90,7 +91,7 @@ public class SalesforceEndpoint extends DefaultEndpoint {
@Override
public SalesforceComponent getComponent() {
- return (SalesforceComponent) super.getComponent();
+ return (SalesforceComponent)super.getComponent();
}
@Override
@@ -125,7 +126,8 @@ public class SalesforceEndpoint extends DefaultEndpoint {
try {
super.doStart();
} finally {
- // check if this endpoint has its own http client that needs to be started
+ // check if this endpoint has its own http client that needs to be
+ // started
final HttpClient httpClient = getConfiguration().getHttpClient();
if (httpClient != null && getComponent().getConfig().getHttpClient() != httpClient) {
final String endpointUri = getEndpointUri();
@@ -141,7 +143,8 @@ public class SalesforceEndpoint extends DefaultEndpoint {
try {
super.doStop();
} finally {
- // check if this endpoint has its own http client that needs to be stopped
+ // check if this endpoint has its own http client that needs to be
+ // stopped
final HttpClient httpClient = getConfiguration().getHttpClient();
if (httpClient != null && getComponent().getConfig().getHttpClient() != httpClient) {
final String endpointUri = getEndpointUri();
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/FieldsToNullPropertyFilter.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/FieldsToNullPropertyFilter.java
index ba86bf7..8620456 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/FieldsToNullPropertyFilter.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/FieldsToNullPropertyFilter.java
@@ -26,17 +26,15 @@ import org.apache.commons.lang3.reflect.FieldUtils;
public class FieldsToNullPropertyFilter extends SimpleBeanPropertyFilter {
@Override
- public void serializeAsField(Object pojo, JsonGenerator jgen, SerializerProvider provider,
- PropertyWriter writer) throws Exception {
+ public void serializeAsField(Object pojo, JsonGenerator jgen, SerializerProvider provider, PropertyWriter writer) throws Exception {
- AbstractSObjectBase sob = (AbstractSObjectBase) pojo;
+ AbstractSObjectBase sob = (AbstractSObjectBase)pojo;
String fieldName = writer.getName();
Object fieldValue = FieldUtils.readField(pojo, fieldName, true);
if (sob.getFieldsToNull().contains(writer.getName()) || fieldValue != null) {
writer.serializeAsField(pojo, jgen, provider);
- }
- else {
+ } else {
writer.serializeAsOmittedField(pojo, jgen, provider);
}
}
-}
\ No newline at end of file
+}
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/Attributes.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/Attributes.java
index 50e7e8d..08166f3 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/Attributes.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/Attributes.java
@@ -19,10 +19,10 @@ package org.apache.camel.component.salesforce.api.dto;
import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
public class Attributes extends AbstractDTOBase {
-
+
@XStreamAsAttribute
private String referenceId;
-
+
@XStreamAsAttribute
private String type;
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/Limits.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/Limits.java
index 0c2b24f..fda9937 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/Limits.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/Limits.java
@@ -61,13 +61,12 @@ public final class Limits implements Serializable {
}
public enum Operation {
- ConcurrentAsyncGetReportInstances, ConcurrentSyncReportRuns, DailyApiRequests,
- DailyAsyncApexExecutions, DailyBulkApiRequests, DailyDurableGenericStreamingApiEvents,
- DailyDurableStreamingApiEvents, DailyGenericStreamingApiEvents, DailyStreamingApiEvents,
- DailyWorkflowEmails, DataStorageMB, DurableStreamingApiConcurrentClients, FileStorageMB,
- HourlyAsyncReportRuns, HourlyDashboardRefreshes, HourlyDashboardResults, HourlyDashboardStatuses,
- HourlyODataCallout, HourlySyncReportRuns, HourlyTimeBasedWorkflow, MassEmail, PermissionSets,
- SingleEmail, StreamingApiConcurrentClients
+ ConcurrentAsyncGetReportInstances, ConcurrentSyncReportRuns, DailyApiRequests, DailyAsyncApexExecutions,
+ DailyBulkApiRequests, DailyDurableGenericStreamingApiEvents, DailyDurableStreamingApiEvents,
+ DailyGenericStreamingApiEvents, DailyStreamingApiEvents, DailyWorkflowEmails, DataStorageMB,
+ DurableStreamingApiConcurrentClients, FileStorageMB, HourlyAsyncReportRuns, HourlyDashboardRefreshes,
+ HourlyDashboardResults, HourlyDashboardStatuses, HourlyODataCallout, HourlySyncReportRuns,
+ HourlyTimeBasedWorkflow, MassEmail, PermissionSets, SingleEmail, StreamingApiConcurrentClients
}
/**
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/bulk/StatusCode.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/bulk/StatusCode.java
index fb4df3a..41c87e7 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/bulk/StatusCode.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/bulk/StatusCode.java
@@ -212,47 +212,53 @@ import javax.xml.bind.annotation.XmlType;
@XmlEnum
public enum StatusCode {
- ALL_OR_NONE_OPERATION_ROLLED_BACK, ALREADY_IN_PROCESS, ASSIGNEE_TYPE_REQUIRED, BAD_CUSTOM_ENTITY_PARENT_DOMAIN, BCC_NOT_ALLOWED_IF_BCC_COMPLIANCE_ENABLED, CANNOT_CASCADE_PRODUCT_ACTIVE,
- CANNOT_CHANGE_FIELD_TYPE_OF_APEX_REFERENCED_FIELD, CANNOT_CREATE_ANOTHER_MANAGED_PACKAGE, CANNOT_DEACTIVATE_DIVISION, CANNOT_DELETE_LAST_DATED_CONVERSION_RATE, CANNOT_DELETE_MANAGED_OBJECT, CANNOT_DISABLE_LAST_ADMIN,
- CANNOT_ENABLE_IP_RESTRICT_REQUESTS, CANNOT_INSERT_UPDATE_ACTIVATE_ENTITY, CANNOT_MODIFY_MANAGED_OBJECT, CANNOT_RENAME_APEX_REFERENCED_FIELD,
- CANNOT_RENAME_APEX_REFERENCED_OBJECT, CANNOT_REPARENT_RECORD, CANNOT_UPDATE_CONVERTED_LEAD, CANT_DISABLE_CORP_CURRENCY,
- CANT_UNSET_CORP_CURRENCY, CHILD_SHARE_FAILS_PARENT, CIRCULAR_DEPENDENCY, COMMUNITY_NOT_ACCESSIBLE,
- CUSTOM_CLOB_FIELD_LIMIT_EXCEEDED, CUSTOM_ENTITY_OR_FIELD_LIMIT, CUSTOM_FIELD_INDEX_LIMIT_EXCEEDED, CUSTOM_INDEX_EXISTS,
- CUSTOM_LINK_LIMIT_EXCEEDED, CUSTOM_TAB_LIMIT_EXCEEDED, DELETE_FAILED, DELETE_OPERATION_TOO_LARGE, DELETE_REQUIRED_ON_CASCADE,
- DEPENDENCY_EXISTS, DUPLICATE_CASE_SOLUTION, DUPLICATE_COMM_NICKNAME, DUPLICATE_CUSTOM_ENTITY_DEFINITION,
- DUPLICATE_CUSTOM_TAB_MOTIF, DUPLICATE_DEVELOPER_NAME, DUPLICATE_EXTERNAL_ID, DUPLICATE_MASTER_LABEL,
- DUPLICATE_SENDER_DISPLAY_NAME, DUPLICATE_USERNAME, DUPLICATE_VALUE, EMAIL_NOT_PROCESSED_DUE_TO_PRIOR_ERROR,
- EMPTY_SCONTROL_FILE_NAME, ENTITY_FAILED_IFLASTMODIFIED_ON_UPDATE, ENTITY_IS_ARCHIVED, ENTITY_IS_DELETED,
- ENTITY_IS_LOCKED, ERROR_IN_MAILER, EXTERNAL_OBJECT_AUTHENTICATION_EXCEPTION, EXTERNAL_OBJECT_CONNECTION_EXCEPTION,
- EXTERNAL_OBJECT_EXCEPTION, EXTERNAL_OBJECT_UNSUPPORTED_EXCEPTION, FAILED_ACTIVATION, FIELD_CUSTOM_VALIDATION_EXCEPTION,
- FIELD_FILTER_VALIDATION_EXCEPTION, FIELD_INTEGRITY_EXCEPTION, FILTERED_LOOKUP_LIMIT_EXCEEDED, HTML_FILE_UPLOAD_NOT_ALLOWED,
- IMAGE_TOO_LARGE, INACTIVE_OWNER_OR_USER, INSUFFICIENT_ACCESS_ON_CROSS_REFERENCE_ENTITY, INSUFFICIENT_ACCESS_OR_READONLY,
- INVALID_ACCESS_LEVEL, INVALID_ARGUMENT_TYPE, INVALID_ASSIGNEE_TYPE, INVALID_ASSIGNMENT_RULE, INVALID_BATCH_OPERATION,
+ ALL_OR_NONE_OPERATION_ROLLED_BACK, ALREADY_IN_PROCESS, ASSIGNEE_TYPE_REQUIRED,
+ BAD_CUSTOM_ENTITY_PARENT_DOMAIN, BCC_NOT_ALLOWED_IF_BCC_COMPLIANCE_ENABLED,
+ CANNOT_CASCADE_PRODUCT_ACTIVE, CANNOT_CHANGE_FIELD_TYPE_OF_APEX_REFERENCED_FIELD,
+ CANNOT_CREATE_ANOTHER_MANAGED_PACKAGE, CANNOT_DEACTIVATE_DIVISION, CANNOT_DELETE_LAST_DATED_CONVERSION_RATE,
+ CANNOT_DELETE_MANAGED_OBJECT, CANNOT_DISABLE_LAST_ADMIN, CANNOT_ENABLE_IP_RESTRICT_REQUESTS,
+ CANNOT_INSERT_UPDATE_ACTIVATE_ENTITY, CANNOT_MODIFY_MANAGED_OBJECT, CANNOT_RENAME_APEX_REFERENCED_FIELD,
+ CANNOT_RENAME_APEX_REFERENCED_OBJECT, CANNOT_REPARENT_RECORD, CANNOT_UPDATE_CONVERTED_LEAD,
+ CANT_DISABLE_CORP_CURRENCY, CANT_UNSET_CORP_CURRENCY, CHILD_SHARE_FAILS_PARENT,
+ CIRCULAR_DEPENDENCY, COMMUNITY_NOT_ACCESSIBLE, CUSTOM_CLOB_FIELD_LIMIT_EXCEEDED,
+ CUSTOM_ENTITY_OR_FIELD_LIMIT, CUSTOM_FIELD_INDEX_LIMIT_EXCEEDED, CUSTOM_INDEX_EXISTS,
+ CUSTOM_LINK_LIMIT_EXCEEDED, CUSTOM_TAB_LIMIT_EXCEEDED, DELETE_FAILED, DELETE_OPERATION_TOO_LARGE,
+ DELETE_REQUIRED_ON_CASCADE, DEPENDENCY_EXISTS, DUPLICATE_CASE_SOLUTION, DUPLICATE_COMM_NICKNAME,
+ DUPLICATE_CUSTOM_ENTITY_DEFINITION, DUPLICATE_CUSTOM_TAB_MOTIF, DUPLICATE_DEVELOPER_NAME,
+ DUPLICATE_EXTERNAL_ID, DUPLICATE_MASTER_LABEL, DUPLICATE_SENDER_DISPLAY_NAME, DUPLICATE_USERNAME,
+ DUPLICATE_VALUE, EMAIL_NOT_PROCESSED_DUE_TO_PRIOR_ERROR, EMPTY_SCONTROL_FILE_NAME,
+ ENTITY_FAILED_IFLASTMODIFIED_ON_UPDATE, ENTITY_IS_ARCHIVED, ENTITY_IS_DELETED, ENTITY_IS_LOCKED,
+ ERROR_IN_MAILER, EXTERNAL_OBJECT_AUTHENTICATION_EXCEPTION, EXTERNAL_OBJECT_CONNECTION_EXCEPTION,
+ EXTERNAL_OBJECT_EXCEPTION, EXTERNAL_OBJECT_UNSUPPORTED_EXCEPTION, FAILED_ACTIVATION,
+ FIELD_CUSTOM_VALIDATION_EXCEPTION, FIELD_FILTER_VALIDATION_EXCEPTION, FIELD_INTEGRITY_EXCEPTION,
+ FILTERED_LOOKUP_LIMIT_EXCEEDED, HTML_FILE_UPLOAD_NOT_ALLOWED, IMAGE_TOO_LARGE, INACTIVE_OWNER_OR_USER,
+ INSUFFICIENT_ACCESS_ON_CROSS_REFERENCE_ENTITY, INSUFFICIENT_ACCESS_OR_READONLY, INVALID_ACCESS_LEVEL,
+ INVALID_ARGUMENT_TYPE, INVALID_ASSIGNEE_TYPE, INVALID_ASSIGNMENT_RULE, INVALID_BATCH_OPERATION,
INVALID_CONTENT_TYPE, INVALID_CREDIT_CARD_INFO, INVALID_CROSS_REFERENCE_KEY, INVALID_CROSS_REFERENCE_TYPE_FOR_FIELD,
INVALID_CURRENCY_CONV_RATE, INVALID_CURRENCY_CORP_RATE, INVALID_CURRENCY_ISO, INVALID_DATA_CATEGORY_GROUP_REFERENCE,
INVALID_DATA_URI, INVALID_EMAIL_ADDRESS, INVALID_EMPTY_KEY_OWNER, INVALID_FIELD, INVALID_FIELD_FOR_INSERT_UPDATE,
- INVALID_FIELD_WHEN_USING_TEMPLATE, INVALID_FILTER_ACTION, INVALID_GOOGLE_DOCS_URL, INVALID_ID_FIELD, INVALID_INET_ADDRESS,
- INVALID_LINEITEM_CLONE_STATE, INVALID_MASTER_OR_TRANSLATED_SOLUTION, INVALID_MESSAGE_ID_REFERENCE, INVALID_OPERATION,
- INVALID_OPERATOR, INVALID_OR_NULL_FOR_RESTRICTED_PICKLIST, INVALID_PACKAGE_VERSION, INVALID_PARTNER_NETWORK_STATUS,
- INVALID_PERSON_ACCOUNT_OPERATION, INVALID_QUERY_LOCATOR, INVALID_READ_ONLY_USER_DML, INVALID_SAVE_AS_ACTIVITY_FLAG,
- INVALID_SESSION_ID, INVALID_SETUP_OWNER, INVALID_STATUS, INVALID_TYPE, INVALID_TYPE_FOR_OPERATION,
- INVALID_TYPE_ON_FIELD_IN_RECORD, IP_RANGE_LIMIT_EXCEEDED, LICENSE_LIMIT_EXCEEDED, LIGHT_PORTAL_USER_EXCEPTION,
- LIMIT_EXCEEDED, MALFORMED_ID, MANAGER_NOT_DEFINED, MASSMAIL_RETRY_LIMIT_EXCEEDED, MASS_MAIL_LIMIT_EXCEEDED,
- MAXIMUM_CCEMAILS_EXCEEDED, MAXIMUM_DASHBOARD_COMPONENTS_EXCEEDED, MAXIMUM_HIERARCHY_LEVELS_REACHED,
- MAXIMUM_SIZE_OF_ATTACHMENT, MAXIMUM_SIZE_OF_DOCUMENT, MAX_ACTIONS_PER_RULE_EXCEEDED, MAX_ACTIVE_RULES_EXCEEDED,
- MAX_APPROVAL_STEPS_EXCEEDED, MAX_FORMULAS_PER_RULE_EXCEEDED, MAX_RULES_EXCEEDED, MAX_RULE_ENTRIES_EXCEEDED,
- MAX_TASK_DESCRIPTION_EXCEEEDED, MAX_TM_RULES_EXCEEDED, MAX_TM_RULE_ITEMS_EXCEEDED, MERGE_FAILED, MISSING_ARGUMENT,
- MIXED_DML_OPERATION, NONUNIQUE_SHIPPING_ADDRESS, NO_APPLICABLE_PROCESS, NO_ATTACHMENT_PERMISSION,
- NO_INACTIVE_DIVISION_MEMBERS, NO_MASS_MAIL_PERMISSION, NUMBER_OUTSIDE_VALID_RANGE, NUM_HISTORY_FIELDS_BY_SOBJECT_EXCEEDED,
- OPTED_OUT_OF_MASS_MAIL, OP_WITH_INVALID_USER_TYPE_EXCEPTION, PACKAGE_LICENSE_REQUIRED, PORTAL_NO_ACCESS,
- PORTAL_USER_ALREADY_EXISTS_FOR_CONTACT, PRIVATE_CONTACT_ON_ASSET, QUERY_TIMEOUT, RECORD_IN_USE_BY_WORKFLOW,
- REQUEST_RUNNING_TOO_LONG, REQUIRED_FEATURE_MISSING, REQUIRED_FIELD_MISSING, SELF_REFERENCE_FROM_TRIGGER,
- SHARE_NEEDED_FOR_CHILD_OWNER, SINGLE_EMAIL_LIMIT_EXCEEDED, STANDARD_PRICE_NOT_DEFINED, STORAGE_LIMIT_EXCEEDED,
- STRING_TOO_LONG, TABSET_LIMIT_EXCEEDED, TEMPLATE_NOT_ACTIVE, TERRITORY_REALIGN_IN_PROGRESS, TEXT_DATA_OUTSIDE_SUPPORTED_CHARSET,
- TOO_MANY_APEX_REQUESTS, TOO_MANY_ENUM_VALUE, TRANSFER_REQUIRES_READ, UNABLE_TO_LOCK_ROW,
- UNAVAILABLE_RECORDTYPE_EXCEPTION, UNDELETE_FAILED, UNKNOWN_EXCEPTION, UNSPECIFIED_EMAIL_ADDRESS,
- UNSUPPORTED_APEX_TRIGGER_OPERATON, UNVERIFIED_SENDER_ADDRESS, USER_OWNS_PORTAL_ACCOUNT_EXCEPTION,
- USER_WITH_APEX_SHARES_EXCEPTION, WEBLINK_SIZE_LIMIT_EXCEEDED, WRONG_CONTROLLER_TYPE;
+ INVALID_FIELD_WHEN_USING_TEMPLATE, INVALID_FILTER_ACTION, INVALID_GOOGLE_DOCS_URL, INVALID_ID_FIELD,
+ INVALID_INET_ADDRESS, INVALID_LINEITEM_CLONE_STATE, INVALID_MASTER_OR_TRANSLATED_SOLUTION,
+ INVALID_MESSAGE_ID_REFERENCE, INVALID_OPERATION, INVALID_OPERATOR, INVALID_OR_NULL_FOR_RESTRICTED_PICKLIST,
+ INVALID_PACKAGE_VERSION, INVALID_PARTNER_NETWORK_STATUS, INVALID_PERSON_ACCOUNT_OPERATION,
+ INVALID_QUERY_LOCATOR, INVALID_READ_ONLY_USER_DML, INVALID_SAVE_AS_ACTIVITY_FLAG, INVALID_SESSION_ID,
+ INVALID_SETUP_OWNER, INVALID_STATUS, INVALID_TYPE, INVALID_TYPE_FOR_OPERATION, INVALID_TYPE_ON_FIELD_IN_RECORD,
+ IP_RANGE_LIMIT_EXCEEDED, LICENSE_LIMIT_EXCEEDED, LIGHT_PORTAL_USER_EXCEPTION, LIMIT_EXCEEDED, MALFORMED_ID,
+ MANAGER_NOT_DEFINED, MASSMAIL_RETRY_LIMIT_EXCEEDED, MASS_MAIL_LIMIT_EXCEEDED, MAXIMUM_CCEMAILS_EXCEEDED,
+ MAXIMUM_DASHBOARD_COMPONENTS_EXCEEDED, MAXIMUM_HIERARCHY_LEVELS_REACHED, MAXIMUM_SIZE_OF_ATTACHMENT,
+ MAXIMUM_SIZE_OF_DOCUMENT, MAX_ACTIONS_PER_RULE_EXCEEDED, MAX_ACTIVE_RULES_EXCEEDED, MAX_APPROVAL_STEPS_EXCEEDED,
+ MAX_FORMULAS_PER_RULE_EXCEEDED, MAX_RULES_EXCEEDED, MAX_RULE_ENTRIES_EXCEEDED, MAX_TASK_DESCRIPTION_EXCEEEDED,
+ MAX_TM_RULES_EXCEEDED, MAX_TM_RULE_ITEMS_EXCEEDED, MERGE_FAILED, MISSING_ARGUMENT, MIXED_DML_OPERATION,
+ NONUNIQUE_SHIPPING_ADDRESS, NO_APPLICABLE_PROCESS, NO_ATTACHMENT_PERMISSION, NO_INACTIVE_DIVISION_MEMBERS,
+ NO_MASS_MAIL_PERMISSION, NUMBER_OUTSIDE_VALID_RANGE, NUM_HISTORY_FIELDS_BY_SOBJECT_EXCEEDED, OPTED_OUT_OF_MASS_MAIL,
+ OP_WITH_INVALID_USER_TYPE_EXCEPTION, PACKAGE_LICENSE_REQUIRED, PORTAL_NO_ACCESS, PORTAL_USER_ALREADY_EXISTS_FOR_CONTACT,
+ PRIVATE_CONTACT_ON_ASSET, QUERY_TIMEOUT, RECORD_IN_USE_BY_WORKFLOW, REQUEST_RUNNING_TOO_LONG, REQUIRED_FEATURE_MISSING,
+ REQUIRED_FIELD_MISSING, SELF_REFERENCE_FROM_TRIGGER, SHARE_NEEDED_FOR_CHILD_OWNER, SINGLE_EMAIL_LIMIT_EXCEEDED,
+ STANDARD_PRICE_NOT_DEFINED, STORAGE_LIMIT_EXCEEDED, STRING_TOO_LONG, TABSET_LIMIT_EXCEEDED, TEMPLATE_NOT_ACTIVE,
+ TERRITORY_REALIGN_IN_PROGRESS, TEXT_DATA_OUTSIDE_SUPPORTED_CHARSET, TOO_MANY_APEX_REQUESTS, TOO_MANY_ENUM_VALUE,
+ TRANSFER_REQUIRES_READ, UNABLE_TO_LOCK_ROW, UNAVAILABLE_RECORDTYPE_EXCEPTION, UNDELETE_FAILED, UNKNOWN_EXCEPTION,
+ UNSPECIFIED_EMAIL_ADDRESS, UNSUPPORTED_APEX_TRIGGER_OPERATON, UNVERIFIED_SENDER_ADDRESS,
+ USER_OWNS_PORTAL_ACCOUNT_EXCEPTION, USER_WITH_APEX_SHARES_EXCEPTION, WEBLINK_SIZE_LIMIT_EXCEEDED, WRONG_CONTROLLER_TYPE;
public String value() {
return name();
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/utils/JsonUtils.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/utils/JsonUtils.java
index 527151b..54ee381 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/utils/JsonUtils.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/utils/JsonUtils.java
@@ -24,9 +24,9 @@ import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
-import com.fasterxml.jackson.databind.ser.impl.SimpleFilterProvider;
import static java.util.stream.Collectors.joining;
+
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.BeanDescription;
import com.fasterxml.jackson.databind.DeserializationFeature;
@@ -41,6 +41,7 @@ import com.fasterxml.jackson.databind.ser.BeanSerializerFactory;
import com.fasterxml.jackson.databind.ser.BeanSerializerModifier;
import com.fasterxml.jackson.databind.ser.PropertyWriter;
import com.fasterxml.jackson.databind.ser.SerializerFactory;
+import com.fasterxml.jackson.databind.ser.impl.SimpleFilterProvider;
import com.fasterxml.jackson.databind.ser.std.NullSerializer;
import com.fasterxml.jackson.module.jsonSchema.JsonSchema;
import com.fasterxml.jackson.module.jsonSchema.JsonSchemaGenerator;
@@ -79,13 +80,12 @@ public abstract class JsonUtils {
public static ObjectMapper createObjectMapper() {
// enable date time support including Java 1.8 ZonedDateTime
ObjectMapper objectMapper = new ObjectMapper();
- SimpleFilterProvider filterProvider = new SimpleFilterProvider()
- .addFilter("fieldsToNull", new FieldsToNullPropertyFilter());
+ SimpleFilterProvider filterProvider = new SimpleFilterProvider().addFilter("fieldsToNull", new FieldsToNullPropertyFilter());
objectMapper.setFilterProvider(filterProvider);
objectMapper.configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false);
objectMapper.configure(DeserializationFeature.ADJUST_DATES_TO_CONTEXT_TIME_ZONE, false);
objectMapper.registerModule(new TimeModule());
-
+
return objectMapper;
}
diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/RestApiIntegrationTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/RestApiIntegrationTest.java
index 44ddf3c..2bf0da9 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/RestApiIntegrationTest.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/RestApiIntegrationTest.java
@@ -253,8 +253,7 @@ public class RestApiIntegrationTest extends AbstractSalesforceTestBase {
final Account account = new Account();
account.setName("Account 1");
account.setSite("test site");
- final CreateSObjectResult accountResult = template().requestBody("direct:createSObject",
- account, CreateSObjectResult.class);
+ final CreateSObjectResult accountResult = template().requestBody("direct:createSObject", account, CreateSObjectResult.class);
assertNotNull(accountResult);
assertTrue("Create success", accountResult.getSuccess());
@@ -262,13 +261,10 @@ public class RestApiIntegrationTest extends AbstractSalesforceTestBase {
account.setSite(null);
account.getFieldsToNull().add("Site");
- final Object updateAccountResult = template().requestBodyAndHeader("salesforce:updateSObject", account,
- SalesforceEndpointConfig.SOBJECT_ID, account.getId());
+ final Object updateAccountResult = template().requestBodyAndHeader("salesforce:updateSObject", account, SalesforceEndpointConfig.SOBJECT_ID, account.getId());
assertNull(updateAccountResult);
- Account updatedAccount = (Account) template().requestBodyAndHeader(
- "salesforce:getSObject?sObjectFields=Id,Name,Site", account.getId(),
- "sObjectName", "Account");
+ Account updatedAccount = (Account)template().requestBodyAndHeader("salesforce:getSObject?sObjectFields=Id,Name,Site", account.getId(), "sObjectName", "Account");
assertNull(updatedAccount.getSite());
// delete the Account
@@ -296,11 +292,9 @@ public class RestApiIntegrationTest extends AbstractSalesforceTestBase {
contact.setAccount(accountRef);
contact.setId(contactResult.getId());
- final Object updateContactResult = template().requestBodyAndHeader("salesforce:updateSObject", contact,
- SalesforceEndpointConfig.SOBJECT_ID, contact.getId());
+ final Object updateContactResult = template().requestBodyAndHeader("salesforce:updateSObject", contact, SalesforceEndpointConfig.SOBJECT_ID, contact.getId());
assertNull(updateContactResult);
-
// delete the Contact
template().requestBodyAndHeader("direct:deleteSObject", contactResult.getId(), "sObjectName", "Contact");
diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/api/MultiSelectPicklistJsonTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/api/MultiSelectPicklistJsonTest.java
index dae2dbf..c57710b 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/api/MultiSelectPicklistJsonTest.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/api/MultiSelectPicklistJsonTest.java
@@ -75,7 +75,7 @@ public class MultiSelectPicklistJsonTest {
@Test
public void testMarshalString() throws Exception {
final StringMSPTest mspTest = new StringMSPTest();
- String[] stringList = new String[] {"Value1", "Value2", "Value3" };
+ String[] stringList = new String[] {"Value1", "Value2", "Value3"};
mspTest.setMspField(stringList);
String json = objectMapper.writeValueAsString(mspTest);
@@ -92,7 +92,7 @@ public class MultiSelectPicklistJsonTest {
@Test
public void testUnmarshalString() throws Exception {
StringMSPTest mspTest = objectMapper.readValue(TEST_JSON, StringMSPTest.class);
- String[] stringList = new String[] {"Value1", "Value2", "Value3" };
+ String[] stringList = new String[] {"Value1", "Value2", "Value3"};
assertArrayEquals(stringList, mspTest.getMspField());
// test null
diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/api/dto/composite/SObjectBatchTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/api/dto/composite/SObjectBatchTest.java
index f2bb9c6..a92d73c 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/api/dto/composite/SObjectBatchTest.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/api/dto/composite/SObjectBatchTest.java
@@ -77,96 +77,21 @@ public class SObjectBatchTest {
@Test
public void shouldSerializeToJson() throws JsonProcessingException {
- final String json = "{" +
- "\"batchRequests\":[" +
- "{" +
- "\"method\":\"POST\"," +
- "\"url\":\"v37.0/sobjects/Account/\"," +
- "\"richInput\":{" +
- "\"attributes\":{" +
- "\"referenceId\":null," +
- "\"type\":\"Account\"," +
- "\"url\":null" +
- "}," +
- "\"Industry\":\"Environmental\"," +
- "\"Name\":\"NewAccountName\"" +
- "}" +
- "}," +
- "{" +
- "\"method\":\"DELETE\"," +
- "\"url\":\"v37.0/sobjects/Account/001D000000K0fXOIAZ\"" +
- "}," +
- "{" +
- "\"method\":\"GET\"," +
- "\"url\":\"v37.0/sobjects/Account/001D000000K0fXOIAZ?fields=Name,BillingPostalCode\"" +
- "}," +
- "{" +
- "\"method\":\"GET\"," +
- "\"url\":\"v37.0/sobjects/Account/EPK/12345\"" +
- "}," +
- "{" +
- "\"method\":\"GET\"," +
- "\"url\":\"v37.0/sobjects/Account/001D000000K0fXOIAZ/CreatedBy?fields=Name\"" +
- "}," +
- "{" +
- "\"method\":\"GET\"," +
- "\"url\":\"v37.0/limits/\"" +
- "}," +
- "{" +
- "\"method\":\"PATCH\"," +
- "\"url\":\"v37.0/sobjects/Account/001D000000K0fXOIAZ\"," +
- "\"richInput\":{" +
- "\"attributes\":{" +
- "\"referenceId\":null," +
- "\"type\":\"Account\"," +
- "\"url\":null" +
- "}," +
- "\"AccountNumber\":\"AC12345\"," +
- "\"Name\":\"NewName\"" +
- "}" +
- "}," +
- "{" +
- "\"method\":\"PATCH\"," +
- "\"url\":\"v37.0/sobjects/Account/EPK/12345\"," +
- "\"richInput\":{" +
- "\"attributes\":{" +
- "\"referenceId\":null," +
- "\"type\":\"Account\"," +
- "\"url\":null" +
- "}," +
- "\"Name\":\"NewName\"" +
- "}" +
- "}," +
- "{" +
- "\"method\":\"PATCH\"," +
- "\"url\":\"v37.0/sobjects/Account/EPK/12345\"," +
- "\"richInput\":{" +
- "\"attributes\":{" +
- "\"referenceId\":null," +
- "\"type\":\"Account\"," +
- "\"url\":null" +
- "}," +
- "\"Name\":\"NewName\"" +
- "}" +
- "}," +
- "{" +
- "\"method\":\"PATCH\"," +
- "\"url\":\"v37.0/some/url\"" +
- "}," +
- "{" +
- "\"method\":\"GET\"," +
- "\"url\":\"v37.0/query/?q=SELECT Name FROM Account\"" +
- "}," +
- "{" +
- "\"method\":\"GET\"," +
- "\"url\":\"v37.0/queryAll/?q=SELECT Name FROM Account\"" +
- "}," +
- "{" +
- "\"method\":\"GET\"," +
- "\"url\":\"v37.0/search/?q=FIND {joe}\"" +
- "}" +
- "]" +
- "}";
+ final String json = "{" + "\"batchRequests\":[" + "{" + "\"method\":\"POST\"," + "\"url\":\"v37.0/sobjects/Account/\"," + "\"richInput\":{" + "\"attributes\":{"
+ + "\"referenceId\":null," + "\"type\":\"Account\"," + "\"url\":null" + "}," + "\"Industry\":\"Environmental\"," + "\"Name\":\"NewAccountName\"" + "}"
+ + "}," + "{" + "\"method\":\"DELETE\"," + "\"url\":\"v37.0/sobjects/Account/001D000000K0fXOIAZ\"" + "}," + "{" + "\"method\":\"GET\","
+ + "\"url\":\"v37.0/sobjects/Account/001D000000K0fXOIAZ?fields=Name,BillingPostalCode\"" + "}," + "{" + "\"method\":\"GET\","
+ + "\"url\":\"v37.0/sobjects/Account/EPK/12345\"" + "}," + "{" + "\"method\":\"GET\","
+ + "\"url\":\"v37.0/sobjects/Account/001D000000K0fXOIAZ/CreatedBy?fields=Name\"" + "}," + "{" + "\"method\":\"GET\"," + "\"url\":\"v37.0/limits/\""
+ + "}," + "{" + "\"method\":\"PATCH\"," + "\"url\":\"v37.0/sobjects/Account/001D000000K0fXOIAZ\"," + "\"richInput\":{" + "\"attributes\":{"
+ + "\"referenceId\":null," + "\"type\":\"Account\"," + "\"url\":null" + "}," + "\"AccountNumber\":\"AC12345\"," + "\"Name\":\"NewName\"" + "}" + "},"
+ + "{" + "\"method\":\"PATCH\"," + "\"url\":\"v37.0/sobjects/Account/EPK/12345\"," + "\"richInput\":{" + "\"attributes\":{" + "\"referenceId\":null,"
+ + "\"type\":\"Account\"," + "\"url\":null" + "}," + "\"Name\":\"NewName\"" + "}" + "}," + "{" + "\"method\":\"PATCH\","
+ + "\"url\":\"v37.0/sobjects/Account/EPK/12345\"," + "\"richInput\":{" + "\"attributes\":{" + "\"referenceId\":null," + "\"type\":\"Account\","
+ + "\"url\":null" + "}," + "\"Name\":\"NewName\"" + "}" + "}," + "{" + "\"method\":\"PATCH\"," + "\"url\":\"v37.0/some/url\"" + "}," + "{"
+ + "\"method\":\"GET\"," + "\"url\":\"v37.0/query/?q=SELECT Name FROM Account\"" + "}," + "{" + "\"method\":\"GET\","
+ + "\"url\":\"v37.0/queryAll/?q=SELECT Name FROM Account\"" + "}," + "{" + "\"method\":\"GET\"," + "\"url\":\"v37.0/search/?q=FIND {joe}\"" + "}" + "]"
+ + "}";
final ObjectMapper mapper = JsonUtils.createObjectMapper();
final String serialized = mapper.writerFor(SObjectBatch.class).writeValueAsString(batch);
assertEquals("Should serialize as expected by Salesforce", json, serialized);
diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/api/dto/composite/SObjectTreeTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/api/dto/composite/SObjectTreeTest.java
index 4720f63..86f4f89 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/api/dto/composite/SObjectTreeTest.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/api/dto/composite/SObjectTreeTest.java
@@ -73,58 +73,14 @@ public class SObjectTreeTest extends CompositeTestBase {
tree.addNode(account2);
final String json = writer.writeValueAsString(tree);
- final String expected = "{" +
- "\"records\":[" +
- "{" +
- "\"Industry\":\"Banking\"," +
- "\"Name\":\"SampleAccount\"," +
- "\"NumberOfEmployees\":100," +
- "\"Phone\":\"1234567890\"," +
- "\"Website\":\"www.salesforce.com\"," +
- "\"attributes\":{" +
- "\"referenceId\":\"ref1\"," +
- "\"type\":\"Account\"," +
- "\"url\":null" +
- "}," +
- "\"Contacts\":{" +
- "\"records\":[" +
- "{" +
- "\"Email\":\"sample@salesforce.com\"," +
- "\"LastName\":\"Smith\"," +
- "\"Title\":\"President\"," +
- "\"attributes\":{" +
- "\"referenceId\":\"ref2\"," +
- "\"type\":\"Contact\"," +
- "\"url\":null" +
- "}" +
- "}," +
- "{" +
- "\"Email\":\"sample@salesforce.com\"," +
- "\"LastName\":\"Evans\"," +
- "\"Title\":\"Vice President\"," +
- "\"attributes\":{" +
- "\"referenceId\":\"ref3\"," +
- "\"type\":\"Contact\"," +
- "\"url\":null" +
- "}" +
- "}" +
- "]" +
- "}" +
- "}," +
- "{" +
- "\"Industry\":\"Banking\"," +
- "\"Name\":\"SampleAccount2\"," +
- "\"NumberOfEmployees\":100," +
- "\"Phone\":\"1234567890\"," +
- "\"Website\":\"www.salesforce2.com\"," +
- "\"attributes\":{" +
- "\"referenceId\":\"ref4\"," +
- "\"type\":\"Account\"," +
- "\"url\":null" +
- "}" +
- "}" +
- "]" +
- "}";
+ final String expected = "{" + "\"records\":[" + "{" + "\"Industry\":\"Banking\"," + "\"Name\":\"SampleAccount\"," + "\"NumberOfEmployees\":100,"
+ + "\"Phone\":\"1234567890\"," + "\"Website\":\"www.salesforce.com\"," + "\"attributes\":{" + "\"referenceId\":\"ref1\"," + "\"type\":\"Account\","
+ + "\"url\":null" + "}," + "\"Contacts\":{" + "\"records\":[" + "{" + "\"Email\":\"sample@salesforce.com\"," + "\"LastName\":\"Smith\","
+ + "\"Title\":\"President\"," + "\"attributes\":{" + "\"referenceId\":\"ref2\"," + "\"type\":\"Contact\"," + "\"url\":null" + "}" + "}," + "{"
+ + "\"Email\":\"sample@salesforce.com\"," + "\"LastName\":\"Evans\"," + "\"Title\":\"Vice President\"," + "\"attributes\":{"
+ + "\"referenceId\":\"ref3\"," + "\"type\":\"Contact\"," + "\"url\":null" + "}" + "}" + "]" + "}" + "}," + "{" + "\"Industry\":\"Banking\","
+ + "\"Name\":\"SampleAccount2\"," + "\"NumberOfEmployees\":100," + "\"Phone\":\"1234567890\"," + "\"Website\":\"www.salesforce2.com\","
+ + "\"attributes\":{" + "\"referenceId\":\"ref4\"," + "\"type\":\"Account\"," + "\"url\":null" + "}" + "}" + "]" + "}";
assertEquals("Should serialize to JSON as in Salesforce example", expected, json);
}
diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Task.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Task.java
index a392c85..187a628 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Task.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Task.java
@@ -34,7 +34,6 @@ public class Task extends AbstractSObjectBase {
getAttributes().setType("Task");
}
-
private ZonedDateTime ActivityDate;
private String Description;
diff --git a/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/java/org/apache/camel/maven/CamelSalesforceMojoOutputTest.java b/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/java/org/apache/camel/maven/CamelSalesforceMojoOutputTest.java
index cc4270d..21c9aa9 100644
--- a/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/java/org/apache/camel/maven/CamelSalesforceMojoOutputTest.java
+++ b/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/java/org/apache/camel/maven/CamelSalesforceMojoOutputTest.java
@@ -104,21 +104,16 @@ public class CamelSalesforceMojoOutputTest {
@Parameters(name = "json = {0}, source = {2}")
public static Iterable<Object[]> parameters() throws IOException {
- return Arrays.asList(testCase(TEST_CASE_FILE, "Case.java"),
- testCase(TEST_CASE_FILE, "Case_PickListAccentMarkEnum.java"),
- testCase(TEST_CASE_FILE, "Case_PickListQuotationMarkEnum.java"),
- testCase(TEST_CASE_FILE, "Case_PickListSlashEnum.java"), //
- testCase(TEST_CASE_FILE, "QueryRecordsCase.java"),
- testCase(TEST_CALCULATED_FORMULA_FILE, "ComplexCalculatedFormula.java"),
- testCase(TEST_CALCULATED_FORMULA_FILE, "QueryRecordsComplexCalculatedFormula.java"),
- testCase("asset.json", "Asset.java"), //
- testCase("asset.json", mojo -> {
- mojo.customTypes = new HashMap<>();
- mojo.customTypes.put("date", "java.time.LocalDateTime");
-
- mojo.setup();
- }, s -> "Asset_LocalDateTime.java", "Asset.java"),
- testCase("with_reference.json", "With_Reference__c.java"));
+ return Arrays.asList(testCase(TEST_CASE_FILE, "Case.java"), testCase(TEST_CASE_FILE, "Case_PickListAccentMarkEnum.java"),
+ testCase(TEST_CASE_FILE, "Case_PickListQuotationMarkEnum.java"), testCase(TEST_CASE_FILE, "Case_PickListSlashEnum.java"), //
+ testCase(TEST_CASE_FILE, "QueryRecordsCase.java"), testCase(TEST_CALCULATED_FORMULA_FILE, "ComplexCalculatedFormula.java"),
+ testCase(TEST_CALCULATED_FORMULA_FILE, "QueryRecordsComplexCalculatedFormula.java"), testCase("asset.json", "Asset.java"), //
+ testCase("asset.json", mojo -> {
+ mojo.customTypes = new HashMap<>();
+ mojo.customTypes.put("date", "java.time.LocalDateTime");
+
+ mojo.setup();
+ }, s -> "Asset_LocalDateTime.java", "Asset.java"), testCase("with_reference.json", "With_Reference__c.java"));
}
static GenerateMojo createMojo() {
[camel] 03/05: Regen
Posted by ac...@apache.org.
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.git
commit 3dd1088edd09789d1be577dc521deef612df1a8a
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Aug 30 12:44:48 2019 +0200
Regen
---
.../src/main/docs/salesforce-component.adoc | 3 +-
components/readme.adoc | 103 +--------------------
.../modules/ROOT/pages/aws-mq-component.adoc | 10 +-
.../modules/ROOT/pages/salesforce-component.adoc | 16 +++-
4 files changed, 21 insertions(+), 111 deletions(-)
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/docs/salesforce-component.adoc b/components/camel-salesforce/camel-salesforce-component/src/main/docs/salesforce-component.adoc
index 441e3c1..47ee657 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/docs/salesforce-component.adoc
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/docs/salesforce-component.adoc
@@ -768,7 +768,7 @@ When using Spring Boot make sure to use the following Maven dependency to have s
----
-The component supports 87 options, which are listed below.
+The component supports 86 options, which are listed below.
@@ -824,7 +824,6 @@ The component supports 87 options, which are listed below.
| *camel.component.salesforce.config.s-object-name* | SObject name if required or supported by API | | String
| *camel.component.salesforce.config.s-object-query* | Salesforce SOQL query string | | String
| *camel.component.salesforce.config.s-object-search* | Salesforce SOSL search string | | String
-| *camel.component.salesforce.config.serialize-nulls* | Should the NULL values of given DTO be serialized with empty (NULL) values. This affects only JSON data format. | false | Boolean
| *camel.component.salesforce.config.update-topic* | Whether to update an existing Push Topic when using the Streaming API, defaults to false | false | Boolean
| *camel.component.salesforce.enabled* | Enable salesforce component | true | Boolean
| *camel.component.salesforce.http-client-connection-timeout* | Connection timeout used by the HttpClient when connecting to the Salesforce server. | 60000 | Long
diff --git a/components/readme.adoc b/components/readme.adoc
index 3638b06..8ca15dd 100644
--- a/components/readme.adoc
+++ b/components/readme.adoc
@@ -1,7 +1,7 @@
= Components
// components: START
-Number of Components: 297 in 235 JAR artifacts (0 deprecated)
+Number of Components: 268 in 207 JAR artifacts (0 deprecated)
[width="100%",cols="4,1,5",options="header"]
|===
@@ -22,9 +22,6 @@ Number of Components: 297 in 235 JAR artifacts (0 deprecated)
| link:camel-flink/src/main/docs/flink-component.adoc[Apache Flink] (camel-flink) +
`flink:endpointType` | 2.18 | The flink component can be used to send DataSet jobs to Apache Flink cluster.
-| link:camel-pulsar/src/main/docs/pulsar-component.adoc[Apache Pulsar] (camel-pulsar) +
-`pulsar:persistence://tenant/namespace/topic` | 2.24 | Camel Apache Pulsar Component
-
| link:camel-spark/src/main/docs/spark-component.adoc[Apache Spark] (camel-spark) +
`spark:endpointType` | 2.17 | The spark component can be used to send RDD or DataFrame jobs to Apache Spark cluster.
@@ -40,9 +37,6 @@ Number of Components: 297 in 235 JAR artifacts (0 deprecated)
| link:camel-atmos/src/main/docs/atmos-component.adoc[Atmos] (camel-atmos) +
`atmos:name/operation` | 2.15 | The atmos component is used for integrating with EMC's Atomos Storage.
-| link:camel-atmosphere-websocket/src/main/docs/atmosphere-websocket-component.adoc[Atmosphere Websocket] (camel-atmosphere-websocket) +
-`atmosphere-websocket:servicePath` | 2.14 | To exchange data with external Websocket clients using Atmosphere.
-
| link:camel-atom/src/main/docs/atom-component.adoc[Atom] (camel-atom) +
`atom:feedUri` | 1.2 | The atom component is used for consuming Atom RSS feeds.
@@ -67,9 +61,6 @@ Number of Components: 297 in 235 JAR artifacts (0 deprecated)
| link:camel-avro/src/main/docs/avro-component.adoc[Avro] (camel-avro) +
`avro:transport:host:port/messageName` | 2.10 | Working with Apache Avro for data serialization.
-| link:camel-aws-cw/src/main/docs/aws-cw-component.adoc[AWS CloudWatch] (camel-aws-cw) +
-`aws-cw:namespace` | 2.11 | The aws-cw component is used for sending metrics to an Amazon CloudWatch.
-
| link:camel-aws-ddb/src/main/docs/aws-ddb-component.adoc[AWS DynamoDB] (camel-aws-ddb) +
`aws-ddb:tableName` | 2.10 | The aws-ddb component is used for storing and retrieving data from Amazon's DynamoDB service.
@@ -112,12 +103,6 @@ Number of Components: 297 in 235 JAR artifacts (0 deprecated)
| link:camel-aws-ses/src/main/docs/aws-ses-component.adoc[AWS Simple Email Service] (camel-aws-ses) +
`aws-ses:from` | 2.9 | The aws-ses component is used for sending emails with Amazon's SES service.
-| link:camel-aws-sns/src/main/docs/aws-sns-component.adoc[AWS Simple Notification System] (camel-aws-sns) +
-`aws-sns:topicNameOrArn` | 2.8 | The aws-sns component is used for sending messages to an Amazon Simple Notification Topic.
-
-| link:camel-aws-sqs/src/main/docs/aws-sqs-component.adoc[AWS Simple Queue Service] (camel-aws-sqs) +
-`aws-sqs:queueNameOrArn` | 2.6 | The aws-sqs component is used for sending and receiving messages to Amazon's SQS service.
-
| link:camel-aws-swf/src/main/docs/aws-swf-component.adoc[AWS Simple Workflow] (camel-aws-swf) +
`aws-swf:type` | 2.13 | The aws-swf component is used for managing workflows from Amazon Simple Workflow.
@@ -181,9 +166,6 @@ Number of Components: 297 in 235 JAR artifacts (0 deprecated)
| link:camel-cometd/src/main/docs/cometd-component.adoc[CometD] (camel-cometd) +
`cometd:host:port/channelName` | 2.0 | The cometd component is a transport for working with the Jetty implementation of the cometd/bayeux protocol.
-| link:camel-consul/src/main/docs/consul-component.adoc[Consul] (camel-consul) +
-`consul:apiEndpoint` | 2.18 | The camel consul component allows you to work with Consul, a distributed, highly available, datacenter-aware, service discovery and configuration system.
-
| link:camel-controlbus/src/main/docs/controlbus-component.adoc[Control Bus] (camel-controlbus) +
`controlbus:command:language` | 2.11 | The controlbus component provides easy management of Camel applications based on the Control Bus EIP pattern.
@@ -268,9 +250,6 @@ Number of Components: 297 in 235 JAR artifacts (0 deprecated)
| link:camel-file/src/main/docs/file-component.adoc[File] (camel-file) +
`file:directoryName` | 1.0 | The file component is used for reading or writing files.
-| link:camel-file-watch/src/main/docs/file-watch-component.adoc[file-watch] (camel-file-watch) +
-`file-watch:path` | 3.0 | The file-watch is used to monitor file events in directory using java.nio.file.WatchService
-
| link:camel-flatpack/src/main/docs/flatpack-component.adoc[Flatpack] (camel-flatpack) +
`flatpack:type:resourceUri` | 1.4 | The flatpack component supports fixed width and delimited file parsing via the FlatPack library.
@@ -286,9 +265,6 @@ Number of Components: 297 in 235 JAR artifacts (0 deprecated)
| link:camel-ftp/src/main/docs/ftps-component.adoc[FTPS] (camel-ftp) +
`ftps:host:port/directoryName` | 2.2 | The \ftps (FTP secure SSL/TLS) component is used for uploading or downloading files from FTP servers.
-| link:camel-ganglia/src/main/docs/ganglia-component.adoc[Ganglia] (camel-ganglia) +
-`ganglia:host:port` | 2.15 | The ganglia component is used for sending metrics to the Ganglia monitoring system.
-
| link:camel-geocoder/src/main/docs/geocoder-component.adoc[Geocoder] (camel-geocoder) +
`geocoder:address:latlng` | 2.12 | The geocoder component is used for looking up geocodes (latitude and longitude) for a given address, or reverse lookup.
@@ -376,15 +352,9 @@ Number of Components: 297 in 235 JAR artifacts (0 deprecated)
| link:camel-hbase/src/main/docs/hbase-component.adoc[HBase] (camel-hbase) +
`hbase:tableName` | 2.10 | For reading/writing from/to an HBase store (Hadoop database).
-| link:camel-hdfs/src/main/docs/hdfs-component.adoc[HDFS] (camel-hdfs) +
-`hdfs:hostName:port/path` | 2.14 | For reading/writing from/to an HDFS filesystem using Hadoop 2.x.
-
| link:camel-hipchat/src/main/docs/hipchat-component.adoc[Hipchat] (camel-hipchat) +
`hipchat:protocol:host:port` | 2.15 | The hipchat component supports producing and consuming messages from/to Hipchat service.
-| link:camel-http/src/main/docs/http-component.adoc[HTTP] (camel-http) +
-`http:httpUri` | 2.3 | For calling out to external HTTP servers using Apache HTTP Client 4.x.
-
| link:camel-iec60870/src/main/docs/iec60870-client-component.adoc[IEC 60870 Client] (camel-iec60870) +
`iec60870-client:uriPath` | 2.20 | IEC 60870 component used for telecontrol (supervisory control and data acquisition) such as controlling electric power transmission grids and other geographically widespread control systems.
@@ -448,9 +418,6 @@ Number of Components: 297 in 235 JAR artifacts (0 deprecated)
| link:camel-jdbc/src/main/docs/jdbc-component.adoc[JDBC] (camel-jdbc) +
`jdbc:dataSourceName` | 1.2 | The jdbc component enables you to access databases through JDBC, where SQL queries are sent in the message body.
-| link:camel-jetty/src/main/docs/jetty-component.adoc[Jetty] (camel-jetty) +
-`jetty:httpUri` | 1.2 | The jetty component provides HTTP-based endpoints for consuming and producing HTTP requests.
-
| link:camel-websocket/src/main/docs/websocket-component.adoc[Jetty Websocket] (camel-websocket) +
`websocket:host:port/resourceUri` | 2.10 | The websocket component provides websocket endpoints with Jetty for communicating with clients using websocket.
@@ -487,9 +454,6 @@ Number of Components: 297 in 235 JAR artifacts (0 deprecated)
| link:camel-jt400/src/main/docs/jt400-component.adoc[JT400] (camel-jt400) +
`jt400:userID:password/systemName/objectPath.type` | 1.5 | The jt400 component allows you to exchanges messages with an AS/400 system using data queues or program call.
-| link:camel-kafka/src/main/docs/kafka-component.adoc[Kafka] (camel-kafka) +
-`kafka:topic` | 2.13 | The kafka component allows messages to be sent to (or consumed from) Apache Kafka brokers.
-
| link:camel-kubernetes/src/main/docs/kubernetes-config-maps-component.adoc[Kubernetes ConfigMap] (camel-kubernetes) +
`kubernetes-config-maps:masterUrl` | 2.17 | The Kubernetes Configmaps component provides a producer to execute kubernetes configmap operations.
@@ -568,18 +532,12 @@ Number of Components: 297 in 235 JAR artifacts (0 deprecated)
| link:camel-microprofile-metrics/src/main/docs/microprofile-metrics-component.adoc[MicroProfile Metrics] (camel-microprofile-metrics) +
`microprofile-metrics:metricType:metricName` | 3.0 | Camel metrics exposed with Eclipse MicroProfile Metrics
-| link:camel-mina/src/main/docs/mina-component.adoc[Mina] (camel-mina) +
-`mina:protocol:host:port` | 2.10 | Socket level networking using TCP or UDP with the Apache Mina 2.x library.
-
| link:camel-mllp/src/main/docs/mllp-component.adoc[MLLP] (camel-mllp) +
`mllp:hostname:port` | 2.17 | Provides functionality required by Healthcare providers to communicate with other systems using the MLLP protocol.
| link:camel-mock/src/main/docs/mock-component.adoc[Mock] (camel-mock) +
`mock:name` | 1.0 | The mock component is used for testing routes and mediation rules using mocks.
-| link:camel-mongodb/src/main/docs/mongodb-component.adoc[MongoDB] (camel-mongodb) +
-`mongodb:connectionBean` | 2.19 | Component for working with documents stored in MongoDB database.
-
| link:camel-mongodb-gridfs/src/main/docs/mongodb-gridfs-component.adoc[MongoDB GridFS] (camel-mongodb-gridfs) +
`mongodb-gridfs:connectionBean` | 2.18 | Component for working with MongoDB GridFS.
@@ -604,24 +562,9 @@ Number of Components: 297 in 235 JAR artifacts (0 deprecated)
| link:camel-nagios/src/main/docs/nagios-component.adoc[Nagios] (camel-nagios) +
`nagios:host:port` | 2.3 | To send passive checks to Nagios using JSendNSCA.
-| link:camel-nats/src/main/docs/nats-component.adoc[Nats] (camel-nats) +
-`nats:servers` | 2.17 | The nats component allows you produce and consume messages from NATS.
-
-| link:camel-netty/src/main/docs/netty-component.adoc[Netty] (camel-netty) +
-`netty:protocol:host:port` | 2.14 | Socket level networking using TCP or UDP with the Netty 4.x library.
-
-| link:camel-netty-http/src/main/docs/netty-http-component.adoc[Netty HTTP] (camel-netty-http) +
-`netty-http:protocol:host:port/path` | 2.14 | Netty HTTP server and client using the Netty 4.x library.
-
| link:camel-nsq/src/main/docs/nsq-component.adoc[NSQ] (camel-nsq) +
`nsq:servers` | 2.23 | Represents a nsq endpoint.
-| link:camel-olingo2/camel-olingo2-component/src/main/docs/olingo2-component.adoc[Olingo2] (camel-olingo2) +
-`olingo2:apiName/methodName` | 2.14 | Communicates with OData 2.0 services using Apache Olingo.
-
-| link:camel-olingo4/camel-olingo4-component/src/main/docs/olingo4-component.adoc[Olingo4] (camel-olingo4) +
-`olingo4:apiName/methodName` | 2.19 | Communicates with OData 4.0 services using Apache Olingo OData API.
-
| link:camel-milo/src/main/docs/milo-client-component.adoc[OPC UA Client] (camel-milo) +
`milo-client:endpointUri` | 2.19 | Connect to OPC UA servers using the binary protocol for acquiring telemetry data
@@ -682,9 +625,6 @@ Number of Components: 297 in 235 JAR artifacts (0 deprecated)
| link:camel-pubnub/src/main/docs/pubnub-component.adoc[PubNub] (camel-pubnub) +
`pubnub:channel` | 2.19 | To send and receive messages to PubNub data stream network for connected devices.
-| link:camel-quartz/src/main/docs/quartz-component.adoc[Quartz] (camel-quartz) +
-`quartz:groupName/triggerName` | 2.12 | Provides a scheduled delivery of messages using the Quartz 2.x scheduler.
-
| link:camel-quickfix/src/main/docs/quickfix-component.adoc[QuickFix] (camel-quickfix) +
`quickfix:configurationName` | 2.1 | The quickfix component allows to send Financial Interchange (FIX) messages to the QuickFix engine.
@@ -703,12 +643,6 @@ Number of Components: 297 in 235 JAR artifacts (0 deprecated)
| link:camel-rest/src/main/docs/rest-api-component.adoc[REST API] (camel-rest) +
`rest-api:path/contextIdPattern` | 2.16 | The rest-api component is used for providing Swagger API of the REST services which has been defined using the rest-dsl in Camel.
-| link:camel-rest-swagger/src/main/docs/rest-swagger-component.adoc[REST Swagger] (camel-rest-swagger) +
-`rest-swagger:specificationUri#operationId` | 2.19 | An awesome REST endpoint backed by Swagger specifications.
-
-| link:camel-restlet/src/main/docs/restlet-component.adoc[Restlet] (camel-restlet) +
-`restlet:protocol:host:port/uriPattern` | 2.0 | Component for consuming and producing Restful resources using Restlet.
-
| link:camel-rss/src/main/docs/rss-component.adoc[RSS] (camel-rss) +
`rss:feedUri` | 2.0 | The rss component is used for consuming RSS feeds.
@@ -739,9 +673,6 @@ Number of Components: 297 in 235 JAR artifacts (0 deprecated)
| link:camel-servicenow/camel-servicenow-component/src/main/docs/servicenow-component.adoc[ServiceNow] (camel-servicenow) +
`servicenow:instanceName` | 2.18 | The servicenow component is used to integrate Camel with ServiceNow cloud services.
-| link:camel-servlet/src/main/docs/servlet-component.adoc[Servlet] (camel-servlet) +
-`servlet:contextPath` | 2.0 | To use a HTTP Servlet as entry for Camel routes when running in a servlet container.
-
| link:camel-ftp/src/main/docs/sftp-component.adoc[SFTP] (camel-ftp) +
`sftp:host:port/directoryName` | 1.1 | The \sftp (FTP over SSH) component is used for uploading or downloading files from SFTP servers.
@@ -781,9 +712,6 @@ Number of Components: 297 in 235 JAR artifacts (0 deprecated)
| link:camel-spring-batch/src/main/docs/spring-batch-component.adoc[Spring Batch] (camel-spring-batch) +
`spring-batch:jobName` | 2.10 | The spring-batch component allows to send messages to Spring Batch for further processing.
-| link:camel-spring/src/main/docs/spring-event-component.adoc[Spring Event] (camel-spring) +
-`spring-event:name` | 1.4 | The spring-event component allows to listen for Spring Application Events.
-
| link:camel-spring-integration/src/main/docs/spring-integration-component.adoc[Spring Integration] (camel-spring-integration) +
`spring-integration:defaultChannel` | 1.4 | Bridges Camel with Spring Integration.
@@ -796,12 +724,6 @@ Number of Components: 297 in 235 JAR artifacts (0 deprecated)
| link:camel-spring-ws/src/main/docs/spring-ws-component.adoc[Spring WebService] (camel-spring-ws) +
`spring-ws:type:lookupKey:webServiceEndpointUri` | 2.6 | The spring-ws component is used for SOAP WebServices using Spring WebServices.
-| link:camel-sql/src/main/docs/sql-component.adoc[SQL] (camel-sql) +
-`sql:query` | 1.4 | The sql component allows you to work with databases using JDBC SQL queries.
-
-| link:camel-sql/src/main/docs/sql-stored-component.adoc[SQL Stored Procedure] (camel-sql) +
-`sql-stored:template` | 2.17 | The sql component allows you to work with databases using JDBC Stored Procedure queries.
-
| link:camel-ssh/src/main/docs/ssh-component.adoc[SSH] (camel-ssh) +
`ssh:host:port` | 2.10 | The ssh component enables access to SSH servers such that you can send an SSH command, and process the response.
@@ -811,9 +733,6 @@ Number of Components: 297 in 235 JAR artifacts (0 deprecated)
| link:camel-stomp/src/main/docs/stomp-component.adoc[Stomp] (camel-stomp) +
`stomp:destination` | 2.12 | The stomp component is used for communicating with Stomp compliant message brokers.
-| link:camel-stream/src/main/docs/stream-component.adoc[Stream] (camel-stream) +
-`stream:kind` | 1.3 | The stream: component provides access to the system-in, system-out and system-err streams as well as allowing streaming of file and URL.
-
| link:camel-stringtemplate/src/main/docs/string-template-component.adoc[String Template] (camel-stringtemplate) +
`string-template:resourceUri` | 1.2 | Transforms the message using a String template.
@@ -844,9 +763,6 @@ Number of Components: 297 in 235 JAR artifacts (0 deprecated)
| link:camel-twitter/src/main/docs/twitter-timeline-component.adoc[Twitter Timeline] (camel-twitter) +
`twitter-timeline:timelineType` | 2.10 | The Twitter Timeline component consumes twitter timeline or update the status of specific user.
-| link:camel-undertow/src/main/docs/undertow-component.adoc[Undertow] (camel-undertow) +
-`undertow:httpURI` | 2.16 | The undertow component provides HTTP and WebSocket based endpoints for consuming and producing HTTP/WebSocket requests.
-
| link:camel-validator/src/main/docs/validator-component.adoc[Validator] (camel-validator) +
`validator:resourceUri` | 1.1 | Validates the payload of a message using XML Schema and JAXP Validation.
@@ -880,9 +796,6 @@ Number of Components: 297 in 235 JAR artifacts (0 deprecated)
| link:camel-xmpp/src/main/docs/xmpp-component.adoc[XMPP] (camel-xmpp) +
`xmpp:host:port/participant` | 1.0 | To send and receive messages from a XMPP (chat) server.
-| link:camel-saxon/src/main/docs/xquery-component.adoc[XQuery] (camel-saxon) +
-`xquery:resourceUri` | 1.0 | Transforms the message using a XQuery template using Saxon.
-
| link:camel-xslt/src/main/docs/xslt-component.adoc[XSLT] (camel-xslt) +
`xslt:resourceUri` | 1.3 | Transforms the message using a XSLT template.
@@ -905,14 +818,12 @@ Number of Components: 297 in 235 JAR artifacts (0 deprecated)
== Data Formats
// dataformats: START
-Number of Data Formats: 45 in 37 JAR artifacts (0 deprecated)
+Number of Data Formats: 43 in 35 JAR artifacts (0 deprecated)
[width="100%",cols="4,1,5",options="header"]
|===
| Data Format | Available From | Description
-| link:camel-any23/src/main/docs/any23-dataformat.adoc[Any23] (camel-any23) | 3.0 | Any23 data format is used for parsing data to RDF.
-
| link:camel-asn1/src/main/docs/asn1-dataformat.adoc[ASN.1 File] (camel-asn1) | 2.20 | The ASN.1 data format is used for file transfer with telecommunications protocols.
| link:camel-avro/src/main/docs/avro-dataformat.adoc[Avro] (camel-avro) | 2.14 | The Avro data format is used for serialization and deserialization of messages using Apache Avro binary dataformat.
@@ -945,8 +856,6 @@ Number of Data Formats: 45 in 37 JAR artifacts (0 deprecated)
| link:camel-zip-deflater/src/main/docs/gzipdeflater-dataformat.adoc[GZip Deflater] (camel-zip-deflater) | 2.0 | The GZip data format is a message compression and de-compression format (which works with the popular gzip/gunzip tools).
-| link:camel-hl7/src/main/docs/hl7-dataformat.adoc[HL7] (camel-hl7) | 2.0 | The HL7 data format can be used to marshal or unmarshal HL7 (Health Care) model objects.
-
| link:camel-ical/src/main/docs/ical-dataformat.adoc[iCal] (camel-ical) | 2.12 | The iCal dataformat is used for working with iCalendar messages.
| link:camel-jacksonxml/src/main/docs/jacksonxml-dataformat.adoc[JacksonXML] (camel-jacksonxml) | 2.16 | JacksonXML data format is used for unmarshal a XML payload to POJO or to marshal POJO back to XML payload.
@@ -1007,7 +916,7 @@ Number of Data Formats: 45 in 37 JAR artifacts (0 deprecated)
== Expression Languages
// languages: START
-Number of Languages: 17 in 11 JAR artifacts (0 deprecated)
+Number of Languages: 14 in 8 JAR artifacts (0 deprecated)
[width="100%",cols="4,1,5",options="header"]
|===
@@ -1025,8 +934,6 @@ Number of Languages: 17 in 11 JAR artifacts (0 deprecated)
| link:camel-base/src/main/docs/header-language.adoc[Header] (camel-base) | 1.5 | To use a Camel Message header in expressions or predicates.
-| link:camel-hl7/src/main/docs/hl7terser-language.adoc[HL7 Terser] (camel-hl7) | 2.11 | To use HL7 terser scripts in Camel expressions or predicates.
-
| link:camel-jsonpath/src/main/docs/jsonpath-language.adoc[JsonPath] (camel-jsonpath) | 2.13 | To use JsonPath in Camel expressions or predicates.
| link:camel-mvel/src/main/docs/mvel-language.adoc[MVEL] (camel-mvel) | 2.0 | To use MVEL scripts in Camel expressions or predicates.
@@ -1037,15 +944,11 @@ Number of Languages: 17 in 11 JAR artifacts (0 deprecated)
| link:camel-base/src/main/docs/simple-language.adoc[Simple] (camel-base) | 1.1 | To use Camels built-in Simple language in Camel expressions or predicates.
-| link:camel-spring/src/main/docs/spel-language.adoc[SpEL] (camel-spring) | 2.7 | To use Spring Expression Language (SpEL) in Camel expressions or predicates.
-
| link:camel-base/src/main/docs/tokenize-language.adoc[Tokenize] (camel-base) | 2.0 | To use Camel message body or header with a tokenizer in Camel expressions or predicates.
| link:camel-jaxp/src/main/docs/xtokenize-language.adoc[XML Tokenize] (camel-jaxp) | 2.14 | To use Camel message body or header with a XML tokenizer in Camel expressions or predicates.
| link:camel-xpath/src/main/docs/xpath-language.adoc[XPath] (camel-xpath) | 1.1 | To use XPath (XML) in Camel expressions or predicates.
-
-| link:camel-saxon/src/main/docs/xquery-language.adoc[XQuery] (camel-saxon) | 1.0 | To use XQuery (XML) in Camel expressions or predicates.
|===
// languages: END
diff --git a/docs/components/modules/ROOT/pages/aws-mq-component.adoc b/docs/components/modules/ROOT/pages/aws-mq-component.adoc
index be117ed..b3aaf2b 100644
--- a/docs/components/modules/ROOT/pages/aws-mq-component.adoc
+++ b/docs/components/modules/ROOT/pages/aws-mq-component.adoc
@@ -3,14 +3,14 @@
*Available as of Camel version 2.21*
-The EC2 component supports create, run, start, stop and terminate
-https://aws.amazon.com/mq/[AWS MQ] instances.
+The MQ component supports create, run, start, stop and terminate
+https://aws.amazon.com/amazon-mq/[AWS MQ] instances.
Prerequisites
You must have a valid Amazon Web Services developer account, and be
signed up to use Amazon MQ. More information is available at
-https://aws.amazon.com/mq/[Amazon MQ].
+https://aws.amazon.com/amazon-mq/[Amazon MQ].
== URI Format
@@ -126,7 +126,7 @@ Required MQ component options
You have to provide the amazonMqClient in the
Registry or your accessKey and secretKey to access
-the https://aws.amazon.com/mq/[Amazon MQ] service.
+the https://aws.amazon.com/amazon-mq/[Amazon MQ] service.
== Usage
@@ -146,7 +146,7 @@ the https://aws.amazon.com/mq/[Amazon MQ] service.
|`CamelAwsMQBrokerDeploymentMode` |`String` |The deployment mode for the broker in the createBroker operation
-|`CamelAwsMQBrokerInstanceType` |`String` |The instance type for the EC2 machine in the createBroker operation
+|`CamelAwsMQBrokerInstanceType` |`String` |The instance type for the MQ machine in the createBroker operation
|`CamelAwsMQBrokerEngine` |`String` |The Broker Engine for MQ. Default is ACTIVEMQ
diff --git a/docs/components/modules/ROOT/pages/salesforce-component.adoc b/docs/components/modules/ROOT/pages/salesforce-component.adoc
index 80cc134..47ee657 100644
--- a/docs/components/modules/ROOT/pages/salesforce-component.adoc
+++ b/docs/components/modules/ROOT/pages/salesforce-component.adoc
@@ -575,6 +575,16 @@ final Map<String, ?> accountUpdateBody = accountUpdateResult.getBody();
final SObjectCompositeResult contactCreationResult = results.stream().filter(r -> "JunctionRecord".equals(r.getReferenceId())).findFirst().get()
----
+== Sending null values to salesforce
+
+By default, SObject fields with null values are not sent to salesforce. In order to
+send null values to salesforce, use the `fieldsToNull` property, as follows:
+
+[source,java]
+----
+accountSObject.getFieldsToNull().add("Site");
+----
+
== Generating SOQL query strings
`org.apache.camel.component.salesforce.api.utils.QueryHelper` contains helper
@@ -689,7 +699,7 @@ with the following path and query parameters:
|===
-=== Query Parameters (46 parameters):
+=== Query Parameters (45 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
@@ -723,7 +733,6 @@ with the following path and query parameters:
| *reportId* (common) | Salesforce1 Analytics report Id | | String
| *reportMetadata* (common) | Salesforce1 Analytics report metadata for filtering | | ReportMetadata
| *resultId* (common) | Bulk API Result ID | | String
-| *serializeNulls* (common) | Should the NULL values of given DTO be serialized with empty (NULL) values. This affects only JSON data format. | false | boolean
| *sObjectBlobFieldName* (common) | SObject blob field name | | String
| *sObjectClass* (common) | Fully qualified SObject class name, usually generated using camel-salesforce-maven-plugin | | String
| *sObjectFields* (common) | SObject fields to retrieve | | String
@@ -759,7 +768,7 @@ When using Spring Boot make sure to use the following Maven dependency to have s
----
-The component supports 87 options, which are listed below.
+The component supports 86 options, which are listed below.
@@ -815,7 +824,6 @@ The component supports 87 options, which are listed below.
| *camel.component.salesforce.config.s-object-name* | SObject name if required or supported by API | | String
| *camel.component.salesforce.config.s-object-query* | Salesforce SOQL query string | | String
| *camel.component.salesforce.config.s-object-search* | Salesforce SOSL search string | | String
-| *camel.component.salesforce.config.serialize-nulls* | Should the NULL values of given DTO be serialized with empty (NULL) values. This affects only JSON data format. | false | Boolean
| *camel.component.salesforce.config.update-topic* | Whether to update an existing Push Topic when using the Streaming API, defaults to false | false | Boolean
| *camel.component.salesforce.enabled* | Enable salesforce component | true | Boolean
| *camel.component.salesforce.http-client-connection-timeout* | Connection timeout used by the HttpClient when connecting to the Salesforce server. | 60000 | Long