You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by zr...@apache.org on 2017/12/17 16:36:12 UTC
[camel] branch master updated: CAMEL-12085: Don't mandate header
case for cust...
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 76daaf1 CAMEL-12085: Don't mandate header case for cust...
76daaf1 is described below
commit 76daaf1f24fb19ba2e5dffb09eddc8401078bb61
Author: Zoran Regvart <zr...@apache.org>
AuthorDate: Sun Dec 17 17:35:21 2017 +0100
CAMEL-12085: Don't mandate header case for cust...
...om Salesforce HTTP haders
---
.../component/salesforce/internal/client/AbstractClientBase.java | 4 +++-
.../salesforce/internal/client/AbstractClientBaseTest.java | 8 ++++----
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/AbstractClientBase.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/AbstractClientBase.java
index 8293a80..221fc55 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/AbstractClientBase.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/AbstractClientBase.java
@@ -26,6 +26,7 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
+import java.util.Locale;
import java.util.Map;
import java.util.Map.Entry;
import java.util.concurrent.Phaser;
@@ -313,7 +314,8 @@ public abstract class AbstractClientBase implements SalesforceSession.Salesforce
final Map<String, List<String>> answer = new HashMap<>();
for (final String headerName : headers.keySet()) {
- if (headerName.startsWith("Sforce") || headerName.startsWith("x-sfdc")) {
+ final String headerNameLowercase = headerName.toLowerCase(Locale.US);
+ if (headerNameLowercase.startsWith("sforce") || headerNameLowercase.startsWith("x-sfdc")) {
final Object headerValue = inboundMessage.getHeader(headerName);
if (headerValue instanceof String) {
diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/internal/client/AbstractClientBaseTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/internal/client/AbstractClientBaseTest.java
index b96ceba..2876c22 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/internal/client/AbstractClientBaseTest.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/internal/client/AbstractClientBaseTest.java
@@ -90,8 +90,8 @@ public class AbstractClientBaseTest {
final Exchange exchange = new DefaultExchange(context);
final Message in = new DefaultMessage(context);
- in.setHeader("Sforce-Auto-Assign", "TRUE");
- in.setHeader("Sforce-Call-Options",
+ in.setHeader("sforce-auto-assign", "TRUE");
+ in.setHeader("SFORCE-CALL-OPTIONS",
new String[] {"client=SampleCaseSensitiveToken/100", "defaultNamespace=battle"});
in.setHeader("Sforce-Limit-Info", singletonList("per-app-api-usage"));
in.setHeader("x-sfdc-packageversion-clientPackage", "1.0");
@@ -101,8 +101,8 @@ public class AbstractClientBaseTest {
final Map<String, List<String>> headers = AbstractClientBase.determineHeaders(exchange);
- assertThat(headers).containsOnly(entry("Sforce-Auto-Assign", singletonList("TRUE")),
- entry("Sforce-Call-Options", asList("client=SampleCaseSensitiveToken/100", "defaultNamespace=battle")),
+ assertThat(headers).containsOnly(entry("sforce-auto-assign", singletonList("TRUE")),
+ entry("SFORCE-CALL-OPTIONS", asList("client=SampleCaseSensitiveToken/100", "defaultNamespace=battle")),
entry("Sforce-Limit-Info", singletonList("per-app-api-usage")),
entry("x-sfdc-packageversion-clientPackage", singletonList("1.0")),
entry("Sforce-Query-Options", singletonList("batchSize=1000")));
--
To stop receiving notification emails like this one, please contact
['"commits@camel.apache.org" <co...@camel.apache.org>'].