camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From acosent...@apache.org
Subject [camel] 01/05: CAMEL-13792 - Rename components to default names, Camel-mongodb3 to camel-mongodb
Date Fri, 02 Aug 2019 10:47:07 GMT
This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 198e5bbe4093a7625510c681466237117acd56a4
Author: Andrea Cosentino <ancosen@gmail.com>
AuthorDate: Fri Aug 2 11:26:30 2019 +0200

    CAMEL-13792 - Rename components to default names, Camel-mongodb3 to camel-mongodb
---
 .../{camel-mongodb3 => camel-mongodb}/pom.xml      |  4 +-
 .../src/main/docs/mongodb-component.adoc}          | 70 +++++++++++-----------
 .../component/mongodb3/CamelMongoDbException.java  |  0
 .../mongodb3/MongoAbstractConsumerThread.java      |  0
 .../mongodb3/MongoDbChangeStreamsConsumer.java     |  0
 .../mongodb3/MongoDbChangeStreamsThread.java       |  0
 .../camel/component/mongodb3/MongoDbComponent.java |  2 +-
 .../camel/component/mongodb3/MongoDbConstants.java |  0
 .../component/mongodb3/MongoDbConsumerType.java    |  0
 .../camel/component/mongodb3/MongoDbEndpoint.java  |  2 +-
 .../camel/component/mongodb3/MongoDbOperation.java |  0
 .../component/mongodb3/MongoDbOutputType.java      |  0
 .../camel/component/mongodb3/MongoDbProducer.java  |  0
 .../mongodb3/MongoDbTailTrackingConfig.java        |  0
 .../mongodb3/MongoDbTailTrackingManager.java       |  0
 .../mongodb3/MongoDbTailableCursorConsumer.java    |  0
 .../component/mongodb3/MongoDbTailingThread.java   |  0
 .../converters/MongoDbBasicConverters.java         |  0
 .../converters/MongoDbFallbackConverter.java       |  0
 .../idempotent/MongoDbIdempotentRepository.java    |  0
 .../component/mongodb3/AbstractMongoDbTest.java    |  0
 .../mongodb3/EmbedMongoConfiguration.java          |  0
 .../MongoBasicOperationsConfiguration.java         |  0
 .../mongodb3/MongoDbAggregateOperationTest.java    |  4 +-
 .../mongodb3/MongoDbBigDecimalConverterTest.java   |  2 +-
 .../mongodb3/MongoDbBulkWriteOperationTest.java    |  4 +-
 .../mongodb3/MongoDbChangeStreamsConsumerTest.java |  4 +-
 .../mongodb3/MongoDbConnectionBeansTest.java       | 12 ++--
 .../component/mongodb3/MongoDbConversionsTest.java |  8 +--
 .../component/mongodb3/MongoDbDynamicityTest.java  |  6 +-
 .../mongodb3/MongoDbExceptionHandlingTest.java     |  6 +-
 .../mongodb3/MongoDbFindOperationTest.java         |  8 +--
 .../mongodb3/MongoDbHeaderHandlingTest.java        |  8 +--
 .../camel/component/mongodb3/MongoDbIndexTest.java |  6 +-
 .../component/mongodb3/MongoDbOperationsTest.java  | 22 +++----
 .../component/mongodb3/MongoDbOutputTypeTest.java  |  8 +--
 .../mongodb3/MongoDbReadPreferenceOptionTest.java  | 16 ++---
 .../mongodb3/MongoDbSpringDslOperationsTest.java   |  0
 .../mongodb3/MongoDbStopEndpointTest.java          |  4 +-
 .../MongoDbTailableCursorConsumerTest.java         |  8 +--
 .../MongoDbIdempotentRepositoryTest.java           |  0
 .../src/test/resources/log4j2.properties           |  0
 .../src/test/resources/mongodb.test.properties     |  2 +-
 .../mongodb3/mongoBasicOperationsTest.xml          | 22 +++----
 components/pom.xml                                 |  2 +-
 .../dsl/MongoDbEndpointBuilderFactory.java         |  8 +--
 .../pom.xml                                        |  6 +-
 .../MongoDbComponentAutoConfiguration.java         |  8 +--
 .../springboot/MongoDbComponentConfiguration.java  |  4 +-
 .../src/main/resources/META-INF/LICENSE.txt        |  0
 .../src/main/resources/META-INF/NOTICE.txt         |  0
 .../src/main/resources/META-INF/spring.factories   |  1 +
 .../src/main/resources/META-INF/spring.provides    |  2 +-
 .../additional-spring-configuration-metadata.json  | 10 ----
 platforms/spring-boot/components-starter/pom.xml   |  1 +
 55 files changed, 131 insertions(+), 139 deletions(-)

diff --git a/components/camel-mongodb3/pom.xml b/components/camel-mongodb/pom.xml
similarity index 97%
rename from components/camel-mongodb3/pom.xml
rename to components/camel-mongodb/pom.xml
index 98c0d8e..7bcccc4 100644
--- a/components/camel-mongodb3/pom.xml
+++ b/components/camel-mongodb/pom.xml
@@ -27,9 +27,9 @@
         <version>3.0.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>camel-mongodb3</artifactId>
+    <artifactId>camel-mongodb</artifactId>
     <packaging>jar</packaging>
-    <name>Camel :: MongoDB3</name>
+    <name>Camel :: MongoDB</name>
     <description>Camel MongoDB (Java Driver 3) component</description>
 
     <properties>
diff --git a/components/camel-mongodb3/src/main/docs/mongodb3-component.adoc b/components/camel-mongodb/src/main/docs/mongodb-component.adoc
similarity index 93%
rename from components/camel-mongodb3/src/main/docs/mongodb3-component.adoc
rename to components/camel-mongodb/src/main/docs/mongodb-component.adoc
index 9c55c50..455d892 100644
--- a/components/camel-mongodb3/src/main/docs/mongodb3-component.adoc
+++ b/components/camel-mongodb/src/main/docs/mongodb-component.adoc
@@ -1,9 +1,9 @@
-[[mongodb3-component]]
+[[mongodb-component]]
 = MongoDB Component
 
 *Available as of Camel version 2.19*
 
-Note: Camel MongoDB3 component Use the Mongo Driver for Java 3.x.
+Note: Camel MongoDB component Use the Mongo Driver for Java 3.x.
 If your are looking for previews versions look the Camel MongoDB component.
 
 According to Wikipedia: "NoSQL is a movement promoting a loosely defined
@@ -38,7 +38,7 @@ for this component:
 ------------------------------------------------------------
 <dependency>
     <groupId>org.apache.camel</groupId>
-    <artifactId>camel-mongodb3</artifactId>
+    <artifactId>camel-mongodb</artifactId>
     <version>x.y.z</version>
     <!-- use the same version as your Camel core version -->
 </dependency>
@@ -48,7 +48,7 @@ for this component:
 
 [source,java]
 ---------------------------------------------------------------------------------------------------------------
-mongodb3:connectionBean?database=databaseName&collection=collectionName&operation=operationName[&moreOptions...]
+mongodb:connectionBean?database=databaseName&collection=collectionName&operation=operationName[&moreOptions...]
 ---------------------------------------------------------------------------------------------------------------
 
 == MongoDB options
@@ -77,7 +77,7 @@ The MongoDB component supports 3 options, which are listed below.
 The MongoDB endpoint is configured using URI syntax:
 
 ----
-mongodb3:connectionBean
+mongodb:connectionBean
 ----
 
 with the following path and query parameters:
@@ -194,7 +194,7 @@ The following route defined in Spring XML executes the operation
 <route>
   <from uri="direct:start" />
   <!-- using bean 'mongoBean' defined above -->
-  <to uri="mongodb3:mongoBean?database=${mongodb.database}&amp;collection=${mongodb.collection}&amp;operation=getDbStats" />
+  <to uri="mongodb:mongoBean?database=${mongodb.database}&amp;collection=${mongodb.collection}&amp;operation=getDbStats" />
   <to uri="direct:result" />
 </route>
 ---------------------------------------------------------------------------------------------------------------------------
@@ -215,7 +215,7 @@ http://www.mongodb.org/display/DOCS/Java+Types[http://www.mongodb.org/display/DO
 [source,java]
 ------------------------------------------------------------------------------
 from("direct:findById")
-    .to("mongodb3:myDb?database=flights&collection=tickets&operation=findById")
+    .to("mongodb:myDb?database=flights&collection=tickets&operation=findById")
     .to("mock:resultFindById");
 ------------------------------------------------------------------------------
 
@@ -238,7 +238,7 @@ Example with no query (returns any object of the collection):
 [source,java]
 ------------------------------------------------------------------------------------
 from("direct:findOneByQuery")
-    .to("mongodb3:myDb?database=flights&collection=tickets&operation=findOneByQuery")
+    .to("mongodb:myDb?database=flights&collection=tickets&operation=findOneByQuery")
     .to("mock:resultFindOneByQuery");
 ------------------------------------------------------------------------------------
 
@@ -248,7 +248,7 @@ Example with a query (returns one matching result):
 ------------------------------------------------------------------------------------
 from("direct:findOneByQuery")
     .setHeader(MongoDbConstants.CRITERIA, Filters.eq("name", "Raul Kripalani"))
-    .to("mongodb3:myDb?database=flights&collection=tickets&operation=findOneByQuery")
+    .to("mongodb:myDb?database=flights&collection=tickets&operation=findOneByQuery")
     .to("mock:resultFindOneByQuery");
 ------------------------------------------------------------------------------------
 
@@ -271,7 +271,7 @@ Example with no query (returns all object in the collection):
 [source,java]
 -----------------------------------------------------------------------------
 from("direct:findAll")
-    .to("mongodb3:myDb?database=flights&collection=tickets&operation=findAll")
+    .to("mongodb:myDb?database=flights&collection=tickets&operation=findAll")
     .to("mock:resultFindAll");
 -----------------------------------------------------------------------------
 
@@ -281,7 +281,7 @@ Example with a query (returns all matching results):
 -----------------------------------------------------------------------------
 from("direct:findAll")
     .setHeader(MongoDbConstants.CRITERIA, Filters.eq("name", "Raul Kripalani"))
-    .to("mongodb3:myDb?database=flights&collection=tickets&operation=findAll")
+    .to("mongodb:myDb?database=flights&collection=tickets&operation=findAll")
     .to("mock:resultFindAll");
 -----------------------------------------------------------------------------
 
@@ -317,7 +317,7 @@ Example with option outputType=MongoIterable and batch size :
 from("direct:findAll")
     .setHeader(MongoDbConstants.BATCH_SIZE).constant(10)
     .setHeader(MongoDbConstants.CRITERIA, Filters.eq("name", "Raul Kripalani"))
