You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2019/05/02 10:04:36 UTC
[camel] branch camel-2.23.x updated: [CAMEL-13464] Olingo4: use
endpointHttpHeaders for EDM, solving authentication issue
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch camel-2.23.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-2.23.x by this push:
new 9336ad3 [CAMEL-13464] Olingo4: use endpointHttpHeaders for EDM, solving authentication issue
9336ad3 is described below
commit 9336ad3b190e78f0213b0b3a87c6676a8ce4aad8
Author: Remco Schoen <r....@topdesk.nl>
AuthorDate: Wed May 1 10:58:45 2019 +0200
[CAMEL-13464] Olingo4: use endpointHttpHeaders for EDM, solving authentication issue
---
.../java/org/apache/camel/component/olingo4/Olingo4AppWrapper.java | 4 ++--
.../main/java/org/apache/camel/component/olingo4/Olingo4Endpoint.java | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4AppWrapper.java b/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4AppWrapper.java
index dc6f130..6b09df3 100644
--- a/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4AppWrapper.java
+++ b/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4AppWrapper.java
@@ -49,7 +49,7 @@ public class Olingo4AppWrapper {
}
// 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) {
@@ -60,7 +60,7 @@ public class Olingo4AppWrapper {
final CountDownLatch latch = new CountDownLatch(1);
final Exception[] error = new Exception[1];
- olingo4App.read(null, Constants.METADATA, null, null, new Olingo4ResponseHandler<Edm>() {
+ olingo4App.read(null, Constants.METADATA, null, endpointHttpHeaders, new Olingo4ResponseHandler<Edm>() {
@Override
public void onResponse(Edm response, Map<String, String> responseHeaders) {
diff --git a/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4Endpoint.java b/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4Endpoint.java
index 62e94a3..771d6ea 100644
--- a/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4Endpoint.java
+++ b/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4Endpoint.java
@@ -161,9 +161,10 @@ public class Olingo4Endpoint extends AbstractApiEndpoint<Olingo4ApiName, Olingo4
@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 keyPredicate
final String keyPredicate = (String)properties.get(KEY_PREDICATE_PROPERTY);