You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2016/07/25 15:16:43 UTC

[1/3] camel git commit: Polished

Repository: camel
Updated Branches:
  refs/heads/master 3706bf1cc -> d50dcd4d7


Polished


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/34f9af90
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/34f9af90
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/34f9af90

Branch: refs/heads/master
Commit: 34f9af90c5a753cc71e60ae7f3d2254fe41b1415
Parents: f80365c
Author: Claus Ibsen <da...@apache.org>
Authored: Mon Jul 25 15:20:28 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Jul 25 17:11:57 2016 +0200

----------------------------------------------------------------------
 .../src/main/java/org/apache/camel/builder/xml/XsltBuilder.java  | 4 ----
 1 file changed, 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/34f9af90/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java b/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java
index 2770d10..4179107 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java
@@ -67,10 +67,6 @@ import static org.apache.camel.util.ObjectHelper.notNull;
  * <p/>
  * Will by default output the result as a String. You can chose which kind of output
  * you want using the <tt>outputXXX</tt> methods.
- * <p/>
- * If using the static <tt>xslt</tt> methods to create a {@link org.apache.camel.builder.xml.XsltBuilder} its recommended
- * to inject the {@link org.apache.camel.CamelContext} using the {@link #setCamelContext(org.apache.camel.CamelContext)}
- * and call {@link #start()} to properly initialize the builder before using.
  *
  * @version 
  */


[3/3] camel git commit: Fixed CS. This closes #1080

Posted by da...@apache.org.
Fixed CS. This closes #1080


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d50dcd4d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d50dcd4d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d50dcd4d

Branch: refs/heads/master
Commit: d50dcd4d7ed89503ed47516a675288a0d98eddfb
Parents: 34f9af9
Author: Claus Ibsen <da...@apache.org>
Authored: Mon Jul 25 17:15:42 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Jul 25 17:15:42 2016 +0200

----------------------------------------------------------------------
 .../component/restlet/DefaultRestletBinding.java | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/d50dcd4d/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java
----------------------------------------------------------------------
diff --git a/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java b/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java
index 31eb55e..be75a8e 100644
--- a/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java
+++ b/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java
@@ -195,23 +195,22 @@ public class DefaultRestletBinding implements RestletBinding, HeaderFilterStrate
             }
         }
 
-        //Get outgoing custom http headers from the exchange if they exists
-        Series<Header> restletHeaders = exchange.getIn().getHeader(HeaderConstants.ATTRIBUTE_HEADERS,Series.class);
+        // get outgoing custom http headers from the exchange if they exists
+        Series<Header> restletHeaders = exchange.getIn().getHeader(HeaderConstants.ATTRIBUTE_HEADERS, Series.class);
         if (restletHeaders == null) {
-            restletHeaders = new Series<>(Header.class);
+            restletHeaders = new Series<Header>(Header.class);
             request.getAttributes().put(HeaderConstants.ATTRIBUTE_HEADERS, restletHeaders);
         } else {
-            
-            //If the restlet headers already exists on the exchange, we need to filter them
-            for(String name : restletHeaders.getNames()){
-                if(headerFilterStrategy.applyFilterToCamelHeaders(name, restletHeaders.getValues(name), exchange)) {
+            // if the restlet headers already exists on the exchange, we need to filter them
+            for (String name : restletHeaders.getNames()) {
+                if (headerFilterStrategy.applyFilterToCamelHeaders(name, restletHeaders.getValues(name), exchange)) {
                     restletHeaders.removeAll(name);
                 }
             }
             request.getAttributes().put(HeaderConstants.ATTRIBUTE_HEADERS, restletHeaders);
-            
-            //Since the restlet headers already exists remove them from the exchange so they don't get added again below
-            //We will get a new set of restlet headers on the response
+
+            // since the restlet headers already exists remove them from the exchange so they don't get added again below
+            // we will get a new set of restlet headers on the response
             exchange.getIn().removeHeader(HeaderConstants.ATTRIBUTE_HEADERS);
         }
 


[2/3] camel git commit: Filter existing restlet headers when building restlet request

Posted by da...@apache.org.
Filter existing restlet headers when building restlet request


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f80365cd
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f80365cd
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f80365cd

Branch: refs/heads/master
Commit: f80365cde8f8ab2595095817e8146f8942c64b97
Parents: 3706bf1
Author: John Moon <jo...@transamerica.com>
Authored: Mon Jul 18 10:00:03 2016 -0400
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Jul 25 17:11:57 2016 +0200

----------------------------------------------------------------------
 .../component/restlet/DefaultRestletBinding.java   | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/f80365cd/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java
----------------------------------------------------------------------
diff --git a/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java b/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java
index 482a97a..31eb55e 100644
--- a/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java
+++ b/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java
@@ -195,11 +195,24 @@ public class DefaultRestletBinding implements RestletBinding, HeaderFilterStrate
             }
         }
 
-        //Get outgoing custom http headers
-        Series<Header> restletHeaders = (Series)request.getAttributes().get(HeaderConstants.ATTRIBUTE_HEADERS);
+        //Get outgoing custom http headers from the exchange if they exists
+        Series<Header> restletHeaders = exchange.getIn().getHeader(HeaderConstants.ATTRIBUTE_HEADERS,Series.class);
         if (restletHeaders == null) {
             restletHeaders = new Series<>(Header.class);
             request.getAttributes().put(HeaderConstants.ATTRIBUTE_HEADERS, restletHeaders);
+        } else {
+            
+            //If the restlet headers already exists on the exchange, we need to filter them
+            for(String name : restletHeaders.getNames()){
+                if(headerFilterStrategy.applyFilterToCamelHeaders(name, restletHeaders.getValues(name), exchange)) {
+                    restletHeaders.removeAll(name);
+                }
+            }
+            request.getAttributes().put(HeaderConstants.ATTRIBUTE_HEADERS, restletHeaders);
+            
+            //Since the restlet headers already exists remove them from the exchange so they don't get added again below
+            //We will get a new set of restlet headers on the response
+            exchange.getIn().removeHeader(HeaderConstants.ATTRIBUTE_HEADERS);
         }
 
         // login and password are filtered by header filter strategy