[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.

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

[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.

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

[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.

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

[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

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

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

Branch: refs/heads/master
Commit: 2d0de2bbf27a71b8d7dad6284e092ba456ec5794
Parents: 9dce509
Author: Claus Ibsen 
Authored: Sun Jul 24 13:53:31 2016 +0200
Committer: Claus Ibsen 
Committed: Sun Jul 24 13:53:31 2016 +0200

--
 .../async/AsyncEndpointRoutingSlipBeanNonBlockingTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/2d0de2bb/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRoutingSlipBeanNonBlockingTest.java
--
diff --git 
a/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRoutingSlipBeanNonBlockingTest.java
 
b/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRoutingSlipBeanNonBlockingTest.java
index 4cfac28..57ca2f4 100644
--- 
a/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRoutingSlipBeanNonBlockingTest.java
+++ 
b/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRoutingSlipBeanNonBlockingTest.java
@@ -96,7 +96,7 @@ public class AsyncEndpointRoutingSlipBeanNonBlockingTest 
extends ContextTestSupp
 private final Endpoint startEndpoint;
 private final SendProcessor asyncSender;
 
-public ExchangeSubmitter(Endpoint startEndpoint, SendProcessor 
asyncSender) {
+ExchangeSubmitter(Endpoint startEndpoint, SendProcessor asyncSender) {
 this.startEndpoint = startEndpoint;
 this.asyncSender = asyncSender;
 }

[4/4] camel git commit: Fixed CS. Added test to SB. This fixes #1071

[davsclaus]

Fixed CS. Added test to SB. This fixes #1071


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

Branch: refs/heads/master
Commit: f496aac76098600313248a8a4c62c75efedf1830
Parents: 12dcc56
Author: Claus Ibsen 
Authored: Fri Jul 15 09:09:45 2016 +0200
Committer: Claus Ibsen 
Committed: Fri Jul 15 09:09:45 2016 +0200

--
 components/camel-lumberjack/pom.xml | 107 +--
 .../src/main/docs/lumberjack.adoc   |   8 +-
 .../lumberjack/LumberjackComponent.java |   2 +-
 .../lumberjack/LumberjackConsumer.java  |   4 +-
 .../lumberjack/LumberjackEndpoint.java  |  11 +-
 .../src/test/resources/log4j.properties |   6 +-
 .../itest/springboot/CamelLumberjackTest.java   |  48 +
 7 files changed, 117 insertions(+), 69 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/f496aac7/components/camel-lumberjack/pom.xml
--
diff --git a/components/camel-lumberjack/pom.xml 
b/components/camel-lumberjack/pom.xml
index 1e69023..38029d7 100644
--- a/components/camel-lumberjack/pom.xml
+++ b/components/camel-lumberjack/pom.xml
@@ -20,65 +20,64 @@
 http://maven.apache.org/POM/4.0.0;
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
-4.0.0
+  4.0.0
 
-
-org.apache.camel
-components
-2.18-SNAPSHOT
-
+  
+org.apache.camel
+components
+2.18-SNAPSHOT
+  
 
-camel-lumberjack
-jar
-Camel :: Lumberjack
-Camel Lumberjack log streaming component
+  camel-lumberjack
+  jar
+  Camel :: Lumberjack
+  Camel Lumberjack log streaming component
 
-
-
org.apache.camel.component.lumberjack.*
-
-org.apache.camel.spi.ComponentResolver;component=lumberjack,
-org.apache.camel.spi.ComponentResolver;component=lumberjacks
-
-
+  
+
org.apache.camel.component.lumberjack.*
+
+  org.apache.camel.spi.ComponentResolver;component=lumberjack
+
+  
 
-
+  
 
-
-org.apache.camel
-camel-core
-
-
-io.netty
-netty-transport
-${netty-version}
-
-
-io.netty
-netty-handler
-${netty-version}
-
-
-com.google.code.gson
-gson
-${gson-version}
-
+
+  org.apache.camel
+  camel-core
+
+
+  io.netty
+  netty-transport
+  ${netty-version}
+
+
+  io.netty
+  netty-handler
+  ${netty-version}
+
+
+  com.google.code.gson
+  gson
+  ${gson-version}
+
 
-
-
-junit
-junit
-test
-
-
-org.apache.camel
-camel-test
-test
-
-
-org.slf4j
-slf4j-log4j12
-test
-
-
+
+
+  junit
+  junit
+  test
+
+
+  org.apache.camel
+  camel-test
+  test
+
+
+  org.slf4j
+  slf4j-log4j12
+  test
+
+  
 
 
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/camel/blob/f496aac7/components/camel-lumberjack/src/main/docs/lumberjack.adoc
--
diff --git a/components/camel-lumberjack/src/main/docs/lumberjack.adoc 
b/components/camel-lumberjack/src/main/docs/lumberjack.adoc
index 8d87a21..bc92bbd 100644
--- a/components/camel-lumberjack/src/main/docs/lumberjack.adoc
+++ b/components/camel-lumberjack/src/main/docs/lumberjack.adoc
@@ -47,6 +47,7 @@ The Lumberjack component has no options.
 
 
 
+
 // endpoint options: START
 The Lumberjack component supports 7 endpoint options which are listed below:
 
@@ -54,10 +55,10 @@ The Lumberjack component supports 7 endpoint options which 
are listed below:
 [width="100%",cols="2s,1,1m,1m,5",options="header"]
 |===
 | Name | Group | Default | Java Type | Description
-| host | common |  | String | *Required* Network interface on which to listen 
for Lumberjack
-| port | common | 5044 | int | Network port on which to listen for Lumberjack
-| sslContextParameters | common |  | SSLContextParameters | SSL configuration
+| host | consumer |  | String | *Required* Network interface on which to 
listen for Lumberjack
+| port | consumer | 5044 | 

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

[davsclaus]

Fixed CS. This closes #1026


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

Branch: refs/heads/camel-2.17.x
Commit: cf939a6927dd28882046a03fb32c5b45e5ff2054
Parents: eed88d1
Author: Claus Ibsen 
Authored: Sun Jun 12 16:30:24 2016 +0200
Committer: Claus Ibsen 
Committed: Sun Jun 12 16:32:02 2016 +0200

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


http://git-wip-us.apache.org/repos/asf/camel/blob/cf939a69/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 4bdc121..a1b8d7f 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
@@ -280,7 +280,9 @@ public class NettyProducer extends DefaultAsyncProducer {
 final Channel channel = existing;
 final AsyncCallback producerCallback;
 
-if(configuration.isReuseChannel()) {
+if (configuration.isReuseChannel()) {
+// use callback as-is because we should not put it back in the 
pool as NettyProducerCallback would do
+// as when reuse channel is enabled it will put the channel back 
in the pool when exchange is done using on completion
 producerCallback = callback;
 } else {
 producerCallback = new NettyProducerCallback(channel, callback);

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

[davsclaus]

Fixed CS. This closes #970


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

Branch: refs/heads/camel-2.17.x
Commit: 2f859275407e7c0a92a85f6f44e63219257e959d
Parents: ad79efc
Author: Claus Ibsen 
Authored: Sun May 1 07:44:32 2016 +0200
Committer: Claus Ibsen 
Committed: Sun May 1 07:46:25 2016 +0200

--
 .../apache/camel/component/aws/ddb/AbstractDdbCommand.java  | 9 ++---
 .../camel/component/aws/ddb/BatchGetItemsCommand.java   | 1 +
 .../apache/camel/component/aws/ddb/DeleteItemCommand.java   | 1 +
 .../apache/camel/component/aws/ddb/DeleteTableCommand.java  | 8 
 .../camel/component/aws/ddb/DescribeTableCommand.java   | 1 +
 .../org/apache/camel/component/aws/ddb/GetItemCommand.java  | 1 +
 .../org/apache/camel/component/aws/ddb/PutItemCommand.java  | 1 +
 .../org/apache/camel/component/aws/ddb/QueryCommand.java| 1 +
 .../org/apache/camel/component/aws/ddb/ScanCommand.java | 1 +
 .../apache/camel/component/aws/ddb/UpdateItemCommand.java   | 1 +
 .../apache/camel/component/aws/ddb/UpdateTableCommand.java  | 1 +
 11 files changed, 15 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/2f859275/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/AbstractDdbCommand.java
--
diff --git 
a/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/AbstractDdbCommand.java
 
b/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/AbstractDdbCommand.java
index 6ea5bd7..a435c57 100644
--- 
a/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/AbstractDdbCommand.java
+++ 
b/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/AbstractDdbCommand.java
@@ -22,7 +22,6 @@ import java.util.Map;
 import com.amazonaws.services.dynamodbv2.AmazonDynamoDB;
 import com.amazonaws.services.dynamodbv2.model.AttributeValue;
 import com.amazonaws.services.dynamodbv2.model.ExpectedAttributeValue;
-
 import org.apache.camel.Exchange;
 import org.apache.camel.Message;
 import org.apache.camel.component.aws.common.AwsExchangeUtil;
@@ -40,7 +39,6 @@ public abstract class AbstractDdbCommand {
 this.exchange = exchange;
 }
 
-
 public abstract void execute();
 
 protected Message getMessageForResponse(Exchange exchange) {
@@ -73,15 +71,12 @@ public abstract class AbstractDdbCommand {
 
 protected void addToResults(Map map) {
 Message msg = getMessageForResponse(exchange);
-for(Map.Entry en : map.entrySet()){
+for (Map.Entry en : map.entrySet()) {
 msg.setHeader(en.getKey(), en.getValue());
 }
 }
-protected void addToResult(String headerKey, Object value) {
-Message msg = getMessageForResponse(exchange);
-msg.setHeader(headerKey, value);
-}
 
+@SuppressWarnings("unchecked")
 protected Map determineKey() {
 return exchange.getIn().getHeader(DdbConstants.KEY, Map.class);
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/2f859275/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/BatchGetItemsCommand.java
--
diff --git 
a/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/BatchGetItemsCommand.java
 
b/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/BatchGetItemsCommand.java
index 8e3cf36..7973a59 100644
--- 
a/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/BatchGetItemsCommand.java
+++ 
b/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/BatchGetItemsCommand.java
@@ -27,6 +27,7 @@ import 
com.amazonaws.services.dynamodbv2.model.KeysAndAttributes;
 import org.apache.camel.Exchange;
 
 public class BatchGetItemsCommand extends AbstractDdbCommand {
+
 public BatchGetItemsCommand(AmazonDynamoDB ddbClient, DdbConfiguration 
configuration, Exchange exchange) {
 super(ddbClient, configuration, exchange);
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/2f859275/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/DeleteItemCommand.java
--
diff --git 
a/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/DeleteItemCommand.java
 
b/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/DeleteItemCommand.java
index 9952d92..a79d6a4 100644
--- 

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

[davsclaus]

Fixed CS. This closes #956


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

Branch: refs/heads/camel-2.17.x
Commit: 1099e619eb583556ba3115ff5f666239d2a6c535
Parents: 6009e81
Author: Claus Ibsen 
Authored: Fri Apr 22 21:05:02 2016 +0200
Committer: Claus Ibsen 
Committed: Fri Apr 22 21:07:16 2016 +0200

--
 ...dRouteDumpStatsAsXmlAndResetWithCustomDomainTest.java | 11 ++-
 .../ManagedRouteDumpStatsAsXmlCustomDomainTest.java  | 11 ++-
 2 files changed, 12 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/1099e619/camel-core/src/test/java/org/apache/camel/management/ManagedRouteDumpStatsAsXmlAndResetWithCustomDomainTest.java
--
diff --git 
a/camel-core/src/test/java/org/apache/camel/management/ManagedRouteDumpStatsAsXmlAndResetWithCustomDomainTest.java
 
b/camel-core/src/test/java/org/apache/camel/management/ManagedRouteDumpStatsAsXmlAndResetWithCustomDomainTest.java
index f5fa254..e4b3b3b 100644
--- 
a/camel-core/src/test/java/org/apache/camel/management/ManagedRouteDumpStatsAsXmlAndResetWithCustomDomainTest.java
+++ 
b/camel-core/src/test/java/org/apache/camel/management/ManagedRouteDumpStatsAsXmlAndResetWithCustomDomainTest.java
@@ -16,18 +16,19 @@
  */
 package org.apache.camel.management;
 
-import org.apache.camel.builder.RouteBuilder;
-import org.w3c.dom.Document;
-
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
 
+import org.w3c.dom.Document;
+
+import org.apache.camel.builder.RouteBuilder;
+
 /**
  * @version
  */
 public class ManagedRouteDumpStatsAsXmlAndResetWithCustomDomainTest extends 
ManagementTestSupport {
 
-private final String CUSTOM_DOMAIN_NAME="custom";
+private static final String CUSTOM_DOMAIN_NAME = "custom";
 
 public void testPerformanceCounterStats() throws Exception {
 // JMX tests dont work well on AIX CI servers (hangs them)
@@ -37,7 +38,7 @@ public class 
ManagedRouteDumpStatsAsXmlAndResetWithCustomDomainTest extends Mana
 
 // get the stats for the route
 MBeanServer mbeanServer = getMBeanServer();
-ObjectName on = 
ObjectName.getInstance(CUSTOM_DOMAIN_NAME+":context=camel-1,type=routes,name=\"foo\"");
+ObjectName on = ObjectName.getInstance(CUSTOM_DOMAIN_NAME + 
":context=camel-1,type=routes,name=\"foo\"");
 
 getMockEndpoint("mock:result").expectedMessageCount(1);
 

http://git-wip-us.apache.org/repos/asf/camel/blob/1099e619/camel-core/src/test/java/org/apache/camel/management/ManagedRouteDumpStatsAsXmlCustomDomainTest.java
--
diff --git 
a/camel-core/src/test/java/org/apache/camel/management/ManagedRouteDumpStatsAsXmlCustomDomainTest.java
 
b/camel-core/src/test/java/org/apache/camel/management/ManagedRouteDumpStatsAsXmlCustomDomainTest.java
index 6d624ba..a94c766 100644
--- 
a/camel-core/src/test/java/org/apache/camel/management/ManagedRouteDumpStatsAsXmlCustomDomainTest.java
+++ 
b/camel-core/src/test/java/org/apache/camel/management/ManagedRouteDumpStatsAsXmlCustomDomainTest.java
@@ -16,18 +16,19 @@
  */
 package org.apache.camel.management;
 
-import org.apache.camel.builder.RouteBuilder;
-import org.w3c.dom.Document;
-
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
 
+import org.w3c.dom.Document;
+
+import org.apache.camel.builder.RouteBuilder;
+
 /**
  * @version
  */
 public class ManagedRouteDumpStatsAsXmlCustomDomainTest extends 
ManagementTestSupport {
 
-private final String CUSTOM_DOMAIN_NAME="custom";
+private static final String CUSTOM_DOMAIN_NAME = "custom";
 
 public void testPerformanceCounterStats() throws Exception {
 // JMX tests dont work well on AIX CI servers (hangs them)
@@ -37,7 +38,7 @@ public class ManagedRouteDumpStatsAsXmlCustomDomainTest 
extends ManagementTestSu
 
 // get the stats for the route
 MBeanServer mbeanServer = getMBeanServer();
-ObjectName on = 
ObjectName.getInstance(CUSTOM_DOMAIN_NAME+":context=camel-1,type=routes,name=\"foo\"");
+ObjectName on = ObjectName.getInstance(CUSTOM_DOMAIN_NAME + 
":context=camel-1,type=routes,name=\"foo\"");
 
 getMockEndpoint("mock:result").expectedMessageCount(1);
 

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

[davsclaus]

Fixed CS. This closes #936. This closes #937.


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

Branch: refs/heads/master
Commit: f1aee991d0f77272baf2ea66ef820a25e35bab70
Parents: 9e18a1d
Author: Claus Ibsen 
Authored: Sat Apr 9 07:47:30 2016 +0200
Committer: Claus Ibsen 
Committed: Sat Apr 9 07:47:30 2016 +0200

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


http://git-wip-us.apache.org/repos/asf/camel/blob/f1aee991/components/camel-fop/src/main/java/org/apache/camel/component/fop/FopEndpoint.java
--
diff --git 
a/components/camel-fop/src/main/java/org/apache/camel/component/fop/FopEndpoint.java
 
b/components/camel-fop/src/main/java/org/apache/camel/component/fop/FopEndpoint.java
index 5ba7fcc..7967d44 100644
--- 
a/components/camel-fop/src/main/java/org/apache/camel/component/fop/FopEndpoint.java
+++ 
b/components/camel-fop/src/main/java/org/apache/camel/component/fop/FopEndpoint.java
@@ -103,8 +103,8 @@ public class FopEndpoint extends DefaultEndpoint {
 if (fopFactory == null && userConfigURL == null) {
 fopFactory = FopFactory.newInstance(new URI("./"));
 } else if (fopFactory != null && userConfigURL != null) {
-throw new FopConfigException("More than one configuration. " +
-"You can configure fop either by config file or by 
supplying FopFactory but not both.");
+throw new FopConfigException("More than one configuration. "
++ "You can configure fop either by config file or by 
supplying FopFactory but not both.");
 } else if (fopFactory == null && userConfigURL != null) {
 InputStream is = 
ResourceHelper.resolveMandatoryResourceAsInputStream(getCamelContext(), 
userConfigURL);
 fopFactory = FopFactory.newInstance(new URI(userConfigURL), is);

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

[davsclaus]

Fixed CS. This closes #931


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

Branch: refs/heads/camel-2.17.x
Commit: 6efd0461d33583de2072c2b2237035d5fca30c1e
Parents: 7cd6cb4
Author: Claus Ibsen 
Authored: Thu Apr 7 10:29:04 2016 +0200
Committer: Claus Ibsen 
Committed: Thu Apr 7 10:29:27 2016 +0200

--
 .../src/main/java/org/apache/camel/spi/CamelContextTracker.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/6efd0461/camel-core/src/main/java/org/apache/camel/spi/CamelContextTracker.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/spi/CamelContextTracker.java 
b/camel-core/src/main/java/org/apache/camel/spi/CamelContextTracker.java
index 0ca540c..87e3dd7 100644
--- a/camel-core/src/main/java/org/apache/camel/spi/CamelContextTracker.java
+++ b/camel-core/src/main/java/org/apache/camel/spi/CamelContextTracker.java
@@ -37,7 +37,7 @@ public class CamelContextTracker implements Closeable {
 public CamelContextTracker() {
 filter = new Filter() {
 public boolean accept(CamelContext camelContext) {
-return camelContext.getClass().getName().contains("Proxy") == 
false;
+return !camelContext.getClass().getName().contains("Proxy");
 }
 };
 }
@@ -50,7 +50,7 @@ public class CamelContextTracker implements Closeable {
  * Called to determine whether this tracker should accept the given 
context.
  */
 public boolean accept(CamelContext camelContext) {
-return filter != null ? filter.accept(camelContext) : true;
+return filter == null || filter.accept(camelContext);
 }
 
 /**

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

[davsclaus]

Fixed CS. This closes #928.


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

Branch: refs/heads/camel-2.17.x
Commit: 9d8f0c200d2085c961bf72d0b29545bb555fc0dd
Parents: 1c710c4
Author: Claus Ibsen 
Authored: Wed Apr 6 07:21:13 2016 +0200
Committer: Claus Ibsen 
Committed: Wed Apr 6 07:25:23 2016 +0200

--
 .../camel/component/rabbitmq/RabbitMQDeclareSupport.java   | 6 +++---
 .../org/apache/camel/component/rabbitmq/RabbitMQEndpoint.java  | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/9d8f0c20/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQDeclareSupport.java
--
diff --git 
a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQDeclareSupport.java
 
b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQDeclareSupport.java
index 2539d50..5b17370 100644
--- 
a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQDeclareSupport.java
+++ 
b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQDeclareSupport.java
@@ -45,9 +45,9 @@ public class RabbitMQDeclareSupport {
 }
 
 private void declareAndBindExchangeWithQueue(final Channel channel) throws 
IOException {
-  if(shouldDeclareExchange()){  
-  declareExchange(channel, endpoint.getExchangeName(), 
endpoint.getExchangeType(), resolvedExchangeArguments());
-  }
+if (shouldDeclareExchange()) {
+declareExchange(channel, endpoint.getExchangeName(), 
endpoint.getExchangeType(), resolvedExchangeArguments());
+}
 
 if (shouldDeclareQueue()) {
 // need to make sure the queueDeclare is same with the exchange 
declare

http://git-wip-us.apache.org/repos/asf/camel/blob/9d8f0c20/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 4293ca7..71721cf 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
@@ -407,7 +407,6 @@ public class RabbitMQEndpoint extends DefaultEndpoint {
 }
 
 /**
- * If true the producer will not declare the exchange.
  * This can be used if we need to declare the queue but not the exchange
  */
 public void setSkipExchangeDeclare(boolean skipExchangeDeclare) {

[4/4] camel git commit: Fixed CS and polished. This closes #840. This closes #839.

[davsclaus]

Fixed CS and polished. This closes #840. This closes #839.


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

Branch: refs/heads/master
Commit: b0c7e793def54732264505c30156d0ffc2bc3467
Parents: 0bf2d09
Author: Claus Ibsen 
Authored: Mon Feb 15 09:34:12 2016 +0100
Committer: Claus Ibsen 
Committed: Mon Feb 15 09:37:24 2016 +0100

--
 .../component/aws/common/AwsExchangeUtil.java   | 32 ++-
 .../component/aws/kinesis/KinesisComponent.java |  6 +---
 .../component/aws/kinesis/KinesisEndpoint.java  | 24 +-
 .../component/aws/kinesis/KinesisProducer.java  | 33 
 .../aws/kinesis/KinesisProducerTest.java| 15 -
 5 files changed, 39 insertions(+), 71 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/b0c7e793/components/camel-aws/src/main/java/org/apache/camel/component/aws/common/AwsExchangeUtil.java
--
diff --git 
a/components/camel-aws/src/main/java/org/apache/camel/component/aws/common/AwsExchangeUtil.java
 
b/components/camel-aws/src/main/java/org/apache/camel/component/aws/common/AwsExchangeUtil.java
index 88abfba..8c9eb95 100644
--- 
a/components/camel-aws/src/main/java/org/apache/camel/component/aws/common/AwsExchangeUtil.java
+++ 
b/components/camel-aws/src/main/java/org/apache/camel/component/aws/common/AwsExchangeUtil.java
@@ -1,25 +1,29 @@
-/*
- *  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
+/**
+ * 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
+ *  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.
+ * 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.aws.common;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.Message;
 
-public class AwsExchangeUtil {
+public final class AwsExchangeUtil {
+
+private AwsExchangeUtil() {
+}
+
 public static Message getMessageForResponse(final Exchange exchange) {
 if (exchange.getPattern().isOutCapable()) {
 Message out = exchange.getOut();

http://git-wip-us.apache.org/repos/asf/camel/blob/b0c7e793/components/camel-aws/src/main/java/org/apache/camel/component/aws/kinesis/KinesisComponent.java
--
diff --git 
a/components/camel-aws/src/main/java/org/apache/camel/component/aws/kinesis/KinesisComponent.java
 
b/components/camel-aws/src/main/java/org/apache/camel/component/aws/kinesis/KinesisComponent.java
index 9740600..270104a 100644
--- 
a/components/camel-aws/src/main/java/org/apache/camel/component/aws/kinesis/KinesisComponent.java
+++ 
b/components/camel-aws/src/main/java/org/apache/camel/component/aws/kinesis/KinesisComponent.java
@@ -21,11 +21,8 @@ import java.util.Map;
 import org.apache.camel.CamelContext;
 import org.apache.camel.Endpoint;
 import org.apache.camel.impl.UriEndpointComponent;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 public class KinesisComponent extends UriEndpointComponent {
-private static final Logger LOG = 
LoggerFactory.getLogger(KinesisComponent.class);
 
 public KinesisComponent() {
 super(KinesisEndpoint.class);
@@ -38,8 +35,7 @@ 

[4/4] camel git commit: Fixed CS. This closes #823. This closes #832. This closes #831. This closes #828.

[davsclaus]

Fixed CS. This closes #823. This closes #832. This closes #831. This closes 
#828.


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

Branch: refs/heads/master
Commit: 7d5436d0d1dd94e1789b4f175c830a393b267f3e
Parents: 280d55d
Author: Claus Ibsen 
Authored: Thu Feb 11 09:12:19 2016 +0100
Committer: Claus Ibsen 
Committed: Thu Feb 11 09:14:09 2016 +0100

--
 components/camel-hbase/pom.xml|  1 -
 .../org/apache/camel/component/hbase/HBaseProducer.java   | 10 +-
 .../camel/component/hbase/filters/ModelAwareFilter.java   |  2 --
 .../component/hbase/filters/ModelAwareFilterList.java |  8 
 .../component/hbase/filters/ModelAwareSkipFilter.java |  8 
 .../hbase/filters/ModelAwareWhileMatchFilter.java |  8 
 6 files changed, 17 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/7d5436d0/components/camel-hbase/pom.xml
--
diff --git a/components/camel-hbase/pom.xml b/components/camel-hbase/pom.xml
index 2c0d530..545a7d0 100644
--- a/components/camel-hbase/pom.xml
+++ b/components/camel-hbase/pom.xml
@@ -28,7 +28,6 @@
 bundle
 Camel :: Hbase
 Camel HBase component
-
 
 
 org.apache.hadoop.conf;version="[2,3)",

http://git-wip-us.apache.org/repos/asf/camel/blob/7d5436d0/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HBaseProducer.java
--
diff --git 
a/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HBaseProducer.java
 
b/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HBaseProducer.java
index 8f35342..93f8bb0 100644
--- 
a/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HBaseProducer.java
+++ 
b/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HBaseProducer.java
@@ -205,12 +205,12 @@ public class HBaseProducer extends DefaultProducer 
implements ServicePoolAware {
 } else {
 scan = new Scan();
 }
-
+
 if (filters != null && !filters.isEmpty()) {
-   for (int i=0;i

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

[davsclaus]

Fixed CS. This closes #826.


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

Branch: refs/heads/camel-2.16.x
Commit: 532de5b923256b1adb66ea79f5013267fdb4968c
Parents: 81392e1
Author: Claus Ibsen 
Authored: Fri Feb 5 09:54:32 2016 +0100
Committer: Claus Ibsen 
Committed: Fri Feb 5 09:55:04 2016 +0100

--
 .../salesforce/internal/client/SalesforceSecurityListener.java   | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/532de5b9/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/SalesforceSecurityListener.java
--
diff --git 
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/SalesforceSecurityListener.java
 
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/SalesforceSecurityListener.java
index 2ef9e98..09fde7a 100644
--- 
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/SalesforceSecurityListener.java
+++ 
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/SalesforceSecurityListener.java
@@ -93,9 +93,7 @@ public class SalesforceSecurityListener extends 
HttpEventListenerWrapper {
 
 private boolean isInvalidSessionError(SalesforceException e) {
 e = getRootSalesforceException(e);
-return e.getErrors() != null &&
-e.getErrors().size() == 1 &&
-
"InvalidSessionId".equals(e.getErrors().get(0).getErrorCode());
+return e.getErrors() != null && e.getErrors().size() == 1 && 
"InvalidSessionId".equals(e.getErrors().get(0).getErrorCode());
 }
 
 private SalesforceException getRootSalesforceException(SalesforceException 
e) {

[4/4] camel git commit: Fixed CS. This closes #753. This closes #379. This closes #536.

[davsclaus]

Fixed CS. This closes #753. This closes #379. This closes #536.


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

Branch: refs/heads/master
Commit: 6ad29b2ec304600c54bdbe655bd80644981d073f
Parents: c978bbd
Author: Claus Ibsen 
Authored: Tue Jan 5 17:50:04 2016 +0100
Committer: Claus Ibsen 
Committed: Tue Jan 5 17:50:04 2016 +0100

--
 .../apache/camel/impl/DefaultCamelContext.java  | 52 ++--
 .../apache/camel/model/ModelCamelContext.java   | 10 ++--
 ...melContextAddRestDefinitionsFromXmlTest.java | 17 +++
 .../apache/camel/model/LoadRestFromXmlTest.java | 16 +++---
 .../boot/CamelConfigurationProperties.java  | 16 +++---
 .../camel/spring/boot/RoutesCollector.java  | 40 +++
 6 files changed, 75 insertions(+), 76 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/6ad29b2e/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java 
b/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
index cef6b6a..c710713 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
@@ -870,32 +870,32 @@ public class DefaultCamelContext extends ServiceSupport 
implements ModelCamelCon
 }
 
 public synchronized RestsDefinition loadRestsDefinition(InputStream is) 
throws Exception {
-   // load routes using JAXB
-   if (jaxbContext == null) {
-   // must use classloader from CamelContext to have JAXB working
-   jaxbContext = getModelJAXBContextFactory().newJAXBContext();
-   }
-
-   Unmarshaller unmarshaller = jaxbContext.createUnmarshaller();
-   Object result = unmarshaller.unmarshal(is);
-
-   if (result == null) {
-   throw new IOException("Cannot unmarshal to rests using JAXB 
from input stream: " + is);
-   }
-
-   // can either be routes or a single route
-   RestsDefinition answer;
-   if (result instanceof RestDefinition) {
-   RestDefinition rest = (RestDefinition) result;
-   answer = new RestsDefinition();
-   answer.getRests().add(rest);
-   } else if (result instanceof RestsDefinition) {
-   answer = (RestsDefinition) result;
-   } else {
-   throw new IllegalArgumentException("Unmarshalled object is an 
unsupported type: " + ObjectHelper.className(result) + " -> " + result);
-   }
-
-   return answer;
+// load routes using JAXB
+if (jaxbContext == null) {
+// must use classloader from CamelContext to have JAXB working
+jaxbContext = getModelJAXBContextFactory().newJAXBContext();
+}
+
+Unmarshaller unmarshaller = jaxbContext.createUnmarshaller();
+Object result = unmarshaller.unmarshal(is);
+
+if (result == null) {
+throw new IOException("Cannot unmarshal to rests using JAXB from 
input stream: " + is);
+}
+
+// can either be routes or a single route
+RestsDefinition answer;
+if (result instanceof RestDefinition) {
+RestDefinition rest = (RestDefinition) result;
+answer = new RestsDefinition();
+answer.getRests().add(rest);
+} else if (result instanceof RestsDefinition) {
+answer = (RestsDefinition) result;
+} else {
+throw new IllegalArgumentException("Unmarshalled object is an 
unsupported type: " + ObjectHelper.className(result) + " -> " + result);
+}
+
+return answer;
 }
 
 public synchronized void addRouteDefinitions(Collection 
routeDefinitions) throws Exception {

http://git-wip-us.apache.org/repos/asf/camel/blob/6ad29b2e/camel-core/src/main/java/org/apache/camel/model/ModelCamelContext.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/model/ModelCamelContext.java 
b/camel-core/src/main/java/org/apache/camel/model/ModelCamelContext.java
index e2fa327..aea0aac 100644
--- a/camel-core/src/main/java/org/apache/camel/model/ModelCamelContext.java
+++ b/camel-core/src/main/java/org/apache/camel/model/ModelCamelContext.java
@@ -56,11 +56,11 @@ public interface ModelCamelContext extends CamelContext {
 
 /**
  * Loads a collection of rest definitions from the given {@link 
java.io.InputStream}.
-*
-* @param 

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

Branch: refs/heads/camel-2.16.x
Commit: 8e261f742f0381ad65a58d7fd6f2c6c51242f6b6
Parents: 2164aba
Author: Claus Ibsen 
Authored: Sun Nov 22 11:36:08 2015 +0100
Committer: Claus Ibsen 
Committed: Sun Nov 22 11:37:03 2015 +0100

--
 .../component/websocket/WebsocketComponent.java | 12 ++--
 .../component/websocket/WebsocketProducer.java  | 10 ++--
 ...dividualAndBroadcastEndpointExampleTest.java | 60 ++--
 ...ocketTwoRoutesToSameEndpointExampleTest.java | 58 +--
 4 files changed, 69 insertions(+), 71 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/8e261f74/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java
--
diff --git 
a/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java
 
b/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java
index 1251a53..dee57b0 100644
--- 
a/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java
+++ 
b/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java
@@ -23,7 +23,6 @@ import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
 import javax.management.MBeanServer;
 import javax.servlet.DispatcherType;
 
@@ -202,7 +201,7 @@ public class WebsocketComponent extends 
UriEndpointComponent {
 enableSessionSupport(connectorRef.server, connectorKey);
 }
 
-NodeSynchronization sync = new 
DefaultNodeSynchronization(connectorRef.memoryStore);
+NodeSynchronization sync = new 
DefaultNodeSynchronization(connectorRef.memoryStore);
 WebsocketComponentServlet servlet = addServlet(sync, prodcon, 
endpoint.getResourceUri());
 if (prodcon instanceof WebsocketConsumer) {
 WebsocketConsumer consumer = 
WebsocketConsumer.class.cast(prodcon);
@@ -213,11 +212,10 @@ public class WebsocketComponent extends 
UriEndpointComponent {
 servlet.connect(consumer);
 }
 if (prodcon instanceof WebsocketProducer) {
-   WebsocketProducer producer = 
WebsocketProducer.class.cast(prodcon);
-   producer.setStore(connectorRef.memoryStore);
+WebsocketProducer producer = 
WebsocketProducer.class.cast(prodcon);
+producer.setStore(connectorRef.memoryStore);
 }
 }
-
 }
 
 /**
@@ -256,7 +254,7 @@ public class WebsocketComponent extends 
UriEndpointComponent {
 connectorRef.servlet.disconnect((WebsocketConsumer) 
prodcon);
 }
 if (prodcon instanceof WebsocketProducer) {
-   ((WebsocketProducer) prodcon).setStore(null);
+((WebsocketProducer) prodcon).setStore(null);
 }
 }
 }
@@ -805,7 +803,7 @@ public class WebsocketComponent extends 
UriEndpointComponent {
 // must add static resource server to CONNECTORS in case the 
websocket producers/consumers
 // uses the same port number, and therefore we must be part of this
 MemoryWebsocketStore memoryStore = new MemoryWebsocketStore();
-ConnectorRef ref = new ConnectorRef(staticResourcesServer, 
connector, null,memoryStore);
+ConnectorRef ref = new ConnectorRef(staticResourcesServer, 
connector, null, memoryStore);
 String key = "websocket:" + host + ":" + port;
 CONNECTORS.put(key, ref);
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/8e261f74/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketProducer.java
--
diff --git 
a/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketProducer.java
 
b/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketProducer.java
index 89b2932..91cfb5e 100644
--- 
a/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketProducer.java
+++ 
b/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketProducer.java
@@ -104,15 +104,15 @@ public class WebsocketProducer extends DefaultProducer 
implements WebsocketProdu
 if (websocket != 

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

Branch: refs/heads/camel-2.16.x
Commit: b2ce0f99032fc8b9f26c97370ce8a794006e2135
Parents: 59b54c6
Author: Claus Ibsen 
Authored: Fri Nov 13 17:33:46 2015 +0100
Committer: Claus Ibsen 
Committed: Fri Nov 13 17:35:51 2015 +0100

--
 .../dynamicrouter/DynamicRouterConcurrentPOJOTest.java  | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/b2ce0f99/camel-core/src/test/java/org/apache/camel/processor/dynamicrouter/DynamicRouterConcurrentPOJOTest.java
--
diff --git 
a/camel-core/src/test/java/org/apache/camel/processor/dynamicrouter/DynamicRouterConcurrentPOJOTest.java
 
b/camel-core/src/test/java/org/apache/camel/processor/dynamicrouter/DynamicRouterConcurrentPOJOTest.java
index eb6db04..776c801 100644
--- 
a/camel-core/src/test/java/org/apache/camel/processor/dynamicrouter/DynamicRouterConcurrentPOJOTest.java
+++ 
b/camel-core/src/test/java/org/apache/camel/processor/dynamicrouter/DynamicRouterConcurrentPOJOTest.java
@@ -16,7 +16,10 @@
  */
 package org.apache.camel.processor.dynamicrouter;
 
-import org.apache.camel.*;
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.DynamicRouter;
+import org.apache.camel.Exchange;
+import org.apache.camel.Header;
 import org.apache.camel.builder.RouteBuilder;
 
 public class DynamicRouterConcurrentPOJOTest extends ContextTestSupport {

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

Branch: refs/heads/camel-2.16.x
Commit: 08f53141320897f5a1185d0169d1941dbd60cecd
Parents: e639563
Author: Claus Ibsen 
Authored: Wed Nov 11 11:00:31 2015 +0100
Committer: Claus Ibsen 
Committed: Wed Nov 11 11:00:51 2015 +0100

--
 .../apache/camel/catalog/UnsafeUriCharactersEncoder.java  | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/08f53141/platforms/catalog/src/main/java/org/apache/camel/catalog/UnsafeUriCharactersEncoder.java
--
diff --git 
a/platforms/catalog/src/main/java/org/apache/camel/catalog/UnsafeUriCharactersEncoder.java
 
b/platforms/catalog/src/main/java/org/apache/camel/catalog/UnsafeUriCharactersEncoder.java
index 1d137d2..2a58f3f 100644
--- 
a/platforms/catalog/src/main/java/org/apache/camel/catalog/UnsafeUriCharactersEncoder.java
+++ 
b/platforms/catalog/src/main/java/org/apache/camel/catalog/UnsafeUriCharactersEncoder.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.
@@ -31,7 +31,7 @@ public final class UnsafeUriCharactersEncoder {
 private static BitSet unsafeCharactersRfc1738;
 private static BitSet unsafeCharactersHttp;
 private static final char[] HEX_DIGITS = {'0', '1', '2', '3', '4', '5', 
'6', '7', '8', '9', 'A', 'B', 'C',
-'D', 'E', 'F', 'a', 'b', 'c', 'd', 'e', 'f'};
+'D', 'E', 'F', 'a', 'b', 'c', 'd', 'e', 'f'};
 
 static {
 unsafeCharactersRfc1738 = new BitSet(256);
@@ -147,7 +147,7 @@ public final class UnsafeUriCharactersEncoder {
 
 // First check whether we actually need to encode
 char chars[] = s.toCharArray();
-for (int i = 0; ; ) {
+for (int i = 0;;) {
 // just deal with the ascii character
 if (chars[i] > 0 && chars[i] < 128) {
 if (unsafeCharacters.get(chars[i])) {

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

Branch: refs/heads/camel-2.16.x
Commit: 3c3bee15ab8c91caa454e78451117b03a920f9e1
Parents: 86782ae
Author: Claus Ibsen 
Authored: Tue Oct 27 14:14:36 2015 +0100
Committer: Claus Ibsen 
Committed: Tue Oct 27 14:14:48 2015 +0100

--
 .../org/apache/camel/management/mbean/ManagedCamelContext.java  | 5 +++--
 .../java/org/apache/camel/management/mbean/ManagedRoute.java| 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/3c3bee15/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java
 
b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java
index 758d3b1..91ffac0 100644
--- 
a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java
+++ 
b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java
@@ -37,8 +37,6 @@ import javax.management.openmbean.CompositeType;
 import javax.management.openmbean.TabularData;
 import javax.management.openmbean.TabularDataSupport;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
 
 import org.apache.camel.CamelContext;
@@ -66,6 +64,9 @@ import org.apache.camel.util.CamelContextHelper;
 import org.apache.camel.util.JsonSchemaHelper;
 import org.apache.camel.util.ObjectHelper;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 /**
  * @version
  */

http://git-wip-us.apache.org/repos/asf/camel/blob/3c3bee15/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 a4722fa..47760f3 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
@@ -54,9 +54,10 @@ import org.slf4j.LoggerFactory;
 @ManagedResource(description = "Managed Route")
 public class ManagedRoute extends ManagedPerformanceCounter implements 
TimerListener, ManagedRouteMBean {
 
+public static final String VALUE_UNKNOWN = "Unknown";
+
 private static final Logger LOG = 
LoggerFactory.getLogger(ManagedRoute.class);
 
-public static final String VALUE_UNKNOWN = "Unknown";
 protected final Route route;
 protected final String description;
 protected final ModelCamelContext context;

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

[davsclaus]

Fixed CS. This closes #605.


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

Branch: refs/heads/master
Commit: 42c6af57b30480509755fef97da668d4f290edfb
Parents: 237a058
Author: Claus Ibsen 
Authored: Fri Sep 4 10:21:50 2015 +0200
Committer: Claus Ibsen 
Committed: Fri Sep 4 10:21:50 2015 +0200

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


http://git-wip-us.apache.org/repos/asf/camel/blob/42c6af57/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
--
diff --git 
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
 
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
index 041aad6..207e88c 100644
--- 
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
+++ 
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
@@ -968,7 +968,7 @@ public class CxfEndpoint extends DefaultEndpoint implements 
HeaderFilterStrategy
  * To limit the total size of number of bytes the logger will output when 
logging feature has been enabled and -1 for no limit.
  */
 public void setLoggingSizeLimit(int loggingSizeLimit) {
-if(loggingSizeLimit < -1) {
+if (loggingSizeLimit < -1) {
 throw new IllegalArgumentException("LoggingSizeLimit must be 
greater or equal to -1.");
 }
 this.loggingSizeLimit = loggingSizeLimit;

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

Branch: refs/heads/camel-2.15.x
Commit: ae1f2015ee6127e32f165646b62cd2d9cd0583d1
Parents: 6ee7b9e
Author: Claus Ibsen davscl...@apache.org
Authored: Wed Jun 24 08:11:02 2015 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Wed Jun 24 08:12:08 2015 +0200

--
 .../apache/camel/component/dozer/ExpressionMapper.java   | 11 +--
 1 file changed, 5 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/ae1f2015/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/ExpressionMapper.java
--
diff --git 
a/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/ExpressionMapper.java
 
b/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/ExpressionMapper.java
index 007cc97..9a6ec17 100644
--- 
a/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/ExpressionMapper.java
+++ 
b/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/ExpressionMapper.java
@@ -22,8 +22,8 @@ import java.io.InputStream;
 import org.apache.camel.Exchange;
 import org.apache.camel.Expression;
 import org.apache.camel.spi.Language;
-import org.apache.camel.util.ResourceHelper;
 import org.apache.camel.util.IOHelper;
+import org.apache.camel.util.ResourceHelper;
 
 /**
  * Provides support for mapping a Camel expression to a target field in a 
@@ -46,15 +46,14 @@ public class ExpressionMapper extends BaseConverter {
 throw new IllegalStateException(
 Current exchange has not been set for 
ExpressionMapper);
 }
+
+Expression exp;
+
 // Resolve the language being used for this expression and evaluate
 Exchange exchange = currentExchange.get();
 Language expLang = 
exchange.getContext().resolveLanguage(getLanguagePart());
 String scheme = getSchemePart();
-Expression exp = null;
-if (scheme != null  
-(scheme.equalsIgnoreCase(classpath) ||
-scheme.equalsIgnoreCase(file) ||
-scheme.equalsIgnoreCase(http))) {
+if (scheme != null  (scheme.equalsIgnoreCase(classpath) || 
scheme.equalsIgnoreCase(file) || scheme.equalsIgnoreCase(http))) {
 String path = getPathPart();
 try {
 exp = expLang.createExpression(resolveScript(scheme + : 
+ path));

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

Branch: refs/heads/master
Commit: 5c435e0b384d3d1f047a11dc6059e9eaffcedd97
Parents: d5d4472
Author: Andrea Cosentino anco...@gmail.com
Authored: Thu Jun 11 22:24:11 2015 +0200
Committer: Andrea Cosentino anco...@gmail.com
Committed: Thu Jun 11 22:24:11 2015 +0200

--
 .../apache/camel/processor/jpa/JpaProducerRemoveTest.java| 8 
 1 file changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/5c435e0b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaProducerRemoveTest.java
--
diff --git 
a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaProducerRemoveTest.java
 
b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaProducerRemoveTest.java
index bc5f9c8..69f03ac 100644
--- 
a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaProducerRemoveTest.java
+++ 
b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaProducerRemoveTest.java
@@ -81,9 +81,9 @@ public class JpaProducerRemoveTest extends AbstractJpaTest {
 return org/apache/camel/processor/jpa/springJpaRouteTest.xml;
 }
 
-   @Override
-   protected String selectAllString() {
-   return SELECT_ALL_STRING;
-   }
+@Override
+protected String selectAllString() {
+return SELECT_ALL_STRING;
+}
 
 }

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

Branch: refs/heads/camel-2.15.x
Commit: bab41b7bfd001991adc4ae76b70e2edfd64acc67
Parents: a840245
Author: Claus Ibsen davscl...@apache.org
Authored: Fri Jun 5 08:21:02 2015 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Fri Jun 5 08:22:09 2015 +0200

--
 .../camel/component/schematron/SchematronEndpoint.java | 13 +++--
 .../schematron/processor/ClassPathURIResolver.java |  7 ++-
 2 files changed, 9 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/bab41b7b/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/SchematronEndpoint.java
--
diff --git 
a/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/SchematronEndpoint.java
 
b/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/SchematronEndpoint.java
index 8af4b13..868cc75 100644
--- 
a/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/SchematronEndpoint.java
+++ 
b/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/SchematronEndpoint.java
@@ -37,17 +37,17 @@ import org.apache.camel.util.ResourceHelper;
 import org.apache.commons.io.FileUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import static 
org.apache.camel.component.schematron.constant.Constants.LINE_NUMBERING;
 import static 
org.apache.camel.component.schematron.constant.Constants.SAXON_TRANSFORMER_FACTORY_CLASS_NAME;
 
-
 /**
  * Schematron Endpoint.
  */
 @UriEndpoint(scheme = schematron, title = Schematron, syntax = 
schematron:path, producerOnly = true, label = validation)
 public class SchematronEndpoint extends DefaultEndpoint {
 
-private Logger LOG = LoggerFactory.getLogger(SchematronEndpoint.class);
+private static final Logger LOG = 
LoggerFactory.getLogger(SchematronEndpoint.class);
 
 private TransformerFactory transformerFactory;
 
@@ -116,7 +116,6 @@ public class SchematronEndpoint extends DefaultEndpoint {
 protected void doStart() throws Exception {
 super.doStart();
 
-
 if (transformerFactory == null) {
 createTransformerFactory();
 }
@@ -144,11 +143,13 @@ public class SchematronEndpoint extends DefaultEndpoint {
 
 private void createTransformerFactory() throws ClassNotFoundException {
 // provide the class loader of this component to work in OSGi 
environments
-Class? factoryClass = 
getCamelContext().getClassResolver().resolveMandatoryClass(SAXON_TRANSFORMER_FACTORY_CLASS_NAME,
-SchematronComponent.class.getClassLoader());
+ClassTransformerFactory factoryClass = 
getCamelContext().getClassResolver().resolveMandatoryClass(SAXON_TRANSFORMER_FACTORY_CLASS_NAME,
+TransformerFactory.class, 
SchematronComponent.class.getClassLoader());
+
 LOG.debug(Using TransformerFactoryClass {}, factoryClass);
-transformerFactory = (TransformerFactory) 
getCamelContext().getInjector().newInstance(factoryClass);
+transformerFactory = 
getCamelContext().getInjector().newInstance(factoryClass);
 transformerFactory.setURIResolver(new 
ClassPathURIResolver(Constants.SCHEMATRON_TEMPLATES_ROOT_DIR));
 transformerFactory.setAttribute(LINE_NUMBERING, true);
 }
+
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/bab41b7b/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/processor/ClassPathURIResolver.java
--
diff --git 
a/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/processor/ClassPathURIResolver.java
 
b/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/processor/ClassPathURIResolver.java
index 135026b..1fc8a9a 100644
--- 
a/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/processor/ClassPathURIResolver.java
+++ 
b/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/processor/ClassPathURIResolver.java
@@ -16,24 +16,21 @@
  */
 package org.apache.camel.component.schematron.processor;
 
+import java.io.File;
 import javax.xml.transform.Source;
 import javax.xml.transform.TransformerException;
 import javax.xml.transform.URIResolver;
 import javax.xml.transform.stream.StreamSource;
-import java.io.*;
-
 
 /**
  * Class path resolver for schematron templates
- *
  */
 public class ClassPathURIResolver implements URIResolver {
 
-private 

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

Branch: refs/heads/master
Commit: 2ec8e5ce2f79c9b73b9d909c9a3c66bd35b2d14f
Parents: f2fbfc8
Author: Claus Ibsen davscl...@apache.org
Authored: Sun Mar 15 07:41:17 2015 +0100
Committer: Claus Ibsen davscl...@apache.org
Committed: Sun Mar 15 07:41:17 2015 +0100

--
 .../src/test/java/org/apache/camel/maven/DomFinderTest.java   | 2 +-
 .../apache/camel/maven/EipDocumentationEnricherMojoTest.java  | 2 +-
 .../src/test/java/org/apache/camel/maven/ResourceUtils.java   | 7 +--
 .../src/test/java/org/apache/camel/maven/XmlHelperTest.java   | 1 -
 .../camel/maven/integration/EIPDocumentationMojoTest.java | 2 +-
 5 files changed, 8 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/2ec8e5ce/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/test/java/org/apache/camel/maven/DomFinderTest.java
--
diff --git 
a/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/test/java/org/apache/camel/maven/DomFinderTest.java
 
b/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/test/java/org/apache/camel/maven/DomFinderTest.java
index 86a508f..c263a2f 100644
--- 
a/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/test/java/org/apache/camel/maven/DomFinderTest.java
+++ 
b/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/test/java/org/apache/camel/maven/DomFinderTest.java
@@ -27,6 +27,7 @@ import org.junit.Test;
 import static org.junit.Assert.assertEquals;
 
 public class DomFinderTest {
+
 private DomFinder domFinder;
 
 @Test
@@ -55,7 +56,6 @@ public class DomFinderTest {
 assertEquals(uri, ((Element) 
attributesList.item(0)).getAttribute(Constants.NAME_ATTRIBUTE_NAME));
 assertEquals(skipSendToOriginalEndpoint,
 ((Element) 
attributesList.item(1)).getAttribute(Constants.NAME_ATTRIBUTE_NAME));
-
 }
 
 @Test

http://git-wip-us.apache.org/repos/asf/camel/blob/2ec8e5ce/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/test/java/org/apache/camel/maven/EipDocumentationEnricherMojoTest.java
--
diff --git 
a/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/test/java/org/apache/camel/maven/EipDocumentationEnricherMojoTest.java
 
b/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/test/java/org/apache/camel/maven/EipDocumentationEnricherMojoTest.java
index 560fa25..83035b3 100644
--- 
a/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/test/java/org/apache/camel/maven/EipDocumentationEnricherMojoTest.java
+++ 
b/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/test/java/org/apache/camel/maven/EipDocumentationEnricherMojoTest.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.camel.maven;
 
 import java.io.File;
@@ -29,6 +28,7 @@ import static org.junit.Assert.fail;
 import static org.mockito.Mockito.when;
 
 public class EipDocumentationEnricherMojoTest {
+
 private EipDocumentationEnricherMojo eipDocumentationEnricherMojo = new 
EipDocumentationEnricherMojo();
 
 @Mock

http://git-wip-us.apache.org/repos/asf/camel/blob/2ec8e5ce/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/test/java/org/apache/camel/maven/ResourceUtils.java
--
diff --git 
a/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/test/java/org/apache/camel/maven/ResourceUtils.java
 
b/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/test/java/org/apache/camel/maven/ResourceUtils.java
index 2da69fa..5b3604f 100644
--- 
a/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/test/java/org/apache/camel/maven/ResourceUtils.java
+++ 
b/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/test/java/org/apache/camel/maven/ResourceUtils.java
@@ -18,8 +18,11 @@ package org.apache.camel.maven;
 
 import java.io.File;
 
-public class ResourceUtils {
-private ResourceUtils() { }
+public final class ResourceUtils {
+
+private ResourceUtils() {
+// noop
+}
 
 public static File getResourceAsFile(String pathToFile) throws Exception {
 return new 
File(ResourceUtils.class.getClassLoader().getResource(pathToFile).getFile());

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

Branch: refs/heads/camel-2.15.x
Commit: caa1b441c82007183dd62c299b0844fd4661fe52
Parents: 68a1306
Author: Claus Ibsen davscl...@apache.org
Authored: Sat Mar 14 20:33:21 2015 +0100
Committer: Claus Ibsen davscl...@apache.org
Committed: Sat Mar 14 20:33:41 2015 +0100

--
 .../src/main/java/org/apache/camel/util/ObjectHelper.java   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/caa1b441/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java
--
diff --git a/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java 
b/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java
index 6776b57..4c1d22b 100644
--- a/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java
+++ b/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java
@@ -44,6 +44,9 @@ import java.util.NoSuchElementException;
 import java.util.Properties;
 import java.util.Scanner;
 
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
 import org.apache.camel.CamelContext;
 import org.apache.camel.CamelExecutionException;
 import org.apache.camel.Exchange;
@@ -54,8 +57,6 @@ import org.apache.camel.TypeConverter;
 import org.apache.camel.WrappedFile;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
 
 /**
  * A number of useful helper methods for working with Objects

[4/4] camel git commit: Fixed CS error of camel-package-maven-plugin

[ningjiang]

Fixed CS error of camel-package-maven-plugin


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

Branch: refs/heads/master
Commit: 48d7f606f07e5d2ce66801654caaa033463ea070
Parents: 7517eb8
Author: Willem Jiang willem.ji...@gmail.com
Authored: Wed Feb 25 14:31:04 2015 +0800
Committer: Willem Jiang willem.ji...@gmail.com
Committed: Wed Feb 25 14:31:04 2015 +0800

--
 .../java/org/apache/camel/maven/packaging/StringHelper.java | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/48d7f606/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/StringHelper.java
--
diff --git 
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/StringHelper.java
 
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/StringHelper.java
index 9af9ec9..ac6a133 100644
--- 
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/StringHelper.java
+++ 
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/StringHelper.java
@@ -16,7 +16,10 @@
  */
 package org.apache.camel.maven.packaging;
 
-public class StringHelper {
+public final class StringHelper {
+private StringHelper() {
+// Utils Class
+}
 
 public static String after(String text, String after) {
 if (!text.contains(after)) {

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

Branch: refs/heads/master
Commit: 424abd63c74b4a2f35a704ed23ab02beecdafa61
Parents: 6fd9adf
Author: Claus Ibsen davscl...@apache.org
Authored: Thu Jan 29 07:40:08 2015 +0100
Committer: Claus Ibsen davscl...@apache.org
Committed: Thu Jan 29 07:40:08 2015 +0100

--
 .../java/org/apache/camel/component/cmis/CMISProducer.java| 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/424abd63/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISProducer.java
--
diff --git 
a/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISProducer.java
 
b/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISProducer.java
index 5169ed6..b05346d 100644
--- 
a/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISProducer.java
+++ 
b/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISProducer.java
@@ -59,8 +59,9 @@ public class CMISProducer extends DefaultProducer {
 private MapString, Object filterTypeProperties(MapString, Object 
properties) {
 MapString, Object result = new HashMapString, 
Object(properties.size());
 String objectTypeName = CamelCMISConstants.CMIS_DOCUMENT;
-if (properties.containsKey(PropertyIds.OBJECT_TYPE_ID))
-objectTypeName = 
(String)properties.get(PropertyIds.OBJECT_TYPE_ID);
+if (properties.containsKey(PropertyIds.OBJECT_TYPE_ID)) {
+objectTypeName = (String) 
properties.get(PropertyIds.OBJECT_TYPE_ID);
+}
 
 SetString types = cmisSessionFacade.getPropertiesFor(objectTypeName);
 for (Map.EntryString, Object entry : properties.entrySet()) {
@@ -161,7 +162,7 @@ public class CMISProducer extends DefaultProducer {
 }
 
 private byte[] getBodyData(Message message) {
-return message.getBody(new byte[0].getClass());
+return message.getBody(byte[].class);
 }
 
 private String getMimeType(Message message) throws NoSuchHeaderException {

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

Branch: refs/heads/master
Commit: 76d808632f3d22a0a1b6507cd6a9a5c1b9355b42
Parents: 9277eac
Author: Claus Ibsen davscl...@apache.org
Authored: Mon Jan 19 14:34:25 2015 +0100
Committer: Claus Ibsen davscl...@apache.org
Committed: Mon Jan 19 14:34:25 2015 +0100

--
 .../src/main/java/org/apache/camel/impl/DefaultConsumer.java  | 2 +-
 .../src/main/java/org/apache/camel/impl/RouteService.java | 2 +-
 .../src/main/java/org/apache/camel/spi/EndpointRegistry.java  | 2 +-
 camel-core/src/main/java/org/apache/camel/util/LRUCache.java  | 7 ---
 4 files changed, 7 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/76d80863/camel-core/src/main/java/org/apache/camel/impl/DefaultConsumer.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/impl/DefaultConsumer.java 
b/camel-core/src/main/java/org/apache/camel/impl/DefaultConsumer.java
index 7e3fde6..30a25f1 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultConsumer.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultConsumer.java
@@ -19,11 +19,11 @@ package org.apache.camel.impl;
 import org.apache.camel.AsyncProcessor;
 import org.apache.camel.Consumer;
 import org.apache.camel.Endpoint;
+import org.apache.camel.EndpointAware;
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.Route;
 import org.apache.camel.RouteAware;
-import org.apache.camel.EndpointAware;
 import org.apache.camel.spi.ExceptionHandler;
 import org.apache.camel.spi.UnitOfWork;
 import org.apache.camel.support.ServiceSupport;

http://git-wip-us.apache.org/repos/asf/camel/blob/76d80863/camel-core/src/main/java/org/apache/camel/impl/RouteService.java
--
diff --git a/camel-core/src/main/java/org/apache/camel/impl/RouteService.java 
b/camel-core/src/main/java/org/apache/camel/impl/RouteService.java
index f23498d..2139d5c 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/RouteService.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/RouteService.java
@@ -29,6 +29,7 @@ import org.apache.camel.CamelContext;
 import org.apache.camel.Channel;
 import org.apache.camel.Consumer;
 import org.apache.camel.Endpoint;
+import org.apache.camel.EndpointAware;
 import org.apache.camel.Processor;
 import org.apache.camel.Route;
 import org.apache.camel.RouteAware;
@@ -37,7 +38,6 @@ import org.apache.camel.model.OnCompletionDefinition;
 import org.apache.camel.model.OnExceptionDefinition;
 import org.apache.camel.model.ProcessorDefinition;
 import org.apache.camel.model.RouteDefinition;
-import org.apache.camel.EndpointAware;
 import org.apache.camel.processor.ErrorHandler;
 import org.apache.camel.spi.LifecycleStrategy;
 import org.apache.camel.spi.RouteContext;

http://git-wip-us.apache.org/repos/asf/camel/blob/76d80863/camel-core/src/main/java/org/apache/camel/spi/EndpointRegistry.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/spi/EndpointRegistry.java 
b/camel-core/src/main/java/org/apache/camel/spi/EndpointRegistry.java
index 7609d3b..3a42dfa 100644
--- a/camel-core/src/main/java/org/apache/camel/spi/EndpointRegistry.java
+++ b/camel-core/src/main/java/org/apache/camel/spi/EndpointRegistry.java
@@ -52,7 +52,7 @@ public interface EndpointRegistryK extends MapK, 
Endpoint, StaticService {
 /**
  * Maximum number of entries to store in the dynamic registry
  */
-public int getMaximumCacheSize();
+int getMaximumCacheSize();
 
 /**
  * Purges the cache (removes endpoints from the dynamic cache)

http://git-wip-us.apache.org/repos/asf/camel/blob/76d80863/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 7d03f02..9599cac 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
@@ -39,12 +39,13 @@ import org.slf4j.LoggerFactory;
 public class LRUCacheK, V implements MapK, V, EvictionListenerK, V, 
Serializable {
 private static final long serialVersionUID = -342098639681884414L;
 private static final Logger LOG = LoggerFactory.getLogger(LRUCache.class);
-
-private int maxCacheSize = 1;
-private boolean