[3/4] camel git commit: Fixed CS

2017-04-21 Thread davsclaus 
Fixed CS


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

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

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


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

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

[3/4] camel git commit: Fixed CS

2016-11-18 Thread ggrzybek 
Fixed CS

(cherry picked from commit 3c4eb0defb8fb9987b977fc16b97ff5a764f85dc)


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

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

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


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

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

[3/4] camel git commit: Fixed CS. This closes #1157. This closes #1155.

2016-09-07 Thread davsclaus 
Fixed CS. This closes #1157. This closes #1155.


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

Branch: refs/heads/ftpfix
Commit: 4d4b5bcb50433750b53f40a7857f96cf1b146c75
Parents: 2e1dd68
Author: Claus Ibsen 
Authored: Wed Sep 7 09:24:49 2016 +0200
Committer: Claus Ibsen 
Committed: Wed Sep 7 09:24:49 2016 +0200

--
 .../jetty/rest/producer/JettyRestProducerPojoInOutTest.java| 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


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

[3/4] camel git commit: Fixed CS

2016-07-24 Thread 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/9dce5091
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9dce5091
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9dce5091

Branch: refs/heads/master
Commit: 9dce5091bc7533e294d09dfd08554f3e8f92bd2e
Parents: 0c90522
Author: Claus Ibsen 
Authored: Sun Jul 24 13:53:17 2016 +0200
Committer: Claus Ibsen 
Committed: Sun Jul 24 13:53:17 2016 +0200

--
 .../org/apache/camel/impl/DefaultAttachment.java  |  4 ++--
 .../java/org/apache/camel/util/AttachmentMap.java | 18 ++
 2 files changed, 12 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/9dce5091/camel-core/src/main/java/org/apache/camel/impl/DefaultAttachment.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/impl/DefaultAttachment.java 
