You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by je...@apache.org on 2025/07/31 03:07:42 UTC

(camel) 02/02: CAMEL-22244: camel-salesforce: simplify Content-Type determination.

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

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

commit cb91cb178b90d3936ff4cb00c58867e9b4dfca32
Author: Jeremy Ross <je...@gmail.com>
AuthorDate: Wed Jul 30 22:04:57 2025 -0500

    CAMEL-22244: camel-salesforce: simplify Content-Type determination.
---
 .../internal/client/DefaultRestClient.java         | 26 ++--------------------
 1 file changed, 2 insertions(+), 24 deletions(-)

diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultRestClient.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultRestClient.java
index 654b9ab88d7..9a389602aa6 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultRestClient.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultRestClient.java
@@ -218,10 +218,9 @@ public class DefaultRestClient extends AbstractClientBase implements RestClient
                         String fieldName = entry.getKey();
                         InputStream binaryData = entry.getValue();
 
-                        String contentType = inferContentType(fieldName, sObjectName);
                         multipartContent.addPart(new MultiPart.ContentSourcePart(
                                 fieldName, "temp-file-name.doc",
-                                HttpFields.build().add(HttpHeader.CONTENT_TYPE, contentType),
+                                HttpFields.build().add(HttpHeader.CONTENT_TYPE, "application/octet-stream"),
                                 new InputStreamRequestContent(binaryData)));
                     }
                 } else {
@@ -279,26 +278,6 @@ public class DefaultRestClient extends AbstractClientBase implements RestClient
         return binaryFields;
     }
 
-    private String inferContentType(String fieldName, String sObjectType) {
-        // Infer content type based on field name and object type
-        switch (fieldName.toLowerCase()) {
-            case "body":
-                if ("Document".equalsIgnoreCase(sObjectType)) {
-                    return "application/octet-stream";
-                } else if ("Attachment".equalsIgnoreCase(sObjectType)) {
-                    return "application/octet-stream";
-                }
-                break;
-            case "versiondata":
-                return "application/octet-stream";
-            case "contentdata":
-                return "application/octet-stream";
-            default:
-                return "application/octet-stream";
-        }
-        return "application/octet-stream";
-    }
-
     @Override
     public void updateSObject(
             String sObjectName, String id, InputStream sObject, Map<String, List<String>> headers, ResponseCallback callback) {
@@ -353,10 +332,9 @@ public class DefaultRestClient extends AbstractClientBase implements RestClient
                         String fieldName = entry.getKey();
                         InputStream binaryData = entry.getValue();
 
-                        String contentType = inferContentType(fieldName, sObjectName);
                         multipartContent.addPart(new MultiPart.ContentSourcePart(
                                 fieldName, "temp-file-name.doc",
-                                HttpFields.build().add(HttpHeader.CONTENT_TYPE, contentType),
+                                HttpFields.build().add(HttpHeader.CONTENT_TYPE, "application/octet-stream"),
                                 new InputStreamRequestContent(binaryData)));
                     }
                 } else {