From 3ed4d9480ce0122aecb5e373564f1bbcf84ff94d Mon Sep 17 00:00:00 2001 From: Marton Balassi Date: Mon, 9 Aug 2021 14:13:06 +0200 Subject: [PATCH] [oracle] Updated package naming to com.ververica in oracle connector This commit does not contain secrets This closes #2 --- flink-connector-oracle-cdc/pom.xml | 6 +++--- .../cdc/connectors/oracle/OracleSource.java | 10 +++++----- .../oracle/table/OracleTableSource.java | 10 +++++----- .../oracle/table/OracleTableSourceFactory.java | 8 ++++---- .../connectors/oracle/table/StartupMode.java | 2 +- .../oracle/table/StartupOptions.java | 2 +- .../org.apache.flink.table.factories.Factory | 2 +- .../connectors/oracle/OracleSourceTest.java | 18 +++++++++--------- .../oracle/table/OracleConnectorITCase.java | 2 +- .../table/OracleTableSourceFactoryTest.java | 6 +++--- .../oracle/utils/OracleTestUtils.java | 2 +- flink-sql-connector-oracle-cdc/pom.xml | 4 ++-- .../cdc/connectors/oracle/DummyDocs.java | 2 +- 13 files changed, 37 insertions(+), 37 deletions(-) rename flink-connector-oracle-cdc/src/main/java/com/{alibaba => }/ververica/cdc/connectors/oracle/OracleSource.java (95%) rename flink-connector-oracle-cdc/src/main/java/com/{alibaba => }/ververica/cdc/connectors/oracle/table/OracleTableSource.java (94%) rename flink-connector-oracle-cdc/src/main/java/com/{alibaba => }/ververica/cdc/connectors/oracle/table/OracleTableSourceFactory.java (95%) rename flink-connector-oracle-cdc/src/main/java/com/{alibaba => }/ververica/cdc/connectors/oracle/table/StartupMode.java (94%) rename flink-connector-oracle-cdc/src/main/java/com/{alibaba => }/ververica/cdc/connectors/oracle/table/StartupOptions.java (97%) rename flink-connector-oracle-cdc/src/test/java/com/{alibaba => }/ververica/cdc/connectors/oracle/OracleSourceTest.java (98%) rename flink-connector-oracle-cdc/src/test/java/com/{alibaba => }/ververica/cdc/connectors/oracle/table/OracleConnectorITCase.java (99%) rename flink-connector-oracle-cdc/src/test/java/com/{alibaba => }/ververica/cdc/connectors/oracle/table/OracleTableSourceFactoryTest.java (97%) rename flink-connector-oracle-cdc/src/test/java/com/{alibaba => }/ververica/cdc/connectors/oracle/utils/OracleTestUtils.java (95%) rename flink-sql-connector-oracle-cdc/src/main/java/com/{alibaba => }/ververica/cdc/connectors/oracle/DummyDocs.java (94%) diff --git a/flink-connector-oracle-cdc/pom.xml b/flink-connector-oracle-cdc/pom.xml index a2692d5a3..d3c220928 100644 --- a/flink-connector-oracle-cdc/pom.xml +++ b/flink-connector-oracle-cdc/pom.xml @@ -20,7 +20,7 @@ under the License. xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> flink-cdc-connectors - com.alibaba.ververica + com.ververica 2.0-SNAPSHOT 4.0.0 @@ -33,7 +33,7 @@ under the License. - com.alibaba.ververica + com.ververica flink-connector-debezium ${project.version} @@ -53,7 +53,7 @@ under the License. - com.alibaba.ververica + com.ververica flink-connector-test-util ${project.version} test diff --git a/flink-connector-oracle-cdc/src/main/java/com/alibaba/ververica/cdc/connectors/oracle/OracleSource.java b/flink-connector-oracle-cdc/src/main/java/com/ververica/cdc/connectors/oracle/OracleSource.java similarity index 95% rename from flink-connector-oracle-cdc/src/main/java/com/alibaba/ververica/cdc/connectors/oracle/OracleSource.java rename to flink-connector-oracle-cdc/src/main/java/com/ververica/cdc/connectors/oracle/OracleSource.java index f40222cc5..f2f3af2ee 100644 --- a/flink-connector-oracle-cdc/src/main/java/com/alibaba/ververica/cdc/connectors/oracle/OracleSource.java +++ b/flink-connector-oracle-cdc/src/main/java/com/ververica/cdc/connectors/oracle/OracleSource.java @@ -16,12 +16,12 @@ * limitations under the License. */ -package com.alibaba.ververica.cdc.connectors.oracle; +package com.ververica.cdc.connectors.oracle; -import com.alibaba.ververica.cdc.connectors.oracle.table.StartupOptions; -import com.alibaba.ververica.cdc.debezium.DebeziumDeserializationSchema; -import com.alibaba.ververica.cdc.debezium.DebeziumSourceFunction; -import com.alibaba.ververica.cdc.debezium.internal.DebeziumOffset; +import com.ververica.cdc.connectors.oracle.table.StartupOptions; +import com.ververica.cdc.debezium.DebeziumDeserializationSchema; +import com.ververica.cdc.debezium.DebeziumSourceFunction; +import com.ververica.cdc.debezium.internal.DebeziumOffset; import io.debezium.connector.oracle.OracleConnector; import java.util.Properties; diff --git a/flink-connector-oracle-cdc/src/main/java/com/alibaba/ververica/cdc/connectors/oracle/table/OracleTableSource.java b/flink-connector-oracle-cdc/src/main/java/com/ververica/cdc/connectors/oracle/table/OracleTableSource.java similarity index 94% rename from flink-connector-oracle-cdc/src/main/java/com/alibaba/ververica/cdc/connectors/oracle/table/OracleTableSource.java rename to flink-connector-oracle-cdc/src/main/java/com/ververica/cdc/connectors/oracle/table/OracleTableSource.java index 448eb9686..a3b2a6861 100644 --- a/flink-connector-oracle-cdc/src/main/java/com/alibaba/ververica/cdc/connectors/oracle/table/OracleTableSource.java +++ b/flink-connector-oracle-cdc/src/main/java/com/ververica/cdc/connectors/oracle/table/OracleTableSource.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.alibaba.ververica.cdc.connectors.oracle.table; +package com.ververica.cdc.connectors.oracle.table; import org.apache.flink.api.common.typeinfo.TypeInformation; import org.apache.flink.table.api.TableSchema; @@ -28,10 +28,10 @@ import org.apache.flink.table.data.RowData; import org.apache.flink.table.types.logical.RowType; import org.apache.flink.types.RowKind; -import com.alibaba.ververica.cdc.connectors.oracle.OracleSource; -import com.alibaba.ververica.cdc.debezium.DebeziumDeserializationSchema; -import com.alibaba.ververica.cdc.debezium.DebeziumSourceFunction; -import com.alibaba.ververica.cdc.debezium.table.RowDataDebeziumDeserializeSchema; +import com.ververica.cdc.connectors.oracle.OracleSource; +import com.ververica.cdc.debezium.DebeziumDeserializationSchema; +import com.ververica.cdc.debezium.DebeziumSourceFunction; +import com.ververica.cdc.debezium.table.RowDataDebeziumDeserializeSchema; import java.util.Objects; import java.util.Properties; diff --git a/flink-connector-oracle-cdc/src/main/java/com/alibaba/ververica/cdc/connectors/oracle/table/OracleTableSourceFactory.java b/flink-connector-oracle-cdc/src/main/java/com/ververica/cdc/connectors/oracle/table/OracleTableSourceFactory.java similarity index 95% rename from flink-connector-oracle-cdc/src/main/java/com/alibaba/ververica/cdc/connectors/oracle/table/OracleTableSourceFactory.java rename to flink-connector-oracle-cdc/src/main/java/com/ververica/cdc/connectors/oracle/table/OracleTableSourceFactory.java index cbcd69401..494226705 100644 --- a/flink-connector-oracle-cdc/src/main/java/com/alibaba/ververica/cdc/connectors/oracle/table/OracleTableSourceFactory.java +++ b/flink-connector-oracle-cdc/src/main/java/com/ververica/cdc/connectors/oracle/table/OracleTableSourceFactory.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.alibaba.ververica.cdc.connectors.oracle.table; +package com.ververica.cdc.connectors.oracle.table; import org.apache.flink.configuration.ConfigOption; import org.apache.flink.configuration.ConfigOptions; @@ -28,16 +28,16 @@ import org.apache.flink.table.factories.DynamicTableSourceFactory; import org.apache.flink.table.factories.FactoryUtil; import org.apache.flink.table.utils.TableSchemaUtils; -import com.alibaba.ververica.cdc.debezium.table.DebeziumOptions; +import com.ververica.cdc.debezium.table.DebeziumOptions; import java.util.HashSet; import java.util.Set; -import static com.alibaba.ververica.cdc.debezium.table.DebeziumOptions.getDebeziumProperties; +import static com.ververica.cdc.debezium.table.DebeziumOptions.getDebeziumProperties; /** * Factory for creating configured instance of {@link - * com.alibaba.ververica.cdc.connectors.oracle.table.OracleTableSource}. + * com.ververica.cdc.connectors.oracle.table.OracleTableSource}. */ public class OracleTableSourceFactory implements DynamicTableSourceFactory { diff --git a/flink-connector-oracle-cdc/src/main/java/com/alibaba/ververica/cdc/connectors/oracle/table/StartupMode.java b/flink-connector-oracle-cdc/src/main/java/com/ververica/cdc/connectors/oracle/table/StartupMode.java similarity index 94% rename from flink-connector-oracle-cdc/src/main/java/com/alibaba/ververica/cdc/connectors/oracle/table/StartupMode.java rename to flink-connector-oracle-cdc/src/main/java/com/ververica/cdc/connectors/oracle/table/StartupMode.java index 28d2447f0..47c2cc98a 100644 --- a/flink-connector-oracle-cdc/src/main/java/com/alibaba/ververica/cdc/connectors/oracle/table/StartupMode.java +++ b/flink-connector-oracle-cdc/src/main/java/com/ververica/cdc/connectors/oracle/table/StartupMode.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.alibaba.ververica.cdc.connectors.oracle.table; +package com.ververica.cdc.connectors.oracle.table; /** * Startup modes for the Oracle CDC Consumer. diff --git a/flink-connector-oracle-cdc/src/main/java/com/alibaba/ververica/cdc/connectors/oracle/table/StartupOptions.java b/flink-connector-oracle-cdc/src/main/java/com/ververica/cdc/connectors/oracle/table/StartupOptions.java similarity index 97% rename from flink-connector-oracle-cdc/src/main/java/com/alibaba/ververica/cdc/connectors/oracle/table/StartupOptions.java rename to flink-connector-oracle-cdc/src/main/java/com/ververica/cdc/connectors/oracle/table/StartupOptions.java index ea317b1bc..409dddd24 100644 --- a/flink-connector-oracle-cdc/src/main/java/com/alibaba/ververica/cdc/connectors/oracle/table/StartupOptions.java +++ b/flink-connector-oracle-cdc/src/main/java/com/ververica/cdc/connectors/oracle/table/StartupOptions.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.alibaba.ververica.cdc.connectors.oracle.table; +package com.ververica.cdc.connectors.oracle.table; import java.util.Objects; diff --git a/flink-connector-oracle-cdc/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory b/flink-connector-oracle-cdc/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory index 9144208f7..56bf523ac 100644 --- a/flink-connector-oracle-cdc/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory +++ b/flink-connector-oracle-cdc/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -com.alibaba.ververica.cdc.connectors.oracle.table.OracleTableSourceFactory +com.ververica.cdc.connectors.oracle.table.OracleTableSourceFactory diff --git a/flink-connector-oracle-cdc/src/test/java/com/alibaba/ververica/cdc/connectors/oracle/OracleSourceTest.java b/flink-connector-oracle-cdc/src/test/java/com/ververica/cdc/connectors/oracle/OracleSourceTest.java similarity index 98% rename from flink-connector-oracle-cdc/src/test/java/com/alibaba/ververica/cdc/connectors/oracle/OracleSourceTest.java rename to flink-connector-oracle-cdc/src/test/java/com/ververica/cdc/connectors/oracle/OracleSourceTest.java index c2ea87799..b75639f5b 100644 --- a/flink-connector-oracle-cdc/src/test/java/com/alibaba/ververica/cdc/connectors/oracle/OracleSourceTest.java +++ b/flink-connector-oracle-cdc/src/test/java/com/ververica/cdc/connectors/oracle/OracleSourceTest.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.alibaba.ververica.cdc.connectors.oracle; +package com.ververica.cdc.connectors.oracle; import org.apache.flink.api.common.state.BroadcastState; import org.apache.flink.api.common.state.KeyedStateStore; @@ -35,11 +35,11 @@ import org.apache.flink.test.util.AbstractTestBase; import org.apache.flink.util.Collector; import org.apache.flink.util.Preconditions; -import com.alibaba.ververica.cdc.connectors.oracle.utils.OracleTestUtils; -import com.alibaba.ververica.cdc.connectors.utils.TestSourceContext; -import com.alibaba.ververica.cdc.debezium.DebeziumDeserializationSchema; -import com.alibaba.ververica.cdc.debezium.DebeziumSourceFunction; import com.jayway.jsonpath.JsonPath; +import com.ververica.cdc.connectors.oracle.utils.OracleTestUtils; +import com.ververica.cdc.connectors.utils.TestSourceContext; +import com.ververica.cdc.debezium.DebeziumDeserializationSchema; +import com.ververica.cdc.debezium.DebeziumSourceFunction; import org.apache.kafka.connect.source.SourceRecord; import org.junit.Before; import org.junit.Test; @@ -67,10 +67,10 @@ import java.util.concurrent.Semaphore; import java.util.concurrent.TimeUnit; import java.util.stream.Stream; -import static com.alibaba.ververica.cdc.connectors.utils.AssertUtils.assertDelete; -import static com.alibaba.ververica.cdc.connectors.utils.AssertUtils.assertInsert; -import static com.alibaba.ververica.cdc.connectors.utils.AssertUtils.assertRead; -import static com.alibaba.ververica.cdc.connectors.utils.AssertUtils.assertUpdate; +import static com.ververica.cdc.connectors.utils.AssertUtils.assertDelete; +import static com.ververica.cdc.connectors.utils.AssertUtils.assertInsert; +import static com.ververica.cdc.connectors.utils.AssertUtils.assertRead; +import static com.ververica.cdc.connectors.utils.AssertUtils.assertUpdate; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/flink-connector-oracle-cdc/src/test/java/com/alibaba/ververica/cdc/connectors/oracle/table/OracleConnectorITCase.java b/flink-connector-oracle-cdc/src/test/java/com/ververica/cdc/connectors/oracle/table/OracleConnectorITCase.java similarity index 99% rename from flink-connector-oracle-cdc/src/test/java/com/alibaba/ververica/cdc/connectors/oracle/table/OracleConnectorITCase.java rename to flink-connector-oracle-cdc/src/test/java/com/ververica/cdc/connectors/oracle/table/OracleConnectorITCase.java index 801037a67..58d46682d 100644 --- a/flink-connector-oracle-cdc/src/test/java/com/alibaba/ververica/cdc/connectors/oracle/table/OracleConnectorITCase.java +++ b/flink-connector-oracle-cdc/src/test/java/com/ververica/cdc/connectors/oracle/table/OracleConnectorITCase.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.alibaba.ververica.cdc.connectors.oracle.table; +package com.ververica.cdc.connectors.oracle.table; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; import org.apache.flink.table.api.EnvironmentSettings; diff --git a/flink-connector-oracle-cdc/src/test/java/com/alibaba/ververica/cdc/connectors/oracle/table/OracleTableSourceFactoryTest.java b/flink-connector-oracle-cdc/src/test/java/com/ververica/cdc/connectors/oracle/table/OracleTableSourceFactoryTest.java similarity index 97% rename from flink-connector-oracle-cdc/src/test/java/com/alibaba/ververica/cdc/connectors/oracle/table/OracleTableSourceFactoryTest.java rename to flink-connector-oracle-cdc/src/test/java/com/ververica/cdc/connectors/oracle/table/OracleTableSourceFactoryTest.java index 586c24087..f122107e3 100644 --- a/flink-connector-oracle-cdc/src/test/java/com/alibaba/ververica/cdc/connectors/oracle/table/OracleTableSourceFactoryTest.java +++ b/flink-connector-oracle-cdc/src/test/java/com/ververica/cdc/connectors/oracle/table/OracleTableSourceFactoryTest.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.alibaba.ververica.cdc.connectors.oracle.table; +package com.ververica.cdc.connectors.oracle.table; import org.apache.flink.configuration.ConfigOption; import org.apache.flink.configuration.Configuration; @@ -47,8 +47,8 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; /** - * Test for {@link com.alibaba.ververica.cdc.connectors.oracle.table.OracleTableSource} created by - * {@link com.alibaba.ververica.cdc.connectors.oracle.table.OracleTableSourceFactory}. + * Test for {@link com.ververica.cdc.connectors.oracle.table.OracleTableSource} created by {@link + * com.ververica.cdc.connectors.oracle.table.OracleTableSourceFactory}. */ public class OracleTableSourceFactoryTest { private static final ResolvedSchema SCHEMA = diff --git a/flink-connector-oracle-cdc/src/test/java/com/alibaba/ververica/cdc/connectors/oracle/utils/OracleTestUtils.java b/flink-connector-oracle-cdc/src/test/java/com/ververica/cdc/connectors/oracle/utils/OracleTestUtils.java similarity index 95% rename from flink-connector-oracle-cdc/src/test/java/com/alibaba/ververica/cdc/connectors/oracle/utils/OracleTestUtils.java rename to flink-connector-oracle-cdc/src/test/java/com/ververica/cdc/connectors/oracle/utils/OracleTestUtils.java index 1de8851e5..c153e2233 100644 --- a/flink-connector-oracle-cdc/src/test/java/com/alibaba/ververica/cdc/connectors/oracle/utils/OracleTestUtils.java +++ b/flink-connector-oracle-cdc/src/test/java/com/ververica/cdc/connectors/oracle/utils/OracleTestUtils.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.alibaba.ververica.cdc.connectors.oracle.utils; +package com.ververica.cdc.connectors.oracle.utils; import org.testcontainers.containers.OracleContainer; diff --git a/flink-sql-connector-oracle-cdc/pom.xml b/flink-sql-connector-oracle-cdc/pom.xml index 57b5145c1..b2335112f 100644 --- a/flink-sql-connector-oracle-cdc/pom.xml +++ b/flink-sql-connector-oracle-cdc/pom.xml @@ -20,7 +20,7 @@ under the License. xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> flink-cdc-connectors - com.alibaba.ververica + com.ververica 2.0-SNAPSHOT 4.0.0 @@ -29,7 +29,7 @@ under the License. - com.alibaba.ververica + com.ververica flink-connector-oracle-cdc ${project.version} diff --git a/flink-sql-connector-oracle-cdc/src/main/java/com/alibaba/ververica/cdc/connectors/oracle/DummyDocs.java b/flink-sql-connector-oracle-cdc/src/main/java/com/ververica/cdc/connectors/oracle/DummyDocs.java similarity index 94% rename from flink-sql-connector-oracle-cdc/src/main/java/com/alibaba/ververica/cdc/connectors/oracle/DummyDocs.java rename to flink-sql-connector-oracle-cdc/src/main/java/com/ververica/cdc/connectors/oracle/DummyDocs.java index 9d15a4cd3..1707ced18 100644 --- a/flink-sql-connector-oracle-cdc/src/main/java/com/alibaba/ververica/cdc/connectors/oracle/DummyDocs.java +++ b/flink-sql-connector-oracle-cdc/src/main/java/com/ververica/cdc/connectors/oracle/DummyDocs.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.alibaba.ververica.cdc.connectors.oracle; +package com.ververica.cdc.connectors.oracle; /** This is used to generate a dummy docs jar for this module to pass OSS repository rule. */ public class DummyDocs {}