-    .to("mongodb3:myDb?database=flights&collection=tickets&operation=findAll&outputType=MongoIterable")
+    .to("mongodb:myDb?database=flights&collection=tickets&operation=findAll&outputType=MongoIterable")
     .to("mock:resultFindAll");
 -----------------------------------------------------------------------------
 
@@ -351,7 +351,7 @@ collection.
 
 [source,java]
 ------------------------------------------------------------------------------------------------------------------------------------
-// from("direct:count").to("mongodb3:myDb?database=tickets&collection=flights&operation=count&dynamicity=true");
+// from("direct:count").to("mongodb:myDb?database=tickets&collection=flights&operation=count&dynamicity=true");
 Long result = template.requestBodyAndHeader("direct:count", "irrelevantBody", MongoDbConstants.COLLECTION, "dynamicCollectionName");
 assertTrue("Result is not of type Long", result instanceof Long);
 ------------------------------------------------------------------------------------------------------------------------------------
@@ -385,7 +385,7 @@ the creation of Bson. It retrieves all fields except `_id` and
 
 [source,java]
 ----------------------------------------------------------------------------------------------------------------------------
-// route: from("direct:findAll").to("mongodb3:myDb?database=flights&collection=tickets&operation=findAll")
+// route: from("direct:findAll").to("mongodb:myDb?database=flights&collection=tickets&operation=findAll")
 Bson fieldProjection = Projection.exclude("_id", "boringField");
 Object result = template.requestBodyAndHeader("direct:findAll", ObjectUtils.NULL, MongoDbConstants.FIELDS_PROJECTION, fieldProjection);
 ----------------------------------------------------------------------------------------------------------------------------
@@ -396,7 +396,7 @@ the creation of Bson. It retrieves all fields except `_id` and
 
 [source,java]
 ----------------------------------------------------------------------------------------------------------------------------
-// route: from("direct:findAll").to("mongodb3:myDb?database=flights&collection=tickets&operation=findAll")
+// route: from("direct:findAll").to("mongodb:myDb?database=flights&collection=tickets&operation=findAll")
 Bson fieldProjection = Projection.exclude("_id", "boringField");
 Object result = template.requestBodyAndHeader("direct:findAll", ObjectUtils.NULL, MongoDbConstants.FIELDS_PROJECTION, fieldProjection);
 ----------------------------------------------------------------------------------------------------------------------------
@@ -411,7 +411,7 @@ the creation of Bson. It retrieves all fields except `_id` and
 
 [source,java]
 ----------------------------------------------------------------------------------------------------------------------------
-// route: from("direct:findAll").to("mongodb3:myDb?database=flights&collection=tickets&operation=findAll")
+// route: from("direct:findAll").to("mongodb:myDb?database=flights&collection=tickets&operation=findAll")
 Bson sorts = Sorts.descending("_id");
 Object result = template.requestBodyAndHeader("direct:findAll", ObjectUtils.NULL, MongoDbConstants.SORT_BY, sorts);
 ----------------------------------------------------------------------------------------------------------------------------
@@ -430,7 +430,7 @@ to a single field, based on the `documentTimestamp` field:
 .setHeader(MongoDbConstants.SORT_BY).constant(Sorts.descending("documentTimestamp"))
 .setHeader(MongoDbConstants.FIELDS_PROJECTION).constant(Projection.include("documentTimestamp"))
 .setBody().constant("{}")
-.to("mongodb3:myDb?database=local&collection=myDemoCollection&operation=findOneByQuery")
+.to("mongodb:myDb?database=local&collection=myDemoCollection&operation=findOneByQuery")
 .to("direct:aMyBatisParameterizedSelect");
 ----------------------------------------------------------------------------------------------------------------------------
 
@@ -450,7 +450,7 @@ Example:
 [source,java]
 -----------------------------------------------------------------------------
 from("direct:insert")
-    .to("mongodb3:myDb?database=flights&collection=tickets&operation=insert");
+    .to("mongodb:myDb?database=flights&collection=tickets&operation=insert");
 -----------------------------------------------------------------------------
 
 The operation will return a WriteResult, and depending on the
@@ -512,7 +512,7 @@ For example:
 [source,java]
 ---------------------------------------------------------------------------
 from("direct:insert")
-    .to("mongodb3:myDb?database=flights&collection=tickets&operation=save");
+    .to("mongodb:myDb?database=flights&collection=tickets&operation=save");
 ---------------------------------------------------------------------------
 
 ==== update
@@ -565,7 +565,7 @@ field equals true by setting the value of the "scientist" field to
 
 [source,java]
 ------------------------------------------------------------------------------------------------------------------------------------------
-// route: from("direct:update").to("mongodb3:myDb?database=science&collection=notableScientists&operation=update");
+// route: from("direct:update").to("mongodb:myDb?database=science&collection=notableScientists&operation=update");
 Bson filterField = Filters.eq("filterField", true);
 String updateObj = Updates.set("scientist", "Darwin");
 Object result = template.requestBodyAndHeader("direct:update", new Bson[] {filterField, Document.parse(updateObj)}, MongoDbConstants.MULTIUPDATE, true);
