[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();

[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");

[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();
 

[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;
+}
 }
 
 /**

[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() {

[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/7f7ce39d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7f7ce39d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7f7ce39d

Branch: refs/heads/master
Commit: 7f7ce39d2dd5b4242854d0a923a0aacc7d01a029
Parents: 9c278bb
Author: Andrea Cosentino 
Authored: Tue Sep 6 08:03:23 2016 +0200
Committer: Andrea Cosentino 
Committed: Tue Sep 6 08:03:23 2016 +0200

--
 .../java/org/apache/camel/component/rabbitmq/RabbitMQEndpoint.java | 2 +-
 .../apache/camel/component/rabbitmq/RabbitMQMessageConverter.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/7f7ce39d/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQEndpoint.java
--
diff --git 
a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQEndpoint.java
 
b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQEndpoint.java
index b503326..c5ef6c5 100644
--- 
a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQEndpoint.java
+++ 
b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQEndpoint.java
@@ -71,7 +71,7 @@ public class RabbitMQEndpoint extends DefaultEndpoint 
implements AsyncEndpoint {
 @UriParam(label = "common", defaultValue = "true")
 private boolean durable = true;
 @UriParam(label = "common", defaultValue = "false")
-private boolean exclusive = false;
+private boolean exclusive;
 @UriParam(label = "producer")
 private boolean bridgeEndpoint;
 @UriParam(label = "common")

http://git-wip-us.apache.org/repos/asf/camel/blob/7f7ce39d/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQMessageConverter.java
--
diff --git 
a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQMessageConverter.java
 
b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQMessageConverter.java
index b29b3cf..b0d72d9 100644
--- 
a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQMessageConverter.java
+++ 
b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQMessageConverter.java
@@ -180,7 +180,7 @@ public class RabbitMQMessageConverter {
 }
 
 private Date convertTimestamp(Object timestamp) {
-if(timestamp instanceof Date){
+if (timestamp instanceof Date) {
 return (Date)timestamp;
 }
 return new Date(Long.parseLong(timestamp.toString()));

[3/3] camel git commit: Fixed CS. This closes #1106. This closes #1110. This closes #1111.

[davsclaus]

Fixed CS. This closes #1106. This closes #1110. This closes #.


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

Branch: refs/heads/master
Commit: 37e971733359bfbf6390beaf2af3a75a44cfba23
Parents: e42ebef
Author: Claus Ibsen 
Authored: Sun Aug 7 16:08:42 2016 +0200
Committer: Claus Ibsen 
Committed: Sun Aug 7 16:08:42 2016 +0200

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


http://git-wip-us.apache.org/repos/asf/camel/blob/37e97173/camel-core/src/main/java/org/apache/camel/component/seda/SedaProducer.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/component/seda/SedaProducer.java 
b/camel-core/src/main/java/org/apache/camel/component/seda/SedaProducer.java
index 03ce9f3..3d9582e 100644
--- a/camel-core/src/main/java/org/apache/camel/component/seda/SedaProducer.java
+++ b/camel-core/src/main/java/org/apache/camel/component/seda/SedaProducer.java
@@ -186,7 +186,7 @@ public class SedaProducer extends DefaultAsyncProducer {
 // if handover we need to do special handover to avoid handing over
 // RestBindingMarshalOnCompletion as it should not be handed over with 
SEDA
 Exchange copy = ExchangeHelper.createCorrelatedCopy(exchange, 
handover, true,
-synchronization -> 
!synchronization.getClass().getName().contains("RestBindingMarshalOnCompletion"));
+synchronization -> 
!synchronization.getClass().getName().contains("RestBindingMarshalOnCompletion"));
 // set a new from endpoint to be the seda queue
 copy.setFromEndpoint(endpoint);
 return copy;

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

[davsclaus]

Fixed CS. This closes #1094. This closes #1088


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

Branch: refs/heads/master
Commit: 560844c2c5ac0f330838e4c5490d4c6139e20dc0
Parents: 8b796b5
Author: Claus Ibsen 
Authored: Sat Jul 30 08:58:51 2016 +0200
Committer: Claus Ibsen 
Committed: Sat Jul 30 08:58:51 2016 +0200

--
 .../src/main/docs/spring-batch.adoc | 10 ++-
 .../spring/batch/SpringBatchEndpoint.java   |  4 +-
 .../spring/batch/SpringBatchProducer.java   |  2 +-
 .../SpringBatchComponentAutoConfiguration.java  | 70 -
 .../SpringBatchComponentConfiguration.java  | 65 +---
 .../spring/batch/SpringBatchEndpointTest.java   | 10 ++-
 .../batch/SpringBatchJobRegistryTest.java   | 79 ++--
 7 files changed, 127 insertions(+), 113 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/560844c2/components/camel-spring-batch/src/main/docs/spring-batch.adoc
--
diff --git a/components/camel-spring-batch/src/main/docs/spring-batch.adoc 
b/components/camel-spring-batch/src/main/docs/spring-batch.adoc
index d970c0e..2064f4b 100644
--- a/components/camel-spring-batch/src/main/docs/spring-batch.adoc
+++ b/components/camel-spring-batch/src/main/docs/spring-batch.adoc
@@ -41,8 +41,9 @@ Options
 ^^^
 
 
+
 // component options: START
-The Spring Batch component supports 1 options which are listed below.
+The Spring Batch component supports 2 options which are listed below.
 
 
 
@@ -60,8 +61,10 @@ The Spring Batch component supports 1 options which are 
listed below.
 
 
 
+
+
 // endpoint options: START
-The Spring Batch component supports 5 endpoint options which are listed below:
+The Spring Batch component supports 6 endpoint options which are listed below:
 
 {% raw %}
 [width="100%",cols="2s,1,1m,1m,5",options="header"]
@@ -70,7 +73,7 @@ The Spring Batch component supports 5 endpoint options which 
are listed below:
 | jobName | producer |  | String | *Required* The name of the Spring Batch job 
located in the registry.
 | jobFromHeader | producer | false | boolean | Explicitly defines if the 
jobName should be taken from the headers instead of the URI.
 | jobLauncher | producer |  | JobLauncher | Explicitly specifies a JobLauncher 
to be used.
-| jobRegistry | producer |  | JobRegistry | Explicitly specifies a JobRegistry 
to be used. If set it it will be used to locate jobs.
+| jobRegistry | producer |  | JobRegistry | Explicitly specifies a JobRegistry 
to be used.
 | exchangePattern | advanced | InOnly | ExchangePattern | Sets the default 
exchange pattern when creating an exchange
 | synchronous | advanced | false | boolean | Sets whether synchronous 
processing should be strictly used or Camel is allowed to use asynchronous 
processing (if supported).
 |===
@@ -80,6 +83,7 @@ The Spring Batch component supports 5 endpoint options which 
are listed below:
 
 
 
+
 [[SpringBatch-Usage]]
 Usage
 ^

http://git-wip-us.apache.org/repos/asf/camel/blob/560844c2/components/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/SpringBatchEndpoint.java
--
diff --git 
a/components/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/SpringBatchEndpoint.java
 
b/components/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/SpringBatchEndpoint.java
index 4f4fcd1..1d14d8f 100644
--- 
a/components/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/SpringBatchEndpoint.java
+++ 
b/components/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/SpringBatchEndpoint.java
@@ -23,7 +23,6 @@ import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
 import org.apache.camel.impl.DefaultEndpoint;
-
 import org.apache.camel.spi.Metadata;
 import org.apache.camel.spi.UriEndpoint;
 import org.apache.camel.spi.UriParam;
@@ -73,7 +72,6 @@ public class SpringBatchEndpoint extends DefaultEndpoint {
 this.allResolvedJobLaunchers = allResolvedJobLaunchers;
 this.jobName = jobName;
 this.jobRegistry = jobRegistry;
-
 }
 
 @Override
@@ -97,7 +95,7 @@ public class SpringBatchEndpoint extends DefaultEndpoint {
 jobLauncher = resolveJobLauncher();
 } 
 if (job == null && jobName != null && !jobFromHeader) {
-if(jobRegistry != null) {
+if 

[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/a47cee59
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a47cee59
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a47cee59

Branch: refs/heads/master
Commit: a47cee597431b0ed700a4efd0666d61a8feae7cb
Parents: 7fc698c
Author: Andrea Cosentino 
Authored: Fri Jul 29 09:30:48 2016 +0200
Committer: Andrea Cosentino 
Committed: Fri Jul 29 09:30:48 2016 +0200

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


http://git-wip-us.apache.org/repos/asf/camel/blob/a47cee59/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyProducer.java
--
diff --git 
a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyProducer.java
 
b/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyProducer.java
index ca4ea84..5099de4 100644
--- 
a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyProducer.java
+++ 
b/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyProducer.java
@@ -137,10 +137,9 @@ public class NettyProducer extends DefaultAsyncProducer {
 }
 
 // setup channel group
-if(configuration.getChannelGroup() == null) {
+if (configuration.getChannelGroup() == null) {
 allChannels = new DefaultChannelGroup("NettyProducer", 
ImmediateEventExecutor.INSTANCE);
-}
-else {
+} else {
 allChannels = configuration.getChannelGroup();
 }
 

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

[davsclaus]

Fixed CS. This closes #1080


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

Branch: refs/heads/camel-2.17.x
Commit: 0d4511a3368c9108293db998c43a6c5c428f00e4
Parents: 2b9a214
Author: Claus Ibsen 
Authored: Mon Jul 25 17:15:42 2016 +0200
Committer: Claus Ibsen 
Committed: Tue Jul 26 13:03:42 2016 +0200

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


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

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

[davsclaus]

Fixed CS. This closes #1080


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

Branch: refs/heads/master
Commit: d50dcd4d7ed89503ed47516a675288a0d98eddfb
Parents: 34f9af9
Author: Claus Ibsen 
Authored: Mon Jul 25 17:15:42 2016 +0200
Committer: Claus Ibsen 
Committed: Mon Jul 25 17:15:42 2016 +0200

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


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

[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/574cb0c6
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/574cb0c6
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/574cb0c6

Branch: refs/heads/master
Commit: 574cb0c67d8d76f333acb3f892aebdd98e32cd49
Parents: 0c241dc
Author: Andrea Cosentino 
Authored: Tue Jul 12 11:08:27 2016 +0200
Committer: Andrea Cosentino 
Committed: Tue Jul 12 11:08:27 2016 +0200

--
 .../example/cdi/kubernetes/Application.java | 27 ++--
 1 file changed, 13 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/574cb0c6/examples/camel-example-cdi-kubernetes/src/main/java/org/apache/camel/example/cdi/kubernetes/Application.java
--
diff --git 
a/examples/camel-example-cdi-kubernetes/src/main/java/org/apache/camel/example/cdi/kubernetes/Application.java
 
b/examples/camel-example-cdi-kubernetes/src/main/java/org/apache/camel/example/cdi/kubernetes/Application.java
index 16cd57a..db25c64 100644
--- 
a/examples/camel-example-cdi-kubernetes/src/main/java/org/apache/camel/example/cdi/kubernetes/Application.java
+++ 
b/examples/camel-example-cdi-kubernetes/src/main/java/org/apache/camel/example/cdi/kubernetes/Application.java
@@ -24,6 +24,8 @@ import javax.enterprise.context.ApplicationScoped;
 import javax.enterprise.inject.Produces;
 import javax.inject.Named;
 
+import io.fabric8.kubernetes.api.model.Pod;
+
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
@@ -33,8 +35,6 @@ import 
org.apache.camel.component.properties.PropertiesComponent;
 import org.apache.camel.component.properties.PropertiesParser;
 import org.apache.deltaspike.core.api.config.ConfigResolver;
 
-import io.fabric8.kubernetes.api.model.Pod;
-
 class Application {
 
 @ContextName("camel-example-kubernetes-cdi")
@@ -46,19 +46,18 @@ class Application {
 from("timer:stream?repeatCount=3")
 
.to("kubernetes://{{kubernetes-master-url}}?oauthToken={{kubernetes-oauth-token}}=pods=listPods")
 .process(new Processor() {
-   
-   @Override
-   public void process(Exchange exchange) 
throws Exception {
-   List list = 
exchange.getIn().getBody(List.class);
-   System.out.println("We 
currently have " + list.size() + " pods");
-   Iterator it = 
list.iterator();
+
+@Override
+public void process(Exchange exchange) throws Exception {
+List list = exchange.getIn().getBody(List.class);
+System.out.println("We currently have " + list.size() 
+ " pods");
+Iterator it = list.iterator();
 while (it.hasNext()) {
-   Pod pod = it.next();
-   System.out.println("Pod 
name " + pod.getMetadata().getName() + " with status " + 
pod.getStatus().getPhase());
-   }
-   
-   }
-   });
+Pod pod = it.next();
+System.out.println("Pod name " + 
pod.getMetadata().getName() + " with status " + pod.getStatus().getPhase());
+}
+}
+});
 }
 }
 

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

[davsclaus]

Fixed CS. This closes #1021


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

Branch: refs/heads/master
Commit: 741118e3f2b6ac07e5585adc0daabb0cd3dce773
Parents: ad3bfc0
Author: Claus Ibsen 
Authored: Fri Jun 10 08:43:53 2016 +0200
Committer: Claus Ibsen 
Committed: Fri Jun 10 08:43:53 2016 +0200

--
 .../AggregateGroupedExchangeMultipleCorrelationTest.java   | 2 +-
 .../org/apache/camel/util/DumpModelAsXmlAggregateRouteTest.java| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/741118e3/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateGroupedExchangeMultipleCorrelationTest.java
--
diff --git 
a/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateGroupedExchangeMultipleCorrelationTest.java
 
b/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateGroupedExchangeMultipleCorrelationTest.java
index 86c35af..447d104 100644
--- 
a/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateGroupedExchangeMultipleCorrelationTest.java
+++ 
b/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateGroupedExchangeMultipleCorrelationTest.java
@@ -79,7 +79,7 @@ public class AggregateGroupedExchangeMultipleCorrelationTest 
extends ContextTest
 // our route is aggregating from the direct queue and sending 
the response to the mock
 from("direct:start")
 // aggregate all using the foo header and group the 
exchanges so we get one single exchange containing all the others
-.aggregate(header("foo"),new 
GroupedExchangeAggregationStrategy())
+.aggregate(header("foo"), new 
GroupedExchangeAggregationStrategy())
 // wait for 1 seconds to aggregate
 .completionTimeout(1000L)
 .to("mock:result");

http://git-wip-us.apache.org/repos/asf/camel/blob/741118e3/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlAggregateRouteTest.java
--
diff --git 
a/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlAggregateRouteTest.java
 
b/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlAggregateRouteTest.java
index 7148d6d..f172942 100644
--- 
a/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlAggregateRouteTest.java
+++ 
b/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlAggregateRouteTest.java
@@ -43,7 +43,7 @@ public class DumpModelAsXmlAggregateRouteTest extends 
ContextTestSupport {
 public void configure() throws Exception {
 from("direct:start").routeId("myRoute")
 .to("log:input")
-.aggregate(header("userId"),new 
GroupedExchangeAggregationStrategy()).completionSize(3)
+.aggregate(header("userId"), new 
GroupedExchangeAggregationStrategy()).completionSize(3)
 .to("mock:aggregate")
 .end()
 .to("mock:result");

[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/5cd4af71
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5cd4af71
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5cd4af71

Branch: refs/heads/master
Commit: 5cd4af715bb5172a09aebe9bae532b5ddebe9b98
Parents: 807ea04
Author: Claus Ibsen 
Authored: Wed Jun 8 14:22:55 2016 +0200
Committer: Claus Ibsen 
Committed: Wed Jun 8 14:28:41 2016 +0200

--
 .../apache/camel/component/dozer/DozerEndpoint.java|  5 +++--
 .../elasticsearch/ElasticsearchConfiguration.java  | 12 ++--
 .../netty4/http/NettyHttpOperationFailedException.java | 13 -
 .../camel/component/netty4/http/NettyHttpProducer.java |  4 ++--
 4 files changed, 19 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/5cd4af71/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/DozerEndpoint.java
--
diff --git 
a/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/DozerEndpoint.java
 
b/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/DozerEndpoint.java
index 190d1cc..92774b7 100644
--- 
a/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/DozerEndpoint.java
+++ 
b/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/DozerEndpoint.java
@@ -167,10 +167,11 @@ public class DozerEndpoint extends DefaultEndpoint {
 BeanContainer.getInstance().setElementReader(reader);
 } finally {
 Thread.currentThread().setContextClassLoader(tccl);
-if (elprop != null)
+if (elprop != null) {
 System.setProperty("javax.el.ExpressionFactory", elprop);
-else
+} else {
 System.clearProperty("javax.el.ExpressionFactory");
+}
 }
 }
 

http://git-wip-us.apache.org/repos/asf/camel/blob/5cd4af71/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchConfiguration.java
--
diff --git 
a/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchConfiguration.java
 
b/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchConfiguration.java
index 6aef4f8..c3bd9e5 100644
--- 
a/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchConfiguration.java
+++ 
b/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchConfiguration.java
@@ -184,11 +184,11 @@ public class ElasticsearchConfiguration {
 /**
  * The path.home property of ElasticSearch configuration. You need to 
provide a valid path, otherwise the default, /usr/share/elasticsearch, will be 
used.
  */
-   public String getPathHome() {
-   return pathHome;
-   }
+public String getPathHome() {
+return pathHome;
+}
 
-   public void setPathHome(String pathHome) {
-   this.pathHome = pathHome;
-   }
+public void setPathHome(String pathHome) {
+this.pathHome = pathHome;
+}
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/5cd4af71/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpOperationFailedException.java
--
diff --git 
a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpOperationFailedException.java
 
b/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpOperationFailedException.java
index d75ee31..5baceeb 100644
--- 
a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpOperationFailedException.java
+++ 
b/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpOperationFailedException.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.
@@ -33,7 +33,7 @@ public class NettyHttpOperationFailedException extends 
CamelException {
 private 

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

[davsclaus]

Fixed CS. This closes #973


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

Branch: refs/heads/master
Commit: 2e3a2041fb66992448f177a1ace6f942a4cbef19
Parents: 43f184e
Author: Claus Ibsen 
Authored: Wed May 4 16:35:57 2016 +0200
Committer: Claus Ibsen 
Committed: Wed May 4 16:35:57 2016 +0200

--
 .../camel/component/jms/JmsConfiguration.java   | 22 +++-
 .../jms/reply/ReplyManagerSupport.java  | 19 ++---
 2 files changed, 10 insertions(+), 31 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/2e3a2041/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
--
diff --git 
a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
 
b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
index 77e0ea7..a6a8311 100644
--- 
a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
+++ 
b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
@@ -173,9 +173,12 @@ public class JmsConfiguration implements Cloneable {
 @UriParam(defaultValue = "1", label = "advanced",
 description = "Specify the limit for the number of consumers that 
are allowed to be idle at any given time.")
 private int idleConsumerLimit = 1;
-@UriParam(defaultValue = "100", label = "advanced")
+@UriParam(defaultValue = "100", label = "advanced",
+description = "Interval in millis to sleep each time while waiting 
for provisional correlation id to be updated.")
 private long waitForProvisionCorrelationToBeUpdatedThreadSleepingTime = 
100L;
-@UriParam(defaultValue = "50", label = "advanced")
+@UriParam(defaultValue = "50", label = "advanced",
+description = "Number of times to wait for provisional correlation 
id to be updated to the actual correlation id when doing request/reply over JMS"
++ " and when the option useMessageIDAsCorrelationID is 
enabled.")
 private int waitForProvisionCorrelationToBeUpdatedCounter = 50;
 @UriParam(label = "consumer",
 description = "Specifies the maximum number of concurrent 
consumers when consuming from JMS (not for request/reply over JMS)."
@@ -1061,33 +1064,24 @@ public class JmsConfiguration implements Cloneable {
 this.idleConsumerLimit = idleConsumerLimit;
 }
 
-/**
- * Receives a counter that is used in conjunction with {@code 
waitForProvisionCorrelationToBeUpdatedThreadSleepingTime}
- * @return waitForProvisionCorrelationToBeUpdatedCounter
- */
 public int getWaitForProvisionCorrelationToBeUpdatedCounter() {
 return waitForProvisionCorrelationToBeUpdatedCounter;
 }
 
 /**
- * Sets a counter that is used in conjunction with {@code 
waitForProvisionCorrelationToBeUpdatedThreadSleepingTime}
- * @param counter
+ * Number of times to wait for provisional correlation id to be updated to 
the actual correlation id when doing request/reply over JMS
+ * and when the option useMessageIDAsCorrelationID is enabled.
  */
 public void setWaitForProvisionCorrelationToBeUpdatedCounter(int counter) {
 this.waitForProvisionCorrelationToBeUpdatedCounter = counter;
 }
 
-/**
- * Gets the sleeping time of the Thread when waiting for provision 
correlation to be updated.
- * @return
- */
 public long getWaitForProvisionCorrelationToBeUpdatedThreadSleepingTime() {
 return waitForProvisionCorrelationToBeUpdatedThreadSleepingTime;
 }
 
 /**
- * Sets the sleeping time of the Thread when waiting for provision 
correlation to be updated.
- * @param sleepingTime
+ * Interval in millis to sleep each time while waiting for provisional 
correlation id to be updated.
  */
 public void 
setWaitForProvisionCorrelationToBeUpdatedThreadSleepingTime(long sleepingTime) {
 this.waitForProvisionCorrelationToBeUpdatedThreadSleepingTime = 
sleepingTime;

http://git-wip-us.apache.org/repos/asf/camel/blob/2e3a2041/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/ReplyManagerSupport.java
--
diff --git 
a/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/ReplyManagerSupport.java
 
b/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/ReplyManagerSupport.java
index 8a14d76..9e242e2 100644
--- 

[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/192a3b2b
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/192a3b2b
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/192a3b2b

Branch: refs/heads/master
Commit: 192a3b2bc7f8e161c0853bb4f9c356a6f1bc3898
Parents: 77be4fa
Author: Claus Ibsen 
Authored: Fri Mar 4 15:40:43 2016 +0100
Committer: Claus Ibsen 
Committed: Fri Mar 4 15:40:43 2016 +0100

--
 .../camel/processor/resequencer/ResequencerBatchOrderTest.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/192a3b2b/camel-core/src/test/java/org/apache/camel/processor/resequencer/ResequencerBatchOrderTest.java
--
diff --git 
a/camel-core/src/test/java/org/apache/camel/processor/resequencer/ResequencerBatchOrderTest.java
 
b/camel-core/src/test/java/org/apache/camel/processor/resequencer/ResequencerBatchOrderTest.java
index 0bfc82d..e677b9c 100644
--- 
a/camel-core/src/test/java/org/apache/camel/processor/resequencer/ResequencerBatchOrderTest.java
+++ 
b/camel-core/src/test/java/org/apache/camel/processor/resequencer/ResequencerBatchOrderTest.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.

[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/eb16b5c1
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/eb16b5c1
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/eb16b5c1

Branch: refs/heads/master
Commit: eb16b5c145bbeed7e7f7cce64fd3901e2a4b71eb
Parents: 33b3bd5
Author: Andrea Cosentino 
Authored: Mon Feb 29 17:38:20 2016 +0100
Committer: Andrea Cosentino 
Committed: Mon Feb 29 17:38:20 2016 +0100

--
 .../org/apache/camel/component/twitter/util/TwitterConverter.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/eb16b5c1/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/util/TwitterConverter.java
--
diff --git 
a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/util/TwitterConverter.java
 
b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/util/TwitterConverter.java
index 2b55814..a650673 100644
--- 
a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/util/TwitterConverter.java
+++ 
b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/util/TwitterConverter.java
@@ -74,7 +74,7 @@ public final class TwitterConverter {
 
 @Converter
 public static String toString(UserList userList) throws ParseException {
- return new StringBuilder()
+return new StringBuilder()
  .append(userList.getCreatedAt()).append(" 
(").append(userList.getUser().getScreenName()).append(") ")
  .append(userList.getFullName())
  .append(',')

[3/3] camel git commit: Fixed CS. This closes #855. This closes #849. This closes #848. This closes #519.

[davsclaus]

Fixed CS. This closes #855. This closes #849. This closes #848. This closes 
#519.


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

Branch: refs/heads/camel-2.15.x
Commit: 459a8b67d5ff395f5062279a0eb66d9e18a45dae
Parents: 0766a06
Author: Claus Ibsen 
Authored: Wed Feb 24 08:17:25 2016 +0100
Committer: Claus Ibsen 
Committed: Wed Feb 24 08:24:52 2016 +0100

--
 .../camel/test/blueprint/CamelBlueprintTestSupport.java  | 2 +-
 .../ConfigAdminNoDefaultValuesBlueprintCreationTest.java | 8 
 2 files changed, 5 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/459a8b67/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 0ee9066..48bc05d 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
@@ -144,7 +144,7 @@ public abstract class CamelBlueprintTestSupport extends 
CamelTestSupport {
 // to the same state of BP container
 Set bpEvents = new HashSet();
 
-if(!expectReload){
+if (!expectReload) {
 CamelBlueprintHelper.waitForBlueprintContainer(bpEvents, answer, 
symbolicName, BlueprintEvent.CREATED, null);
 }
 

http://git-wip-us.apache.org/repos/asf/camel/blob/459a8b67/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/ConfigAdminNoDefaultValuesBlueprintCreationTest.java
--
diff --git 
a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/ConfigAdminNoDefaultValuesBlueprintCreationTest.java
 
b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/ConfigAdminNoDefaultValuesBlueprintCreationTest.java
index f19342b..8ace8c9 100644
--- 
a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/ConfigAdminNoDefaultValuesBlueprintCreationTest.java
+++ 
b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/ConfigAdminNoDefaultValuesBlueprintCreationTest.java
@@ -16,16 +16,17 @@
  */
 package org.apache.camel.test.blueprint;
 
-import org.junit.Test;
 import java.util.Dictionary;
 
+import org.junit.Test;
+
 /**
  *
  */
 public class ConfigAdminNoDefaultValuesBlueprintCreationTest extends 
CamelBlueprintTestSupport {
 
 @Override
-protected boolean expectBlueprintContainerReloadOnConfigAdminUpdate(){
+protected boolean expectBlueprintContainerReloadOnConfigAdminUpdate() {
 return true;
 }
 
@@ -35,8 +36,7 @@ public class ConfigAdminNoDefaultValuesBlueprintCreationTest 
extends CamelBluepr
 }
 
 @Override
-protected String useOverridePropertiesWithConfigAdmin(Dictionary props)
-throws Exception {
+protected String useOverridePropertiesWithConfigAdmin(Dictionary props) 
throws Exception {
 props.put("greeting", "Bye");
 props.put("destination", "mock:result");
 return "my-placeholders";

[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/00d37f6f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/00d37f6f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/00d37f6f

Branch: refs/heads/camel-2.15.x
Commit: 00d37f6ffd6774becfc3da1f8fd8436967a13c0b
Parents: 5d3f329
Author: Claus Ibsen 
Authored: Sat Jan 9 15:54:44 2016 +0100
Committer: Claus Ibsen 
Committed: Sat Jan 9 15:57:15 2016 +0100

--
 .../apache/camel/component/mail/MapMailMessagesBugRoute.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/00d37f6f/components/camel-mail/src/test/java/org/apache/camel/component/mail/MapMailMessagesBugRoute.java
--
diff --git 
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MapMailMessagesBugRoute.java
 
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MapMailMessagesBugRoute.java
index 1b22704..b7d9c75 100644
--- 
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MapMailMessagesBugRoute.java
+++ 
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MapMailMessagesBugRoute.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.

[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/6cefe5ee
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/6cefe5ee
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/6cefe5ee

Branch: refs/heads/master
Commit: 6cefe5eebfe4907116a84067e2c4b522e9d28ed4
Parents: f712e16
Author: Andrea Cosentino 
Authored: Thu Oct 29 17:12:49 2015 +0100
Committer: Andrea Cosentino 
Committed: Thu Oct 29 17:12:49 2015 +0100

--
 .../kubernetes/KubernetesConfiguration.java |  51 ++---
 .../kubernetes/KubernetesConstants.java |   4 +-
 .../kubernetes/KubernetesEndpoint.java  |  64 +++---
 .../consumer/KubernetesPodsConsumer.java| 178 
 ...ubernetesReplicationControllersConsumer.java | 177 
 .../consumer/KubernetesSecretsConsumer.java | 169 ---
 .../consumer/KubernetesServicesConsumer.java| 175 
 .../kubernetes/consumer/common/PodEvent.java|  52 +++--
 .../common/ReplicationControllerEvent.java  |  52 +++--
 .../kubernetes/consumer/common/SecretEvent.java |  52 +++--
 .../consumer/common/ServiceEvent.java   |  52 +++--
 .../KubernetesBuildConfigsProducer.java |  51 ++---
 .../producer/KubernetesBuildsProducer.java  |  55 ++---
 .../producer/KubernetesNodesProducer.java   |  49 ++---
 .../kubernetes/KubernetesTestSupport.java   |   2 +-
 .../consumer/KubernetesPodsConsumerTest.java|  79 +++
 ...netesReplicationControllersConsumerTest.java | 210 ---
 .../consumer/KubernetesSecretsConsumerTest.java | 127 +--
 .../KubernetesServicesConsumerTest.java | 189 -
 19 files changed, 842 insertions(+), 946 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/6cefe5ee/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/KubernetesConfiguration.java
--
diff --git 
a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/KubernetesConfiguration.java
 
b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/KubernetesConfiguration.java
index 9c5696f..0d3cda4 100644
--- 
a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/KubernetesConfiguration.java
+++ 
b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/KubernetesConfiguration.java
@@ -45,9 +45,9 @@ public class KubernetesConfiguration {
 
 @UriParam(label = "producer", enums = 
"listNamespaces,listNamespacesByLabels,getNamespace,createNamespace,deleteNamespace,listServices,listServicesByLabels,getService,createService,"
 + 
"deleteService,listReplicationControllers,listReplicationControllersByLabels,getReplicationController,createReplicationController,deleteReplicationController,listPods,"
-   + 
"listPodsByLabels,getPod,createPod,deletePod,listPersistentVolumes,listPersistentVolumesByLabels,getPersistentVolume,listPersistentVolumesClaims,listPersistentVolumesClaimsByLabels,"
-+ 
"getPersistentVolumeClaim,createPersistentVolumeClaim,deletePersistentVolumeClaim,listSecrets,listSecretsByLabels,getSecret,createSecret,deleteSecret,listResourcesQuota,"
 
-   + 
"listResourcesQuotaByLabels,getResourceQuota,createResourceQuota,deleteResourceQuota,listServiceAccounts,listServiceAccountsByLabels,getServiceAccount,createServiceAccount,"
++ 
"listPodsByLabels,getPod,createPod,deletePod,listPersistentVolumes,listPersistentVolumesByLabels,getPersistentVolume,listPersistentVolumesClaims,listPersistentVolumesClaimsByLabels,"
++ 
"getPersistentVolumeClaim,createPersistentVolumeClaim,deletePersistentVolumeClaim,listSecrets,listSecretsByLabels,getSecret,createSecret,deleteSecret,listResourcesQuota,"
++ 
"listResourcesQuotaByLabels,getResourceQuota,createResourceQuota,deleteResourceQuota,listServiceAccounts,listServiceAccountsByLabels,getServiceAccount,createServiceAccount,"
 + 
"deleteServiceAccount,listNodes,listNodesByLabels,getNode,listBuilds,listBuildsByLabels,getBuild,listBuildConfigs,listBuildConfigsByLabels,getBuildConfig")
 private String operation;
 
@@ -83,7 +83,7 @@ public class KubernetesConfiguration {
 
 @UriParam
 private Boolean trustCerts;
-
+
 @UriParam(label = "consumer")
 private String namespaceName;
 
@@ -253,7 +253,7 @@ public class KubernetesConfiguration {
 }
 
 /**
- * The Auth Token 
+ * The Auth Token
  */
 public String getOauthToken() {
 return oauthToken;
@@ -277,27 +277,22 @@ public class KubernetesConfiguration {
 /**
  * The namespace name
  */
-   

[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/cf5a
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/cf5a
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/cf5a

Branch: refs/heads/master
Commit: cf5a4180e2749dcf9f8e2a8ff438d62d90dc
Parents: 36b7d01
Author: Andrea Cosentino 
Authored: Tue Sep 15 21:13:58 2015 +0200
Committer: Andrea Cosentino 
Committed: Tue Sep 15 21:13:58 2015 +0200

--
 .../facebook/FacebookComponentConsumerTest.java  | 11 +--
 .../facebook/FacebookComponentProducerTest.java  |  2 +-
 2 files changed, 10 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/cf5a/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/FacebookComponentConsumerTest.java
--
diff --git 
a/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/FacebookComponentConsumerTest.java
 
b/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/FacebookComponentConsumerTest.java
index 1e78bc2..fc3dbdc 100644
--- 
a/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/FacebookComponentConsumerTest.java
+++ 
b/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/FacebookComponentConsumerTest.java
@@ -18,12 +18,19 @@ package org.apache.camel.component.facebook;
 
 import java.lang.reflect.Method;
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
 import facebook4j.FacebookException;
 import facebook4j.api.SearchMethods;
-import org.apache.camel.*;
+
+import org.apache.camel.Consumer;
+import org.apache.camel.Endpoint;
+import org.apache.camel.Route;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.impl.DefaultPollingConsumerPollStrategy;

http://git-wip-us.apache.org/repos/asf/camel/blob/cf5a/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/FacebookComponentProducerTest.java
--
diff --git 
a/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/FacebookComponentProducerTest.java
 
b/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/FacebookComponentProducerTest.java
index 753f699..6d5c0e5 100644
--- 
a/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/FacebookComponentProducerTest.java
+++ 
b/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/FacebookComponentProducerTest.java
@@ -67,7 +67,7 @@ public class FacebookComponentProducerTest extends 
CamelFacebookTestSupport {
 readingExcludes.addAll(Arrays.asList("pictureURL", "permissions", 
"taggableFriends", "sSLPictureURL"));
 
 for (FacebookMethodsType types : FacebookMethodsType.values()) {
-if(types.getArgNames().contains("pageId")) {
+if (types.getArgNames().contains("pageId")) {
 idExcludes.add(getShortName(types.getName()));
 readingExcludes.add(getShortName(types.getName()));
 }

[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/cc158b2a
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/cc158b2a
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/cc158b2a

Branch: refs/heads/master
Commit: cc158b2acd4a8490408549c3add1f42881489312
Parents: 8c20822
Author: Claus Ibsen davscl...@apache.org
Authored: Thu Aug 6 10:20:41 2015 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Thu Aug 6 10:21:11 2015 +0200

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


http://git-wip-us.apache.org/repos/asf/camel/blob/cc158b2a/camel-core/src/main/java/org/apache/camel/impl/osgi/Activator.java
--
diff --git a/camel-core/src/main/java/org/apache/camel/impl/osgi/Activator.java 
b/camel-core/src/main/java/org/apache/camel/impl/osgi/Activator.java
index 6457747..f0e584c 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/osgi/Activator.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/osgi/Activator.java
@@ -90,7 +90,7 @@ public class Activator implements BundleActivator, 
BundleTrackerCustomizer {
 private long bundleId;
 
 // Map from package name to the capability we export for this package
-private final MapString, BundleCapability packageCapabilities = new 
HashMap();
+private final MapString, BundleCapability packageCapabilities = new 
HashMapString, BundleCapability();
 
 public void start(BundleContext context) throws Exception {
 LOG.info(Camel activator starting);

[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/ba5c56f5
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ba5c56f5
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ba5c56f5

Branch: refs/heads/master
Commit: ba5c56f551fba1b0fb647b08973d6b03dece7225
Parents: 6473653
Author: Claus Ibsen davscl...@apache.org
Authored: Fri Jul 17 09:44:07 2015 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Fri Jul 17 09:44:07 2015 +0200

--
 .../component/netty/http/NettyHttpSSLHandshakeErrorTest.java   | 6 --
 .../component/netty4/http/NettyHttpSSLHandshakeErrorTest.java  | 6 --
 2 files changed, 8 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/ba5c56f5/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpSSLHandshakeErrorTest.java
--
diff --git 
a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpSSLHandshakeErrorTest.java
 
b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpSSLHandshakeErrorTest.java
index b6b45b5..73958fa 100644
--- 
a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpSSLHandshakeErrorTest.java
+++ 
b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpSSLHandshakeErrorTest.java
@@ -39,7 +39,8 @@ public class NettyHttpSSLHandshakeErrorTest extends 
BaseNettyTest {
 
 context.addRoutes(new RouteBuilder() {
 public void configure() {
-
from(netty-http:https://localhost:{{port}}?ssl=trueneedClientAuth=truekeyStoreFormat=JKSpassphrase=storepasswordkeyStoreResource=jsse/server-keystore.jkstrustStoreResource=jsse/server-truststore.jks;)
+
from(netty-http:https://localhost:{{port}}?ssl=trueneedClientAuth=truekeyStoreFormat=JKS;
++ 
passphrase=storepasswordkeyStoreResource=jsse/server-keystore.jkstrustStoreResource=jsse/server-truststore.jks)
 .to(mock:target);
 }
 });
@@ -47,7 +48,8 @@ public class NettyHttpSSLHandshakeErrorTest extends 
BaseNettyTest {
 
 DefaultExchange exchange = new DefaultExchange(context);
 
-Exchange response = 
template.send(netty-http:https://localhost:{{port}}?requestTimeout=1throwExceptionOnFailure=falsessl=truekeyStoreFormat=JKSpassphrase=storepasswordkeyStoreResource=jsse/client-keystore.jkstrustStoreResource=jsse/server-truststore.jks;,
 exchange);
+Exchange response = 
template.send(netty-http:https://localhost:{{port}}?requestTimeout=1throwExceptionOnFailure=false;
++ 
ssl=truekeyStoreFormat=JKSpassphrase=storepasswordkeyStoreResource=jsse/client-keystore.jkstrustStoreResource=jsse/server-truststore.jks,
 exchange);
 
 Exception ex = response.getException();
 

http://git-wip-us.apache.org/repos/asf/camel/blob/ba5c56f5/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpSSLHandshakeErrorTest.java
--
diff --git 
a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpSSLHandshakeErrorTest.java
 
b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpSSLHandshakeErrorTest.java
index f917d48..d0b3bf7 100644
--- 
a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpSSLHandshakeErrorTest.java
+++ 
b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpSSLHandshakeErrorTest.java
@@ -39,7 +39,8 @@ public class NettyHttpSSLHandshakeErrorTest extends 
BaseNettyTest {
 
 context.addRoutes(new RouteBuilder() {
 public void configure() {
-
from(netty4-http:https://localhost:{{port}}?ssl=trueneedClientAuth=truekeyStoreFormat=JKSpassphrase=storepasswordkeyStoreResource=jsse/server-keystore.jkstrustStoreResource=jsse/server-truststore.jks;)
+
from(netty4-http:https://localhost:{{port}}?ssl=trueneedClientAuth=truekeyStoreFormat=JKS;
++ 
passphrase=storepasswordkeyStoreResource=jsse/server-keystore.jkstrustStoreResource=jsse/server-truststore.jks)
 .to(mock:target);
 }
 });
@@ -47,7 +48,8 @@ public class NettyHttpSSLHandshakeErrorTest extends 
BaseNettyTest {
 
 DefaultExchange exchange = new DefaultExchange(context);
 
-Exchange response = 

[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/359bf0e4
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/359bf0e4
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/359bf0e4

Branch: refs/heads/master
Commit: 359bf0e45a7eef2efdc2d8ad6f275233bef23777
Parents: 2acb2a0
Author: Andrea Cosentino anco...@gmail.com
Authored: Sun Jun 14 13:42:36 2015 +0200
Committer: Andrea Cosentino anco...@gmail.com
Committed: Sun Jun 14 13:42:36 2015 +0200

--
 .../camel/component/hazelcast/queue/HazelcastQueueProducer.java| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/359bf0e4/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/queue/HazelcastQueueProducer.java
--
diff --git 
a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/queue/HazelcastQueueProducer.java
 
b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/queue/HazelcastQueueProducer.java
index 4575439..c814e3c 100644
--- 
a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/queue/HazelcastQueueProducer.java
+++ 
b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/queue/HazelcastQueueProducer.java
@@ -115,6 +115,6 @@ public class HazelcastQueueProducer extends 
HazelcastDefaultProducer {
 }
 
 private void remainingCapacity(Exchange exchange) {
-   exchange.getOut().setBody(this.queue.remainingCapacity());
+exchange.getOut().setBody(this.queue.remainingCapacity());
 }
 }
\ No newline at end of file

[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/05f0d1b1
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/05f0d1b1
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/05f0d1b1

Branch: refs/heads/master
Commit: 05f0d1b1851ee6d2f3834831f52e3477966f5f7a
Parents: eac1acb
Author: Claus Ibsen davscl...@apache.org
Authored: Tue May 26 14:16:53 2015 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Tue May 26 14:16:53 2015 +0200

--
 .../maven/packaging/PackageComponentMojo.java   |  7 +++---
 .../maven/packaging/PackageDataFormatMojo.java  | 23 ++--
 .../camel/maven/packaging/PackageHelper.java|  4 ++--
 .../maven/packaging/PackageLanguageMojo.java| 23 ++--
 .../maven/packaging/PrepareComponentMojo.java   |  8 +++
 5 files changed, 34 insertions(+), 31 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/05f0d1b1/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageComponentMojo.java
--
diff --git 
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageComponentMojo.java
 
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageComponentMojo.java
index b3d8207..774e49c 100644
--- 
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageComponentMojo.java
+++ 
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageComponentMojo.java
@@ -29,6 +29,7 @@ import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.plugin.logging.Log;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.project.MavenProjectHelper;
+import org.omg.IOP.IORHelper;
 import org.sonatype.plexus.build.incremental.BuildContext;
 
 /**
@@ -141,9 +142,9 @@ public class PackageComponentMojo extends AbstractMojo {
 camelMetaDir.mkdirs();
 File outFile = new File(camelMetaDir, component.properties);
 try {
-try(OutputStream os = 
buildContext.newFileOutputStream(outFile)) {
-properties.store(os, Generated by 
camel-package-maven-plugin);
-}
+OutputStream os = buildContext.newFileOutputStream(outFile);
+properties.store(os, Generated by 
camel-package-maven-plugin);
+os.close();
 
 log.info(Generated  + outFile +  containing  + count +  
Camel  + (count  1 ? components:  : component: ) + names);
 

http://git-wip-us.apache.org/repos/asf/camel/blob/05f0d1b1/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java
--
diff --git 
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java
 
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java
index b398787..d7e3371 100644
--- 
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java
+++ 
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java
@@ -16,10 +16,6 @@
  */
 package org.apache.camel.maven.packaging;
 
-import static org.apache.camel.maven.packaging.PackageHelper.after;
-import static org.apache.camel.maven.packaging.PackageHelper.loadText;
-import static org.apache.camel.maven.packaging.PackageHelper.parseAsMap;
-
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -44,6 +40,10 @@ import org.apache.maven.project.MavenProject;
 import org.apache.maven.project.MavenProjectHelper;
 import org.sonatype.plexus.build.incremental.BuildContext;
 
+import static org.apache.camel.maven.packaging.PackageHelper.after;
+import static org.apache.camel.maven.packaging.PackageHelper.loadText;
+import static org.apache.camel.maven.packaging.PackageHelper.parseAsMap;
+
 /**
  * Analyses the Camel plugins in a project and generates extra descriptor 
information for easier auto-discovery in Camel.
  *
@@ -102,7 +102,8 @@ public class PackageDataFormatMojo extends AbstractMojo {
 prepareDataFormat(getLog(), project, projectHelper, dataFormatOutDir, 
schemaOutDir, buildContext);
 }
 
-public static void prepareDataFormat(Log log, MavenProject project, 
MavenProjectHelper projectHelper, File dataFormatOutDir, File schemaOutDir, 
BuildContext buildContext) throws MojoExecutionException {
+public static void prepareDataFormat(Log log, MavenProject 

[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/0583aa11
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/0583aa11
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/0583aa11

Branch: refs/heads/master
Commit: 0583aa1134f2eeacaf7788c81004e21d1f3b24de
Parents: 546a0d2
Author: Claus Ibsen davscl...@apache.org
Authored: Wed May 20 17:11:36 2015 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Wed May 20 17:11:36 2015 +0200

--
 .../src/main/java/org/apache/camel/model/rest/RestDefinition.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/0583aa11/camel-core/src/main/java/org/apache/camel/model/rest/RestDefinition.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/model/rest/RestDefinition.java 
b/camel-core/src/main/java/org/apache/camel/model/rest/RestDefinition.java
index f3729d5..964015b 100644
--- a/camel-core/src/main/java/org/apache/camel/model/rest/RestDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/rest/RestDefinition.java
@@ -562,7 +562,7 @@ public class RestDefinition extends 
OptionalIdentifiedDefinitionRestDefinition
 }
 }
 
-if( verb.getType() != null ) {
+if (verb.getType() != null) {
 String bodyType = verb.getType();
 if (bodyType.endsWith([])) {
 bodyType = List[ + bodyType.substring(0, 
bodyType.length() - 2) + ];

[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/33b96b0b
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/33b96b0b
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/33b96b0b

Branch: refs/heads/master
Commit: 33b96b0b52262d87ff7393b0d8da265cd5faae93
Parents: ee5c0f8
Author: Claus Ibsen davscl...@apache.org
Authored: Wed Mar 25 15:06:56 2015 +0100
Committer: Claus Ibsen davscl...@apache.org
Committed: Wed Mar 25 15:06:56 2015 +0100

--
 .../org/apache/camel/component/hazelcast/HazelcastComponent.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/33b96b0b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastComponent.java
--
diff --git 
a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastComponent.java
 
b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastComponent.java
index d7153f7..4890738 100644
--- 
a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastComponent.java
+++ 
b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastComponent.java
@@ -35,8 +35,9 @@ import 
org.apache.camel.component.hazelcast.seda.HazelcastSedaEndpoint;
 import org.apache.camel.component.hazelcast.topic.HazelcastTopicEndpoint;
 import org.apache.camel.impl.UriEndpointComponent;
 
+import static 
org.apache.camel.component.hazelcast.HazelcastConstants.HAZELCAST_INSTANCE_NAME_PARAM;
+import static 
org.apache.camel.component.hazelcast.HazelcastConstants.HAZELCAST_INSTANCE_PARAM;
 import static org.apache.camel.util.ObjectHelper.removeStartingCharacters;
-import static org.apache.camel.component.hazelcast.HazelcastConstants.*;
 
 public class HazelcastComponent extends UriEndpointComponent {
 

[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/eb86ec62
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/eb86ec62
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/eb86ec62

Branch: refs/heads/master
Commit: eb86ec62cb6b32a53bcd1b2cc76681c0cd76054c
Parents: f18270e
Author: Claus Ibsen davscl...@apache.org
Authored: Sun Feb 22 16:19:59 2015 +0100
Committer: Claus Ibsen davscl...@apache.org
Committed: Sun Feb 22 16:19:59 2015 +0100

--
 .../rabbitmq/RabbitMQRequeueIntTest.java| 21 +---
 1 file changed, 18 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/eb86ec62/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQRequeueIntTest.java
--
diff --git 
a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQRequeueIntTest.java
 
b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQRequeueIntTest.java
index d860a41..97798fc 100644
--- 
a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQRequeueIntTest.java
+++ 
b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQRequeueIntTest.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.rabbitmq;
 
 import org.apache.camel.Endpoint;
@@ -11,8 +27,6 @@ import org.junit.Test;
 
 /**
  * Integration test to confirm REQUEUE header causes message to be re-queued 
instead of sent to DLQ.
- *
- * Created by Andrew Austin on 2/21/15.
  */
 public class RabbitMQRequeueIntTest extends CamelTestSupport {
 public static final String ROUTING_KEY = rk4;
@@ -41,6 +55,7 @@ public class RabbitMQRequeueIntTest extends CamelTestSupport {
 .log(Sending message)
 .inOnly(rabbitMQEndpoint)
 .to(producingMockEndpoint);
+
 from(rabbitMQEndpoint)
 .id(consumingRoute)
 .log(Receiving message)
@@ -67,7 +82,7 @@ public class RabbitMQRequeueIntTest extends CamelTestSupport {
 producingMockEndpoint.expectedMessageCount(1);
 consumingMockEndpoint.expectedMessageCount(1);
 
-directProducer.sendBodyAndHeader(Hello, World!, 
RabbitMQConstants.REQUEUE, 4l);
+directProducer.sendBodyAndHeader(Hello, World!, 
RabbitMQConstants.REQUEUE, 4L);
 
 Thread.sleep(100);
 producingMockEndpoint.assertIsSatisfied();

[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/4125e9d8
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4125e9d8
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4125e9d8

Branch: refs/heads/camel-2.14.x
Commit: 4125e9d86984de733b757b7f1c7915df0caa5999
Parents: abee35c
Author: Claus Ibsen davscl...@apache.org
Authored: Sun Feb 22 16:19:59 2015 +0100
Committer: Claus Ibsen davscl...@apache.org
Committed: Sun Feb 22 16:28:59 2015 +0100

--
 .../rabbitmq/RabbitMQRequeueIntTest.java| 21 +---
 1 file changed, 18 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/4125e9d8/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQRequeueIntTest.java
--
diff --git 
a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQRequeueIntTest.java
 
b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQRequeueIntTest.java
index d860a41..97798fc 100644
--- 
a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQRequeueIntTest.java
+++ 
b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQRequeueIntTest.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.rabbitmq;
 
 import org.apache.camel.Endpoint;
@@ -11,8 +27,6 @@ import org.junit.Test;
 
 /**
  * Integration test to confirm REQUEUE header causes message to be re-queued 
instead of sent to DLQ.
- *
- * Created by Andrew Austin on 2/21/15.
  */
 public class RabbitMQRequeueIntTest extends CamelTestSupport {
 public static final String ROUTING_KEY = rk4;
@@ -41,6 +55,7 @@ public class RabbitMQRequeueIntTest extends CamelTestSupport {
 .log(Sending message)
 .inOnly(rabbitMQEndpoint)
 .to(producingMockEndpoint);
+
 from(rabbitMQEndpoint)
 .id(consumingRoute)
 .log(Receiving message)
@@ -67,7 +82,7 @@ public class RabbitMQRequeueIntTest extends CamelTestSupport {
 producingMockEndpoint.expectedMessageCount(1);
 consumingMockEndpoint.expectedMessageCount(1);
 
-directProducer.sendBodyAndHeader(Hello, World!, 
RabbitMQConstants.REQUEUE, 4l);
+directProducer.sendBodyAndHeader(Hello, World!, 
RabbitMQConstants.REQUEUE, 4L);
 
 Thread.sleep(100);
 producingMockEndpoint.assertIsSatisfied();