You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by or...@apache.org on 2020/10/23 09:10:28 UTC
[camel-kafka-connector] branch master updated: Decouple the
Cassandra client from the service to simplify moving the services to Camel
core
This is an automated email from the ASF dual-hosted git repository.
orpiske 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 3bc6b99 Decouple the Cassandra client from the service to simplify moving the services to Camel core
3bc6b99 is described below
commit 3bc6b998041aea8ae61f27412a24c97d6fc9d30b
Author: Otavio Rodolfo Piske <op...@redhat.com>
AuthorDate: Fri Oct 23 10:32:10 2020 +0200
Decouple the Cassandra client from the service to simplify moving the services to Camel core
---
.../cassandra/services/CassandraLocalContainerService.java | 9 ---------
.../kafkaconnector/cassandra/services/CassandraService.java | 4 ----
.../cassandra/services/RemoteCassandraService.java | 10 ----------
.../cassandra/sink/CamelSinkCassandraITCase.java | 4 +---
.../cassandra/source/CamelSourceCassandraITCase.java | 4 +---
5 files changed, 2 insertions(+), 29 deletions(-)
diff --git a/tests/itests-cassandra/src/test/java/org/apache/camel/kafkaconnector/cassandra/services/CassandraLocalContainerService.java b/tests/itests-cassandra/src/test/java/org/apache/camel/kafkaconnector/cassandra/services/CassandraLocalContainerService.java
index d3b3a5f..9972c2b 100644
--- a/tests/itests-cassandra/src/test/java/org/apache/camel/kafkaconnector/cassandra/services/CassandraLocalContainerService.java
+++ b/tests/itests-cassandra/src/test/java/org/apache/camel/kafkaconnector/cassandra/services/CassandraLocalContainerService.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.kafkaconnector.cassandra.services;
-import org.apache.camel.kafkaconnector.cassandra.clients.CassandraClient;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -46,14 +45,6 @@ public class CassandraLocalContainerService implements CassandraService {
}
@Override
- public CassandraClient getClient() {
- String host = getCassandraHost();
- int port = getCQL3Port();
-
- return new CassandraClient(host, port);
- }
-
- @Override
public void initialize() {
LOG.info("Cassandra server running at address {}", getCQL3Endpoint());
}
diff --git a/tests/itests-cassandra/src/test/java/org/apache/camel/kafkaconnector/cassandra/services/CassandraService.java b/tests/itests-cassandra/src/test/java/org/apache/camel/kafkaconnector/cassandra/services/CassandraService.java
index de012c1..49526ea 100644
--- a/tests/itests-cassandra/src/test/java/org/apache/camel/kafkaconnector/cassandra/services/CassandraService.java
+++ b/tests/itests-cassandra/src/test/java/org/apache/camel/kafkaconnector/cassandra/services/CassandraService.java
@@ -17,7 +17,6 @@
package org.apache.camel.kafkaconnector.cassandra.services;
-import org.apache.camel.kafkaconnector.cassandra.clients.CassandraClient;
import org.junit.jupiter.api.extension.AfterAllCallback;
import org.junit.jupiter.api.extension.BeforeAllCallback;
import org.junit.jupiter.api.extension.ExtensionContext;
@@ -45,9 +44,6 @@ public interface CassandraService extends BeforeAllCallback, AfterAllCallback {
*/
void shutdown();
- CassandraClient getClient();
-
-
@Override
default void beforeAll(ExtensionContext extensionContext) throws Exception {
initialize();
diff --git a/tests/itests-cassandra/src/test/java/org/apache/camel/kafkaconnector/cassandra/services/RemoteCassandraService.java b/tests/itests-cassandra/src/test/java/org/apache/camel/kafkaconnector/cassandra/services/RemoteCassandraService.java
index 1a8e8bd..b9d5ecb 100644
--- a/tests/itests-cassandra/src/test/java/org/apache/camel/kafkaconnector/cassandra/services/RemoteCassandraService.java
+++ b/tests/itests-cassandra/src/test/java/org/apache/camel/kafkaconnector/cassandra/services/RemoteCassandraService.java
@@ -16,8 +16,6 @@
*/
package org.apache.camel.kafkaconnector.cassandra.services;
-import org.apache.camel.kafkaconnector.cassandra.clients.CassandraClient;
-
/**
* A remote instance of Apache Cassandra
*/
@@ -41,14 +39,6 @@ public class RemoteCassandraService implements CassandraService {
}
@Override
- public CassandraClient getClient() {
- String host = getCassandraHost();
- int port = getCQL3Port();
-
- return new CassandraClient(host, port);
- }
-
- @Override
public void initialize() {
// NO-OP
}
diff --git a/tests/itests-cassandra/src/test/java/org/apache/camel/kafkaconnector/cassandra/sink/CamelSinkCassandraITCase.java b/tests/itests-cassandra/src/test/java/org/apache/camel/kafkaconnector/cassandra/sink/CamelSinkCassandraITCase.java
index c583d71..0fbae41 100644
--- a/tests/itests-cassandra/src/test/java/org/apache/camel/kafkaconnector/cassandra/sink/CamelSinkCassandraITCase.java
+++ b/tests/itests-cassandra/src/test/java/org/apache/camel/kafkaconnector/cassandra/sink/CamelSinkCassandraITCase.java
@@ -63,7 +63,7 @@ public class CamelSinkCassandraITCase extends AbstractKafkaTest {
@BeforeEach
public void setUp() {
- cassandraClient = cassandraService.getClient();
+ cassandraClient = new CassandraClient(cassandraService.getCassandraHost(), cassandraService.getCQL3Port());
testDataDao = cassandraClient.newTestDataDao();
@@ -74,8 +74,6 @@ public class CamelSinkCassandraITCase extends AbstractKafkaTest {
@AfterEach
public void tearDown() {
- cassandraClient = cassandraService.getClient();
-
if (testDataDao != null) {
try {
testDataDao.dropTable();
diff --git a/tests/itests-cassandra/src/test/java/org/apache/camel/kafkaconnector/cassandra/source/CamelSourceCassandraITCase.java b/tests/itests-cassandra/src/test/java/org/apache/camel/kafkaconnector/cassandra/source/CamelSourceCassandraITCase.java
index 25ef1ee..00ce194 100644
--- a/tests/itests-cassandra/src/test/java/org/apache/camel/kafkaconnector/cassandra/source/CamelSourceCassandraITCase.java
+++ b/tests/itests-cassandra/src/test/java/org/apache/camel/kafkaconnector/cassandra/source/CamelSourceCassandraITCase.java
@@ -60,7 +60,7 @@ public class CamelSourceCassandraITCase extends AbstractKafkaTest {
@BeforeEach
public void setUp() {
- cassandraClient = cassandraService.getClient();
+ cassandraClient = new CassandraClient(cassandraService.getCassandraHost(), cassandraService.getCQL3Port());
testDataDao = cassandraClient.newTestDataDao();
@@ -75,8 +75,6 @@ public class CamelSourceCassandraITCase extends AbstractKafkaTest {
@AfterEach
public void tearDown() {
- cassandraClient = cassandraService.getClient();
-
if (testDataDao != null) {
try {
testDataDao.dropTable();