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

2016-07-26 Thread davsclaus
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/0d4511a3
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/0d4511a3
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/0d4511a3

Branch: refs/heads/camel-2.17.x
Commit: 0d4511a3368c9108293db998c43a6c5c428f00e4
Parents: 2b9a214
Author: Claus Ibsen 
Authored: Mon Jul 25 17:15:42 2016 +0200
Committer: Claus Ibsen 
Committed: Tue Jul 26 13:03: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/0d4511a3/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 restletHeaders = 
exchange.getIn().getHeader(HeaderConstants.ATTRIBUTE_HEADERS,Series.class);
+// get outgoing custom http headers from the exchange if they exists
+Series restletHeaders = 
exchange.getIn().getHeader(HeaderConstants.ATTRIBUTE_HEADERS, Series.class);
 if (restletHeaders == null) {
-restletHeaders = new Series<>(Header.class);
+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)) {
+// 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);
 }
 



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

2016-07-25 Thread davsclaus
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 
Authored: Mon Jul 25 17:15:42 2016 +0200
Committer: Claus Ibsen 
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 restletHeaders = 
exchange.getIn().getHeader(HeaderConstants.ATTRIBUTE_HEADERS,Series.class);
+// get outgoing custom http headers from the exchange if they exists
+Series restletHeaders = 
exchange.getIn().getHeader(HeaderConstants.ATTRIBUTE_HEADERS, Series.class);
 if (restletHeaders == null) {
-restletHeaders = new Series<>(Header.class);
+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)) {
+// 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);
 }