[camel] branch master updated: CAMEL-12703: camel-salesforce - Added JSON as a valid contentType

[zregvart]

This is an automated email from the ASF dual-hosted git repository.

zregvart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/master by this push:
     new 80c5c3b  CAMEL-12703: camel-salesforce - Added JSON as a valid 
contentType
80c5c3b is described below

commit 80c5c3bb36525cc5326e6cf45485354d18983564
Author: Jesse Sightler <jesse.sight...@gmail.com>
AuthorDate: Tue Jul 31 12:37:48 2018 -0400

    CAMEL-12703: camel-salesforce - Added JSON as a valid contentType
    
    Added JSON to JobInfo ContentType. Documented here: 
https://developer.salesforce.com/docs/atlas.en-us.api_asynch.meta/api_asynch/asynch_api_reference_jobinfo.htm
---
 .../apache/camel/component/salesforce/api/dto/bulk/ContentType.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git 
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/bulk/ContentType.java
 
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/bulk/ContentType.java
index c5b4541..ce32489 100644
--- 
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/bulk/ContentType.java
+++ 
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/bulk/ContentType.java
@@ -30,8 +30,10 @@ import javax.xml.bind.annotation.XmlType;
  *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string";>
  *     &lt;enumeration value="XML"/>
  *     &lt;enumeration value="CSV"/>
+ *     &lt;enumeration value="JSON"/>
  *     &lt;enumeration value="ZIP_XML"/>
  *     &lt;enumeration value="ZIP_CSV"/>
+ *     &lt;enumeration value="ZIP_JSON"/>
  *   &lt;/restriction>
  * &lt;/simpleType>
  * </pre>
@@ -42,8 +44,10 @@ public enum ContentType {
 
     XML,
     CSV,
+    JSON,
     ZIP_XML,
-    ZIP_CSV;
+    ZIP_CSV,
+    ZIP_JSON;
 
     public String value() {
         return name();