[camel] branch camel-2.x updated: [CAMEL-13464] Olingo4: use endpointHttpHeaders for EDM, solving authentication issue

[acosentino]

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

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


The following commit(s) were added to refs/heads/camel-2.x by this push:
     new 62028ee  [CAMEL-13464] Olingo4: use endpointHttpHeaders for EDM, 
solving authentication issue
62028ee is described below

commit 62028ee6599d4bde0a9f6fab79bf59c870d3eaa3
Author: Remco Schoen <r.sch...@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 b211a0a..aefde58 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
@@ -163,9 +163,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 filterAlreadySeen property
         properties.put(FILTER_ALREADY_SEEN, 
configuration.getFilterAlreadySeen());