[camel] branch camel-3.4.x updated: CAMEL-15338 removed hardcoded suffix for salesforce Platform Event Channel. (#4045)

[acosentino]

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

acosentino pushed a commit to branch camel-3.4.x
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/camel-3.4.x by this push:
     new 6785667  CAMEL-15338 removed hardcoded suffix for salesforce Platform 
Event Channel. (#4045)
6785667 is described below

commit 678566757351fbfc084cb54ccb4c577fd3d20d3a
Author: Yulia Buzlukova <alta...@gmail.com>
AuthorDate: Tue Jul 28 02:11:14 2020 -0400

    CAMEL-15338 removed hardcoded suffix for salesforce Platform Event Channel. 
(#4045)
    
    API names of standard platform events, such as AssetTokenEvent, don’t 
include a suffix. See 
https://developer.salesforce.com/docs/atlas.en-us.platform_events.meta/platform_events/platform_events_define_ui.htm
    Hardcoding the suffix in channel name results in subscription failure for 
standard salesforce events.
---
 .../component/salesforce/internal/streaming/SubscriptionHelper.java  | 5 -----
 1 file changed, 5 deletions(-)

diff --git 
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/streaming/SubscriptionHelper.java
 
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/streaming/SubscriptionHelper.java
index faf530f..26958c1 100644
--- 
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/streaming/SubscriptionHelper.java
+++ 
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/streaming/SubscriptionHelper.java
@@ -538,11 +538,6 @@ public class SubscriptionHelper extends ServiceSupport {
             channelName.append(topicName);
         }
 
-        final int typeIdx = channelName.indexOf("/", 1);
-        if ("event".equals(channelName.substring(1, typeIdx)) && 
!topicName.endsWith("__e")) {
-            channelName.append("__e");
-        }
-
         return channelName.toString();
     }