camel git commit: Fix CS violations

[bvahdat]

Repository: camel
Updated Branches:
  refs/heads/master 079b5f9e6 -> 490a76f17


Fix CS violations

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

Branch: refs/heads/master
Commit: 490a76f17a1cb96a08009607a7aa972e7bc0372d
Parents: 079b5f9
Author: Babak Vahdat 
Authored: Sun Dec 18 18:26:52 2016 +0100
Committer: Babak Vahdat 
Committed: Sun Dec 18 18:26:52 2016 +0100

--
 .../component/bonita/BonitaConfiguration.java   |   6 +-
 .../core/xml/CamelProxyFactoryDefinition.java   |   2 +-
 .../camel/component/gridfs/GridFsEndpoint.java  |   1 -
 .../openstack/nova/KeypairProducerTest.java |   2 +-
 .../processor/RibbonServiceCallProcessor.java   |  19 +-
 .../component/servicenow/ServiceNowClient.java  |   2 +-
 components/readme.adoc  | 402 ---
 7 files changed, 15 insertions(+), 419 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/490a76f1/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/BonitaConfiguration.java
--
diff --git 
a/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/BonitaConfiguration.java
 
b/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/BonitaConfiguration.java
index 7343e2c..b992682 100644
--- 
a/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/BonitaConfiguration.java
+++ 
b/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/BonitaConfiguration.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/490a76f1/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/CamelProxyFactoryDefinition.java
--
diff --git 
a/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/CamelProxyFactoryDefinition.java
 
