[camel-quarkus] 01/01: debezium tests failing

[zb...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

zbendhiba pushed a commit to branch debezium-quarkus-2
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git

commit 5a3933e232b8fd274644d2fdaf7b3dfd740316a5
Author: Zineb Bendhiba <be...@gmail.com>
AuthorDate: Wed May 12 00:26:16 2021 +0200

    debezium tests failing
---
 .../debezium/common/it/AbstractDebeziumResource.java          | 11 ++++++-----
 .../component/debezium/common/it/DebeziumMongodbResource.java |  6 ++++--
 .../component/debezium/common/it/DebeziumMysqlResource.java   | 10 ++++++----
 .../debezium/common/it/DebeziumSqlserverResource.java         | 10 ++++++----
 .../debezium/common/it/mongodb/DebeziumMongodbTest.java       |  9 ++++++---
 .../component/debezium/common/it/mysql/DebeziumMysqlTest.java |  8 +++++---
 .../debezium/common/it/mysql/DebeziumMysqlTestResource.java   |  3 +--
 .../debezium/common/it/postgres/DebeziumPostgresTest.java     |  3 ++-
 .../debezium/common/it/sqlserver/DebeziumSqlserverTest.java   |  9 ++++++---
 .../common/it/sqlserver/DebeziumSqlserverTestResource.java    |  3 +--
 10 files changed, 43 insertions(+), 29 deletions(-)

diff --git a/integration-tests/debezium/src/main/java/org/apache/camel/quarkus/component/debezium/common/it/AbstractDebeziumResource.java b/integration-tests/debezium/src/main/java/org/apache/camel/quarkus/component/debezium/common/it/AbstractDebeziumResource.java
index 4fc86cb..da469dc 100644
--- a/integration-tests/debezium/src/main/java/org/apache/camel/quarkus/component/debezium/common/it/AbstractDebeziumResource.java
+++ b/integration-tests/debezium/src/main/java/org/apache/camel/quarkus/component/debezium/common/it/AbstractDebeziumResource.java
@@ -21,6 +21,7 @@ import javax.inject.Inject;
 import org.apache.camel.ConsumerTemplate;
 import org.apache.camel.Exchange;
 import org.apache.camel.component.debezium.DebeziumConstants;
+import org.eclipse.microprofile.config.ConfigProvider;
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 
 /**
@@ -87,12 +88,12 @@ public abstract class AbstractDebeziumResource {
 
     private Exchange receiveAsExchange() {
         String endpoint = getEndpoinUrl(
-                System.getProperty(type.getPropertyHostname()),
-                System.getProperty(type.getPropertyPort()),
-                System.getProperty(type.getPropertyUsername()),
-                System.getProperty(type.getPropertyPassword()),
+                ConfigProvider.getConfig().getValue(type.getPropertyHostname(), String.class),
+                ConfigProvider.getConfig().getValue(type.getPropertyPort(), String.class),
+                ConfigProvider.getConfig().getValue(type.getPropertyUsername(), String.class),
+                ConfigProvider.getConfig().getValue(type.getPropertyPassword(), String.class),
                 "qa",
-                System.getProperty(type.getPropertyOffsetFileName()));
+                ConfigProvider.getConfig().getValue(type.getPropertyOffsetFileName(), String.class));
         return consumerTemplate.receive(endpoint, TIMEOUT);
     }
 }
diff --git a/integration-tests/debezium/src/main/java/org/apache/camel/quarkus/component/debezium/common/it/DebeziumMongodbResource.java b/integration-tests/debezium/src/main/java/org/apache/camel/quarkus/component/debezium/common/it/DebeziumMongodbResource.java
index 336374b..7f41880 100644
--- a/integration-tests/debezium/src/main/java/org/apache/camel/quarkus/component/debezium/common/it/DebeziumMongodbResource.java
+++ b/integration-tests/debezium/src/main/java/org/apache/camel/quarkus/component/debezium/common/it/DebeziumMongodbResource.java
@@ -22,6 +22,8 @@ import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 
+import org.eclipse.microprofile.config.ConfigProvider;
+
 @Path("/debezium-mongodb")
 @ApplicationScoped
 public class DebeziumMongodbResource extends AbstractDebeziumResource {
@@ -61,8 +63,8 @@ public class DebeziumMongodbResource extends AbstractDebeziumResource {
             String offsetStorageFileName) {
         return Type.mongodb.getComponent() + ":localhost?"
                 + "offsetStorageFileName=" + offsetStorageFileName
-                + "&mongodbUser=" + System.getProperty(Type.mongodb.getPropertyUsername())
-                + "&mongodbPassword=" + System.getProperty(Type.mongodb.getPropertyPassword())
+                + "&mongodbUser=" + ConfigProvider.getConfig().getValue(Type.mongodb.getPropertyUsername(), String.class)
+                + "&mongodbPassword=" + ConfigProvider.getConfig().getValue(Type.mongodb.getPropertyPassword(), String.class)
                 + "&mongodbName=docker-rs"
                 + "&mongodbHosts=" + hostname + ":" + port;
     }
diff --git a/integration-tests/debezium/src/main/java/org/apache/camel/quarkus/component/debezium/common/it/DebeziumMysqlResource.java b/integration-tests/debezium/src/main/java/org/apache/camel/quarkus/component/debezium/common/it/DebeziumMysqlResource.java
index e4af62d..0b29ac9 100644
--- a/integration-tests/debezium/src/main/java/org/apache/camel/quarkus/component/debezium/common/it/DebeziumMysqlResource.java
+++ b/integration-tests/debezium/src/main/java/org/apache/camel/quarkus/component/debezium/common/it/DebeziumMysqlResource.java
@@ -22,13 +22,12 @@ import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 
+import org.eclipse.microprofile.config.inject.ConfigProperty;
+
 @Path("/debezium-mysql")
 @ApplicationScoped
 public class DebeziumMysqlResource extends AbstractDebeziumResource {
 
-    public static final String PROPERTY_DB_HISTORY_FILE = DebeziumMysqlResource.class.getSimpleName()
-            + "_databaseHistoryFileFilename";
-
     //debezium on mysql needs more privileges, therefore it will use root user
     public static final String DB_ROOT_USERNAME = "root";
 
@@ -36,6 +35,9 @@ public class DebeziumMysqlResource extends AbstractDebeziumResource {
         super(Type.mysql);
     }
 
+    @ConfigProperty(name = "mysql.server.db.history.file")
+    String dbHistoryFile;
+
     @Path("/receiveEmptyMessages")
     @GET
     @Produces(MediaType.TEXT_PLAIN)
@@ -58,6 +60,6 @@ public class DebeziumMysqlResource extends AbstractDebeziumResource {
         return super.getEndpoinUrl(hostname, port, DB_ROOT_USERNAME, password, databaseServerName, offsetStorageFileName)
                 //and add specific parameters
                 + "&databaseServerId=223344"
-                + "&databaseHistoryFileFilename=" + System.getProperty(PROPERTY_DB_HISTORY_FILE);
+                + "&databaseHistoryFileFilename=" + dbHistoryFile;
     }
 }
diff --git a/integration-tests/debezium/src/main/java/org/apache/camel/quarkus/component/debezium/common/it/DebeziumSqlserverResource.java b/integration-tests/debezium/src/main/java/org/apache/camel/quarkus/component/debezium/common/it/DebeziumSqlserverResource.java
index bd4cce1..980a4f3 100644
--- a/integration-tests/debezium/src/main/java/org/apache/camel/quarkus/component/debezium/common/it/DebeziumSqlserverResource.java
+++ b/integration-tests/debezium/src/main/java/org/apache/camel/quarkus/component/debezium/common/it/DebeziumSqlserverResource.java
@@ -22,19 +22,21 @@ import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 
+import org.eclipse.microprofile.config.inject.ConfigProperty;
+
 @Path("/debezium-sqlserver")
 @ApplicationScoped
 public class DebeziumSqlserverResource extends AbstractDebeziumResource {
 
-    public static final String PROPERTY_DB_HISTORY_FILE = DebeziumSqlserverResource.class.getSimpleName()
-            + "_databaseHistoryFileFilename";
-
     public static final String DB_NAME = "testDB";
 
     public DebeziumSqlserverResource() {
         super(Type.sqlserver);
     }
 
+    @ConfigProperty(name = "sql.server.db.history.file")
+    String dbHistoryFile;
+
     @Path("/receiveAsRecord")
     @GET
     @Produces(MediaType.APPLICATION_JSON)
@@ -59,6 +61,6 @@ public class DebeziumSqlserverResource extends AbstractDebeziumResource {
             String offsetStorageFileName) {
         return super.getEndpoinUrl(hostname, port, username, password, databaseServerName, offsetStorageFileName)
                 + "&databaseDbname=" + DB_NAME
-                + "&databaseHistoryFileFilename=" + System.getProperty(PROPERTY_DB_HISTORY_FILE);
+                + "&databaseHistoryFileFilename=" + dbHistoryFile;
     }
 }
diff --git a/integration-tests/debezium/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/mongodb/DebeziumMongodbTest.java b/integration-tests/debezium/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/mongodb/DebeziumMongodbTest.java
index dc7c161..e9e0955 100644
--- a/integration-tests/debezium/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/mongodb/DebeziumMongodbTest.java
+++ b/integration-tests/debezium/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/mongodb/DebeziumMongodbTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.quarkus.component.debezium.common.it.mongodb;
 
 import java.sql.Connection;
 import java.sql.SQLException;
+import java.util.Optional;
 
 import com.mongodb.client.MongoClient;
 import com.mongodb.client.MongoClients;
@@ -29,6 +30,7 @@ import io.quarkus.test.junit.QuarkusTest;
 import org.apache.camel.quarkus.component.debezium.common.it.AbstractDebeziumTest;
 import org.apache.camel.quarkus.component.debezium.common.it.Type;
 import org.bson.Document;
+import org.eclipse.microprofile.config.ConfigProvider;
 import org.jboss.logging.Logger;
 import org.junit.Assert;
 import org.junit.Before;
@@ -62,10 +64,11 @@ class DebeziumMongodbTest extends AbstractDebeziumTest {
 
     @BeforeAll
     public static void setUp() throws SQLException {
-        final String mongoUrl = System.getProperty(Type.mongodb.getPropertyJdbc());
+        final Optional<String> mongoUrl = ConfigProvider.getConfig().getOptionalValue(Type.mongodb.getPropertyJdbc(),
+                String.class);
 
-        if (mongoUrl != null) {
-            mongoClient = MongoClients.create(mongoUrl);
+        if (mongoUrl.isPresent()) {
+            mongoClient = MongoClients.create(mongoUrl.get());
         } else {
             LOG.warn("Container is not running. Connection is not created.");
         }
diff --git a/integration-tests/debezium/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/mysql/DebeziumMysqlTest.java b/integration-tests/debezium/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/mysql/DebeziumMysqlTest.java
index d8dffe7..a8f0a45 100644
--- a/integration-tests/debezium/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/mysql/DebeziumMysqlTest.java
+++ b/integration-tests/debezium/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/mysql/DebeziumMysqlTest.java
@@ -19,11 +19,13 @@ package org.apache.camel.quarkus.component.debezium.common.it.mysql;
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.SQLException;
+import java.util.Optional;
 
 import io.quarkus.test.common.QuarkusTestResource;
 import io.quarkus.test.junit.QuarkusTest;
 import org.apache.camel.quarkus.component.debezium.common.it.AbstractDebeziumTest;
 import org.apache.camel.quarkus.component.debezium.common.it.Type;
+import org.eclipse.microprofile.config.ConfigProvider;
 import org.jboss.logging.Logger;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
@@ -49,10 +51,10 @@ class DebeziumMysqlTest extends AbstractDebeziumTest {
 
     @BeforeAll
     public static void setUp() throws SQLException {
-        final String jdbcUrl = System.getProperty(PROPERTY_JDBC);
+        final Optional<String> jdbcUrl = ConfigProvider.getConfig().getOptionalValue(PROPERTY_JDBC, String.class);
 
-        if (jdbcUrl != null) {
-            connection = DriverManager.getConnection(jdbcUrl);
+        if (jdbcUrl.isPresent()) {
+            connection = DriverManager.getConnection(jdbcUrl.get());
         } else {
             LOG.warn("Container is not running. Connection is not created.");
         }
diff --git a/integration-tests/debezium/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/mysql/DebeziumMysqlTestResource.java b/integration-tests/debezium/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/mysql/DebeziumMysqlTestResource.java
index 01bcd30..58b7652 100644
--- a/integration-tests/debezium/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/mysql/DebeziumMysqlTestResource.java
+++ b/integration-tests/debezium/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/mysql/DebeziumMysqlTestResource.java
@@ -24,7 +24,6 @@ import java.util.Collections;
 import java.util.Map;
 
 import org.apache.camel.quarkus.component.debezium.common.it.AbstractDebeziumTestResource;
-import org.apache.camel.quarkus.component.debezium.common.it.DebeziumMysqlResource;
 import org.apache.camel.quarkus.component.debezium.common.it.Type;
 import org.jboss.logging.Logger;
 import org.testcontainers.containers.MySQLContainer;
@@ -68,7 +67,7 @@ public class DebeziumMysqlTestResource extends AbstractDebeziumTestResource<MySQ
         try {
             historyFile = Files.createTempFile(getClass().getSimpleName() + "-history-file-", "");
 
-            properties.put(DebeziumMysqlResource.PROPERTY_DB_HISTORY_FILE, historyFile.toString());
+            properties.put("mysql.server.db.history.file", historyFile.toString());
         } catch (IOException e) {
             throw new RuntimeException(e);
         }
diff --git a/integration-tests/debezium/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/postgres/DebeziumPostgresTest.java b/integration-tests/debezium/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/postgres/DebeziumPostgresTest.java
index 0fb2d68..e793e73 100644
--- a/integration-tests/debezium/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/postgres/DebeziumPostgresTest.java
+++ b/integration-tests/debezium/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/postgres/DebeziumPostgresTest.java
@@ -24,6 +24,7 @@ import io.quarkus.test.common.QuarkusTestResource;
 import io.quarkus.test.junit.QuarkusTest;
 import org.apache.camel.quarkus.component.debezium.common.it.AbstractDebeziumTest;
 import org.apache.camel.quarkus.component.debezium.common.it.Type;
+import org.eclipse.microprofile.config.ConfigProvider;
 import org.jboss.logging.Logger;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
@@ -44,7 +45,7 @@ class DebeziumPostgresTest extends AbstractDebeziumTest {
 
     @BeforeAll
     public static void setUp() throws SQLException {
-        final String jdbcUrl = System.getProperty(Type.postgres.getPropertyJdbc());
+        final String jdbcUrl = ConfigProvider.getConfig().getValue(Type.postgres.getPropertyJdbc(), String.class);
 
         connection = DriverManager.getConnection(jdbcUrl);
     }
diff --git a/integration-tests/debezium/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/sqlserver/DebeziumSqlserverTest.java b/integration-tests/debezium/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/sqlserver/DebeziumSqlserverTest.java
index d0c0587..b18a42e 100644
--- a/integration-tests/debezium/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/sqlserver/DebeziumSqlserverTest.java
+++ b/integration-tests/debezium/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/sqlserver/DebeziumSqlserverTest.java
@@ -19,6 +19,7 @@ package org.apache.camel.quarkus.component.debezium.common.it.sqlserver;
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.SQLException;
+import java.util.Optional;
 
 import io.quarkus.test.common.QuarkusTestResource;
 import io.quarkus.test.junit.QuarkusTest;
@@ -26,6 +27,7 @@ import io.restassured.response.Response;
 import org.apache.camel.quarkus.component.debezium.common.it.AbstractDebeziumTest;
 import org.apache.camel.quarkus.component.debezium.common.it.Record;
 import org.apache.camel.quarkus.component.debezium.common.it.Type;
+import org.eclipse.microprofile.config.ConfigProvider;
 import org.jboss.logging.Logger;
 import org.junit.Assert;
 import org.junit.Before;
@@ -54,10 +56,11 @@ class DebeziumSqlserverTest extends AbstractDebeziumTest {
 
     @BeforeAll
     public static void setUp() throws SQLException {
-        final String jdbcUrl = System.getProperty(Type.sqlserver.getPropertyJdbc());
+        final Optional<String> jdbcUrl = ConfigProvider.getConfig().getOptionalValue(Type.sqlserver.getPropertyJdbc(),
+                String.class);
 
-        if (jdbcUrl != null) {
-            connection = DriverManager.getConnection(jdbcUrl);
+        if (jdbcUrl.isPresent()) {
+            connection = DriverManager.getConnection(jdbcUrl.get());
         } else {
             LOG.warn("Container is not running. Connection is not created.");
         }
diff --git a/integration-tests/debezium/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/sqlserver/DebeziumSqlserverTestResource.java b/integration-tests/debezium/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/sqlserver/DebeziumSqlserverTestResource.java
index e32258d..0b9aa2c 100644
--- a/integration-tests/debezium/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/sqlserver/DebeziumSqlserverTestResource.java
+++ b/integration-tests/debezium/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/sqlserver/DebeziumSqlserverTestResource.java
@@ -25,7 +25,6 @@ import java.util.Collections;
 import java.util.Map;
 
 import org.apache.camel.quarkus.component.debezium.common.it.AbstractDebeziumTestResource;
-import org.apache.camel.quarkus.component.debezium.common.it.DebeziumSqlserverResource;
 import org.apache.camel.quarkus.component.debezium.common.it.Type;
 import org.jboss.logging.Logger;
 import org.testcontainers.containers.MSSQLServerContainer;
@@ -73,7 +72,7 @@ public class DebeziumSqlserverTestResource extends AbstractDebeziumTestResource<
         try {
             historyFile = Files.createTempFile(getClass().getSimpleName() + "-history-file-", "");
 
-            properties.put(DebeziumSqlserverResource.PROPERTY_DB_HISTORY_FILE, historyFile.toString());
+            properties.put("sql.server.db.history.file", historyFile.toString());
         } catch (IOException e) {
             throw new RuntimeException(e);
         }