b/camel-core/src/main/java/org/apache/camel/impl/DefaultAttachment.java
index dbb87af..8a1ad89 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultAttachment.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultAttachment.java
@@ -29,7 +29,7 @@ import org.apache.camel.Attachment;
 import org.apache.camel.util.CollectionHelper;
 
 public class DefaultAttachment implements Attachment {
-private Map headers = null;
+private Map headers;
 private DataHandler dataHandler;
 
 public DefaultAttachment(DataHandler dh) {
@@ -120,6 +120,6 @@ public class DefaultAttachment implements Attachment {
 }
 
 public int hashCode() {
-return (dataHandler.hashCode());
+return dataHandler.hashCode();
 }
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/9dce5091/camel-core/src/main/java/org/apache/camel/util/AttachmentMap.java
--
diff --git a/camel-core/src/main/java/org/apache/camel/util/AttachmentMap.java 
b/camel-core/src/main/java/org/apache/camel/util/AttachmentMap.java
index 1f33546..b6c0a5f 100644
--- a/camel-core/src/main/java/org/apache/camel/util/AttachmentMap.java
+++ b/camel-core/src/main/java/org/apache/camel/util/AttachmentMap.java
@@ -60,7 +60,7 @@ public class AttachmentMap extends AbstractMap {
 private static class AttachmentEntrySet extends 
AbstractSet> {
 private Set> set;
 
-public AttachmentEntrySet(Set> set) {
+AttachmentEntrySet(Set> set) {
 this.set = set;
 }
 
@@ -78,7 +78,7 @@ public class AttachmentMap extends AbstractMap {
 private static class AttachmentEntrySetIterator implements 
Iterator> {
 private Iterator> iter;
 
-public AttachmentEntrySetIterator(Iterator> origIterator) {
+AttachmentEntrySetIterator(Iterator> 
origIterator) {
 iter = origIterator;
 }
 
@@ -100,7 +100,7 @@ public class AttachmentMap extends AbstractMap {
 private static class AttachmentEntry implements Map.Entry {
 private Map.Entry entry;
 
-public AttachmentEntry(Map.Entry backingEntry) {
+AttachmentEntry(Map.Entry backingEntry) {
 this.entry = backingEntry;
 }
 
@@ -112,24 +112,26 @@ public class AttachmentMap extends AbstractMap {
 @Override
 public DataHandler getValue() {
 Attachment value = entry.getValue();
-if (value != null)
+if (value != null) {
 return value.getDataHandler();
+}
 return null;
 }
 
 @Override
 public DataHandler setValue(DataHandler value) {
 Attachment oldValue = entry.setValue(new DefaultAttachment(value));
-if (oldValue != null)
+if (oldValue != null) {
 return oldValue.getDataHandler();
+}
 return null;
 }
 
-// two AttachmentEntry objects are equal if the backing entries are
-// equal
+// two AttachmentEntry objects are equal if the backing entries are 
equal
 public boolean equals(Object o) {
-if (o instanceof AttachmentEntry && 
entry.equals(((AttachmentEntry)o).entry))
+if (o instanceof AttachmentEntry && 
entry.equals(((AttachmentEntry)o).entry)) {
 return true;
+

[3/4] camel git commit: Fixed CS

2016-07-05 Thread 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/5086efed
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5086efed
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5086efed

Branch: refs/heads/master
Commit: 5086efed065a922954c1283bab9a68ac69a4a51f
Parents: b059605
Author: Andrea Cosentino 
Authored: Tue Jul 5 12:35:29 2016 +0200
Committer: Andrea Cosentino 
Committed: Tue Jul 5 12:46:50 2016 +0200

--
 .../camel/component/aws/s3/S3Configuration.java | 13 ++---
 .../camel/component/aws/s3/S3Producer.java  | 20 ++--
 .../aws/s3/S3ComponentCopyObjectSpringTest.java |  6 +++---
 .../aws/s3/S3ComponentCopyObjectTest.java   |  6 +++---
 4 files changed, 22 insertions(+), 23 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/5086efed/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Configuration.java
--
diff --git 
a/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Configuration.java
 
b/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Configuration.java
index 533bcc8..4939832 100644
--- 
a/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Configuration.java
+++ 
b/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Configuration.java
@@ -284,18 +284,17 @@ public class S3Configuration implements Cloneable {
 }
 
 public S3Operations getOperation() {
-   return operation;
-   }
+return operation;
+}
 
 /**
  * *Camel 2.18*: The operation to do in case the user don't want to do 
only an upload
  */
-   public void setOperation(S3Operations operation) {
-   this.operation = operation;
-   }
+public void setOperation(S3Operations operation) {
+this.operation = operation;
+}
 
-   boolean hasProxyConfiguration() {
+boolean hasProxyConfiguration() {
 return ObjectHelper.isNotEmpty(getProxyHost()) && 
ObjectHelper.isNotEmpty(getProxyPort());
-
 }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/camel/blob/5086efed/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Producer.java
--
diff --git 
a/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Producer.java
 
b/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Producer.java
index 538d413..e7bab7e 100644
--- 
a/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Producer.java
+++ 
b/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Producer.java
@@ -74,14 +74,14 @@ public class S3Producer extends DefaultProducer {
 
 @Override
 public void process(final Exchange exchange) throws Exception {
-   S3Operations operation = determineOperation(exchange);
-   if (ObjectHelper.isEmpty(operation)) {
+S3Operations operation = determineOperation(exchange);
+if (ObjectHelper.isEmpty(operation)) {
 if (getConfiguration().isMultiPartUpload()) {
 processMultiPart(exchange);
 } else {
 processSingleOp(exchange);
 }
-   } else {
+} else {
 switch (operation) {
 case copyObject:
 copyObject(getEndpoint().getS3Client(), exchange);
@@ -89,7 +89,7 @@ public class S3Producer extends DefaultProducer {
 default:
 throw new IllegalArgumentException("Unsupported operation");
 }
-   }
+}
 }
 
 public void processMultiPart(final Exchange exchange) throws Exception {
@@ -251,7 +251,7 @@ public class S3Producer extends DefaultProducer {
 
 bucketName = exchange.getIn().getHeader(S3Constants.BUCKET_NAME, 
String.class);
 if (ObjectHelper.isEmpty(bucketName)) {
-   bucketName = getConfiguration().getBucketName();
+bucketName = getConfiguration().getBucketName();
 }
 sourceKey = exchange.getIn().getHeader(S3Constants.KEY, String.class);
 destinationKey = 
exchange.getIn().getHeader(S3Constants.DESTINATION_KEY, String.class);
@@ -259,22 +259,22 @@ public class S3Producer extends DefaultProducer {
 versionId = exchange.getIn().getHeader(S3Constants.VERSION_ID, 
String.class);
 
 if (ObjectHelper.isEmpty(bucketName)) {
-   throw new IllegalArgumentException("Bucket Name must be 
specified for copyObject Operation");
+throw new IllegalArgumentException("Bucket Name must be specified 
for copyObject

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

2016-04-30 Thread 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/50d029ae
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/50d029ae
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/50d029ae

Branch: refs/heads/master
Commit: 50d029ae217d8a46e07fe24a3f1e5780f5111e81
Parents: 84fbf55
Author: Claus Ibsen 
Authored: Sun May 1 07:44:32 2016 +0200
Committer: Claus Ibsen 
Committed: Sun May 1 07:44:32 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/50d029ae/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/50d029ae/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/50d029ae/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
---

[3/4] camel git commit: Fixed CS

2016-04-28 Thread 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/7459007d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7459007d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7459007d

Branch: refs/heads/camel-2.17.x
Commit: 7459007d12aa37276ede6d7a7ed0257c0e001eaf
Parents: f64562b
Author: Claus Ibsen 
Authored: Thu Apr 28 21:04:10 2016 +0200
Committer: Claus Ibsen 
Committed: Thu Apr 28 21:04:10 2016 +0200

--
 .../java/org/apache/camel/component/etcd/EtcdWatchConsumer.java  | 2 +-
 .../test/java/org/apache/camel/component/etcd/EtcdWatchTest.java | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/7459007d/components/camel-etcd/src/main/java/org/apache/camel/component/etcd/EtcdWatchConsumer.java
--
diff --git 
a/components/camel-etcd/src/main/java/org/apache/camel/component/etcd/EtcdWatchConsumer.java
 
b/components/camel-etcd/src/main/java/org/apache/camel/component/etcd/EtcdWatchConsumer.java
index 9f85a0a..153cbdb 100644
--- 
a/components/camel-etcd/src/main/java/org/apache/camel/component/etcd/EtcdWatchConsumer.java
+++ 
b/components/camel-etcd/src/main/java/org/apache/camel/component/etcd/EtcdWatchConsumer.java
@@ -128,7 +128,7 @@ public class EtcdWatchConsumer extends AbstractEtcdConsumer 
implements ResponseP
 }
 }
 
-if (throwable != null){
+if (throwable != null) {
 handleException("Error processing etcd response", throwable);
 }
 

http://git-wip-us.apache.org/repos/asf/camel/blob/7459007d/components/camel-etcd/src/test/java/org/apache/camel/component/etcd/EtcdWatchTest.java
--
diff --git 
a/components/camel-etcd/src/test/java/org/apache/camel/component/etcd/EtcdWatchTest.java
 
b/components/camel-etcd/src/test/java/org/apache/camel/component/etcd/EtcdWatchTest.java
index 60cea00..c511325 100644
--- 
a/components/camel-etcd/src/test/java/org/apache/camel/component/etcd/EtcdWatchTest.java
+++ 
b/components/camel-etcd/src/test/java/org/apache/camel/component/etcd/EtcdWatchTest.java
@@ -78,7 +78,7 @@ public class EtcdWatchTest extends EtcdTest {
 
 private void testWatch(String mockEndpoint, final String key, int updates) 
throws Exception {
 final String[] values = new String[updates];
-for (int i = 0; i< updates; i++) {
+for (int i = 0; i < updates; i++) {
 values[i] = key + "=myValue-" + i;
 }
 
@@ -89,7 +89,7 @@ public class EtcdWatchTest extends EtcdTest {
 mock.expectedBodiesReceived(values);
 
 final EtcdClient client = getClient();
-for (int i = 0; i< updates; i++) {
+for (int i = 0; i < updates; i++) {
 client.put(key, "myValue-" + i).send().get();
 }

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

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

Branch: refs/heads/master
Commit: d943910b26ace69c7c00122ea32dcdf883e21a32
Parents: 4cf2aa4
Author: Claus Ibsen 
Authored: Thu Apr 7 10:29:04 2016 +0200
Committer: Claus Ibsen 
Committed: Thu Apr 7 10:29:04 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/d943910b/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);
 }
 
 /**

[3/4] camel git commit: Fixed CS

2015-10-27 Thread 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/bc11cef6
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/bc11cef6
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/bc11cef6

Branch: refs/heads/master
Commit: bc11cef6985ebbe026143cfc1b3fa431fe24dd70
Parents: f4d689c
Author: Claus Ibsen 
Authored: Tue Oct 27 14:14:36 2015 +0100
Committer: Claus Ibsen 
Committed: Tue Oct 27 14:14:36 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/bc11cef6/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/bc11cef6/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;

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

2015-09-27 Thread davsclaus 
Fixed CS. This closes #624.


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

Branch: refs/heads/master
Commit: 6ffcaccc3dfae27cb3465509738952b33e3c5315
Parents: 91812a5
Author: Claus Ibsen 
Authored: Mon Sep 28 07:22:29 2015 +0200
Committer: Claus Ibsen 
Committed: Mon Sep 28 07:22:29 2015 +0200

--
 .../camel/component/netty/http/NettyHttpComponent.java   | 8 
 .../camel/component/netty4/http/NettyHttpComponent.java  | 8 
 2 files changed, 8 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/6ffcaccc/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpComponent.java
--
diff --git 
a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpComponent.java
 
b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpComponent.java
index 2763256..370c6c8 100644
--- 
a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpComponent.java
+++ 
b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpComponent.java
@@ -272,10 +272,10 @@ public class NettyHttpComponent extends NettyComponent 
implements HeaderFilterSt
 }
 
 String contextPath = config.getContextPath();
-if(ObjectHelper.isNotEmpty(contextPath)) {
-   contextPath = FileUtil.stripTrailingSeparator(contextPath);
-   contextPath = FileUtil.stripLeadingSeparator(contextPath);
-   path =  contextPath + "/" + path;
+if (ObjectHelper.isNotEmpty(contextPath)) {
+contextPath = FileUtil.stripTrailingSeparator(contextPath);
+contextPath = FileUtil.stripLeadingSeparator(contextPath);
+path = contextPath + "/" + path;
 }
 
 // if no explicit hostname set then resolve the hostname

http://git-wip-us.apache.org/repos/asf/camel/blob/6ffcaccc/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpComponent.java
--
diff --git 
a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpComponent.java
 
b/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpComponent.java
index bf104c4..1f8e397 100644
--- 
a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpComponent.java
+++ 
b/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpComponent.java
@@ -271,10 +271,10 @@ public class NettyHttpComponent extends NettyComponent 
implements HeaderFilterSt
 }
 
 String contextPath = config.getContextPath();
-if(ObjectHelper.isNotEmpty(contextPath)) {
-   contextPath = FileUtil.stripTrailingSeparator(contextPath);
-   contextPath = FileUtil.stripLeadingSeparator(contextPath);
-   path =  contextPath + "/" + path;
+if (ObjectHelper.isNotEmpty(contextPath)) {
+contextPath = FileUtil.stripTrailingSeparator(contextPath);
+contextPath = FileUtil.stripLeadingSeparator(contextPath);
+path = contextPath + "/" + path;
 }
 
 // if no explicit hostname set then resolve the hostname

[3/4] camel git commit: Fixed CS

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

Branch: refs/heads/master
Commit: a6c87f315c9481bd819f6c55f0889be318fe4b60
Parents: 5170ccd
Author: Claus Ibsen davscl...@apache.org
Authored: Mon Feb 9 08:29:54 2015 +0100
Committer: Claus Ibsen davscl...@apache.org
Committed: Mon Feb 9 08:29:54 2015 +0100

--
 .../java/org/apache/camel/component/browse/BrowseComponent.java   | 3 ++-
 .../org/apache/camel/component/file/GenericFileOnCompletion.java  | 2 +-
 .../main/java/org/apache/camel/component/seda/SedaConsumer.java   | 2 +-
 .../src/main/java/org/apache/camel/processor/BatchProcessor.java  | 2 +-
 .../main/java/org/apache/camel/processor/StreamResequencer.java   | 2 +-
 .../org/apache/camel/processor/aggregate/AggregateProcessor.java  | 2 +-
 6 files changed, 7 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/a6c87f31/camel-core/src/main/java/org/apache/camel/component/browse/BrowseComponent.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/component/browse/BrowseComponent.java
 
b/camel-core/src/main/java/org/apache/camel/component/browse/BrowseComponent.java
index 7e4c0aa..e3a6716 100644
--- 
a/camel-core/src/main/java/org/apache/camel/component/browse/BrowseComponent.java
+++ 
b/camel-core/src/main/java/org/apache/camel/component/browse/BrowseComponent.java
@@ -22,7 +22,8 @@ import org.apache.camel.Endpoint;
 import org.apache.camel.impl.UriEndpointComponent;
 
 /**
- * The a href=http://camel.apache.org/browse.html;Browse Component/a 
provides a simple a 
href=http://camel.apache.org/browsableendpoint.html;BrowsableEndpoint/a for 
testing visualization or debugging.
+ * The a href=http://camel.apache.org/browse.html;Browse Component/a 
provides a simple
+ * a 
href=http://camel.apache.org/browsableendpoint.html;BrowsableEndpoint/a for 
testing visualization or debugging.
  *
  * @version 
  */

http://git-wip-us.apache.org/repos/asf/camel/blob/a6c87f31/camel-core/src/main/java/org/apache/camel/component/file/GenericFileOnCompletion.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/component/file/GenericFileOnCompletion.java
 
b/camel-core/src/main/java/org/apache/camel/component/file/GenericFileOnCompletion.java
index 1916493..015250d 100644
--- 
a/camel-core/src/main/java/org/apache/camel/component/file/GenericFileOnCompletion.java
+++ 
b/camel-core/src/main/java/org/apache/camel/component/file/GenericFileOnCompletion.java
@@ -17,9 +17,9 @@
 package org.apache.camel.component.file;
 
 import org.apache.camel.Exchange;
-import org.apache.camel.support.LoggingExceptionHandler;
 import org.apache.camel.spi.ExceptionHandler;
 import org.apache.camel.spi.Synchronization;
+import org.apache.camel.support.LoggingExceptionHandler;
 import org.apache.camel.util.ObjectHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

http://git-wip-us.apache.org/repos/asf/camel/blob/a6c87f31/camel-core/src/main/java/org/apache/camel/component/seda/SedaConsumer.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/component/seda/SedaConsumer.java 
b/camel-core/src/main/java/org/apache/camel/component/seda/SedaConsumer.java
index 77a1698..5ddd0b5 100644
--- a/camel-core/src/main/java/org/apache/camel/component/seda/SedaConsumer.java
+++ b/camel-core/src/main/java/org/apache/camel/component/seda/SedaConsumer.java
@@ -31,11 +31,11 @@ import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.ShutdownRunningTask;
 import org.apache.camel.SuspendableService;
-import org.apache.camel.support.LoggingExceptionHandler;
 import org.apache.camel.processor.MulticastProcessor;
 import org.apache.camel.spi.ExceptionHandler;
 import org.apache.camel.spi.ShutdownAware;
 import org.apache.camel.spi.Synchronization;
+import org.apache.camel.support.LoggingExceptionHandler;
 import org.apache.camel.support.ServiceSupport;
 import org.apache.camel.util.AsyncProcessorConverterHelper;
 import org.apache.camel.util.ExchangeHelper;

http://git-wip-us.apache.org/repos/asf/camel/blob/a6c87f31/camel-core/src/main/java/org/apache/camel/processor/BatchProcessor.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/processor/BatchProcessor.java 
b/camel-core/src/main/java/org/apache/camel/processor/BatchProcessor.java
index 2dde110..c62b614 100644
---