[camel] branch master updated (4c1c3b9 -> b58e508)

classic Classic list List threaded Threaded
3 messages Options
Reply | Threaded
Open this post in threaded view
|

[camel] branch master updated (4c1c3b9 -> b58e508)

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

davsclaus pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.


    from 4c1c3b9  Skip tests which we cant always verify
     new 8c48b6c  Fixed olingo which was setting endpoint options wrong
     new b58e508  Fixed CS

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../apache/camel/jsonpath/JsonPathExpression.java  | 26 +++++++++++-----------
 .../camel/component/olingo2/Olingo2Endpoint.java   |  3 +--
 .../camel/component/olingo4/Olingo4Endpoint.java   |  3 +--
 3 files changed, 15 insertions(+), 17 deletions(-)

Reply | Threaded
Open this post in threaded view
|

[camel] 01/02: Fixed olingo which was setting endpoint options wrong

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

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

commit 8c48b6c6ced758baf87f4369f061d07871cda490
Author: Claus Ibsen <[hidden email]>
AuthorDate: Thu Feb 13 06:31:36 2020 +0100

    Fixed olingo which was setting endpoint options wrong
---
 .../main/java/org/apache/camel/component/olingo2/Olingo2Endpoint.java  | 3 +--
 .../main/java/org/apache/camel/component/olingo4/Olingo4Endpoint.java  | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

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 e6cbb13..67e34f4 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
@@ -112,10 +112,9 @@ public class Olingo2Endpoint extends AbstractApiEndpoint<Olingo2ApiName, Olingo2
 
     @Override
     public void configureProperties(Map<String, Object> options) {
+        super.configureProperties(options);
         // handle individual query params
         parseQueryParams(options);
-
-        super.configureProperties(options);
     }
 
     @Override
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 d0d37d4..71a1dc3 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
@@ -112,10 +112,9 @@ public class Olingo4Endpoint extends AbstractApiEndpoint<Olingo4ApiName, Olingo4
 
     @Override
     public void configureProperties(Map<String, Object> options) {
+        super.configureProperties(options);
         // handle individual query params
         parseQueryParams(options);
-
-        super.configureProperties(options);
     }
 
     @Override

Reply | Threaded
Open this post in threaded view
|

[camel] 02/02: Fixed CS

davsclaus-2
In reply to this post by davsclaus-2
This is an automated email from the ASF dual-hosted git repository.

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

commit b58e50871b3492c54e36a9aa8678868e40eefa5c
Author: Claus Ibsen <[hidden email]>
AuthorDate: Thu Feb 13 07:20:40 2020 +0100

    Fixed CS
---
 .../apache/camel/jsonpath/JsonPathExpression.java  | 26 +++++++++++-----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JsonPathExpression.java b/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JsonPathExpression.java
index 49e6fa6..9e51e48 100644
--- a/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JsonPathExpression.java
+++ b/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JsonPathExpression.java
@@ -61,19 +61,19 @@ public class JsonPathExpression extends ExpressionAdapter implements AfterProper
             throw new IllegalStateException("Can only configure our own instance !");
         }
         switch (ignoreCase ? name.toLowerCase() : name) {
-            case "resulttype":
-            case "resultType": setResultType(PropertyConfigurerSupport.property(camelContext, Class.class, value)); return true;
-            case "suppressexceptions":
-            case "suppressExceptions": setSuppressExceptions(PropertyConfigurerSupport.property(camelContext, Boolean.class, value)); return true;
-            case "allowsimple":
-            case "allowSimple": setAllowSimple(PropertyConfigurerSupport.property(camelContext, Boolean.class, value)); return true;
-            case "alloweasypredicate":
-            case "allowEasyPredicate": setAllowEasyPredicate(PropertyConfigurerSupport.property(camelContext, Boolean.class, value)); return true;
-            case "writeasstring":
-            case "writeAsString": setWriteAsString(PropertyConfigurerSupport.property(camelContext, Boolean.class, value)); return true;
-            case "headername":
-            case "headerName": setHeaderName(PropertyConfigurerSupport.property(camelContext, String.class, value)); return true;
-            default: return false;
+        case "resulttype":
+        case "resultType": setResultType(PropertyConfigurerSupport.property(camelContext, Class.class, value)); return true;
+        case "suppressexceptions":
+        case "suppressExceptions": setSuppressExceptions(PropertyConfigurerSupport.property(camelContext, Boolean.class, value)); return true;
+        case "allowsimple":
+        case "allowSimple": setAllowSimple(PropertyConfigurerSupport.property(camelContext, Boolean.class, value)); return true;
+        case "alloweasypredicate":
+        case "allowEasyPredicate": setAllowEasyPredicate(PropertyConfigurerSupport.property(camelContext, Boolean.class, value)); return true;
+        case "writeasstring":
+        case "writeAsString": setWriteAsString(PropertyConfigurerSupport.property(camelContext, Boolean.class, value)); return true;
+        case "headername":
+        case "headerName": setHeaderName(PropertyConfigurerSupport.property(camelContext, String.class, value)); return true;
+        default: return false;
         }
     }