From 5f17e289bc057a3652f65f3cb0d45ff8fde727e0 Mon Sep 17 00:00:00 2001 From: mfvitale Date: Tue, 9 Jul 2024 09:08:11 +0200 Subject: [PATCH] DBZ-7920 Rename ZonedTimestampType to DebeziumZonedTimestampType --- .../connector/jdbc/dialect/GeneralDatabaseDialect.java | 4 ++-- .../connector/jdbc/dialect/db2/ZonedTimestampType.java | 3 ++- .../connector/jdbc/dialect/mysql/ZonedTimestampType.java | 3 ++- .../connector/jdbc/dialect/oracle/ZonedTimestampType.java | 3 ++- .../jdbc/dialect/postgres/PostgresDatabaseDialect.java | 4 ++-- .../connector/jdbc/dialect/postgres/ZonedTimestampType.java | 3 ++- ...onedTimestampType.java => DebeziumZonedTimestampType.java} | 4 ++-- .../connector/jdbc/e2e/AbstractJdbcSinkPipelineIT.java | 3 +-- 8 files changed, 15 insertions(+), 12 deletions(-) rename debezium-connector-jdbc/src/main/java/io/debezium/connector/jdbc/type/debezium/{ZonedTimestampType.java => DebeziumZonedTimestampType.java} (94%) diff --git a/debezium-connector-jdbc/src/main/java/io/debezium/connector/jdbc/dialect/GeneralDatabaseDialect.java b/debezium-connector-jdbc/src/main/java/io/debezium/connector/jdbc/dialect/GeneralDatabaseDialect.java index 91059b5ff..afc4315e4 100644 --- a/debezium-connector-jdbc/src/main/java/io/debezium/connector/jdbc/dialect/GeneralDatabaseDialect.java +++ b/debezium-connector-jdbc/src/main/java/io/debezium/connector/jdbc/dialect/GeneralDatabaseDialect.java @@ -69,6 +69,7 @@ import io.debezium.connector.jdbc.type.connect.ConnectTimeType; import io.debezium.connector.jdbc.type.connect.ConnectTimestampType; import io.debezium.connector.jdbc.type.debezium.DateType; +import io.debezium.connector.jdbc.type.debezium.DebeziumZonedTimestampType; import io.debezium.connector.jdbc.type.debezium.MicroTimeType; import io.debezium.connector.jdbc.type.debezium.MicroTimestampType; import io.debezium.connector.jdbc.type.debezium.NanoTimeType; @@ -77,7 +78,6 @@ import io.debezium.connector.jdbc.type.debezium.TimestampType; import io.debezium.connector.jdbc.type.debezium.VariableScaleDecimalType; import io.debezium.connector.jdbc.type.debezium.ZonedTimeType; -import io.debezium.connector.jdbc.type.debezium.ZonedTimestampType; import io.debezium.util.Strings; /** @@ -636,7 +636,7 @@ protected void registerTypes() { registerType(NanoTimeType.INSTANCE); registerType(NanoTimestampType.INSTANCE); registerType(ZonedTimeType.INSTANCE); - registerType(ZonedTimestampType.INSTANCE); + registerType(DebeziumZonedTimestampType.INSTANCE); registerType(VariableScaleDecimalType.INSTANCE); // Supported connect data types diff --git a/debezium-connector-jdbc/src/main/java/io/debezium/connector/jdbc/dialect/db2/ZonedTimestampType.java b/debezium-connector-jdbc/src/main/java/io/debezium/connector/jdbc/dialect/db2/ZonedTimestampType.java index d0fd2024c..f4e311710 100644 --- a/debezium-connector-jdbc/src/main/java/io/debezium/connector/jdbc/dialect/db2/ZonedTimestampType.java +++ b/debezium-connector-jdbc/src/main/java/io/debezium/connector/jdbc/dialect/db2/ZonedTimestampType.java @@ -11,6 +11,7 @@ import io.debezium.connector.jdbc.ValueBindDescriptor; import io.debezium.connector.jdbc.type.Type; +import io.debezium.connector.jdbc.type.debezium.DebeziumZonedTimestampType; import io.debezium.time.ZonedTimestamp; /** @@ -18,7 +19,7 @@ * * @author Chris Cranford */ -public class ZonedTimestampType extends io.debezium.connector.jdbc.type.debezium.ZonedTimestampType { +public class ZonedTimestampType extends DebeziumZonedTimestampType { public static final ZonedTimestampType INSTANCE = new ZonedTimestampType(); diff --git a/debezium-connector-jdbc/src/main/java/io/debezium/connector/jdbc/dialect/mysql/ZonedTimestampType.java b/debezium-connector-jdbc/src/main/java/io/debezium/connector/jdbc/dialect/mysql/ZonedTimestampType.java index c154eeecc..3b3c0f96d 100644 --- a/debezium-connector-jdbc/src/main/java/io/debezium/connector/jdbc/dialect/mysql/ZonedTimestampType.java +++ b/debezium-connector-jdbc/src/main/java/io/debezium/connector/jdbc/dialect/mysql/ZonedTimestampType.java @@ -8,6 +8,7 @@ import java.sql.Types; import io.debezium.connector.jdbc.type.Type; +import io.debezium.connector.jdbc.type.debezium.DebeziumZonedTimestampType; import io.debezium.time.ZonedTimestamp; /** @@ -15,7 +16,7 @@ * * @author Chris Cranford */ -public class ZonedTimestampType extends io.debezium.connector.jdbc.type.debezium.ZonedTimestampType { +public class ZonedTimestampType extends DebeziumZonedTimestampType { public static final ZonedTimestampType INSTANCE = new ZonedTimestampType(); diff --git a/debezium-connector-jdbc/src/main/java/io/debezium/connector/jdbc/dialect/oracle/ZonedTimestampType.java b/debezium-connector-jdbc/src/main/java/io/debezium/connector/jdbc/dialect/oracle/ZonedTimestampType.java index 31206f675..ab04a95cd 100644 --- a/debezium-connector-jdbc/src/main/java/io/debezium/connector/jdbc/dialect/oracle/ZonedTimestampType.java +++ b/debezium-connector-jdbc/src/main/java/io/debezium/connector/jdbc/dialect/oracle/ZonedTimestampType.java @@ -10,6 +10,7 @@ import io.debezium.connector.jdbc.ValueBindDescriptor; import io.debezium.connector.jdbc.type.Type; +import io.debezium.connector.jdbc.type.debezium.DebeziumZonedTimestampType; import io.debezium.time.ZonedTimestamp; /** @@ -17,7 +18,7 @@ * * @author Chris Cranford */ -public class ZonedTimestampType extends io.debezium.connector.jdbc.type.debezium.ZonedTimestampType { +public class ZonedTimestampType extends DebeziumZonedTimestampType { public static final ZonedTimestampType INSTANCE = new ZonedTimestampType(); diff --git a/debezium-connector-jdbc/src/main/java/io/debezium/connector/jdbc/dialect/postgres/PostgresDatabaseDialect.java b/debezium-connector-jdbc/src/main/java/io/debezium/connector/jdbc/dialect/postgres/PostgresDatabaseDialect.java index 31e7bf763..5f0cd5d3c 100644 --- a/debezium-connector-jdbc/src/main/java/io/debezium/connector/jdbc/dialect/postgres/PostgresDatabaseDialect.java +++ b/debezium-connector-jdbc/src/main/java/io/debezium/connector/jdbc/dialect/postgres/PostgresDatabaseDialect.java @@ -5,8 +5,8 @@ */ package io.debezium.connector.jdbc.dialect.postgres; -import static io.debezium.connector.jdbc.type.debezium.ZonedTimestampType.NEGATIVE_INFINITY; -import static io.debezium.connector.jdbc.type.debezium.ZonedTimestampType.POSITIVE_INFINITY; +import static io.debezium.connector.jdbc.type.debezium.DebeziumZonedTimestampType.NEGATIVE_INFINITY; +import static io.debezium.connector.jdbc.type.debezium.DebeziumZonedTimestampType.POSITIVE_INFINITY; import java.sql.Connection; import java.sql.SQLException; diff --git a/debezium-connector-jdbc/src/main/java/io/debezium/connector/jdbc/dialect/postgres/ZonedTimestampType.java b/debezium-connector-jdbc/src/main/java/io/debezium/connector/jdbc/dialect/postgres/ZonedTimestampType.java index e084925e9..8a00ea418 100644 --- a/debezium-connector-jdbc/src/main/java/io/debezium/connector/jdbc/dialect/postgres/ZonedTimestampType.java +++ b/debezium-connector-jdbc/src/main/java/io/debezium/connector/jdbc/dialect/postgres/ZonedTimestampType.java @@ -13,6 +13,7 @@ import io.debezium.connector.jdbc.ValueBindDescriptor; import io.debezium.connector.jdbc.relational.ColumnDescriptor; import io.debezium.connector.jdbc.type.Type; +import io.debezium.connector.jdbc.type.debezium.DebeziumZonedTimestampType; import io.debezium.time.ZonedTimestamp; /** @@ -20,7 +21,7 @@ * * @author Mario Fiore Vitale */ -public class ZonedTimestampType extends io.debezium.connector.jdbc.type.debezium.ZonedTimestampType { +public class ZonedTimestampType extends DebeziumZonedTimestampType { public static final ZonedTimestampType INSTANCE = new ZonedTimestampType(); diff --git a/debezium-connector-jdbc/src/main/java/io/debezium/connector/jdbc/type/debezium/ZonedTimestampType.java b/debezium-connector-jdbc/src/main/java/io/debezium/connector/jdbc/type/debezium/DebeziumZonedTimestampType.java similarity index 94% rename from debezium-connector-jdbc/src/main/java/io/debezium/connector/jdbc/type/debezium/ZonedTimestampType.java rename to debezium-connector-jdbc/src/main/java/io/debezium/connector/jdbc/type/debezium/DebeziumZonedTimestampType.java index 7f6462e1a..8d48b245a 100644 --- a/debezium-connector-jdbc/src/main/java/io/debezium/connector/jdbc/type/debezium/ZonedTimestampType.java +++ b/debezium-connector-jdbc/src/main/java/io/debezium/connector/jdbc/type/debezium/DebeziumZonedTimestampType.java @@ -23,9 +23,9 @@ * * @author Chris Cranford */ -public class ZonedTimestampType extends AbstractTimestampType { +public class DebeziumZonedTimestampType extends AbstractTimestampType { - public static final ZonedTimestampType INSTANCE = new ZonedTimestampType(); + public static final DebeziumZonedTimestampType INSTANCE = new DebeziumZonedTimestampType(); public static final String POSITIVE_INFINITY = "infinity"; public static final String NEGATIVE_INFINITY = "-infinity"; diff --git a/debezium-connector-jdbc/src/test/java/io/debezium/connector/jdbc/e2e/AbstractJdbcSinkPipelineIT.java b/debezium-connector-jdbc/src/test/java/io/debezium/connector/jdbc/e2e/AbstractJdbcSinkPipelineIT.java index 3b5c2a6f9..8095b9345 100644 --- a/debezium-connector-jdbc/src/test/java/io/debezium/connector/jdbc/e2e/AbstractJdbcSinkPipelineIT.java +++ b/debezium-connector-jdbc/src/test/java/io/debezium/connector/jdbc/e2e/AbstractJdbcSinkPipelineIT.java @@ -36,7 +36,6 @@ import org.apache.commons.lang3.RandomStringUtils; import org.apache.kafka.connect.sink.SinkRecord; -import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.TestTemplate; import org.junit.jupiter.api.extension.ExtendWith; @@ -2590,7 +2589,7 @@ public void testTimestampWithTimeZoneDataTypeWithInfinityValue(Source source, Si (rs, index) -> rs.getTimestamp(index).toInstant().atZone(ZoneOffset.UTC)); } - private static @NotNull List getExpectedZonedDateTimes(Sink sink) { + private static List getExpectedZonedDateTimes(Sink sink) { List expectedValues = List.of(); if (sink.getType().is(SinkType.SQLSERVER) && sink.getType().is(SinkType.DB2)) {