alexey.rassokhin/tet123
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

DBZ-2868 Removing superfluous property definitions

Browse Source
This commit is contained in:
Gunnar Morling 2021-01-12 14:42:04 +01:00
parent 0be379ab79
commit dfd7b02554
6 changed files with 14 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
debezium-server/debezium-server-core/src/test/java/io/debezium/server/TestConfigSource.java
View File

@ -12,9 +12,11 @@
import org.apache.kafka.connect.runtime.standalone.StandaloneConfig;
import org.eclipse.microprofile.config.spi.ConfigSource;
import io.debezium.testing.testcontainers.PostgresTestResourceLifecycleManager;
import io.debezium.util.Testing;
/**
* A config source used during tests. Amended/overridden by values exposed from test lifecycle listeners.
*/
public class TestConfigSource implements ConfigSource {
public static final String OFFSETS_FILE = "file-connector-offsets.txt";
@ -32,11 +34,6 @@ public TestConfigSource() {
integrationTest.put("debezium.source.connector.class", "io.debezium.connector.postgresql.PostgresConnector");
integrationTest.put("debezium.source." + StandaloneConfig.OFFSET_STORAGE_FILE_FILENAME_CONFIG, OFFSET_STORE_PATH.toAbsolutePath().toString());
integrationTest.put("debezium.source.offset.flush.interval.ms", "0");
integrationTest.put("debezium.source.database.hostname", PostgresTestResourceLifecycleManager.POSTGRES_HOST);
integrationTest.put("debezium.source.database.port", Integer.toString(PostgresTestResourceLifecycleManager.POSTGRES_PORT));
integrationTest.put("debezium.source.database.user", PostgresTestResourceLifecycleManager.POSTGRES_USER);
integrationTest.put("debezium.source.database.password", PostgresTestResourceLifecycleManager.POSTGRES_PASSWORD);
integrationTest.put("debezium.source.database.dbname", PostgresTestResourceLifecycleManager.POSTGRES_DBNAME);
integrationTest.put("debezium.source.database.server.name", "testc");
integrationTest.put("debezium.source.schema.include.list", "inventory");
integrationTest.put("debezium.source.table.include.list", "inventory.customers");

10
debezium-server/debezium-server-eventhubs/src/test/java/io/debezium/server/eventhubs/EventHubsTestConfigSource.java
View File

@ -11,7 +11,6 @@
import org.apache.kafka.connect.runtime.standalone.StandaloneConfig;
import io.debezium.server.TestConfigSource;
import io.debezium.testing.testcontainers.PostgresTestResourceLifecycleManager;
public class EventHubsTestConfigSource extends TestConfigSource {
@ -19,9 +18,9 @@ public class EventHubsTestConfigSource extends TestConfigSource {
static final String EVENTHUBS_NAME_SYSTEM_PROPERTY_NAME = "eventhubs.hub.name";
static final String CONNECTION_STRING_FORMAT = "%s;EntityPath=%s";
final Map<String, String> eventHubsTest = new HashMap<>();
public EventHubsTestConfigSource() {
Map<String, String> eventHubsTest = new HashMap<>();
// event hubs sink config
eventHubsTest.put("debezium.sink.type", "eventhubs");
eventHubsTest.put("debezium.sink.eventhubs.connectionstring", getEventHubsConnectionString());
@ -34,11 +33,6 @@ public EventHubsTestConfigSource() {
eventHubsTest.put("debezium.source." + StandaloneConfig.OFFSET_STORAGE_FILE_FILENAME_CONFIG,
OFFSET_STORE_PATH.toAbsolutePath().toString());
eventHubsTest.put("debezium.source.offset.flush.interval.ms", "0");
eventHubsTest.put("debezium.source.database.hostname", PostgresTestResourceLifecycleManager.POSTGRES_HOST);
eventHubsTest.put("debezium.source.database.port", Integer.toString(PostgresTestResourceLifecycleManager.POSTGRES_PORT));
eventHubsTest.put("debezium.source.database.user", PostgresTestResourceLifecycleManager.POSTGRES_USER);
eventHubsTest.put("debezium.source.database.password", PostgresTestResourceLifecycleManager.POSTGRES_PASSWORD);
eventHubsTest.put("debezium.source.database.dbname", PostgresTestResourceLifecycleManager.POSTGRES_DBNAME);
eventHubsTest.put("debezium.source.database.server.name", "testc");
eventHubsTest.put("debezium.source.schema.include.list", "inventory");
eventHubsTest.put("debezium.source.table.include.list", "inventory.customers");

10
debezium-server/debezium-server-kinesis/src/test/java/io/debezium/server/kinesis/KinesisTestConfigSource.java
View File

@ -11,25 +11,19 @@
import org.apache.kafka.connect.runtime.standalone.StandaloneConfig;
import io.debezium.server.TestConfigSource;
import io.debezium.testing.testcontainers.PostgresTestResourceLifecycleManager;
public class KinesisTestConfigSource extends TestConfigSource {
public static final String KINESIS_REGION = "eu-central-1";
final Map<String, String> kinesisTest = new HashMap<>();
public KinesisTestConfigSource() {
Map<String, String> kinesisTest = new HashMap<>();
kinesisTest.put("debezium.sink.type", "kinesis");
kinesisTest.put("debezium.sink.kinesis.region", KINESIS_REGION);
kinesisTest.put("debezium.source.connector.class", "io.debezium.connector.postgresql.PostgresConnector");
kinesisTest.put("debezium.source." + StandaloneConfig.OFFSET_STORAGE_FILE_FILENAME_CONFIG, OFFSET_STORE_PATH.toAbsolutePath().toString());
kinesisTest.put("debezium.source.offset.flush.interval.ms", "0");
kinesisTest.put("debezium.source.database.hostname", PostgresTestResourceLifecycleManager.POSTGRES_HOST);
kinesisTest.put("debezium.source.database.port", Integer.toString(PostgresTestResourceLifecycleManager.POSTGRES_PORT));
kinesisTest.put("debezium.source.database.user", PostgresTestResourceLifecycleManager.POSTGRES_USER);
kinesisTest.put("debezium.source.database.password", PostgresTestResourceLifecycleManager.POSTGRES_PASSWORD);
kinesisTest.put("debezium.source.database.dbname", PostgresTestResourceLifecycleManager.POSTGRES_DBNAME);
kinesisTest.put("debezium.source.database.server.name", "testc");
kinesisTest.put("debezium.source.schema.include.list", "inventory");
kinesisTest.put("debezium.source.table.include.list", "inventory.customers");

10
debezium-server/debezium-server-pubsub/src/test/java/io/debezium/server/pubsub/PubSubTestConfigSource.java
View File

@ -11,23 +11,17 @@
import org.apache.kafka.connect.runtime.standalone.StandaloneConfig;
import io.debezium.server.TestConfigSource;
import io.debezium.testing.testcontainers.PostgresTestResourceLifecycleManager;
public class PubSubTestConfigSource extends TestConfigSource {
final Map<String, String> pubsubTest = new HashMap<>();
public PubSubTestConfigSource() {
Map<String, String> pubsubTest = new HashMap<>();
pubsubTest.put("debezium.sink.type", "pubsub");
pubsubTest.put("debezium.source.connector.class", "io.debezium.connector.postgresql.PostgresConnector");
pubsubTest.put("debezium.source." + StandaloneConfig.OFFSET_STORAGE_FILE_FILENAME_CONFIG,
OFFSET_STORE_PATH.toAbsolutePath().toString());
pubsubTest.put("debezium.source.offset.flush.interval.ms", "0");
pubsubTest.put("debezium.source.database.hostname", PostgresTestResourceLifecycleManager.POSTGRES_HOST);
pubsubTest.put("debezium.source.database.port", Integer.toString(PostgresTestResourceLifecycleManager.POSTGRES_PORT));
pubsubTest.put("debezium.source.database.user", PostgresTestResourceLifecycleManager.POSTGRES_USER);
pubsubTest.put("debezium.source.database.password", PostgresTestResourceLifecycleManager.POSTGRES_PASSWORD);
pubsubTest.put("debezium.source.database.dbname", PostgresTestResourceLifecycleManager.POSTGRES_DBNAME);
pubsubTest.put("debezium.source.database.server.name", "testc");
pubsubTest.put("debezium.source.schema.include.list", "inventory");
pubsubTest.put("debezium.source.table.include.list", "inventory.customers");

10
debezium-server/debezium-server-pulsar/src/test/java/io/debezium/server/pulsar/PulsarTestConfigSource.java
View File

@ -11,24 +11,18 @@
import org.apache.kafka.connect.runtime.standalone.StandaloneConfig;
import io.debezium.server.TestConfigSource;
import io.debezium.testing.testcontainers.PostgresTestResourceLifecycleManager;
public class PulsarTestConfigSource extends TestConfigSource {
final Map<String, String> pulsarTest = new HashMap<>();
public PulsarTestConfigSource() {
Map<String, String> pulsarTest = new HashMap<>();
pulsarTest.put("debezium.sink.type", "pulsar");
pulsarTest.put("debezium.sink.pulsar.client.serviceUrl", getServiceUrl());
pulsarTest.put("debezium.source.connector.class", "io.debezium.connector.postgresql.PostgresConnector");
pulsarTest.put("debezium.source." + StandaloneConfig.OFFSET_STORAGE_FILE_FILENAME_CONFIG,
OFFSET_STORE_PATH.toAbsolutePath().toString());
pulsarTest.put("debezium.source.offset.flush.interval.ms", "0");
pulsarTest.put("debezium.source.database.hostname", PostgresTestResourceLifecycleManager.POSTGRES_HOST);
pulsarTest.put("debezium.source.database.port", Integer.toString(PostgresTestResourceLifecycleManager.POSTGRES_PORT));
pulsarTest.put("debezium.source.database.user", PostgresTestResourceLifecycleManager.POSTGRES_USER);
pulsarTest.put("debezium.source.database.password", PostgresTestResourceLifecycleManager.POSTGRES_PASSWORD);
pulsarTest.put("debezium.source.database.dbname", PostgresTestResourceLifecycleManager.POSTGRES_DBNAME);
pulsarTest.put("debezium.source.database.server.name", "testc");
pulsarTest.put("debezium.source.schema.include.list", "inventory");
pulsarTest.put("debezium.source.table.include.list", "inventory.customers");

4
debezium-testing/debezium-testing-testcontainers/src/main/java/io/debezium/testing/testcontainers/PostgresTestResourceLifecycleManager.java
View File

@ -25,6 +25,7 @@ public class PostgresTestResourceLifecycleManager implements QuarkusTestResource
public static final String POSTGRES_IMAGE = "debezium/example-postgres";
public static final String POSTGRES_HOST = "localhost";
public static final Integer POSTGRES_PORT = 5432;
private final GenericContainer<?> container = new GenericContainer<>(POSTGRES_IMAGE)
.waitingFor(Wait.forLogMessage(".*database system is ready to accept connections.*", 2))
.withEnv("POSTGRES_USER", POSTGRES_USER)
@ -34,6 +35,7 @@ public class PostgresTestResourceLifecycleManager implements QuarkusTestResource
.withEnv("LANG", "en_US.utf8")
.withStartupTimeout(Duration.ofSeconds(30));
@Override
public Map<String, String> start() {
container.start();
@ -57,4 +59,4 @@ public void stop() {
// ignored
}
}
}
}