You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ja...@apache.org on 2022/08/23 11:29:00 UTC
[camel-quarkus] branch main updated (6b54e61cb4 -> ee99951d1c)
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
from 6b54e61cb4 perf-regression: disable itests when -Dquickly is passed
new 16a5dcb685 Pass encrypt property to Debezium MS SQL Server JDBC URL
new ee99951d1c Minor tidying of Debezium tests
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../common/it/AbstractDebeziumResource.java | 6 ++---
.../common/it/DebeziumMongodbResource.java | 2 +-
.../debezium/common/it/DebeziumMysqlResource.java | 4 +--
.../common/it/DebeziumPostgresResource.java | 4 +--
.../common/it/DebeziumSqlserverResource.java | 11 +++++---
.../common/it/AbstractDebeziumTestResource.java | 5 ++--
.../common/it/mongodb/DebeziumMongodbTest.java | 5 +---
.../it/mongodb/DebeziumMongodbTestResource.java | 29 ++++++++++------------
.../common/it/mysql/DebeziumMysqlTest.java | 3 ---
.../common/it/mysql/DebeziumMysqlTestResource.java | 2 +-
.../it/postgres/DebeziumPostgresTestResource.java | 8 +++---
.../sqlserver/DebeziumSqlserverTestResource.java | 19 +++++++-------
12 files changed, 47 insertions(+), 51 deletions(-)
[camel-quarkus] 02/02: Minor tidying of Debezium tests
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit ee99951d1cdf482893c0f77f68e5187900a58488
Author: James Netherton <ja...@gmail.com>
AuthorDate: Tue Aug 23 08:09:51 2022 +0100
Minor tidying of Debezium tests
---
.../common/it/AbstractDebeziumResource.java | 6 ++---
.../common/it/DebeziumMongodbResource.java | 2 +-
.../debezium/common/it/DebeziumMysqlResource.java | 4 +--
.../common/it/DebeziumPostgresResource.java | 4 +--
.../common/it/DebeziumSqlserverResource.java | 4 +--
.../common/it/AbstractDebeziumTestResource.java | 5 ++--
.../common/it/mongodb/DebeziumMongodbTest.java | 5 +---
.../it/mongodb/DebeziumMongodbTestResource.java | 29 ++++++++++------------
.../common/it/mysql/DebeziumMysqlTest.java | 3 ---
.../common/it/mysql/DebeziumMysqlTestResource.java | 2 +-
.../it/postgres/DebeziumPostgresTestResource.java | 8 +++---
.../sqlserver/DebeziumSqlserverTestResource.java | 19 +++++++-------
12 files changed, 41 insertions(+), 50 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 0e74a9b4b2..ffc52f3f35 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
@@ -61,13 +61,13 @@ public abstract class AbstractDebeziumResource {
@GET
@Produces(MediaType.APPLICATION_JSON)
public Map<String, String> getAdditionalProperties() {
- DebeziumEndpoint endpoint = (DebeziumEndpoint) camelContext.getEndpoint(getEndpointUrl()
+ DebeziumEndpoint<?> endpoint = (DebeziumEndpoint<?>) camelContext.getEndpoint(getEndpointUrl()
+ "&additionalProperties.database.connectionTimeZone=CET");
return endpoint.getConfiguration().getAdditionalProperties().entrySet().stream()
.collect(Collectors.toMap(Map.Entry::getKey, e -> (String) e.getValue()));
}
- String getEndpoinUrl(String hostname, String port, String username, String password, String databaseServerName,
+ String getEndpointUrl(String hostname, String port, String username, String password, String databaseServerName,
String offsetStorageFileName) {
return type.getComponent() + ":localhost?"
+ "databaseHostname=" + hostname
@@ -117,7 +117,7 @@ public abstract class AbstractDebeziumResource {
}
protected String getEndpointUrl() {
- String endpoint = getEndpoinUrl(
+ String endpoint = getEndpointUrl(
config.getValue(type.getPropertyHostname(), String.class),
config.getValue(type.getPropertyPort(), String.class),
config.getValue(type.getPropertyUsername(), String.class),
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 4549c30f3b..ecff5263ab 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
@@ -63,7 +63,7 @@ public class DebeziumMongodbResource extends AbstractDebeziumResource {
}
@Override
- String getEndpoinUrl(String hostname, String port, String username, String password, String databaseServerName,
+ String getEndpointUrl(String hostname, String port, String username, String password, String databaseServerName,
String offsetStorageFileName) {
return Type.mongodb.getComponent() + ":localhost?"
+ "offsetStorageFileName=" + offsetStorageFileName
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 4b60864f8f..ee702347b9 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
@@ -58,10 +58,10 @@ public class DebeziumMysqlResource extends AbstractDebeziumResource {
}
@Override
- String getEndpoinUrl(String hostname, String port, String username, String password, String databaseServerName,
+ String getEndpointUrl(String hostname, String port, String username, String password, String databaseServerName,
String offsetStorageFileName) {
//use root user to get all required privileges
- return super.getEndpoinUrl(hostname, port, DB_ROOT_USERNAME, password, databaseServerName, offsetStorageFileName)
+ return super.getEndpointUrl(hostname, port, DB_ROOT_USERNAME, password, databaseServerName, offsetStorageFileName)
//and add specific parameters
+ "&databaseServerId=223344"
+ "&databaseHistoryFileFilename=" + config.getValue(PROPERTY_DB_HISTORY_FILE, String.class);
diff --git a/integration-tests/debezium/src/main/java/org/apache/camel/quarkus/component/debezium/common/it/DebeziumPostgresResource.java b/integration-tests/debezium/src/main/java/org/apache/camel/quarkus/component/debezium/common/it/DebeziumPostgresResource.java
index f294e6f216..b7d8404d69 100644
--- a/integration-tests/debezium/src/main/java/org/apache/camel/quarkus/component/debezium/common/it/DebeziumPostgresResource.java
+++ b/integration-tests/debezium/src/main/java/org/apache/camel/quarkus/component/debezium/common/it/DebeziumPostgresResource.java
@@ -47,9 +47,9 @@ public class DebeziumPostgresResource extends AbstractDebeziumResource {
}
@Override
- String getEndpoinUrl(String hostname, String port, String username, String password, String databaseServerName,
+ String getEndpointUrl(String hostname, String port, String username, String password, String databaseServerName,
String offsetStorageFileName) {
- return super.getEndpoinUrl(hostname, port, username, password, databaseServerName, offsetStorageFileName)
+ return super.getEndpointUrl(hostname, port, username, password, databaseServerName, offsetStorageFileName)
+ "&databaseDbname=" + DB_NAME;
}
}
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 e96d93bfd9..896258eee5 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
@@ -65,9 +65,9 @@ public class DebeziumSqlserverResource extends AbstractDebeziumResource {
}
@Override
- String getEndpoinUrl(String hostname, String port, String username, String password, String databaseServerName,
+ String getEndpointUrl(String hostname, String port, String username, String password, String databaseServerName,
String offsetStorageFileName) {
- return super.getEndpoinUrl(hostname, port, username, password, databaseServerName, offsetStorageFileName)
+ return super.getEndpointUrl(hostname, port, username, password, databaseServerName, offsetStorageFileName)
+ "&databaseDbname=" + DB_NAME
+ "&databaseHistoryFileFilename=" + config.getValue(PROPERTY_DB_HISTORY_FILE, String.class)
+ "&additionalProperties.database.encrypt=" + encryptConnection;
diff --git a/integration-tests/debezium/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/AbstractDebeziumTestResource.java b/integration-tests/debezium/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/AbstractDebeziumTestResource.java
index 72ddce3df3..f9d1e78a61 100644
--- a/integration-tests/debezium/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/AbstractDebeziumTestResource.java
+++ b/integration-tests/debezium/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/AbstractDebeziumTestResource.java
@@ -32,7 +32,8 @@ import org.testcontainers.utility.TestcontainersConfiguration;
* Abstract parent for debezium test resources.
* Parent starts using abstract method.
*/
-public abstract class AbstractDebeziumTestResource<T extends GenericContainer> implements QuarkusTestResourceLifecycleManager {
+public abstract class AbstractDebeziumTestResource<T extends GenericContainer<?>>
+ implements QuarkusTestResourceLifecycleManager {
private static final Logger LOGGER = LoggerFactory.getLogger(AbstractDebeziumTestResource.class);
protected T container;
@@ -64,7 +65,7 @@ public abstract class AbstractDebeziumTestResource<T extends GenericContainer> i
startContainer();
Map<String, String> map = CollectionHelper.mapOf(
- type.getPropertyHostname(), container.getContainerIpAddress(),
+ type.getPropertyHostname(), container.getHost(),
type.getPropertyPort(), container.getMappedPort(getPort()) + "",
type.getPropertyOffsetFileName(), storeFile.toString(),
type.getPropertyJdbc(), getJdbcUrl());
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 cbf939047c..04a8474208 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
@@ -32,7 +32,6 @@ import org.apache.camel.quarkus.component.debezium.common.it.Type;
import org.bson.Document;
import org.eclipse.microprofile.config.Config;
import org.eclipse.microprofile.config.ConfigProvider;
-import org.jboss.logging.Logger;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
@@ -52,11 +51,9 @@ import static org.junit.jupiter.api.Assumptions.assumeTrue;
@QuarkusTestResource(DebeziumMongodbTestResource.class)
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
class DebeziumMongodbTest extends AbstractDebeziumTest {
- private static final Logger LOG = Logger.getLogger(DebeziumMongodbTest.class);
-
private static MongoClient mongoClient;
- private static MongoCollection companies;
+ private static MongoCollection<Document> companies;
public DebeziumMongodbTest() {
super(Type.mongodb);
diff --git a/integration-tests/debezium/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/mongodb/DebeziumMongodbTestResource.java b/integration-tests/debezium/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/mongodb/DebeziumMongodbTestResource.java
index 086141aa22..b48d897b90 100644
--- a/integration-tests/debezium/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/mongodb/DebeziumMongodbTestResource.java
+++ b/integration-tests/debezium/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/mongodb/DebeziumMongodbTestResource.java
@@ -22,28 +22,25 @@ import java.nio.charset.StandardCharsets;
import org.apache.camel.quarkus.component.debezium.common.it.AbstractDebeziumTestResource;
import org.apache.camel.quarkus.component.debezium.common.it.Type;
import org.apache.commons.io.IOUtils;
-import org.jboss.logging.Logger;
import org.testcontainers.containers.Container;
import org.testcontainers.containers.GenericContainer;
import org.testcontainers.containers.Network;
import org.testcontainers.containers.wait.strategy.Wait;
-public class DebeziumMongodbTestResource extends AbstractDebeziumTestResource<GenericContainer> {
- private static final Logger LOG = Logger.getLogger(DebeziumMongodbTestResource.class);
-
+public class DebeziumMongodbTestResource extends AbstractDebeziumTestResource<GenericContainer<?>> {
private static final String PRIVATE_HOST = "mongodb_private";
private static final String DB_USERNAME = "debezium";
private static final String DB_PASSWORD = "dbz";
- private static int DB_PORT = 27017;
+ private static final int DB_PORT = 27017;
public DebeziumMongodbTestResource() {
super(Type.mongodb);
}
- private Network net = Network.newNetwork();;
+ private final Network net = Network.newNetwork();;
@Override
- protected GenericContainer createContainer() {
+ protected GenericContainer<?> createContainer() {
return new GenericContainer("mongo")
.withExposedPorts(DB_PORT)
.withCommand("--replSet", "my-mongo-set")
@@ -61,21 +58,21 @@ public class DebeziumMongodbTestResource extends AbstractDebeziumTestResource<Ge
execScriptInContainer("initMongodb.txt");
}
- private void execScriptInContainer(String script) throws Exception {
- String cmd = IOUtils.toString(getClass().getResource("/" + script), StandardCharsets.UTF_8);
- String[] cmds = cmd.split("\\n\\n");
-
- for (int i = 0; i < cmds.length; i++) {
- Container.ExecResult er = container.execInContainer(new String[] { "mongo", "--eval", cmds[i] });
+ private void execScriptInContainer(String scriptFileName) throws Exception {
+ String script = IOUtils.toString(getClass().getResource("/" + scriptFileName), StandardCharsets.UTF_8);
+ String[] cmds = script.split("\\n\\n");
+ for (String cmd : cmds) {
+ Container.ExecResult er = container.execInContainer("mongo", "--eval", cmd);
+ if (er.getExitCode() != 0) {
+ throw new RuntimeException("Error executing MongoDB command: " + cmd);
+ }
}
}
@Override
protected String getJdbcUrl() {
- final String jdbcUrl = String.format("mongodb://%s:%s@%s:%d", DB_USERNAME, DB_PASSWORD, container.getHost(),
+ return String.format("mongodb://%s:%s@%s:%d", DB_USERNAME, DB_PASSWORD, container.getHost(),
container.getMappedPort(DB_PORT));
-
- return jdbcUrl;
}
@Override
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 8530879baa..8ddca8e204 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
@@ -27,7 +27,6 @@ import org.apache.camel.quarkus.component.debezium.common.it.AbstractDebeziumTes
import org.apache.camel.quarkus.component.debezium.common.it.Type;
import org.eclipse.microprofile.config.Config;
import org.eclipse.microprofile.config.ConfigProvider;
-import org.jboss.logging.Logger;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.Assumptions;
import org.junit.jupiter.api.BeforeAll;
@@ -40,8 +39,6 @@ import org.junit.jupiter.api.TestMethodOrder;
@QuarkusTestResource(DebeziumMysqlTestResource.class)
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
class DebeziumMysqlTest extends AbstractDebeziumTest {
- private static final Logger LOG = Logger.getLogger(DebeziumMysqlTest.class);
-
private static Connection connection;
public DebeziumMysqlTest() {
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 01bcd3049a..b2a7459e12 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
@@ -29,7 +29,7 @@ import org.apache.camel.quarkus.component.debezium.common.it.Type;
import org.jboss.logging.Logger;
import org.testcontainers.containers.MySQLContainer;
-public class DebeziumMysqlTestResource extends AbstractDebeziumTestResource<MySQLContainer> {
+public class DebeziumMysqlTestResource extends AbstractDebeziumTestResource<MySQLContainer<?>> {
private static final Logger LOG = Logger.getLogger(DebeziumMysqlTestResource.class);
public static final String DB_NAME = "test";
diff --git a/integration-tests/debezium/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/postgres/DebeziumPostgresTestResource.java b/integration-tests/debezium/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/postgres/DebeziumPostgresTestResource.java
index 28d23b4cb3..0415546830 100644
--- a/integration-tests/debezium/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/postgres/DebeziumPostgresTestResource.java
+++ b/integration-tests/debezium/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/postgres/DebeziumPostgresTestResource.java
@@ -23,7 +23,7 @@ import org.apache.camel.quarkus.component.debezium.common.it.Type;
import org.testcontainers.containers.PostgreSQLContainer;
import org.testcontainers.utility.DockerImageName;
-public class DebeziumPostgresTestResource extends AbstractDebeziumTestResource<PostgreSQLContainer> {
+public class DebeziumPostgresTestResource extends AbstractDebeziumTestResource<PostgreSQLContainer<?>> {
public static final String DB_USERNAME = "postgres";
public static final String DB_PASSWORD = "changeit";
@@ -35,7 +35,7 @@ public class DebeziumPostgresTestResource extends AbstractDebeziumTestResource<P
}
@Override
- protected PostgreSQLContainer createContainer() {
+ protected PostgreSQLContainer<?> createContainer() {
DockerImageName imageName = DockerImageName.parse(POSTGRES_IMAGE)
.asCompatibleSubstituteFor("postgres");
return new PostgreSQLContainer<>(imageName)
@@ -47,11 +47,9 @@ public class DebeziumPostgresTestResource extends AbstractDebeziumTestResource<P
@Override
protected String getJdbcUrl() {
- final String jdbcUrl = "jdbc:postgresql://" + container.getContainerIpAddress() + ":"
+ return "jdbc:postgresql://" + container.getHost() + ":"
+ container.getMappedPort(DB_PORT) + "/" + DebeziumPostgresResource.DB_NAME + "?user="
+ DB_USERNAME + "&password=" + DB_PASSWORD;
-
- return jdbcUrl;
}
@Override
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 e32258d116..44096bd641 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
@@ -30,12 +30,14 @@ import org.apache.camel.quarkus.component.debezium.common.it.Type;
import org.jboss.logging.Logger;
import org.testcontainers.containers.MSSQLServerContainer;
import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.utility.DockerImageName;
-public class DebeziumSqlserverTestResource extends AbstractDebeziumTestResource<MSSQLServerContainer> {
- private static final Logger LOG = Logger.getLogger(DebeziumSqlserverTestResource.class);
-
- private static int DB_PORT = 1433;
+import static org.testcontainers.containers.MSSQLServerContainer.IMAGE;
+public class DebeziumSqlserverTestResource extends AbstractDebeziumTestResource<MSSQLServerContainer<?>> {
+ private static final Logger LOG = Logger.getLogger(DebeziumSqlserverTestResource.class);
+ private static final DockerImageName DOCKER_IMAGE_NAME = DockerImageName.parse(IMAGE).withTag("2017-CU12");
+ private static final int DB_PORT = 1433;
private Path historyFile;
public DebeziumSqlserverTestResource() {
@@ -43,8 +45,9 @@ public class DebeziumSqlserverTestResource extends AbstractDebeziumTestResource<
}
@Override
- protected MSSQLServerContainer createContainer() {
- return new MSSQLServerContainer<>().withEnv(Collections.singletonMap("MSSQL_AGENT_ENABLED", "True"))
+ protected MSSQLServerContainer<?> createContainer() {
+ return new MSSQLServerContainer<>(DOCKER_IMAGE_NAME)
+ .withEnv(Collections.singletonMap("MSSQL_AGENT_ENABLED", "True"))
.withInitScript("initSqlserver.sql")
.waitingFor(
Wait.forLogMessage(".*xp_sqlagent_notify.*", 1));
@@ -96,10 +99,8 @@ public class DebeziumSqlserverTestResource extends AbstractDebeziumTestResource<
@Override
protected String getJdbcUrl() {
- final String jdbcUrl = container.getJdbcUrl() + ";databaseName=testDB;user=" + getUsername() + ";password="
+ return container.getJdbcUrl() + ";databaseName=testDB;user=" + getUsername() + ";password="
+ getPassword();
-
- return jdbcUrl;
}
@Override
[camel-quarkus] 01/02: Pass encrypt property to Debezium MS SQL Server JDBC URL
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 16a5dcb685406e7fbd777416b7a4ea4728809cea
Author: James Netherton <ja...@gmail.com>
AuthorDate: Tue Aug 23 07:57:29 2022 +0100
Pass encrypt property to Debezium MS SQL Server JDBC URL
Fixes #4027
---
.../component/debezium/common/it/DebeziumSqlserverResource.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
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 1809e24094..e96d93bfd9 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
@@ -24,6 +24,7 @@ import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
import org.eclipse.microprofile.config.Config;
+import org.eclipse.microprofile.config.inject.ConfigProperty;
@Path("/debezium-sqlserver")
@ApplicationScoped
@@ -34,6 +35,9 @@ public class DebeziumSqlserverResource extends AbstractDebeziumResource {
public static final String DB_NAME = "testDB";
+ @ConfigProperty(name = "sqlserver.encrypt", defaultValue = "false")
+ Boolean encryptConnection;
+
@Inject
Config config;
@@ -65,6 +69,7 @@ public class DebeziumSqlserverResource extends AbstractDebeziumResource {
String offsetStorageFileName) {
return super.getEndpoinUrl(hostname, port, username, password, databaseServerName, offsetStorageFileName)
+ "&databaseDbname=" + DB_NAME
- + "&databaseHistoryFileFilename=" + config.getValue(PROPERTY_DB_HISTORY_FILE, String.class);
+ + "&databaseHistoryFileFilename=" + config.getValue(PROPERTY_DB_HISTORY_FILE, String.class)
+ + "&additionalProperties.database.encrypt=" + encryptConnection;
}
}