[2/3] camel git commit: Fixed CS

[acosentino]

Fixed CS


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

Branch: refs/heads/master
Commit: dd23610b2ddbed8baf2d757bc568f047e00a06a6
Parents: 818d548
Author: Andrea Cosentino 
Authored: Wed Oct 18 08:18:04 2017 +0200
Committer: Andrea Cosentino 
Committed: Wed Oct 18 08:18:04 2017 +0200

--
 .../java/org/apache/camel/component/hdfs2/HdfsOsgiHelper.java| 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/dd23610b/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/HdfsOsgiHelper.java
--
diff --git 
a/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/HdfsOsgiHelper.java
 
b/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/HdfsOsgiHelper.java
index d63a592..2373408 100644
--- 
a/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/HdfsOsgiHelper.java
+++ 
b/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/HdfsOsgiHelper.java
@@ -46,9 +46,9 @@ public class HdfsOsgiHelper {
 for (String key : fileSystems.keySet()) {
 URI uri = URI.create(key);
 conf.setClass(String.format("fs.%s.impl", uri.getScheme()), 
cl.loadClass(fileSystems.get(key)), FileSystem.class);
-LOG.debug("Successfully loaded class: {}", 
fileSystems.get(key) );
+LOG.debug("Successfully loaded class: {}", 
fileSystems.get(key));
 FileSystem.get(uri, conf);
-LOG.debug("Successfully got uri: {} from FileSystem Object", 
uri );
+LOG.debug("Successfully got uri: {} from FileSystem Object", 
uri);
 }
 } catch (Exception e) {
 LOG.debug(e.getMessage(), e);

[1/2] camel git commit: Fixed CS

[acosentino]

Repository: camel
Updated Branches:
  refs/heads/camel-2.19.x 9d6bc075a -> 4a506b06b


Fixed CS


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

Branch: refs/heads/camel-2.19.x
Commit: 4a506b06b2efe533a1908629b062907aea33b736
Parents: 337252c
Author: Andrea Cosentino 
Authored: Wed Oct 18 08:18:04 2017 +0200
Committer: Andrea Cosentino 
Committed: Wed Oct 18 08:22:43 2017 +0200

--
 .../java/org/apache/camel/component/hdfs2/HdfsOsgiHelper.java| 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/4a506b06/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/HdfsOsgiHelper.java
--
diff --git 
a/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/HdfsOsgiHelper.java
 
b/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/HdfsOsgiHelper.java
index d63a592..2373408 100644
--- 
a/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/HdfsOsgiHelper.java
+++ 
b/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/HdfsOsgiHelper.java
@@ -46,9 +46,9 @@ public class HdfsOsgiHelper {
 for (String key : fileSystems.keySet()) {
 URI uri = URI.create(key);
 conf.setClass(String.format("fs.%s.impl", uri.getScheme()), 
cl.loadClass(fileSystems.get(key)), FileSystem.class);
-LOG.debug("Successfully loaded class: {}", 
fileSystems.get(key) );
+LOG.debug("Successfully loaded class: {}", 
fileSystems.get(key));
 FileSystem.get(uri, conf);
-LOG.debug("Successfully got uri: {} from FileSystem Object", 
uri );
+LOG.debug("Successfully got uri: {} from FileSystem Object", 
uri);
 }
 } catch (Exception e) {
 LOG.debug(e.getMessage(), e);

[2/2] camel git commit: Fixed CS

[acosentino]

Fixed CS


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

Branch: refs/heads/camel-2.20.x
Commit: fd32e1cb8a0de65a0852ac77281fa5afd3164e91
Parents: 1da22b2
Author: Andrea Cosentino 
Authored: Wed Oct 18 08:18:04 2017 +0200
Committer: Andrea Cosentino 
Committed: Wed Oct 18 08:18:40 2017 +0200

--
 .../java/org/apache/camel/component/hdfs2/HdfsOsgiHelper.java| 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/fd32e1cb/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/HdfsOsgiHelper.java
--
diff --git 
a/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/HdfsOsgiHelper.java
 
b/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/HdfsOsgiHelper.java
index d63a592..2373408 100644
--- 
a/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/HdfsOsgiHelper.java
+++ 
b/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/HdfsOsgiHelper.java
@@ -46,9 +46,9 @@ public class HdfsOsgiHelper {
 for (String key : fileSystems.keySet()) {
 URI uri = URI.create(key);
 conf.setClass(String.format("fs.%s.impl", uri.getScheme()), 
cl.loadClass(fileSystems.get(key)), FileSystem.class);
-LOG.debug("Successfully loaded class: {}", 
fileSystems.get(key) );
+LOG.debug("Successfully loaded class: {}", 
fileSystems.get(key));
 FileSystem.get(uri, conf);
-LOG.debug("Successfully got uri: {} from FileSystem Object", 
uri );
+LOG.debug("Successfully got uri: {} from FileSystem Object", 
uri);
 }
 } catch (Exception e) {
 LOG.debug(e.getMessage(), e);

[2/2] camel git commit: Fixed CS

[davsclaus]

Fixed CS


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

Branch: refs/heads/master
Commit: bfffd714aff0f1c58070574939c4c36df9b7d092
Parents: 553788b
Author: Claus Ibsen 
Authored: Sat Oct 14 14:48:32 2017 +0200
Committer: Claus Ibsen 
Committed: Sat Oct 14 14:48:32 2017 +0200

--
 .../apache/camel/parser/RouteBuilderParser.java |  2 +-
 .../org/apache/camel/parser/XmlRouteParser.java |  7 +-
 .../apache/camel/parser/graph/RenderRoute.java  | 70 
 .../parser/helper/CamelXmlTreeParserHelper.java |  5 +-
 .../camel/parser/model/CamelNodeDetails.java|  6 +-
 .../parser/model/CamelNodeDetailsFactory.java   |  8 +--
 .../camel/parser/java/RoasterJavaDslTest.java   |  2 +-
 .../java/RoasterJavaDslTwoRoutesTest.java   |  2 +-
 8 files changed, 16 insertions(+), 86 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/bfffd714/tooling/camel-route-parser/src/main/java/org/apache/camel/parser/RouteBuilderParser.java
--
diff --git 
a/tooling/camel-route-parser/src/main/java/org/apache/camel/parser/RouteBuilderParser.java
 
b/tooling/camel-route-parser/src/main/java/org/apache/camel/parser/RouteBuilderParser.java
index de1d51f..703d54e 100644
--- 
a/tooling/camel-route-parser/src/main/java/org/apache/camel/parser/RouteBuilderParser.java
+++ 
b/tooling/camel-route-parser/src/main/java/org/apache/camel/parser/RouteBuilderParser.java
@@ -23,8 +23,8 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import org.apache.camel.parser.helper.CamelJavaTreeParserHelper;
 import org.apache.camel.parser.helper.CamelJavaParserHelper;
+import org.apache.camel.parser.helper.CamelJavaTreeParserHelper;
 import org.apache.camel.parser.model.CamelEndpointDetails;
 import org.apache.camel.parser.model.CamelNodeDetails;
 import org.apache.camel.parser.model.CamelRouteDetails;

http://git-wip-us.apache.org/repos/asf/camel/blob/bfffd714/tooling/camel-route-parser/src/main/java/org/apache/camel/parser/XmlRouteParser.java
--
diff --git 
a/tooling/camel-route-parser/src/main/java/org/apache/camel/parser/XmlRouteParser.java
 
b/tooling/camel-route-parser/src/main/java/org/apache/camel/parser/XmlRouteParser.java
index 5512837..3c9e5ee 100644
--- 
a/tooling/camel-route-parser/src/main/java/org/apache/camel/parser/XmlRouteParser.java
+++ 
b/tooling/camel-route-parser/src/main/java/org/apache/camel/parser/XmlRouteParser.java
@@ -20,17 +20,16 @@ import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.camel.parser.helper.CamelXmlTreeParserHelper;
-import org.apache.camel.parser.model.CamelNodeDetails;
-import org.apache.camel.parser.model.CamelNodeDetailsFactory;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
 import org.apache.camel.parser.helper.CamelJavaParserHelper;
 import org.apache.camel.parser.helper.CamelXmlHelper;
+import org.apache.camel.parser.helper.CamelXmlTreeParserHelper;
 import org.apache.camel.parser.helper.XmlLineNumberParser;
-
 import org.apache.camel.parser.model.CamelEndpointDetails;
+import org.apache.camel.parser.model.CamelNodeDetails;
+import org.apache.camel.parser.model.CamelNodeDetailsFactory;
 import org.apache.camel.parser.model.CamelRouteDetails;
 import org.apache.camel.parser.model.CamelSimpleExpressionDetails;
 import org.jboss.forge.roaster.model.util.Strings;

http://git-wip-us.apache.org/repos/asf/camel/blob/bfffd714/tooling/camel-route-parser/src/main/java/org/apache/camel/parser/graph/RenderRoute.java
--
diff --git 
a/tooling/camel-route-parser/src/main/java/org/apache/camel/parser/graph/RenderRoute.java
 
b/tooling/camel-route-parser/src/main/java/org/apache/camel/parser/graph/RenderRoute.java
deleted file mode 100644
index a1f4807..000
--- 
a/tooling/camel-route-parser/src/main/java/org/apache/camel/parser/graph/RenderRoute.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed 

[5/5] camel git commit: Fixed CS. This closes #1969

[davsclaus]

Fixed CS. This closes #1969


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

Branch: refs/heads/camel-2.19.x
Commit: 93ec6f3a787dd6271527101b23b70aa5b22f5530
Parents: 3af062b
Author: Claus Ibsen 
Authored: Wed Sep 27 15:40:04 2017 +0200
Committer: Claus Ibsen 
Committed: Wed Sep 27 15:41:58 2017 +0200

--
 .../org/apache/camel/component/mongodb/MongoDbTailingProcess.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/93ec6f3a/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbTailingProcess.java
--
diff --git 
a/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbTailingProcess.java
 
b/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbTailingProcess.java
index a93cd11..6192949 100644
--- 
a/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbTailingProcess.java
+++ 
b/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbTailingProcess.java
@@ -96,7 +96,7 @@ public class MongoDbTailingProcess implements Runnable {
 private Boolean isCollectionCapped() {
 // A non-capped collection does not return a "capped" key/value, so we 
have to deal with null here
 Boolean result = 
endpoint.getMongoDatabase().runCommand(createCollStatsCommand()).getBoolean(CAPPED_KEY);
-return (result != null ? result : false);
+return result != null ? result : false;
 }
 
 private BasicDBObject createCollStatsCommand() {

[2/5] camel git commit: Fixed CS. This closes #1969

[davsclaus]

Fixed CS. This closes #1969


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

Branch: refs/heads/master
Commit: 5ff3f1f0813ca2ea5da734bf5613a2a468a68a8c
Parents: 3fea2a2
Author: Claus Ibsen 
Authored: Wed Sep 27 15:40:04 2017 +0200
Committer: Claus Ibsen 
Committed: Wed Sep 27 15:40:04 2017 +0200

--
 .../org/apache/camel/component/mongodb/MongoDbTailingProcess.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/5ff3f1f0/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbTailingProcess.java
--
diff --git 
a/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbTailingProcess.java
 
b/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbTailingProcess.java
index a93cd11..6192949 100644
--- 
a/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbTailingProcess.java
+++ 
b/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbTailingProcess.java
@@ -96,7 +96,7 @@ public class MongoDbTailingProcess implements Runnable {
 private Boolean isCollectionCapped() {
 // A non-capped collection does not return a "capped" key/value, so we 
have to deal with null here
 Boolean result = 
endpoint.getMongoDatabase().runCommand(createCollStatsCommand()).getBoolean(CAPPED_KEY);
-return (result != null ? result : false);
+return result != null ? result : false;
 }
 
 private BasicDBObject createCollStatsCommand() {

camel git commit: Fixed CS

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/master 012666bbd -> 4d6293e55


Fixed CS


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

Branch: refs/heads/master
Commit: 4d6293e5563601142faf6dc21d30b6429548b109
Parents: 012666b
Author: Claus Ibsen 
Authored: Tue Sep 26 09:38:10 2017 +0200
Committer: Claus Ibsen 
Committed: Tue Sep 26 09:38:16 2017 +0200

--
 parent/pom.xml | 2 +-
 .../java/org/apache/camel/json/simple/JsonSimpleOrderedTest.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/4d6293e5/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index c94b8bb..84848e4 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -4812,7 +4812,7 @@
 
 header-java.txt
 
**/*.java,**/*.groovy,**/*.scala,**/*.properties,**/*.xml,**/*.xsd
-
**/archetype-resources/**/*.java,**/archetype-resources/**/*.groovy,**/archetype-resources/**/*.scala,**/archetype-resources/**/*.xml
+
**/archetype-resources/**/*.java,**/archetype-resources/**/*.groovy,**/archetype-resources/**/*.scala,**/archetype-resources/**/*.xml,**/org/json/simple/**/*.java
   
   
 checkstyle

http://git-wip-us.apache.org/repos/asf/camel/blob/4d6293e5/tooling/json-simple-ordered/src/test/java/org/apache/camel/json/simple/JsonSimpleOrderedTest.java
--
diff --git 
a/tooling/json-simple-ordered/src/test/java/org/apache/camel/json/simple/JsonSimpleOrderedTest.java
 
b/tooling/json-simple-ordered/src/test/java/org/apache/camel/json/simple/JsonSimpleOrderedTest.java
index f6ff70f..d3a9ff8 100644
--- 
a/tooling/json-simple-ordered/src/test/java/org/apache/camel/json/simple/JsonSimpleOrderedTest.java
+++ 
b/tooling/json-simple-ordered/src/test/java/org/apache/camel/json/simple/JsonSimpleOrderedTest.java
@@ -71,7 +71,7 @@ public class JsonSimpleOrderedTest extends TestCase {
 try {
 BufferedReader reader = new BufferedReader(isr);
 
-while(true) {
+while (true) {
 String line = reader.readLine();
 if (line == null) {
 line = builder.toString();

camel git commit: Fixed CS

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/master 749f99206 -> 64b16bd2c


Fixed CS


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

Branch: refs/heads/master
Commit: 64b16bd2c256bd0a0d6c195893368b1d639c211e
Parents: 749f992
Author: Claus Ibsen 
Authored: Sun Sep 3 13:24:30 2017 +0200
Committer: Claus Ibsen 
Committed: Sun Sep 3 13:24:30 2017 +0200

--
 .../camel/itest/springboot/util/BOMResolver.java  | 18 --
 .../test/resources/components/cache-ehcache.xml   |  1 +
 2 files changed, 13 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/64b16bd2/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/BOMResolver.java
--
diff --git 
a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/BOMResolver.java
 
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/BOMResolver.java
index 7fd76df..8ffaea5 100644
--- 
a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/BOMResolver.java
+++ 
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/BOMResolver.java
@@ -107,12 +107,18 @@ public final class BOMResolver {
 String camelVersion = 
DependencyResolver.resolveCamelParentProperty("${project.version}");
 
 List neededArtifacts = new LinkedList<>();
-neededArtifacts.add(new DefaultArtifact("org.apache.camel:camel:pom:" 
+ camelVersion).setFile(camelRoot("pom.xml")));
-neededArtifacts.add(new 
DefaultArtifact("org.apache.camel:camel-parent:pom:" + 
camelVersion).setFile(camelRoot("parent/pom.xml")));
-neededArtifacts.add(new 
DefaultArtifact("org.apache.camel:spring-boot:pom:" + 
camelVersion).setFile(camelRoot("platforms/spring-boot/pom.xml")));
-neededArtifacts.add(new 
DefaultArtifact("org.apache.camel:camel-spring-boot-dm:pom:" + 
camelVersion).setFile(camelRoot("platforms/spring-boot/spring-boot-dm/pom.xml")));
-neededArtifacts.add(new 
DefaultArtifact("org.apache.camel:camel-spring-boot-dependencies:pom:" + 
camelVersion).setFile(camelRoot("platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml")));
-Artifact camelSpringBootParent = new 
DefaultArtifact("org.apache.camel:camel-starter-parent:pom:" + 
camelVersion).setFile(camelRoot("platforms/spring-boot/spring-boot-dm/camel-starter-parent/pom.xml"));
+neededArtifacts.add(new DefaultArtifact("org.apache.camel:camel:pom:"
++ camelVersion).setFile(camelRoot("pom.xml")));
+neededArtifacts.add(new 
DefaultArtifact("org.apache.camel:camel-parent:pom:"
++ camelVersion).setFile(camelRoot("parent/pom.xml")));
+neededArtifacts.add(new 
DefaultArtifact("org.apache.camel:spring-boot:pom:"
++ 
camelVersion).setFile(camelRoot("platforms/spring-boot/pom.xml")));
+neededArtifacts.add(new 
DefaultArtifact("org.apache.camel:camel-spring-boot-dm:pom:"
++ 
camelVersion).setFile(camelRoot("platforms/spring-boot/spring-boot-dm/pom.xml")));
+neededArtifacts.add(new 
DefaultArtifact("org.apache.camel:camel-spring-boot-dependencies:pom:"
++ 
camelVersion).setFile(camelRoot("platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml")));
+Artifact camelSpringBootParent = new 
DefaultArtifact("org.apache.camel:camel-starter-parent:pom:"
++ 
camelVersion).setFile(camelRoot("platforms/spring-boot/spring-boot-dm/camel-starter-parent/pom.xml"));
 neededArtifacts.add(camelSpringBootParent);
 
 RemoteRepository localRepoDist = new 
RemoteRepository.Builder("org.apache.camel.itest.springboot", "default", new 
File(LOCAL_REPO).toURI().toString()).build();

http://git-wip-us.apache.org/repos/asf/camel/blob/64b16bd2/tests/camel-itest-spring-boot/src/test/resources/components/cache-ehcache.xml
--
diff --git 
a/tests/camel-itest-spring-boot/src/test/resources/components/cache-ehcache.xml 
b/tests/camel-itest-spring-boot/src/test/resources/components/cache-ehcache.xml
index 0d16ddd..dda12a2 100644
--- 
a/tests/camel-itest-spring-boot/src/test/resources/components/cache-ehcache.xml
+++ 
b/tests/camel-itest-spring-boot/src/test/resources/components/cache-ehcache.xml
@@ -1,3 +1,4 @@
+
 

[2/2] camel git commit: Fixed CS

[acosentino]

Fixed CS


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

Branch: refs/heads/master
Commit: ac1cd9500d7d5c202832933802c5b7d5285b
Parents: d78a658
Author: Andrea Cosentino 
Authored: Mon Aug 21 10:41:44 2017 +0200
Committer: Andrea Cosentino 
Committed: Mon Aug 21 10:41:44 2017 +0200

--
 .../org/apache/camel/component/couchbase/CouchbaseConsumer.java| 2 +-
 .../org/apache/camel/component/couchbase/CouchbaseProducer.java| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/ac1cd950/components/camel-couchbase/src/main/java/org/apache/camel/component/couchbase/CouchbaseConsumer.java
--
diff --git 
a/components/camel-couchbase/src/main/java/org/apache/camel/component/couchbase/CouchbaseConsumer.java
 
b/components/camel-couchbase/src/main/java/org/apache/camel/component/couchbase/CouchbaseConsumer.java
index f970267..7bf27da 100644
--- 
a/components/camel-couchbase/src/main/java/org/apache/camel/component/couchbase/CouchbaseConsumer.java
+++ 
b/components/camel-couchbase/src/main/java/org/apache/camel/component/couchbase/CouchbaseConsumer.java
@@ -85,7 +85,7 @@ public class CouchbaseConsumer extends 
DefaultScheduledPollConsumer {
 log.info("Stopping Couchbase consumer");
 super.doStop();
 if (client != null) {
-   client.shutdown();
+client.shutdown();
 }
 }
 

http://git-wip-us.apache.org/repos/asf/camel/blob/ac1cd950/components/camel-couchbase/src/main/java/org/apache/camel/component/couchbase/CouchbaseProducer.java
--
diff --git 
a/components/camel-couchbase/src/main/java/org/apache/camel/component/couchbase/CouchbaseProducer.java
 
b/components/camel-couchbase/src/main/java/org/apache/camel/component/couchbase/CouchbaseProducer.java
index e407fc5..14352ae 100644
--- 
a/components/camel-couchbase/src/main/java/org/apache/camel/component/couchbase/CouchbaseProducer.java
+++ 
b/components/camel-couchbase/src/main/java/org/apache/camel/component/couchbase/CouchbaseProducer.java
@@ -138,7 +138,7 @@ public class CouchbaseProducer extends DefaultProducer {
 protected void doStop() throws Exception {
 super.doStop();
 if (client != null) {
-   client.shutdown();
+client.shutdown();
 }
 }
 

camel git commit: Fixed CS

[acosentino]

Repository: camel
Updated Branches:
  refs/heads/master 94f621d15 -> 0b243a48a


Fixed CS


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

Branch: refs/heads/master
Commit: 0b243a48aea3f30fba8460c7b26f7b184b3c6456
Parents: 94f621d
Author: Andrea Cosentino 
Authored: Tue Aug 1 15:09:21 2017 +0200
Committer: Andrea Cosentino 
Committed: Tue Aug 1 15:09:21 2017 +0200

--
 .../camel/dataformat/univocity/Marshaller.java  | 43 +++-
 1 file changed, 23 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/0b243a48/components/camel-univocity-parsers/src/main/java/org/apache/camel/dataformat/univocity/Marshaller.java
--
diff --git 
a/components/camel-univocity-parsers/src/main/java/org/apache/camel/dataformat/univocity/Marshaller.java
 
b/components/camel-univocity-parsers/src/main/java/org/apache/camel/dataformat/univocity/Marshaller.java
index 1161559..1e5d1c1 100644
--- 
a/components/camel-univocity-parsers/src/main/java/org/apache/camel/dataformat/univocity/Marshaller.java
+++ 
b/components/camel-univocity-parsers/src/main/java/org/apache/camel/dataformat/univocity/Marshaller.java
@@ -16,22 +16,22 @@
  */
 package org.apache.camel.dataformat.univocity;
 
-import static org.apache.camel.util.ExchangeHelper.convertToMandatoryType;
-import static org.apache.camel.util.ExchangeHelper.convertToType;
-
 import java.util.Arrays;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 
+import com.univocity.parsers.common.AbstractWriter;
+
 import org.apache.camel.Exchange;
 import org.apache.camel.NoTypeConversionAvailableException;
 
-import com.univocity.parsers.common.AbstractWriter;
+import static org.apache.camel.util.ExchangeHelper.convertToMandatoryType;
+import static org.apache.camel.util.ExchangeHelper.convertToType;
 
 /**
- * This class marshalls the exchange body using an uniVocity writer. It can 
automatically generates headers and keep
- * their order in memory.
+ * This class marshalls the exchange body using an uniVocity writer. It can
+ * automatically generates headers and keep their order in memory.
  *
  * @param  Writer class
  */
@@ -42,8 +42,9 @@ final class Marshaller> {
 /**
  * Creates a new instance.
  *
- * @param headers  the base headers to use
- * @param adaptHeaders whether or not we can add headers on the fly 
depending on the data
+ * @param headers the base headers to use
+ * @param adaptHeaders whether or not we can add headers on the fly
+ *depending on the data
  */
 Marshaller(String[] headers, boolean adaptHeaders) {
 if (headers != null) {
@@ -56,9 +57,10 @@ final class Marshaller> {
  * Marshals the given body.
  *
  * @param exchange exchange to use (for type conversion)
- * @param body body to marshal
- * @param writer   uniVocity writer to use
- * @throws NoTypeConversionAvailableException when it's not possible to 
convert the body as list and maps.
+ * @param body body to marshal
+ * @param writer uniVocity writer to use
+ * @throws NoTypeConversionAvailableException when it's not possible to
+ * convert the body as list and maps.
  */
 public void marshal(Exchange exchange, Object body, W writer) throws 
NoTypeConversionAvailableException {
 try {
@@ -79,9 +81,10 @@ final class Marshaller> {
  * Writes the given row.
  *
  * @param exchange exchange to use (for type conversion)
- * @param row  row to write
- * @param writer   uniVocity writer to use
- * @throws NoTypeConversionAvailableException when it's not possible to 
convert the row as map.
+ * @param row row to write
+ * @param writer uniVocity writer to use
+ * @throws NoTypeConversionAvailableException when it's not possible to
+ * convert the row as map.
  */
 private void writeRow(Exchange exchange, Object row, W writer) throws 
NoTypeConversionAvailableException {
 Map map = convertToMandatoryType(exchange, Map.class, row);
@@ -104,11 +107,11 @@ final class Marshaller> {
  * @param writer uniVocity writer to use
  */
 private void writeRow(Map map, W writer) {
-  Object[] values = new Object[headers.size()];
-  int index = 0;
-  for (String header : headers) {
-  values[index++] = map.get(header);
-  }
-  writer.writeRow(values);
+Object[] values = new Object[headers.size()];
+int index = 0;
+for (String header : headers) {

[3/7] camel git commit: Fixed CS

[davsclaus]

Fixed CS


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

Branch: refs/heads/master
Commit: 19bb97b2136406aad0cc32d6d400fcc25b1cb6eb
Parents: 78f3c6b
Author: Claus Ibsen 
Authored: Sun Jul 23 15:18:16 2017 +0200
Committer: Claus Ibsen 
Committed: Sun Jul 23 15:18:16 2017 +0200

--
 examples/README.adoc |  2 +-
 .../resources/META-INF/spring/bar/barContext.xml | 19 +++
 .../src/main/java/sample/camel/MagicNumber.java  |  6 +++---
 3 files changed, 23 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/19bb97b2/examples/README.adoc
--
diff --git a/examples/README.adoc b/examples/README.adoc
index e4a3979..e314f2f 100644
--- a/examples/README.adoc
+++ b/examples/README.adoc
@@ -46,7 +46,7 @@ Number of Examples: 93 (8 deprecated)
 
 | link:camel-example-spring-boot-live-reload/readme.adoc[Spring Boot Live 
Reload] (camel-example-spring-boot-live-reload) | Beginner | An example showing 
how to use the live reload feature of Spring Boot with Camel
 
-| link:camel-example-spring-boot-pojo/readme.md[Spring Boot Pojo] 
(camel-example-spring-boot-pojo) | Beginner | An example showing how to work 
with Camel POJO routing with Spring Boot
+| link:camel-example-spring-boot-pojo/README.adoc[Spring Boot Pojo] 
(camel-example-spring-boot-pojo) | Beginner | An example showing how to work 
with Camel POJO routing with Spring Boot
 
 | link:camel-example-spring-boot-routecontroller/readme.adoc[Spring Boot 
Routecontroller] (camel-example-spring-boot-routecontroller) | Beginner | An 
example showing how to work with Camel Route Controller and Spring Boot
 

http://git-wip-us.apache.org/repos/asf/camel/blob/19bb97b2/examples/camel-example-reload/src/main/resources/META-INF/spring/bar/barContext.xml
--
diff --git 
a/examples/camel-example-reload/src/main/resources/META-INF/spring/bar/barContext.xml
 
b/examples/camel-example-reload/src/main/resources/META-INF/spring/bar/barContext.xml
index 50ff670..b34e3c2 100644
--- 
a/examples/camel-example-reload/src/main/resources/META-INF/spring/bar/barContext.xml
+++ 
b/examples/camel-example-reload/src/main/resources/META-INF/spring/bar/barContext.xml
@@ -1,3 +1,22 @@
+
+
 http://www.springframework.org/schema/beans;
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation="

http://git-wip-us.apache.org/repos/asf/camel/blob/19bb97b2/examples/camel-example-spring-boot-pojo/src/main/java/sample/camel/MagicNumber.java
--
diff --git 
a/examples/camel-example-spring-boot-pojo/src/main/java/sample/camel/MagicNumber.java
 
b/examples/camel-example-spring-boot-pojo/src/main/java/sample/camel/MagicNumber.java
index 475ecb5..8813751 100644
--- 
a/examples/camel-example-spring-boot-pojo/src/main/java/sample/camel/MagicNumber.java
+++ 
b/examples/camel-example-spring-boot-pojo/src/main/java/sample/camel/MagicNumber.java
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

camel git commit: Fixed CS. This closes #1828.

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/master 1ea6abadc -> 41c6c0ed4


Fixed CS. This closes #1828.


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

Branch: refs/heads/master
Commit: 41c6c0ed45cf585a3e5c3571dc4ab7fa4e95c120
Parents: 1ea6aba
Author: Claus Ibsen 
Authored: Sun Jul 16 21:41:45 2017 +0200
Committer: Claus Ibsen 
Committed: Sun Jul 16 21:41:45 2017 +0200

--
 .../test/java/org/apache/camel/component/jmx/XmlFixture.java  | 7 +++
 .../org/apache/camel/dataformat/xmlsecurity/TestHelper.java   | 6 +++---
 2 files changed, 6 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/41c6c0ed/components/camel-jmx/src/test/java/org/apache/camel/component/jmx/XmlFixture.java
--
diff --git 
a/components/camel-jmx/src/test/java/org/apache/camel/component/jmx/XmlFixture.java
 
b/components/camel-jmx/src/test/java/org/apache/camel/component/jmx/XmlFixture.java
index 2a943eb..041af95 100644
--- 
a/components/camel-jmx/src/test/java/org/apache/camel/component/jmx/XmlFixture.java
+++ 
b/components/camel-jmx/src/test/java/org/apache/camel/component/jmx/XmlFixture.java
@@ -16,10 +16,7 @@
  */
 package org.apache.camel.component.jmx;
 
-import static org.junit.Assert.assertFalse;
-
 import java.io.File;
-
 import javax.xml.transform.OutputKeys;
 import javax.xml.transform.Source;
 import javax.xml.transform.Transformer;
@@ -33,6 +30,8 @@ import org.xmlunit.builder.DiffBuilder;
 import org.xmlunit.builder.Input;
 import org.xmlunit.diff.Diff;
 
+import static org.junit.Assert.assertFalse;
+
 public final class XmlFixture {
 
 private XmlFixture() {
@@ -51,7 +50,7 @@ public final class XmlFixture {
 .ignoreComments().ignoreWhitespace()
 .checkForSimilar().build();
 try {
- assertFalse(aMessage + ":\n" + diff.toString(), 
diff.hasDifferences());
+assertFalse(aMessage + ":\n" + diff.toString(), 
diff.hasDifferences());
 } catch (Throwable t) {
 dump(aActual);
 throw t;

http://git-wip-us.apache.org/repos/asf/camel/blob/41c6c0ed/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/TestHelper.java
--
diff --git 
a/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/TestHelper.java
 
b/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/TestHelper.java
index 587deb1..e23e16c 100644
--- 
a/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/TestHelper.java
+++ 
b/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/TestHelper.java
@@ -18,11 +18,13 @@ package org.apache.camel.dataformat.xmlsecurity;
 
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
-
 import javax.crypto.Cipher;
 import javax.crypto.SecretKey;
 import javax.crypto.spec.SecretKeySpec;
 
+import org.w3c.dom.Document;
+import org.w3c.dom.NodeList;
+
 import org.apache.camel.CamelContext;
 import org.apache.camel.Exchange;
 import org.apache.camel.Message;
@@ -35,8 +37,6 @@ import 
org.apache.xml.security.encryption.XMLEncryptionException;
 import org.junit.Assert;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.w3c.dom.Document;
-import org.w3c.dom.NodeList;
 import org.xmlunit.builder.DiffBuilder;
 import org.xmlunit.diff.Diff;
 

[2/2] camel git commit: Fixed CS. This closes #1827

[davsclaus]

Fixed CS. This closes #1827


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

Branch: refs/heads/master
Commit: ddf7c9f7d060cb47518b07aa83b15f10766050b8
Parents: 9170e19
Author: Claus Ibsen 
Authored: Sun Jul 16 21:31:15 2017 +0200
Committer: Claus Ibsen 
Committed: Sun Jul 16 21:31:15 2017 +0200

--
 .../test/spring/CamelSpringActiveProfileTest.java   |  1 +
 .../CamelSpringRunnerTestPropertySourceTest.java| 16 
 2 files changed, 17 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/ddf7c9f7/components/camel-test-spring/src/test/java/org/apache/camel/test/spring/CamelSpringActiveProfileTest.java
--
diff --git 
a/components/camel-test-spring/src/test/java/org/apache/camel/test/spring/CamelSpringActiveProfileTest.java
 
b/components/camel-test-spring/src/test/java/org/apache/camel/test/spring/CamelSpringActiveProfileTest.java
index 347eb0b..cb06f50 100644
--- 
a/components/camel-test-spring/src/test/java/org/apache/camel/test/spring/CamelSpringActiveProfileTest.java
+++ 
b/components/camel-test-spring/src/test/java/org/apache/camel/test/spring/CamelSpringActiveProfileTest.java
@@ -41,6 +41,7 @@ public class CamelSpringActiveProfileTest {
 
 @Autowired
 protected CamelContext camelContext;
+
 @Produce(uri = "direct:start", context = "camelContext")
 protected ProducerTemplate start;
 

http://git-wip-us.apache.org/repos/asf/camel/blob/ddf7c9f7/components/camel-test-spring/src/test/java/org/apache/camel/test/spring/CamelSpringRunnerTestPropertySourceTest.java
--
diff --git 
a/components/camel-test-spring/src/test/java/org/apache/camel/test/spring/CamelSpringRunnerTestPropertySourceTest.java
 
b/components/camel-test-spring/src/test/java/org/apache/camel/test/spring/CamelSpringRunnerTestPropertySourceTest.java
index 3bfdd1e..e75ee56 100644
--- 
a/components/camel-test-spring/src/test/java/org/apache/camel/test/spring/CamelSpringRunnerTestPropertySourceTest.java
+++ 
b/components/camel-test-spring/src/test/java/org/apache/camel/test/spring/CamelSpringRunnerTestPropertySourceTest.java
@@ -1,3 +1,19 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.apache.camel.test.spring;
 
 import org.apache.camel.EndpointInject;

[2/2] camel git commit: Fixed CS

[acosentino]

Fixed CS


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

Branch: refs/heads/camel-2.18.x
Commit: 88e43af236d6f763caf40de3e03e48b07a2adc5f
Parents: 74b4287
Author: Andrea Cosentino 
Authored: Thu Jul 13 08:19:58 2017 +0200
Committer: Andrea Cosentino 
Committed: Thu Jul 13 08:30:37 2017 +0200

--
 camel-core/src/main/java/org/apache/camel/util/LRUCache.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/88e43af2/camel-core/src/main/java/org/apache/camel/util/LRUCache.java
--
diff --git a/camel-core/src/main/java/org/apache/camel/util/LRUCache.java 
b/camel-core/src/main/java/org/apache/camel/util/LRUCache.java
index db1c1b8..27300e7 100644
--- a/camel-core/src/main/java/org/apache/camel/util/LRUCache.java
+++ b/camel-core/src/main/java/org/apache/camel/util/LRUCache.java
@@ -73,7 +73,7 @@ public class LRUCache implements Map, 
RemovalListener, Seriali
  */
 public LRUCache(int initialCapacity, int maximumCacheSize) {
 //Do not stop service if ConcurrentLinkedHashMap try to evict entry 
when its max capacity is zero.
-this(initialCapacity, maximumCacheSize, maximumCacheSize>0);
+this(initialCapacity, maximumCacheSize, maximumCacheSize > 0);
 }
 
 /**

[2/2] camel git commit: Fixed CS

[acosentino]

Fixed CS


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

Branch: refs/heads/camel-2.19.x
Commit: 81ddec977a96370410862a2ee20eb690f8ccb480
Parents: d1719f2
Author: Andrea Cosentino 
Authored: Thu Jul 13 08:19:58 2017 +0200
Committer: Andrea Cosentino 
Committed: Thu Jul 13 08:29:34 2017 +0200

--
 camel-core/src/main/java/org/apache/camel/util/LRUCache.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/81ddec97/camel-core/src/main/java/org/apache/camel/util/LRUCache.java
--
diff --git a/camel-core/src/main/java/org/apache/camel/util/LRUCache.java 
b/camel-core/src/main/java/org/apache/camel/util/LRUCache.java
index db1c1b8..27300e7 100644
--- a/camel-core/src/main/java/org/apache/camel/util/LRUCache.java
+++ b/camel-core/src/main/java/org/apache/camel/util/LRUCache.java
@@ -73,7 +73,7 @@ public class LRUCache implements Map, 
RemovalListener, Seriali
  */
 public LRUCache(int initialCapacity, int maximumCacheSize) {
 //Do not stop service if ConcurrentLinkedHashMap try to evict entry 
when its max capacity is zero.
-this(initialCapacity, maximumCacheSize, maximumCacheSize>0);
+this(initialCapacity, maximumCacheSize, maximumCacheSize > 0);
 }
 
 /**

[2/2] camel git commit: Fixed CS

[acosentino]

Fixed CS


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

Branch: refs/heads/master
Commit: a7542736a238b7e06dd9b6d8ec5855c72b8e986b
Parents: be4e17e
Author: Andrea Cosentino 
Authored: Thu Jul 13 08:19:58 2017 +0200
Committer: Andrea Cosentino 
Committed: Thu Jul 13 08:19:58 2017 +0200

--
 camel-core/src/main/java/org/apache/camel/util/LRUCache.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/a7542736/camel-core/src/main/java/org/apache/camel/util/LRUCache.java
--
diff --git a/camel-core/src/main/java/org/apache/camel/util/LRUCache.java 
b/camel-core/src/main/java/org/apache/camel/util/LRUCache.java
index d66cd0e..efc3280 100644
--- a/camel-core/src/main/java/org/apache/camel/util/LRUCache.java
+++ b/camel-core/src/main/java/org/apache/camel/util/LRUCache.java
@@ -76,7 +76,7 @@ public class LRUCache implements Map, 
RemovalListener, Seriali
  */
 public LRUCache(int initialCapacity, int maximumCacheSize) {
 //Do not stop service if ConcurrentLinkedHashMap try to evict entry 
when its max capacity is zero.
-this(initialCapacity, maximumCacheSize, maximumCacheSize>0);
+this(initialCapacity, maximumCacheSize, maximumCacheSize > 0);
 }
 
 /**

[1/4] camel git commit: Fixed CS

[acosentino]

Repository: camel
Updated Branches:
  refs/heads/master 34a054426 -> 6032163a9


Fixed CS


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

Branch: refs/heads/master
Commit: 2501304b327b7001b938a1b7ad03be2593fb53dc
Parents: 34a0544
Author: Andrea Cosentino 
Authored: Tue Jul 11 08:28:58 2017 +0200
Committer: Andrea Cosentino 
Committed: Tue Jul 11 08:44:38 2017 +0200

--
 .../org/apache/camel/component/influxdb/InfluxDbProducer.java| 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/2501304b/components/camel-influxdb/src/main/java/org/apache/camel/component/influxdb/InfluxDbProducer.java
--
diff --git 
a/components/camel-influxdb/src/main/java/org/apache/camel/component/influxdb/InfluxDbProducer.java
 
b/components/camel-influxdb/src/main/java/org/apache/camel/component/influxdb/InfluxDbProducer.java
index 5d318a3..625a1cb 100644
--- 
a/components/camel-influxdb/src/main/java/org/apache/camel/component/influxdb/InfluxDbProducer.java
+++ 
b/components/camel-influxdb/src/main/java/org/apache/camel/component/influxdb/InfluxDbProducer.java
@@ -81,8 +81,8 @@ public class InfluxDbProducer extends DefaultProducer {
 LOG.debug("Writing point {}", p.lineProtocol());
 
 if (!connection.databaseExists(dataBaseName)) {
-   LOG.debug("Database {} doesn't exist. Creating it...", 
dataBaseName);
-   connection.createDatabase(dataBaseName);
+LOG.debug("Database {} doesn't exist. Creating it...", 
dataBaseName);
+connection.createDatabase(dataBaseName);
 }
 connection.write(dataBaseName, retentionPolicy, p);
 } catch (Exception ex) {

[3/3] camel git commit: Fixed CS

[davsclaus]

Fixed CS


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

Branch: refs/heads/master
Commit: e6bcdba111d267bd90e29ce2261dde0aae3a196c
Parents: 7376cc4
Author: Claus Ibsen 
Authored: Wed Jul 5 10:14:19 2017 +0200
Committer: Claus Ibsen 
Committed: Wed Jul 5 10:14:19 2017 +0200

--
 .../java/org/apache/camel/support/ReloadStrategySupport.java  | 3 +--
 .../src/main/java/org/apache/camel/util/LRUCacheFactory.java  | 7 +--
 2 files changed, 6 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/e6bcdba1/camel-core/src/main/java/org/apache/camel/support/ReloadStrategySupport.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/support/ReloadStrategySupport.java 
b/camel-core/src/main/java/org/apache/camel/support/ReloadStrategySupport.java
index ecc040c..41d2600 100644
--- 
a/camel-core/src/main/java/org/apache/camel/support/ReloadStrategySupport.java
+++ 
b/camel-core/src/main/java/org/apache/camel/support/ReloadStrategySupport.java
@@ -22,7 +22,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.camel.util.LRUCacheFactory;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
@@ -35,7 +34,7 @@ import org.apache.camel.model.RouteDefinition;
 import org.apache.camel.model.RoutesDefinition;
 import org.apache.camel.spi.ReloadStrategy;
 import org.apache.camel.util.CollectionStringBuffer;
-import org.apache.camel.util.LRUCache;
+import org.apache.camel.util.LRUCacheFactory;
 import org.apache.camel.util.ObjectHelper;
 import org.apache.camel.util.StringHelper;
 import org.apache.camel.util.XmlLineNumberParser;

http://git-wip-us.apache.org/repos/asf/camel/blob/e6bcdba1/camel-core/src/main/java/org/apache/camel/util/LRUCacheFactory.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/util/LRUCacheFactory.java 
b/camel-core/src/main/java/org/apache/camel/util/LRUCacheFactory.java
index 71363b3..97d5018 100644
--- a/camel-core/src/main/java/org/apache/camel/util/LRUCacheFactory.java
+++ b/camel-core/src/main/java/org/apache/camel/util/LRUCacheFactory.java
@@ -29,17 +29,20 @@ public final class LRUCacheFactory {
 
 private static final Logger LOG = 
LoggerFactory.getLogger(LRUCacheFactory.class);
 
-private static final AtomicBoolean init = new AtomicBoolean();
+private static final AtomicBoolean INIT = new AtomicBoolean();
 
 private LRUCacheFactory() {
 }
 
+/**
+ * Warm-up the LRUCache to startup Apache Camel faster.
+ */
 @SuppressWarnings("unchecked")
 public static void warmUp() {
 // create a dummy map in a separate thread to warm-up the Caffeine 
cache concurrently
 // while Camel is starting up. This allows us to overall startup Camel 
a bit faster
 // as Caffeine takes 150+ millis to initialize.
-if (init.compareAndSet(false, true)) {
+if (INIT.compareAndSet(false, true)) {
 // only need to init Caffeine once in the JVM/classloader
 Runnable task = () -> {
 StopWatch watch = new StopWatch();

[4/4] camel git commit: Fixed CS

[davsclaus]

Fixed CS


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

Branch: refs/heads/camel-2.19.x
Commit: bb07bcd25f3d985ef834fed5d1446529e8214bce
Parents: 26085bb
Author: Claus Ibsen 
Authored: Tue Jul 4 10:52:12 2017 +0200
Committer: Claus Ibsen 
Committed: Tue Jul 4 10:52:40 2017 +0200

--
 .../apache/camel/catalog/maven/PatchedHttpClientHandler.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/bb07bcd2/platforms/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/PatchedHttpClientHandler.java
--
diff --git 
a/platforms/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/PatchedHttpClientHandler.java
 
b/platforms/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/PatchedHttpClientHandler.java
index 66a26f4..499ed58 100644
--- 
a/platforms/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/PatchedHttpClientHandler.java
+++ 
b/platforms/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/PatchedHttpClientHandler.java
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

[1/4] camel git commit: Fixed CS

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/camel-2.19.x 26085bb4b -> bb07bcd25
  refs/heads/master 717edf803 -> 0bab270c8


Fixed CS


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

Branch: refs/heads/master
Commit: 0bab270c89f95d3f1ab3657df1af78ed11fe2992
Parents: 756e56c
Author: Claus Ibsen 
Authored: Tue Jul 4 10:52:12 2017 +0200
Committer: Claus Ibsen 
Committed: Tue Jul 4 10:52:19 2017 +0200

--
 .../apache/camel/catalog/maven/PatchedHttpClientHandler.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/0bab270c/platforms/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/PatchedHttpClientHandler.java
--
diff --git 
a/platforms/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/PatchedHttpClientHandler.java
 
b/platforms/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/PatchedHttpClientHandler.java
index 66a26f4..499ed58 100644
--- 
a/platforms/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/PatchedHttpClientHandler.java
+++ 
b/platforms/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/PatchedHttpClientHandler.java
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

[2/2] camel git commit: Fixed CS

[acosentino]

Fixed CS


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

Branch: refs/heads/master
Commit: bac9ddd4b40bb5bbbdb85d725930de337734419e
Parents: 222f287
Author: Andrea Cosentino 
Authored: Fri Jun 30 10:52:21 2017 +0200
Committer: Andrea Cosentino 
Committed: Fri Jun 30 10:52:34 2017 +0200

--
 .../processor/idempotent/CaffeineIdempotentRepository.java | 6 +++---
 .../processor/idempotent/CaffeineIdempotentRepositoryTest.java | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/bac9ddd4/components/camel-caffeine/src/main/java/org/apache/camel/component/caffeine/processor/idempotent/CaffeineIdempotentRepository.java
--
diff --git 
a/components/camel-caffeine/src/main/java/org/apache/camel/component/caffeine/processor/idempotent/CaffeineIdempotentRepository.java
 
b/components/camel-caffeine/src/main/java/org/apache/camel/component/caffeine/processor/idempotent/CaffeineIdempotentRepository.java
index b1f9880..4007cf1 100644
--- 
a/components/camel-caffeine/src/main/java/org/apache/camel/component/caffeine/processor/idempotent/CaffeineIdempotentRepository.java
+++ 
b/components/camel-caffeine/src/main/java/org/apache/camel/component/caffeine/processor/idempotent/CaffeineIdempotentRepository.java
@@ -16,15 +16,15 @@
  */
 package org.apache.camel.component.caffeine.processor.idempotent;
 
+import com.github.benmanes.caffeine.cache.Cache;
+import com.github.benmanes.caffeine.cache.Caffeine;
+
 import org.apache.camel.api.management.ManagedAttribute;
 import org.apache.camel.api.management.ManagedOperation;
 import org.apache.camel.api.management.ManagedResource;
 import org.apache.camel.spi.IdempotentRepository;
 import org.apache.camel.support.ServiceSupport;
 
-import com.github.benmanes.caffeine.cache.Cache;
-import com.github.benmanes.caffeine.cache.Caffeine;
-
 @ManagedResource(description = "Caffeine based message id repository")
 public class CaffeineIdempotentRepository extends ServiceSupport implements 
IdempotentRepository {
 

http://git-wip-us.apache.org/repos/asf/camel/blob/bac9ddd4/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/processor/idempotent/CaffeineIdempotentRepositoryTest.java
--
diff --git 
a/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/processor/idempotent/CaffeineIdempotentRepositoryTest.java
 
b/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/processor/idempotent/CaffeineIdempotentRepositoryTest.java
index e2eef89..9ce16c9 100644
--- 
a/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/processor/idempotent/CaffeineIdempotentRepositoryTest.java
+++ 
b/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/processor/idempotent/CaffeineIdempotentRepositoryTest.java
@@ -18,13 +18,13 @@ package 
org.apache.camel.component.caffeine.processor.idempotent;
 
 import java.util.UUID;
 
+import com.github.benmanes.caffeine.cache.Cache;
+
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.test.junit4.CamelTestSupport;
 import org.junit.Test;
 
-import com.github.benmanes.caffeine.cache.Cache;
-
 public class CaffeineIdempotentRepositoryTest extends CamelTestSupport {
 
 private CaffeineIdempotentRepository repo;

[2/2] camel git commit: Fixed CS

[davsclaus]

Fixed CS


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

Branch: refs/heads/master
Commit: bde5691a82d49f0de5fcdcd87df6bef8aa1884cb
Parents: cfd4e02
Author: Claus Ibsen 
Authored: Thu Jun 29 14:07:05 2017 +0200
Committer: Claus Ibsen 
Committed: Thu Jun 29 14:07:05 2017 +0200

--
 .../main/java/org/apache/camel/impl/DefaultShutdownStrategy.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/bde5691a/camel-core/src/main/java/org/apache/camel/impl/DefaultShutdownStrategy.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/impl/DefaultShutdownStrategy.java 
b/camel-core/src/main/java/org/apache/camel/impl/DefaultShutdownStrategy.java
index f06b52b..304c492 100644
--- 
a/camel-core/src/main/java/org/apache/camel/impl/DefaultShutdownStrategy.java
+++ 
b/camel-core/src/main/java/org/apache/camel/impl/DefaultShutdownStrategy.java
@@ -197,7 +197,8 @@ public class DefaultShutdownStrategy extends ServiceSupport 
implements ShutdownS
 
 // use another thread to perform the shutdowns so we can support 
timeout
 timeoutOccurred.set(false);
-currentShutdownTaskFuture = getExecutorService().submit(new 
ShutdownTask(context, routesOrdered, timeout, timeUnit, suspendOnly, 
abortAfterTimeout, timeoutOccurred, isLogInflightExchangesOnTimeout()));
+currentShutdownTaskFuture = getExecutorService().submit(new 
ShutdownTask(context, routesOrdered, timeout, timeUnit, suspendOnly,
+abortAfterTimeout, timeoutOccurred, 
isLogInflightExchangesOnTimeout()));
 try {
 currentShutdownTaskFuture.get(timeout, timeUnit);
 } catch (ExecutionException e) {

[2/9] camel git commit: Fixed CS

[davsclaus]

Fixed CS


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

Branch: refs/heads/master
Commit: 1edc5fad3e32034af746dfb2a0284bfd38e2f866
Parents: dd4ba92
Author: Claus Ibsen 
Authored: Thu Jun 29 12:57:03 2017 +0200
Committer: Claus Ibsen 
Committed: Thu Jun 29 12:57:03 2017 +0200

--
 .../apache/camel/test/blueprint/CamelBlueprintTestSupport.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/1edc5fad/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java
--
diff --git 
a/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java
 
b/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java
index cddfaea..5e5cbab 100644
--- 
a/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java
+++ 
b/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java
@@ -249,9 +249,9 @@ public abstract class CamelBlueprintTestSupport extends 
CamelTestSupport {
 // start context when we are ready
 log.debug("Starting CamelContext: {}", context.getName());
 if (isUseAdviceWith()) {
-log.info("Skipping starting CamelContext as isUseAdviceWith is 
set to true.");
+log.info("Skipping starting CamelContext as isUseAdviceWith is set 
to true.");
 } else {
-context.start();
+context.start();
 }
 }
 

[5/9] camel git commit: Fixed CS

[davsclaus]

Fixed CS


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

Branch: refs/heads/camel-2.19.x
Commit: b8c23d1712f5ddd184002d4e33063648f50ac656
Parents: 83b102b
Author: Claus Ibsen 
Authored: Thu Jun 29 12:57:03 2017 +0200
Committer: Claus Ibsen 
Committed: Thu Jun 29 13:08:59 2017 +0200

--
 .../apache/camel/test/blueprint/CamelBlueprintTestSupport.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/b8c23d17/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java
--
diff --git 
a/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java
 
b/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java
index cddfaea..5e5cbab 100644
--- 
a/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java
+++ 
b/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java
@@ -249,9 +249,9 @@ public abstract class CamelBlueprintTestSupport extends 
CamelTestSupport {
 // start context when we are ready
 log.debug("Starting CamelContext: {}", context.getName());
 if (isUseAdviceWith()) {
-log.info("Skipping starting CamelContext as isUseAdviceWith is 
set to true.");
+log.info("Skipping starting CamelContext as isUseAdviceWith is set 
to true.");
 } else {
-context.start();
+context.start();
 }
 }
 

[8/9] camel git commit: Fixed CS

[davsclaus]

Fixed CS


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

Branch: refs/heads/camel-2.18.x
Commit: 044083e6049d68d6238dc5d39a80d0fd17597f79
Parents: abc3087
Author: Claus Ibsen 
Authored: Thu Jun 29 12:57:03 2017 +0200
Committer: Claus Ibsen 
Committed: Thu Jun 29 13:31:06 2017 +0200

--
 .../apache/camel/test/blueprint/CamelBlueprintTestSupport.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/044083e6/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java
--
diff --git 
a/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java
 
b/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java
index 686854c..5d7eaed 100644
--- 
a/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java
+++ 
b/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java
@@ -249,9 +249,9 @@ public abstract class CamelBlueprintTestSupport extends 
CamelTestSupport {
 // start context when we are ready
 log.debug("Starting CamelContext: {}", context.getName());
 if (isUseAdviceWith()) {
-log.info("Skipping starting CamelContext as isUseAdviceWith is 
set to true.");
+log.info("Skipping starting CamelContext as isUseAdviceWith is set 
to true.");
 } else {
-context.start();
+context.start();
 }
 }
 

camel git commit: Fixed CS

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/master aeb71af0c -> f80e47736


Fixed CS


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

Branch: refs/heads/master
Commit: f80e4773640190cbb2acfc7f7a88383dbc205c73
Parents: aeb71af
Author: Claus Ibsen 
Authored: Sat Jun 24 19:48:14 2017 +0200
Committer: Claus Ibsen 
Committed: Sat Jun 24 19:48:14 2017 +0200

--
 .../org/apache/camel/converter/IOConverterOptimised.java  | 10 ++
 .../org/apache/camel/converter/NIOConverterOptimised.java |  8 
 .../apache/camel/converter/ObjectConverterOptimised.java  |  6 +++---
 .../camel/impl/converter/OptimisedTypeConverter.java  |  6 +++---
 4 files changed, 16 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/f80e4773/camel-core/src/main/java/org/apache/camel/converter/IOConverterOptimised.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/converter/IOConverterOptimised.java 
b/camel-core/src/main/java/org/apache/camel/converter/IOConverterOptimised.java
index 590b398..6ae8779 100644
--- 
a/camel-core/src/main/java/org/apache/camel/converter/IOConverterOptimised.java
+++ 
b/camel-core/src/main/java/org/apache/camel/converter/IOConverterOptimised.java
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -34,11 +34,12 @@ import org.apache.camel.Exchange;
 /**
  * Optimised {@link IOConverter}
  */
-public class IOConverterOptimised {
+public final class IOConverterOptimised {
 
 private IOConverterOptimised() {
 }
 
+// CHECKSTYLE:OFF
 public static Object convertTo(final Class type, final Exchange 
exchange, final Object value) throws Exception {
 Class fromType = value.getClass();
 
@@ -159,5 +160,6 @@ public class IOConverterOptimised {
 // no optimised type converter found
 return null;
 }
+// CHECKSTYLE:ON
 
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/f80e4773/camel-core/src/main/java/org/apache/camel/converter/NIOConverterOptimised.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/converter/NIOConverterOptimised.java
 
b/camel-core/src/main/java/org/apache/camel/converter/NIOConverterOptimised.java
index cd30f47..cbef7a9 100644
--- 
a/camel-core/src/main/java/org/apache/camel/converter/NIOConverterOptimised.java
+++ 
b/camel-core/src/main/java/org/apache/camel/converter/NIOConverterOptimised.java
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -25,7 +25,7 @@ import org.apache.camel.Exchange;
 /**
  * Optimised {@link NIOConverter}
  */
-public class NIOConverterOptimised {
+public final class NIOConverterOptimised {
 
 private NIOConverterOptimised() {
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/f80e4773/camel-core/src/main/java/org/apache/camel/converter/ObjectConverterOptimised.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/converter/ObjectConverterOptimised.java
 
b/camel-core/src/main/java/org/apache/camel/converter/ObjectConverterOptimised.java
index d7378bd..149ca7a 100644
--- 
a/camel-core/src/main/java/org/apache/camel/converter/ObjectConverterOptimised.java
+++ 
b/camel-core/src/main/java/org/apache/camel/converter/ObjectConverterOptimised.java
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy 

[1/2] camel git commit: Fixed CS

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/master a7593280b -> 2f8b01906


Fixed CS


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

Branch: refs/heads/master
Commit: 848512fe856d53d95ff3880d96ec2e6847569fe0
Parents: a759328
Author: Claus Ibsen 
Authored: Sun Jun 18 15:48:42 2017 +0200
Committer: Claus Ibsen 
Committed: Sun Jun 18 15:48:42 2017 +0200

--
 .../apache/camel/builder/DefaultFluentProducerTemplate.java| 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/848512fe/camel-core/src/main/java/org/apache/camel/builder/DefaultFluentProducerTemplate.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/builder/DefaultFluentProducerTemplate.java
 
b/camel-core/src/main/java/org/apache/camel/builder/DefaultFluentProducerTemplate.java
index 4c6034b..5d7cebe 100644
--- 
a/camel-core/src/main/java/org/apache/camel/builder/DefaultFluentProducerTemplate.java
+++ 
b/camel-core/src/main/java/org/apache/camel/builder/DefaultFluentProducerTemplate.java
@@ -125,10 +125,10 @@ public class DefaultFluentProducerTemplate extends 
ServiceSupport implements Flu
 
 @Override
 public FluentProducerTemplate clearAll() {
-   clearBody();
-   clearHeaders();
+clearBody();
+clearHeaders();
 
-   return this;
+return this;
 }
 
 @Override

[06/10] camel git commit: Fixed CS. This closes #1731

[davsclaus]

Fixed CS. This closes #1731


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

Branch: refs/heads/camel-2.19.x
Commit: 796f056b9974fd49c27f68ee46b5dfd32e56730a
Parents: e0d6078
Author: Claus Ibsen 
Authored: Thu Jun 1 09:11:25 2017 +0200
Committer: Claus Ibsen 
Committed: Thu Jun 1 09:12:02 2017 +0200

--
 .../java/org/apache/camel/component/cmis/CMISSessionFacade.java| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/796f056b/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISSessionFacade.java
--
diff --git 
a/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISSessionFacade.java
 
b/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISSessionFacade.java
index 0af07d2..f5da95f 100644
--- 
a/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISSessionFacade.java
+++ 
b/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISSessionFacade.java
@@ -182,7 +182,7 @@ public class CMISSessionFacade {
 
 public InputStream getContentStreamFor(QueryResult item) {
 Document document = getDocument(item);
-if(document != null) {
+if (document != null) {
 ContentStream contentStream = document.getContentStream();
 if (contentStream != null) {
 return contentStream.getStream();

[03/10] camel git commit: Fixed CS. This closes #1731

[davsclaus]

Fixed CS. This closes #1731


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

Branch: refs/heads/master
Commit: 7aa57abb7980e2fd49ce9479e7633fbde321ab3e
Parents: 743d855
Author: Claus Ibsen 
Authored: Thu Jun 1 09:11:25 2017 +0200
Committer: Claus Ibsen 
Committed: Thu Jun 1 09:11:25 2017 +0200

--
 .../java/org/apache/camel/component/cmis/CMISSessionFacade.java| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/7aa57abb/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISSessionFacade.java
--
diff --git 
a/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISSessionFacade.java
 
b/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISSessionFacade.java
index 0af07d2..f5da95f 100644
--- 
a/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISSessionFacade.java
+++ 
b/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISSessionFacade.java
@@ -182,7 +182,7 @@ public class CMISSessionFacade {
 
 public InputStream getContentStreamFor(QueryResult item) {
 Document document = getDocument(item);
-if(document != null) {
+if (document != null) {
 ContentStream contentStream = document.getContentStream();
 if (contentStream != null) {
 return contentStream.getStream();

[09/10] camel git commit: Fixed CS. This closes #1731

[davsclaus]

Fixed CS. This closes #1731


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

Branch: refs/heads/camel-2.18.x
Commit: 035120f6de2ab373256ab5d094e58134abab4d03
Parents: 8c6ae74
Author: Claus Ibsen 
Authored: Thu Jun 1 09:11:25 2017 +0200
Committer: Claus Ibsen 
Committed: Thu Jun 1 09:12:32 2017 +0200

--
 .../java/org/apache/camel/component/cmis/CMISSessionFacade.java| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/035120f6/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISSessionFacade.java
--
diff --git 
a/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISSessionFacade.java
 
b/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISSessionFacade.java
index 0af07d2..f5da95f 100644
--- 
a/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISSessionFacade.java
+++ 
b/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISSessionFacade.java
@@ -182,7 +182,7 @@ public class CMISSessionFacade {
 
 public InputStream getContentStreamFor(QueryResult item) {
 Document document = getDocument(item);
-if(document != null) {
+if (document != null) {
 ContentStream contentStream = document.getContentStream();
 if (contentStream != null) {
 return contentStream.getStream();

[1/2] camel git commit: Fixed CS

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/master 4941e7fac -> 072f89eeb


Fixed CS


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

Branch: refs/heads/master
Commit: 072f89eeb455bec080b249d9a5e36c9070206a18
Parents: a57a894
Author: Claus Ibsen 
Authored: Mon May 29 09:36:26 2017 +0200
Committer: Claus Ibsen 
Committed: Mon May 29 09:45:55 2017 +0200

--
 .../java/org/apache/camel/management/mbean/ManagedRoute.java   | 3 ++-
 .../org/apache/camel/management/mbean/StatisticCounter.java| 6 +++---
 .../java/org/apache/camel/management/mbean/StatisticDelta.java | 6 +++---
 .../org/apache/camel/management/mbean/StatisticMaximum.java| 6 +++---
 .../org/apache/camel/management/mbean/StatisticMinimum.java| 6 +++---
 .../java/org/apache/camel/management/mbean/StatisticValue.java | 6 +++---
 6 files changed, 17 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/072f89ee/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRoute.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRoute.java 
b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRoute.java
index 93248b5..a977350 100644
--- 
a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRoute.java
+++ 
b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRoute.java
@@ -34,6 +34,8 @@ import javax.management.Query;
 import javax.management.QueryExp;
 import javax.management.StringValueExp;
 
+import org.w3c.dom.Document;
+
 import org.apache.camel.CamelContext;
 import org.apache.camel.ManagementStatisticsLevel;
 import org.apache.camel.Route;
@@ -52,7 +54,6 @@ import org.apache.camel.util.ObjectHelper;
 import org.apache.camel.util.XmlLineNumberParser;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.w3c.dom.Document;
 
 @ManagedResource(description = "Managed Route")
 public class ManagedRoute extends ManagedPerformanceCounter implements 
TimerListener, ManagedRouteMBean {

http://git-wip-us.apache.org/repos/asf/camel/blob/072f89ee/camel-core/src/main/java/org/apache/camel/management/mbean/StatisticCounter.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/management/mbean/StatisticCounter.java
 
b/camel-core/src/main/java/org/apache/camel/management/mbean/StatisticCounter.java
index 814aa51..27620c7 100644
--- 
a/camel-core/src/main/java/org/apache/camel/management/mbean/StatisticCounter.java
+++ 
b/camel-core/src/main/java/org/apache/camel/management/mbean/StatisticCounter.java
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

http://git-wip-us.apache.org/repos/asf/camel/blob/072f89ee/camel-core/src/main/java/org/apache/camel/management/mbean/StatisticDelta.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/management/mbean/StatisticDelta.java
 
b/camel-core/src/main/java/org/apache/camel/management/mbean/StatisticDelta.java
index 6038106..40b3747 100644
--- 
a/camel-core/src/main/java/org/apache/camel/management/mbean/StatisticDelta.java
+++ 
b/camel-core/src/main/java/org/apache/camel/management/mbean/StatisticDelta.java
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

http://git-wip-us.apache.org/repos/asf/camel/blob/072f89ee/camel-core/src/main/java/org/apache/camel/management/mbean/StatisticMaximum.java
--
diff 

[13/13] camel git commit: Fixed CS

[davsclaus]

Fixed CS


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

Branch: refs/heads/master
Commit: 1fe30377164ccbbcbefc0183c8c784988767c28c
Parents: 04088ff
Author: Claus Ibsen 
Authored: Thu May 25 11:16:27 2017 +0200
Committer: Claus Ibsen 
Committed: Thu May 25 11:32:17 2017 +0200

--
 .../jetty/rest/RestJettyOptionsTest.java |  6 +++---
 .../netty/http/DefaultNettyHttpBinding.java  |  2 +-
 .../streams/api/CamelReactiveStreamsService.java |  2 +-
 .../support/ReactiveStreamsTestService.java  |  2 +-
 .../servlet/rest/OptionsMethodWebRequest.java|  6 +++---
 .../apache/camel/spring/SpringTestSupport.java   |  2 +-
 .../TwitterDirectMessageEndpoint.java| 19 ++-
 .../twitter/search/TwitterSearchEndpoint.java| 19 ++-
 .../streaming/TwitterStreamingEndpoint.java  | 19 ++-
 .../timeline/TwitterTimelineEndpoint.java| 19 ++-
 .../twitter/CamelComponentVerifierTest.java  |  5 +++--
 .../twitter/UserProducerInOnlyTest.java  |  5 +++--
 .../component/twitter/UserProducerInOutTest.java |  6 +++---
 13 files changed, 91 insertions(+), 21 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/1fe30377/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/rest/RestJettyOptionsTest.java
--
diff --git 
a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/rest/RestJettyOptionsTest.java
 
b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/rest/RestJettyOptionsTest.java
index 7618601..7f6536e 100644
--- 
a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/rest/RestJettyOptionsTest.java
+++ 
b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/rest/RestJettyOptionsTest.java
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

http://git-wip-us.apache.org/repos/asf/camel/blob/1fe30377/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/DefaultNettyHttpBinding.java
--
diff --git 
a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/DefaultNettyHttpBinding.java
 
b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/DefaultNettyHttpBinding.java
index 5112762..15cea1b 100644
--- 
a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/DefaultNettyHttpBinding.java
+++ 
b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/DefaultNettyHttpBinding.java
@@ -252,7 +252,7 @@ public class DefaultNettyHttpBinding implements 
NettyHttpBinding, Cloneable {
 public Message toCamelMessage(HttpResponse response, Exchange exchange, 
NettyHttpConfiguration configuration) throws Exception {
 LOG.trace("toCamelMessage: {}", response);
 
-NettyHttpMessage answer = new 
NettyHttpMessage(exchange.getContext(),null, response);
+NettyHttpMessage answer = new NettyHttpMessage(exchange.getContext(), 
null, response);
 answer.setExchange(exchange);
 if (configuration.isMapHeaders()) {
 populateCamelHeaders(response, answer.getHeaders(), exchange, 
configuration);

http://git-wip-us.apache.org/repos/asf/camel/blob/1fe30377/components/camel-reactive-streams/src/main/java/org/apache/camel/component/reactive/streams/api/CamelReactiveStreamsService.java
--
diff --git 
a/components/camel-reactive-streams/src/main/java/org/apache/camel/component/reactive/streams/api/CamelReactiveStreamsService.java
 
b/components/camel-reactive-streams/src/main/java/org/apache/camel/component/reactive/streams/api/CamelReactiveStreamsService.java
index 199f96d..f851fa6 100644
--- 
a/components/camel-reactive-streams/src/main/java/org/apache/camel/component/reactive/streams/api/CamelReactiveStreamsService.java
+++ 

[2/2] camel git commit: Fixed CS

[davsclaus]

Fixed CS


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

Branch: refs/heads/camel-2.19.x
Commit: 6fcf166164b87708a5a89b9b94d41057e8d95d7e
Parents: 9db1c9e
Author: Claus Ibsen 
Authored: Wed May 24 14:34:25 2017 +0200
Committer: Claus Ibsen 
Committed: Wed May 24 14:35:00 2017 +0200

--
 .../org/apache/camel/component/sql/stored/ParserTest.java| 8 +++-
 1 file changed, 3 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/6fcf1661/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ParserTest.java
--
diff --git 
a/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ParserTest.java
 
b/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ParserTest.java
index ae807b2..bfbe4af 100644
--- 
a/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ParserTest.java
+++ 
b/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ParserTest.java
@@ -74,7 +74,6 @@ public class ParserTest extends CamelTestSupport {
 public void noOutputParameterShouldFail() {
 parser.parseTemplate("ADDNUMBERS2"
 + "(INTEGER VALUE1 ${header.v1},INTEGER VALUE2 ${header.v2})");
-
 }
 
 @Test(expected = ParseRuntimeException.class)
@@ -107,12 +106,12 @@ public class ParserTest extends CamelTestSupport {
 
 @Test
 public void colonInSimple() {
-
 PropertiesComponent pc = (PropertiesComponent) 
context.getComponent("properties");
 pc.setLocation("classpath:jndi.properties");
 Exchange exchange = createExchangeWithBody(1);
 Template template = parser.parseTemplate("ADDNUMBERS2(-1342 
${properties:java.naming.factory.initial})");
-
assertEquals("org.apache.camel.util.jndi.CamelInitialContextFactory",((InputParameter)template.getParameterList().get(0)).getValueExtractor().eval(exchange,
 null));
+assertEquals("org.apache.camel.util.jndi.CamelInitialContextFactory",
+((InputParameter) 
template.getParameterList().get(0)).getValueExtractor().eval(exchange, null));
 }
 
 @Test
@@ -121,7 +120,7 @@ public class ParserTest extends CamelTestSupport {
 Exchange exchange = createExchangeWithBody(1);
 
 Map container = new HashMap();
-container.put("a:",1);
+container.put("a:", 1);
 assertEquals(1, ((InputParameter) 
template.getParameterList().get(0)).getValueExtractor().eval(exchange, 
container));
 }
 
@@ -137,7 +136,6 @@ public class ParserTest extends CamelTestSupport {
 assertEquals(-1342, ((OutParameter) 
template.getParameterList().get(0)).getSqlType());
 }
 
-
 @Test
 public void nableIssueSyntax() {
 Map params = new HashMap<>();

[1/2] camel git commit: Fixed CS

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/master d067f423d -> b684edc6d


Fixed CS


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

Branch: refs/heads/master
Commit: b684edc6d4a86cca8876eaa60e8ba051d9bc42d0
Parents: 239c743
Author: Claus Ibsen 
Authored: Wed May 24 14:34:25 2017 +0200
Committer: Claus Ibsen 
Committed: Wed May 24 14:35:28 2017 +0200

--
 .../org/apache/camel/component/sql/stored/ParserTest.java| 8 +++-
 1 file changed, 3 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/b684edc6/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ParserTest.java
--
diff --git 
a/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ParserTest.java
 
b/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ParserTest.java
index ae807b2..bfbe4af 100644
--- 
a/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ParserTest.java
+++ 
b/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ParserTest.java
@@ -74,7 +74,6 @@ public class ParserTest extends CamelTestSupport {
 public void noOutputParameterShouldFail() {
 parser.parseTemplate("ADDNUMBERS2"
 + "(INTEGER VALUE1 ${header.v1},INTEGER VALUE2 ${header.v2})");
-
 }
 
 @Test(expected = ParseRuntimeException.class)
@@ -107,12 +106,12 @@ public class ParserTest extends CamelTestSupport {
 
 @Test
 public void colonInSimple() {
-
 PropertiesComponent pc = (PropertiesComponent) 
context.getComponent("properties");
 pc.setLocation("classpath:jndi.properties");
 Exchange exchange = createExchangeWithBody(1);
 Template template = parser.parseTemplate("ADDNUMBERS2(-1342 
${properties:java.naming.factory.initial})");
-
assertEquals("org.apache.camel.util.jndi.CamelInitialContextFactory",((InputParameter)template.getParameterList().get(0)).getValueExtractor().eval(exchange,
 null));
+assertEquals("org.apache.camel.util.jndi.CamelInitialContextFactory",
+((InputParameter) 
template.getParameterList().get(0)).getValueExtractor().eval(exchange, null));
 }
 
 @Test
@@ -121,7 +120,7 @@ public class ParserTest extends CamelTestSupport {
 Exchange exchange = createExchangeWithBody(1);
 
 Map container = new HashMap();
-container.put("a:",1);
+container.put("a:", 1);
 assertEquals(1, ((InputParameter) 
template.getParameterList().get(0)).getValueExtractor().eval(exchange, 
container));
 }
 
@@ -137,7 +136,6 @@ public class ParserTest extends CamelTestSupport {
 assertEquals(-1342, ((OutParameter) 
template.getParameterList().get(0)).getSqlType());
 }
 
-
 @Test
 public void nableIssueSyntax() {
 Map params = new HashMap<>();

camel git commit: Fixed CS so code compiles

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/master 3dd29006c -> a1830d5a2


Fixed CS so code compiles


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

Branch: refs/heads/master
Commit: a1830d5a2788ec26b34e48732026b3d706f615dd
Parents: 3dd2900
Author: Claus Ibsen 
Authored: Tue May 16 10:15:54 2017 +0200
Committer: Claus Ibsen 
Committed: Tue May 16 10:15:54 2017 +0200

--
 .../springboot/test/support/ReactiveStreamsServiceTestSupport.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/a1830d5a/platforms/spring-boot/components-starter/camel-reactive-streams-starter/src/test/java/org/apache/camel/component/reactive/streams/springboot/test/support/ReactiveStreamsServiceTestSupport.java
--
diff --git 
a/platforms/spring-boot/components-starter/camel-reactive-streams-starter/src/test/java/org/apache/camel/component/reactive/streams/springboot/test/support/ReactiveStreamsServiceTestSupport.java
 
b/platforms/spring-boot/components-starter/camel-reactive-streams-starter/src/test/java/org/apache/camel/component/reactive/streams/springboot/test/support/ReactiveStreamsServiceTestSupport.java
index 8290919..6778897 100644
--- 
a/platforms/spring-boot/components-starter/camel-reactive-streams-starter/src/test/java/org/apache/camel/component/reactive/streams/springboot/test/support/ReactiveStreamsServiceTestSupport.java
+++ 
b/platforms/spring-boot/components-starter/camel-reactive-streams-starter/src/test/java/org/apache/camel/component/reactive/streams/springboot/test/support/ReactiveStreamsServiceTestSupport.java
@@ -19,10 +19,10 @@ package 
org.apache.camel.component.reactive.streams.springboot.test.support;
 import java.util.function.Function;
 
 import org.apache.camel.Exchange;
+import 
org.apache.camel.component.reactive.streams.ReactiveStreamsCamelSubscriber;
 import org.apache.camel.component.reactive.streams.ReactiveStreamsConsumer;
 import org.apache.camel.component.reactive.streams.ReactiveStreamsProducer;
 import 
org.apache.camel.component.reactive.streams.api.CamelReactiveStreamsService;
-import 
org.apache.camel.component.reactive.streams.ReactiveStreamsCamelSubscriber;
 import org.reactivestreams.Publisher;
 import org.reactivestreams.Subscriber;
 

[3/4] camel git commit: Fixed CS

[davsclaus]

Fixed CS


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

Branch: refs/heads/master
Commit: 5bc22d1f1c94f633ac9499ddbf7f20f546c73883
Parents: 7c60d20
Author: Claus Ibsen 
Authored: Fri Apr 21 21:01:52 2017 +0200
Committer: Claus Ibsen 
Committed: Fri Apr 21 21:04:47 2017 +0200

--
 .../example/kubernetes/fmp/CqlPopulateBean.java | 20 +++---
 .../example/kubernetes/fmp/HazelcastRoute.java  | 68 ++--
 .../camel/example/kafka/StringPartitioner.java  |  6 +-
 .../apache/camel/example/mention/Contact.java   |  7 +-
 ...ponentConfigurationAndDocumentationTest.java |  6 +-
 ...nguageConfigurationAndDocumentationTest.java |  3 +-
 6 files changed, 57 insertions(+), 53 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/5bc22d1f/examples/camel-example-cassandra-kubernetes/src/main/java/org/apache/camel/example/kubernetes/fmp/CqlPopulateBean.java
--
diff --git 
a/examples/camel-example-cassandra-kubernetes/src/main/java/org/apache/camel/example/kubernetes/fmp/CqlPopulateBean.java
 
b/examples/camel-example-cassandra-kubernetes/src/main/java/org/apache/camel/example/kubernetes/fmp/CqlPopulateBean.java
index d2b589a..8df 100644
--- 
a/examples/camel-example-cassandra-kubernetes/src/main/java/org/apache/camel/example/kubernetes/fmp/CqlPopulateBean.java
+++ 
b/examples/camel-example-cassandra-kubernetes/src/main/java/org/apache/camel/example/kubernetes/fmp/CqlPopulateBean.java
@@ -20,15 +20,15 @@ import com.datastax.driver.core.Cluster;
 import com.datastax.driver.core.Session;
 
 public class CqlPopulateBean {
-   
-   public void populate() {
-   Cluster cluster = 
Cluster.builder().addContactPoint("cassandra").build();
-   Session session = cluster.connect();
-   session.execute("create keyspace if not exists test with 
replication = {'class':'SimpleStrategy', 'replication_factor':1};");
-   session.execute("create table if not exists test.users ( id int 
primary key, name text );");
-   session.execute("insert into test.users (id,name) values (1, 
'oscerd') if not exists;");
-   session.close();
-   cluster.close();
-   }
+
+public void populate() {
+Cluster cluster = 
Cluster.builder().addContactPoint("cassandra").build();
+Session session = cluster.connect();
+session.execute("create keyspace if not exists test with replication = 
{'class':'SimpleStrategy', 'replication_factor':1};");
+session.execute("create table if not exists test.users ( id int 
primary key, name text );");
+session.execute("insert into test.users (id,name) values (1, 'oscerd') 
if not exists;");
+session.close();
+cluster.close();
+}
 
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/5bc22d1f/examples/camel-example-hazelcast-kubernetes/src/main/java/org/apache/camel/example/kubernetes/fmp/HazelcastRoute.java
--
diff --git 
a/examples/camel-example-hazelcast-kubernetes/src/main/java/org/apache/camel/example/kubernetes/fmp/HazelcastRoute.java
 
b/examples/camel-example-hazelcast-kubernetes/src/main/java/org/apache/camel/example/kubernetes/fmp/HazelcastRoute.java
index d11cae6..b851680 100644
--- 
a/examples/camel-example-hazelcast-kubernetes/src/main/java/org/apache/camel/example/kubernetes/fmp/HazelcastRoute.java
+++ 
b/examples/camel-example-hazelcast-kubernetes/src/main/java/org/apache/camel/example/kubernetes/fmp/HazelcastRoute.java
@@ -18,47 +18,47 @@ package org.apache.camel.example.kubernetes.fmp;
 
 import java.util.UUID;
 
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.hazelcast.HazelcastComponent;
-import org.apache.camel.component.hazelcast.HazelcastConstants;
-
 import com.hazelcast.client.HazelcastClient;
 import com.hazelcast.client.config.ClientConfig;
 import com.hazelcast.config.GroupConfig;
 import com.hazelcast.config.SSLConfig;
 import com.hazelcast.core.HazelcastInstance;
+import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.hazelcast.HazelcastComponent;
+import org.apache.camel.component.hazelcast.HazelcastConstants;
 
 public class HazelcastRoute extends RouteBuilder {
 
-   @Override
-   public void configure() throws Exception {
-   
-   HazelcastComponent component = new 

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

[davsclaus]

Fixed CS. This closes #1646. This closes #1645


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

Branch: refs/heads/master
Commit: 0ab557c0ca3b830b913e991c3b5683e52bb85655
Parents: a3ecc21
Author: Claus Ibsen 
Authored: Thu Apr 20 17:09:51 2017 +0200
Committer: Claus Ibsen 
Committed: Thu Apr 20 17:09:51 2017 +0200

--
 .../catalog/maven/ConnectorArtifactHelper.java  |  8 ++--
 .../maven/DefaultMavenArtifactProvider.java | 46 ++--
 2 files changed, 27 insertions(+), 27 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/0ab557c0/platforms/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/ConnectorArtifactHelper.java
--
diff --git 
a/platforms/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/ConnectorArtifactHelper.java
 
b/platforms/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/ConnectorArtifactHelper.java
index 454b639..b233e95 100644
--- 
a/platforms/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/ConnectorArtifactHelper.java
+++ 
b/platforms/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/ConnectorArtifactHelper.java
@@ -38,15 +38,15 @@ public final class ConnectorArtifactHelper {
 return answer;
 }
 
-   private static String loadJsonSchema(ClassLoader classLoader, String 
jsonSchemaPath) {
-   try (InputStream is = 
classLoader.getResourceAsStream(jsonSchemaPath)) {
+private static String loadJsonSchema(ClassLoader classLoader, String 
jsonSchemaPath) {
+try (InputStream is = classLoader.getResourceAsStream(jsonSchemaPath)) 
{
 if (is != null) {
 return loadText(is);
 }
 } catch (Throwable e) {
 LOG.warn("Error loading " + jsonSchemaPath + " file", e);
 }
-   return null;
-   }
+return null;
+}
 
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/0ab557c0/platforms/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/DefaultMavenArtifactProvider.java
--
diff --git 
a/platforms/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/DefaultMavenArtifactProvider.java
 
b/platforms/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/DefaultMavenArtifactProvider.java
index 1a7f3cb..9361195 100644
--- 
a/platforms/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/DefaultMavenArtifactProvider.java
+++ 
b/platforms/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/DefaultMavenArtifactProvider.java
@@ -73,27 +73,27 @@ public class DefaultMavenArtifactProvider implements 
MavenArtifactProvider {
 
 Grape.setEnableAutoDownload(true);
 
-try (final GroovyClassLoader classLoader = new 
GroovyClassLoader()){
-
-   Map param = new HashMap<>();
-   param.put("classLoader", classLoader);
-   param.put("group", groupId);
-   param.put("module", artifactId);
-   param.put("version", version);
-   // no need to download transitive dependencies as we only need 
to check the component or connector itself
-   param.put("validate", false);
-   param.put("transitive", false);
-
-   LOG.debug("Downloading {}:{}:{}", groupId, artifactId, version);
-   Grape.grab(param);
-
-   // the classloader can load content from the downloaded JAR
-   if (camelCatalog != null) {
-   scanCamelComponents(camelCatalog, classLoader, names);
-   }
-   if (camelConnectorCatalog != null) {
-   scanCamelConnectors(camelConnectorCatalog, classLoader, 
groupId, artifactId, version, names);
-   }
+try (final GroovyClassLoader classLoader = new 
GroovyClassLoader()) {
+
+Map param = new HashMap<>();
+param.put("classLoader", classLoader);
+param.put("group", groupId);
+param.put("module", artifactId);
+param.put("version", version);
+// no need to download transitive dependencies as we only need 
to check the component or connector itself
+param.put("validate", false);
+param.put("transitive", false);
+
+LOG.debug("Downloading {}:{}:{}", groupId, artifactId, 
version);
+

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

[davsclaus]

Fixed CS. This closes #1592


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

Branch: refs/heads/master
Commit: a41bef53829213008b8a95b9b70d598738defe68
Parents: 7647222
Author: Claus Ibsen 
Authored: Wed Apr 12 10:29:12 2017 +0200
Committer: Claus Ibsen 
Committed: Wed Apr 12 10:29:12 2017 +0200

--
 .../apache/camel/component/springldap/SpringLdapProducer.java   | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/a41bef53/components/camel-spring-ldap/src/main/java/org/apache/camel/component/springldap/SpringLdapProducer.java
--
diff --git 
a/components/camel-spring-ldap/src/main/java/org/apache/camel/component/springldap/SpringLdapProducer.java
 
b/components/camel-spring-ldap/src/main/java/org/apache/camel/component/springldap/SpringLdapProducer.java
index 84259c4..328dbd2 100644
--- 
a/components/camel-spring-ldap/src/main/java/org/apache/camel/component/springldap/SpringLdapProducer.java
+++ 
b/components/camel-spring-ldap/src/main/java/org/apache/camel/component/springldap/SpringLdapProducer.java
@@ -18,7 +18,6 @@ package org.apache.camel.component.springldap;
 
 import java.util.Map;
 import java.util.function.BiFunction;
-
 import javax.naming.NamingException;
 import javax.naming.directory.Attributes;
 import javax.naming.directory.ModificationItem;
@@ -97,8 +96,8 @@ public class SpringLdapProducer extends DefaultProducer {
 if (StringUtils.isBlank(dn)) {
 ContextSource contextSource = ldapTemplate.getContextSource();
 if (contextSource instanceof BaseLdapPathContextSource) {
-   dn = ((BaseLdapPathContextSource) 
contextSource).getBaseLdapPathAsString();
-   }
+dn = ((BaseLdapPathContextSource) 
contextSource).getBaseLdapPathAsString();
+}
 }
 if (operation != LdapOperation.FUNCTION_DRIVEN && 
(StringUtils.isBlank(dn))) {
 throw new UnsupportedOperationException("DN must not be empty, but 
you provided an empty DN");

[6/6] camel git commit: Fixed CS. This closes #1565

[davsclaus]

Fixed CS. This closes #1565


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

Branch: refs/heads/master
Commit: cded03c5a547a59a760d191959476dd3674f5429
Parents: 927205e
Author: Claus Ibsen 
Authored: Tue Mar 28 10:17:37 2017 +0200
Committer: Claus Ibsen 
Committed: Tue Mar 28 10:18:35 2017 +0200

--
 .../camel/component/sjms/SjmsComponent.java | 23 ++--
 .../camel/component/sjms/SjmsEndpoint.java  | 20 -
 .../component/sjms/batch/SjmsBatchEndpoint.java | 16 --
 .../component/sjms/support/MockConnection.java  |  3 ---
 .../sjms/support/MockConnectionFactory.java |  4 
 .../sjms/support/MockMessageConsumer.java   |  4 +---
 .../component/sjms/support/MockSession.java |  4 
 .../src/main/docs/sjms2-component.adoc  |  2 +-
 8 files changed, 42 insertions(+), 34 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/cded03c5/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsComponent.java
--
diff --git 
a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsComponent.java
 
b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsComponent.java
index f4e07c0..158c0ac 100644
--- 
a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsComponent.java
+++ 
b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsComponent.java
@@ -45,7 +45,10 @@ public class SjmsComponent extends 
HeaderFilterStrategyComponent {
 @Metadata(label = "advanced", description = "A ConnectionResource is an 
interface that allows for customization and container control of the 
ConnectionFactory."
 + " * See Plugable Connection Resource Management for 
further details.")
 private ConnectionResource connectionResource;
-@Metadata(label = "advanced", description = "Pluggable strategy for 
encoding and decoding JMS keys so they can be compliant with the JMS 
specification. Camel provides one implementation out of the box: default. The 
default strategy will safely marshal dots and hyphens (. and -). Can be used 
for JMS brokers which do not care whether JMS header keys contain illegal 
characters. You can provide your own implementation of the 
org.apache.camel.component.jms.JmsKeyFormatStrategy and refer to it using the # 
notation.")
+@Metadata(label = "advanced", description = "Pluggable strategy for 
encoding and decoding JMS keys so they can be compliant with the JMS 
specification."
++ " Camel provides one implementation out of the box: default. The 
default strategy will safely marshal dots and hyphens (. and -)."
++ " Can be used for JMS brokers which do not care whether JMS header 
keys contain illegal characters. You can provide your own implementation"
++ " of the org.apache.camel.component.jms.JmsKeyFormatStrategy and 
refer to it using the # notation.")
 private JmsKeyFormatStrategy jmsKeyFormatStrategy = new 
DefaultJmsKeyFormatStrategy();
 @Metadata(defaultValue = "1", description = "The maximum number of 
connections available to endpoints started under this component")
 private Integer connectionCount = 1;
@@ -55,17 +58,23 @@ public class SjmsComponent extends 
HeaderFilterStrategyComponent {
 private TimedTaskManager timedTaskManager;
 @Metadata(label = "advanced", description = "To use a custom 
DestinationCreationStrategy.")
 private DestinationCreationStrategy destinationCreationStrategy;
-@Metadata(label = "advanced", description = "To use the given 
MessageCreatedStrategy which are invoked when Camel creates new instances of 
javax.jms.Message objects when Camel is sending a JMS message.")
+@Metadata(label = "advanced", description = "To use the given 
MessageCreatedStrategy which are invoked when Camel creates new instances"
++ " of javax.jms.Message objects when Camel is sending a JMS 
message.")
 private MessageCreatedStrategy messageCreatedStrategy;
-@Metadata(label = "advanced", defaultValue = "true", description = "When 
using the default {@link 
org.apache.camel.component.sjms.jms.ConnectionFactoryResource} then should each 
{@link javax.jms.Connection} be tested (calling start) before returned from the 
pool.")
+@Metadata(label = "advanced", defaultValue = "true", description = "When 
using the default {@link 
org.apache.camel.component.sjms.jms.ConnectionFactoryResource}"
++ " then should each {@link javax.jms.Connection} be tested (calling 
start) before 

camel git commit: fixed CS error

[cmueller]

Repository: camel
Updated Branches:
  refs/heads/master fce2a5ab5 -> d0dafc6f9


fixed CS error


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

Branch: refs/heads/master
Commit: d0dafc6f973a77077bab69d0474c5216574ce647
Parents: fce2a5a
Author: Christian Mueller 
Authored: Sun Mar 26 16:40:17 2017 +0200
Committer: Christian Mueller 
Committed: Sun Mar 26 16:40:17 2017 +0200

--
 .../KinesisComponentIntegrationTest.java| 60 ++--
 1 file changed, 29 insertions(+), 31 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/d0dafc6f/components/camel-aws/src/test/java/org/apache/camel/component/aws/kinesis/integration/KinesisComponentIntegrationTest.java
--
diff --git 
a/components/camel-aws/src/test/java/org/apache/camel/component/aws/kinesis/integration/KinesisComponentIntegrationTest.java
 
b/components/camel-aws/src/test/java/org/apache/camel/component/aws/kinesis/integration/KinesisComponentIntegrationTest.java
index 5764c59..3970fcf 100644
--- 
a/components/camel-aws/src/test/java/org/apache/camel/component/aws/kinesis/integration/KinesisComponentIntegrationTest.java
+++ 
b/components/camel-aws/src/test/java/org/apache/camel/component/aws/kinesis/integration/KinesisComponentIntegrationTest.java
@@ -16,6 +16,11 @@
  */
 package org.apache.camel.component.aws.kinesis.integration;
 
+import com.amazonaws.regions.Regions;
+import com.amazonaws.services.kinesis.AmazonKinesis;
+import com.amazonaws.services.kinesis.AmazonKinesisClientBuilder;
+import com.amazonaws.services.kinesis.model.Record;
+
 import org.apache.camel.EndpointInject;
 import org.apache.camel.Exchange;
 import org.apache.camel.ExchangePattern;
@@ -29,44 +34,39 @@ import org.apache.camel.test.junit4.CamelTestSupport;
 import org.junit.Ignore;
 import org.junit.Test;
 
-import com.amazonaws.regions.Regions;
-import com.amazonaws.services.kinesis.AmazonKinesis;
-import com.amazonaws.services.kinesis.AmazonKinesisClientBuilder;
-import com.amazonaws.services.kinesis.model.Record;
-
 @Ignore("Must be manually tested.")
 public class KinesisComponentIntegrationTest extends CamelTestSupport {
-
+
 @EndpointInject(uri = "direct:start")
 private ProducerTemplate template;
-
+
 @EndpointInject(uri = "mock:result")
 private MockEndpoint result;
-
+
 @Test
 public void send() throws Exception {
 result.expectedMessageCount(2);
-
+
 template.send("direct:start", ExchangePattern.InOnly, new Processor() {
 public void process(Exchange exchange) throws Exception {
 exchange.getIn().setHeader(KinesisConstants.PARTITION_KEY, 
"partition-1");
 exchange.getIn().setBody("Kinesis Event 1.");
 }
 });
-
+
 template.send("direct:start", ExchangePattern.InOut, new Processor() {
 public void process(Exchange exchange) throws Exception {
 exchange.getIn().setHeader(KinesisConstants.PARTITION_KEY, 
"partition-1");
 exchange.getIn().setBody("Kinesis Event 2.");
 }
 });
-
+
 assertMockEndpointsSatisfied();
-
+
 assertResultExchange(result.getExchanges().get(0), "Kinesis Event 1.", 
"partition-1");
 assertResultExchange(result.getExchanges().get(1), "Kinesis Event 2.", 
"partition-1");
 }
-
+
 private void assertResultExchange(Exchange resultExchange, String data, 
String partition) {
 assertIsInstanceOf(Record.class, resultExchange.getIn().getBody());
 Record record = resultExchange.getIn().getBody(Record.class);
@@ -75,29 +75,27 @@ public class KinesisComponentIntegrationTest extends 
CamelTestSupport {
 
assertNotNull(resultExchange.getIn().getHeader(KinesisConstants.APPROX_ARRIVAL_TIME));
 
assertNotNull(resultExchange.getIn().getHeader(KinesisConstants.SEQUENCE_NUMBER));
 }
-
+
 @Override
-   protected JndiRegistry createRegistry() throws Exception {
-JndiRegistry registry = super.createRegistry();
-
-AmazonKinesis client = 
AmazonKinesisClientBuilder.standard().withRegion(Regions.EU_CENTRAL_1).build();
-registry.bind("amazonKinesisClient", client);
-
-return registry;
-   }
-
-   protected RouteBuilder createRouteBuilder() throws Exception {
+protected JndiRegistry createRegistry() throws Exception {
+JndiRegistry registry = super.createRegistry();
+
+

[2/4] camel git commit: Fixed CS. This closes #1568

[davsclaus]

Fixed CS. This closes #1568


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

Branch: refs/heads/master
Commit: 833a1a3015df33bf5f227d021296845b1c4cbd08
Parents: dc82efe
Author: Claus Ibsen 
Authored: Sun Mar 26 10:06:35 2017 +0200
Committer: Claus Ibsen 
Committed: Sun Mar 26 10:06:35 2017 +0200

--
 components/camel-spark-rest/pom.xml | 13 
 .../sparkrest/DefaultSparkBindingTest.java  | 33 ++--
 2 files changed, 23 insertions(+), 23 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/833a1a30/components/camel-spark-rest/pom.xml
--
diff --git a/components/camel-spark-rest/pom.xml 
b/components/camel-spark-rest/pom.xml
index d914147..4237762 100644
--- a/components/camel-spark-rest/pom.xml
+++ b/components/camel-spark-rest/pom.xml
@@ -100,6 +100,13 @@
   camel-swagger-java
   test
 
+
+  org.mockito
+  mockito-all
+  ${mockito-version}
+  test
+
+
 
 
   org.apache.camel
@@ -111,12 +118,6 @@
   camel-jaxb
   test
 
-
-org.mockito
-mockito-all
-1.9.5
-test
-
 
 
 

http://git-wip-us.apache.org/repos/asf/camel/blob/833a1a30/components/camel-spark-rest/src/test/java/org/apache/camel/component/sparkrest/DefaultSparkBindingTest.java
--
diff --git 
a/components/camel-spark-rest/src/test/java/org/apache/camel/component/sparkrest/DefaultSparkBindingTest.java
 
b/components/camel-spark-rest/src/test/java/org/apache/camel/component/sparkrest/DefaultSparkBindingTest.java
index 717e280..e9074aa 100644
--- 
a/components/camel-spark-rest/src/test/java/org/apache/camel/component/sparkrest/DefaultSparkBindingTest.java
+++ 
b/components/camel-spark-rest/src/test/java/org/apache/camel/component/sparkrest/DefaultSparkBindingTest.java
@@ -16,26 +16,19 @@
  */
 package org.apache.camel.component.sparkrest;
 
-import static java.util.Arrays.asList;
-import static java.util.Collections.emptyMap;
-import static org.apache.camel.Exchange.CONTENT_TYPE;
-import static org.apache.camel.Exchange.HTTP_METHOD;
-import static org.apache.camel.Exchange.HTTP_QUERY;
-import static org.apache.camel.Exchange.HTTP_URI;
-import static org.apache.camel.Exchange.HTTP_URL;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-import static org.junit.Assert.assertEquals;
-
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 
+import static java.util.Arrays.asList;
+import static java.util.Collections.emptyMap;
+
 import javax.servlet.http.HttpServletRequest;
 
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Sets;
 import org.apache.camel.Exchange;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.experimental.theories.DataPoints;
@@ -43,11 +36,17 @@ import org.junit.experimental.theories.FromDataPoints;
 import org.junit.experimental.theories.Theories;
 import org.junit.experimental.theories.Theory;
 import org.junit.runner.RunWith;
+import spark.Request;
 
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Sets;
+import static org.apache.camel.Exchange.CONTENT_TYPE;
+import static org.apache.camel.Exchange.HTTP_METHOD;
+import static org.apache.camel.Exchange.HTTP_QUERY;
+import static org.apache.camel.Exchange.HTTP_URI;
+import static org.apache.camel.Exchange.HTTP_URL;
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
-import spark.Request;
 
 @RunWith(Theories.class)
 public class DefaultSparkBindingTest {
@@ -94,7 +93,7 @@ public class DefaultSparkBindingTest {
 
 @Theory
 @Test
-public void 
shouldOnlyAddStandardExchangeHeader_givenHeaderNotPresentInInput(
+public void 
shouldOnlyAddStandardExchangeHeaderGivenHeaderNotPresentInInput(
 @FromDataPoints("exchangeHeaderScenarios") ExchangeHeaderScenario 
scenario) throws Exception {
 //given
 Map headers = scenario.headers;
@@ -112,7 +111,7 @@ public class DefaultSparkBindingTest {
 String expectedHeaderName;
 String expectedHeaderValue;
 
-public ExchangeHeaderScenario(Map headers, String 
expectedHeaderName, String expectedHeaderValue) {
+ExchangeHeaderScenario(Map headers, String 
expectedHeaderName, String expectedHeaderValue) {
 

[4/4] camel git commit: Fixed CS. This closes #1568

[davsclaus]

Fixed CS. This closes #1568


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

Branch: refs/heads/camel-2.18.x
Commit: bf2991301ce9f48355237b17243117202a02781d
Parents: 38e2c1f
Author: Claus Ibsen 
Authored: Sun Mar 26 10:06:35 2017 +0200
Committer: Claus Ibsen 
Committed: Sun Mar 26 10:07:31 2017 +0200

--
 components/camel-spark-rest/pom.xml | 13 
 .../sparkrest/DefaultSparkBindingTest.java  | 33 ++--
 2 files changed, 23 insertions(+), 23 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/bf299130/components/camel-spark-rest/pom.xml
--
diff --git a/components/camel-spark-rest/pom.xml 
b/components/camel-spark-rest/pom.xml
index 879bbd8..29fc0be 100644
--- a/components/camel-spark-rest/pom.xml
+++ b/components/camel-spark-rest/pom.xml
@@ -100,6 +100,13 @@
   camel-swagger-java
   test
 
+
+  org.mockito
+  mockito-all
+  ${mockito-version}
+  test
+
+
 
 
   org.apache.camel
@@ -111,12 +118,6 @@
   camel-jaxb
   test
 
-
-org.mockito
-mockito-all
-1.9.5
-test
-
 
 
 

http://git-wip-us.apache.org/repos/asf/camel/blob/bf299130/components/camel-spark-rest/src/test/java/org/apache/camel/component/sparkrest/DefaultSparkBindingTest.java
--
diff --git 
a/components/camel-spark-rest/src/test/java/org/apache/camel/component/sparkrest/DefaultSparkBindingTest.java
 
b/components/camel-spark-rest/src/test/java/org/apache/camel/component/sparkrest/DefaultSparkBindingTest.java
index 717e280..e9074aa 100644
--- 
a/components/camel-spark-rest/src/test/java/org/apache/camel/component/sparkrest/DefaultSparkBindingTest.java
+++ 
b/components/camel-spark-rest/src/test/java/org/apache/camel/component/sparkrest/DefaultSparkBindingTest.java
@@ -16,26 +16,19 @@
  */
 package org.apache.camel.component.sparkrest;
 
-import static java.util.Arrays.asList;
-import static java.util.Collections.emptyMap;
-import static org.apache.camel.Exchange.CONTENT_TYPE;
-import static org.apache.camel.Exchange.HTTP_METHOD;
-import static org.apache.camel.Exchange.HTTP_QUERY;
-import static org.apache.camel.Exchange.HTTP_URI;
-import static org.apache.camel.Exchange.HTTP_URL;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-import static org.junit.Assert.assertEquals;
-
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 
+import static java.util.Arrays.asList;
+import static java.util.Collections.emptyMap;
+
 import javax.servlet.http.HttpServletRequest;
 
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Sets;
 import org.apache.camel.Exchange;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.experimental.theories.DataPoints;
@@ -43,11 +36,17 @@ import org.junit.experimental.theories.FromDataPoints;
 import org.junit.experimental.theories.Theories;
 import org.junit.experimental.theories.Theory;
 import org.junit.runner.RunWith;
+import spark.Request;
 
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Sets;
+import static org.apache.camel.Exchange.CONTENT_TYPE;
+import static org.apache.camel.Exchange.HTTP_METHOD;
+import static org.apache.camel.Exchange.HTTP_QUERY;
+import static org.apache.camel.Exchange.HTTP_URI;
+import static org.apache.camel.Exchange.HTTP_URL;
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
-import spark.Request;
 
 @RunWith(Theories.class)
 public class DefaultSparkBindingTest {
@@ -94,7 +93,7 @@ public class DefaultSparkBindingTest {
 
 @Theory
 @Test
-public void 
shouldOnlyAddStandardExchangeHeader_givenHeaderNotPresentInInput(
+public void 
shouldOnlyAddStandardExchangeHeaderGivenHeaderNotPresentInInput(
 @FromDataPoints("exchangeHeaderScenarios") ExchangeHeaderScenario 
scenario) throws Exception {
 //given
 Map headers = scenario.headers;
@@ -112,7 +111,7 @@ public class DefaultSparkBindingTest {
 String expectedHeaderName;
 String expectedHeaderValue;
 
-public ExchangeHeaderScenario(Map headers, String 
expectedHeaderName, String expectedHeaderValue) {
+ExchangeHeaderScenario(Map headers, String 
expectedHeaderName, String expectedHeaderValue) {
   

camel git commit: Fixed CS

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/master 12ddb0fc8 -> 323279362


Fixed CS


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

Branch: refs/heads/master
Commit: 3232793629e8336610c50d32cc49998b565962e9
Parents: 12ddb0f
Author: Claus Ibsen 
Authored: Wed Mar 15 22:46:17 2017 +0100
Committer: Claus Ibsen 
Committed: Wed Mar 15 22:46:17 2017 +0100

--
 .../maven/connector/SpringBootAutoConfigurationMojo.java | 8 
 .../apache/camel/maven/connector/model/ComponentModel.java   | 6 +++---
 .../camel/maven/connector/model/ComponentOptionModel.java| 6 +++---
 .../camel/component/connector/DefaultConnectorComponent.java | 3 +--
 4 files changed, 11 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/32327936/connectors/camel-connector-maven-plugin/src/main/java/org/apache/camel/maven/connector/SpringBootAutoConfigurationMojo.java
--
diff --git 
a/connectors/camel-connector-maven-plugin/src/main/java/org/apache/camel/maven/connector/SpringBootAutoConfigurationMojo.java
 
b/connectors/camel-connector-maven-plugin/src/main/java/org/apache/camel/maven/connector/SpringBootAutoConfigurationMojo.java
index 1529696..8aad172 100644
--- 
a/connectors/camel-connector-maven-plugin/src/main/java/org/apache/camel/maven/connector/SpringBootAutoConfigurationMojo.java
+++ 
b/connectors/camel-connector-maven-plugin/src/main/java/org/apache/camel/maven/connector/SpringBootAutoConfigurationMojo.java
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -185,7 +185,7 @@ public class SpringBootAutoConfigurationMojo extends 
AbstractMojo {
 String type = option.getJavaType();
 PropertySource prop = javaClass.addProperty(type, 
option.getName());
 
-// TODO: only include the global options so we can configure them
+// TODO: only include the component options so we can configure 
them
 
 if ("true".equals(option.getDeprecated())) {
 prop.getField().addAnnotation(Deprecated.class);

http://git-wip-us.apache.org/repos/asf/camel/blob/32327936/connectors/camel-connector-maven-plugin/src/main/java/org/apache/camel/maven/connector/model/ComponentModel.java
--
diff --git 
a/connectors/camel-connector-maven-plugin/src/main/java/org/apache/camel/maven/connector/model/ComponentModel.java
 
b/connectors/camel-connector-maven-plugin/src/main/java/org/apache/camel/maven/connector/model/ComponentModel.java
index fad13aa..d5cd4d2 100644
--- 
a/connectors/camel-connector-maven-plugin/src/main/java/org/apache/camel/maven/connector/model/ComponentModel.java
+++ 
b/connectors/camel-connector-maven-plugin/src/main/java/org/apache/camel/maven/connector/model/ComponentModel.java
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

http://git-wip-us.apache.org/repos/asf/camel/blob/32327936/connectors/camel-connector-maven-plugin/src/main/java/org/apache/camel/maven/connector/model/ComponentOptionModel.java
--
diff --git 
a/connectors/camel-connector-maven-plugin/src/main/java/org/apache/camel/maven/connector/model/ComponentOptionModel.java
 
b/connectors/camel-connector-maven-plugin/src/main/java/org/apache/camel/maven/connector/model/ComponentOptionModel.java
index 2a717ab..96b5598 100644
--- 
a/connectors/camel-connector-maven-plugin/src/main/java/org/apache/camel/maven/connector/model/ComponentOptionModel.java
+++ 

[1/3] camel git commit: Fixed CS

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/master 910b678f7 -> 69cc2cb55


Fixed CS


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

Branch: refs/heads/master
Commit: aa005279d9a42f61996afeb3385b5a62b3afb52b
Parents: a57bc99
Author: Claus Ibsen 
Authored: Tue Mar 14 14:14:14 2017 +0100
Committer: Claus Ibsen 
Committed: Tue Mar 14 14:14:20 2017 +0100

--
 .../java/org/apache/camel/component/connector/ConnectorModel.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/aa005279/connectors/camel-connector/src/main/java/org/apache/camel/component/connector/ConnectorModel.java
--
diff --git 
a/connectors/camel-connector/src/main/java/org/apache/camel/component/connector/ConnectorModel.java
 
b/connectors/camel-connector/src/main/java/org/apache/camel/component/connector/ConnectorModel.java
index 0b2b6b2..7419256 100644
--- 
a/connectors/camel-connector/src/main/java/org/apache/camel/component/connector/ConnectorModel.java
+++ 
b/connectors/camel-connector/src/main/java/org/apache/camel/component/connector/ConnectorModel.java
@@ -60,7 +60,7 @@ final class ConnectorModel {
 private Map defaultComponentOptions;
 private Map defaultEndpointOptions;
 
-public ConnectorModel(String componentName, String className) {
+ConnectorModel(String componentName, String className) {
 this.componentName = componentName;
 this.className = className;
 this.lines = Suppliers.memorize(() -> findCamelConnectorJSonSchema());

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

[davsclaus]

Fixed CS. This closes #1520


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

Branch: refs/heads/master
Commit: 16d6fc3857ae633aa2599a91528114ed99e2ebc3
Parents: 7f78921
Author: Claus Ibsen 
Authored: Fri Mar 10 21:43:27 2017 +0100
Committer: Claus Ibsen 
Committed: Fri Mar 10 21:43:27 2017 +0100

--
 .../component/undertow/rest/RestUndertowHttpPojoTypeTest.java  | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/16d6fc38/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpPojoTypeTest.java
--
diff --git 
a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpPojoTypeTest.java
 
b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpPojoTypeTest.java
index 1752f54..7541dd6 100644
--- 
a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpPojoTypeTest.java
+++ 
b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpPojoTypeTest.java
@@ -16,6 +16,10 @@
  */
 package org.apache.camel.component.undertow.rest;
 
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
@@ -27,8 +31,6 @@ import org.apache.camel.model.rest.RestDefinition;
 import org.apache.camel.model.rest.VerbDefinition;
 import org.junit.Test;
 
-import java.util.*;
-
 public class RestUndertowHttpPojoTypeTest extends BaseUndertowTest {
 private final ObjectMapper mapper = new ObjectMapper();
 

camel git commit: Fixed CS

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/master 9f1a4524e -> b877b4584


Fixed CS


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

Branch: refs/heads/master
Commit: b877b45840b3166f0c9213337595fbc506075197
Parents: 9f1a452
Author: Claus Ibsen 
Authored: Tue Mar 7 17:23:23 2017 +0100
Committer: Claus Ibsen 
Committed: Tue Mar 7 17:23:23 2017 +0100

--
 .../src/main/java/sample/camel/PetController.java| 8 
 1 file changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/b877b458/examples/camel-example-rest-producer/src/main/java/sample/camel/PetController.java
--
diff --git 
a/examples/camel-example-rest-producer/src/main/java/sample/camel/PetController.java
 
b/examples/camel-example-rest-producer/src/main/java/sample/camel/PetController.java
index c1234a6..d9bb346 100644
--- 
a/examples/camel-example-rest-producer/src/main/java/sample/camel/PetController.java
+++ 
b/examples/camel-example-rest-producer/src/main/java/sample/camel/PetController.java
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -26,7 +26,7 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 public class PetController {
 
-private static String[] PETS = new String[]{"Snoopy", "Fido", "Tony the 
Tiger"};
+private static final String[] PETS = new String[]{"Snoopy", "Fido", "Tony 
the Tiger"};
 
 @RequestMapping(value = "/petById/{id}", produces = "application/json")
 public String petById(@PathVariable("id") Integer id) {

camel git commit: Fixed CS

[acosentino]

Repository: camel
Updated Branches:
  refs/heads/camel-2.17.x 5aa518ef6 -> bd9f9077e


Fixed CS


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

Branch: refs/heads/camel-2.17.x
Commit: bd9f9077ef9bf7eb98bd793e9521ae5ba0d93ce1
Parents: 5aa518e
Author: Andrea Cosentino 
Authored: Mon Mar 6 13:27:50 2017 +0100
Committer: Andrea Cosentino 
Committed: Mon Mar 6 13:32:49 2017 +0100

--
 .../main/java/org/apache/camel/component/hdfs2/HdfsConsumer.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/bd9f9077/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/HdfsConsumer.java
--
diff --git 
a/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/HdfsConsumer.java
 
b/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/HdfsConsumer.java
index 8bb17b8..3d5d8d4 100644
--- 
a/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/HdfsConsumer.java
+++ 
b/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/HdfsConsumer.java
@@ -35,14 +35,14 @@ import org.apache.hadoop.fs.PathFilter;
 
 public final class HdfsConsumer extends ScheduledPollConsumer {
 
+public static final long DEFAULT_CONSUMER_INITIAL_DELAY = 10 * 1000L;
+
 private final HdfsConfiguration config;
 private final StringBuilder hdfsPath;
 private final Processor processor;
 private final ReadWriteLock rwlock = new ReentrantReadWriteLock();
 private volatile HdfsInputStream istream;
 
-public static final long DEFAULT_CONSUMER_INITIAL_DELAY = 10 * 1000L;
-
 public HdfsConsumer(HdfsEndpoint endpoint, Processor processor, 
HdfsConfiguration config) {
 super(endpoint, processor);
 this.config = config;

camel git commit: Fixed CS

[acosentino]

Repository: camel
Updated Branches:
  refs/heads/camel-2.18.x c17cb6785 -> e12179ca2


Fixed CS


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

Branch: refs/heads/camel-2.18.x
Commit: e12179ca2fc7f8b3f09cb31219fda18017f633ad
Parents: c17cb67
Author: Andrea Cosentino 
Authored: Mon Mar 6 13:27:50 2017 +0100
Committer: Andrea Cosentino 
Committed: Mon Mar 6 13:29:14 2017 +0100

--
 .../main/java/org/apache/camel/component/hdfs2/HdfsConsumer.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/e12179ca/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/HdfsConsumer.java
--
diff --git 
a/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/HdfsConsumer.java
 
b/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/HdfsConsumer.java
index 8bb17b8..3d5d8d4 100644
--- 
a/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/HdfsConsumer.java
+++ 
b/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/HdfsConsumer.java
@@ -35,14 +35,14 @@ import org.apache.hadoop.fs.PathFilter;
 
 public final class HdfsConsumer extends ScheduledPollConsumer {
 
+public static final long DEFAULT_CONSUMER_INITIAL_DELAY = 10 * 1000L;
+
 private final HdfsConfiguration config;
 private final StringBuilder hdfsPath;
 private final Processor processor;
 private final ReadWriteLock rwlock = new ReentrantReadWriteLock();
 private volatile HdfsInputStream istream;
 
-public static final long DEFAULT_CONSUMER_INITIAL_DELAY = 10 * 1000L;
-
 public HdfsConsumer(HdfsEndpoint endpoint, Processor processor, 
HdfsConfiguration config) {
 super(endpoint, processor);
 this.config = config;

[2/2] camel git commit: Fixed CS. This closes #1506

[davsclaus]

Fixed CS. This closes #1506


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

Branch: refs/heads/master
Commit: f97c6af6ad549f49c878dbd670d6adb5186026ea
Parents: 84b21a8
Author: Claus Ibsen 
Authored: Sat Mar 4 16:04:44 2017 +0100
Committer: Claus Ibsen 
Committed: Sat Mar 4 16:04:44 2017 +0100

--
 .../decorators/AbstractHttpSpanDecorator.java   |  1 -
 .../opentracing/decorators/JdbcSpanDecorator.java   |  3 +--
 .../decorators/MongoDBSpanDecorator.java| 11 +--
 .../opentracing/decorators/SqlSpanDecorator.java|  3 +--
 .../decorators/AbstractHttpSpanDecoratorTest.java   | 11 ---
 .../decorators/AbstractSpanDecoratorTest.java   | 11 +--
 .../decorators/JdbcSpanDecoratorTest.java   |  7 +++
 .../decorators/MongoDBSpanDecoratorTest.java| 16 +++-
 .../decorators/SqlSpanDecoratorTest.java|  7 +++
 .../decorators/TimerSpanDecoratorTest.java  |  4 ++--
 10 files changed, 31 insertions(+), 43 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/f97c6af6/components/camel-opentracing/src/main/java/org/apache/camel/opentracing/decorators/AbstractHttpSpanDecorator.java
--
diff --git 
a/components/camel-opentracing/src/main/java/org/apache/camel/opentracing/decorators/AbstractHttpSpanDecorator.java
 
b/components/camel-opentracing/src/main/java/org/apache/camel/opentracing/decorators/AbstractHttpSpanDecorator.java
index bc16f42..a498349 100644
--- 
a/components/camel-opentracing/src/main/java/org/apache/camel/opentracing/decorators/AbstractHttpSpanDecorator.java
+++ 
b/components/camel-opentracing/src/main/java/org/apache/camel/opentracing/decorators/AbstractHttpSpanDecorator.java
@@ -18,7 +18,6 @@ package org.apache.camel.opentracing.decorators;
 
 import io.opentracing.Span;
 import io.opentracing.tag.Tags;
-
 import org.apache.camel.Endpoint;
 import org.apache.camel.Exchange;
 

http://git-wip-us.apache.org/repos/asf/camel/blob/f97c6af6/components/camel-opentracing/src/main/java/org/apache/camel/opentracing/decorators/JdbcSpanDecorator.java
--
diff --git 
a/components/camel-opentracing/src/main/java/org/apache/camel/opentracing/decorators/JdbcSpanDecorator.java
 
b/components/camel-opentracing/src/main/java/org/apache/camel/opentracing/decorators/JdbcSpanDecorator.java
index 44cded4..b42d377 100644
--- 
a/components/camel-opentracing/src/main/java/org/apache/camel/opentracing/decorators/JdbcSpanDecorator.java
+++ 
b/components/camel-opentracing/src/main/java/org/apache/camel/opentracing/decorators/JdbcSpanDecorator.java
@@ -16,11 +16,10 @@
  */
 package org.apache.camel.opentracing.decorators;
 
+import io.opentracing.Span;
 import org.apache.camel.Endpoint;
 import org.apache.camel.Exchange;
 
-import io.opentracing.Span;
-
 public class JdbcSpanDecorator extends AbstractSpanDecorator {
 
 @Override

http://git-wip-us.apache.org/repos/asf/camel/blob/f97c6af6/components/camel-opentracing/src/main/java/org/apache/camel/opentracing/decorators/MongoDBSpanDecorator.java
--
diff --git 
a/components/camel-opentracing/src/main/java/org/apache/camel/opentracing/decorators/MongoDBSpanDecorator.java
 
b/components/camel-opentracing/src/main/java/org/apache/camel/opentracing/decorators/MongoDBSpanDecorator.java
index 0237535..f224f6d 100644
--- 
a/components/camel-opentracing/src/main/java/org/apache/camel/opentracing/decorators/MongoDBSpanDecorator.java
+++ 
b/components/camel-opentracing/src/main/java/org/apache/camel/opentracing/decorators/MongoDBSpanDecorator.java
@@ -20,11 +20,10 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
+import io.opentracing.Span;
 import org.apache.camel.Endpoint;
 import org.apache.camel.Exchange;
 
-import io.opentracing.Span;
-
 public class MongoDBSpanDecorator extends AbstractSpanDecorator {
 
 @Override
@@ -34,7 +33,7 @@ public class MongoDBSpanDecorator extends 
AbstractSpanDecorator {
 
 @Override
 public String getOperationName(Exchange exchange, Endpoint endpoint) {
-Map queryParameters = 
toQueryParameters(endpoint.getEndpointUri());
+Map queryParameters = 
toQueryParameters(endpoint.getEndpointUri());
 String opName = queryParameters.get("operation");
 if (opName != null) {
 return opName;
@@ -48,7 +47,7 @@ public class MongoDBSpanDecorator extends 

[1/3] camel git commit: Fixed CS

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/master 00e27d6de -> 010411af1


Fixed CS


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

Branch: refs/heads/master
Commit: 010411af1dbcd7263e274d0f95cee30c40c23064
Parents: 0f51e57
Author: Claus Ibsen 
Authored: Fri Mar 3 11:59:12 2017 +0100
Committer: Claus Ibsen 
Committed: Fri Mar 3 12:22:58 2017 +0100

--
 .../main/java/org/apache/camel/main/MainDurationEventNotifier.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/010411af/camel-core/src/main/java/org/apache/camel/main/MainDurationEventNotifier.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/main/MainDurationEventNotifier.java 
b/camel-core/src/main/java/org/apache/camel/main/MainDurationEventNotifier.java
index e8e6bbe..b50d3de 100644
--- 
a/camel-core/src/main/java/org/apache/camel/main/MainDurationEventNotifier.java
+++ 
b/camel-core/src/main/java/org/apache/camel/main/MainDurationEventNotifier.java
@@ -148,7 +148,7 @@ public class MainDurationEventNotifier extends 
EventNotifierSupport {
 }
 }
 };
-executorService.scheduleAtFixedRate(task, 1,1, TimeUnit.SECONDS);
+executorService.scheduleAtFixedRate(task, 1, 1, TimeUnit.SECONDS);
 }
 }
 

camel git commit: Fixed cs

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/master d2a0699e8 -> 8622f48b7


Fixed cs


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

Branch: refs/heads/master
Commit: 8622f48b708eaeeadfdc5186f62556599b55a4e4
Parents: d2a0699
Author: jpoth 
Authored: Wed Feb 22 10:25:16 2017 +0100
Committer: Claus Ibsen 
Committed: Wed Feb 22 11:13:07 2017 +0100

--
 .../tools/apt/CoreEipAnnotationProcessor.java   | 40 ++--
 .../tools/apt/SpringAnnotationProcessor.java|  4 +-
 .../tools/apt/EndpointOptionComparatorTest.java |  8 ++--
 3 files changed, 26 insertions(+), 26 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/8622f48b/tooling/apt/src/main/java/org/apache/camel/tools/apt/CoreEipAnnotationProcessor.java
--
diff --git 
a/tooling/apt/src/main/java/org/apache/camel/tools/apt/CoreEipAnnotationProcessor.java
 
b/tooling/apt/src/main/java/org/apache/camel/tools/apt/CoreEipAnnotationProcessor.java
index 737df54..07e7bf1 100644
--- 
a/tooling/apt/src/main/java/org/apache/camel/tools/apt/CoreEipAnnotationProcessor.java
+++ 
b/tooling/apt/src/main/java/org/apache/camel/tools/apt/CoreEipAnnotationProcessor.java
@@ -372,7 +372,7 @@ public class CoreEipAnnotationProcessor {
 displayName = metadata.displayName();
 }
 
-EipOption ep = new EipOption(name, displayName,"attribute", 
fieldTypeName, required, defaultValue, docComment, deprecated, isEnum, enums, 
false, null, false);
+EipOption ep = new EipOption(name, displayName, "attribute", 
fieldTypeName, required, defaultValue, docComment, deprecated, isEnum, enums, 
false, null, false);
 eipOptions.add(ep);
 
 return false;
@@ -410,7 +410,7 @@ public class CoreEipAnnotationProcessor {
 displayName = metadata.displayName();
 }
 
-EipOption ep = new EipOption(name, displayName,"value", fieldTypeName, 
required, defaultValue, docComment, deprecated, false, null, false, null, 
false);
+EipOption ep = new EipOption(name, displayName, "value", 
fieldTypeName, required, defaultValue, docComment, deprecated, false, null, 
false, null, false);
 eipOptions.add(ep);
 }
 
@@ -548,52 +548,52 @@ public class CoreEipAnnotationProcessor {
 
 // group
 String docComment = findJavaDoc(elementUtils, null, "group", null, 
classElement, true);
-EipOption ep = new EipOption("group", "Group","attribute", 
"java.lang.String", false, "", docComment, false, false, null, false, null, 
false);
+EipOption ep = new EipOption("group", "Group", "attribute", 
"java.lang.String", false, "", docComment, false, false, null, false, null, 
false);
 eipOptions.add(ep);
 
 // group
 docComment = findJavaDoc(elementUtils, null, "streamCache", null, 
classElement, true);
-ep = new EipOption("streamCache", "Stream Cache","attribute", 
"java.lang.String", false, "", docComment, false, false, null, false, null, 
false);
+ep = new EipOption("streamCache", "Stream Cache", "attribute", 
"java.lang.String", false, "", docComment, false, false, null, false, null, 
false);
 eipOptions.add(ep);
 
 // trace
 docComment = findJavaDoc(elementUtils, null, "trace", null, 
classElement, true);
-ep = new EipOption("trace", "Trace","attribute", "java.lang.String", 
false, "", docComment, false, false, null, false, null, false);
+ep = new EipOption("trace", "Trace", "attribute", "java.lang.String", 
false, "", docComment, false, false, null, false, null, false);
 eipOptions.add(ep);
 
 // trace
 docComment = findJavaDoc(elementUtils, null, "messageHistory", null, 
classElement, true);
-ep = new EipOption("messageHistory", "Message History","attribute", 
"java.lang.String", false, "true", docComment, false, false, null, false, null, 
false);
+ep = new EipOption("messageHistory", "Message History", "attribute", 
"java.lang.String", false, "true", docComment, false, false, null, false, null, 
false);
 eipOptions.add(ep);
 
 // trace
 docComment = findJavaDoc(elementUtils, null, "handleFault", null, 
classElement, true);
-ep = new EipOption("handleFault", "Handle Fault","attribute", 
"java.lang.String", false, "", docComment, false, false, null, false, null, 
false);
+ep = new EipOption("handleFault", "Handle Fault", "attribute", 
"java.lang.String", false, "", docComment, false, false, null, false, null, 
false);
 eipOptions.add(ep);
 
 // 

[4/4] camel git commit: Fixed CS

[davsclaus]

Fixed CS


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

Branch: refs/heads/master
Commit: a97db7cd5d0fae6455d2e1e6c994b7477a220fca
Parents: 8d4a41f
Author: Claus Ibsen 
Authored: Mon Feb 20 14:21:25 2017 +0100
Committer: Claus Ibsen 
Committed: Mon Feb 20 14:23:51 2017 +0100

--
 .../apache/camel/catalog/nexus/BaseNexusRepository.java |  6 +++---
 .../catalog/nexus/ComponentCatalogNexusRepository.java  |  4 ++--
 .../org/apache/camel/catalog/nexus/ConnectorDto.java| 12 ++--
 .../apache/camel/catalog/nexus/NexusArtifactDto.java| 12 ++--
 .../nexus/LocalFileComponentCatalogNexusRepository.java |  6 +++---
 .../nexus/LocalFileConnectorNexusRepository.java|  6 +++---
 .../nexus/LocalNexusComponentCatalogRepositoryTest.java |  6 +++---
 .../nexus/LocalNexusConnectorRepositoryTest.java|  6 +++---
 8 files changed, 29 insertions(+), 29 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/a97db7cd/platforms/catalog-nexus/src/main/java/org/apache/camel/catalog/nexus/BaseNexusRepository.java
--
diff --git 
a/platforms/catalog-nexus/src/main/java/org/apache/camel/catalog/nexus/BaseNexusRepository.java
 
b/platforms/catalog-nexus/src/main/java/org/apache/camel/catalog/nexus/BaseNexusRepository.java
index 8e7653e..6dd8347 100644
--- 
a/platforms/catalog-nexus/src/main/java/org/apache/camel/catalog/nexus/BaseNexusRepository.java
+++ 
b/platforms/catalog-nexus/src/main/java/org/apache/camel/catalog/nexus/BaseNexusRepository.java
@@ -33,13 +33,13 @@ import javax.xml.xpath.XPath;
 import javax.xml.xpath.XPathConstants;
 import javax.xml.xpath.XPathFactory;
 
-import org.apache.camel.catalog.CamelCatalog;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 public abstract class BaseNexusRepository {
 
 final Logger log = LoggerFactory.getLogger(getClass());

http://git-wip-us.apache.org/repos/asf/camel/blob/a97db7cd/platforms/catalog-nexus/src/main/java/org/apache/camel/catalog/nexus/ComponentCatalogNexusRepository.java
--
diff --git 
a/platforms/catalog-nexus/src/main/java/org/apache/camel/catalog/nexus/ComponentCatalogNexusRepository.java
 
b/platforms/catalog-nexus/src/main/java/org/apache/camel/catalog/nexus/ComponentCatalogNexusRepository.java
index 03844b1..152b058 100644
--- 
a/platforms/catalog-nexus/src/main/java/org/apache/camel/catalog/nexus/ComponentCatalogNexusRepository.java
+++ 
b/platforms/catalog-nexus/src/main/java/org/apache/camel/catalog/nexus/ComponentCatalogNexusRepository.java
@@ -87,8 +87,8 @@ public class ComponentCatalogNexusRepository extends 
BaseNexusRepository {
 /**
  * Adds any discovered third party Camel components from the artifact.
  */
-private void addCustomCamelComponentsFromArtifact(NexusArtifactDto dto, 
URL jarUrl ) {
-try (URLClassLoader classLoader = new URLClassLoader(new 
URL[]{jarUrl});) {
+private void addCustomCamelComponentsFromArtifact(NexusArtifactDto dto, 
URL jarUrl) {
+try (URLClassLoader classLoader = new URLClassLoader(new 
URL[]{jarUrl})) {
 // is there any custom Camel components in this library?
 Properties properties = loadComponentProperties(classLoader);
 if (properties != null) {

http://git-wip-us.apache.org/repos/asf/camel/blob/a97db7cd/platforms/catalog-nexus/src/main/java/org/apache/camel/catalog/nexus/ConnectorDto.java
--
diff --git 
a/platforms/catalog-nexus/src/main/java/org/apache/camel/catalog/nexus/ConnectorDto.java
 
b/platforms/catalog-nexus/src/main/java/org/apache/camel/catalog/nexus/ConnectorDto.java
index 1aa2b98..0c66ba8 100644
--- 
a/platforms/catalog-nexus/src/main/java/org/apache/camel/catalog/nexus/ConnectorDto.java
+++ 
b/platforms/catalog-nexus/src/main/java/org/apache/camel/catalog/nexus/ConnectorDto.java
@@ -74,12 +74,12 @@ public class ConnectorDto implements Serializable {
 
 @Override
 public String toString() {
-return "ConnectorDto[" +
-"groupId='" + nexusArtifactDto.getGroupId() + '\'' +
-", artifactId='" + nexusArtifactDto.getArtifactId() + '\'' +
-", version='" + nexusArtifactDto.getVersion() + '\'' +
-", name='" + name + '\'' +
-']';
+return "ConnectorDto["
++ 

[4/4] camel git commit: Fixed CS

[davsclaus]

Fixed CS


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

Branch: refs/heads/master
Commit: 79367a511b2c44e3ac49b97e3d966a8b7b555455
Parents: 3603272
Author: Claus Ibsen 
Authored: Sun Feb 19 09:57:48 2017 +0100
Committer: Claus Ibsen 
Committed: Sun Feb 19 09:57:48 2017 +0100

--
 .../org/apache/camel/component/azure/blob/BlobBlock.java |  6 +++---
 .../component/azure/blob/BlobServiceRequestOptions.java  |  6 +++---
 .../camel/component/azure/blob/BlobServiceUtil.java  |  6 +++---
 .../camel/component/paxlogging/PaxLoggingEndpoint.java   |  3 ++-
 .../component/servlet/rest/RestServletVerbTest.java  | 11 ---
 components/camel-xmlbeans/pom.xml|  2 +-
 6 files changed, 20 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/79367a51/components/camel-azure/src/main/java/org/apache/camel/component/azure/blob/BlobBlock.java
--
diff --git 
a/components/camel-azure/src/main/java/org/apache/camel/component/azure/blob/BlobBlock.java
 
b/components/camel-azure/src/main/java/org/apache/camel/component/azure/blob/BlobBlock.java
index f85093f..dcf8aa1 100644
--- 
a/components/camel-azure/src/main/java/org/apache/camel/component/azure/blob/BlobBlock.java
+++ 
b/components/camel-azure/src/main/java/org/apache/camel/component/azure/blob/BlobBlock.java
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

http://git-wip-us.apache.org/repos/asf/camel/blob/79367a51/components/camel-azure/src/main/java/org/apache/camel/component/azure/blob/BlobServiceRequestOptions.java
--
diff --git 
a/components/camel-azure/src/main/java/org/apache/camel/component/azure/blob/BlobServiceRequestOptions.java
 
b/components/camel-azure/src/main/java/org/apache/camel/component/azure/blob/BlobServiceRequestOptions.java
index 5f48dc6..3d1342e 100644
--- 
a/components/camel-azure/src/main/java/org/apache/camel/component/azure/blob/BlobServiceRequestOptions.java
+++ 
b/components/camel-azure/src/main/java/org/apache/camel/component/azure/blob/BlobServiceRequestOptions.java
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

http://git-wip-us.apache.org/repos/asf/camel/blob/79367a51/components/camel-azure/src/main/java/org/apache/camel/component/azure/blob/BlobServiceUtil.java
--
diff --git 
a/components/camel-azure/src/main/java/org/apache/camel/component/azure/blob/BlobServiceUtil.java
 
b/components/camel-azure/src/main/java/org/apache/camel/component/azure/blob/BlobServiceUtil.java
index c4a4363..dcf6dc3 100644
--- 
a/components/camel-azure/src/main/java/org/apache/camel/component/azure/blob/BlobServiceUtil.java
+++ 
b/components/camel-azure/src/main/java/org/apache/camel/component/azure/blob/BlobServiceUtil.java
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

[7/8] camel git commit: Fixed CS. This closes #1467

[davsclaus]

Fixed CS. This closes #1467


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

Branch: refs/heads/master
Commit: dbb27d0282bab674d6fcc80a515ccf5984c46d51
Parents: a011087
Author: Claus Ibsen 
Authored: Fri Feb 17 12:58:41 2017 +0100
Committer: Claus Ibsen 
Committed: Fri Feb 17 12:58:41 2017 +0100

--
 components/camel-opentracing/pom.xml|  2 +-
 .../opentracing/CamelHeadersExtractAdapter.java |  6 +--
 .../camel/opentracing/OpenTracingTracer.java| 53 +---
 .../apache/camel/opentracing/SpanDecorator.java | 24 -
 .../decorators/AbstractHttpSpanDecorator.java   |  9 ++--
 .../decorators/AbstractSpanDecorator.java   | 10 ++--
 .../decorators/JettySpanDecorator.java  |  2 +-
 .../apache/camel/opentracing/ABCRouteTest.java  | 43 
 .../CamelOpenTracingTestSupport.java| 33 ++--
 .../ClientRecipientListRouteTest.java   | 45 -
 .../camel/opentracing/MulticastRouteTest.java   | 47 +
 .../opentracing/OpenTracingSimpleRouteTest.java |  8 +--
 .../camel/opentracing/RouteConcurrentTest.java  | 23 -
 .../opentracing/TestSEDASpanDecorator.java  |  3 +-
 .../camel/opentracing/TwoServiceTest.java   | 27 +-
 .../src/test/resources/log4j2.properties| 27 +-
 16 files changed, 173 insertions(+), 189 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/dbb27d02/components/camel-opentracing/pom.xml
--
diff --git a/components/camel-opentracing/pom.xml 
b/components/camel-opentracing/pom.xml
index 6f0f550..3f664d8 100644
--- a/components/camel-opentracing/pom.xml
+++ b/components/camel-opentracing/pom.xml
@@ -34,7 +34,7 @@
   
 
 2.19.0
-monitoring,microservice,opentracing
+monitoring,microservice
 
 
org.apache.camel.opentracing.*
   

http://git-wip-us.apache.org/repos/asf/camel/blob/dbb27d02/components/camel-opentracing/src/main/java/org/apache/camel/opentracing/CamelHeadersExtractAdapter.java
--
diff --git 
a/components/camel-opentracing/src/main/java/org/apache/camel/opentracing/CamelHeadersExtractAdapter.java
 
b/components/camel-opentracing/src/main/java/org/apache/camel/opentracing/CamelHeadersExtractAdapter.java
index cb8a9cb..c0a8ff0 100644
--- 
a/components/camel-opentracing/src/main/java/org/apache/camel/opentracing/CamelHeadersExtractAdapter.java
+++ 
b/components/camel-opentracing/src/main/java/org/apache/camel/opentracing/CamelHeadersExtractAdapter.java
@@ -25,11 +25,11 @@ import io.opentracing.propagation.TextMap;
 public final class CamelHeadersExtractAdapter implements TextMap {
 private final Map map = new HashMap();
 
-public CamelHeadersExtractAdapter(final Map map) {
+public CamelHeadersExtractAdapter(final Map map) {
 // Extract string valued map entries
 map.entrySet().stream().filter(e -> e.getValue() instanceof 
String).forEach(e ->
-this.map.put(e.getKey(),(String)e.getValue()));
- }
+this.map.put(e.getKey(), (String) e.getValue()));
+}
 
 @Override
 public Iterator> iterator() {

http://git-wip-us.apache.org/repos/asf/camel/blob/dbb27d02/components/camel-opentracing/src/main/java/org/apache/camel/opentracing/OpenTracingTracer.java
--
diff --git 
a/components/camel-opentracing/src/main/java/org/apache/camel/opentracing/OpenTracingTracer.java
 
b/components/camel-opentracing/src/main/java/org/apache/camel/opentracing/OpenTracingTracer.java
index 406a491..165978c 100644
--- 
a/components/camel-opentracing/src/main/java/org/apache/camel/opentracing/OpenTracingTracer.java
+++ 
b/components/camel-opentracing/src/main/java/org/apache/camel/opentracing/OpenTracingTracer.java
@@ -22,6 +22,14 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.ServiceLoader;
 
+import io.opentracing.Span;
+import io.opentracing.Tracer;
+import io.opentracing.Tracer.SpanBuilder;
+import io.opentracing.contrib.global.GlobalTracer;
+import io.opentracing.contrib.spanmanager.DefaultSpanManager;
+import io.opentracing.contrib.spanmanager.SpanManager;
+import io.opentracing.propagation.Format;
+import io.opentracing.tag.Tags;
 import org.apache.camel.CamelContext;
 import org.apache.camel.CamelContextAware;
 import org.apache.camel.Endpoint;
@@ -42,15 +50,6 @@ import 

[6/6] camel git commit: Fixed CS. This closes #1471

[davsclaus]

Fixed CS. This closes #1471


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

Branch: refs/heads/camel-2.18.x
Commit: c123041cacc6a77a5c38571aaf6ae8e55b899e3c
Parents: e0de0d2
Author: Claus Ibsen 
Authored: Fri Feb 17 09:58:24 2017 +0100
Committer: Claus Ibsen 
Committed: Fri Feb 17 09:59:32 2017 +0100

--
 .../csv/CsvDataFormatCustomRecordConverter.xml  | 68 
 ...utogenColumnsSpringQuoteModeTest-context.xml | 71 -
 ...vMarshalAutogenColumnsSpringTest-context.xml | 71 -
 ...svMarshalPipeDelimiterSpringTest-context.xml | 41 +-
 .../CsvUnmarshalMapLineSpringTest-context.xml   | 81 ++--
 ...UnmarshalPipeDelimiterSpringTest-context.xml | 37 -
 ...UnmarshalSkipFirstLineSpringTest-context.xml | 37 -
 .../CsvUnmarshalStreamSpringTest-context.xml| 29 +++
 ...vUnmarshalTabDelimiterSpringTest-context.xml | 29 +++
 9 files changed, 236 insertions(+), 228 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/c123041c/components/camel-csv/src/test/resources/org/apache/camel/dataformat/csv/CsvDataFormatCustomRecordConverter.xml
--
diff --git 
a/components/camel-csv/src/test/resources/org/apache/camel/dataformat/csv/CsvDataFormatCustomRecordConverter.xml
 
b/components/camel-csv/src/test/resources/org/apache/camel/dataformat/csv/CsvDataFormatCustomRecordConverter.xml
index 7fbb7c2..fb1a799 100644
--- 
a/components/camel-csv/src/test/resources/org/apache/camel/dataformat/csv/CsvDataFormatCustomRecordConverter.xml
+++ 
b/components/camel-csv/src/test/resources/org/apache/camel/dataformat/csv/CsvDataFormatCustomRecordConverter.xml
@@ -1,43 +1,43 @@
 
 
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
 http://www.springframework.org/schema/beans; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
-   xsi:schemaLocation="
+   xsi:schemaLocation="
 http://www.springframework.org/schema/beans 
http://www.springframework.org/schema/beans/spring-beans.xsd
 http://camel.apache.org/schema/spring 
http://camel.apache.org/schema/spring/camel-spring.xsd;>
 
-   
-   
-   
-   Hello
-   Again
-   Democracy
-   
-   
-   
+  
+
+  
+Hello
+Again
+Democracy
+  
+
+  
 
-   http://camel.apache.org/schema/spring;>
-   
-   
-   
-   
-   
-   
-   
-   
+  http://camel.apache.org/schema/spring;>
+
+  
+  
+
+  
+  
+
+  
 
 
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/camel/blob/c123041c/components/camel-csv/src/test/resources/org/apache/camel/dataformat/csv/CsvMarshalAutogenColumnsSpringQuoteModeTest-context.xml
--
diff --git 
a/components/camel-csv/src/test/resources/org/apache/camel/dataformat/csv/CsvMarshalAutogenColumnsSpringQuoteModeTest-context.xml
 
b/components/camel-csv/src/test/resources/org/apache/camel/dataformat/csv/CsvMarshalAutogenColumnsSpringQuoteModeTest-context.xml
index aaed0af..3e2b4cc 100644
--- 
a/components/camel-csv/src/test/resources/org/apache/camel/dataformat/csv/CsvMarshalAutogenColumnsSpringQuoteModeTest-context.xml
+++ 
b/components/camel-csv/src/test/resources/org/apache/camel/dataformat/csv/CsvMarshalAutogenColumnsSpringQuoteModeTest-context.xml
@@ -1,54 +1,55 @@
 
-  
+
 http://www.springframework.org/schema/beans;
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
-  xsi:schemaLocation="
+   

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

[davsclaus]

Fixed CS. This closes #1471


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

Branch: refs/heads/master
Commit: 375121d8c2ec34e27064087949d55fec1e4983b3
Parents: 7af77f2
Author: Claus Ibsen 
Authored: Fri Feb 17 09:58:24 2017 +0100
Committer: Claus Ibsen 
Committed: Fri Feb 17 09:58:24 2017 +0100

--
 .../CsvDataFormatCustomFactoryTest-context.xml  | 30 
 .../csv/CsvDataFormatCustomRecordConverter.xml  | 68 
 ...CsvDataFormatResourceFactoryTest-context.xml | 30 
 ...utogenColumnsSpringQuoteModeTest-context.xml | 71 -
 ...vMarshalAutogenColumnsSpringTest-context.xml | 71 -
 ...svMarshalPipeDelimiterSpringTest-context.xml | 41 +-
 .../CsvUnmarshalMapLineSpringTest-context.xml   | 81 ++--
 ...UnmarshalPipeDelimiterSpringTest-context.xml | 37 -
 ...UnmarshalSkipFirstLineSpringTest-context.xml | 37 -
 .../CsvUnmarshalStreamSpringTest-context.xml| 29 +++
 ...vUnmarshalTabDelimiterSpringTest-context.xml | 29 +++
 11 files changed, 266 insertions(+), 258 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/375121d8/components/camel-csv/src/test/resources/org/apache/camel/dataformat/csv/CsvDataFormatCustomFactoryTest-context.xml
--
diff --git 
a/components/camel-csv/src/test/resources/org/apache/camel/dataformat/csv/CsvDataFormatCustomFactoryTest-context.xml
 
b/components/camel-csv/src/test/resources/org/apache/camel/dataformat/csv/CsvDataFormatCustomFactoryTest-context.xml
index 3668a73..8c1fa1a 100644
--- 
a/components/camel-csv/src/test/resources/org/apache/camel/dataformat/csv/CsvDataFormatCustomFactoryTest-context.xml
+++ 
b/components/camel-csv/src/test/resources/org/apache/camel/dataformat/csv/CsvDataFormatCustomFactoryTest-context.xml
@@ -1,20 +1,20 @@
 
 
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
 http://www.springframework.org/schema/beans;
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation="

http://git-wip-us.apache.org/repos/asf/camel/blob/375121d8/components/camel-csv/src/test/resources/org/apache/camel/dataformat/csv/CsvDataFormatCustomRecordConverter.xml
--
diff --git 
a/components/camel-csv/src/test/resources/org/apache/camel/dataformat/csv/CsvDataFormatCustomRecordConverter.xml
 
b/components/camel-csv/src/test/resources/org/apache/camel/dataformat/csv/CsvDataFormatCustomRecordConverter.xml
index 7fbb7c2..fb1a799 100644
--- 
a/components/camel-csv/src/test/resources/org/apache/camel/dataformat/csv/CsvDataFormatCustomRecordConverter.xml
+++ 
b/components/camel-csv/src/test/resources/org/apache/camel/dataformat/csv/CsvDataFormatCustomRecordConverter.xml
@@ -1,43 +1,43 @@
 
 
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
 http://www.springframework.org/schema/beans; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
-   xsi:schemaLocation="
+   xsi:schemaLocation="
 http://www.springframework.org/schema/beans 

[1/4] camel git commit: Fixed CS

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/master 952ae9646 -> 634c4d77c


Fixed CS


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

Branch: refs/heads/master
Commit: 634c4d77c3c3b536e1907f6688437cd122b83625
Parents: 054515d
Author: Claus Ibsen 
Authored: Wed Feb 8 10:40:26 2017 +0100
Committer: Claus Ibsen 
Committed: Wed Feb 8 10:40:53 2017 +0100

--
 .../camel-example-loan-broker-cxf/README.md |  2 +-
 examples/camel-example-loan-broker-cxf/pom.xml  |  6 +-
 .../BankResponseAggregationStrategy.java|  2 +-
 .../org/apache/camel/loanbroker/Client.java |  6 +-
 .../camel/loanbroker/CreditScoreProcessor.java  |  2 +-
 .../apache/camel/loanbroker/ReplyProcessor.java |  4 +-
 .../org/apache/camel/loanbroker/bank/Bank.java  |  2 +-
 .../camel/loanbroker/credit/CreditAgency.java   |  4 +-
 .../META-INF/spring/webServiceCamelContext.xml  | 17 +++--
 .../src/main/resources/features.xml | 42 +++-
 .../src/main/resources/log4j2.properties| 13 ++--
 .../src/main/resources/logging.properties   | 24 ++-
 .../camel/loanbroker/LoanBrokerWSTest.java  |  8 +--
 .../src/test/resources/log4j2.properties| 23 +++
 .../camel-example-loan-broker-jms/README.md |  2 +-
 .../org/apache/camel/loanbroker/Client.java |  4 +-
 .../org/apache/camel/loanbroker/LoanBroker.java | 26 +++
 .../camel/loanbroker/LoanBrokerRoute.java   | 18 ++---
 .../camel/loanbroker/bank/BankProcessor.java|  2 +-
 .../main/resources/META-INF/spring/client.xml   | 54 ---
 .../main/resources/META-INF/spring/server.xml   | 72 ++--
 .../camel/loanbroker/LoanBrokerQueueTest.java   | 67 +-
 .../src/test/resources/log4j2.properties| 23 +++
 .../mention/TwitterSalesforceApplication.java   |  2 +
 24 files changed, 209 insertions(+), 216 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/634c4d77/examples/camel-example-loan-broker-cxf/README.md
--
diff --git a/examples/camel-example-loan-broker-cxf/README.md 
b/examples/camel-example-loan-broker-cxf/README.md
index ed5366e..6ca423b 100644
--- a/examples/camel-example-loan-broker-cxf/README.md
+++ b/examples/camel-example-loan-broker-cxf/README.md
@@ -1,4 +1,4 @@
-# Loan Broker Example
+# Loan Broker Example with Apache CXF
 
 ### Introduction
 This example shows how to use Camel to implement the EIP's loan broker example,

http://git-wip-us.apache.org/repos/asf/camel/blob/634c4d77/examples/camel-example-loan-broker-cxf/pom.xml
--
diff --git a/examples/camel-example-loan-broker-cxf/pom.xml 
b/examples/camel-example-loan-broker-cxf/pom.xml
index 121f97f..662a676 100644
--- a/examples/camel-example-loan-broker-cxf/pom.xml
+++ b/examples/camel-example-loan-broker-cxf/pom.xml
@@ -58,7 +58,7 @@
   cxf-rt-transports-http-jetty
   ${cxf-version}
 
- 
+
 
   org.apache.xbean
   xbean-spring
@@ -69,7 +69,7 @@
 
   
 
-
+
 
 
   org.apache.logging.log4j
@@ -155,7 +155,7 @@
   
 
   
- 
+
   WS.LoanBroker
   
 
org.apache.camel.loanbroker.LoanBroker

http://git-wip-us.apache.org/repos/asf/camel/blob/634c4d77/examples/camel-example-loan-broker-cxf/src/main/java/org/apache/camel/loanbroker/BankResponseAggregationStrategy.java
--
diff --git 
a/examples/camel-example-loan-broker-cxf/src/main/java/org/apache/camel/loanbroker/BankResponseAggregationStrategy.java
 
b/examples/camel-example-loan-broker-cxf/src/main/java/org/apache/camel/loanbroker/BankResponseAggregationStrategy.java
index f4805bc..2ee0260 100644
--- 
a/examples/camel-example-loan-broker-cxf/src/main/java/org/apache/camel/loanbroker/BankResponseAggregationStrategy.java
+++ 
b/examples/camel-example-loan-broker-cxf/src/main/java/org/apache/camel/loanbroker/BankResponseAggregationStrategy.java
@@ -21,7 +21,7 @@ import org.apache.camel.loanbroker.bank.BankQuote;
 //START SNIPPET: aggregating
 // This POJO aggregator is supported since Camel 2.12
 public class BankResponseAggregationStrategy {
-
+
 public BankQuote aggregate(BankQuote oldQuote, BankQuote newQuote) {
 if (oldQuote != null && oldQuote.getRate() <= newQuote.getRate()) {
 return oldQuote;

http://git-wip-us.apache.org/repos/asf/camel/blob/634c4d77/examples/camel-example-loan-broker-cxf/src/main/java/org/apache/camel/loanbroker/Client.java

[9/9] camel git commit: Fixed CS. This closes #1449

[davsclaus]

Fixed CS. This closes #1449


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

Branch: refs/heads/camel-2.17.x
Commit: 7bfed82853f7b80272a770586883ef6b260cce5b
Parents: e6d82ea
Author: Claus Ibsen 
Authored: Tue Feb 7 18:37:46 2017 +0100
Committer: Claus Ibsen 
Committed: Tue Feb 7 18:42:21 2017 +0100

--
 .../camel/component/mina2/Mina2CustomCodecTest.java | 12 +---
 1 file changed, 5 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/7bfed828/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2CustomCodecTest.java
--
diff --git 
a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2CustomCodecTest.java
 
b/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2CustomCodecTest.java
index 195455c..912881e 100644
--- 
a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2CustomCodecTest.java
+++ 
b/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2CustomCodecTest.java
@@ -56,11 +56,11 @@ public class Mina2CustomCodecTest extends BaseMina2Test {
 try {
 
template.requestBody(String.format("mina2:tcp://localhost:%1$s?sync=true=#failingCodec",
 getPort()), "Hello World");
 fail("Expecting that decode of result fails");
-} catch (Exception e){
+} catch (Exception e) {
 assertTrue(e instanceof CamelExecutionException);
 assertNotNull(e.getCause());
 Throwable rootCause = e;
-while(rootCause.getCause() != null){
+while (rootCause.getCause() != null) {
 rootCause = rootCause.getCause();
 }
 assertTrue(rootCause instanceof IllegalArgumentException);
@@ -124,12 +124,11 @@ public class Mina2CustomCodecTest extends BaseMina2Test {
 
 private final boolean failing;
 
-public MyCodec(boolean failing) {
+MyCodec(boolean failing) {
 this.failing = failing;
-
 }
 
-public MyCodec() {
+MyCodec() {
 this.failing = false;
 }
 
@@ -161,11 +160,10 @@ public class Mina2CustomCodecTest extends BaseMina2Test {
 
 @Override
 protected boolean doDecode(IoSession session, IoBuffer in, 
ProtocolDecoderOutput out) throws Exception {
-if (failing){
+if (failing) {
 throw new IllegalArgumentException("Something went 
wrong in decode");
 }
 
-
 if (in.remaining() > 0) {
 byte[] buf = new byte[in.remaining()];
 in.get(buf);

[6/9] camel git commit: Fixed CS. This closes #1449

[davsclaus]

Fixed CS. This closes #1449


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

Branch: refs/heads/camel-2.18.x
Commit: 927d1d980401f046dc74aea1e978369f3f692f81
Parents: 387c740
Author: Claus Ibsen 
Authored: Tue Feb 7 18:37:46 2017 +0100
Committer: Claus Ibsen 
Committed: Tue Feb 7 18:41:45 2017 +0100

--
 .../camel/component/mina2/Mina2CustomCodecTest.java | 12 +---
 1 file changed, 5 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/927d1d98/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2CustomCodecTest.java
--
diff --git 
a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2CustomCodecTest.java
 
b/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2CustomCodecTest.java
index 195455c..912881e 100644
--- 
a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2CustomCodecTest.java
+++ 
b/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2CustomCodecTest.java
@@ -56,11 +56,11 @@ public class Mina2CustomCodecTest extends BaseMina2Test {
 try {
 
template.requestBody(String.format("mina2:tcp://localhost:%1$s?sync=true=#failingCodec",
 getPort()), "Hello World");
 fail("Expecting that decode of result fails");
-} catch (Exception e){
+} catch (Exception e) {
 assertTrue(e instanceof CamelExecutionException);
 assertNotNull(e.getCause());
 Throwable rootCause = e;
-while(rootCause.getCause() != null){
+while (rootCause.getCause() != null) {
 rootCause = rootCause.getCause();
 }
 assertTrue(rootCause instanceof IllegalArgumentException);
@@ -124,12 +124,11 @@ public class Mina2CustomCodecTest extends BaseMina2Test {
 
 private final boolean failing;
 
-public MyCodec(boolean failing) {
+MyCodec(boolean failing) {
 this.failing = failing;
-
 }
 
-public MyCodec() {
+MyCodec() {
 this.failing = false;
 }
 
@@ -161,11 +160,10 @@ public class Mina2CustomCodecTest extends BaseMina2Test {
 
 @Override
 protected boolean doDecode(IoSession session, IoBuffer in, 
ProtocolDecoderOutput out) throws Exception {
-if (failing){
+if (failing) {
 throw new IllegalArgumentException("Something went 
wrong in decode");
 }
 
-
 if (in.remaining() > 0) {
 byte[] buf = new byte[in.remaining()];
 in.get(buf);

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

[davsclaus]

Fixed CS. This closes #1449


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

Branch: refs/heads/master
Commit: 87557bac109661dd2598bc703b5586fcf05945d3
Parents: 862727b
Author: Claus Ibsen 
Authored: Tue Feb 7 18:37:46 2017 +0100
Committer: Claus Ibsen 
Committed: Tue Feb 7 18:37:46 2017 +0100

--
 .../camel/component/mina2/Mina2CustomCodecTest.java | 12 +---
 1 file changed, 5 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/87557bac/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2CustomCodecTest.java
--
diff --git 
a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2CustomCodecTest.java
 
b/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2CustomCodecTest.java
index 195455c..912881e 100644
--- 
a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2CustomCodecTest.java
+++ 
b/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2CustomCodecTest.java
@@ -56,11 +56,11 @@ public class Mina2CustomCodecTest extends BaseMina2Test {
 try {
 
template.requestBody(String.format("mina2:tcp://localhost:%1$s?sync=true=#failingCodec",
 getPort()), "Hello World");
 fail("Expecting that decode of result fails");
-} catch (Exception e){
+} catch (Exception e) {
 assertTrue(e instanceof CamelExecutionException);
 assertNotNull(e.getCause());
 Throwable rootCause = e;
-while(rootCause.getCause() != null){
+while (rootCause.getCause() != null) {
 rootCause = rootCause.getCause();
 }
 assertTrue(rootCause instanceof IllegalArgumentException);
@@ -124,12 +124,11 @@ public class Mina2CustomCodecTest extends BaseMina2Test {
 
 private final boolean failing;
 
-public MyCodec(boolean failing) {
+MyCodec(boolean failing) {
 this.failing = failing;
-
 }
 
-public MyCodec() {
+MyCodec() {
 this.failing = false;
 }
 
@@ -161,11 +160,10 @@ public class Mina2CustomCodecTest extends BaseMina2Test {
 
 @Override
 protected boolean doDecode(IoSession session, IoBuffer in, 
ProtocolDecoderOutput out) throws Exception {
-if (failing){
+if (failing) {
 throw new IllegalArgumentException("Something went 
wrong in decode");
 }
 
-
 if (in.remaining() > 0) {
 byte[] buf = new byte[in.remaining()];
 in.get(buf);

[20/24] camel git commit: Fixed CS

[davsclaus]

Fixed CS


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

Branch: refs/heads/mention
Commit: 01c94eb52803b16f1d07f243a5c8afb785ddedaf
Parents: d994bcd
Author: Andrea Cosentino 
Authored: Tue Feb 7 10:32:57 2017 +0100
Committer: Andrea Cosentino 
Committed: Tue Feb 7 10:32:57 2017 +0100

--
 .../chronicle/engine/ChronicleEngineConfiguration.java  | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/01c94eb5/components/camel-chronicle/src/main/java/org/apache/camel/component/chronicle/engine/ChronicleEngineConfiguration.java
--
diff --git 
a/components/camel-chronicle/src/main/java/org/apache/camel/component/chronicle/engine/ChronicleEngineConfiguration.java
 
b/components/camel-chronicle/src/main/java/org/apache/camel/component/chronicle/engine/ChronicleEngineConfiguration.java
index ab56b95..25506fa 100644
--- 
a/components/camel-chronicle/src/main/java/org/apache/camel/component/chronicle/engine/ChronicleEngineConfiguration.java
+++ 
b/components/camel-chronicle/src/main/java/org/apache/camel/component/chronicle/engine/ChronicleEngineConfiguration.java
@@ -162,14 +162,14 @@ public class ChronicleEngineConfiguration {
 this.persistent = persistent;
 }
 
-   public String getClusterName() {
-   return clusterName;
-   }
+public String getClusterName() {
+return clusterName;
+}
 
 /**
  * Cluster name for queue
  */
-   public void setClusterName(String clusterName) {
-   this.clusterName = clusterName;
-   }
+public void setClusterName(String clusterName) {
+this.clusterName = clusterName;
+}
 }

camel git commit: Fixed CS

[acosentino]

Repository: camel
Updated Branches:
  refs/heads/master d994bcd6a -> 01c94eb52


Fixed CS


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

Branch: refs/heads/master
Commit: 01c94eb52803b16f1d07f243a5c8afb785ddedaf
Parents: d994bcd
Author: Andrea Cosentino 
Authored: Tue Feb 7 10:32:57 2017 +0100
Committer: Andrea Cosentino 
Committed: Tue Feb 7 10:32:57 2017 +0100

--
 .../chronicle/engine/ChronicleEngineConfiguration.java  | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/01c94eb5/components/camel-chronicle/src/main/java/org/apache/camel/component/chronicle/engine/ChronicleEngineConfiguration.java
--
diff --git 
a/components/camel-chronicle/src/main/java/org/apache/camel/component/chronicle/engine/ChronicleEngineConfiguration.java
 
b/components/camel-chronicle/src/main/java/org/apache/camel/component/chronicle/engine/ChronicleEngineConfiguration.java
index ab56b95..25506fa 100644
--- 
a/components/camel-chronicle/src/main/java/org/apache/camel/component/chronicle/engine/ChronicleEngineConfiguration.java
+++ 
b/components/camel-chronicle/src/main/java/org/apache/camel/component/chronicle/engine/ChronicleEngineConfiguration.java
@@ -162,14 +162,14 @@ public class ChronicleEngineConfiguration {
 this.persistent = persistent;
 }
 
-   public String getClusterName() {
-   return clusterName;
-   }
+public String getClusterName() {
+return clusterName;
+}
 
 /**
  * Cluster name for queue
  */
-   public void setClusterName(String clusterName) {
-   this.clusterName = clusterName;
-   }
+public void setClusterName(String clusterName) {
+this.clusterName = clusterName;
+}
 }

[2/2] camel git commit: Fixed CS. This closes #1434

[davsclaus]

Fixed CS. This closes #1434


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

Branch: refs/heads/master
Commit: 95078e40597fd5012167ae34d9d0af030bcd22df
Parents: bfc113a
Author: Claus Ibsen 
Authored: Tue Jan 31 19:44:29 2017 +0100
Committer: Claus Ibsen 
Committed: Tue Jan 31 19:44:29 2017 +0100

--
 .../remoting/MultiArgumentsWithDefaultBindingService.java  | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/95078e40/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/MultiArgumentsWithDefaultBindingService.java
--
diff --git 
a/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/MultiArgumentsWithDefaultBindingService.java
 
b/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/MultiArgumentsWithDefaultBindingService.java
index 8847415..66a315f 100644
--- 
a/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/MultiArgumentsWithDefaultBindingService.java
+++ 
b/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/MultiArgumentsWithDefaultBindingService.java
@@ -17,10 +17,12 @@
 package org.apache.camel.spring.remoting;
 
 import java.util.Date;
-import org.apache.camel.Consume;
+
 import static junit.framework.TestCase.assertEquals;
-import static junit.framework.TestCase.assertTrue;
 import static junit.framework.TestCase.assertNotNull;
+import static junit.framework.TestCase.assertTrue;
+
+import org.apache.camel.Consume;
 
 public class MultiArgumentsWithDefaultBindingService implements 
MultiArgumentsWithDefaultBindingServiceInterface {
 

[2/2] camel git commit: Fixed CS. This closes #1430. This closes #1432.

[davsclaus]

Fixed CS. This closes #1430. This closes #1432.


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

Branch: refs/heads/master
Commit: 69d57640e42c2009ea6a531b046cd6a7f6b4ed94
Parents: 6b2f245
Author: Claus Ibsen 
Authored: Tue Jan 31 10:05:02 2017 +0100
Committer: Claus Ibsen 
Committed: Tue Jan 31 10:05:02 2017 +0100

--
 .../apache/camel/impl/cloud/ChainedServiceFilterTest.java |  2 +-
 .../org/apache/camel/impl/cloud/LoadBalancerTest.java | 10 --
 2 files changed, 9 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/69d57640/camel-core/src/test/java/org/apache/camel/impl/cloud/ChainedServiceFilterTest.java
--
diff --git 
a/camel-core/src/test/java/org/apache/camel/impl/cloud/ChainedServiceFilterTest.java
 
b/camel-core/src/test/java/org/apache/camel/impl/cloud/ChainedServiceFilterTest.java
index dc99d11..adfb325 100644
--- 
a/camel-core/src/test/java/org/apache/camel/impl/cloud/ChainedServiceFilterTest.java
+++ 
b/camel-core/src/test/java/org/apache/camel/impl/cloud/ChainedServiceFilterTest.java
@@ -58,7 +58,7 @@ public class ChainedServiceFilterTest extends 
ContextTestSupport {
 ));
 
 Assert.assertEquals(2, services.size());
-Assert.assertFalse(services.stream().anyMatch(s -> 
s.getHealth().isHealthy() == false));
+Assert.assertFalse(services.stream().anyMatch(s -> 
!s.getHealth().isHealthy()));
 Assert.assertFalse(services.stream().anyMatch(s -> s.getPort() > 
2000));
 Assert.assertTrue(services.stream().anyMatch(s -> s.getPort() == 
1000));
 Assert.assertTrue(services.stream().anyMatch(s -> s.getPort() == 
1002));

http://git-wip-us.apache.org/repos/asf/camel/blob/69d57640/camel-core/src/test/java/org/apache/camel/impl/cloud/LoadBalancerTest.java
--
diff --git 
a/camel-core/src/test/java/org/apache/camel/impl/cloud/LoadBalancerTest.java 
b/camel-core/src/test/java/org/apache/camel/impl/cloud/LoadBalancerTest.java
index 56cf63f..280d8af 100644
--- a/camel-core/src/test/java/org/apache/camel/impl/cloud/LoadBalancerTest.java
+++ b/camel-core/src/test/java/org/apache/camel/impl/cloud/LoadBalancerTest.java
@@ -36,7 +36,13 @@ public class LoadBalancerTest extends ContextTestSupport {
 loadBalancer.setServiceDiscovery(serviceDiscovery);
 loadBalancer.setServiceFilter(services -> services.stream().filter(s 
-> s.getPort() < 2000).collect(Collectors.toList()));
 loadBalancer.setServiceChooser(new RoundRobinServiceChooser());
-loadBalancer.process("no-name", service -> { assertEquals(1001, 
service.getPort()); return false; });
-loadBalancer.process("no-name", service -> { assertEquals(1002, 
service.getPort()); return false; });
+loadBalancer.process("no-name", service -> {
+assertEquals(1001, service.getPort());
+return false;
+});
+loadBalancer.process("no-name", service -> {
+assertEquals(1002, service.getPort());
+return false;
+});
 }
 }

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

[davsclaus]

Fixed CS. This closes #1429


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

Branch: refs/heads/master
Commit: 9c6263d8a25a1e1ae2a3aa68f53f356534f098e3
Parents: 280aacb
Author: Claus Ibsen 
Authored: Mon Jan 30 18:49:09 2017 +0100
Committer: Claus Ibsen 
Committed: Mon Jan 30 18:49:09 2017 +0100

--
 .../camel/spring/remoting/MyMultiArgumentServiceInterface.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/9c6263d8/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/MyMultiArgumentServiceInterface.java
--
diff --git 
a/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/MyMultiArgumentServiceInterface.java
 
b/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/MyMultiArgumentServiceInterface.java
index 175b969..49b1129 100644
--- 
a/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/MyMultiArgumentServiceInterface.java
+++ 
b/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/MyMultiArgumentServiceInterface.java
@@ -18,6 +18,6 @@ package org.apache.camel.spring.remoting;
 
 public interface MyMultiArgumentServiceInterface {
 
-public void doSomething(String arg1, String arg2, Long arg3);
+void doSomething(String arg1, String arg2, Long arg3);
 
 }

[5/6] camel git commit: Fixed CS. This closes #1429

[davsclaus]

Fixed CS. This closes #1429


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

Branch: refs/heads/camel-2.18.x
Commit: b00278f2f69ec339a2ceec72cdf5bf03d0d14ceb
Parents: 8f07298
Author: Claus Ibsen 
Authored: Mon Jan 30 18:49:09 2017 +0100
Committer: Claus Ibsen 
Committed: Mon Jan 30 18:50:47 2017 +0100

--
 .../camel/spring/remoting/MyMultiArgumentServiceInterface.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/b00278f2/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/MyMultiArgumentServiceInterface.java
--
diff --git 
a/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/MyMultiArgumentServiceInterface.java
 
b/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/MyMultiArgumentServiceInterface.java
index 175b969..49b1129 100644
--- 
a/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/MyMultiArgumentServiceInterface.java
+++ 
b/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/MyMultiArgumentServiceInterface.java
@@ -18,6 +18,6 @@ package org.apache.camel.spring.remoting;
 
 public interface MyMultiArgumentServiceInterface {
 
-public void doSomething(String arg1, String arg2, Long arg3);
+void doSomething(String arg1, String arg2, Long arg3);
 
 }

camel git commit: Fixed CS

[gzurowski]

Repository: camel
Updated Branches:
  refs/heads/camel-2.18.x d7e84ed09 -> 44631b0f7


Fixed CS


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

Branch: refs/heads/camel-2.18.x
Commit: 44631b0f71605413b6ab47fcebe647b6f14927c4
Parents: d7e84ed
Author: Andrea Cosentino 
Authored: Fri Dec 23 08:50:26 2016 +0100
Committer: Gregor Zurowski 
Committed: Sat Jan 21 17:36:25 2017 +0100

--
 .../java/org/apache/camel/component/mongodb/MongoDbEndpoint.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/44631b0f/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbEndpoint.java
--
diff --git 
a/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbEndpoint.java
 
b/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbEndpoint.java
index c2f94bd..4ce84c7 100644
--- 
a/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbEndpoint.java
+++ 
b/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbEndpoint.java
@@ -295,8 +295,8 @@ public class MongoDbEndpoint extends DefaultEndpoint {
 protected void doStop() throws Exception {
 super.doStop();
 if (mongoConnection != null) {
-   LOG.debug("Closing connection");
-   mongoConnection.close();
+LOG.debug("Closing connection");
+mongoConnection.close();
 }
 }
 

[2/3] camel git commit: Fixed CS

[acosentino]

Fixed CS


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

Branch: refs/heads/master
Commit: 2f29e506ab2bcff2ddab0f622f6db6bb595218e4
Parents: 5dd5916
Author: Andrea Cosentino 
Authored: Mon Jan 9 12:47:22 2017 +0100
Committer: Andrea Cosentino 
Committed: Mon Jan 9 12:47:22 2017 +0100

--
 ...ActiveMQPropagateSerializableHeadersTest.java | 19 ++-
 1 file changed, 10 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/2f29e506/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/ActiveMQPropagateSerializableHeadersTest.java
--
diff --git 
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/ActiveMQPropagateSerializableHeadersTest.java
 
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/ActiveMQPropagateSerializableHeadersTest.java
index 1136a4d..cdb4318 100644
--- 
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/ActiveMQPropagateSerializableHeadersTest.java
+++ 
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/ActiveMQPropagateSerializableHeadersTest.java
@@ -16,6 +16,13 @@
  */
 package org.apache.camel.component.jms.issues;
 
+import java.util.Calendar;
+import java.util.Date;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import javax.jms.ConnectionFactory;
+
 import org.apache.activemq.command.ActiveMQQueue;
 import org.apache.camel.CamelContext;
 import org.apache.camel.Exchange;
@@ -29,14 +36,8 @@ import org.apache.camel.test.junit4.CamelTestSupport;
 import org.junit.Before;
 import org.junit.Test;
 
-import javax.jms.ConnectionFactory;
-import java.util.*;
-
 import static 
org.apache.camel.component.jms.JmsComponent.jmsComponentAutoAcknowledge;
 
-/**
- * @version 
- */
 public class ActiveMQPropagateSerializableHeadersTest extends CamelTestSupport 
{
 
 protected Object expectedBody = "" + new Date() + "";
@@ -47,9 +48,9 @@ public class ActiveMQPropagateSerializableHeadersTest extends 
CamelTestSupport {
 private Map mapValue;
 
 @Before
-public void setup () {
+public void setup() {
 calValue = Calendar.getInstance();
-mapValue = new LinkedHashMap();
+mapValue = new LinkedHashMap();
 mapValue.put("myStringEntry", "stringValue");
 mapValue.put("myCalEntry", Calendar.getInstance());
 mapValue.put("myIntEntry", 123);
@@ -79,7 +80,7 @@ public class ActiveMQPropagateSerializableHeadersTest extends 
CamelTestSupport {
 assertEquals("myCal", calValue, headerValue);
 }
 {
-Map headerValue = 
exchange.getIn().getHeader("myMap", Map.class);
+Map headerValue = 
exchange.getIn().getHeader("myMap", Map.class);
 assertEquals("myMap", mapValue, headerValue);
 }
 }

[4/4] camel git commit: Fixed CS

[acosentino]

Fixed CS


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

Branch: refs/heads/master
Commit: 7a1bf6922fbf3293564950ebeaf1412cd909d844
Parents: 24a2d04
Author: Andrea Cosentino 
Authored: Sat Jan 7 10:54:35 2017 +0100
Committer: Andrea Cosentino 
Committed: Sat Jan 7 10:54:35 2017 +0100

--
 .../java/org/apache/camel/component/mongodb/MongoDbEndpoint.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/7a1bf692/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbEndpoint.java
--
diff --git 
a/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbEndpoint.java
 
b/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbEndpoint.java
index aa75b15..35e5eee 100644
--- 
a/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbEndpoint.java
+++ 
b/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbEndpoint.java
@@ -663,7 +663,7 @@ public class MongoDbEndpoint extends DefaultEndpoint {
 }
 
 public MongoDBTailTrackingEnum getTailTrackingStrategy() {
-if(tailTrackingStrategy == null) {
+if (tailTrackingStrategy == null) {
 tailTrackingStrategy = MongoDBTailTrackingEnum.LITERAL;
 }
 return tailTrackingStrategy;

[2/2] camel git commit: Fixed CS. This closes #1368

[davsclaus]

Fixed CS. This closes #1368


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

Branch: refs/heads/master
Commit: a9fe0d69ebdba02cc562462957386275fff51970
Parents: 52e7be8
Author: Claus Ibsen 
Authored: Fri Dec 30 09:44:50 2016 +0100
Committer: Claus Ibsen 
Committed: Fri Dec 30 09:44:50 2016 +0100

--
 .../camel/component/elasticsearch/ElasticsearchProducer.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/a9fe0d69/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchProducer.java
--
diff --git 
a/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchProducer.java
 
b/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchProducer.java
index 75164d2..55e9d3c 100644
--- 
a/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchProducer.java
+++ 
b/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchProducer.java
@@ -170,7 +170,7 @@ public class ElasticsearchProducer extends DefaultProducer {
 MultiSearchRequest multiSearchRequest = 
message.getBody(MultiSearchRequest.class);
 message.setBody(client.multiSearch(multiSearchRequest));
 } else if 
(ElasticsearchConstants.OPERATION_DELETE_INDEX.equals(operation)) {
-   DeleteIndexRequest deleteIndexRequest = 
message.getBody(DeleteIndexRequest.class);
+DeleteIndexRequest deleteIndexRequest = 
message.getBody(DeleteIndexRequest.class);
 
message.setBody(client.admin().indices().delete(deleteIndexRequest).actionGet());
 } else {
 throw new 
IllegalArgumentException(ElasticsearchConstants.PARAM_OPERATION + " value '" + 
operation + "' is not supported");

[2/3] camel git commit: Fixed CS

[acosentino]

Fixed CS


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

Branch: refs/heads/master
Commit: a56afad9cd070b05e0cb42da6ef5a37e13c9957f
Parents: 8eeac79
Author: Andrea Cosentino 
Authored: Fri Dec 23 08:50:26 2016 +0100
Committer: Andrea Cosentino 
Committed: Fri Dec 23 08:50:26 2016 +0100

--
 .../java/org/apache/camel/component/mongodb/MongoDbEndpoint.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/a56afad9/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbEndpoint.java
--
diff --git 
a/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbEndpoint.java
 
b/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbEndpoint.java
index c2f94bd..4ce84c7 100644
--- 
a/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbEndpoint.java
+++ 
b/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbEndpoint.java
@@ -295,8 +295,8 @@ public class MongoDbEndpoint extends DefaultEndpoint {
 protected void doStop() throws Exception {
 super.doStop();
 if (mongoConnection != null) {
-   LOG.debug("Closing connection");
-   mongoConnection.close();
+LOG.debug("Closing connection");
+mongoConnection.close();
 }
 }
 

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

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/master 0b2068209 -> 5875067f0


Fixed CS. This closes #1360


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

Branch: refs/heads/master
Commit: 5875067f0d961d7cf7c40069c0e065a6b8ef5cb6
Parents: 208e21c
Author: Claus Ibsen 
Authored: Wed Dec 21 17:20:57 2016 +0100
Committer: Claus Ibsen 
Committed: Wed Dec 21 18:00:48 2016 +0100

--
 .../java/org/apache/camel/component/cxf/jaxrs/CxfRsBinding.java| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/5875067f/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsBinding.java
--
diff --git 
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsBinding.java
 
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsBinding.java
index 17b68ca..90b6d73 100644
--- 
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsBinding.java
+++ 
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsBinding.java
@@ -115,5 +115,5 @@ public interface CxfRsBinding {
  * @throws Exception can be thrown if error in the binding process
  * @return the {@link Entity} to use
  */
-Entity bindCamelMessageToRequestEntity(Object body, 
org.apache.camel.Message camelMessage, org.apache.camel.Exchange camelExchange) 
throws Exception ;
+Entity bindCamelMessageToRequestEntity(Object body, 
org.apache.camel.Message camelMessage, org.apache.camel.Exchange camelExchange) 
throws Exception;
 }

[5/5] camel git commit: Fixed CS. This closes #1339

[davsclaus]

Fixed CS. This closes #1339


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

Branch: refs/heads/master
Commit: a5771f5a8e2755e237e74df1eb3aeb0466d84212
Parents: 2cc56e9
Author: Claus Ibsen 
Authored: Mon Dec 12 10:17:24 2016 +0100
Committer: Claus Ibsen 
Committed: Mon Dec 12 10:17:24 2016 +0100

--
 .../org/apache/camel/component/servlet/ServletComponent.java| 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/a5771f5a/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/ServletComponent.java
--
diff --git 
a/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/ServletComponent.java
 
b/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/ServletComponent.java
index a04cf5a..6163b56 100644
--- 
a/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/ServletComponent.java
+++ 
b/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/ServletComponent.java
@@ -135,11 +135,12 @@ public class ServletComponent extends HttpCommonComponent 
implements RestConsume
 // turn off stream caching if in attachment mode
 if (endpoint.isAttachmentMultipartBinding()) {
 if (disableStreamCache == null) {
-// disableStreamCache not explict configured so we can 
automatic change it
+// disableStreamCache not explicit configured so we can 
automatic change it
 LOG.info("Disabling stream caching as 
attachmentMultipartBinding is enabled");
 endpoint.setDisableStreamCache(true);
 } else if (!disableStreamCache) {
-throw new IllegalArgumentException("The options 
attachmentMultipartBinding=true and disableStreamCache=false cannot work 
together. Remove disableStreamCache to use AttachmentMultipartBinding");
+throw new IllegalArgumentException("The options 
attachmentMultipartBinding=true and disableStreamCache=false cannot work 
together."
++ " Remove disableStreamCache to use 
AttachmentMultipartBinding");
 }
 }
 

[2/2] camel git commit: Fixed CS

[acosentino]

Fixed CS


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

Branch: refs/heads/master
Commit: 2310011d14074ab4f2a9a165c9e5c6181ba531dd
Parents: dc2138a
Author: Andrea Cosentino 
Authored: Thu Dec 1 08:35:38 2016 +0100
Committer: Andrea Cosentino 
Committed: Thu Dec 1 08:35:38 2016 +0100

--
 .../component/google/pubsub/GooglePubsubConnectionFactory.java   | 2 +-
 .../camel/component/google/pubsub/GooglePubsubConsumer.java  | 2 +-
 .../camel/component/google/pubsub/GooglePubsubEndpoint.java  | 2 +-
 .../component/google/pubsub/consumer/ExchangeAckTransaction.java | 4 ++--
 .../component/google/pubsub/consumer/PubsubAcknowledgement.java  | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/2310011d/components/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/GooglePubsubConnectionFactory.java
--
diff --git 
a/components/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/GooglePubsubConnectionFactory.java
 
b/components/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/GooglePubsubConnectionFactory.java
index 59bdb8b..2762451 100644
--- 
a/components/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/GooglePubsubConnectionFactory.java
+++ 
b/components/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/GooglePubsubConnectionFactory.java
@@ -65,7 +65,7 @@ public class GooglePubsubConnectionFactory {
 
 public Pubsub getMultiThreadClient(int parallelThreads) throws Exception {
 
-PoolingHttpClientConnectionManager cm=new 
PoolingHttpClientConnectionManager();
+PoolingHttpClientConnectionManager cm = new 
PoolingHttpClientConnectionManager();
 cm.setDefaultMaxPerRoute(parallelThreads);
 cm.setMaxTotal(parallelThreads);
 CloseableHttpClient httpClient = HttpClients.createMinimal(cm);

http://git-wip-us.apache.org/repos/asf/camel/blob/2310011d/components/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/GooglePubsubConsumer.java
--
diff --git 
a/components/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/GooglePubsubConsumer.java
 
b/components/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/GooglePubsubConsumer.java
index dffc63c..f056bbd 100644
--- 
a/components/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/GooglePubsubConsumer.java
+++ 
b/components/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/GooglePubsubConsumer.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ *  http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

http://git-wip-us.apache.org/repos/asf/camel/blob/2310011d/components/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/GooglePubsubEndpoint.java
--
diff --git 
a/components/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/GooglePubsubEndpoint.java
 
b/components/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/GooglePubsubEndpoint.java
index 03c7b93..162cc1c 100644
--- 
a/components/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/GooglePubsubEndpoint.java
+++ 
b/components/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/GooglePubsubEndpoint.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ *  http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

http://git-wip-us.apache.org/repos/asf/camel/blob/2310011d/components/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/consumer/ExchangeAckTransaction.java
--
diff --git 

[19/20] camel git commit: Fixed CS. This closes #1298

[davsclaus]

Fixed CS. This closes #1298


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

Branch: refs/heads/camel-2.18.x
Commit: e044b10197aa6ebf578ad14c1117861cab05ecc7
Parents: 085b890
Author: Claus Ibsen 
Authored: Fri Nov 25 09:55:27 2016 +0100
Committer: Claus Ibsen 
Committed: Fri Nov 25 10:03:50 2016 +0100

--
 .../producer/DropboxProducerDelTest.java| 31 +--
 .../producer/DropboxProducerGetFolderTest.java  | 31 +--
 .../producer/DropboxProducerGetSingleTest.java  | 31 +--
 .../producer/DropboxProducerMoveTest.java   | 31 +--
 .../DropboxProducerPutSingleFileTest.java   | 31 +--
 ...ProducerPutSingleFileWithRemotePathTest.java | 31 +--
 .../DropboxProducerPutWithRemotePathTest.java   | 32 +---
 .../DropboxProducerSearchQueryTest.java | 31 +--
 .../producer/DropboxProducerSearchTest.java | 31 +--
 9 files changed, 135 insertions(+), 145 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/e044b101/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerDelTest.java
--
diff --git 
a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerDelTest.java
 
b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerDelTest.java
index c9cd093..437d76e 100755
--- 
a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerDelTest.java
+++ 
b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerDelTest.java
@@ -1,18 +1,18 @@
-/*
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package org.apache.camel.component.dropbox.integration.producer;
 
@@ -26,7 +26,6 @@ import 
org.apache.camel.component.dropbox.util.DropboxResultHeader;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.junit.Test;
 
-
 public class DropboxProducerDelTest extends DropboxTestSupport {
 
 public DropboxProducerDelTest() throws Exception { }

http://git-wip-us.apache.org/repos/asf/camel/blob/e044b101/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerGetFolderTest.java
--
diff --git 
a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerGetFolderTest.java
 
b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerGetFolderTest.java
index 415c964..c23c577 100755
--- 
a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerGetFolderTest.java
+++ 

[09/20] camel git commit: Fixed CS. This closes #1298

[davsclaus]

Fixed CS. This closes #1298


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

Branch: refs/heads/master
Commit: 2c7bdedae795c8eea104fe9ea189b6fa95ece12a
Parents: c13ef2f
Author: Claus Ibsen 
Authored: Fri Nov 25 09:55:27 2016 +0100
Committer: Claus Ibsen 
Committed: Fri Nov 25 09:55:27 2016 +0100

--
 .../producer/DropboxProducerDelTest.java| 31 +--
 .../producer/DropboxProducerGetFolderTest.java  | 31 +--
 .../producer/DropboxProducerGetSingleTest.java  | 31 +--
 .../producer/DropboxProducerMoveTest.java   | 31 +--
 .../DropboxProducerPutSingleFileTest.java   | 31 +--
 ...ProducerPutSingleFileWithRemotePathTest.java | 31 +--
 .../DropboxProducerPutWithRemotePathTest.java   | 32 +---
 .../DropboxProducerSearchQueryTest.java | 31 +--
 .../producer/DropboxProducerSearchTest.java | 31 +--
 9 files changed, 135 insertions(+), 145 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/2c7bdeda/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerDelTest.java
--
diff --git 
a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerDelTest.java
 
b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerDelTest.java
index c9cd093..437d76e 100755
--- 
a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerDelTest.java
+++ 
b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerDelTest.java
@@ -1,18 +1,18 @@
-/*
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package org.apache.camel.component.dropbox.integration.producer;
 
@@ -26,7 +26,6 @@ import 
org.apache.camel.component.dropbox.util.DropboxResultHeader;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.junit.Test;
 
-
 public class DropboxProducerDelTest extends DropboxTestSupport {
 
 public DropboxProducerDelTest() throws Exception { }

http://git-wip-us.apache.org/repos/asf/camel/blob/2c7bdeda/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerGetFolderTest.java
--
diff --git 
a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerGetFolderTest.java
 
b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerGetFolderTest.java
index 415c964..c23c577 100755
--- 
a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerGetFolderTest.java
+++ 

[4/4] camel git commit: Fixed CS

[acosentino]

Fixed CS


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

Branch: refs/heads/master
Commit: 22f30a300144f1234884081b31c4e602906db23f
Parents: f878eb2
Author: Andrea Cosentino 
Authored: Tue Nov 22 10:59:54 2016 +0100
Committer: Andrea Cosentino 
Committed: Tue Nov 22 10:59:54 2016 +0100

--
 .../apache/camel/component/git/consumer/GitConsumerTest.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/22f30a30/components/camel-git/src/test/java/org/apache/camel/component/git/consumer/GitConsumerTest.java
--
diff --git 
a/components/camel-git/src/test/java/org/apache/camel/component/git/consumer/GitConsumerTest.java
 
b/components/camel-git/src/test/java/org/apache/camel/component/git/consumer/GitConsumerTest.java
index ded0b07..49d063c 100644
--- 
a/components/camel-git/src/test/java/org/apache/camel/component/git/consumer/GitConsumerTest.java
+++ 
b/components/camel-git/src/test/java/org/apache/camel/component/git/consumer/GitConsumerTest.java
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

[1/4] camel git commit: Fixed CS

[ggrzybek]

Repository: camel
Updated Branches:
  refs/heads/camel-2.16.x e6bf8367b -> 9ef8327e7
  refs/heads/camel-2.17.x d35f61c20 -> b43043757
  refs/heads/camel-2.18.x a4280151d -> 2a78bb3a8
  refs/heads/master 35a8fb65c -> 3c4eb0def


Fixed CS


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

Branch: refs/heads/master
Commit: 3c4eb0defb8fb9987b977fc16b97ff5a764f85dc
Parents: 35a8fb6
Author: Grzegorz Grzybek 
Authored: Fri Nov 18 18:05:26 2016 +0100
Committer: Grzegorz Grzybek 
Committed: Fri Nov 18 18:05:26 2016 +0100

--
 .../org/apache/camel/test/blueprint/CamelBlueprintHelper.java | 2 +-
 .../test/java/org/apache/camel/test/blueprint/MainTest.java   | 7 +--
 2 files changed, 2 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/3c4eb0de/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java
--
diff --git 
a/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java
 
b/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java
index 90f23bb..59244ff 100644
--- 
a/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java
+++ 
b/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java
@@ -134,7 +134,7 @@ public final class CamelBlueprintHelper {
 }
 
 public static BundleContext createBundleContext(String name, String 
bundleFilter, TinyBundle bundle) throws Exception {
-return createBundleContext(name, bundleFilter, bundle, null,null);
+return createBundleContext(name, bundleFilter, bundle, null, null);
 }
 
 public static BundleContext createBundleContext(String name, String 
bundleFilter,

http://git-wip-us.apache.org/repos/asf/camel/blob/3c4eb0de/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/MainTest.java
--
diff --git 
a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/MainTest.java
 
b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/MainTest.java
index eb48a1c..a041e28 100644
--- 
a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/MainTest.java
+++ 
b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/MainTest.java
@@ -19,17 +19,12 @@ package org.apache.camel.test.blueprint;
 
 import java.io.File;
 import java.io.FileOutputStream;
-import java.io.StringWriter;
 import java.net.URL;
 import java.net.URLClassLoader;
-import java.util.Arrays;
 
 import org.apache.aries.util.io.IOUtils;
 import org.apache.camel.ProducerTemplate;
-import org.apache.camel.util.FileUtil;
-import org.apache.felix.connect.felix.framework.util.Util;
 import org.junit.Test;
-import org.ops4j.io.FileUtils;
 import org.ops4j.pax.swissbox.tinybundles.core.TinyBundle;
 import org.ops4j.pax.swissbox.tinybundles.core.TinyBundles;
 
@@ -78,7 +73,7 @@ public class MainTest {
 
 // simulate `camel:run` which is run after packaging the artifact, so 
a "bundle" (location with
 // META-INF/MANIFEST.MF) is detected in target/classes
-URLClassLoader loader = new URLClassLoader(new URL[] { 
tb.toURI().toURL() }, getClass().getClassLoader());
+URLClassLoader loader = new URLClassLoader(new URL[] 
{tb.toURI().toURL()}, getClass().getClassLoader());
 
 Main main = new Main();
 main.setLoader(loader);

[2/4] camel git commit: Fixed CS

[ggrzybek]

Fixed CS

(cherry picked from commit 3c4eb0defb8fb9987b977fc16b97ff5a764f85dc)


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

Branch: refs/heads/camel-2.18.x
Commit: 2a78bb3a87645767a89423eaa818de1043683e46
Parents: a428015
Author: Grzegorz Grzybek 
Authored: Fri Nov 18 18:05:26 2016 +0100
Committer: Grzegorz Grzybek 
Committed: Fri Nov 18 18:05:39 2016 +0100

--
 .../org/apache/camel/test/blueprint/CamelBlueprintHelper.java | 2 +-
 .../test/java/org/apache/camel/test/blueprint/MainTest.java   | 7 +--
 2 files changed, 2 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/2a78bb3a/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java
--
diff --git 
a/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java
 
b/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java
index 90f23bb..59244ff 100644
--- 
a/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java
+++ 
b/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java
@@ -134,7 +134,7 @@ public final class CamelBlueprintHelper {
 }
 
 public static BundleContext createBundleContext(String name, String 
bundleFilter, TinyBundle bundle) throws Exception {
-return createBundleContext(name, bundleFilter, bundle, null,null);
+return createBundleContext(name, bundleFilter, bundle, null, null);
 }
 
 public static BundleContext createBundleContext(String name, String 
bundleFilter,

http://git-wip-us.apache.org/repos/asf/camel/blob/2a78bb3a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/MainTest.java
--
diff --git 
a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/MainTest.java
 
b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/MainTest.java
index eb48a1c..a041e28 100644
--- 
a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/MainTest.java
+++ 
b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/MainTest.java
@@ -19,17 +19,12 @@ package org.apache.camel.test.blueprint;
 
 import java.io.File;
 import java.io.FileOutputStream;
-import java.io.StringWriter;
 import java.net.URL;
 import java.net.URLClassLoader;
-import java.util.Arrays;
 
 import org.apache.aries.util.io.IOUtils;
 import org.apache.camel.ProducerTemplate;
-import org.apache.camel.util.FileUtil;
-import org.apache.felix.connect.felix.framework.util.Util;
 import org.junit.Test;
-import org.ops4j.io.FileUtils;
 import org.ops4j.pax.swissbox.tinybundles.core.TinyBundle;
 import org.ops4j.pax.swissbox.tinybundles.core.TinyBundles;
 
@@ -78,7 +73,7 @@ public class MainTest {
 
 // simulate `camel:run` which is run after packaging the artifact, so 
a "bundle" (location with
 // META-INF/MANIFEST.MF) is detected in target/classes
-URLClassLoader loader = new URLClassLoader(new URL[] { 
tb.toURI().toURL() }, getClass().getClassLoader());
+URLClassLoader loader = new URLClassLoader(new URL[] 
{tb.toURI().toURL()}, getClass().getClassLoader());
 
 Main main = new Main();
 main.setLoader(loader);

[3/4] camel git commit: Fixed CS

[ggrzybek]

Fixed CS

(cherry picked from commit 3c4eb0defb8fb9987b977fc16b97ff5a764f85dc)


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

Branch: refs/heads/camel-2.17.x
Commit: b430437573051697ade77daa5b386840c49ff1c2
Parents: d35f61c
Author: Grzegorz Grzybek 
Authored: Fri Nov 18 18:05:26 2016 +0100
Committer: Grzegorz Grzybek 
Committed: Fri Nov 18 18:05:48 2016 +0100

--
 .../org/apache/camel/test/blueprint/CamelBlueprintHelper.java | 2 +-
 .../test/java/org/apache/camel/test/blueprint/MainTest.java   | 7 +--
 2 files changed, 2 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/b4304375/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java
--
diff --git 
a/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java
 
b/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java
index 90f23bb..59244ff 100644
--- 
a/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java
+++ 
b/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java
@@ -134,7 +134,7 @@ public final class CamelBlueprintHelper {
 }
 
 public static BundleContext createBundleContext(String name, String 
bundleFilter, TinyBundle bundle) throws Exception {
-return createBundleContext(name, bundleFilter, bundle, null,null);
+return createBundleContext(name, bundleFilter, bundle, null, null);
 }
 
 public static BundleContext createBundleContext(String name, String 
bundleFilter,

http://git-wip-us.apache.org/repos/asf/camel/blob/b4304375/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/MainTest.java
--
diff --git 
a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/MainTest.java
 
b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/MainTest.java
index eb48a1c..a041e28 100644
--- 
a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/MainTest.java
+++ 
b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/MainTest.java
@@ -19,17 +19,12 @@ package org.apache.camel.test.blueprint;
 
 import java.io.File;
 import java.io.FileOutputStream;
-import java.io.StringWriter;
 import java.net.URL;
 import java.net.URLClassLoader;
-import java.util.Arrays;
 
 import org.apache.aries.util.io.IOUtils;
 import org.apache.camel.ProducerTemplate;
-import org.apache.camel.util.FileUtil;
-import org.apache.felix.connect.felix.framework.util.Util;
 import org.junit.Test;
-import org.ops4j.io.FileUtils;
 import org.ops4j.pax.swissbox.tinybundles.core.TinyBundle;
 import org.ops4j.pax.swissbox.tinybundles.core.TinyBundles;
 
@@ -78,7 +73,7 @@ public class MainTest {
 
 // simulate `camel:run` which is run after packaging the artifact, so 
a "bundle" (location with
 // META-INF/MANIFEST.MF) is detected in target/classes
-URLClassLoader loader = new URLClassLoader(new URL[] { 
tb.toURI().toURL() }, getClass().getClassLoader());
+URLClassLoader loader = new URLClassLoader(new URL[] 
{tb.toURI().toURL()}, getClass().getClassLoader());
 
 Main main = new Main();
 main.setLoader(loader);

[4/4] camel git commit: Fixed CS

[ggrzybek]

Fixed CS

(cherry picked from commit 3c4eb0defb8fb9987b977fc16b97ff5a764f85dc)


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

Branch: refs/heads/camel-2.16.x
Commit: 9ef8327e7627c3c88035bfce0103ae64639ba59b
Parents: e6bf836
Author: Grzegorz Grzybek 
Authored: Fri Nov 18 18:05:26 2016 +0100
Committer: Grzegorz Grzybek 
Committed: Fri Nov 18 18:05:53 2016 +0100

--
 .../org/apache/camel/test/blueprint/CamelBlueprintHelper.java | 2 +-
 .../test/java/org/apache/camel/test/blueprint/MainTest.java   | 7 +--
 2 files changed, 2 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/9ef8327e/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java
--
diff --git 
a/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java
 
b/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java
index eed2951..bc9766a 100644
--- 
a/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java
+++ 
b/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java
@@ -139,7 +139,7 @@ public final class CamelBlueprintHelper {
 }
 
 public static BundleContext createBundleContext(String name, String 
bundleFilter, TinyBundle bundle) throws Exception {
-return createBundleContext(name, bundleFilter, bundle, null,null);
+return createBundleContext(name, bundleFilter, bundle, null, null);
 }
 
 public static BundleContext createBundleContext(String name, String 
bundleFilter,

http://git-wip-us.apache.org/repos/asf/camel/blob/9ef8327e/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/MainTest.java
--
diff --git 
a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/MainTest.java
 
b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/MainTest.java
index eb48a1c..a041e28 100644
--- 
a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/MainTest.java
+++ 
b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/MainTest.java
@@ -19,17 +19,12 @@ package org.apache.camel.test.blueprint;
 
 import java.io.File;
 import java.io.FileOutputStream;
-import java.io.StringWriter;
 import java.net.URL;
 import java.net.URLClassLoader;
-import java.util.Arrays;
 
 import org.apache.aries.util.io.IOUtils;
 import org.apache.camel.ProducerTemplate;
-import org.apache.camel.util.FileUtil;
-import org.apache.felix.connect.felix.framework.util.Util;
 import org.junit.Test;
-import org.ops4j.io.FileUtils;
 import org.ops4j.pax.swissbox.tinybundles.core.TinyBundle;
 import org.ops4j.pax.swissbox.tinybundles.core.TinyBundles;
 
@@ -78,7 +73,7 @@ public class MainTest {
 
 // simulate `camel:run` which is run after packaging the artifact, so 
a "bundle" (location with
 // META-INF/MANIFEST.MF) is detected in target/classes
-URLClassLoader loader = new URLClassLoader(new URL[] { 
tb.toURI().toURL() }, getClass().getClassLoader());
+URLClassLoader loader = new URLClassLoader(new URL[] 
{tb.toURI().toURL()}, getClass().getClassLoader());
 
 Main main = new Main();
 main.setLoader(loader);

[2/4] camel git commit: Fixed CS. This closes #1254

[davsclaus]

Fixed CS. This closes #1254


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

Branch: refs/heads/master
Commit: 1c20543baeb4c2a6f308d1536edc1c7617e4733c
Parents: f718159
Author: Claus Ibsen 
Authored: Mon Nov 7 20:24:34 2016 +0100
Committer: Claus Ibsen 
Committed: Mon Nov 7 20:24:34 2016 +0100

--
 .../java/org/apache/camel/component/cxf/DefaultCxfBindingTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/1c20543b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/DefaultCxfBindingTest.java
--
diff --git 
a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/DefaultCxfBindingTest.java
 
b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/DefaultCxfBindingTest.java
index 2ef1fd8..7e7b79f 100644
--- 
a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/DefaultCxfBindingTest.java
+++ 
b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/DefaultCxfBindingTest.java
@@ -200,7 +200,7 @@ public class DefaultCxfBindingTest extends Assert {
 cxfBinding.populateCxfRequestFromExchange(cxfExchange, exchange, 
requestContext);
 
 String actualSoapActionHeader = 
(String)requestContext.get(SoapBindingConstants.SOAP_ACTION);
-assertEquals(expectedSoapActionHeader,actualSoapActionHeader);
+assertEquals(expectedSoapActionHeader, actualSoapActionHeader);
 }
 
 @Test

[4/4] camel git commit: Fixed CS. This closes #1254

[davsclaus]

Fixed CS. This closes #1254


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

Branch: refs/heads/camel-2.18.x
Commit: 13af4f0c9ff3d07b9b47e3f9040d1adf57154e8f
Parents: bb1803c
Author: Claus Ibsen 
Authored: Mon Nov 7 20:24:34 2016 +0100
Committer: Claus Ibsen 
Committed: Mon Nov 7 20:25:05 2016 +0100

--
 .../java/org/apache/camel/component/cxf/DefaultCxfBindingTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/13af4f0c/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/DefaultCxfBindingTest.java
--
diff --git 
a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/DefaultCxfBindingTest.java
 
b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/DefaultCxfBindingTest.java
index 2ef1fd8..7e7b79f 100644
--- 
a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/DefaultCxfBindingTest.java
+++ 
b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/DefaultCxfBindingTest.java
@@ -200,7 +200,7 @@ public class DefaultCxfBindingTest extends Assert {
 cxfBinding.populateCxfRequestFromExchange(cxfExchange, exchange, 
requestContext);
 
 String actualSoapActionHeader = 
(String)requestContext.get(SoapBindingConstants.SOAP_ACTION);
-assertEquals(expectedSoapActionHeader,actualSoapActionHeader);
+assertEquals(expectedSoapActionHeader, actualSoapActionHeader);
 }
 
 @Test

[2/2] camel git commit: Fixed CS

[acosentino]

Fixed CS


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

Branch: refs/heads/master
Commit: bee13d29024b3d54397d1bd9ce29c181c8dc7b87
Parents: 2ebd233
Author: Andrea Cosentino 
Authored: Fri Nov 4 08:59:20 2016 +0100
Committer: Andrea Cosentino 
Committed: Fri Nov 4 08:59:20 2016 +0100

--
 .../org/apache/camel/component/scp/ScpConfiguration.java | 8 
 .../java/org/apache/camel/component/scp/ScpOperations.java   | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/bee13d29/components/camel-jsch/src/main/java/org/apache/camel/component/scp/ScpConfiguration.java
--
diff --git 
a/components/camel-jsch/src/main/java/org/apache/camel/component/scp/ScpConfiguration.java
 
b/components/camel-jsch/src/main/java/org/apache/camel/component/scp/ScpConfiguration.java
index 6d0502f..0914b20 100644
--- 
a/components/camel-jsch/src/main/java/org/apache/camel/component/scp/ScpConfiguration.java
+++ 
b/components/camel-jsch/src/main/java/org/apache/camel/component/scp/ScpConfiguration.java
@@ -154,15 +154,15 @@ public class ScpConfiguration extends 
RemoteFileConfiguration {
 
 /**
  * Set a comma separated list of authentications that will be used in 
order of preference.
-* Possible authentication methods are defined by JCraft JSCH. Some 
examples include: gssapi-with-mic,publickey,keyboard-interactive,password
+ * Possible authentication methods are defined by JCraft JSCH. Some 
examples include: gssapi-with-mic,publickey,keyboard-interactive,password
  * If not specified the JSCH and/or system defaults will be used.
  */
 public void setPreferredAuthentications(final String 
preferredAuthentications) {
-  this.preferredAuthentications = preferredAuthentications;
+this.preferredAuthentications = preferredAuthentications;
 }
 
 public String getPreferredAuthentications() {
-  return preferredAuthentications;
+return preferredAuthentications;
 }
-   
+
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/bee13d29/components/camel-jsch/src/main/java/org/apache/camel/component/scp/ScpOperations.java
--
diff --git 
a/components/camel-jsch/src/main/java/org/apache/camel/component/scp/ScpOperations.java
 
b/components/camel-jsch/src/main/java/org/apache/camel/component/scp/ScpOperations.java
index beec1a6..1403dae 100644
--- 
a/components/camel-jsch/src/main/java/org/apache/camel/component/scp/ScpOperations.java
+++ 
b/components/camel-jsch/src/main/java/org/apache/camel/component/scp/ScpOperations.java
@@ -249,7 +249,7 @@ public class ScpOperations implements 
RemoteFileOperations {
 LOG.trace("Using preferredAuthentications: {}", 
config.getPreferredAuthentications());
 session.setConfig("PreferredAuthentications", 
config.getPreferredAuthentications());
 }
-   
+
 int timeout = config.getConnectTimeout();
 LOG.debug("Connecting to {} with {} timeout...", 
config.remoteServerInformation(),
 timeout > 0 ? (Integer.toString(timeout) + " ms") : "no");

[4/4] camel git commit: Fixed CS. This closes #1240

[davsclaus]

Fixed CS. This closes #1240


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

Branch: refs/heads/camel-2.18.x
Commit: 6d68dac3dd2d6c99d511e1bf2ab93c280800dbd3
Parents: 96b0494
Author: Claus Ibsen 
Authored: Tue Nov 1 12:40:40 2016 +0100
Committer: Claus Ibsen 
Committed: Tue Nov 1 12:41:12 2016 +0100

--
 .../cxf/transport/CxfRsCamelTransportTest.java  | 20 +++-
 1 file changed, 11 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/6d68dac3/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/transport/CxfRsCamelTransportTest.java
--
diff --git 
a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/transport/CxfRsCamelTransportTest.java
 
b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/transport/CxfRsCamelTransportTest.java
index acf295b..070a490 100644
--- 
a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/transport/CxfRsCamelTransportTest.java
+++ 
b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/transport/CxfRsCamelTransportTest.java
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,18 +16,18 @@
  */
 package org.apache.camel.component.cxf.transport;
 
-import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.spring.CamelSpringTestSupport;
-import org.junit.Test;
-import org.springframework.context.support.AbstractApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-
 import javax.ws.rs.Consumes;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
 
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.spring.CamelSpringTestSupport;
+import org.junit.Test;
+import org.springframework.context.support.AbstractApplicationContext;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+
 public class CxfRsCamelTransportTest extends CamelSpringTestSupport {
 
 @Override
@@ -46,6 +46,7 @@ public class CxfRsCamelTransportTest extends 
CamelSpringTestSupport {
 
 @Path("/greeting")
 public interface GreetingResource {
+
 @GET
 @Path("/hello/{name}")
 @Consumes("text/plain")
@@ -55,6 +56,7 @@ public class CxfRsCamelTransportTest extends 
CamelSpringTestSupport {
 
 @Path("/greeting")
 public static class GreetingResourceBean implements GreetingResource {
+
 @GET
 @Path("/hello/{name}")
 @Consumes("text/plain")

[2/4] camel git commit: Fixed CS. This closes #1240

[davsclaus]

Fixed CS. This closes #1240


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

Branch: refs/heads/master
Commit: 23fb42a9e22a4e3dd4adc7dbafa2080f919a3acf
Parents: 0eb700a
Author: Claus Ibsen 
Authored: Tue Nov 1 12:40:40 2016 +0100
Committer: Claus Ibsen 
Committed: Tue Nov 1 12:40:40 2016 +0100

--
 .../cxf/transport/CxfRsCamelTransportTest.java  | 20 +++-
 1 file changed, 11 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/23fb42a9/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/transport/CxfRsCamelTransportTest.java
--
diff --git 
a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/transport/CxfRsCamelTransportTest.java
 
b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/transport/CxfRsCamelTransportTest.java
index acf295b..070a490 100644
--- 
a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/transport/CxfRsCamelTransportTest.java
+++ 
b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/transport/CxfRsCamelTransportTest.java
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,18 +16,18 @@
  */
 package org.apache.camel.component.cxf.transport;
 
-import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.spring.CamelSpringTestSupport;
-import org.junit.Test;
-import org.springframework.context.support.AbstractApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-
 import javax.ws.rs.Consumes;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
 
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.spring.CamelSpringTestSupport;
+import org.junit.Test;
+import org.springframework.context.support.AbstractApplicationContext;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+
 public class CxfRsCamelTransportTest extends CamelSpringTestSupport {
 
 @Override
@@ -46,6 +46,7 @@ public class CxfRsCamelTransportTest extends 
CamelSpringTestSupport {
 
 @Path("/greeting")
 public interface GreetingResource {
+
 @GET
 @Path("/hello/{name}")
 @Consumes("text/plain")
@@ -55,6 +56,7 @@ public class CxfRsCamelTransportTest extends 
CamelSpringTestSupport {
 
 @Path("/greeting")
 public static class GreetingResourceBean implements GreetingResource {
+
 @GET
 @Path("/hello/{name}")
 @Consumes("text/plain")

[2/2] camel git commit: Fixed CS

[acosentino]

Fixed CS


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

Branch: refs/heads/camel-2.18.x
Commit: 24e9a9d7d16c6dbe4dbf041fe8dbe6116b78ec3b
Parents: 1ce6f36
Author: Andrea Cosentino 
Authored: Wed Oct 26 16:27:02 2016 +0200
Committer: Andrea Cosentino 
Committed: Wed Oct 26 16:29:45 2016 +0200

--
 .../netty4/NettySSLConsumerClientModeTest.java  | 79 ++--
 1 file changed, 39 insertions(+), 40 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/24e9a9d7/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettySSLConsumerClientModeTest.java
--
diff --git 
a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettySSLConsumerClientModeTest.java
 
b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettySSLConsumerClientModeTest.java
index f36e920..44ada54 100644
--- 
a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettySSLConsumerClientModeTest.java
+++ 
b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettySSLConsumerClientModeTest.java
@@ -16,6 +16,21 @@
  */
 package org.apache.camel.component.netty4;
 
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.security.KeyManagementException;
+import java.security.KeyStore;
+import java.security.KeyStoreException;
+import java.security.NoSuchAlgorithmException;
+import java.security.UnrecoverableKeyException;
+import java.security.cert.CertificateException;
+
+import javax.net.ssl.KeyManagerFactory;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLEngine;
+import javax.net.ssl.TrustManagerFactory;
 
 import io.netty.bootstrap.ServerBootstrap;
 import io.netty.channel.Channel;
@@ -34,22 +49,6 @@ import io.netty.handler.codec.string.StringDecoder;
 import io.netty.handler.codec.string.StringEncoder;
 import io.netty.handler.ssl.SslHandler;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.security.KeyManagementException;
-import java.security.KeyStore;
-import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
-import java.security.UnrecoverableKeyException;
-import java.security.cert.CertificateException;
-
-import javax.net.ssl.KeyManagerFactory;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLEngine;
-import javax.net.ssl.TrustManagerFactory;
-
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
@@ -170,30 +169,30 @@ public class NettySSLConsumerClientModeTest extends 
BaseNettyTest {
 
 private SSLContext sslContext;
 
-public ServerInitializer() {
-   super();
-   try {
-   // create the SSLContext that will be used to 
create SSLEngine instances
-   char[] pass = "changeit".toCharArray();
-   
-   KeyManagerFactory kmf;
-   kmf = 
KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
-   TrustManagerFactory tmf = 
TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
-   
-   KeyStore ks = KeyStore.getInstance("JKS");
-   try (InputStream ksStream = new FileInputStream(new 
File("src/test/resources/keystore.jks"))) {
-   ks.load(ksStream, pass);
-   }
-   kmf.init(ks, pass);
-   tmf.init(ks);
-
-   sslContext = SSLContext.getInstance("TLS");
-   
-   sslContext.init(kmf.getKeyManagers(), 
tmf.getTrustManagers(), null);
-   } catch (NoSuchAlgorithmException | KeyStoreException | 
CertificateException | IOException | UnrecoverableKeyException | 
KeyManagementException e) {
-   e.printStackTrace();
-   }
-   }
+ServerInitializer() {
+super();
+try {
+// create the SSLContext that will be used to create SSLEngine 
instances
+char[] pass = "changeit".toCharArray();
+
+KeyManagerFactory kmf;
+kmf = 

[2/2] camel git commit: Fixed CS

[acosentino]

Fixed CS


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

Branch: refs/heads/camel-2.17.x
Commit: c6a90ce40f0276a38442687ba66cf3b0160d0370
Parents: 155c631
Author: Andrea Cosentino 
Authored: Wed Oct 26 16:27:02 2016 +0200
Committer: Andrea Cosentino 
Committed: Wed Oct 26 16:31:59 2016 +0200

--
 .../netty4/NettySSLConsumerClientModeTest.java  | 79 ++--
 1 file changed, 39 insertions(+), 40 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/c6a90ce4/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettySSLConsumerClientModeTest.java
--
diff --git 
a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettySSLConsumerClientModeTest.java
 
b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettySSLConsumerClientModeTest.java
index f36e920..44ada54 100644
--- 
a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettySSLConsumerClientModeTest.java
+++ 
b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettySSLConsumerClientModeTest.java
@@ -16,6 +16,21 @@
  */
 package org.apache.camel.component.netty4;
 
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.security.KeyManagementException;
+import java.security.KeyStore;
+import java.security.KeyStoreException;
+import java.security.NoSuchAlgorithmException;
+import java.security.UnrecoverableKeyException;
+import java.security.cert.CertificateException;
+
+import javax.net.ssl.KeyManagerFactory;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLEngine;
+import javax.net.ssl.TrustManagerFactory;
 
 import io.netty.bootstrap.ServerBootstrap;
 import io.netty.channel.Channel;
@@ -34,22 +49,6 @@ import io.netty.handler.codec.string.StringDecoder;
 import io.netty.handler.codec.string.StringEncoder;
 import io.netty.handler.ssl.SslHandler;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.security.KeyManagementException;
-import java.security.KeyStore;
-import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
-import java.security.UnrecoverableKeyException;
-import java.security.cert.CertificateException;
-
-import javax.net.ssl.KeyManagerFactory;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLEngine;
-import javax.net.ssl.TrustManagerFactory;
-
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
@@ -170,30 +169,30 @@ public class NettySSLConsumerClientModeTest extends 
BaseNettyTest {
 
 private SSLContext sslContext;
 
-public ServerInitializer() {
-   super();
-   try {
-   // create the SSLContext that will be used to 
create SSLEngine instances
-   char[] pass = "changeit".toCharArray();
-   
-   KeyManagerFactory kmf;
-   kmf = 
KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
-   TrustManagerFactory tmf = 
TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
-   
-   KeyStore ks = KeyStore.getInstance("JKS");
-   try (InputStream ksStream = new FileInputStream(new 
File("src/test/resources/keystore.jks"))) {
-   ks.load(ksStream, pass);
-   }
-   kmf.init(ks, pass);
-   tmf.init(ks);
-
-   sslContext = SSLContext.getInstance("TLS");
-   
-   sslContext.init(kmf.getKeyManagers(), 
tmf.getTrustManagers(), null);
-   } catch (NoSuchAlgorithmException | KeyStoreException | 
CertificateException | IOException | UnrecoverableKeyException | 
KeyManagementException e) {
-   e.printStackTrace();
-   }
-   }
+ServerInitializer() {
+super();
+try {
+// create the SSLContext that will be used to create SSLEngine 
instances
+char[] pass = "changeit".toCharArray();
+
+KeyManagerFactory kmf;
+kmf = 

[2/2] camel git commit: Fixed CS

[acosentino]

Fixed CS


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

Branch: refs/heads/master
Commit: 7c0eb6d5f94d33b4f2efe879e97d82f1c0898db6
Parents: d1f94b2
Author: Andrea Cosentino 
Authored: Wed Oct 26 16:27:02 2016 +0200
Committer: Andrea Cosentino 
Committed: Wed Oct 26 16:27:58 2016 +0200

--
 .../netty4/NettySSLConsumerClientModeTest.java  | 79 ++--
 1 file changed, 39 insertions(+), 40 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/7c0eb6d5/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettySSLConsumerClientModeTest.java
--
diff --git 
a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettySSLConsumerClientModeTest.java
 
b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettySSLConsumerClientModeTest.java
index f36e920..44ada54 100644
--- 
a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettySSLConsumerClientModeTest.java
+++ 
b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettySSLConsumerClientModeTest.java
@@ -16,6 +16,21 @@
  */
 package org.apache.camel.component.netty4;
 
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.security.KeyManagementException;
+import java.security.KeyStore;
+import java.security.KeyStoreException;
+import java.security.NoSuchAlgorithmException;
+import java.security.UnrecoverableKeyException;
+import java.security.cert.CertificateException;
+
+import javax.net.ssl.KeyManagerFactory;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLEngine;
+import javax.net.ssl.TrustManagerFactory;
 
 import io.netty.bootstrap.ServerBootstrap;
 import io.netty.channel.Channel;
@@ -34,22 +49,6 @@ import io.netty.handler.codec.string.StringDecoder;
 import io.netty.handler.codec.string.StringEncoder;
 import io.netty.handler.ssl.SslHandler;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.security.KeyManagementException;
-import java.security.KeyStore;
-import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
-import java.security.UnrecoverableKeyException;
-import java.security.cert.CertificateException;
-
-import javax.net.ssl.KeyManagerFactory;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLEngine;
-import javax.net.ssl.TrustManagerFactory;
-
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
@@ -170,30 +169,30 @@ public class NettySSLConsumerClientModeTest extends 
BaseNettyTest {
 
 private SSLContext sslContext;
 
-public ServerInitializer() {
-   super();
-   try {
-   // create the SSLContext that will be used to 
create SSLEngine instances
-   char[] pass = "changeit".toCharArray();
-   
-   KeyManagerFactory kmf;
-   kmf = 
KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
-   TrustManagerFactory tmf = 
TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
-   
-   KeyStore ks = KeyStore.getInstance("JKS");
-   try (InputStream ksStream = new FileInputStream(new 
File("src/test/resources/keystore.jks"))) {
-   ks.load(ksStream, pass);
-   }
-   kmf.init(ks, pass);
-   tmf.init(ks);
-
-   sslContext = SSLContext.getInstance("TLS");
-   
-   sslContext.init(kmf.getKeyManagers(), 
tmf.getTrustManagers(), null);
-   } catch (NoSuchAlgorithmException | KeyStoreException | 
CertificateException | IOException | UnrecoverableKeyException | 
KeyManagementException e) {
-   e.printStackTrace();
-   }
-   }
+ServerInitializer() {
+super();
+try {
+// create the SSLContext that will be used to create SSLEngine 
instances
+char[] pass = "changeit".toCharArray();
+
+KeyManagerFactory kmf;
+kmf = 

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

[davsclaus]

Fixed CS. This closes #1219


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

Branch: refs/heads/master
Commit: 3184b9c71c0f494869041d43cd3051c7a34dcb55
Parents: 6fdcfc0
Author: Claus Ibsen 
Authored: Sat Oct 22 09:47:03 2016 +0200
Committer: Claus Ibsen 
Committed: Sat Oct 22 09:47:03 2016 +0200

--
 .../main/java/org/apache/camel/swagger/RestSwaggerReader.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/3184b9c7/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerReader.java
--
diff --git 
a/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerReader.java
 
b/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerReader.java
index db16013..994452f 100644
--- 
a/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerReader.java
+++ 
b/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerReader.java
@@ -26,6 +26,7 @@ import java.util.Map;
 import java.util.Set;
 
 import io.swagger.jaxrs.config.BeanConfig;
+import io.swagger.models.ArrayModel;
 import io.swagger.models.Model;
 import io.swagger.models.ModelImpl;
 import io.swagger.models.Operation;
@@ -296,7 +297,7 @@ public class RestSwaggerReader {
 BodyParameter bp = (BodyParameter) parameter;
 
 if (verb.getType() != null) {
-if(verb.getType().endsWith("[]")){
+if (verb.getType().endsWith("[]")) {
 String typeName = verb.getType();
 typeName = typeName.substring(0, 
typeName.length() - 2);
 Property prop = modelTypeAsProperty(typeName, 
swagger);
@@ -305,8 +306,7 @@ public class RestSwaggerReader {
 arrayModel.setItems(prop);
 bp.setSchema(arrayModel);
 }
-}
-else {
+} else {
 String ref = modelTypeAsRef(verb.getType(), 
swagger);
 if (ref != null) {
 bp.setSchema(new RefModel(ref));

[8/8] camel git commit: Fixed CS. This closes #1219

[davsclaus]

Fixed CS. This closes #1219


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

Branch: refs/heads/camel-2.18.x
Commit: 3275217aa8e5e2404822fd6a443add36389eede7
Parents: 717f5be
Author: Claus Ibsen 
Authored: Sat Oct 22 09:47:03 2016 +0200
Committer: Claus Ibsen 
Committed: Sat Oct 22 11:45:05 2016 +0200

--
 .../main/java/org/apache/camel/swagger/RestSwaggerReader.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/3275217a/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerReader.java
--
diff --git 
a/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerReader.java
 
b/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerReader.java
index db16013..994452f 100644
--- 
a/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerReader.java
+++ 
b/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerReader.java
@@ -26,6 +26,7 @@ import java.util.Map;
 import java.util.Set;
 
 import io.swagger.jaxrs.config.BeanConfig;
+import io.swagger.models.ArrayModel;
 import io.swagger.models.Model;
 import io.swagger.models.ModelImpl;
 import io.swagger.models.Operation;
@@ -296,7 +297,7 @@ public class RestSwaggerReader {
 BodyParameter bp = (BodyParameter) parameter;
 
 if (verb.getType() != null) {
-if(verb.getType().endsWith("[]")){
+if (verb.getType().endsWith("[]")) {
 String typeName = verb.getType();
 typeName = typeName.substring(0, 
typeName.length() - 2);
 Property prop = modelTypeAsProperty(typeName, 
swagger);
@@ -305,8 +306,7 @@ public class RestSwaggerReader {
 arrayModel.setItems(prop);
 bp.setSchema(arrayModel);
 }
-}
-else {
+} else {
 String ref = modelTypeAsRef(verb.getType(), 
swagger);
 if (ref != null) {
 bp.setSchema(new RefModel(ref));

[1/2] camel git commit: Fixed CS

[acosentino]

Repository: camel
Updated Branches:
  refs/heads/master 36c9839e1 -> 0e62b9f97


Fixed CS


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

Branch: refs/heads/master
Commit: 0e62b9f9772784b58982c4cf0e7fd0e79a43d231
Parents: a600621
Author: Andrea Cosentino 
Authored: Thu Oct 20 14:23:00 2016 +0200
Committer: Andrea Cosentino 
Committed: Thu Oct 20 14:23:16 2016 +0200

--
 .../camel/component/nats/NatsConfiguration.java | 40 ++--
 .../camel/component/nats/NatsConsumer.java  | 10 ++---
 .../camel/component/nats/NatsProducer.java  | 10 ++---
 3 files changed, 30 insertions(+), 30 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/0e62b9f9/components/camel-nats/src/main/java/org/apache/camel/component/nats/NatsConfiguration.java
--
diff --git 
a/components/camel-nats/src/main/java/org/apache/camel/component/nats/NatsConfiguration.java
 
b/components/camel-nats/src/main/java/org/apache/camel/component/nats/NatsConfiguration.java
index 26e0921..0b1d487 100644
--- 
a/components/camel-nats/src/main/java/org/apache/camel/component/nats/NatsConfiguration.java
+++ 
b/components/camel-nats/src/main/java/org/apache/camel/component/nats/NatsConfiguration.java
@@ -222,37 +222,37 @@ public class NatsConfiguration {
 /**
  * set set secure option indicating TLS is required
  */
-   public boolean isSecure() {
-   return secure;
-   }
-
-   public void setSecure(boolean secure) {
-   this.secure = secure;
-   }
-   
+public boolean isSecure() {
+return secure;
+}
+
+public void setSecure(boolean secure) {
+this.secure = secure;
+}
+
 /**
  * TLS Debug, it will add additional console output
  */
 public boolean isTlsDebug() {
-   return tlsDebug;
-   }
+return tlsDebug;
+}
 
-   public void setTlsDebug(boolean tlsDebug) {
-   this.tlsDebug = tlsDebug;
-   }
+public void setTlsDebug(boolean tlsDebug) {
+this.tlsDebug = tlsDebug;
+}
 
 /**
  * To configure security using SSLContextParameters
  */
-   public SSLContextParameters getSslContextParameters() {
-   return sslContextParameters;
-   }
+public SSLContextParameters getSslContextParameters() {
+return sslContextParameters;
+}
 
-   public void setSslContextParameters(SSLContextParameters 
sslContextParameters) {
-   this.sslContextParameters = sslContextParameters;
-   }
+public void setSslContextParameters(SSLContextParameters 
sslContextParameters) {
+this.sslContextParameters = sslContextParameters;
+}
 
-   private static  void addPropertyIfNotNull(Properties props, String 
key, T value) {
+private static  void addPropertyIfNotNull(Properties props, String key, 
T value) {
 if (value != null) {
 props.put(key, value);
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/0e62b9f9/components/camel-nats/src/main/java/org/apache/camel/component/nats/NatsConsumer.java
--
diff --git 
a/components/camel-nats/src/main/java/org/apache/camel/component/nats/NatsConsumer.java
 
b/components/camel-nats/src/main/java/org/apache/camel/component/nats/NatsConsumer.java
index e1c46df..37e5171 100644
--- 
a/components/camel-nats/src/main/java/org/apache/camel/component/nats/NatsConsumer.java
+++ 
b/components/camel-nats/src/main/java/org/apache/camel/component/nats/NatsConsumer.java
@@ -102,11 +102,11 @@ public class NatsConsumer extends DefaultConsumer {
 Properties prop = 
getEndpoint().getNatsConfiguration().createProperties();
 ConnectionFactory factory = new ConnectionFactory(prop);
 if (getEndpoint().getNatsConfiguration().getSslContextParameters() != 
null && getEndpoint().getNatsConfiguration().isSecure()) {
-   SSLContext sslCtx = 
getEndpoint().getNatsConfiguration().getSslContextParameters().createSSLContext(getEndpoint().getCamelContext());
 
-   factory.setSSLContext(sslCtx);
-   if (getEndpoint().getNatsConfiguration().isTlsDebug()) {
-   
factory.setTlsDebug(getEndpoint().getNatsConfiguration().isTlsDebug());
-   }
+SSLContext sslCtx = 
getEndpoint().getNatsConfiguration().getSslContextParameters().createSSLContext(getEndpoint().getCamelContext());
 
+factory.setSSLContext(sslCtx);
+if 

[2/2] camel git commit: Fixed CS

[acosentino]

Fixed CS


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

Branch: refs/heads/camel-2.18.x
Commit: 752ac58a24a3a2d1dc8729e053646bd263e6677f
Parents: 84a2eef
Author: Andrea Cosentino 
Authored: Wed Oct 19 13:30:57 2016 +0200
Committer: Andrea Cosentino 
Committed: Wed Oct 19 13:41:40 2016 +0200

--
 .../camel/component/smpp/MessageReceiverListenerImplTest.java   | 4 ++--
 .../java/org/apache/camel/component/smpp/SmppEndpointTest.java  | 5 ++---
 .../component/smpp/SmppProducerLazySessionCreationTest.java | 4 ++--
 .../java/org/apache/camel/component/smpp/SmppProducerTest.java  | 4 ++--
 .../org/apache/camel/component/smpp/SmppQuerySmCommandTest.java | 4 ++--
 .../apache/camel/component/smpp/SmppReplaceSmCommandTest.java   | 4 ++--
 6 files changed, 12 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/752ac58a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/MessageReceiverListenerImplTest.java
--
diff --git 
a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/MessageReceiverListenerImplTest.java
 
b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/MessageReceiverListenerImplTest.java
index d571efa..5ebb3eb 100644
--- 
a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/MessageReceiverListenerImplTest.java
+++ 
b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/MessageReceiverListenerImplTest.java
@@ -31,8 +31,8 @@ import org.jsmpp.util.MessageId;
 import org.junit.Before;
 import org.junit.Test;
 
-import static org.easymock.EasyMock.expect;
 import static org.easymock.EasyMock.createMock;
+import static org.easymock.EasyMock.expect;
 import static org.easymock.EasyMock.replay;
 import static org.easymock.EasyMock.verify;
 import static org.junit.Assert.assertEquals;
@@ -121,4 +121,4 @@ public class MessageReceiverListenerImplTest {
 assertSame(optionalParameters, result.getOptionalParameters());
 }
 
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/camel/blob/752ac58a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppEndpointTest.java
--
diff --git 
a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppEndpointTest.java
 
b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppEndpointTest.java
index 679b0d4..9a50fe6 100644
--- 
a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppEndpointTest.java
+++ 
b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppEndpointTest.java
@@ -28,17 +28,16 @@ import org.jsmpp.bean.DeliverSm;
 import org.junit.Before;
 import org.junit.Test;
 
+import static org.easymock.EasyMock.createMock;
 import static org.easymock.EasyMock.eq;
 import static org.easymock.EasyMock.expect;
 import static org.easymock.EasyMock.isA;
-import static org.easymock.EasyMock.createMock;
 import static org.easymock.EasyMock.replay;
 import static org.easymock.EasyMock.verify;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 
-
 /**
  * JUnit test class for 
org.apache.camel.component.smpp.SmppEndpoint
  * 
@@ -263,4 +262,4 @@ public class SmppEndpointTest {
 public void getConfigurationShouldReturnTheSetValue() {
 assertSame(configuration, endpoint.getConfiguration());
 }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/camel/blob/752ac58a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppProducerLazySessionCreationTest.java
--
diff --git 
a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppProducerLazySessionCreationTest.java
 
b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppProducerLazySessionCreationTest.java
index 56d95a0..d943a00 100644
--- 
a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppProducerLazySessionCreationTest.java
+++ 
b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppProducerLazySessionCreationTest.java
@@ -27,9 +27,9 @@ import org.jsmpp.session.SessionStateListener;
 import org.junit.Before;
 import org.junit.Test;
 
+import static org.easymock.EasyMock.createMock;
 import static org.easymock.EasyMock.expect;
 import static org.easymock.EasyMock.isA;
-import static 

[2/2] camel git commit: Fixed CS

[acosentino]

Fixed CS


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

Branch: refs/heads/master
Commit: b0c2d2bd8cbf9e9c4e98f14fd04222b530e1a37d
Parents: fd55146
Author: Andrea Cosentino 
Authored: Wed Oct 19 13:30:57 2016 +0200
Committer: Andrea Cosentino 
Committed: Wed Oct 19 13:30:57 2016 +0200

--
 .../camel/component/smpp/MessageReceiverListenerImplTest.java   | 4 ++--
 .../java/org/apache/camel/component/smpp/SmppEndpointTest.java  | 5 ++---
 .../component/smpp/SmppProducerLazySessionCreationTest.java | 4 ++--
 .../java/org/apache/camel/component/smpp/SmppProducerTest.java  | 4 ++--
 .../org/apache/camel/component/smpp/SmppQuerySmCommandTest.java | 4 ++--
 .../apache/camel/component/smpp/SmppReplaceSmCommandTest.java   | 4 ++--
 6 files changed, 12 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/b0c2d2bd/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/MessageReceiverListenerImplTest.java
--
diff --git 
a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/MessageReceiverListenerImplTest.java
 
b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/MessageReceiverListenerImplTest.java
index d571efa..5ebb3eb 100644
--- 
a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/MessageReceiverListenerImplTest.java
+++ 
b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/MessageReceiverListenerImplTest.java
@@ -31,8 +31,8 @@ import org.jsmpp.util.MessageId;
 import org.junit.Before;
 import org.junit.Test;
 
-import static org.easymock.EasyMock.expect;
 import static org.easymock.EasyMock.createMock;
+import static org.easymock.EasyMock.expect;
 import static org.easymock.EasyMock.replay;
 import static org.easymock.EasyMock.verify;
 import static org.junit.Assert.assertEquals;
@@ -121,4 +121,4 @@ public class MessageReceiverListenerImplTest {
 assertSame(optionalParameters, result.getOptionalParameters());
 }
 
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/camel/blob/b0c2d2bd/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppEndpointTest.java
--
diff --git 
a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppEndpointTest.java
 
b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppEndpointTest.java
index 679b0d4..9a50fe6 100644
--- 
a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppEndpointTest.java
+++ 
b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppEndpointTest.java
@@ -28,17 +28,16 @@ import org.jsmpp.bean.DeliverSm;
 import org.junit.Before;
 import org.junit.Test;
 
+import static org.easymock.EasyMock.createMock;
 import static org.easymock.EasyMock.eq;
 import static org.easymock.EasyMock.expect;
 import static org.easymock.EasyMock.isA;
-import static org.easymock.EasyMock.createMock;
 import static org.easymock.EasyMock.replay;
 import static org.easymock.EasyMock.verify;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 
-
 /**
  * JUnit test class for 
org.apache.camel.component.smpp.SmppEndpoint
  * 
@@ -263,4 +262,4 @@ public class SmppEndpointTest {
 public void getConfigurationShouldReturnTheSetValue() {
 assertSame(configuration, endpoint.getConfiguration());
 }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/camel/blob/b0c2d2bd/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppProducerLazySessionCreationTest.java
--
diff --git 
a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppProducerLazySessionCreationTest.java
 
b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppProducerLazySessionCreationTest.java
index 56d95a0..d943a00 100644
--- 
a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppProducerLazySessionCreationTest.java
+++ 
b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppProducerLazySessionCreationTest.java
@@ -27,9 +27,9 @@ import org.jsmpp.session.SessionStateListener;
 import org.junit.Before;
 import org.junit.Test;
 
+import static org.easymock.EasyMock.createMock;
 import static org.easymock.EasyMock.expect;
 import static org.easymock.EasyMock.isA;
-import static 

[2/2] camel git commit: Fixed CS. This closes #1204

[davsclaus]

Fixed CS. This closes #1204


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

Branch: refs/heads/camel-2.18.x
Commit: 92630afb2a9fae68955b9546015277864a204fd7
Parents: 803f7e5
Author: Claus Ibsen 
Authored: Wed Oct 12 13:01:26 2016 +0200
Committer: Claus Ibsen 
Committed: Thu Oct 13 10:22:16 2016 +0200

--
 .../bean/BeanInfoWithBridgedMethodTest.java | 16 
 1 file changed, 16 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/92630afb/camel-core/src/test/java/org/apache/camel/component/bean/BeanInfoWithBridgedMethodTest.java
--
diff --git 
a/camel-core/src/test/java/org/apache/camel/component/bean/BeanInfoWithBridgedMethodTest.java
 
b/camel-core/src/test/java/org/apache/camel/component/bean/BeanInfoWithBridgedMethodTest.java
index 813c11e..61db8ec 100644
--- 
a/camel-core/src/test/java/org/apache/camel/component/bean/BeanInfoWithBridgedMethodTest.java
+++ 
b/camel-core/src/test/java/org/apache/camel/component/bean/BeanInfoWithBridgedMethodTest.java
@@ -1,3 +1,19 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.apache.camel.component.bean;
 
 import org.apache.camel.ContextTestSupport;

[3/3] camel git commit: Fixed CS

[acosentino]

Fixed CS


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

Branch: refs/heads/camel-2.16.x
Commit: b93b773c0a515dcde38f1ad6e42da2fc9e43da2b
Parents: 0fd28e1
Author: Andrea Cosentino 
Authored: Tue Oct 11 09:54:45 2016 +0200
Committer: Andrea Cosentino 
Committed: Wed Oct 12 13:05:33 2016 +0200

--
 .../hazelcast/HazelcastAggregationRepository.java| 11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/b93b773c/components/camel-hazelcast/src/main/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepository.java
--
diff --git 
a/components/camel-hazelcast/src/main/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepository.java
 
b/components/camel-hazelcast/src/main/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepository.java
index 04ff1dc..ea2325e 100644
--- 
a/components/camel-hazelcast/src/main/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepository.java
+++ 
b/components/camel-hazelcast/src/main/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepository.java
@@ -294,11 +294,12 @@ public class HazelcastAggregationRepository extends 
ServiceSupport
  * 
  * @param key Object - key in question
  */
-public boolean containsKey(Object key){
-  if(cache != null)
-return cache.containsKey(key);
-  else
-return false;
+public boolean containsKey(Object key) {
+if (cache != null) {
+return cache.containsKey(key);
+} else {
+return false;
+}
 }
 
 /**

[2/2] camel git commit: Fixed CS. This closes #1204

[davsclaus]

Fixed CS. This closes #1204


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

Branch: refs/heads/master
Commit: 4d917dfd521693db85c29ea6272092d8c9279f42
Parents: 8f0c154
Author: Claus Ibsen 
Authored: Wed Oct 12 13:01:26 2016 +0200
Committer: Claus Ibsen 
Committed: Wed Oct 12 13:01:26 2016 +0200

--
 .../bean/BeanInfoWithBridgedMethodTest.java | 16 
 1 file changed, 16 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/4d917dfd/camel-core/src/test/java/org/apache/camel/component/bean/BeanInfoWithBridgedMethodTest.java
--
diff --git 
a/camel-core/src/test/java/org/apache/camel/component/bean/BeanInfoWithBridgedMethodTest.java
 
b/camel-core/src/test/java/org/apache/camel/component/bean/BeanInfoWithBridgedMethodTest.java
index 813c11e..61db8ec 100644
--- 
a/camel-core/src/test/java/org/apache/camel/component/bean/BeanInfoWithBridgedMethodTest.java
+++ 
b/camel-core/src/test/java/org/apache/camel/component/bean/BeanInfoWithBridgedMethodTest.java
@@ -1,3 +1,19 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.apache.camel.component.bean;
 
 import org.apache.camel.ContextTestSupport;

[3/3] camel git commit: Fixed CS

[acosentino]

Fixed CS


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

Branch: refs/heads/camel-2.17.x
Commit: 9fc87f2c45bfc25c5357f5acc86a89b70159e1a0
Parents: 304178c
Author: Andrea Cosentino 
Authored: Tue Oct 11 09:54:45 2016 +0200
Committer: Andrea Cosentino 
Committed: Tue Oct 11 10:01:22 2016 +0200

--
 .../hazelcast/HazelcastAggregationRepository.java| 11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/9fc87f2c/components/camel-hazelcast/src/main/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepository.java
--
diff --git 
a/components/camel-hazelcast/src/main/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepository.java
 
b/components/camel-hazelcast/src/main/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepository.java
index 9dd0c17..309aee5 100644
--- 
a/components/camel-hazelcast/src/main/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepository.java
+++ 
b/components/camel-hazelcast/src/main/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepository.java
@@ -295,11 +295,12 @@ public class HazelcastAggregationRepository extends 
ServiceSupport
  * 
  * @param key Object - key in question
  */
-public boolean containsKey(Object key){
-  if(cache != null)
-return cache.containsKey(key);
-  else
-return false;
+public boolean containsKey(Object key) {
+if (cache != null) {
+return cache.containsKey(key);
+} else {
+return false;
+}
 }
 
 public boolean isAllowSerializedHeaders() {

[3/3] camel git commit: Fixed CS

[acosentino]

Fixed CS


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

Branch: refs/heads/camel-2.18.x
Commit: 9916ee431192e1215a87900b5c5c622822d2e98c
Parents: 201aeb2
Author: Andrea Cosentino 
Authored: Tue Oct 11 09:54:45 2016 +0200
Committer: Andrea Cosentino 
Committed: Tue Oct 11 09:59:25 2016 +0200

--
 .../hazelcast/HazelcastAggregationRepository.java| 11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/9916ee43/components/camel-hazelcast/src/main/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepository.java
--
diff --git 
a/components/camel-hazelcast/src/main/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepository.java
 
b/components/camel-hazelcast/src/main/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepository.java
index 9dd0c17..309aee5 100644
--- 
a/components/camel-hazelcast/src/main/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepository.java
+++ 
b/components/camel-hazelcast/src/main/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepository.java
@@ -295,11 +295,12 @@ public class HazelcastAggregationRepository extends 
ServiceSupport
  * 
  * @param key Object - key in question
  */
-public boolean containsKey(Object key){
-  if(cache != null)
-return cache.containsKey(key);
-  else
-return false;
+public boolean containsKey(Object key) {
+if (cache != null) {
+return cache.containsKey(key);
+} else {
+return false;
+}
 }
 
 public boolean isAllowSerializedHeaders() {

[3/3] camel git commit: Fixed CS

[acosentino]

Fixed CS


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

Branch: refs/heads/master
Commit: 607b4a8640584f445268bef9e909ba4403fb4a22
Parents: ed687f9
Author: Andrea Cosentino 
Authored: Tue Oct 11 09:54:45 2016 +0200
Committer: Andrea Cosentino 
Committed: Tue Oct 11 09:54:45 2016 +0200

--
 .../hazelcast/HazelcastAggregationRepository.java| 11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/607b4a86/components/camel-hazelcast/src/main/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepository.java
--
diff --git 
a/components/camel-hazelcast/src/main/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepository.java
 
b/components/camel-hazelcast/src/main/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepository.java
index 9dd0c17..309aee5 100644
--- 
a/components/camel-hazelcast/src/main/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepository.java
+++ 
b/components/camel-hazelcast/src/main/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepository.java
@@ -295,11 +295,12 @@ public class HazelcastAggregationRepository extends 
ServiceSupport
  * 
  * @param key Object - key in question
  */
-public boolean containsKey(Object key){
-  if(cache != null)
-return cache.containsKey(key);
-  else
-return false;
+public boolean containsKey(Object key) {
+if (cache != null) {
+return cache.containsKey(key);
+} else {
+return false;
+}
 }
 
 public boolean isAllowSerializedHeaders() {