[camel] branch main updated: Pull request for Salesforce Consumer - needed to add .getJSON() to message for raw payload (#6260)

[davsclaus]

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

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


The following commit(s) were added to refs/heads/main by this push:
     new 2a906e4  Pull request for Salesforce Consumer - needed to add 
.getJSON() to message for raw payload (#6260)
2a906e4 is described below

commit 2a906e469913a26c4ed4a1f288120e0c7527da0f
Author: hakidehari <38669902+hakideh...@users.noreply.github.com>
AuthorDate: Wed Oct 13 23:39:36 2021 -0500

    Pull request for Salesforce Consumer - needed to add .getJSON() to message 
for raw payload (#6260)
    
    CAMEL-17080: camel-salesforce - Raw mode should store json payload directly
    
    * Update SalesforceConsumer.java
    * Updated platform event and cdc event consumer
    needed to add message.getJSON() for raw payload configuration.
    * Added .getJSON() method call to unit test of raw platform event
---
 .../org/apache/camel/component/salesforce/SalesforceConsumer.java   | 6 ++++--
 .../apache/camel/component/salesforce/SalesforceConsumerTest.java   | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

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 6b152bf..56ac9ae 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
@@ -169,7 +169,8 @@ public class SalesforceConsumer extends DefaultConsumer {
         in.setHeader("CamelSalesforceRecordIds", 
changeEventHeader.get("recordIds"));
 
         if (rawPayload) {
-            in.setBody(message);
+            // getJSON is used for raw payload
+            in.setBody(message.getJSON());
         } else {
             payload.remove("ChangeEventHeader");
             in.setBody(payload);
@@ -198,7 +199,8 @@ public class SalesforceConsumer extends DefaultConsumer {
         in.setHeader("CamelSalesforceCreatedDate", platformEvent.getCreated());
 
         if (rawPayload) {
-            in.setBody(message);
+            // getJSON is used for raw payload
+            in.setBody(message.getJSON());
         } else {
             in.setBody(platformEvent);
         }
diff --git 
a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/SalesforceConsumerTest.java
 
b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/SalesforceConsumerTest.java
index b9b4027..7306b44 100644
--- 
a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/SalesforceConsumerTest.java
+++ 
b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/SalesforceConsumerTest.java
@@ -273,7 +273,7 @@ public class SalesforceConsumerTest {
 
         consumer.processMessage(mock(ClientSessionChannel.class), message);
 
-        verify(in).setBody(message);
+        verify(in).setBody(message.getJSON());
         verify(in).setHeader("CamelSalesforceCreatedDate", 
ZonedDateTime.parse("2018-07-06T12:41:04Z"));
         verify(in).setHeader("CamelSalesforceReplayId", 4L);
         verify(in).setHeader("CamelSalesforceChannel", "/event/TestEvent__e");