You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2020/11/03 15:46:10 UTC
[camel-kafka-connector] branch master updated: Decouple the MongoDB
client from the service to simplify using the test infra from Camel
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-kafka-connector.git
The following commit(s) were added to refs/heads/master by this push:
new 27dcfd0 Decouple the MongoDB client from the service to simplify using the test infra from Camel
27dcfd0 is described below
commit 27dcfd0fc82a3656650a72059c6772be155ce1ff
Author: Otavio Rodolfo Piske <op...@redhat.com>
AuthorDate: Tue Nov 3 10:13:28 2020 +0100
Decouple the MongoDB client from the service to simplify using the test infra from Camel
---
.../mongodb/services/MongoDBLocalContainerService.java | 7 -------
.../camel/kafkaconnector/mongodb/services/MongoDBService.java | 3 ---
.../kafkaconnector/mongodb/services/RemoteMongoDBService.java | 8 --------
.../camel/kafkaconnector/mongodb/sink/CamelSinkMongoDBITCase.java | 3 ++-
.../kafkaconnector/mongodb/source/CamelSourceMongoDBITCase.java | 3 ++-
5 files changed, 4 insertions(+), 20 deletions(-)
diff --git a/tests/itests-mongodb/src/test/java/org/apache/camel/kafkaconnector/mongodb/services/MongoDBLocalContainerService.java b/tests/itests-mongodb/src/test/java/org/apache/camel/kafkaconnector/mongodb/services/MongoDBLocalContainerService.java
index 27d647e..860859f 100644
--- a/tests/itests-mongodb/src/test/java/org/apache/camel/kafkaconnector/mongodb/services/MongoDBLocalContainerService.java
+++ b/tests/itests-mongodb/src/test/java/org/apache/camel/kafkaconnector/mongodb/services/MongoDBLocalContainerService.java
@@ -17,8 +17,6 @@
package org.apache.camel.kafkaconnector.mongodb.services;
-import com.mongodb.client.MongoClient;
-import com.mongodb.client.MongoClients;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.testcontainers.containers.MongoDBContainer;
@@ -46,11 +44,6 @@ public class MongoDBLocalContainerService implements MongoDBService {
}
@Override
- public MongoClient getClient() {
- return MongoClients.create(getReplicaSetUrl());
- }
-
- @Override
public void initialize() {
LOG.info("MongoDB service running at {}", container.getReplicaSetUrl());
}
diff --git a/tests/itests-mongodb/src/test/java/org/apache/camel/kafkaconnector/mongodb/services/MongoDBService.java b/tests/itests-mongodb/src/test/java/org/apache/camel/kafkaconnector/mongodb/services/MongoDBService.java
index 106a705..4822b49 100644
--- a/tests/itests-mongodb/src/test/java/org/apache/camel/kafkaconnector/mongodb/services/MongoDBService.java
+++ b/tests/itests-mongodb/src/test/java/org/apache/camel/kafkaconnector/mongodb/services/MongoDBService.java
@@ -17,7 +17,6 @@
package org.apache.camel.kafkaconnector.mongodb.services;
-import com.mongodb.client.MongoClient;
import org.junit.jupiter.api.extension.AfterAllCallback;
import org.junit.jupiter.api.extension.BeforeAllCallback;
import org.junit.jupiter.api.extension.ExtensionContext;
@@ -35,8 +34,6 @@ public interface MongoDBService extends BeforeAllCallback, AfterAllCallback {
String getReplicaSetUrl();
- MongoClient getClient();
-
@Override
default void beforeAll(ExtensionContext extensionContext) throws Exception {
initialize();
diff --git a/tests/itests-mongodb/src/test/java/org/apache/camel/kafkaconnector/mongodb/services/RemoteMongoDBService.java b/tests/itests-mongodb/src/test/java/org/apache/camel/kafkaconnector/mongodb/services/RemoteMongoDBService.java
index c495d7c..175b49c 100644
--- a/tests/itests-mongodb/src/test/java/org/apache/camel/kafkaconnector/mongodb/services/RemoteMongoDBService.java
+++ b/tests/itests-mongodb/src/test/java/org/apache/camel/kafkaconnector/mongodb/services/RemoteMongoDBService.java
@@ -17,9 +17,6 @@
package org.apache.camel.kafkaconnector.mongodb.services;
-import com.mongodb.client.MongoClient;
-import com.mongodb.client.MongoClients;
-
public class RemoteMongoDBService implements MongoDBService {
public String getReplicaSetUrl() {
@@ -35,9 +32,4 @@ public class RemoteMongoDBService implements MongoDBService {
public void shutdown() {
// NO-OP
}
-
- @Override
- public MongoClient getClient() {
- return MongoClients.create(getReplicaSetUrl());
- }
}
diff --git a/tests/itests-mongodb/src/test/java/org/apache/camel/kafkaconnector/mongodb/sink/CamelSinkMongoDBITCase.java b/tests/itests-mongodb/src/test/java/org/apache/camel/kafkaconnector/mongodb/sink/CamelSinkMongoDBITCase.java
index a381f38..e4874db 100644
--- a/tests/itests-mongodb/src/test/java/org/apache/camel/kafkaconnector/mongodb/sink/CamelSinkMongoDBITCase.java
+++ b/tests/itests-mongodb/src/test/java/org/apache/camel/kafkaconnector/mongodb/sink/CamelSinkMongoDBITCase.java
@@ -20,6 +20,7 @@ package org.apache.camel.kafkaconnector.mongodb.sink;
import java.util.concurrent.ExecutionException;
import com.mongodb.client.MongoClient;
+import com.mongodb.client.MongoClients;
import com.mongodb.client.MongoCollection;
import com.mongodb.client.MongoDatabase;
import org.apache.camel.kafkaconnector.common.AbstractKafkaTest;
@@ -60,7 +61,7 @@ public class CamelSinkMongoDBITCase extends AbstractKafkaTest {
@BeforeEach
public void setUp() {
- mongoClient = mongoDBService.getClient();
+ mongoClient = MongoClients.create(mongoDBService.getReplicaSetUrl());
}
private void putRecords() {
diff --git a/tests/itests-mongodb/src/test/java/org/apache/camel/kafkaconnector/mongodb/source/CamelSourceMongoDBITCase.java b/tests/itests-mongodb/src/test/java/org/apache/camel/kafkaconnector/mongodb/source/CamelSourceMongoDBITCase.java
index 0ce470a..340b07e 100644
--- a/tests/itests-mongodb/src/test/java/org/apache/camel/kafkaconnector/mongodb/source/CamelSourceMongoDBITCase.java
+++ b/tests/itests-mongodb/src/test/java/org/apache/camel/kafkaconnector/mongodb/source/CamelSourceMongoDBITCase.java
@@ -22,6 +22,7 @@ import java.util.List;
import java.util.concurrent.ExecutionException;
import com.mongodb.client.MongoClient;
+import com.mongodb.client.MongoClients;
import com.mongodb.client.MongoCollection;
import com.mongodb.client.MongoDatabase;
import com.mongodb.client.model.CreateCollectionOptions;
@@ -63,7 +64,7 @@ public class CamelSourceMongoDBITCase extends AbstractKafkaTest {
@BeforeEach
public void setUp() {
- mongoClient = mongoDBService.getClient();
+ mongoClient = MongoClients.create(mongoDBService.getReplicaSetUrl());
MongoDatabase database = mongoClient.getDatabase("testDatabase");