[camel-kafka-connector] branch master updated: Decouple the jdbc clients from the service to simplify using the test infra from Camel

[orpiske]

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 4604e7e  Decouple the jdbc clients from the service to simplify using 
the test infra from Camel
4604e7e is described below

commit 4604e7efb4258d314aac33fa110461941a72cf8f
Author: Otavio Rodolfo Piske <opi...@redhat.com>
AuthorDate: Mon Nov 16 15:51:15 2020 +0100

    Decouple the jdbc clients from the service to simplify using the test infra 
from Camel
---
 .../jdbc/services/JDBCLocalContainerService.java           |  7 ++-----
 .../kafkaconnector/jdbc/services/JDBCRemoteService.java    | 14 +++++---------
 .../camel/kafkaconnector/jdbc/services/JDBCService.java    |  6 +-----
 .../kafkaconnector/jdbc/sink/CamelSinkJDBCITCase.java      |  2 +-
 4 files changed, 9 insertions(+), 20 deletions(-)

diff --git 
a/tests/itests-jdbc/src/test/java/org/apache/camel/kafkaconnector/jdbc/services/JDBCLocalContainerService.java
 
b/tests/itests-jdbc/src/test/java/org/apache/camel/kafkaconnector/jdbc/services/JDBCLocalContainerService.java
index e67c72c..98ac948 100644
--- 
a/tests/itests-jdbc/src/test/java/org/apache/camel/kafkaconnector/jdbc/services/JDBCLocalContainerService.java
+++ 
b/tests/itests-jdbc/src/test/java/org/apache/camel/kafkaconnector/jdbc/services/JDBCLocalContainerService.java
@@ -17,9 +17,6 @@
 
 package org.apache.camel.kafkaconnector.jdbc.services;
 
-import java.sql.SQLException;
-
-import org.apache.camel.kafkaconnector.jdbc.client.DatabaseClient;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testcontainers.containers.JdbcDatabaseContainer;
@@ -44,8 +41,8 @@ public class JDBCLocalContainerService implements JDBCService 
{
     }
 
     @Override
-    public DatabaseClient getClient() throws SQLException {
-        return new DatabaseClient(container.getJdbcUrl());
+    public String jdbcUrl() {
+        return container.getJdbcUrl();
     }
 
     @Override
diff --git 
a/tests/itests-jdbc/src/test/java/org/apache/camel/kafkaconnector/jdbc/services/JDBCRemoteService.java
 
b/tests/itests-jdbc/src/test/java/org/apache/camel/kafkaconnector/jdbc/services/JDBCRemoteService.java
index 12956da..f351010 100644
--- 
a/tests/itests-jdbc/src/test/java/org/apache/camel/kafkaconnector/jdbc/services/JDBCRemoteService.java
+++ 
b/tests/itests-jdbc/src/test/java/org/apache/camel/kafkaconnector/jdbc/services/JDBCRemoteService.java
@@ -17,10 +17,6 @@
 
 package org.apache.camel.kafkaconnector.jdbc.services;
 
-import java.sql.SQLException;
-
-import org.apache.camel.kafkaconnector.jdbc.client.DatabaseClient;
-
 public class JDBCRemoteService implements JDBCService {
     private static final String CONNECTION_URL;
 
@@ -29,17 +25,17 @@ public class JDBCRemoteService implements JDBCService {
     }
 
     @Override
-    public void initialize() {
-        // NO-OP
+    public String jdbcUrl() {
+        return CONNECTION_URL;
     }
 
     @Override
-    public void shutdown() {
+    public void initialize() {
         // NO-OP
     }
 
     @Override
-    public DatabaseClient getClient() throws SQLException {
-        return new DatabaseClient(CONNECTION_URL);
+    public void shutdown() {
+        // NO-OP
     }
 }
diff --git 
a/tests/itests-jdbc/src/test/java/org/apache/camel/kafkaconnector/jdbc/services/JDBCService.java
 
b/tests/itests-jdbc/src/test/java/org/apache/camel/kafkaconnector/jdbc/services/JDBCService.java
index c970453..4ee5996 100644
--- 
a/tests/itests-jdbc/src/test/java/org/apache/camel/kafkaconnector/jdbc/services/JDBCService.java
+++ 
b/tests/itests-jdbc/src/test/java/org/apache/camel/kafkaconnector/jdbc/services/JDBCService.java
@@ -17,9 +17,6 @@
 
 package org.apache.camel.kafkaconnector.jdbc.services;
 
-import java.sql.SQLException;
-
-import org.apache.camel.kafkaconnector.jdbc.client.DatabaseClient;
 import org.junit.jupiter.api.extension.AfterAllCallback;
 import org.junit.jupiter.api.extension.BeforeAllCallback;
 import org.junit.jupiter.api.extension.ExtensionContext;
@@ -35,8 +32,7 @@ public interface JDBCService extends BeforeAllCallback, 
AfterAllCallback {
      */
     void shutdown();
 
-
-    DatabaseClient getClient() throws SQLException;
+    String jdbcUrl();
 
 
     @Override
diff --git 
a/tests/itests-jdbc/src/test/java/org/apache/camel/kafkaconnector/jdbc/sink/CamelSinkJDBCITCase.java
 
b/tests/itests-jdbc/src/test/java/org/apache/camel/kafkaconnector/jdbc/sink/CamelSinkJDBCITCase.java
index b4266bd..7066ff3 100644
--- 
a/tests/itests-jdbc/src/test/java/org/apache/camel/kafkaconnector/jdbc/sink/CamelSinkJDBCITCase.java
+++ 
b/tests/itests-jdbc/src/test/java/org/apache/camel/kafkaconnector/jdbc/sink/CamelSinkJDBCITCase.java
@@ -116,7 +116,7 @@ public class CamelSinkJDBCITCase extends AbstractKafkaTest {
         LOG.debug("Waiting for indices");
 
         try {
-            DatabaseClient client = jdbcService.getClient();
+            DatabaseClient client = new DatabaseClient(jdbcService.jdbcUrl());
 
             TestUtils.waitFor(() -> {
                 try {