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/12/01 12:03:54 UTC
[camel-kafka-connector] 02/03: IT Test SQL: Fixed CS
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch it-tests-sql
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git
commit 46bc36761641a647011e588bc0c9f41279bb5454
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Dec 1 13:01:38 2020 +0100
IT Test SQL: Fixed CS
---
.../sql/services/SQLLocalContainerService.java | 12 +++---------
.../camel/kafkaconnector/sql/services/SQLService.java | 1 -
.../kafkaconnector/sql/services/SQLServiceFactory.java | 5 ++---
.../kafkaconnector/sql/sink/CamelSinkSQLITCase.java | 6 ++----
.../sql/sink/CamelSqlPropertyFactory.java | 9 ++-------
.../kafkaconnector/sql/source/CamelSourceSQLITCase.java | 17 ++++-------------
.../sql/source/CamelSqlPropertyFactory.java | 9 ++-------
7 files changed, 15 insertions(+), 44 deletions(-)
diff --git a/tests/itests-sql/src/test/java/org/apache/camel/kafkaconnector/sql/services/SQLLocalContainerService.java b/tests/itests-sql/src/test/java/org/apache/camel/kafkaconnector/sql/services/SQLLocalContainerService.java
index a907d32..e94805d 100644
--- a/tests/itests-sql/src/test/java/org/apache/camel/kafkaconnector/sql/services/SQLLocalContainerService.java
+++ b/tests/itests-sql/src/test/java/org/apache/camel/kafkaconnector/sql/services/SQLLocalContainerService.java
@@ -28,12 +28,7 @@ public class SQLLocalContainerService implements SQLService {
private static JdbcDatabaseContainer container;
public SQLLocalContainerService() {
- container = new PostgreSQLContainer()
- .withDatabaseName("camel")
- .withUsername("ckc")
- .withPassword("ckcDevel123")
- .withInitScript("schema.sql")
- .withStartupTimeoutSeconds(60);
+ container = new PostgreSQLContainer().withDatabaseName("camel").withUsername("ckc").withPassword("ckcDevel123").withInitScript("schema.sql").withStartupTimeoutSeconds(60);
container.start();
@@ -52,10 +47,9 @@ public class SQLLocalContainerService implements SQLService {
@Override
public void shutdown() {
- System.err.println("Shutdown");
+ System.err.println("Shutdown");
LOG.info("Stopping the database instance");
container.stop();
}
-
-
+
}
diff --git a/tests/itests-sql/src/test/java/org/apache/camel/kafkaconnector/sql/services/SQLService.java b/tests/itests-sql/src/test/java/org/apache/camel/kafkaconnector/sql/services/SQLService.java
index 2e389a1..44d48fb 100644
--- a/tests/itests-sql/src/test/java/org/apache/camel/kafkaconnector/sql/services/SQLService.java
+++ b/tests/itests-sql/src/test/java/org/apache/camel/kafkaconnector/sql/services/SQLService.java
@@ -34,7 +34,6 @@ public interface SQLService extends BeforeAllCallback, AfterAllCallback {
String sqlUrl();
-
@Override
default void beforeAll(ExtensionContext extensionContext) throws Exception {
initialize();
diff --git a/tests/itests-sql/src/test/java/org/apache/camel/kafkaconnector/sql/services/SQLServiceFactory.java b/tests/itests-sql/src/test/java/org/apache/camel/kafkaconnector/sql/services/SQLServiceFactory.java
index e4268f0..90bd411 100644
--- a/tests/itests-sql/src/test/java/org/apache/camel/kafkaconnector/sql/services/SQLServiceFactory.java
+++ b/tests/itests-sql/src/test/java/org/apache/camel/kafkaconnector/sql/services/SQLServiceFactory.java
@@ -26,12 +26,11 @@ public final class SQLServiceFactory {
private SQLServiceFactory() {
}
-
- public static SQLService createService() {
+ public static SQLService createService() {
String instanceType = System.getProperty("sql.instance.type");
if (instanceType == null || instanceType.equals("local-sql-container")) {
- return new SQLLocalContainerService();
+ return new SQLLocalContainerService();
}
if (instanceType.equals("remote")) {
diff --git a/tests/itests-sql/src/test/java/org/apache/camel/kafkaconnector/sql/sink/CamelSinkSQLITCase.java b/tests/itests-sql/src/test/java/org/apache/camel/kafkaconnector/sql/sink/CamelSinkSQLITCase.java
index b61fa96..9cd1ff3 100644
--- a/tests/itests-sql/src/test/java/org/apache/camel/kafkaconnector/sql/sink/CamelSinkSQLITCase.java
+++ b/tests/itests-sql/src/test/java/org/apache/camel/kafkaconnector/sql/sink/CamelSinkSQLITCase.java
@@ -138,10 +138,8 @@ public class CamelSinkSQLITCase extends AbstractKafkaTest {
@Test
public void testDBFetch() throws ExecutionException, InterruptedException {
- CamelSqlPropertyFactory factory = CamelSqlPropertyFactory.basic()
- .withDataSource(CamelSqlPropertyFactory.classRef(TestDataSource.class.getName()))
- .withQuery("insert into test(test_name, test_data) values(:#TestName,:#TestData)")
- .withTopics(TestUtils.getDefaultTestTopic(this.getClass()));
+ CamelSqlPropertyFactory factory = CamelSqlPropertyFactory.basic().withDataSource(CamelSqlPropertyFactory.classRef(TestDataSource.class.getName()))
+ .withQuery("insert into test(test_name, test_data) values(:#TestName,:#TestData)").withTopics(TestUtils.getDefaultTestTopic(this.getClass()));
runTest(factory);
diff --git a/tests/itests-sql/src/test/java/org/apache/camel/kafkaconnector/sql/sink/CamelSqlPropertyFactory.java b/tests/itests-sql/src/test/java/org/apache/camel/kafkaconnector/sql/sink/CamelSqlPropertyFactory.java
index f7df3fc..3a64a5a 100644
--- a/tests/itests-sql/src/test/java/org/apache/camel/kafkaconnector/sql/sink/CamelSqlPropertyFactory.java
+++ b/tests/itests-sql/src/test/java/org/apache/camel/kafkaconnector/sql/sink/CamelSqlPropertyFactory.java
@@ -17,7 +17,6 @@
package org.apache.camel.kafkaconnector.sql.sink;
-
import org.apache.camel.kafkaconnector.common.SinkConnectorPropertyFactory;
public final class CamelSqlPropertyFactory extends SinkConnectorPropertyFactory<CamelSqlPropertyFactory> {
@@ -34,11 +33,7 @@ public final class CamelSqlPropertyFactory extends SinkConnectorPropertyFactory<
}
public static CamelSqlPropertyFactory basic() {
- return new CamelSqlPropertyFactory()
- .withName("CamelSQLSinkConnector")
- .withTasksMax(1)
- .withConnectorClass("org.apache.camel.kafkaconnector.sql.CamelSqlSinkConnector")
- .withKeyConverterClass("org.apache.kafka.connect.storage.StringConverter")
- .withValueConverterClass("org.apache.kafka.connect.storage.StringConverter");
+ return new CamelSqlPropertyFactory().withName("CamelSQLSinkConnector").withTasksMax(1).withConnectorClass("org.apache.camel.kafkaconnector.sql.CamelSqlSinkConnector")
+ .withKeyConverterClass("org.apache.kafka.connect.storage.StringConverter").withValueConverterClass("org.apache.kafka.connect.storage.StringConverter");
}
}
diff --git a/tests/itests-sql/src/test/java/org/apache/camel/kafkaconnector/sql/source/CamelSourceSQLITCase.java b/tests/itests-sql/src/test/java/org/apache/camel/kafkaconnector/sql/source/CamelSourceSQLITCase.java
index 8b877bf..4dc4b16 100644
--- a/tests/itests-sql/src/test/java/org/apache/camel/kafkaconnector/sql/source/CamelSourceSQLITCase.java
+++ b/tests/itests-sql/src/test/java/org/apache/camel/kafkaconnector/sql/source/CamelSourceSQLITCase.java
@@ -17,17 +17,16 @@
package org.apache.camel.kafkaconnector.sql.source;
+import java.util.concurrent.ExecutionException;
+
import org.apache.camel.kafkaconnector.common.AbstractKafkaTest;
import org.apache.camel.kafkaconnector.common.ConnectorPropertyFactory;
import org.apache.camel.kafkaconnector.common.clients.kafka.KafkaClient;
import org.apache.camel.kafkaconnector.common.utils.TestUtils;
-import org.apache.camel.kafkaconnector.sql.client.DatabaseClient;
import org.apache.camel.kafkaconnector.sql.services.SQLService;
import org.apache.camel.kafkaconnector.sql.services.SQLServiceFactory;
import org.apache.camel.kafkaconnector.sql.services.TestDataSource;
import org.apache.kafka.clients.consumer.ConsumerRecord;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.Timeout;
import org.junit.jupiter.api.extension.RegisterExtension;
@@ -36,12 +35,6 @@ import org.slf4j.LoggerFactory;
import org.testcontainers.junit.jupiter.Testcontainers;
import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.fail;
-
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.concurrent.ExecutionException;
@Testcontainers
public class CamelSourceSQLITCase extends AbstractKafkaTest {
@@ -82,10 +75,8 @@ public class CamelSourceSQLITCase extends AbstractKafkaTest {
@Timeout(10)
@Test
public void testDBFetch() throws ExecutionException, InterruptedException {
- CamelSqlPropertyFactory factory = CamelSqlPropertyFactory.basic()
- .withDataSource(CamelSqlPropertyFactory.classRef(TestDataSource.class.getName()))
- .withQuery("select * from test")
- .withTopics(TestUtils.getDefaultTestTopic(this.getClass()));
+ CamelSqlPropertyFactory factory = CamelSqlPropertyFactory.basic().withDataSource(CamelSqlPropertyFactory.classRef(TestDataSource.class.getName()))
+ .withQuery("select * from test").withTopics(TestUtils.getDefaultTestTopic(this.getClass()));
runTest(factory);
diff --git a/tests/itests-sql/src/test/java/org/apache/camel/kafkaconnector/sql/source/CamelSqlPropertyFactory.java b/tests/itests-sql/src/test/java/org/apache/camel/kafkaconnector/sql/source/CamelSqlPropertyFactory.java
index 5618cf4..4f5100a 100644
--- a/tests/itests-sql/src/test/java/org/apache/camel/kafkaconnector/sql/source/CamelSqlPropertyFactory.java
+++ b/tests/itests-sql/src/test/java/org/apache/camel/kafkaconnector/sql/source/CamelSqlPropertyFactory.java
@@ -17,7 +17,6 @@
package org.apache.camel.kafkaconnector.sql.source;
-
import org.apache.camel.kafkaconnector.common.SinkConnectorPropertyFactory;
public final class CamelSqlPropertyFactory extends SinkConnectorPropertyFactory<CamelSqlPropertyFactory> {
@@ -34,11 +33,7 @@ public final class CamelSqlPropertyFactory extends SinkConnectorPropertyFactory<
}
public static CamelSqlPropertyFactory basic() {
- return new CamelSqlPropertyFactory()
- .withName("CamelSQLSourceConnector")
- .withTasksMax(1)
- .withConnectorClass("org.apache.camel.kafkaconnector.sql.CamelSqlSourceConnector")
- .withKeyConverterClass("org.apache.kafka.connect.storage.StringConverter")
- .withValueConverterClass("org.apache.kafka.connect.storage.StringConverter");
+ return new CamelSqlPropertyFactory().withName("CamelSQLSourceConnector").withTasksMax(1).withConnectorClass("org.apache.camel.kafkaconnector.sql.CamelSqlSourceConnector")
+ .withKeyConverterClass("org.apache.kafka.connect.storage.StringConverter").withValueConverterClass("org.apache.kafka.connect.storage.StringConverter");
}
}