You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2016/05/13 05:58:08 UTC

[1/2] camel git commit: Allow flexible formatting from URI: JSON | XML

Repository: camel
Updated Branches:
  refs/heads/camel-2.17.x 3cedfe4cd -> 087e7c174
  refs/heads/master 2a462898f -> 890379171


Allow flexible formatting from URI: JSON | XML

Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/087e7c17
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/087e7c17
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/087e7c17

Branch: refs/heads/camel-2.17.x
Commit: 087e7c174e58421ba39c5f71926e0e0efbaf53dd
Parents: 3cedfe4
Author: Sergio Martinez <ch...@gmail.com>
Authored: Wed May 11 19:51:20 2016 -0700
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri May 13 07:56:20 2016 +0200

----------------------------------------------------------------------
 .../org/apache/camel/component/salesforce/SalesforceConsumer.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/087e7c17/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceConsumer.java
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceConsumer.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceConsumer.java
index ac44d5a..e6434a5 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceConsumer.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceConsumer.java
@@ -103,7 +103,7 @@ public class SalesforceConsumer extends DefaultConsumer {
             // create REST client for PushTopic operations
             SalesforceComponent component = endpoint.getComponent();
             RestClient restClient = new DefaultRestClient(component.getConfig().getHttpClient(),
-                    endpoint.getConfiguration().getApiVersion(), PayloadFormat.JSON, component.getSession());
+                    endpoint.getConfiguration().getApiVersion(), endpoint.getConfiguration().getFormat(), component.getSession());
             // don't forget to start the client
             ServiceHelper.startService(restClient);

[2/2] camel git commit: Allow flexible formatting from URI: JSON | XML

Posted by da...@apache.org.
Allow flexible formatting from URI: JSON | XML

Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/89037917
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/89037917
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/89037917

Branch: refs/heads/master
Commit: 8903791711336fdab56d3dd0d0fef991075ab366
Parents: 2a46289
Author: Sergio Martinez <ch...@gmail.com>
Authored: Wed May 11 19:51:20 2016 -0700
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri May 13 07:56:47 2016 +0200

----------------------------------------------------------------------
 .../org/apache/camel/component/salesforce/SalesforceConsumer.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/89037917/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceConsumer.java
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceConsumer.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceConsumer.java
index ac44d5a..e6434a5 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceConsumer.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceConsumer.java
@@ -103,7 +103,7 @@ public class SalesforceConsumer extends DefaultConsumer {
             // create REST client for PushTopic operations
             SalesforceComponent component = endpoint.getComponent();
             RestClient restClient = new DefaultRestClient(component.getConfig().getHttpClient(),
-                    endpoint.getConfiguration().getApiVersion(), PayloadFormat.JSON, component.getSession());
+                    endpoint.getConfiguration().getApiVersion(), endpoint.getConfiguration().getFormat(), component.getSession());
             // don't forget to start the client
             ServiceHelper.startService(restClient);