b/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/CamelProxyFactoryDefinition.java
index 6f160ce..5c78b93 100644
--- 
a/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/CamelProxyFactoryDefinition.java
+++ 
b/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/CamelProxyFactoryDefinition.java
@@ -63,7 +63,7 @@ public class CamelProxyFactoryDefinition extends 
IdentifiedType {
  * @deprecated use serviceUrl instead with the ref endpoint.
  */
 @Deprecated
-   public void setServiceRef(String serviceRef) {
+public void setServiceRef(String serviceRef) {
 this.serviceRef = serviceRef;
 }
 

http://git-wip-us.apache.org/repos/asf/camel/blob/490a76f1/components/camel-mongodb-gridfs/src/main/java/org/apache/camel/component/gridfs/GridFsEndpoint.java
--
diff --git 
a/components/camel-mongodb-gridfs/src/main/java/org/apache/camel/component/gridfs/GridFsEndpoint.java
 
b/components/camel-mongodb-gridfs/src/main/java/org/apache/camel/component/gridfs/GridFsEndpoint.java
index cb8f686..f4d5d65 100644
--- 
a/components/camel-mongodb-gridfs/src/main/java/org/apache/camel/component/gridfs/GridFsEndpoint.java
+++ 
b/components/camel-mongodb-gridfs/src/main/java/org/apache/camel/component/gridfs/GridFsEndpoint.java
@@ -39,7 +39,6 @@ import org.slf4j.LoggerFactory;
 @UriEndpoint(scheme = "gridfs", title = "MongoDBGridFS", syntax = 
"gridfs:connectionBean", label = "database,nosql")
 public class GridFsEndpoint extends DefaultEndpoint {
 
-;
 public static final String GRIDFS_OPERATION = "gridfs.operation";
 public static final String GRIDFS_METADATA = "gridfs.metadata";
 public static final String GRIDFS_CHUNKSIZE = "gridfs.chunksize";

http://git-wip-us.apache.org/repos/asf/camel/blob/490a76f1/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/nova/KeypairProducerTest.java
--
diff --git 
a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/nova/KeypairProducerTest.java
 

[1/5] camel git commit: Polish

[bvahdat]

Repository: camel
Updated Branches:
  refs/heads/master 7bc7a37ac -> 079b5f9e6


Polish

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

Branch: refs/heads/master
Commit: dccd46005a9550a021c43dc1b690816d44eee42b
Parents: 7bc7a37
Author: Babak Vahdat 
Authored: Sun Dec 18 17:14:21 2016 +0100
Committer: Babak Vahdat 
Committed: Sun Dec 18 17:14:21 2016 +0100

--
 .../apache/camel/util/component/ApiMethodParser.java   |  1 -
 .../camel/component/bean/BeanConcurrentTest.java   |  1 -
 .../api/util/BonitaAPIUtilPrepareInputsTest.java   | 13 +++--
 .../docker/headers/AttachContainerCmdHeaderTest.java   |  2 +-
 .../docker/headers/BuildImageCmdHeaderTest.java|  4 ++--
 .../google/calendar/CalendarConfigurationTest.java |  2 --
 .../openstack/common/AbstractOpenstackProducer.java|  2 +-
 .../component/salesforce/dto/generated/Account.java|  2 --
 .../component/salesforce/dto/generated/Asset.java  |  3 ---
 .../sql/stored/CallableStatementWrapperTest.java   |  2 +-
 .../example/transformer/demo/client/CamelClient.java   |  5 -
 11 files changed, 12 insertions(+), 25 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/dccd4600/camel-core/src/main/java/org/apache/camel/util/component/ApiMethodParser.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/util/component/ApiMethodParser.java 
b/camel-core/src/main/java/org/apache/camel/util/component/ApiMethodParser.java
index 8829ba5..73f71e6 100644
--- 
a/camel-core/src/main/java/org/apache/camel/util/component/ApiMethodParser.java
+++ 
b/camel-core/src/main/java/org/apache/camel/util/component/ApiMethodParser.java
@@ -19,7 +19,6 @@ package org.apache.camel.util.component;
 import java.lang.reflect.Array;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;

http://git-wip-us.apache.org/repos/asf/camel/blob/dccd4600/camel-core/src/test/java/org/apache/camel/component/bean/BeanConcurrentTest.java
--
diff --git 
a/camel-core/src/test/java/org/apache/camel/component/bean/BeanConcurrentTest.java
 
b/camel-core/src/test/java/org/apache/camel/component/bean/BeanConcurrentTest.java
index 4601a21..dfa4848 100644
--- 
a/camel-core/src/test/java/org/apache/camel/component/bean/BeanConcurrentTest.java
+++ 
b/camel-core/src/test/java/org/apache/camel/component/bean/BeanConcurrentTest.java
@@ -17,7 +17,6 @@
 package org.apache.camel.component.bean;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 
 import org.apache.camel.ContextTestSupport;

http://git-wip-us.apache.org/repos/asf/camel/blob/dccd4600/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/util/BonitaAPIUtilPrepareInputsTest.java
--
diff --git 
a/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/util/BonitaAPIUtilPrepareInputsTest.java
 
b/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/util/BonitaAPIUtilPrepareInputsTest.java
index 14a900c..1750d15 100644
--- 
a/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/util/BonitaAPIUtilPrepareInputsTest.java
+++ 
b/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/util/BonitaAPIUtilPrepareInputsTest.java
@@ -27,6 +27,7 @@ import 
org.apache.camel.component.bonita.api.model.UploadFileResponse;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.Matchers;
 import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.powermock.core.classloader.annotations.PrepareForTest;
@@ -80,8 +81,8 @@ public class BonitaAPIUtilPrepareInputsTest {
 BonitaAPIUtil bonitaApiUtilMod = Mockito.spy(bonitaApiUtil);
 UploadFileResponse uploadFileResponse = new UploadFileResponse();
 uploadFileResponse.setTempPath("temp");
-
Mockito.doReturn(uploadFileResponse).when(bonitaApiUtilMod).uploadFile(Mockito.any(),
-Mockito.any());
+
Mockito.doReturn(uploadFileResponse).when(bonitaApiUtilMod).uploadFile(Matchers.any(),
+Matchers.any());
 Map inputs =
 bonitaApiUtilMod.prepareInputs(processDefinition, rawInputs);
 assertEquals(rawInputs.size(), inputs.size());
@@ -96,8 +97,8 @@ public class 

[3/5] camel git commit: Polish

[bvahdat]

Polish

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

Branch: refs/heads/master
Commit: 769a57094b7c5054d5b88f79995aff85195a9f83
Parents: 5b66536
Author: Babak Vahdat 
Authored: Sun Dec 18 17:15:48 2016 +0100
Committer: Babak Vahdat 
Committed: Sun Dec 18 17:15:48 2016 +0100

--
 .../camel/impl/MappedEndpointConfiguration.java  |  1 -
 .../management/mbean/ManagedCamelContext.java|  1 -
 .../apache/camel/util/IntrospectionSupport.java  |  4 ++--
 .../headers/LogContainerCmdHeaderTest.java   |  2 +-
 .../google/pubsub/GooglePubsubConsumer.java  |  3 ---
 .../InfinispanLocalAggregationRepository.java|  4 ++--
 .../InfinispanRemoteAggregationRepository.java   |  4 ++--
 .../camel/component/ironmq/IronMQConsumer.java   |  4 ++--
 ...MarshalUnmarshalTypeHeaderNotAllowedTest.java |  2 --
 .../camel/component/jcache/JCacheProducer.java   |  6 +++---
 .../camel/component/jms/JmsPollingConsumer.java  |  5 +++--
 .../camel/component/kafka/KafkaProducerTest.java |  6 +++---
 .../test/junit/rule/mllp/MllpClientResource.java |  6 +++---
 .../keystone/producer/GroupProducer.java | 19 ++-
 .../openstack/nova/producer/KeypairProducer.java | 15 ---
 .../openstack/glance/GlanceProducerTest.java | 19 ++-
 .../openstack/keystone/GroupProducerTest.java| 17 +
 .../openstack/nova/KeypairProducerTest.java  | 11 ++-
 .../org/apache/camel/test/blueprint/Main.java|  1 -
 19 files changed, 64 insertions(+), 66 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/769a5709/camel-core/src/main/java/org/apache/camel/impl/MappedEndpointConfiguration.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/impl/MappedEndpointConfiguration.java
 
b/camel-core/src/main/java/org/apache/camel/impl/MappedEndpointConfiguration.java
index b0147d2..10e94ee 100644
--- 
a/camel-core/src/main/java/org/apache/camel/impl/MappedEndpointConfiguration.java
+++ 
b/camel-core/src/main/java/org/apache/camel/impl/MappedEndpointConfiguration.java
@@ -17,7 +17,6 @@
 package org.apache.camel.impl;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;

http://git-wip-us.apache.org/repos/asf/camel/blob/769a5709/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 c4e7c4a..c5ff800 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
@@ -22,7 +22,6 @@ import java.io.InputStream;
 import java.net.URLDecoder;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 import java.util.Map;

http://git-wip-us.apache.org/repos/asf/camel/blob/769a5709/camel-core/src/main/java/org/apache/camel/util/IntrospectionSupport.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/util/IntrospectionSupport.java 
b/camel-core/src/main/java/org/apache/camel/util/IntrospectionSupport.java
index 46fd82e..37d0edc 100755
--- a/camel-core/src/main/java/org/apache/camel/util/IntrospectionSupport.java
+++ b/camel-core/src/main/java/org/apache/camel/util/IntrospectionSupport.java
@@ -34,6 +34,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.Set;
 import java.util.regex.Pattern;
 
@@ -453,8 +454,7 @@ public final class IntrospectionSupport {
 
 Map rc = new LinkedHashMap(properties.size());
 
-for (Iterator> it = 
properties.entrySet().iterator(); it.hasNext();) {
-Map.Entry entry = it.next();
+for (Entry entry : properties.entrySet()) {
 String name = entry.getKey();
 String value = entry.getValue().toString();
 rc.put(name, value);

[5/5] camel git commit: Polish

[bvahdat]

Polish

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

Branch: refs/heads/master
Commit: 079b5f9e6dd7e664e376f388b457568bbb518e93
Parents: 3fd9102
Author: Babak Vahdat 
Authored: Sun Dec 18 17:16:57 2016 +0100
Committer: Babak Vahdat 
Committed: Sun Dec 18 17:16:57 2016 +0100

--
 .../java/org/apache/camel/util/URISupport.java  |  1 -
 .../s3/S3ComponentListBucketsSpringTest.java|  4 ++--
 .../aws/s3/S3ComponentListBucketsTest.java  |  4 ++--
 .../apache/camel/component/cxf/ssl/SslTest.java |  2 +-
 .../headers/WaitContainerCmdHeaderTest.java |  4 ++--
 .../camel/dataformat/hessian/TestObject.java|  2 +-
 .../cinder/producer/SnapshotProducer.java   | 23 ++--
 .../cinder/producer/VolumeProducer.java | 23 ++--
 .../keystone/producer/UserProducer.java | 19 
 .../neutron/producer/RouterProducer.java| 19 
 .../neutron/producer/SubnetProducer.java| 17 ---
 .../openstack/nova/producer/ServerProducer.java | 23 ++--
 .../openstack/cinder/VolumeProducerTest.java| 23 ++--
 .../cinder/VolumeSnapshotProducerTest.java  | 19 
 .../openstack/keystone/UserProducerTest.java| 17 ---
 .../openstack/neutron/RouterProducerTest.java   | 19 
 .../openstack/neutron/SubnetProducerTest.java   | 13 ++-
 .../openstack/nova/ServerProducerTest.java  | 15 +++--
 .../processor/RibbonServiceCallProcessor.java   |  3 ++-
 .../StringMultiSelectPicklistSerializer.java|  2 +-
 .../component/smpp/SmppNLSTSplitterTest.java|  9 ++--
 .../component/weather/WeatherConfiguration.java |  2 +-
 .../component/websocket/WebsocketComponent.java |  1 -
 .../WebsocketComponentServletTest.java  |  4 ++--
 24 files changed, 137 insertions(+), 131 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/079b5f9e/camel-core/src/main/java/org/apache/camel/util/URISupport.java
--
diff --git a/camel-core/src/main/java/org/apache/camel/util/URISupport.java 
b/camel-core/src/main/java/org/apache/camel/util/URISupport.java
index 1c30ff4..1530e31 100644
--- a/camel-core/src/main/java/org/apache/camel/util/URISupport.java
+++ b/camel-core/src/main/java/org/apache/camel/util/URISupport.java
@@ -22,7 +22,6 @@ import java.net.URISyntaxException;
 import java.net.URLDecoder;
 import java.net.URLEncoder;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.List;

http://git-wip-us.apache.org/repos/asf/camel/blob/079b5f9e/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/S3ComponentListBucketsSpringTest.java
--
diff --git 
a/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/S3ComponentListBucketsSpringTest.java
 
b/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/S3ComponentListBucketsSpringTest.java
index 4a21958..ddaf04e 100644
--- 
a/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/S3ComponentListBucketsSpringTest.java
+++ 
b/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/S3ComponentListBucketsSpringTest.java
@@ -54,8 +54,8 @@ public class S3ComponentListBucketsSpringTest extends 
CamelSpringTestSupport {
 private void assertResultExchange(Exchange resultExchange) {
 List list = resultExchange.getIn().getBody(List.class);
 assertEquals(1, list.size());
-assertEquals("camel", ((Bucket) 
list.get(0)).getOwner().getDisplayName());
-assertEquals("camel-bucket", ((Bucket) list.get(0)).getName());
+assertEquals("camel", list.get(0).getOwner().getDisplayName());
+assertEquals("camel-bucket", list.get(0).getName());
 }
 
 @Override

http://git-wip-us.apache.org/repos/asf/camel/blob/079b5f9e/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/S3ComponentListBucketsTest.java
--
diff --git 
a/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/S3ComponentListBucketsTest.java
 
b/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/S3ComponentListBucketsTest.java
index 9d3db60..cc7a0f2 100644
--- 
a/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/S3ComponentListBucketsTest.java
+++ 

[4/5] camel git commit: Polish

[bvahdat]

Polish

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

Branch: refs/heads/master
Commit: 3fd9102b357dc3d750905a72b035541a16cfdfb0
Parents: 769a570
Author: Babak Vahdat 
Authored: Sun Dec 18 17:16:27 2016 +0100
Committer: Babak Vahdat 
Committed: Sun Dec 18 17:16:27 2016 +0100

--
 .../apache/camel/util/OrderedComparatorTest.java |  1 -
 .../docker/headers/PullImageCmdHeaderTest.java   |  2 +-
 .../docker/headers/PushImageCmdHeaderTest.java   |  2 +-
 .../apache/camel/component/ironmq/MockQueue.java |  4 ++--
 .../mllp/MllpTcpClientProducerTest.java  |  1 -
 .../MongoDbIdempotentRepositoryTest.java |  2 +-
 .../keystone/producer/ProjectProducer.java   | 19 ++-
 .../keystone/producer/RegionProducer.java| 15 ---
 .../neutron/producer/NetworkProducer.java| 17 +
 .../openstack/neutron/producer/PortProducer.java | 19 ++-
 .../openstack/swift/producer/ObjectProducer.java | 11 ++-
 .../openstack/keystone/ProjectProducerTest.java  | 17 +
 .../openstack/keystone/RegionProducerTest.java   | 15 ---
 .../openstack/neutron/NetworkProducerTest.java   | 13 +++--
 .../openstack/neutron/PortProducerTest.java  | 17 +
 .../openstack/swift/ObjectProducerTest.java  | 15 ---
 .../component/salesforce/api/dto/RestError.java  |  2 --
 .../api/dto/composite/ReferenceId.java   |  1 -
 .../template/generated/ParseException.java   | 12 ++--
 .../camel/component/sql/stored/ParserTest.java   |  2 +-
 .../component/sql/stored/ProducerBatchTest.java  |  2 +-
 .../camel/example/transformer/demo/Order.java|  5 -
 .../example/transformer/demo/OrderProcessor.java |  5 -
 .../example/transformer/demo/OrderResponse.java  |  6 --
 parent/pom.xml   |  2 +-
 25 files changed, 98 insertions(+), 109 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/3fd9102b/camel-core/src/test/java/org/apache/camel/util/OrderedComparatorTest.java
--
diff --git 
a/camel-core/src/test/java/org/apache/camel/util/OrderedComparatorTest.java 
b/camel-core/src/test/java/org/apache/camel/util/OrderedComparatorTest.java
index d663aaf..2c89e77 100644
--- a/camel-core/src/test/java/org/apache/camel/util/OrderedComparatorTest.java
+++ b/camel-core/src/test/java/org/apache/camel/util/OrderedComparatorTest.java
@@ -17,7 +17,6 @@
 package org.apache.camel.util;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 
 import junit.framework.TestCase;

http://git-wip-us.apache.org/repos/asf/camel/blob/3fd9102b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/PullImageCmdHeaderTest.java
--
diff --git 
a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/PullImageCmdHeaderTest.java
 
b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/PullImageCmdHeaderTest.java
index 1a01b03..0504685 100644
--- 
a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/PullImageCmdHeaderTest.java
+++ 
b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/PullImageCmdHeaderTest.java
@@ -62,7 +62,7 @@ public class PullImageCmdHeaderTest extends 
BaseDockerHeaderTest {
 @Override
 protected void setupMocks() {
 
Mockito.when(dockerClient.pullImageCmd(Matchers.anyString())).thenReturn(mockObject);
-
Mockito.when(mockObject.exec(Mockito.anyObject())).thenReturn(callback);
+
Mockito.when(mockObject.exec(Matchers.anyObject())).thenReturn(callback);
 try {
 Mockito.when(callback.awaitCompletion()).thenReturn(callback);
 } catch (InterruptedException e) {

http://git-wip-us.apache.org/repos/asf/camel/blob/3fd9102b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/PushImageCmdHeaderTest.java
--
diff --git 
a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/PushImageCmdHeaderTest.java
 
b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/PushImageCmdHeaderTest.java
index 85e4e7c..edec5e3 100644
--- 
a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/PushImageCmdHeaderTest.java
+++ 

[2/5] camel git commit: Polish

[bvahdat]

Polish

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

Branch: refs/heads/master
Commit: 5b66536de61ef276e427f2190cca604fd8835333
Parents: dccd460
Author: Babak Vahdat 
Authored: Sun Dec 18 17:15:03 2016 +0100
Committer: Babak Vahdat 
Committed: Sun Dec 18 17:15:03 2016 +0100

--
 .../apache/camel/builder/ExpressionBuilder.java |  1 -
 .../camel/impl/DefaultHeaderFilterStrategy.java |  1 -
 .../camel/processor/CamelInternalProcessor.java |  1 -
 .../apache/camel/support/DefaultTimeoutMap.java |  1 -
 .../core/xml/CamelProxyFactoryDefinition.java   |  3 ++-
 .../cxf/converter/CxfPayloadConverter.java  |  4 +--
 .../consumer/DockerEventsConsumerTest.java  |  3 ++-
 .../consumer/DockerStatsConsumerTest.java   |  3 ++-
 .../docker/headers/ExecStartCmdHeaderTest.java  |  2 +-
 .../ConcurrentConsumerLoadTest.java |  4 +--
 .../camel/component/metrics/GaugeRouteTest.java |  3 ++-
 .../openstack/glance/GlanceProducer.java| 27 ++--
 .../keystone/producer/DomainProducer.java   | 19 +++---
 .../nova/producer/FlavorsProducer.java  | 17 ++--
 .../swift/producer/ContainerProducer.java   | 23 +
 .../openstack/keystone/DomainProducerTest.java  | 17 ++--
 .../openstack/nova/FlavorProducerTest.java  | 21 +++
 .../openstack/swift/ContainerProducerTest.java  | 17 ++--
 .../salesforce/dto/generated/Contact.java   |  3 ---
 .../apache/camel/maven/CamelSalesforceMojo.java |  4 ---
 .../ClassLoadingAwareObjectInputStream.java |  2 +-
 .../CamelSpringBootJUnit4ClassRunner.java   |  1 +
 22 files changed, 89 insertions(+), 88 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/5b66536d/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java 
b/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java
index 6051555..0c04cd8 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java
@@ -21,7 +21,6 @@ import java.io.StringWriter;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.Comparator;
 import java.util.Date;
 import java.util.Iterator;

http://git-wip-us.apache.org/repos/asf/camel/blob/5b66536d/camel-core/src/main/java/org/apache/camel/impl/DefaultHeaderFilterStrategy.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/impl/DefaultHeaderFilterStrategy.java
 
b/camel-core/src/main/java/org/apache/camel/impl/DefaultHeaderFilterStrategy.java
index 77656a2..9652af6 100644
--- 
a/camel-core/src/main/java/org/apache/camel/impl/DefaultHeaderFilterStrategy.java
+++ 
b/camel-core/src/main/java/org/apache/camel/impl/DefaultHeaderFilterStrategy.java
@@ -17,7 +17,6 @@
 package org.apache.camel.impl;
 
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.Locale;
 import java.util.Set;
 import java.util.regex.Pattern;

http://git-wip-us.apache.org/repos/asf/camel/blob/5b66536d/camel-core/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java
 
b/camel-core/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java
index 67ee6c6..3ce9220 100644
--- 
a/camel-core/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java
+++ 
b/camel-core/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java
@@ -17,7 +17,6 @@
 package org.apache.camel.processor;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Date;
 import java.util.LinkedList;
 import java.util.List;

http://git-wip-us.apache.org/repos/asf/camel/blob/5b66536d/camel-core/src/main/java/org/apache/camel/support/DefaultTimeoutMap.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/support/DefaultTimeoutMap.java 
b/camel-core/src/main/java/org/apache/camel/support/DefaultTimeoutMap.java
index 1e09952..d99a5b0 100644
--- a/camel-core/src/main/java/org/apache/camel/support/DefaultTimeoutMap.java
+++ 

camel git commit: CAMEL-10615: camel-sjms - BatchConsumer should use exception handler instead of warn log

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/master c4ce89196 -> 7bc7a37ac


CAMEL-10615: camel-sjms - BatchConsumer should use exception handler instead of 
warn log


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

Branch: refs/heads/master
Commit: 7bc7a37ac812a2094488556f7498050a776a71cd
Parents: c4ce891
Author: Claus Ibsen 
Authored: Sun Dec 18 14:07:24 2016 +0100
Committer: Claus Ibsen 
Committed: Sun Dec 18 14:07:56 2016 +0100

--
 .../component/sjms/batch/SjmsBatchConsumer.java | 68 +++-
 1 file changed, 36 insertions(+), 32 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/7bc7a37a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/batch/SjmsBatchConsumer.java
--
diff --git 
a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/batch/SjmsBatchConsumer.java
 
b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/batch/SjmsBatchConsumer.java
index 243c2b8..20acfdf 100644
--- 
a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/batch/SjmsBatchConsumer.java
+++ 
b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/batch/SjmsBatchConsumer.java
@@ -70,7 +70,6 @@ public class SjmsBatchConsumer extends DefaultConsumer {
 private final int pollDuration;
 private final ConnectionFactory connectionFactory;
 private final String destinationName;
-private final Processor processor;
 private ExecutorService jmsConsumerExecutors;
 private final AtomicBoolean running = new AtomicBoolean(true);
 private final AtomicReference consumersShutdownLatchRef = 
new AtomicReference<>();
@@ -80,7 +79,6 @@ public class SjmsBatchConsumer extends DefaultConsumer {
 super(sjmsBatchEndpoint, processor);
 
 this.sjmsBatchEndpoint = ObjectHelper.notNull(sjmsBatchEndpoint, 
"batchJmsEndpoint");
-this.processor = ObjectHelper.notNull(processor, "processor");
 
 destinationName = 
ObjectHelper.notEmpty(sjmsBatchEndpoint.getDestinationName(), 
"destinationName");
 
@@ -133,9 +131,7 @@ public class SjmsBatchConsumer extends DefaultConsumer {
 connection = connectionFactory.createConnection();
 connection.start();
 
-if (LOG.isInfoEnabled()) {
-LOG.info("Starting " + consumerCount + " consumer(s) for " + 
destinationName + ":" + completionSize);
-}
+LOG.info("Starting {} consumer(s) for {}:{}", consumerCount, 
destinationName, completionSize);
 consumersShutdownLatchRef.set(new CountDownLatch(consumerCount));
 
 jmsConsumerExecutors = 
getEndpoint().getCamelContext().getExecutorServiceManager().newFixedThreadPool(this,
 "SjmsBatchConsumer", consumerCount);
@@ -148,7 +144,7 @@ public class SjmsBatchConsumer extends DefaultConsumer {
 }
 
 if (completionInterval > 0) {
-LOG.info("Using CompletionInterval to run every " + 
completionInterval + " millis.");
+LOG.info("Using CompletionInterval to run every {} millis.", 
completionInterval);
 if (timeoutCheckerExecutorService == null) {
 
setTimeoutCheckerExecutorService(getEndpoint().getCamelContext().getExecutorServiceManager().newScheduledThreadPool(this,
 SJMS_BATCH_TIMEOUT_CHECKER, 1));
 shutdownTimeoutCheckerExecutorService = true;
@@ -170,7 +166,7 @@ public class SjmsBatchConsumer extends DefaultConsumer {
 if (consumersShutdownLatch.await(60, TimeUnit.SECONDS)) {
 LOG.warn("Timeout waiting on consumer threads to signal 
completion - shutting down");
 } else {
-LOG.info("All consumers have shut down");
+LOG.info("All consumers have been shutdown");
 }
 } else {
 LOG.info("Stop signalled while there are no consumers yet, so no 
need to wait for consumers");
@@ -180,14 +176,14 @@ public class SjmsBatchConsumer extends DefaultConsumer {
 LOG.debug("Shutting down JMS connection");
 connection.close();
 } catch (Exception e) {
-LOG.warn("Exception caught closing JMS connection", e);
+// ignore
 }
 
-
getEndpoint().getCamelContext().getExecutorServiceManager().shutdown(jmsConsumerExecutors);
+
getEndpoint().getCamelContext().getExecutorServiceManager().shutdownGraceful(jmsConsumerExecutors);
 jmsConsumerExecutors = null;
 
 if (shutdownTimeoutCheckerExecutorService) {
-

camel git commit: Fixed AHC upgrade

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/master ede810223 -> c4ce89196


Fixed AHC upgrade


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

Branch: refs/heads/master
Commit: c4ce89196bd36c92a577a03418e47f66e8388f31
Parents: ede8102
Author: Claus Ibsen 
Authored: Sun Dec 18 13:46:41 2016 +0100
Committer: Claus Ibsen 
Committed: Sun Dec 18 13:46:56 2016 +0100

--
 components/camel-websocket/pom.xml | 236 
 1 file changed, 119 insertions(+), 117 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/c4ce8919/components/camel-websocket/pom.xml
--
diff --git a/components/camel-websocket/pom.xml 
b/components/camel-websocket/pom.xml
index ccde071..eaf52a4 100644
--- a/components/camel-websocket/pom.xml
+++ b/components/camel-websocket/pom.xml
@@ -15,129 +15,131 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-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/maven-v4_0_0.xsd;>
+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/maven-v4_0_0.xsd;>
 
-4.0.0
+  4.0.0
 
-
-org.apache.camel
-components
-2.19.0-SNAPSHOT
-
+  
+org.apache.camel
+components
+2.19.0-SNAPSHOT
+  
 
-camel-websocket
-jar
-Camel :: WebSocket
-Camel WebSocket
+  camel-websocket
+  jar
+  Camel :: WebSocket
+  Camel WebSocket
 
-
-
-org.apache.camel.component.websocket.*;${camel.osgi.version}
-
-
-!org.apache.camel.component.websocket.*,
-org.eclipse.jetty.util.ssl;version="[9,10)";resolution:=optional,
-${camel.osgi.import.defaults},
-*
-
-
org.apache.camel.spi.ComponentResolver;component=websocket
-
+  
+
+  org.apache.camel.component.websocket.*;${camel.osgi.version}
+
+
+  !org.apache.camel.component.websocket.*,
+  org.eclipse.jetty.util.ssl;version="[9.2,10)";resolution:=optional,
+  ${camel.osgi.import.defaults},
+  *
+
+
org.apache.camel.spi.ComponentResolver;component=websocket
+  
 
-
-
-
-org.apache.camel
-camel-core
-
-
-
-org.eclipse.jetty.websocket
-websocket-server
-${jetty-version}
-
-
-org.eclipse.jetty.websocket
-websocket-client
-${jetty-version}
-
-
-org.eclipse.jetty.websocket
-websocket-api
-${jetty-version}
-
-
-org.eclipse.jetty
-jetty-servlet
-${jetty-version}
-
-
-org.eclipse.jetty
-jetty-servlets
-${jetty-version}
-
-
-org.eclipse.jetty
-jetty-jmx
-${jetty-version}
-
+  
+
+
+  org.apache.camel
+  camel-core
+
+
+
+  org.eclipse.jetty.websocket
+  websocket-server
+  ${jetty-version}
+
+
+  org.eclipse.jetty.websocket
+  websocket-client
+  ${jetty-version}
+
+
+  org.eclipse.jetty.websocket
+  websocket-api
+  ${jetty-version}
+
+
+  org.eclipse.jetty
+  jetty-servlet
+  ${jetty-version}
+
+
+  org.eclipse.jetty
+  jetty-servlets
+  ${jetty-version}
+
+
+  org.eclipse.jetty
+  jetty-jmx
+  ${jetty-version}
+
 
-
-javax.servlet
-javax.servlet-api
-
-
-
-
-org.apache.camel
-camel-test
-test
-
-
-junit
-junit
-test
-
-
-org.mockito
-mockito-core
-test
-
-
-org.asynchttpclient
-async-http-client
-${ahc-version}
-test
-  
-
-org.apache.logging.log4j
-log4j-api
-test
-
-
-org.apache.logging.log4j
-log4j-core
-test
-
-
-org.apache.logging.log4j
-log4j-slf4j-impl
-test
-
-   

[2/2] camel git commit: CAMEL-9945: Upgrade to Jetty 9.3

[davsclaus]

CAMEL-9945: Upgrade to Jetty 9.3


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

Branch: refs/heads/master
Commit: ede810223d9fca38caaf8e8d0c13231efea85356
Parents: 57e4210
Author: Claus Ibsen 
Authored: Sun Dec 18 13:31:34 2016 +0100
Committer: Claus Ibsen 
Committed: Sun Dec 18 13:31:34 2016 +0100

--
 examples/camel-example-cxf/pom.xml | 39 -
 1 file changed, 34 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/ede81022/examples/camel-example-cxf/pom.xml
--
diff --git a/examples/camel-example-cxf/pom.xml 
b/examples/camel-example-cxf/pom.xml
index acb4aab..f1413f3 100644
--- a/examples/camel-example-cxf/pom.xml
+++ b/examples/camel-example-cxf/pom.xml
@@ -30,6 +30,10 @@
   Camel :: Example :: CXF
   An example which demonstrates the use of the Camel CXF 
component
 
+  
+${jetty92-version}
+  
+
   
 
   org.apache.camel
@@ -52,14 +56,39 @@
 
 
 
-  org.apache.camel
-  camel-jetty9
-
-
-
   org.apache.cxf
   cxf-rt-transports-http-jetty
   ${cxf-version}
+  
+
+  org.eclipse.jetty
+  jetty-server
+
+
+  org.eclipse.jetty
+  jetty-util
+
+
+  org.eclipse.jetty
+  jetty-io
+
+
+  org.eclipse.jetty
+  jetty-security
+
+
+  org.eclipse.jetty
+  jetty-continuation
+
+
+  org.eclipse.jetty
+  jetty-http
+
+  
+
+
+  org.apache.camel
+  camel-jetty9
 
 
 

[1/2] camel git commit: CAMEL-10609: Improve simple functions that requires parameters to not parse text that happens to use same name as the function name.

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/master a2d0acc1c -> ede810223


CAMEL-10609: Improve simple functions that requires parameters to not parse 
text that happens to use same name as the function name.


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

Branch: refs/heads/master
Commit: 57e4210fc45dab5b1645e4c9e087636617baac5f
Parents: a2d0acc
Author: Claus Ibsen 
Authored: Sun Dec 18 13:25:51 2016 +0100
Committer: Claus Ibsen 
Committed: Sun Dec 18 13:25:51 2016 +0100

--
 .../simple/ast/SimpleFunctionExpression.java| 24 ++--
 1 file changed, 12 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/57e4210f/camel-core/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionExpression.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionExpression.java
 
b/camel-core/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionExpression.java
index caddbab..5affb51 100644
--- 
a/camel-core/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionExpression.java
+++ 
b/camel-core/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionExpression.java
@@ -235,9 +235,9 @@ public class SimpleFunctionExpression extends 
LiteralExpression {
 
 private Expression createSimpleExpressionBodyOrHeader(String function, 
boolean strict) {
 // bodyAs
-String remainder = ifStartsWithReturnRemainder("bodyAs", function);
+String remainder = ifStartsWithReturnRemainder("bodyAs(", function);
 if (remainder != null) {
-String type = ObjectHelper.between(remainder, "(", ")");
+String type = ObjectHelper.before(remainder, ")");
 if (type == null) {
 throw new SimpleParserException("Valid syntax: ${bodyAs(type)} 
was: " + function, token.getIndex());
 }
@@ -255,9 +255,9 @@ public class SimpleFunctionExpression extends 
LiteralExpression {
 
 }
 // mandatoryBodyAs
-remainder = ifStartsWithReturnRemainder("mandatoryBodyAs", function);
+remainder = ifStartsWithReturnRemainder("mandatoryBodyAs(", function);
 if (remainder != null) {
-String type = ObjectHelper.between(remainder, "(", ")");
+String type = ObjectHelper.before(remainder, ")");
 if (type == null) {
 throw new SimpleParserException("Valid syntax: 
${mandatoryBodyAs(type)} was: " + function, token.getIndex());
 }
@@ -288,9 +288,9 @@ public class SimpleFunctionExpression extends 
LiteralExpression {
 }
 
 // headerAs
-remainder = ifStartsWithReturnRemainder("headerAs", function);
+remainder = ifStartsWithReturnRemainder("headerAs(", function);
 if (remainder != null) {
-String keyAndType = ObjectHelper.between(remainder, "(", ")");
+String keyAndType = ObjectHelper.before(remainder, ")");
 if (keyAndType == null) {
 throw new SimpleParserException("Valid syntax: ${headerAs(key, 
type)} was: " + function, token.getIndex());
 }
@@ -431,9 +431,9 @@ public class SimpleFunctionExpression extends 
LiteralExpression {
 String remainder;
 
 // random function
-remainder = ifStartsWithReturnRemainder("random", function);
+remainder = ifStartsWithReturnRemainder("random(", function);
 if (remainder != null) {
-String values = ObjectHelper.between(remainder, "(", ")");
+String values = ObjectHelper.before(remainder, ")");
 if (values == null || ObjectHelper.isEmpty(values)) {
 throw new SimpleParserException("Valid syntax: 
${random(min,max)} or ${random(max)} was: " + function, token.getIndex());
 }
@@ -449,9 +449,9 @@ public class SimpleFunctionExpression extends 
LiteralExpression {
 }
 
 // skip function
-remainder = ifStartsWithReturnRemainder("skip", function);
+remainder = ifStartsWithReturnRemainder("skip(", function);
 if (remainder != null) {
-String values = ObjectHelper.between(remainder, "(", ")");
+String values = ObjectHelper.before(remainder, ")");
 if (values == null || ObjectHelper.isEmpty(values)) {
 throw new SimpleParserException("Valid syntax: ${skip(number)} 
was: " + function, token.getIndex());
 }
@@ -461,9 +461,9 @@ public class SimpleFunctionExpression extends 

camel git commit: CAMEL-10554 - camel-mongodb evolution to driver 3. Added Karaf feature for the new component.

[acosentino]

Repository: camel
Updated Branches:
  refs/heads/master 046e7dc21 -> 4262ac901


CAMEL-10554 - camel-mongodb evolution to driver 3. Added Karaf feature for the 
new component.


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

Branch: refs/heads/master
Commit: 4262ac901c673d773583121baf41fb78107f3b6c
Parents: 046e7dc
Author: Andrea Cosentino 
Authored: Sun Dec 18 10:21:48 2016 +0100
Committer: Andrea Cosentino 
Committed: Sun Dec 18 10:21:48 2016 +0100

--
 .../features/src/main/resources/features.xml|  6 
 .../camel/itest/karaf/CamelMongodb3Test.java| 34 
 2 files changed, 40 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/4262ac90/platforms/karaf/features/src/main/resources/features.xml
--
diff --git a/platforms/karaf/features/src/main/resources/features.xml 
b/platforms/karaf/features/src/main/resources/features.xml
index f04a458..d8b9455 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1246,6 +1246,12 @@
 mvn:org.mongodb/mongo-java-driver/${mongo-java-driver-version}
 mvn:org.apache.camel/camel-mongodb/${project.version}
   
+  
+camel-core
+camel-jackson
+mvn:org.mongodb/mongo-java-driver/${mongo-java-driver-version}
+mvn:org.apache.camel/camel-mongodb3/${project.version}
+  
   
 camel-core
 camel-jackson

http://git-wip-us.apache.org/repos/asf/camel/blob/4262ac90/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMongodb3Test.java
--
diff --git 
a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMongodb3Test.java
 
b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMongodb3Test.java
new file mode 100644
index 000..41ac118
--- /dev/null
+++ 
b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMongodb3Test.java
@@ -0,0 +1,34 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.itest.karaf;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.junit.PaxExam;
+
+@RunWith(PaxExam.class)
+public class CamelMongodb3Test extends BaseKarafTest {
+
+public static final String COMPONENT = 
extractName(CamelMongodb3Test.class);
+
+@Test
+public void test() throws Exception {
+testComponent(COMPONENT);
+}
+
+
+}

[05/13] camel git commit: CAMEL-10554 - camel-mongodb evolution to driver 3. Merging the component. Thanks to Jean-Yves Terrien for the contribution.

[acosentino]

CAMEL-10554 - camel-mongodb evolution to driver 3. Merging the component. 
Thanks to Jean-Yves Terrien for the contribution.


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

Branch: refs/heads/master
Commit: 7bd7750efc872e4a27ac10db1d3700bedcb9ef43
Parents: caa82aa
Author: Andrea Cosentino 
Authored: Sat Dec 17 14:38:38 2016 +0100
Committer: Andrea Cosentino 
Committed: Sun Dec 18 09:52:36 2016 +0100

--
 components/camel-mongodb3/pom.xml   | 118 +++
 .../src/main/docs/mongodb-component.adoc| 903 +++
 .../mongodb3/CamelMongoDbException.java |  35 +
 .../component/mongodb3/MongoDbComponent.java|  87 ++
 .../component/mongodb3/MongoDbConstants.java|  48 +
 .../component/mongodb3/MongoDbConsumerType.java |  24 +
 .../component/mongodb3/MongoDbEndpoint.java | 593 
 .../component/mongodb3/MongoDbOperation.java|  45 +
 .../component/mongodb3/MongoDbOutputType.java   |  23 +
 .../component/mongodb3/MongoDbProducer.java | 566 
 .../mongodb3/MongoDbTailTrackingConfig.java |  58 ++
 .../mongodb3/MongoDbTailTrackingManager.java| 101 +++
 .../mongodb3/MongoDbTailableCursorConsumer.java |  65 ++
 .../mongodb3/MongoDbTailingProcess.java | 226 +
 .../converters/MongoDbBasicConverters.java  | 163 
 .../idempotent/MongoDbIdempotentRepository.java | 134 +++
 .../src/main/resources/META-INF/LICENSE.txt | 203 +
 .../src/main/resources/META-INF/NOTICE.txt  |  11 +
 .../services/org/apache/camel/TypeConverter |  18 +
 .../org/apache/camel/component/mongodb3 |  18 +
 .../component/mongodb3/AbstractMongoDbTest.java | 114 +++
 .../mongodb3/EmbedMongoConfiguration.java   |  99 ++
 .../MongoBasicOperationsConfiguration.java  |  27 +
 .../mongodb3/MongoDbConversionsTest.java| 120 +++
 .../mongodb3/MongoDbDynamicityTest.java | 165 
 .../mongodb3/MongoDbExceptionHandlingTest.java  |  76 ++
 .../mongodb3/MongoDbFindOperationTest.java  | 261 ++
 .../mongodb3/MongoDbHeaderHandlingTest.java | 131 +++
 .../component/mongodb3/MongoDbIndexTest.java| 216 +
 .../mongodb3/MongoDbOperationsTest.java | 436 +
 .../mongodb3/MongoDbOutputTypeTest.java | 138 +++
 .../MongoDbReadPreferenceOptionTest.java|  91 ++
 .../MongoDbSpringDslOperationsTest.java |  44 +
 .../MongoDbTailableCursorConsumerTest.java  | 456 ++
 .../MongoDbIdempotentRepositoryTest.java| 116 +++
 .../src/test/resources/log4j2.properties|  29 +
 .../src/test/resources/mongodb.test.properties  |  21 +
 .../mongodb3/mongoBasicOperationsTest.xml   |  91 ++
 38 files changed, 6070 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/7bd7750e/components/camel-mongodb3/pom.xml
--
diff --git a/components/camel-mongodb3/pom.xml 
b/components/camel-mongodb3/pom.xml
new file mode 100644
index 000..15edda8
--- /dev/null
+++ b/components/camel-mongodb3/pom.xml
@@ -0,0 +1,118 @@
+
+
+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/maven-v4_0_0.xsd;>
+  4.0.0
+
+  
+org.apache.camel
+components
+2.19.0-SNAPSHOT
+  
+
+  camel-mongodb3
+  jar
+  Camel :: MongoDB3
+  Camel MongoDB (Java Driver 3) component
+
+  
+
org.apache.camel.component.mongodb3.*
+
org.apache.camel.spi.ComponentResolver;component=mongodb3
+  
+
+  
+
+
+  org.apache.camel
+  camel-core
+
+
+   
+
+  org.apache.camel
+  camel-jackson
+
+
+
+
+  org.mongodb
+  mongo-java-driver
+  ${mongo-java-driver-version}
+
+
+
+
+  org.apache.camel
+  camel-test-spring
+  test
+   
+
+  org.apache.logging.log4j
+  log4j-api
+  test
+
+
+  org.apache.logging.log4j
+  log4j-core
+  test
+
+
+  org.apache.logging.log4j
+  log4j-slf4j-impl
+  test
+
+
+  junit
+  junit
+  test
+
+
+  de.flapdoodle.embed
+  de.flapdoodle.embed.mongo
+  test
+
+  
+
+
+
+
+aix
+
+
+AIX
+
+
+
+true
+
+
+
+hpux
+
+
+HP-UX
+
+
+
+true
+
+

[10/13] camel git commit: CAMEL-10554 - Camel Mongodb evolution to driver 3. Fixed CS

[acosentino]

http://git-wip-us.apache.org/repos/asf/camel/blob/5715fce7/components/camel-mongodb3/src/main/java/org/apache/camel/component/mongodb3/MongoDbProducer.java
--
diff --git 
a/components/camel-mongodb3/src/main/java/org/apache/camel/component/mongodb3/MongoDbProducer.java
 
b/components/camel-mongodb3/src/main/java/org/apache/camel/component/mongodb3/MongoDbProducer.java
index d1f04c2..cb33fe4 100644
--- 
a/components/camel-mongodb3/src/main/java/org/apache/camel/component/mongodb3/MongoDbProducer.java
+++ 
b/components/camel-mongodb3/src/main/java/org/apache/camel/component/mongodb3/MongoDbProducer.java
@@ -16,27 +16,6 @@
  */
 package org.apache.camel.component.mongodb3;
 
-import static com.mongodb.client.model.Filters.eq;
-import static org.apache.camel.component.mongodb3.MongoDbConstants.BATCH_SIZE;
-import static org.apache.camel.component.mongodb3.MongoDbConstants.COLLECTION;
-import static 
org.apache.camel.component.mongodb3.MongoDbConstants.COLLECTION_INDEX;
-import static org.apache.camel.component.mongodb3.MongoDbConstants.DATABASE;
-import static org.apache.camel.component.mongodb3.MongoDbConstants.CRITERIA;
-import static 
org.apache.camel.component.mongodb3.MongoDbConstants.FIELDS_PROJECTION;
-import static org.apache.camel.component.mongodb3.MongoDbConstants.LIMIT;
-import static org.apache.camel.component.mongodb3.MongoDbConstants.MONGO_ID;
-import static org.apache.camel.component.mongodb3.MongoDbConstants.MULTIUPDATE;
-import static org.apache.camel.component.mongodb3.MongoDbConstants.NUM_TO_SKIP;
-import static org.apache.camel.component.mongodb3.MongoDbConstants.OID;
-import static 
org.apache.camel.component.mongodb3.MongoDbConstants.OPERATION_HEADER;
-import static 
org.apache.camel.component.mongodb3.MongoDbConstants.RECORDS_AFFECTED;
-import static 
org.apache.camel.component.mongodb3.MongoDbConstants.RECORDS_MATCHED;
-import static 
org.apache.camel.component.mongodb3.MongoDbConstants.RESULT_PAGE_SIZE;
-import static 
org.apache.camel.component.mongodb3.MongoDbConstants.RESULT_TOTAL_SIZE;
-import static org.apache.camel.component.mongodb3.MongoDbConstants.SORT_BY;
-import static org.apache.camel.component.mongodb3.MongoDbConstants.UPSERT;
-import static org.apache.camel.component.mongodb3.MongoDbConstants.WRITERESULT;
-
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -44,6 +23,15 @@ import java.util.Map;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
+import com.mongodb.client.AggregateIterable;
+import com.mongodb.client.FindIterable;
+import com.mongodb.client.MongoCollection;
+import com.mongodb.client.MongoDatabase;
+import com.mongodb.client.model.Filters;
+import com.mongodb.client.model.UpdateOptions;
+import com.mongodb.client.result.DeleteResult;
+import com.mongodb.client.result.UpdateResult;
+
 import org.apache.camel.Exchange;
 import org.apache.camel.InvalidPayloadException;
 import org.apache.camel.Processor;
@@ -57,510 +45,529 @@ import org.bson.conversions.Bson;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.mongodb.client.AggregateIterable;
-import com.mongodb.client.FindIterable;
-import com.mongodb.client.MongoCollection;
-import com.mongodb.client.MongoDatabase;
-import com.mongodb.client.model.Filters;
-import com.mongodb.client.model.UpdateOptions;
-import com.mongodb.client.result.DeleteResult;
-import com.mongodb.client.result.UpdateResult;
+import static com.mongodb.client.model.Filters.eq;
+import static org.apache.camel.component.mongodb3.MongoDbConstants.BATCH_SIZE;
+import static org.apache.camel.component.mongodb3.MongoDbConstants.COLLECTION;
+import static 
org.apache.camel.component.mongodb3.MongoDbConstants.COLLECTION_INDEX;
+import static org.apache.camel.component.mongodb3.MongoDbConstants.CRITERIA;
+import static org.apache.camel.component.mongodb3.MongoDbConstants.DATABASE;
+import static 
org.apache.camel.component.mongodb3.MongoDbConstants.FIELDS_PROJECTION;
+import static org.apache.camel.component.mongodb3.MongoDbConstants.LIMIT;
+import static org.apache.camel.component.mongodb3.MongoDbConstants.MONGO_ID;
+import static org.apache.camel.component.mongodb3.MongoDbConstants.MULTIUPDATE;
+import static org.apache.camel.component.mongodb3.MongoDbConstants.NUM_TO_SKIP;
+import static org.apache.camel.component.mongodb3.MongoDbConstants.OID;
+import static 
org.apache.camel.component.mongodb3.MongoDbConstants.OPERATION_HEADER;
+import static 
org.apache.camel.component.mongodb3.MongoDbConstants.RECORDS_AFFECTED;
+import static 
org.apache.camel.component.mongodb3.MongoDbConstants.RECORDS_MATCHED;
+import static 
org.apache.camel.component.mongodb3.MongoDbConstants.RESULT_PAGE_SIZE;
+import static 
org.apache.camel.component.mongodb3.MongoDbConstants.RESULT_TOTAL_SIZE;
+import static org.apache.camel.component.mongodb3.MongoDbConstants.SORT_BY;
+import static 

[09/13] camel git commit: CAMEL-10554 - Camel Mongodb evolution to driver 3. Fixed CS

[acosentino]

http://git-wip-us.apache.org/repos/asf/camel/blob/5715fce7/components/camel-mongodb3/src/test/java/org/apache/camel/component/mongodb3/MongoDbConversionsTest.java
--
diff --git 
a/components/camel-mongodb3/src/test/java/org/apache/camel/component/mongodb3/MongoDbConversionsTest.java
 
b/components/camel-mongodb3/src/test/java/org/apache/camel/component/mongodb3/MongoDbConversionsTest.java
index abb265c..7b7ca8b 100644
--- 
a/components/camel-mongodb3/src/test/java/org/apache/camel/component/mongodb3/MongoDbConversionsTest.java
+++ 
b/components/camel-mongodb3/src/test/java/org/apache/camel/component/mongodb3/MongoDbConversionsTest.java
@@ -16,9 +16,6 @@
  */
 package org.apache.camel.component.mongodb3;
 
-import static com.mongodb.client.model.Filters.eq;
-import static org.apache.camel.component.mongodb3.MongoDbConstants.MONGO_ID;
-
 import java.io.ByteArrayInputStream;
 import java.util.HashMap;
 import java.util.Map;
@@ -28,85 +25,89 @@ import org.apache.camel.converter.IOConverter;
 import org.bson.Document;
 import org.junit.Test;
 
+import static com.mongodb.client.model.Filters.eq;
+import static org.apache.camel.component.mongodb3.MongoDbConstants.MONGO_ID;
+
 public class MongoDbConversionsTest extends AbstractMongoDbTest {
 
-   @Test
+@Test
 public void testInsertMap() throws InterruptedException {
 assertEquals(0, testCollection.count());
-
+
 Map m1 = new HashMap<>();
 Map m1Nested = new HashMap<>();
 
 m1Nested.put("nested1", "nestedValue1");
 m1Nested.put("nested2", "nestedValue2");
-
+
 m1.put("field1", "value1");
 m1.put("field2", "value2");
 m1.put("nestedField", m1Nested);
 m1.put(MONGO_ID, "testInsertMap");
 
-//Object result = 
-   template.requestBody("direct:insertMap", m1);
-   Document b = testCollection.find(eq(MONGO_ID, 
"testInsertMap")).first();
+// Object result =
+template.requestBody("direct:insertMap", m1);
+Document b = testCollection.find(eq(MONGO_ID, 
"testInsertMap")).first();
 assertNotNull("No record with 'testInsertMap' _id", b);
 
 }
-
+
 @Test
 public void testInsertPojo() {
 assertEquals(0, testCollection.count());
-//Object result = 
-   template.requestBody("direct:insertPojo", new 
MyPojoTest());
-   Document b = testCollection.find(eq(MONGO_ID, 
"testInsertPojo")).first();
+// Object result =
+template.requestBody("direct:insertPojo", new MyPojoTest());
+Document b = testCollection.find(eq(MONGO_ID, 
"testInsertPojo")).first();
 assertNotNull("No record with 'testInsertPojo' _id", b);
 }
-
+
 @Test
 public void testInsertJsonString() {
 assertEquals(0, testCollection.count());
-//Object result = 
-   template.requestBody("direct:insertJsonString", 
"{\"fruits\": [\"apple\", \"banana\", \"papaya\"], \"veggie\": \"broccoli\", 
\"_id\": \"testInsertJsonString\"}");
-//assertTrue(result instanceof WriteResult);
+// Object result =
+template.requestBody("direct:insertJsonString", "{\"fruits\": 
[\"apple\", \"banana\", \"papaya\"], \"veggie\": \"broccoli\", \"_id\": 
\"testInsertJsonString\"}");
+// assertTrue(result instanceof WriteResult);
 Document b = testCollection.find(eq(MONGO_ID, 
"testInsertJsonString")).first();
 assertNotNull("No record with 'testInsertJsonString' _id", b);
 }
-
+
 @Test
 public void testInsertJsonInputStream() throws Exception {
 assertEquals(0, testCollection.count());
-//Object result = 
-   template.requestBody("direct:insertJsonString", 
-IOConverter.toInputStream("{\"fruits\": [\"apple\", 
\"banana\"], \"veggie\": \"broccoli\", \"_id\": \"testInsertJsonString\"}\n", 
null));
-   Document b = testCollection.find(eq(MONGO_ID, 
"testInsertJsonString")).first();
+// Object result =
+template.requestBody("direct:insertJsonString",
+ IOConverter.toInputStream("{\"fruits\": 
[\"apple\", \"banana\"], \"veggie\": \"broccoli\", \"_id\": 
\"testInsertJsonString\"}\n", null));
+Document b = testCollection.find(eq(MONGO_ID, 
"testInsertJsonString")).first();
 assertNotNull("No record with 'testInsertJsonString' _id", b);
 }
-
+
 @Test
 public void testInsertBsonInputStream() {
 assertEquals(0, testCollection.count());
-
+
 Document document = new Document(MONGO_ID, "testInsertBsonString");
-
-//Object result = 
-   template.requestBody("direct:insertJsonString", new 
ByteArrayInputStream(document.toJson().getBytes()));
-  

[12/13] camel git commit: CAMEL-10554 - Camel Mongodb evolution to driver 3. Docs.

[acosentino]

CAMEL-10554 - Camel Mongodb evolution to driver 3. Docs.


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

Branch: refs/heads/master
Commit: a0a3cd3880fca89c0bf47335f9e20fd1b0c30e89
Parents: d79d915
Author: Andrea Cosentino 
Authored: Sun Dec 18 09:48:16 2016 +0100
Committer: Andrea Cosentino 
Committed: Sun Dec 18 10:00:10 2016 +0100

--
 components/readme.adoc|  3 +++
 docs/user-manual/en/SUMMARY.md|  1 +
 .../spring-boot-dm/camel-spring-boot-dependencies/pom.xml | 10 ++
 3 files changed, 14 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/a0a3cd38/components/readme.adoc
--
diff --git a/components/readme.adoc b/components/readme.adoc
index 761a365..6d1eb1a 100644
--- a/components/readme.adoc
+++ b/components/readme.adoc
@@ -342,6 +342,9 @@ Components
 | link:camel-mongodb/src/main/docs/mongodb-component.adoc[MongoDB] 
(camel-mongodb) +
 `mongodb:connectionBean` | Component for working with documents stored in 
MongoDB database.
 
+| link:camel-mongodb3/src/main/docs/mongodb3-component.adoc[MongoDB] 
(camel-mongodb3) +
+`mongodb3:connectionBean` | Component for working with documents stored in 
MongoDB database.
+
 | link:camel-mongodb-gridfs/src/main/docs/gridfs-component.adoc[MongoDBGridFS] 
(camel-mongodb-gridfs) +
 `gridfs:connectionBean` | Component for working with MongoDB GridFS.
 

http://git-wip-us.apache.org/repos/asf/camel/blob/a0a3cd38/docs/user-manual/en/SUMMARY.md
--
diff --git a/docs/user-manual/en/SUMMARY.md b/docs/user-manual/en/SUMMARY.md
index 930e3c4..c4fb37e 100644
--- a/docs/user-manual/en/SUMMARY.md
+++ b/docs/user-manual/en/SUMMARY.md
@@ -236,6 +236,7 @@
* [Mina2](mina2-component.adoc)
* [MLLP](mllp-component.adoc)
* [MongoDB](mongodb-component.adoc)
+   * [MongoDB](mongodb3-component.adoc)
* [MongoDBGridFS](gridfs-component.adoc)
* [MQTT](mqtt-component.adoc)
* [MSV](msv-component.adoc)

http://git-wip-us.apache.org/repos/asf/camel/blob/a0a3cd38/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
--
diff --git 
a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml 
b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
index d3dbaca..9df762d 100644
--- 
a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
+++ 
b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
@@ -1654,6 +1654,16 @@
   
   
 org.apache.camel
+camel-mongodb3
+${project.version}
+  
+  
+org.apache.camel
+camel-mongodb3-starter
+${project.version}
+  
+  
+org.apache.camel
 camel-mqtt
 ${project.version}
   

[03/13] camel git commit: CAMEL-10554 - camel-mongodb evolution to driver 3. Merging the component. Thanks to Jean-Yves Terrien for the contribution.

[acosentino]

http://git-wip-us.apache.org/repos/asf/camel/blob/7bd7750e/components/camel-mongodb3/src/test/java/org/apache/camel/component/mongodb3/MongoDbDynamicityTest.java
--
diff --git 
a/components/camel-mongodb3/src/test/java/org/apache/camel/component/mongodb3/MongoDbDynamicityTest.java
 
b/components/camel-mongodb3/src/test/java/org/apache/camel/component/mongodb3/MongoDbDynamicityTest.java
new file mode 100644
index 000..b4d5410
--- /dev/null
+++ 
b/components/camel-mongodb3/src/test/java/org/apache/camel/component/mongodb3/MongoDbDynamicityTest.java
@@ -0,0 +1,165 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.mongodb3;
+
+import static com.mongodb.client.model.Filters.eq;
+import static org.apache.camel.component.mongodb3.MongoDbConstants.MONGO_ID;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.stream.StreamSupport;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mongodb3.MongoDbConstants;
+import org.bson.Document;
+import org.junit.Test;
+
+import com.mongodb.client.MongoCollection;
+
+public class MongoDbDynamicityTest extends AbstractMongoDbTest {
+
+   @Test
+public void testInsertDynamicityDisabled() {
+assertEquals(0, testCollection.count());
+mongo.getDatabase("otherDB").drop();
+db.getCollection("otherCollection").drop();
+assertFalse("The otherDB database should not exist",
+StreamSupport.stream(mongo.listDatabaseNames().spliterator(), 
false)
+.anyMatch("otherDB"::equals));
+
+String body = "{\"_id\": \"testInsertDynamicityDisabled\", \"a\" : 
\"1\"}";
+Map headers = new HashMap<>();
+headers.put(MongoDbConstants.DATABASE, "otherDB");
+headers.put(MongoDbConstants.COLLECTION, "otherCollection");
+//Object result = 
+   template.requestBodyAndHeaders("direct:noDynamicity", 
body, headers);
+
+   Document b = testCollection.find(eq(MONGO_ID, 
"testInsertDynamicityDisabled")).first();
+assertNotNull("No record with 'testInsertDynamicityDisabled' _id", b);
+
+body = "{\"_id\": \"testInsertDynamicityDisabledExplicitly\", \"a\" : 
\"1\"}";
+//result = 
+   
template.requestBodyAndHeaders("direct:noDynamicityExplicit", body, headers);
+
+b = testCollection.find(eq(MONGO_ID, 
"testInsertDynamicityDisabledExplicitly")).first();
+assertNotNull("No record with 'testInsertDynamicityDisabledExplicitly' 
_id", b);
+
+assertFalse("The otherDB database should not exist",
+StreamSupport.stream(mongo.listDatabaseNames().spliterator(), 
false)
+.anyMatch("otherDB"::equals));
+
+}
+
+@Test
+public void testInsertDynamicityEnabledDBOnly() {
+assertEquals(0, testCollection.count());
+mongo.getDatabase("otherDB").drop();
+db.getCollection("otherCollection").drop();
+assertFalse("The otherDB database should not exist",
+StreamSupport.stream(mongo.listDatabaseNames().spliterator(), 
false)
+.anyMatch("otherDB"::equals));
+
+String body = "{\"_id\": \"testInsertDynamicityEnabledDBOnly\", \"a\" 
: \"1\"}";
+Map headers = new HashMap<>();
+headers.put(MongoDbConstants.DATABASE, "otherDB");
+//Object result = 
+   
template.requestBodyAndHeaders("direct:dynamicityEnabled", body, headers);
+
+MongoCollection localDynamicCollection = 
mongo.getDatabase("otherDB").getCollection(testCollection.getNamespace().getCollectionName(),
 Document.class);
+
+Document b = localDynamicCollection.find(eq(MONGO_ID, 
"testInsertDynamicityEnabledDBOnly")).first();
+assertNotNull("No record with 'testInsertDynamicityEnabledDBOnly' 
_id", b);
+
+b = testCollection.find(eq(MONGO_ID, 
"testInsertDynamicityEnabledDBOnly")).first();
+assertNull("There is a record with 'testInsertDynamicityEnabledDBOnly' 
_id in the test 

[13/13] camel git commit: CAMEL-9748 - Create Openstack Component. Add component to kit.

[acosentino]

CAMEL-9748 - Create Openstack Component. Add component to kit.


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

Branch: refs/heads/master
Commit: 046e7dc218f55116357233f4879adff0e8454ca4
Parents: a0a3cd3
Author: Andrea Cosentino 
Authored: Sun Dec 18 10:05:07 2016 +0100
Committer: Andrea Cosentino 
Committed: Sun Dec 18 10:05:07 2016 +0100

--
 apache-camel/pom.xml | 9 +
 1 file changed, 9 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/046e7dc2/apache-camel/pom.xml
--
diff --git a/apache-camel/pom.xml b/apache-camel/pom.xml
index 87f8cf5..4db5135 100644
--- a/apache-camel/pom.xml
+++ b/apache-camel/pom.xml
@@ -678,6 +678,10 @@
 
 
   org.apache.camel
+  camel-openstack
+
+
+  org.apache.camel
   camel-optaplanner
 
 
@@ -1759,6 +1763,11 @@
 
 
   org.apache.camel
+  camel-openstack-starter
+  ${project.version}
+
+
+  org.apache.camel
   camel-optaplanner-starter
   ${project.version}
 

[02/13] camel git commit: CAMEL-10554 - camel-mongodb evolution to driver 3. Merging the component. Thanks to Jean-Yves Terrien for the contribution.

[acosentino]

http://git-wip-us.apache.org/repos/asf/camel/blob/7bd7750e/components/camel-mongodb3/src/test/java/org/apache/camel/component/mongodb3/MongoDbTailableCursorConsumerTest.java
--
diff --git 
a/components/camel-mongodb3/src/test/java/org/apache/camel/component/mongodb3/MongoDbTailableCursorConsumerTest.java
 
b/components/camel-mongodb3/src/test/java/org/apache/camel/component/mongodb3/MongoDbTailableCursorConsumerTest.java
new file mode 100644
index 000..c33caa8
--- /dev/null
+++ 
b/components/camel-mongodb3/src/test/java/org/apache/camel/component/mongodb3/MongoDbTailableCursorConsumerTest.java
@@ -0,0 +1,456 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.mongodb3;
+
+import java.util.Calendar;
+import static com.mongodb.client.model.Filters.eq;
+
+import org.apache.camel.ServiceStatus;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.component.mongodb3.MongoDbTailTrackingConfig;
+import org.bson.Document;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import com.mongodb.client.MongoCollection;
+import com.mongodb.client.model.CreateCollectionOptions;
+
+public class MongoDbTailableCursorConsumerTest extends AbstractMongoDbTest {
+
+private MongoCollection cappedTestCollection;
+private String cappedTestCollectionName;
+
+@Test
+public void testThousandRecordsWithoutReadPreference() throws Exception {
+testThousandRecordsWithRouteId("tailableCursorConsumer1");
+}
+
+@Test
+public void testThousandRecordsWithReadPreference() throws Exception {
+
testThousandRecordsWithRouteId("tailableCursorConsumer1.readPreference");
+}
+
+@Test
+public void testNoRecords() throws Exception {
+assertEquals(0, cappedTestCollection.count());
+MockEndpoint mock = getMockEndpoint("mock:test");
+mock.expectedMessageCount(0);
+//DocumentBuilder.start().add("capped", true).add("size", 
10).add("max", 1000).get()
+// create a capped collection with max = 1000
+CreateCollectionOptions collectionOptions = new 
CreateCollectionOptions()
+.capped(true)
+.sizeInBytes(10)
+.maxDocuments(1000);
+db.createCollection(cappedTestCollectionName,
+collectionOptions);
+cappedTestCollection = db.getCollection(cappedTestCollectionName, 
Document.class);
+assertEquals(0, cappedTestCollection.count());
+
+addTestRoutes();
+context.startRoute("tailableCursorConsumer1");
+Thread.sleep(1000);
+mock.assertIsSatisfied();
+context.stopRoute("tailableCursorConsumer1");
+
+}
+
+@Test
+public void testMultipleBursts() throws Exception {
+assertEquals(0, cappedTestCollection.count());
+MockEndpoint mock = getMockEndpoint("mock:test");
+mock.expectedMessageCount(5000);
+//DocumentBuilder.start().add("capped", true).add("size", 
10).add("max", 1000).get()
+// create a capped collection with max = 1000
+CreateCollectionOptions createCollectionOptions = new 
CreateCollectionOptions()
+.capped(true)
+.sizeInBytes(10)
+.maxDocuments(1000);
+db.createCollection(cappedTestCollectionName,
+createCollectionOptions);
+cappedTestCollection = db.getCollection(cappedTestCollectionName, 
Document.class);
+addTestRoutes();
+context.startRoute("tailableCursorConsumer1");
+
+// pump 5 bursts of 1000 records each with 500ms pause between burst 
and burst
+Thread t = new Thread(new Runnable() {
+@Override
+public void run() {
+for (int i = 0; i < 5000; i++) {
+if (i % 1000 == 0) {
+try {
+Thread.sleep(500);
+} catch (InterruptedException e) {
+return;
+}
+}
+ 

[07/13] camel git commit: CAMEL-10554 - Camel Mongodb evolution to driver 3. Build.

[acosentino]

CAMEL-10554 - Camel Mongodb evolution to driver 3. Build.


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

Branch: refs/heads/master
Commit: 3cb16078d7e0aa17051ddcb1a4253281e404099d
Parents: 5715fce
Author: Andrea Cosentino 
Authored: Sun Dec 18 09:22:18 2016 +0100
Committer: Andrea Cosentino 
Committed: Sun Dec 18 09:52:36 2016 +0100

--
 .../camel-mongodb3-starter/pom.xml  |  51 ++
 .../MongoDbComponentAutoConfiguration.java  |  80 ++
 .../src/main/resources/META-INF/LICENSE.txt | 203 +
 .../src/main/resources/META-INF/NOTICE.txt  |  11 +
 ...dditional-spring-configuration-metadata.json |  10 +
 .../main/resources/META-INF/spring.factories|  19 +
 .../src/main/resources/META-INF/spring.provides |  18 +
 .../src/main/docs/mongodb-component.adoc| 903 ---
 .../src/main/docs/mongodb3-component.adoc   | 903 +++
 9 files changed, 1295 insertions(+), 903 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/3cb16078/components-starter/camel-mongodb3-starter/pom.xml
--
diff --git a/components-starter/camel-mongodb3-starter/pom.xml 
b/components-starter/camel-mongodb3-starter/pom.xml
new file mode 100644
index 000..56d2434
--- /dev/null
+++ b/components-starter/camel-mongodb3-starter/pom.xml
@@ -0,0 +1,51 @@
+
+
+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/maven-v4_0_0.xsd;>
+  4.0.0
+  
+org.apache.camel
+components-starter
+2.19.0-SNAPSHOT
+  
+  camel-mongodb3-starter
+  jar
+  Spring-Boot Starter :: Camel :: MongoDB3
+  Spring-Boot Starter for Camel MongoDB (Java Driver 3) 
component
+  
+
+  org.springframework.boot
+  spring-boot-starter
+  ${spring-boot-version}
+
+
+  org.apache.camel
+  camel-mongodb3
+  ${project.version}
+
+
+
+  org.apache.camel
+  camel-core-starter
+
+
+  org.apache.camel
+  camel-spring-boot-starter
+
+
+  
+

http://git-wip-us.apache.org/repos/asf/camel/blob/3cb16078/components-starter/camel-mongodb3-starter/src/main/java/org/apache/camel/component/mongodb3/springboot/MongoDbComponentAutoConfiguration.java
--
diff --git 
a/components-starter/camel-mongodb3-starter/src/main/java/org/apache/camel/component/mongodb3/springboot/MongoDbComponentAutoConfiguration.java
 
b/components-starter/camel-mongodb3-starter/src/main/java/org/apache/camel/component/mongodb3/springboot/MongoDbComponentAutoConfiguration.java
new file mode 100644
index 000..38f7dc7
--- /dev/null
+++ 
b/components-starter/camel-mongodb3-starter/src/main/java/org/apache/camel/component/mongodb3/springboot/MongoDbComponentAutoConfiguration.java
@@ -0,0 +1,80 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.mongodb3.springboot;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.component.mongodb3.MongoDbComponent;
+import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.condition.ConditionMessage;
+import org.springframework.boot.autoconfigure.condition.ConditionOutcome;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import 
org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.SpringBootCondition;
+import org.springframework.boot.bind.RelaxedPropertyResolver;
+import org.springframework.context.annotation.Bean;
+import 

[11/13] camel git commit: CAMEL-10554 - Camel Mongodb evolution to driver 3. Fixed CS

[acosentino]

CAMEL-10554 - Camel Mongodb evolution to driver 3. Fixed CS


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

Branch: refs/heads/master
Commit: 5715fce79779f0e9654329bba74cc1b3967e2b34
Parents: 7bd7750
Author: Andrea Cosentino 
Authored: Sun Dec 18 09:20:09 2016 +0100
Committer: Andrea Cosentino 
Committed: Sun Dec 18 09:52:36 2016 +0100

--
 components-starter/pom.xml  |1 +
 .../component/mongodb3/MongoDbComponent.java|   20 +-
 .../component/mongodb3/MongoDbConstants.java|   46 +-
 .../component/mongodb3/MongoDbConsumerType.java |2 +-
 .../component/mongodb3/MongoDbEndpoint.java | 1120 +-
 .../component/mongodb3/MongoDbOutputType.java   |6 +-
 .../component/mongodb3/MongoDbProducer.java | 1051 
 .../mongodb3/MongoDbTailTrackingConfig.java |   12 +-
 .../mongodb3/MongoDbTailTrackingManager.java|   41 +-
 .../mongodb3/MongoDbTailableCursorConsumer.java |4 +-
 .../mongodb3/MongoDbTailingProcess.java |  380 +++---
 .../converters/MongoDbBasicConverters.java  |  221 ++--
 .../idempotent/MongoDbIdempotentRepository.java |   19 +-
 .../component/mongodb3/AbstractMongoDbTest.java |   24 +-
 .../mongodb3/EmbedMongoConfiguration.java   |   47 +-
 .../MongoBasicOperationsConfiguration.java  |2 +-
 .../mongodb3/MongoDbConversionsTest.java|   67 +-
 .../mongodb3/MongoDbDynamicityTest.java |  101 +-
 .../mongodb3/MongoDbExceptionHandlingTest.java  |   30 +-
 .../mongodb3/MongoDbFindOperationTest.java  |  102 +-
 .../mongodb3/MongoDbHeaderHandlingTest.java |   47 +-
 .../component/mongodb3/MongoDbIndexTest.java|   53 +-
 .../mongodb3/MongoDbOperationsTest.java |  763 ++--
 .../mongodb3/MongoDbOutputTypeTest.java |   29 +-
 .../MongoDbReadPreferenceOptionTest.java|  110 +-
 .../MongoDbSpringDslOperationsTest.java |9 +-
 .../MongoDbTailableCursorConsumerTest.java  |  231 ++--
 .../MongoDbIdempotentRepositoryTest.java|   22 +-
 28 files changed, 2241 insertions(+), 2319 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/5715fce7/components-starter/pom.xml
--
diff --git a/components-starter/pom.xml b/components-starter/pom.xml
index 2b60ca0..9fd5db3 100644
--- a/components-starter/pom.xml
+++ b/components-starter/pom.xml
@@ -206,6 +206,7 @@
 camel-mllp-starter
 camel-mongodb-gridfs-starter
 camel-mongodb-starter
+camel-mongodb3-starter
 camel-mqtt-starter
 camel-msv-starter
 camel-mustache-starter

http://git-wip-us.apache.org/repos/asf/camel/blob/5715fce7/components/camel-mongodb3/src/main/java/org/apache/camel/component/mongodb3/MongoDbComponent.java
--
diff --git 
a/components/camel-mongodb3/src/main/java/org/apache/camel/component/mongodb3/MongoDbComponent.java
 
b/components/camel-mongodb3/src/main/java/org/apache/camel/component/mongodb3/MongoDbComponent.java
index 76c873a..c54ba71 100644
--- 
a/components/camel-mongodb3/src/main/java/org/apache/camel/component/mongodb3/MongoDbComponent.java
+++ 
b/components/camel-mongodb3/src/main/java/org/apache/camel/component/mongodb3/MongoDbComponent.java
@@ -21,25 +21,21 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
+import com.mongodb.MongoClient;
+
 import org.apache.camel.Endpoint;
 import org.apache.camel.impl.UriEndpointComponent;
 import org.apache.camel.util.CamelContextHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.mongodb.MongoClient;
-
 /**
  * Represents the component that manages {@link MongoDbEndpoint}.
  */
 public class MongoDbComponent extends UriEndpointComponent {
-
-public static final Set WRITE_OPERATIONS = 
-new HashSet<>(Arrays.asList(
-   MongoDbOperation.insert, 
-   MongoDbOperation.save, 
-MongoDbOperation.update, 
-MongoDbOperation.remove));
+
+public static final Set WRITE_OPERATIONS = new 
HashSet<>(Arrays.asList(MongoDbOperation.insert, MongoDbOperation.save, 
MongoDbOperation.update,
+   
  MongoDbOperation.remove));
 private static final Logger LOG = 
LoggerFactory.getLogger(MongoDbComponent.class);
 private volatile MongoClient db;
 
@@ -50,7 +46,7 @@ public class MongoDbComponent extends UriEndpointComponent {
 /**
  * 

[01/13] camel git commit: CAMEL-10554 - Camel Mongodb evolution to driver 3. Added the component to kit.

[acosentino]

Repository: camel
Updated Branches:
  refs/heads/master caa82aa18 -> 046e7dc21


CAMEL-10554 - Camel Mongodb evolution to driver 3. Added the component to kit.


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

Branch: refs/heads/master
Commit: d79d9156696cfbdae60629de3f5ae3b63c73253c
Parents: 3cb1607
Author: Andrea Cosentino 
Authored: Sun Dec 18 09:28:01 2016 +0100
Committer: Andrea Cosentino 
Committed: Sun Dec 18 09:52:36 2016 +0100

--
 apache-camel/pom.xml |  9 +
 apache-camel/src/main/descriptors/common-bin.xml |  2 ++
 components/pom.xml   |  1 +
 parent/pom.xml   | 10 ++
 4 files changed, 22 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/d79d9156/apache-camel/pom.xml
--
diff --git a/apache-camel/pom.xml b/apache-camel/pom.xml
index 3d21c13..87f8cf5 100644
--- a/apache-camel/pom.xml
+++ b/apache-camel/pom.xml
@@ -614,6 +614,10 @@
 
 
   org.apache.camel
+  camel-mongodb3
+
+
+  org.apache.camel
   camel-mongodb-gridfs
 
 
@@ -1680,6 +1684,11 @@
 
 
   org.apache.camel
+  camel-mongodb3-starter
+  ${project.version}
+
+
+  org.apache.camel
   camel-mqtt-starter
   ${project.version}
 

http://git-wip-us.apache.org/repos/asf/camel/blob/d79d9156/apache-camel/src/main/descriptors/common-bin.xml
--
diff --git a/apache-camel/src/main/descriptors/common-bin.xml 
b/apache-camel/src/main/descriptors/common-bin.xml
index 7b0fd4e..6621c65 100644
--- a/apache-camel/src/main/descriptors/common-bin.xml
+++ b/apache-camel/src/main/descriptors/common-bin.xml
@@ -160,6 +160,7 @@
 org.apache.camel:camel-mina2
 org.apache.camel:camel-mllp
 org.apache.camel:camel-mongodb
+org.apache.camel:camel-mongodb3
 org.apache.camel:camel-mongodb-gridfs
 org.apache.camel:camel-mqtt
 org.apache.camel:camel-msv
@@ -424,6 +425,7 @@
 org.apache.camel:camel-mllp-starter
 org.apache.camel:camel-mongodb-gridfs-starter
 org.apache.camel:camel-mongodb-starter
+org.apache.camel:camel-mongodb3-starter
 org.apache.camel:camel-mqtt-starter
 org.apache.camel:camel-msv-starter
 org.apache.camel:camel-mustache-starter

http://git-wip-us.apache.org/repos/asf/camel/blob/d79d9156/components/pom.xml
--
diff --git a/components/pom.xml b/components/pom.xml
index a241f5d..59650e7 100644
--- a/components/pom.xml
+++ b/components/pom.xml
@@ -184,6 +184,7 @@
 camel-mina2
 camel-mllp
 camel-mongodb
+camel-mongodb3
 camel-mongodb-gridfs
 camel-mqtt
 camel-msv

http://git-wip-us.apache.org/repos/asf/camel/blob/d79d9156/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index a915299..61aa920 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1442,6 +1442,11 @@
   
   
 org.apache.camel
+camel-mongodb3
+${project.version}
+  
+  
+org.apache.camel
 camel-mongodb-gridfs
 ${project.version}
   
@@ -2699,6 +2704,11 @@
   
   
 org.apache.camel
+camel-mongodb3-starter
+${project.version}
+  
+  
+org.apache.camel
 camel-mqtt-starter
 ${project.version}
   

[04/13] camel git commit: CAMEL-10554 - camel-mongodb evolution to driver 3. Merging the component. Thanks to Jean-Yves Terrien for the contribution.

[acosentino]

http://git-wip-us.apache.org/repos/asf/camel/blob/7bd7750e/components/camel-mongodb3/src/main/java/org/apache/camel/component/mongodb3/MongoDbOutputType.java
--
diff --git 
a/components/camel-mongodb3/src/main/java/org/apache/camel/component/mongodb3/MongoDbOutputType.java
 
b/components/camel-mongodb3/src/main/java/org/apache/camel/component/mongodb3/MongoDbOutputType.java
new file mode 100644
index 000..694e054
--- /dev/null
+++ 
b/components/camel-mongodb3/src/main/java/org/apache/camel/component/mongodb3/MongoDbOutputType.java
@@ -0,0 +1,23 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.mongodb3;
+
+public enum MongoDbOutputType {
+DocumentList, //List
+Document, //Document
+MongoIterable //MongoIterable
+}

http://git-wip-us.apache.org/repos/asf/camel/blob/7bd7750e/components/camel-mongodb3/src/main/java/org/apache/camel/component/mongodb3/MongoDbProducer.java
--
diff --git 
a/components/camel-mongodb3/src/main/java/org/apache/camel/component/mongodb3/MongoDbProducer.java
 
b/components/camel-mongodb3/src/main/java/org/apache/camel/component/mongodb3/MongoDbProducer.java
new file mode 100644
index 000..d1f04c2
--- /dev/null
+++ 
b/components/camel-mongodb3/src/main/java/org/apache/camel/component/mongodb3/MongoDbProducer.java
@@ -0,0 +1,566 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.mongodb3;
+
+import static com.mongodb.client.model.Filters.eq;
+import static org.apache.camel.component.mongodb3.MongoDbConstants.BATCH_SIZE;
+import static org.apache.camel.component.mongodb3.MongoDbConstants.COLLECTION;
+import static 
org.apache.camel.component.mongodb3.MongoDbConstants.COLLECTION_INDEX;
+import static org.apache.camel.component.mongodb3.MongoDbConstants.DATABASE;
+import static org.apache.camel.component.mongodb3.MongoDbConstants.CRITERIA;
+import static 
org.apache.camel.component.mongodb3.MongoDbConstants.FIELDS_PROJECTION;
+import static org.apache.camel.component.mongodb3.MongoDbConstants.LIMIT;
+import static org.apache.camel.component.mongodb3.MongoDbConstants.MONGO_ID;
+import static org.apache.camel.component.mongodb3.MongoDbConstants.MULTIUPDATE;
+import static org.apache.camel.component.mongodb3.MongoDbConstants.NUM_TO_SKIP;
+import static org.apache.camel.component.mongodb3.MongoDbConstants.OID;
+import static 
org.apache.camel.component.mongodb3.MongoDbConstants.OPERATION_HEADER;
+import static 
org.apache.camel.component.mongodb3.MongoDbConstants.RECORDS_AFFECTED;
+import static 
org.apache.camel.component.mongodb3.MongoDbConstants.RECORDS_MATCHED;
+import static 
org.apache.camel.component.mongodb3.MongoDbConstants.RESULT_PAGE_SIZE;
+import static 
org.apache.camel.component.mongodb3.MongoDbConstants.RESULT_TOTAL_SIZE;
+import static org.apache.camel.component.mongodb3.MongoDbConstants.SORT_BY;
+import static org.apache.camel.component.mongodb3.MongoDbConstants.UPSERT;
+import static org.apache.camel.component.mongodb3.MongoDbConstants.WRITERESULT;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.InvalidPayloadException;
+import 

[08/13] camel git commit: CAMEL-10554 - Camel Mongodb evolution to driver 3. Fixed CS

[acosentino]

http://git-wip-us.apache.org/repos/asf/camel/blob/5715fce7/components/camel-mongodb3/src/test/java/org/apache/camel/component/mongodb3/MongoDbOutputTypeTest.java
--
diff --git 
a/components/camel-mongodb3/src/test/java/org/apache/camel/component/mongodb3/MongoDbOutputTypeTest.java
 
b/components/camel-mongodb3/src/test/java/org/apache/camel/component/mongodb3/MongoDbOutputTypeTest.java
index 7ac2af9..a2a0c9a 100644
--- 
a/components/camel-mongodb3/src/test/java/org/apache/camel/component/mongodb3/MongoDbOutputTypeTest.java
+++ 
b/components/camel-mongodb3/src/test/java/org/apache/camel/component/mongodb3/MongoDbOutputTypeTest.java
@@ -16,24 +16,23 @@
  */
 package org.apache.camel.component.mongodb3;
 
-import static org.apache.camel.component.mongodb3.MongoDbConstants.MONGO_ID;
-
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import com.mongodb.client.MongoIterable;
+
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.mongodb3.MongoDbConstants;
 import org.apache.commons.lang3.ObjectUtils;
 import org.bson.Document;
 import org.junit.Test;
 
-import com.mongodb.client.MongoIterable;
+import static org.apache.camel.component.mongodb3.MongoDbConstants.MONGO_ID;
 
 public class MongoDbOutputTypeTest extends AbstractMongoDbTest {
 
-   @Test
+@Test
 public void testFindAllDBCursor() {
 // Test that the collection has 0 documents in it
 assertEquals(0, testCollection.count());
@@ -49,7 +48,7 @@ public class MongoDbOutputTypeTest extends 
AbstractMongoDbTest {
 assertTrue("Result is not of type MongoIterable", result 
instanceof MongoIterable);
 
 @SuppressWarnings("unchecked")
-   MongoIterable resultCursor = 
(MongoIterable) result;
+MongoIterable resultCursor = 
(MongoIterable)result;
 // Ensure that all returned documents contain all fields
 for (Document document : resultCursor) {
 assertNotNull("Document in returned list should contain all 
fields", document.get(MONGO_ID));
@@ -69,7 +68,7 @@ public class MongoDbOutputTypeTest extends 
AbstractMongoDbTest {
 Object result = template.requestBody("direct:findAllDocumentList", 
ObjectUtils.NULL);
 assertTrue("Result is not of type List", result instanceof List);
 @SuppressWarnings("unchecked")
-List resultList = (List) result;
+List resultList = (List)result;
 
 assertListSize("Result does not contain 1000 elements", resultList, 
1000);
 
@@ -91,7 +90,8 @@ public class MongoDbOutputTypeTest extends 
AbstractMongoDbTest {
 RouteBuilder taillableRouteBuilder = new RouteBuilder() {
 @Override
 public void configure() throws Exception {
-
from("mongodb3:myDb?database={{mongodb.testDb}}={{mongodb.testCollection}}=findById=true=MongoIterable").to("mock:dummy");
+
from("mongodb3:myDb?database={{mongodb.testDb}}={{mongodb.testCollection}}=findById=true=MongoIterable")
+.to("mock:dummy");
 }
 };
 template.getCamelContext().addRoutes(taillableRouteBuilder);
@@ -108,9 +108,7 @@ public class MongoDbOutputTypeTest extends 
AbstractMongoDbTest {
 @Override
 public void configure() throws Exception {
 
from("mongodb3:myDb?database={{mongodb.testDb}}={{mongodb.cappedTestCollection}}=increasing=MongoIterable")
-.id("tailableCursorConsumer1")
-.autoStartup(false)
-.to("mock:test");
+
.id("tailableCursorConsumer1").autoStartup(false).to("mock:test");
 }
 };
 template.getCamelContext().addRoutes(taillableRouteBuilder);
@@ -126,11 +124,10 @@ public class MongoDbOutputTypeTest extends 
AbstractMongoDbTest {
 public void configure() {
 
 from("direct:findAllDBCursor")
-
.to("mongodb3:myDb?database={{mongodb.testDb}}={{mongodb.testCollection}}=findAll=true=MongoIterable")
-.to("mock:resultFindAllDBCursor");
-from("direct:findAllDocumentList")
-
.to("mongodb3:myDb?database={{mongodb.testDb}}={{mongodb.testCollection}}=findAll=DocumentList")
-.to("mock:resultFindAllDocumentList");
+
.to("mongodb3:myDb?database={{mongodb.testDb}}={{mongodb.testCollection}}=findAll=true=MongoIterable")
+.to("mock:resultFindAllDBCursor");
+
from("direct:findAllDocumentList").to("mongodb3:myDb?database={{mongodb.testDb}}={{mongodb.testCollection}}=findAll=DocumentList")
+.to("mock:resultFindAllDocumentList");