You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ts...@apache.org on 2019/11/22 07:24:35 UTC
[camel] branch master updated: CAMEL-14207: camel-olingo2 - Basic
auth with endpointHttpHeaders not working
This is an automated email from the ASF dual-hosted git repository.
tsato 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 a3175b7 CAMEL-14207: camel-olingo2 - Basic auth with endpointHttpHeaders not working
a3175b7 is described below
commit a3175b77a54f0cb3e02585b8cd7326a2fa817eac
Author: Tadayoshi Sato <sa...@gmail.com>
AuthorDate: Fri Nov 22 16:14:10 2019 +0900
CAMEL-14207: camel-olingo2 - Basic auth with endpointHttpHeaders not working
---
.../java/org/apache/camel/component/olingo2/Olingo2AppWrapper.java | 4 ++--
.../main/java/org/apache/camel/component/olingo2/Olingo2Endpoint.java | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2AppWrapper.java b/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2AppWrapper.java
index f5fee4d..3a36839 100644
--- a/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2AppWrapper.java
+++ b/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2AppWrapper.java
@@ -48,7 +48,7 @@ public class Olingo2AppWrapper {
}
// double checked locking based singleton Edm reader
- public Edm getEdm() throws RuntimeCamelException {
+ public Edm getEdm(Map<String, String> endpointHttpHeaders) throws RuntimeCamelException {
Edm localEdm = edm;
if (localEdm == null) {
@@ -59,7 +59,7 @@ public class Olingo2AppWrapper {
final CountDownLatch latch = new CountDownLatch(1);
final Exception[] error = new Exception[1];
- olingo2App.read(null, "$metadata", null, null, new Olingo2ResponseHandler<Edm>() {
+ olingo2App.read(null, "$metadata", null, endpointHttpHeaders, new Olingo2ResponseHandler<Edm>() {
@Override
public void onResponse(Edm response, Map<String, String> responseHeaders) {
diff --git a/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Endpoint.java b/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Endpoint.java
index 1cf70eb..e6cbb13 100644
--- a/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Endpoint.java
+++ b/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Endpoint.java
@@ -166,9 +166,10 @@ public class Olingo2Endpoint extends AbstractApiEndpoint<Olingo2ApiName, Olingo2
@Override
public void interceptProperties(Map<String, Object> properties) {
+ Map<String, String> endpointHttpHeaders = (Map<String, String>) properties.get(ENDPOINT_HTTP_HEADERS_PROPERTY);
// read Edm if not set yet
- properties.put(EDM_PROPERTY, apiProxy.getEdm());
+ properties.put(EDM_PROPERTY, apiProxy.getEdm(endpointHttpHeaders));
// handle filterAlreadySeen property
properties.put(FILTER_ALREADY_SEEN, configuration.isFilterAlreadySeen());