@@ -573,7 +573,7 @@ Object result = template.requestBodyAndHeader("direct:update", new Bson[] {filte
 
 [source,java]
 ------------------------------------------------------------------------------------------------------------------------------------------
-// route: from("direct:update").to("mongodb3:myDb?database=science&collection=notableScientists&operation=update");
+// route: from("direct:update").to("mongodb:myDb?database=science&collection=notableScientists&operation=update");
 Maps<String, Object> headers = new HashMap<>(2);
 headers.add(MongoDbConstants.MULTIUPDATE, true);
 headers.add(MongoDbConstants.FIELDS_FILTER, Filters.eq("filterField", true));
@@ -584,7 +584,7 @@ Object result = template.requestBodyAndHeaders("direct:update", updateObj, heade
 
 [source,java]
 ------------------------------------------------------------------------------------------------------------------------------------------
-// route: from("direct:update").to("mongodb3:myDb?database=science&collection=notableScientists&operation=update");
+// route: from("direct:update").to("mongodb:myDb?database=science&collection=notableScientists&operation=update");
 String updateObj = "[{\"filterField\": true}, {\"$set\", {\"scientist\", \"Darwin\"}}]";
 Object result = template.requestBodyAndHeader("direct:update", updateObj, MongoDbConstants.MULTIUPDATE, true);
 
@@ -603,7 +603,7 @@ collection:
 
 [source,java]
 ------------------------------------------------------------------------------------------------------------------
-// route: from("direct:remove").to("mongodb3:myDb?database=science&collection=notableScientists&operation=remove");
+// route: from("direct:remove").to("mongodb:myDb?database=science&collection=notableScientists&operation=remove");
 Bson conditionField = Filters.eq("conditionField", true);
 Object result = template.requestBody("direct:remove", conditionField);
 ------------------------------------------------------------------------------------------------------------------
@@ -660,12 +660,12 @@ body.
 
 [source,java]
 ----------------------------------------------------------------------------------------------------------------------------------------------------------------------
-// route: from("direct:aggregate").to("mongodb3:myDb?database=science&collection=notableScientists&operation=aggregate");
+// route: from("direct:aggregate").to("mongodb:myDb?database=science&collection=notableScientists&operation=aggregate");
 List<Bson> aggregate = Arrays.asList(match(or(eq("scientist", "Darwin"), eq("scientist", 
         group("$scientist", sum("count", 1)));
 from("direct:aggregate")
     .setBody().constant(aggregate)
-    .to("mongodb3:myDb?database=science&collection=notableScientists&operation=aggregate")
+    .to("mongodb:myDb?database=science&collection=notableScientists&operation=aggregate")
     .to("mock:resultAggregate");
 ----------------------------------------------------------------------------------------------------------------------------------------------------------------------
 
@@ -693,7 +693,7 @@ List<Bson> aggregate = Arrays.asList(match(or(eq("scientist", "Darwin"), eq("sci
 from("direct:aggregate")
     .setHeader(MongoDbConstants.BATCH_SIZE).constant(10)
     .setBody().constant(aggregate)
-    .to("mongodb3:myDb?database=science&collection=notableScientists&operation=aggregate&outputType=MongoIterable")
+    .to("mongodb:myDb?database=science&collection=notableScientists&operation=aggregate&outputType=MongoIterable")
     .split(body())
     .streaming()
     .to("mock:resultAggregate");
@@ -732,7 +732,7 @@ Usage example:
 
 [source,java]
 ---------------------------------------------------------------------------------------------------------
-// from("direct:getDbStats").to("mongodb3:myDb?database=flights&collection=tickets&operation=getDbStats");
+// from("direct:getDbStats").to("mongodb:myDb?database=flights&collection=tickets&operation=getDbStats");
 Object result = template.requestBody("direct:getDbStats", "irrelevantBody");
 assertTrue("Result is not of type Document", result instanceof Document);
 ---------------------------------------------------------------------------------------------------------
@@ -772,7 +772,7 @@ Usage example:
 
 [source,java]
 -----------------------------------------------------------------------------------------------------------
-// from("direct:getColStats").to("mongodb3:myDb?database=flights&collection=tickets&operation=getColStats");
+// from("direct:getColStats").to("mongodb:myDb?database=flights&collection=tickets&operation=getColStats");
 Object result = template.requestBody("direct:getColStats", "irrelevantBody");
 assertTrue("Result is not of type Document", result instanceof Document);
 -----------------------------------------------------------------------------------------------------------
@@ -789,7 +789,7 @@ Collection parameter is not use for this operation.
 
 [source,java]
 --------------------------------------------------------------------------------
-// route: from("command").to("mongodb3:myDb?database=science&operation=command");
+// route: from("command").to("mongodb:myDb?database=science&operation=command");
 DBObject commandBody = new BasicDBObject("hostInfo", "1");
 Object result = template.requestBody("direct:command", commandBody);
 --------------------------------------------------------------------------------
@@ -807,7 +807,7 @@ For example:
 
 [source,java]
 -----------------------------------------------------------------------------------------------------------------------------
-// from("direct:insert").to("mongodb3:myDb?database=flights&collection=tickets&operation=insert");
+// from("direct:insert").to("mongodb:myDb?database=flights&collection=tickets&operation=insert");
 Object result = template.requestBodyAndHeader("direct:insert", "irrelevantBody", MongoDbConstants.OPERATION_HEADER, "count");
 assertTrue("Result is not of type Long", result instanceof Long);
 -----------------------------------------------------------------------------------------------------------------------------
@@ -881,7 +881,7 @@ An example:
 
 [source,java]
 -----------------------------------------------------------------------------------------------------
-from("mongodb3:myDb?database=flights&collection=cancellations&tailTrackIncreasingField=departureTime")
+from("mongodb:myDb?database=flights&collection=cancellations&tailTrackIncreasingField=departureTime")
     .id("tailableCursorConsumer1")
     .autoStartup(false)
     .to("mock:test");
@@ -935,7 +935,7 @@ the last processed value under the "lastTrackingValue" field
 
 [source,java]
 -----------------------------------------------------------------------------------------------------------------------------------
-from("mongodb3:myDb?database=flights&collection=cancellations&tailTrackIncreasingField=departureTime&persistentTailTracking=true" + 
+from("mongodb:myDb?database=flights&collection=cancellations&tailTrackIncreasingField=departureTime&persistentTailTracking=true" + 
      "&persistentId=cancellationsTracker")
     .id("tailableCursorConsumer2")
     .autoStartup(false)
@@ -949,7 +949,7 @@ field:
 
 [source,java]
 -----------------------------------------------------------------------------------------------------------------------------------
-from("mongodb3:myDb?database=flights&collection=cancellations&tailTrackIncreasingField=departureTime&persistentTailTracking=true" + 
+from("mongodb:myDb?database=flights&collection=cancellations&tailTrackIncreasingField=departureTime&persistentTailTracking=true" + 
      "&persistentId=cancellationsTracker&tailTrackDb=trackers&tailTrackCollection=camelTrackers" + 
      "&tailTrackField=lastProcessedDepartureTime")
     .id("tailableCursorConsumer3")
@@ -971,7 +971,7 @@ It could be easily specified using XML DSL configuration:
 [source,xml]
 -------------
 <route id="filterConsumer">
-    <from uri="mongodb3:myDb?consumerType=changeStreams&amp;database=flights&amp;collection=tickets"/>
+    <from uri="mongodb:myDb?consumerType=changeStreams&amp;database=flights&amp;collection=tickets"/>
     <to uri="mock:test"/>
 
     <routeProperty key="streamFilter" value="{'$match':{'$or':[{'fullDocument.stringValue': 'specificValue'}]}}"/>
@@ -981,7 +981,7 @@ It could be easily specified using XML DSL configuration:
 Java configuration:
 [source,java]
 -------------
-from("mongodb3:myDb?consumerType=changeStreams&database=flights&collection=tickets")
+from("mongodb:myDb?consumerType=changeStreams&database=flights&collection=tickets")
     .routeProperty("streamFilter", "{'$match':{'$or':[{'fullDocument.stringValue': 'specificValue'}]}}")
     .to("mock:test");
 -------------
diff --git a/components/camel-mongodb3/src/main/java/org/apache/camel/component/mongodb3/CamelMongoDbException.java b/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb3/CamelMongoDbException.java
similarity index 100%
rename from components/camel-mongodb3/src/main/java/org/apache/camel/component/mongodb3/CamelMongoDbException.java
rename to components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb3/CamelMongoDbException.java
diff --git a/components/camel-mongodb3/src/main/java/org/apache/camel/component/mongodb3/MongoAbstractConsumerThread.java b/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb3/MongoAbstractConsumerThread.java
similarity index 100%
rename from components/camel-mongodb3/src/main/java/org/apache/camel/component/mongodb3/MongoAbstractConsumerThread.java
rename to components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb3/MongoAbstractConsumerThread.java
diff --git a/components/camel-mongodb3/src/main/java/org/apache/camel/component/mongodb3/MongoDbChangeStreamsConsumer.java b/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb3/MongoDbChangeStreamsConsumer.java
similarity index 100%
rename from components/camel-mongodb3/src/main/java/org/apache/camel/component/mongodb3/MongoDbChangeStreamsConsumer.java
rename to components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb3/MongoDbChangeStreamsConsumer.java
diff --git a/components/camel-mongodb3/src/main/java/org/apache/camel/component/mongodb3/MongoDbChangeStreamsThread.java b/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb3/MongoDbChangeStreamsThread.java
similarity index 100%
rename from components/camel-mongodb3/src/main/java/org/apache/camel/component/mongodb3/MongoDbChangeStreamsThread.java
rename to components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb3/MongoDbChangeStreamsThread.java
diff --git a/components/camel-mongodb3/src/main/java/org/apache/camel/component/mongodb3/MongoDbComponent.java b/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb3/MongoDbComponent.java
similarity index 98%
rename from components/camel-mongodb3/src/main/java/org/apache/camel/component/mongodb3/MongoDbComponent.java
rename to components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb3/MongoDbComponent.java
index 206230f..5533861 100644
--- a/components/camel-mongodb3/src/main/java/org/apache/camel/component/mongodb3/MongoDbComponent.java
+++ b/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb3/MongoDbComponent.java
@@ -30,7 +30,7 @@ import org.apache.camel.support.DefaultComponent;
 /**
  * Represents the component that manages {@link MongoDbEndpoint}.
  */
-@Component("mongodb,mongodb3")
+@Component("mongodb")
 public class MongoDbComponent extends DefaultComponent {
 
     public static final Set<MongoDbOperation> WRITE_OPERATIONS = new HashSet<>(Arrays.asList(
diff --git a/components/camel-mongodb3/src/main/java/org/apache/camel/component/mongodb3/MongoDbConstants.java b/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb3/MongoDbConstants.java
similarity index 100%
rename from components/camel-mongodb3/src/main/java/org/apache/camel/component/mongodb3/MongoDbConstants.java
rename to components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb3/MongoDbConstants.java
diff --git a/components/camel-mongodb3/src/main/java/org/apache/camel/component/mongodb3/MongoDbConsumerType.java b/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb3/MongoDbConsumerType.java
similarity index 100%
rename from components/camel-mongodb3/src/main/java/org/apache/camel/component/mongodb3/MongoDbConsumerType.java
rename to components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb3/MongoDbConsumerType.java
diff --git a/components/camel-mongodb3/src/main/java/org/apache/camel/component/mongodb3/MongoDbEndpoint.java b/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb3/MongoDbEndpoint.java
similarity index 99%
rename from components/camel-mongodb3/src/main/java/org/apache/camel/component/mongodb3/MongoDbEndpoint.java
rename to components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb3/MongoDbEndpoint.java
index 36dd67f..b18e54f 100644
--- a/components/camel-mongodb3/src/main/java/org/apache/camel/component/mongodb3/MongoDbEndpoint.java
+++ b/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb3/MongoDbEndpoint.java
@@ -57,7 +57,7 @@ import static org.apache.camel.component.mongodb3.MongoDbOutputType.MongoIterabl
 /**
  * Component for working with documents stored in MongoDB database.
  */
-@UriEndpoint(firstVersion = "2.19.0", scheme = "mongodb3", title = "MongoDB", syntax = "mongodb3:connectionBean",
+@UriEndpoint(firstVersion = "2.19.0", scheme = "mongodb", title = "MongoDB", syntax = "mongodb:connectionBean",
     label = "database,nosql")
 public class MongoDbEndpoint extends DefaultEndpoint {
 
diff --git a/components/camel-mongodb3/src/main/java/org/apache/camel/component/mongodb3/MongoDbOperation.java b/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb3/MongoDbOperation.java
similarity index 100%
rename from components/camel-mongodb3/src/main/java/org/apache/camel/component/mongodb3/MongoDbOperation.java
rename to components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb3/MongoDbOperation.java
diff --git a/components/camel-mongodb3/src/main/java/org/apache/camel/component/mongodb3/MongoDbOutputType.java b/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb3/MongoDbOutputType.java
similarity index 100%
rename from components/camel-mongodb3/src/main/java/org/apache/camel/component/mongodb3/MongoDbOutputType.java
rename to components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb3/MongoDbOutputType.java
diff --git a/components/camel-mongodb3/src/main/java/org/apache/camel/component/mongodb3/MongoDbProducer.java b/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb3/MongoDbProducer.java
similarity index 100%
rename from components/camel-mongodb3/src/main/java/org/apache/camel/component/mongodb3/MongoDbProducer.java
rename to components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb3/MongoDbProducer.java
diff --git a/components/camel-mongodb3/src/main/java/org/apache/camel/component/mongodb3/MongoDbTailTrackingConfig.java b/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb3/MongoDbTailTrackingConfig.java
similarity index 100%
rename from components/camel-mongodb3/src/main/java/org/apache/camel/component/mongodb3/MongoDbTailTrackingConfig.java
rename to components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb3/MongoDbTailTrackingConfig.java
diff --git a/components/camel-mongodb3/src/main/java/org/apache/camel/component/mongodb3/MongoDbTailTrackingManager.java b/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb3/MongoDbTailTrackingManager.java
similarity index 100%
rename from components/camel-mongodb3/src/main/java/org/apache/camel/component/mongodb3/MongoDbTailTrackingManager.java
rename to components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb3/MongoDbTailTrackingManager.java
diff --git a/components/camel-mongodb3/src/main/java/org/apache/camel/component/mongodb3/MongoDbTailableCursorConsumer.java b/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb3/MongoDbTailableCursorConsumer.java
similarity index 100%
rename from components/camel-mongodb3/src/main/java/org/apache/camel/component/mongodb3/MongoDbTailableCursorConsumer.java
rename to components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb3/MongoDbTailableCursorConsumer.java
diff --git a/components/camel-mongodb3/src/main/java/org/apache/camel/component/mongodb3/MongoDbTailingThread.java b/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb3/MongoDbTailingThread.java
similarity index 100%
rename from components/camel-mongodb3/src/main/java/org/apache/camel/component/mongodb3/MongoDbTailingThread.java
rename to components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb3/MongoDbTailingThread.java
diff --git a/components/camel-mongodb3/src/main/java/org/apache/camel/component/mongodb3/converters/MongoDbBasicConverters.java b/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb3/converters/MongoDbBasicConverters.java
similarity index 100%
rename from components/camel-mongodb3/src/main/java/org/apache/camel/component/mongodb3/converters/MongoDbBasicConverters.java
rename to components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb3/converters/MongoDbBasicConverters.java
diff --git a/components/camel-mongodb3/src/main/java/org/apache/camel/component/mongodb3/converters/MongoDbFallbackConverter.java b/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb3/converters/MongoDbFallbackConverter.java
similarity index 100%
rename from components/camel-mongodb3/src/main/java/org/apache/camel/component/mongodb3/converters/MongoDbFallbackConverter.java
rename to components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb3/converters/MongoDbFallbackConverter.java
diff --git a/components/camel-mongodb3/src/main/java/org/apache/camel/component/mongodb3/processor/idempotent/MongoDbIdempotentRepository.java b/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb3/processor/idempotent/MongoDbIdempotentRepository.java
similarity index 100%
rename from components/camel-mongodb3/src/main/java/org/apache/camel/component/mongodb3/processor/idempotent/MongoDbIdempotentRepository.java
rename to components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb3/processor/idempotent/MongoDbIdempotentRepository.java
diff --git a/components/camel-mongodb3/src/test/java/org/apache/camel/component/mongodb3/AbstractMongoDbTest.java b/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb3/AbstractMongoDbTest.java
similarity index 100%
rename from components/camel-mongodb3/src/test/java/org/apache/camel/component/mongodb3/AbstractMongoDbTest.java
rename to components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb3/AbstractMongoDbTest.java
diff --git a/components/camel-mongodb3/src/test/java/org/apache/camel/component/mongodb3/EmbedMongoConfiguration.java b/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb3/EmbedMongoConfiguration.java
similarity index 100%
rename from components/camel-mongodb3/src/test/java/org/apache/camel/component/mongodb3/EmbedMongoConfiguration.java
rename to components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb3/EmbedMongoConfiguration.java
diff --git a/components/camel-mongodb3/src/test/java/org/apache/camel/component/mongodb3/MongoBasicOperationsConfiguration.java b/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb3/MongoBasicOperationsConfiguration.java
similarity index 100%
rename from components/camel-mongodb3/src/test/java/org/apache/camel/component/mongodb3/MongoBasicOperationsConfiguration.java
rename to components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb3/MongoBasicOperationsConfiguration.java
diff --git a/components/camel-mongodb3/src/test/java/org/apache/camel/component/mongodb3/MongoDbAggregateOperationTest.java b/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb3/MongoDbAggregateOperationTest.java
similarity index 94%
rename from components/camel-mongodb3/src/test/java/org/apache/camel/component/mongodb3/MongoDbAggregateOperationTest.java
rename to components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb3/MongoDbAggregateOperationTest.java
index 8dee933..b00230b 100644
--- a/components/camel-mongodb3/src/test/java/org/apache/camel/component/mongodb3/MongoDbAggregateOperationTest.java
+++ b/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb3/MongoDbAggregateOperationTest.java
@@ -111,9 +111,9 @@ public class MongoDbAggregateOperationTest extends AbstractMongoDbTest {
         return new RouteBuilder() {
             public void configure() {
                 from("direct:aggregate")
-                    .to("mongodb3:myDb?database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&operation=aggregate");
+                    .to("mongodb:myDb?database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&operation=aggregate");
                 from("direct:aggregateDBCursor")
-                    .to("mongodb3:myDb?database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&operation=aggregate&dynamicity=true&outputType=MongoIterable")
+                    .to("mongodb:myDb?database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&operation=aggregate&dynamicity=true&outputType=MongoIterable")
                       .to("mock:resultAggregateDBCursor");
             }
         };
diff --git a/components/camel-mongodb3/src/test/java/org/apache/camel/component/mongodb3/MongoDbBigDecimalConverterTest.java b/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb3/MongoDbBigDecimalConverterTest.java
similarity index 94%
rename from components/camel-mongodb3/src/test/java/org/apache/camel/component/mongodb3/MongoDbBigDecimalConverterTest.java
rename to components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb3/MongoDbBigDecimalConverterTest.java
index 38d09de..f863850 100644
--- a/components/camel-mongodb3/src/test/java/org/apache/camel/component/mongodb3/MongoDbBigDecimalConverterTest.java
+++ b/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb3/MongoDbBigDecimalConverterTest.java
@@ -53,7 +53,7 @@ public class MongoDbBigDecimalConverterTest extends AbstractMongoDbTest {
         return new RouteBuilder() {
             public void configure() {
                 from("direct:insert")
-                    .to("mongodb3:myDb?database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&operation=insert");
+                    .to("mongodb:myDb?database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&operation=insert");
             }
         };
     }
diff --git a/components/camel-mongodb3/src/test/java/org/apache/camel/component/mongodb3/MongoDbBulkWriteOperationTest.java b/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb3/MongoDbBulkWriteOperationTest.java
similarity index 95%
rename from components/camel-mongodb3/src/test/java/org/apache/camel/component/mongodb3/MongoDbBulkWriteOperationTest.java
rename to components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb3/MongoDbBulkWriteOperationTest.java
index 16a45e3..e9e599c 100644
--- a/components/camel-mongodb3/src/test/java/org/apache/camel/component/mongodb3/MongoDbBulkWriteOperationTest.java
+++ b/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb3/MongoDbBulkWriteOperationTest.java
@@ -112,9 +112,9 @@ public class MongoDbBulkWriteOperationTest extends AbstractMongoDbTest {
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             public void configure() {
-                from("direct:bulkWrite").to("mongodb3:myDb?database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&operation=bulkWrite");
+                from("direct:bulkWrite").to("mongodb:myDb?database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&operation=bulkWrite");
                 from("direct:unorderedBulkWrite").setHeader(MongoDbConstants.BULK_ORDERED).constant(false)
-                    .to("mongodb3:myDb?database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&operation=bulkWrite");
+                    .to("mongodb:myDb?database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&operation=bulkWrite");
             }
         };
     }
diff --git a/components/camel-mongodb3/src/test/java/org/apache/camel/component/mongodb3/MongoDbChangeStreamsConsumerTest.java b/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb3/MongoDbChangeStreamsConsumerTest.java
similarity index 93%
rename from components/camel-mongodb3/src/test/java/org/apache/camel/component/mongodb3/MongoDbChangeStreamsConsumerTest.java
rename to components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb3/MongoDbChangeStreamsConsumerTest.java
index 647c641..51cc900 100644
--- a/components/camel-mongodb3/src/test/java/org/apache/camel/component/mongodb3/MongoDbChangeStreamsConsumerTest.java
+++ b/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb3/MongoDbChangeStreamsConsumerTest.java
@@ -97,12 +97,12 @@ public class MongoDbChangeStreamsConsumerTest extends AbstractMongoDbTest {
 
             @Override
             public void configure() {
-                from("mongodb3:myDb?consumerType=changeStreams&database={{mongodb.testDb}}&collection={{mongodb.testCollection}}")
+                from("mongodb:myDb?consumerType=changeStreams&database={{mongodb.testDb}}&collection={{mongodb.testCollection}}")
                         .id("simpleConsumer")
                         .autoStartup(false)
                         .to("mock:test");
 
-                from("mongodb3:myDb?consumerType=changeStreams&database={{mongodb.testDb}}&collection={{mongodb.testCollection}}")
+                from("mongodb:myDb?consumerType=changeStreams&database={{mongodb.testDb}}&collection={{mongodb.testCollection}}")
                         .routeProperty("streamFilter", "{'$match':{'$or':[{'fullDocument.string': 'value2'}]}}")
                         .id("filterConsumer")
                         .autoStartup(false)
diff --git a/components/camel-mongodb3/src/test/java/org/apache/camel/component/mongodb3/MongoDbConnectionBeansTest.java b/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb3/MongoDbConnectionBeansTest.java
similarity index 80%
rename from components/camel-mongodb3/src/test/java/org/apache/camel/component/mongodb3/MongoDbConnectionBeansTest.java
rename to components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb3/MongoDbConnectionBeansTest.java
index 171bf10..781c675 100644
--- a/components/camel-mongodb3/src/test/java/org/apache/camel/component/mongodb3/MongoDbConnectionBeansTest.java
+++ b/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb3/MongoDbConnectionBeansTest.java
@@ -33,7 +33,7 @@ public class MongoDbConnectionBeansTest extends AbstractMongoDbTest {
     @Test
     public void checkConnectionFromProperties() {
         MongoDbEndpoint testEndpoint = context.getEndpoint(
-                "mongodb3:anyName?mongoConnection=#myDb&database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&operation=count&dynamicity=true",
+                "mongodb:anyName?mongoConnection=#myDb&database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&operation=count&dynamicity=true",
                 MongoDbEndpoint.class);
         assertNotEquals("myDb", testEndpoint.getConnectionBean());
         assertEquals(mongo, testEndpoint.getMongoConnection());
@@ -42,7 +42,7 @@ public class MongoDbConnectionBeansTest extends AbstractMongoDbTest {
     @Test
     public void checkConnectionFromBean() {
         MongoDbEndpoint testEndpoint = context.getEndpoint(
-                "mongodb3:myDb?database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&operation=count&dynamicity=true",
+                "mongodb:myDb?database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&operation=count&dynamicity=true",
                 MongoDbEndpoint.class);
         assertEquals("myDb", testEndpoint.getConnectionBean());
         assertEquals(mongo, testEndpoint.getMongoConnection());
@@ -51,7 +51,7 @@ public class MongoDbConnectionBeansTest extends AbstractMongoDbTest {
     @Test
     public void checkConnectionBothExisting() {
         MongoDbEndpoint testEndpoint = context.getEndpoint(
-                "mongodb3:myDb?mongoConnection=#myDbS&database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&operation=count&dynamicity=true",
+                "mongodb:myDb?mongoConnection=#myDbS&database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&operation=count&dynamicity=true",
                 MongoDbEndpoint.class);
         assertEquals("myDb", testEndpoint.getConnectionBean());
         MongoClient myDbS = applicationContext.getBean("myDbS", MongoClient.class);
@@ -61,16 +61,16 @@ public class MongoDbConnectionBeansTest extends AbstractMongoDbTest {
     @Test(expected = Exception.class)
     public void checkMissingConnection() {
         MongoDbEndpoint testEndpoint = context.getEndpoint(
-                "mongodb3:anythingNotRelated?database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&operation=count&dynamicity=true",
+                "mongodb:anythingNotRelated?database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&operation=count&dynamicity=true",
                 MongoDbEndpoint.class);
     }
 
     @Test
     public void checkConnectionOnComponent() throws Exception {
-        MongoDbComponent component = context.getComponent("mongodb3", MongoDbComponent.class);
+        MongoDbComponent component = context.getComponent("mongodb", MongoDbComponent.class);
         MongoClient myDbS = applicationContext.getBean("myDbS", MongoClient.class);
         component.setMongoConnection(myDbS);
-        Endpoint endpoint = component.createEndpoint("mongodb3:justARouteName?database={{mongodb.testDb}}&collection="
+        Endpoint endpoint = component.createEndpoint("mongodb:justARouteName?database={{mongodb.testDb}}&collection="
                 + "{{mongodb.testCollection}}&operation=count&dynamicity=true");
         assertIsInstanceOf(MongoDbEndpoint.class, endpoint);
         assertEquals(myDbS, ((MongoDbEndpoint) endpoint).getMongoConnection());
diff --git a/components/camel-mongodb3/src/test/java/org/apache/camel/component/mongodb3/MongoDbConversionsTest.java b/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb3/MongoDbConversionsTest.java
similarity index 91%
rename from components/camel-mongodb3/src/test/java/org/apache/camel/component/mongodb3/MongoDbConversionsTest.java
rename to components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb3/MongoDbConversionsTest.java
index 9c14d5d..cb808b2 100644
--- a/components/camel-mongodb3/src/test/java/org/apache/camel/component/mongodb3/MongoDbConversionsTest.java
+++ b/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb3/MongoDbConversionsTest.java
@@ -105,10 +105,10 @@ public class MongoDbConversionsTest extends AbstractMongoDbTest {
         return new RouteBuilder() {
             public void configure() {
 
-                from("direct:insertMap").to("mongodb3:myDb?database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&operation=insert");
-                from("direct:insertPojo").to("mongodb3:myDb?database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&operation=insert");
-                from("direct:insertJsonString").to("mongodb3:myDb?database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&operation=insert");
-                from("direct:insertJsonStringWriteResultInString").to("mongodb3:myDb?database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&operation=insert")
+                from("direct:insertMap").to("mongodb:myDb?database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&operation=insert");
+                from("direct:insertPojo").to("mongodb:myDb?database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&operation=insert");
+                from("direct:insertJsonString").to("mongodb:myDb?database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&operation=insert");
+                from("direct:insertJsonStringWriteResultInString").to("mongodb:myDb?database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&operation=insert")
                     .convertBodyTo(String.class);
 
             }
diff --git a/components/camel-mongodb3/src/test/java/org/apache/camel/component/mongodb3/MongoDbDynamicityTest.java b/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb3/MongoDbDynamicityTest.java
similarity index 93%
rename from components/camel-mongodb3/src/test/java/org/apache/camel/component/mongodb3/MongoDbDynamicityTest.java
rename to components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb3/MongoDbDynamicityTest.java
index cc1d9a7..f787954 100644
--- a/components/camel-mongodb3/src/test/java/org/apache/camel/component/mongodb3/MongoDbDynamicityTest.java
+++ b/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb3/MongoDbDynamicityTest.java
@@ -137,9 +137,9 @@ public class MongoDbDynamicityTest extends AbstractMongoDbTest {
         return new RouteBuilder() {
             public void configure() {
 
-                from("direct:noDynamicity").to("mongodb3:myDb?database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&operation=insert");
-                from("direct:noDynamicityExplicit").to("mongodb3:myDb?database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&operation=insert&dynamicity=false");
-                from("direct:dynamicityEnabled").to("mongodb3:myDb?database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&operation=insert&dynamicity=true");
+                from("direct:noDynamicity").to("mongodb:myDb?database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&operation=insert");
+                from("direct:noDynamicityExplicit").to("mongodb:myDb?database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&operation=insert&dynamicity=false");
+                from("direct:dynamicityEnabled").to("mongodb:myDb?database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&operation=insert&dynamicity=true");
 
             }
         };
diff --git a/components/camel-mongodb3/src/test/java/org/apache/camel/component/mongodb3/MongoDbExceptionHandlingTest.java b/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb3/MongoDbExceptionHandlingTest.java
similarity index 88%
rename from components/camel-mongodb3/src/test/java/org/apache/camel/component/mongodb3/MongoDbExceptionHandlingTest.java
rename to components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb3/MongoDbExceptionHandlingTest.java
index 7ae9e9d..c23b24d 100644
--- a/components/camel-mongodb3/src/test/java/org/apache/camel/component/mongodb3/MongoDbExceptionHandlingTest.java
+++ b/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb3/MongoDbExceptionHandlingTest.java
@@ -78,13 +78,13 @@ public class MongoDbExceptionHandlingTest extends AbstractMongoDbTest {
         return new RouteBuilder() {
             public void configure() {
 
-                from("direct:findAll").to("mongodb3:myDb?database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&operation=findAll&dynamicity=true")
+                from("direct:findAll").to("mongodb:myDb?database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&operation=findAll&dynamicity=true")
                     .to("mock:resultFindAll");
 
-                from("direct:findOneByQuery").to("mongodb3:myDb?database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&operation=findOneByQuery&dynamicity=true")
+                from("direct:findOneByQuery").to("mongodb:myDb?database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&operation=findOneByQuery&dynamicity=true")
                     .to("mock:resultFindOneByQuery");
 
-                from("direct:findById").to("mongodb3:myDb?database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&operation=findById&dynamicity=true")
+                from("direct:findById").to("mongodb:myDb?database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&operation=findById&dynamicity=true")
                     .to("mock:resultFindById");
 
             }
diff --git a/components/camel-mongodb3/src/test/java/org/apache/camel/component/mongodb3/MongoDbFindOperationTest.java b/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb3/MongoDbFindOperationTest.java
similarity index 95%
rename from components/camel-mongodb3/src/test/java/org/apache/camel/component/mongodb3/MongoDbFindOperationTest.java
rename to components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb3/MongoDbFindOperationTest.java
index 766d514..5e76f1e 100644
--- a/components/camel-mongodb3/src/test/java/org/apache/camel/component/mongodb3/MongoDbFindOperationTest.java
+++ b/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb3/MongoDbFindOperationTest.java
@@ -279,16 +279,16 @@ public class MongoDbFindOperationTest extends AbstractMongoDbTest {
         return new RouteBuilder() {
             public void configure() {
 
-                from("direct:findAll").to("mongodb3:myDb?database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&operation=findAll&dynamicity=true")
+                from("direct:findAll").to("mongodb:myDb?database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&operation=findAll&dynamicity=true")
                     .to("mock:resultFindAll");
 
-                from("direct:findOneByQuery").to("mongodb3:myDb?database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&operation=findOneByQuery&dynamicity=true")
+                from("direct:findOneByQuery").to("mongodb:myDb?database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&operation=findOneByQuery&dynamicity=true")
                     .to("mock:resultFindOneByQuery");
 
-                from("direct:findById").to("mongodb3:myDb?database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&operation=findById&dynamicity=true")
+                from("direct:findById").to("mongodb:myDb?database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&operation=findById&dynamicity=true")
                     .to("mock:resultFindById");
 
-                from("direct:findDistinct").to("mongodb3:myDb?database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&operation=findDistinct&dynamicity=true")
+                from("direct:findDistinct").to("mongodb:myDb?database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&operation=findDistinct&dynamicity=true")
                     .to("mock:resultFindDistinct");
             }
         };
diff --git a/components/camel-mongodb3/src/test/java/org/apache/camel/component/mongodb3/MongoDbHeaderHandlingTest.java b/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb3/MongoDbHeaderHandlingTest.java
similarity index 91%
rename from components/camel-mongodb3/src/test/java/org/apache/camel/component/mongodb3/MongoDbHeaderHandlingTest.java
rename to components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb3/MongoDbHeaderHandlingTest.java
index 30816a3..8e04f7f 100644
--- a/components/camel-mongodb3/src/test/java/org/apache/camel/component/mongodb3/MongoDbHeaderHandlingTest.java
+++ b/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb3/MongoDbHeaderHandlingTest.java
@@ -114,12 +114,12 @@ public class MongoDbHeaderHandlingTest extends AbstractMongoDbTest {
             public void configure() {
 
                 // tested routes
-                from("direct:count").to("mongodb3:myDb?database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&operation=count&dynamicity=true");
-                from("direct:save").to("mongodb3:myDb?database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&operation=save&writeResultAsHeader=true");
-                from("direct:getDbStats").to("mongodb3:myDb?database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&operation=getDbStats&writeResultAsHeader=true");
+                from("direct:count").to("mongodb:myDb?database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&operation=count&dynamicity=true");
+                from("direct:save").to("mongodb:myDb?database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&operation=save&writeResultAsHeader=true");
+                from("direct:getDbStats").to("mongodb:myDb?database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&operation=getDbStats&writeResultAsHeader=true");
 
                 // supporting routes
-                from("direct:insert").to("mongodb3:myDb?database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&operation=insert");
+                from("direct:insert").to("mongodb:myDb?database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&operation=insert");
 
             }
         };
diff --git a/components/camel-mongodb3/src/test/java/org/apache/camel/component/mongodb3/MongoDbIndexTest.java b/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb3/MongoDbIndexTest.java
similarity index 95%
rename from components/camel-mongodb3/src/test/java/org/apache/camel/component/mongodb3/MongoDbIndexTest.java
rename to components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb3/MongoDbIndexTest.java
index 10ad823..4facc49 100644
--- a/components/camel-mongodb3/src/test/java/org/apache/camel/component/mongodb3/MongoDbIndexTest.java
+++ b/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb3/MongoDbIndexTest.java
@@ -191,11 +191,11 @@ public class MongoDbIndexTest extends AbstractMongoDbTest {
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             public void configure() {
-                from("direct:dynamicityEnabled").to("mongodb3:myDb?database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&operation=insert&dynamicity=true");
+                from("direct:dynamicityEnabled").to("mongodb:myDb?database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&operation=insert&dynamicity=true");
                 from("direct:dynamicityEnabledWithIndexUri")
-                    .to("mongodb3:myDb?database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&collectionIndex={\"a\":1}&operation=insert&dynamicity=true");
+                    .to("mongodb:myDb?database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&collectionIndex={\"a\":1}&operation=insert&dynamicity=true");
                 from("direct:dynamicityDisabled")
-                    .to("mongodb3:myDb?database={{mongodb.testDb}}&collection=otherCollection&collectionIndex={\"a\":1,\"b\":-1}&operation=insert&dynamicity=false");
+                    .to("mongodb:myDb?database={{mongodb.testDb}}&collection=otherCollection&collectionIndex={\"a\":1,\"b\":-1}&operation=insert&dynamicity=false");
             }
         };
     }
diff --git a/components/camel-mongodb3/src/test/java/org/apache/camel/component/mongodb3/MongoDbOperationsTest.java b/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb3/MongoDbOperationsTest.java
similarity index 92%
rename from components/camel-mongodb3/src/test/java/org/apache/camel/component/mongodb3/MongoDbOperationsTest.java
rename to components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb3/MongoDbOperationsTest.java
index 26da960..44dddd4 100644
--- a/components/camel-mongodb3/src/test/java/org/apache/camel/component/mongodb3/MongoDbOperationsTest.java
+++ b/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb3/MongoDbOperationsTest.java
@@ -377,19 +377,19 @@ public class MongoDbOperationsTest extends AbstractMongoDbTest {
         return new RouteBuilder() {
             public void configure() {
 
-                from("direct:count").to("mongodb3:myDb?database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&operation=count&dynamicity=true");
-                from("direct:insert").to("mongodb3:myDb?database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&operation=insert");
-                from("direct:testStoreOidOnInsert").to("mongodb3:myDb?database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&operation=insert").setBody()
+                from("direct:count").to("mongodb:myDb?database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&operation=count&dynamicity=true");
+                from("direct:insert").to("mongodb:myDb?database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&operation=insert");
+                from("direct:testStoreOidOnInsert").to("mongodb:myDb?database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&operation=insert").setBody()
                     .header(MongoDbConstants.OID);
-                from("direct:save").to("mongodb3:myDb?database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&operation=save");
-                from("direct:testStoreOidOnSave").to("mongodb3:myDb?database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&operation=save").setBody()
+                from("direct:save").to("mongodb:myDb?database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&operation=save");
+                from("direct:testStoreOidOnSave").to("mongodb:myDb?database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&operation=save").setBody()
                     .header(MongoDbConstants.OID);
-                from("direct:update").to("mongodb3:myDb?database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&operation=update");
-                from("direct:remove").to("mongodb3:myDb?database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&operation=remove");
-                from("direct:aggregate").to("mongodb3:myDb?database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&operation=aggregate");
-                from("direct:getDbStats").to("mongodb3:myDb?database={{mongodb.testDb}}&operation=getDbStats");
-                from("direct:getColStats").to("mongodb3:myDb?database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&operation=getColStats");
-                from("direct:command").to("mongodb3:myDb?database={{mongodb.testDb}}&operation=command");
+                from("direct:update").to("mongodb:myDb?database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&operation=update");
+                from("direct:remove").to("mongodb:myDb?database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&operation=remove");
+                from("direct:aggregate").to("mongodb:myDb?database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&operation=aggregate");
+                from("direct:getDbStats").to("mongodb:myDb?database={{mongodb.testDb}}&operation=getDbStats");
+                from("direct:getColStats").to("mongodb:myDb?database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&operation=getColStats");
+                from("direct:command").to("mongodb:myDb?database={{mongodb.testDb}}&operation=command");
 
             }
         };
diff --git a/components/camel-mongodb3/src/test/java/org/apache/camel/component/mongodb3/MongoDbOutputTypeTest.java b/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb3/MongoDbOutputTypeTest.java
similarity index 89%
rename from components/camel-mongodb3/src/test/java/org/apache/camel/component/mongodb3/MongoDbOutputTypeTest.java
rename to components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb3/MongoDbOutputTypeTest.java
index b55beee..5752039 100644
--- a/components/camel-mongodb3/src/test/java/org/apache/camel/component/mongodb3/MongoDbOutputTypeTest.java
+++ b/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb3/MongoDbOutputTypeTest.java
@@ -89,7 +89,7 @@ public class MongoDbOutputTypeTest extends AbstractMongoDbTest {
             RouteBuilder taillableRouteBuilder = new RouteBuilder() {
                 @Override
                 public void configure() throws Exception {
-                    from("mongodb3:myDb?database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&operation=findById&dynamicity=true&outputType=MongoIterable")
+                    from("mongodb:myDb?database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&operation=findById&dynamicity=true&outputType=MongoIterable")
                         .to("mock:dummy");
                 }
             };
@@ -106,7 +106,7 @@ public class MongoDbOutputTypeTest extends AbstractMongoDbTest {
             RouteBuilder taillableRouteBuilder = new RouteBuilder() {
                 @Override
                 public void configure() throws Exception {
-                    from("mongodb3:myDb?database={{mongodb.testDb}}&collection={{mongodb.cappedTestCollection}}&tailTrackIncreasingField=increasing&outputType=MongoIterable")
+                    from("mongodb:myDb?database={{mongodb.testDb}}&collection={{mongodb.cappedTestCollection}}&tailTrackIncreasingField=increasing&outputType=MongoIterable")
                         .id("tailableCursorConsumer1").autoStartup(false).to("mock:test");
                 }
             };
@@ -123,9 +123,9 @@ public class MongoDbOutputTypeTest extends AbstractMongoDbTest {
             public void configure() {
 
                 from("direct:findAllDBCursor")
-                    .to("mongodb3:myDb?database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&operation=findAll&dynamicity=true&outputType=MongoIterable")
+                    .to("mongodb:myDb?database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&operation=findAll&dynamicity=true&outputType=MongoIterable")
                     .to("mock:resultFindAllDBCursor");
-                from("direct:findAllDocumentList").to("mongodb3:myDb?database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&operation=findAll&outputType=DocumentList")
+                from("direct:findAllDocumentList").to("mongodb:myDb?database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&operation=findAll&outputType=DocumentList")
                     .to("mock:resultFindAllDocumentList");
 
             }
diff --git a/components/camel-mongodb3/src/test/java/org/apache/camel/component/mongodb3/MongoDbReadPreferenceOptionTest.java b/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb3/MongoDbReadPreferenceOptionTest.java
similarity index 85%
rename from components/camel-mongodb3/src/test/java/org/apache/camel/component/mongodb3/MongoDbReadPreferenceOptionTest.java
rename to components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb3/MongoDbReadPreferenceOptionTest.java
index 027b4ee..a4702b8 100644
--- a/components/camel-mongodb3/src/test/java/org/apache/camel/component/mongodb3/MongoDbReadPreferenceOptionTest.java
+++ b/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb3/MongoDbReadPreferenceOptionTest.java
@@ -28,7 +28,7 @@ public class MongoDbReadPreferenceOptionTest extends AbstractMongoDbTest {
     @Test
     public void testInvalidReadPreferenceOptionValue() throws Exception {
         try {
-            createMongoDbEndpoint("mongodb3:myDb?database={{mongodb.testDb}}&readPreference=foo");
+            createMongoDbEndpoint("mongodb:myDb?database={{mongodb.testDb}}&readPreference=foo");
             fail("Should have thrown exception");
         } catch (ResolveEndpointFailedException refe) {
             assertTrue(refe.getMessage(), refe.getMessage().endsWith("Unknown parameters=[{readPreference=foo}]"));
@@ -37,7 +37,7 @@ public class MongoDbReadPreferenceOptionTest extends AbstractMongoDbTest {
 
     @Test
     public void testNoReadPreferenceOptionValue() throws Exception {
-        endpoint = createMongoDbEndpoint("mongodb3:myDb?database={{mongodb.testDb}}");
+        endpoint = createMongoDbEndpoint("mongodb:myDb?database={{mongodb.testDb}}");
         assertSame(ReadPreference.primary(), endpoint.getReadPreference());
         assertSame(ReadPreference.primary(), endpoint.getMongoConnection().getReadPreference());
         // the default is primary
@@ -45,41 +45,41 @@ public class MongoDbReadPreferenceOptionTest extends AbstractMongoDbTest {
 
     @Test
     public void testPrimaryReadPreferenceOptionValue() throws Exception {
-        endpoint = createMongoDbEndpoint("mongodb3:myDbP?database={{mongodb.testDb}}");
+        endpoint = createMongoDbEndpoint("mongodb:myDbP?database={{mongodb.testDb}}");
         assertSame(ReadPreference.primary(), endpoint.getReadPreference());
         assertSame(ReadPreference.primary(), endpoint.getMongoConnection().getReadPreference());
     }
 
     @Test
     public void testPrimaryPreferredReadPreferenceOptionValue() throws Exception {
-        endpoint = createMongoDbEndpoint("mongodb3:myDbPP?database={{mongodb.testDb}}");
+        endpoint = createMongoDbEndpoint("mongodb:myDbPP?database={{mongodb.testDb}}");
         assertSame(ReadPreference.primaryPreferred(), endpoint.getReadPreference());
         assertSame(ReadPreference.primaryPreferred(), endpoint.getMongoConnection().getReadPreference());
     }
 
     @Test
     public void testSecondaryReadPreferenceOptionValue() throws Exception {
-        endpoint = createMongoDbEndpoint("mongodb3:myDbS?database={{mongodb.testDb}}");
+        endpoint = createMongoDbEndpoint("mongodb:myDbS?database={{mongodb.testDb}}");
         assertSame(ReadPreference.secondary(), endpoint.getReadPreference());
         assertSame(ReadPreference.secondary(), endpoint.getMongoConnection().getReadPreference());
     }
 
     @Test
     public void testSecondaryPreferredReadPreferenceOptionValue() throws Exception {
-        endpoint = createMongoDbEndpoint("mongodb3:myDbSP?database={{mongodb.testDb}}");
+        endpoint = createMongoDbEndpoint("mongodb:myDbSP?database={{mongodb.testDb}}");
         assertSame(ReadPreference.secondaryPreferred(), endpoint.getReadPreference());
         assertSame(ReadPreference.secondaryPreferred(), endpoint.getMongoConnection().getReadPreference());
     }
 
     @Test
     public void testNearestReadPreferenceOptionValue() throws Exception {
-        endpoint = createMongoDbEndpoint("mongodb3:myDbN?database={{mongodb.testDb}}");
+        endpoint = createMongoDbEndpoint("mongodb:myDbN?database={{mongodb.testDb}}");
         assertSame(ReadPreference.nearest(), endpoint.getReadPreference());
         assertSame(ReadPreference.nearest(), endpoint.getMongoConnection().getReadPreference());
     }
 
     private MongoDbEndpoint createMongoDbEndpoint(String uri) throws Exception {
-        Endpoint mongoEndpoint = context().getComponent("mongodb3").createEndpoint(uri);
+        Endpoint mongoEndpoint = context().getComponent("mongodb").createEndpoint(uri);
         mongoEndpoint.start();
         return MongoDbEndpoint.class.cast(mongoEndpoint);
 
diff --git a/components/camel-mongodb3/src/test/java/org/apache/camel/component/mongodb3/MongoDbSpringDslOperationsTest.java b/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb3/MongoDbSpringDslOperationsTest.java
similarity index 100%
rename from components/camel-mongodb3/src/test/java/org/apache/camel/component/mongodb3/MongoDbSpringDslOperationsTest.java
rename to components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb3/MongoDbSpringDslOperationsTest.java
diff --git a/components/camel-mongodb3/src/test/java/org/apache/camel/component/mongodb3/MongoDbStopEndpointTest.java b/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb3/MongoDbStopEndpointTest.java
similarity index 89%
rename from components/camel-mongodb3/src/test/java/org/apache/camel/component/mongodb3/MongoDbStopEndpointTest.java
rename to components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb3/MongoDbStopEndpointTest.java
index b07b2f2..1fc2419 100644
--- a/components/camel-mongodb3/src/test/java/org/apache/camel/component/mongodb3/MongoDbStopEndpointTest.java
+++ b/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb3/MongoDbStopEndpointTest.java
@@ -27,7 +27,7 @@ public class MongoDbStopEndpointTest extends AbstractMongoDbTest {
 
     private static final String MY_ID = "myId";
 
-    @EndpointInject("mongodb3:myDb?database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&operation=insert")
+    @EndpointInject("mongodb:myDb?database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&operation=insert")
     MongoDbEndpoint endpoint;
 
     @Override
@@ -35,7 +35,7 @@ public class MongoDbStopEndpointTest extends AbstractMongoDbTest {
         return new RouteBuilder() {
             public void configure() {
                 from("direct:insertJsonString").routeId("insert").to(endpoint);
-                from("direct:findById").routeId("find").to("mongodb3:myDb?database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&operation=findById&dynamicity=true");
+                from("direct:findById").routeId("find").to("mongodb:myDb?database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&operation=findById&dynamicity=true");
             }
         };
     }
diff --git a/components/camel-mongodb3/src/test/java/org/apache/camel/component/mongodb3/MongoDbTailableCursorConsumerTest.java b/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb3/MongoDbTailableCursorConsumerTest.java
similarity index 96%
rename from components/camel-mongodb3/src/test/java/org/apache/camel/component/mongodb3/MongoDbTailableCursorConsumerTest.java
rename to components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb3/MongoDbTailableCursorConsumerTest.java
index 14099dc..b2f6385 100644
--- a/components/camel-mongodb3/src/test/java/org/apache/camel/component/mongodb3/MongoDbTailableCursorConsumerTest.java
+++ b/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb3/MongoDbTailableCursorConsumerTest.java
@@ -414,17 +414,17 @@ public class MongoDbTailableCursorConsumerTest extends AbstractMongoDbTest {
             @Override
             public void configure() throws Exception {
 
-                from("mongodb3:myDb?database={{mongodb.testDb}}&collection={{mongodb.cappedTestCollection}}&tailTrackIncreasingField=increasing").id("tailableCursorConsumer1")
+                from("mongodb:myDb?database={{mongodb.testDb}}&collection={{mongodb.cappedTestCollection}}&tailTrackIncreasingField=increasing").id("tailableCursorConsumer1")
                     .autoStartup(false).to("mock:test");
 
-                from("mongodb3:myDb?database={{mongodb.testDb}}&collection={{mongodb.cappedTestCollection}}&tailTrackIncreasingField=increasing&persistentTailTracking=true&persistentId=darwin")
+                from("mongodb:myDb?database={{mongodb.testDb}}&collection={{mongodb.cappedTestCollection}}&tailTrackIncreasingField=increasing&persistentTailTracking=true&persistentId=darwin")
                     .id("tailableCursorConsumer2").autoStartup(false).to("mock:test");
 
-                from("mongodb3:myDb?database={{mongodb.testDb}}&collection={{mongodb.cappedTestCollection}}&tailTrackIncreasingField=increasing&"
+                from("mongodb:myDb?database={{mongodb.testDb}}&collection={{mongodb.cappedTestCollection}}&tailTrackIncreasingField=increasing&"
                      + "persistentTailTracking=true&persistentId=darwin&tailTrackDb=einstein&tailTrackCollection=curie&tailTrackField=newton").id("tailableCursorConsumer3")
                          .autoStartup(false).to("mock:test");
 
-                from("mongodb3:myDb?database={{mongodb.testDb}}&collection={{mongodb.cappedTestCollection}}&tailTrackIncreasingField=increasing")// &readPreference=primary")
+                from("mongodb:myDb?database={{mongodb.testDb}}&collection={{mongodb.cappedTestCollection}}&tailTrackIncreasingField=increasing")// &readPreference=primary")
                     .id("tailableCursorConsumer1.readPreference").autoStartup(false).to("mock:test");
 
             }
diff --git a/components/camel-mongodb3/src/test/java/org/apache/camel/component/mongodb3/processor/idempotent/MongoDbIdempotentRepositoryTest.java b/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb3/processor/idempotent/MongoDbIdempotentRepositoryTest.java
similarity index 100%
rename from components/camel-mongodb3/src/test/java/org/apache/camel/component/mongodb3/processor/idempotent/MongoDbIdempotentRepositoryTest.java
rename to components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb3/processor/idempotent/MongoDbIdempotentRepositoryTest.java
diff --git a/components/camel-mongodb3/src/test/resources/log4j2.properties b/components/camel-mongodb/src/test/resources/log4j2.properties
similarity index 100%
rename from components/camel-mongodb3/src/test/resources/log4j2.properties
rename to components/camel-mongodb/src/test/resources/log4j2.properties
diff --git a/components/camel-mongodb3/src/test/resources/mongodb.test.properties b/components/camel-mongodb/src/test/resources/mongodb.test.properties
similarity index 95%
rename from components/camel-mongodb3/src/test/resources/mongodb.test.properties
rename to components/camel-mongodb/src/test/resources/mongodb.test.properties
index d701837..89a9583 100644
--- a/components/camel-mongodb3/src/test/resources/mongodb.test.properties
+++ b/components/camel-mongodb/src/test/resources/mongodb.test.properties
@@ -15,7 +15,7 @@
 ## limitations under the License.
 ## ---------------------------------------------------------------------------
 
-mongodb.connectionURI=mongodb3://localhost:27017
+mongodb.connectionURI=mongodb://localhost:27017
 mongodb.testDb=test
 mongodb.testCollection=camelTest
 mongodb.cappedTestCollection=camelTestCapped
diff --git a/components/camel-mongodb3/src/test/resources/org/apache/camel/component/mongodb3/mongoBasicOperationsTest.xml b/components/camel-mongodb/src/test/resources/org/apache/camel/component/mongodb3/mongoBasicOperationsTest.xml
similarity index 59%
rename from components/camel-mongodb3/src/test/resources/org/apache/camel/component/mongodb3/mongoBasicOperationsTest.xml
rename to components/camel-mongodb/src/test/resources/org/apache/camel/component/mongodb3/mongoBasicOperationsTest.xml
index fbd681d..2d9f94e 100644
--- a/components/camel-mongodb3/src/test/resources/org/apache/camel/component/mongodb3/mongoBasicOperationsTest.xml
+++ b/components/camel-mongodb/src/test/resources/org/apache/camel/component/mongodb3/mongoBasicOperationsTest.xml
@@ -29,17 +29,17 @@
   
     <route>
         <from uri="direct:count" />
-        <to uri="mongodb3:myDb?database={{mongodb.testDb}}&amp;collection={{mongodb.testCollection}}&amp;operation=count&amp;dynamicity=true" />
+        <to uri="mongodb:myDb?database={{mongodb.testDb}}&amp;collection={{mongodb.testCollection}}&amp;operation=count&amp;dynamicity=true" />
     </route>
 
     <route>
         <from uri="direct:insert" />
-        <to uri="mongodb3:myDb?database={{mongodb.testDb}}&amp;collection={{mongodb.testCollection}}&amp;operation=insert" /> <!-- &amp;writeConcern=SAFE" /> -->
+        <to uri="mongodb:myDb?database={{mongodb.testDb}}&amp;collection={{mongodb.testCollection}}&amp;operation=insert" /> <!-- &amp;writeConcern=SAFE" /> -->
     </route>
     
     <route>
         <from uri="direct:testStoreOidOnInsert" />
-        <to uri="mongodb3:myDb?database={{mongodb.testDb}}&amp;collection={{mongodb.testCollection}}&amp;operation=insert" /> <!-- &amp;writeConcern=SAFE" /> -->
+        <to uri="mongodb:myDb?database={{mongodb.testDb}}&amp;collection={{mongodb.testCollection}}&amp;operation=insert" /> <!-- &amp;writeConcern=SAFE" /> -->
         <setBody>
           <header>CamelMongoOid</header>
         </setBody>
@@ -47,12 +47,12 @@
 
     <route>
         <from uri="direct:save" />
-        <to uri="mongodb3:myDb?database={{mongodb.testDb}}&amp;collection={{mongodb.testCollection}}&amp;operation=save" /> <!-- &amp;writeConcern=SAFE" /> -->
+        <to uri="mongodb:myDb?database={{mongodb.testDb}}&amp;collection={{mongodb.testCollection}}&amp;operation=save" /> <!-- &amp;writeConcern=SAFE" /> -->
     </route>
 
     <route>
         <from uri="direct:testStoreOidOnSave" />
-        <to uri="mongodb3:myDb?database={{mongodb.testDb}}&amp;collection={{mongodb.testCollection}}&amp;operation=save" /> <!-- &amp;writeConcern=SAFE" /> -->
+        <to uri="mongodb:myDb?database={{mongodb.testDb}}&amp;collection={{mongodb.testCollection}}&amp;operation=save" /> <!-- &amp;writeConcern=SAFE" /> -->
         <setBody>
           <header>CamelMongoOid</header>
         </setBody>
@@ -60,32 +60,32 @@
 
     <route>
         <from uri="direct:update" />
-        <to uri="mongodb3:myDb?database={{mongodb.testDb}}&amp;collection={{mongodb.testCollection}}&amp;operation=update" /> <!-- &amp;writeConcern=SAFE" /> -->
+        <to uri="mongodb:myDb?database={{mongodb.testDb}}&amp;collection={{mongodb.testCollection}}&amp;operation=update" /> <!-- &amp;writeConcern=SAFE" /> -->
     </route>
     
     <route>
         <from uri="direct:remove" />
-        <to uri="mongodb3:myDb?database={{mongodb.testDb}}&amp;collection={{mongodb.testCollection}}&amp;operation=remove" /> <!-- &amp;writeConcern=SAFE" /> -->
+        <to uri="mongodb:myDb?database={{mongodb.testDb}}&amp;collection={{mongodb.testCollection}}&amp;operation=remove" /> <!-- &amp;writeConcern=SAFE" /> -->
     </route>
 
     <route>
         <from uri="direct:aggregate" />
-        <to uri="mongodb3:myDb?database={{mongodb.testDb}}&amp;collection={{mongodb.testCollection}}&amp;operation=aggregate" /> <!-- &amp;writeConcern=SAFE" /> -->
+        <to uri="mongodb:myDb?database={{mongodb.testDb}}&amp;collection={{mongodb.testCollection}}&amp;operation=aggregate" /> <!-- &amp;writeConcern=SAFE" /> -->
     </route>
 
     <route>
         <from uri="direct:getDbStats" />
-        <to uri="mongodb3:myDb?database={{mongodb.testDb}}&amp;operation=getDbStats" />
+        <to uri="mongodb:myDb?database={{mongodb.testDb}}&amp;operation=getDbStats" />
     </route>
     
     <route>
         <from uri="direct:getColStats" />
-        <to uri="mongodb3:myDb?database={{mongodb.testDb}}&amp;collection={{mongodb.testCollection}}&amp;operation=getColStats" />
+        <to uri="mongodb:myDb?database={{mongodb.testDb}}&amp;collection={{mongodb.testCollection}}&amp;operation=getColStats" />
     </route>
 
     <route>
        <from uri="direct:command" />
-       <to uri="mongodb3:myDb?database={{mongodb.testDb}}&amp;operation=command" />
+       <to uri="mongodb:myDb?database={{mongodb.testDb}}&amp;operation=command" />
     </route>
   </camelContext>
 
diff --git a/components/pom.xml b/components/pom.xml
index ac382f4..8231abe 100644
--- a/components/pom.xml
+++ b/components/pom.xml
@@ -237,7 +237,7 @@
         <module>camel-milo</module>
         <module>camel-mina2</module>
         <module>camel-mllp</module>
-        <module>camel-mongodb3</module>
+        <module>camel-mongodb</module>
         <module>camel-mongodb-gridfs</module>
         <module>camel-mqtt</module>
         <module>camel-msv</module>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MongoDbEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MongoDbEndpointBuilderFactory.java
index a3a3d2b..6ce5827 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MongoDbEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MongoDbEndpointBuilderFactory.java
@@ -1494,14 +1494,14 @@ public interface MongoDbEndpointBuilderFactory {
         MongoIterable;
     }
     /**
-     * MongoDB (camel-mongodb3)
+     * MongoDB (camel-mongodb)
      * Component for working with documents stored in MongoDB database.
      * 
      * Category: database,nosql
      * Available as of version: 2.19
-     * Maven coordinates: org.apache.camel:camel-mongodb3
+     * Maven coordinates: org.apache.camel:camel-mongodb
      * 
-     * Syntax: <code>mongodb3:connectionBean</code>
+     * Syntax: <code>mongodb:connectionBean</code>
      * 
      * Path parameter: connectionBean (required)
      * Name of com.mongodb.Mongo to use.
@@ -1509,7 +1509,7 @@ public interface MongoDbEndpointBuilderFactory {
     default MongoDbEndpointBuilder mongoDb(String path) {
         class MongoDbEndpointBuilderImpl extends AbstractEndpointBuilder implements MongoDbEndpointBuilder, AdvancedMongoDbEndpointBuilder {
             public MongoDbEndpointBuilderImpl(String path) {
-                super("mongodb3", path);
+                super("mongodb", path);
             }
         }
         return new MongoDbEndpointBuilderImpl(path);
diff --git a/platforms/spring-boot/components-starter/camel-mongodb3-starter/pom.xml b/platforms/spring-boot/components-starter/camel-mongodb-starter/pom.xml
similarity index 93%
rename from platforms/spring-boot/components-starter/camel-mongodb3-starter/pom.xml
rename to platforms/spring-boot/components-starter/camel-mongodb-starter/pom.xml
index e9fce74..7ebc331 100644
--- a/platforms/spring-boot/components-starter/camel-mongodb3-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-mongodb-starter/pom.xml
@@ -24,9 +24,9 @@
     <artifactId>components-starter</artifactId>
     <version>3.0.0-SNAPSHOT</version>
   </parent>
-  <artifactId>camel-mongodb3-starter</artifactId>
+  <artifactId>camel-mongodb-starter</artifactId>
   <packaging>jar</packaging>
-  <name>Spring-Boot Starter :: Camel :: MongoDB3</name>
+  <name>Spring-Boot Starter :: Camel :: MongoDB</name>
   <description>Spring-Boot Starter for Camel MongoDB (Java Driver 3) component</description>
   <dependencies>
     <dependency>
@@ -36,7 +36,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
-      <artifactId>camel-mongodb3</artifactId>
+      <artifactId>camel-mongodb</artifactId>
       <version>${project.version}</version>
     </dependency>
     <!--START OF GENERATED CODE-->
diff --git a/platforms/spring-boot/components-starter/camel-mongodb3-starter/src/main/java/org/apache/camel/component/mongodb3/springboot/MongoDbComponentAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-mongodb-starter/src/main/java/org/apache/camel/component/mongodb3/springboot/MongoDbComponentAutoConfiguration.java
similarity index 95%
rename from platforms/spring-boot/components-starter/camel-mongodb3-starter/src/main/java/org/apache/camel/component/mongodb3/springboot/MongoDbComponentAutoConfiguration.java
rename to platforms/spring-boot/components-starter/camel-mongodb-starter/src/main/java/org/apache/camel/component/mongodb3/springboot/MongoDbComponentAutoConfiguration.java
index 2dd1799..1110a40 100644
--- a/platforms/spring-boot/components-starter/camel-mongodb3-starter/src/main/java/org/apache/camel/component/mongodb3/springboot/MongoDbComponentAutoConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-mongodb-starter/src/main/java/org/apache/camel/component/mongodb3/springboot/MongoDbComponentAutoConfiguration.java
@@ -70,12 +70,12 @@ public class MongoDbComponentAutoConfiguration {
 
     static class GroupConditions extends GroupCondition {
         public GroupConditions() {
-            super("camel.component", "camel.component.mongodb3");
+            super("camel.component", "camel.component.mongodb");
         }
     }
 
     @Lazy
-    @Bean(name = "mongodb3-component")
+    @Bean(name = "mongodb-component")
     @ConditionalOnMissingBean(MongoDbComponent.class)
     public MongoDbComponent configureMongoDbComponent() throws Exception {
         MongoDbComponent component = new MongoDbComponent();
@@ -110,12 +110,12 @@ public class MongoDbComponentAutoConfiguration {
                         ? HierarchicalPropertiesEvaluator.evaluate(
                                 applicationContext.getEnvironment(),
                                 "camel.component.customizer",
-                                "camel.component.mongodb3.customizer",
+                                "camel.component.mongodb.customizer",
                                 ((HasId) customizer).getId())
                         : HierarchicalPropertiesEvaluator.evaluate(
                                 applicationContext.getEnvironment(),
                                 "camel.component.customizer",
-                                "camel.component.mongodb3.customizer");
+                                "camel.component.mongodb.customizer");
                 if (useCustomizer) {
                     LOGGER.debug("Configure component {}, with customizer {}",
                             component, customizer);
diff --git a/platforms/spring-boot/components-starter/camel-mongodb3-starter/src/main/java/org/apache/camel/component/mongodb3/springboot/MongoDbComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-mongodb-starter/src/main/java/org/apache/camel/component/mongodb3/springboot/MongoDbComponentConfiguration.java
similarity index 95%
rename from platforms/spring-boot/components-starter/camel-mongodb3-starter/src/main/java/org/apache/camel/component/mongodb3/springboot/MongoDbComponentConfiguration.java
rename to platforms/spring-boot/components-starter/camel-mongodb-starter/src/main/java/org/apache/camel/component/mongodb3/springboot/MongoDbComponentConfiguration.java
index a17b62a..fc81e1c 100644
--- a/platforms/spring-boot/components-starter/camel-mongodb3-starter/src/main/java/org/apache/camel/component/mongodb3/springboot/MongoDbComponentConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-mongodb-starter/src/main/java/org/apache/camel/component/mongodb3/springboot/MongoDbComponentConfiguration.java
@@ -26,13 +26,13 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
 @Generated("org.apache.camel.maven.packaging.SpringBootAutoConfigurationMojo")
-@ConfigurationProperties(prefix = "camel.component.mongodb3")
+@ConfigurationProperties(prefix = "camel.component.mongodb")
 public class MongoDbComponentConfiguration
         extends
             ComponentConfigurationPropertiesCommon {
 
     /**
-     * Whether to enable auto configuration of the mongodb3 component. This is
+     * Whether to enable auto configuration of the mongodb component. This is
      * enabled by default.
      */
     private Boolean enabled;
diff --git a/platforms/spring-boot/components-starter/camel-mongodb3-starter/src/main/resources/META-INF/LICENSE.txt b/platforms/spring-boot/components-starter/camel-mongodb-starter/src/main/resources/META-INF/LICENSE.txt
similarity index 100%
rename from platforms/spring-boot/components-starter/camel-mongodb3-starter/src/main/resources/META-INF/LICENSE.txt
rename to platforms/spring-boot/components-starter/camel-mongodb-starter/src/main/resources/META-INF/LICENSE.txt
diff --git a/platforms/spring-boot/components-starter/camel-mongodb3-starter/src/main/resources/META-INF/NOTICE.txt b/platforms/spring-boot/components-starter/camel-mongodb-starter/src/main/resources/META-INF/NOTICE.txt
similarity index 100%
rename from platforms/spring-boot/components-starter/camel-mongodb3-starter/src/main/resources/META-INF/NOTICE.txt
rename to platforms/spring-boot/components-starter/camel-mongodb-starter/src/main/resources/META-INF/NOTICE.txt
diff --git a/platforms/spring-boot/components-starter/camel-mongodb3-starter/src/main/resources/META-INF/spring.factories b/platforms/spring-boot/components-starter/camel-mongodb-starter/src/main/resources/META-INF/spring.factories
similarity index 99%
rename from platforms/spring-boot/components-starter/camel-mongodb3-starter/src/main/resources/META-INF/spring.factories
rename to platforms/spring-boot/components-starter/camel-mongodb-starter/src/main/resources/META-INF/spring.factories
index 0772c64..3fd5c05 100644
--- a/platforms/spring-boot/components-starter/camel-mongodb3-starter/src/main/resources/META-INF/spring.factories
+++ b/platforms/spring-boot/components-starter/camel-mongodb-starter/src/main/resources/META-INF/spring.factories
@@ -14,5 +14,6 @@
 ## See the License for the specific language governing permissions and
 ## limitations under the License.
 ## ---------------------------------------------------------------------------
+
 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
 org.apache.camel.component.mongodb3.springboot.MongoDbComponentAutoConfiguration
diff --git a/platforms/spring-boot/components-starter/camel-mongodb3-starter/src/main/resources/META-INF/spring.provides b/platforms/spring-boot/components-starter/camel-mongodb-starter/src/main/resources/META-INF/spring.provides
similarity index 97%
rename from platforms/spring-boot/components-starter/camel-mongodb3-starter/src/main/resources/META-INF/spring.provides
rename to platforms/spring-boot/components-starter/camel-mongodb-starter/src/main/resources/META-INF/spring.provides
index c326e53..850a10a 100644
--- a/platforms/spring-boot/components-starter/camel-mongodb3-starter/src/main/resources/META-INF/spring.provides
+++ b/platforms/spring-boot/components-starter/camel-mongodb-starter/src/main/resources/META-INF/spring.provides
@@ -14,4 +14,4 @@
 ## See the License for the specific language governing permissions and
 ## limitations under the License.
 ## ---------------------------------------------------------------------------
-provides: camel-mongodb3
+provides: camel-mongodb
diff --git a/platforms/spring-boot/components-starter/camel-mongodb3-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/platforms/spring-boot/components-starter/camel-mongodb3-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
deleted file mode 100644
index bddef97..0000000
--- a/platforms/spring-boot/components-starter/camel-mongodb3-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "properties": [
-    {
-      "defaultValue": true,
-      "name": "camel.component.mongodb3.enabled",
-      "description": "Enable mongodb3 component",
-      "type": "java.lang.Boolean"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/platforms/spring-boot/components-starter/pom.xml b/platforms/spring-boot/components-starter/pom.xml
index 338be63..ce1d623 100644
--- a/platforms/spring-boot/components-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/pom.xml
@@ -273,6 +273,7 @@
     <module>camel-mllp-starter</module>
     <module>camel-mock-starter</module>
     <module>camel-mongodb-gridfs-starter</module>
+    <module>camel-mongodb-starter</module>
     <module>camel-mongodb3-starter</module>
     <module>camel-mqtt-starter</module>
     <module>camel-msv-starter</module>


Mime
View raw message