This is an automated email from the ASF dual-hosted git repository.
martijnvisser pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/flink-connector-kudu.git
commit 34cb67fd62aefc03ed67ee75731ef2a2c82b1fff
Author: Ferenc Csaky <ferenc.cs...@pm.me>
AuthorDate: Wed Apr 10 16:27:19 2024 +0200
[FLINK-34930] Rename base package
---
.../kudu/connector/ColumnSchemasFactory.java | 2 +-
.../kudu/connector/CreateTableOptionsFactory.java | 2 +-
.../kudu/connector/KuduFilterInfo.java | 2 +-
.../kudu/connector/KuduTableInfo.java | 2 +-
.../connector/converter/RowResultConverter.java | 2 +-
.../connector/converter/RowResultRowConverter.java | 2 +-
.../converter/RowResultRowDataConverter.java | 2 +-
.../failure/DefaultKuduFailureHandler.java | 2 +-
.../kudu/connector/failure/KuduFailureHandler.java | 5 ++-
.../kudu/connector/reader/KuduInputSplit.java | 2 +-
.../kudu/connector/reader/KuduReader.java | 8 ++--
.../kudu/connector/reader/KuduReaderConfig.java | 7 ++--
.../kudu/connector/reader/KuduReaderIterator.java | 4 +-
.../writer/AbstractSingleOperationMapper.java | 2 +-
.../kudu/connector/writer/KuduOperationMapper.java | 2 +-
.../kudu/connector/writer/KuduWriter.java | 8 ++--
.../kudu/connector/writer/KuduWriterConfig.java | 9 +++--
.../kudu/connector/writer/PojoOperationMapper.java | 2 +-
.../writer/RowDataUpsertOperationMapper.java | 2 +-
.../kudu/connector/writer/RowOperationMapper.java | 2 +-
.../connector/writer/TupleOperationMapper.java | 2 +-
.../kudu/format/AbstractKuduInputFormat.java | 18 ++++-----
.../kudu/format/KuduOutputFormat.java | 14 +++----
.../kudu/format/KuduRowDataInputFormat.java | 10 ++---
.../kudu/format/KuduRowInputFormat.java | 10 ++---
.../kudu/streaming/KuduSink.java | 14 +++----
.../kudu/table/AbstractReadOnlyCatalog.java | 2 +-
.../kudu/table/KuduCatalog.java | 25 ++++++-------
.../kudu/table/KuduTableFactory.java | 10 ++---
.../kudu/table/KuduTableSink.java | 8 ++--
.../kudu/table/KuduTableSource.java | 17 ++++-----
.../kudu/table/UpsertOperationMapper.java | 4 +-
.../kudu/table/dynamic/KuduDynamicTableSink.java | 10 ++---
.../kudu/table/dynamic/KuduDynamicTableSource.java | 20 +++++-----
.../dynamic/KuduDynamicTableSourceSinkFactory.java | 12 +++---
.../table/dynamic/catalog/KuduCatalogFactory.java | 6 +--
.../table/dynamic/catalog/KuduDynamicCatalog.java | 18 ++++-----
.../table/function/lookup/KuduLookupOptions.java | 2 +-
.../function/lookup/KuduRowDataLookupFunction.java | 20 +++++-----
.../kudu/table/utils/KuduTableUtils.java | 43 +++++++++++++---------
.../kudu/table/utils/KuduTypeUtils.java | 2 +-
.../org.apache.flink.table.factories.Factory | 2 +-
.../org.apache.flink.table.factories.TableFactory | 4 +-
.../kudu/connector/KuduFilterInfoTest.java | 2 +-
.../kudu/connector/KuduTestBase.java | 22 +++++------
.../kudu/format/KuduOutputFormatTest.java | 12 +++---
.../kudu/format/KuduRowDataInputFormatTest.java | 16 ++++----
.../kudu/format/KuduRowInputFormatTest.java | 12 +++---
.../kudu/streaming/KuduSinkTest.java | 12 +++---
.../kudu/table/KuduCatalogTest.java | 14 +++----
.../kudu/table/KuduTableFactoryTest.java | 8 ++--
.../kudu/table/KuduTableSourceITCase.java | 6 +--
.../kudu/table/KuduTableSourceTest.java | 6 +--
.../kudu/table/KuduTableTestUtils.java | 2 +-
.../kudu/table/dynamic/KuduDynamicSinkTest.java | 6 +--
.../kudu/table/dynamic/KuduDynamicSourceTest.java | 6 +--
.../dynamic/KuduRowDataLookupFunctionTest.java | 12 +++---
.../kudu/writer/AbstractOperationTest.java | 4 +-
.../kudu/writer/PojoOperationMapperTest.java | 15 ++++----
.../writer/RowDataUpsertOperationMapperTest.java | 6 +--
.../kudu/writer/RowOperationMapperTest.java | 8 ++--
.../kudu/writer/TupleOperationMapperTest.java | 8 ++--
62 files changed, 264 insertions(+), 255 deletions(-)
diff --git
a/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/connector/ColumnSchemasFactory.java
b/flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/connector/ColumnSchemasFactory.java
similarity index 96%
rename from
flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/connector/ColumnSchemasFactory.java
rename to
flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/connector/ColumnSchemasFactory.java
index 194af17..95fe97d 100644
---
a/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/connector/ColumnSchemasFactory.java
+++
b/flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/connector/ColumnSchemasFactory.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.flink.connectors.kudu.connector;
+package org.apache.flink.connector.kudu.connector;
import org.apache.flink.annotation.PublicEvolving;
diff --git
a/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/connector/CreateTableOptionsFactory.java
b/flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/connector/CreateTableOptionsFactory.java
similarity index 96%
rename from
flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/connector/CreateTableOptionsFactory.java
rename to
flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/connector/CreateTableOptionsFactory.java
index 31aa735..08b4f36 100644
---
a/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/connector/CreateTableOptionsFactory.java
+++
b/flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/connector/CreateTableOptionsFactory.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.flink.connectors.kudu.connector;
+package org.apache.flink.connector.kudu.connector;
import org.apache.flink.annotation.PublicEvolving;
diff --git
a/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/connector/KuduFilterInfo.java
b/flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/connector/KuduFilterInfo.java
similarity index 99%
rename from
flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/connector/KuduFilterInfo.java
rename to
flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/connector/KuduFilterInfo.java
index 828efff..97d8496 100644
---
a/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/connector/KuduFilterInfo.java
+++
b/flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/connector/KuduFilterInfo.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.flink.connectors.kudu.connector;
+package org.apache.flink.connector.kudu.connector;
import org.apache.flink.annotation.PublicEvolving;
import org.apache.flink.table.data.binary.BinaryStringData;
diff --git
a/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/connector/KuduTableInfo.java
b/flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/connector/KuduTableInfo.java
similarity index 98%
rename from
flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/connector/KuduTableInfo.java
rename to
flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/connector/KuduTableInfo.java
index 53dba54..f8ad4fa 100644
---
a/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/connector/KuduTableInfo.java
+++
b/flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/connector/KuduTableInfo.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.flink.connectors.kudu.connector;
+package org.apache.flink.connector.kudu.connector;
import org.apache.flink.annotation.PublicEvolving;
diff --git
a/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/connector/converter/RowResultConverter.java
b/flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/connector/converter/RowResultConverter.java
similarity index 95%
rename from
flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/connector/converter/RowResultConverter.java
rename to
flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/connector/converter/RowResultConverter.java
index c2f4bfc..ee07f9f 100644
---
a/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/connector/converter/RowResultConverter.java
+++
b/flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/connector/converter/RowResultConverter.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.flink.connectors.kudu.connector.converter;
+package org.apache.flink.connector.kudu.connector.converter;
import org.apache.flink.annotation.Internal;
diff --git
a/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/connector/converter/RowResultRowConverter.java
b/flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/connector/converter/RowResultRowConverter.java
similarity index 96%
rename from
flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/connector/converter/RowResultRowConverter.java
rename to
flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/connector/converter/RowResultRowConverter.java
index f1f1b87..dc2f814 100644
---
a/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/connector/converter/RowResultRowConverter.java
+++
b/flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/connector/converter/RowResultRowConverter.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.flink.connectors.kudu.connector.converter;
+package org.apache.flink.connector.kudu.connector.converter;
import org.apache.flink.annotation.Internal;
import org.apache.flink.types.Row;
diff --git
a/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/connector/converter/RowResultRowDataConverter.java
b/flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/connector/converter/RowResultRowDataConverter.java
similarity index 98%
rename from
flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/connector/converter/RowResultRowDataConverter.java
rename to
flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/connector/converter/RowResultRowDataConverter.java
index 033ec04..07002a7 100644
---
a/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/connector/converter/RowResultRowDataConverter.java
+++
b/flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/connector/converter/RowResultRowDataConverter.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.flink.connectors.kudu.connector.converter;
+package org.apache.flink.connector.kudu.connector.converter;
import org.apache.flink.table.data.DecimalData;
import org.apache.flink.table.data.GenericRowData;
diff --git
a/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/connector/failure/DefaultKuduFailureHandler.java
b/flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/connector/failure/DefaultKuduFailureHandler.java
similarity index 96%
rename from
flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/connector/failure/DefaultKuduFailureHandler.java
rename to
flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/connector/failure/DefaultKuduFailureHandler.java
index 99a636d..785b4e9 100644
---
a/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/connector/failure/DefaultKuduFailureHandler.java
+++
b/flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/connector/failure/DefaultKuduFailureHandler.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.flink.connectors.kudu.connector.failure;
+package org.apache.flink.connector.kudu.connector.failure;
import org.apache.kudu.client.RowError;
diff --git
a/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/connector/failure/KuduFailureHandler.java
b/flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/connector/failure/KuduFailureHandler.java
similarity index 92%
rename from
flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/connector/failure/KuduFailureHandler.java
rename to
flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/connector/failure/KuduFailureHandler.java
index ed1bc33..6da1631 100644
---
a/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/connector/failure/KuduFailureHandler.java
+++
b/flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/connector/failure/KuduFailureHandler.java
@@ -15,9 +15,10 @@
* limitations under the License.
*/
-package org.apache.flink.connectors.kudu.connector.failure;
+package org.apache.flink.connector.kudu.connector.failure;
import org.apache.flink.annotation.PublicEvolving;
+import org.apache.flink.connector.kudu.connector.writer.KuduWriter;
import org.apache.kudu.client.RowError;
@@ -27,7 +28,7 @@ import java.util.List;
/**
* Custom handling logic for errors resulting from trying to execute Kudu
operations in the {@link
- * org.apache.flink.connectors.kudu.connector.writer.KuduWriter}.
+ * KuduWriter}.
*/
@PublicEvolving
public interface KuduFailureHandler extends Serializable {
diff --git
a/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/connector/reader/KuduInputSplit.java
b/flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/connector/reader/KuduInputSplit.java
similarity index 96%
rename from
flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/connector/reader/KuduInputSplit.java
rename to
flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/connector/reader/KuduInputSplit.java
index 8cc8b06..c45fcb9 100644
---
a/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/connector/reader/KuduInputSplit.java
+++
b/flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/connector/reader/KuduInputSplit.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.flink.connectors.kudu.connector.reader;
+package org.apache.flink.connector.kudu.connector.reader;
import org.apache.flink.annotation.Internal;
import org.apache.flink.core.io.LocatableInputSplit;
diff --git
a/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/connector/reader/KuduReader.java
b/flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/connector/reader/KuduReader.java
similarity index 96%
rename from
flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/connector/reader/KuduReader.java
rename to
flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/connector/reader/KuduReader.java
index 9ff2f22..0a8f0b2 100644
---
a/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/connector/reader/KuduReader.java
+++
b/flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/connector/reader/KuduReader.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.flink.connectors.kudu.connector.reader;
+package org.apache.flink.connector.kudu.connector.reader;
import org.apache.flink.annotation.Internal;
-import org.apache.flink.connectors.kudu.connector.KuduFilterInfo;
-import org.apache.flink.connectors.kudu.connector.KuduTableInfo;
-import org.apache.flink.connectors.kudu.connector.converter.RowResultConverter;
+import org.apache.flink.connector.kudu.connector.KuduFilterInfo;
+import org.apache.flink.connector.kudu.connector.KuduTableInfo;
+import org.apache.flink.connector.kudu.connector.converter.RowResultConverter;
import org.apache.commons.collections.CollectionUtils;
import org.apache.kudu.client.KuduClient;
diff --git
a/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/connector/reader/KuduReaderConfig.java
b/flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/connector/reader/KuduReaderConfig.java
similarity index 91%
rename from
flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/connector/reader/KuduReaderConfig.java
rename to
flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/connector/reader/KuduReaderConfig.java
index 43068b5..71d56de 100644
---
a/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/connector/reader/KuduReaderConfig.java
+++
b/flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/connector/reader/KuduReaderConfig.java
@@ -15,9 +15,10 @@
* limitations under the License.
*/
-package org.apache.flink.connectors.kudu.connector.reader;
+package org.apache.flink.connector.kudu.connector.reader;
import org.apache.flink.annotation.PublicEvolving;
+import org.apache.flink.connector.kudu.format.KuduRowInputFormat;
import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -26,8 +27,8 @@ import java.io.Serializable;
import static org.apache.flink.util.Preconditions.checkNotNull;
/**
- * Configuration used by {@link
org.apache.flink.connectors.kudu.format.KuduRowInputFormat}.
- * Specifies connection and other necessary properties.
+ * Configuration used by {@link KuduRowInputFormat}. Specifies connection and
other necessary
+ * properties.
*/
@PublicEvolving
public class KuduReaderConfig implements Serializable {
diff --git
a/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/connector/reader/KuduReaderIterator.java
b/flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/connector/reader/KuduReaderIterator.java
similarity index 93%
rename from
flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/connector/reader/KuduReaderIterator.java
rename to
flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/connector/reader/KuduReaderIterator.java
index 805f258..0253b21 100644
---
a/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/connector/reader/KuduReaderIterator.java
+++
b/flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/connector/reader/KuduReaderIterator.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.apache.flink.connectors.kudu.connector.reader;
+package org.apache.flink.connector.kudu.connector.reader;
import org.apache.flink.annotation.Internal;
-import org.apache.flink.connectors.kudu.connector.converter.RowResultConverter;
+import org.apache.flink.connector.kudu.connector.converter.RowResultConverter;
import org.apache.kudu.client.KuduException;
import org.apache.kudu.client.KuduScanner;
diff --git
a/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/connector/writer/AbstractSingleOperationMapper.java
b/flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/connector/writer/AbstractSingleOperationMapper.java
similarity index 98%
rename from
flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/connector/writer/AbstractSingleOperationMapper.java
rename to
flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/connector/writer/AbstractSingleOperationMapper.java
index cb6062a..9a29207 100644
---
a/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/connector/writer/AbstractSingleOperationMapper.java
+++
b/flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/connector/writer/AbstractSingleOperationMapper.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.flink.connectors.kudu.connector.writer;
+package org.apache.flink.connector.kudu.connector.writer;
import org.apache.flink.annotation.PublicEvolving;
diff --git
a/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/connector/writer/KuduOperationMapper.java
b/flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/connector/writer/KuduOperationMapper.java
similarity index 96%
rename from
flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/connector/writer/KuduOperationMapper.java
rename to
flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/connector/writer/KuduOperationMapper.java
index 310d3fc..1f1be1c 100644
---
a/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/connector/writer/KuduOperationMapper.java
+++
b/flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/connector/writer/KuduOperationMapper.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.flink.connectors.kudu.connector.writer;
+package org.apache.flink.connector.kudu.connector.writer;
import org.apache.flink.annotation.PublicEvolving;
diff --git
a/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/connector/writer/KuduWriter.java
b/flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/connector/writer/KuduWriter.java
similarity index 95%
rename from
flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/connector/writer/KuduWriter.java
rename to
flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/connector/writer/KuduWriter.java
index 246739c..318ba2e 100644
---
a/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/connector/writer/KuduWriter.java
+++
b/flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/connector/writer/KuduWriter.java
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package org.apache.flink.connectors.kudu.connector.writer;
+package org.apache.flink.connector.kudu.connector.writer;
import org.apache.flink.annotation.Internal;
import org.apache.flink.annotation.VisibleForTesting;
-import org.apache.flink.connectors.kudu.connector.KuduTableInfo;
-import
org.apache.flink.connectors.kudu.connector.failure.DefaultKuduFailureHandler;
-import org.apache.flink.connectors.kudu.connector.failure.KuduFailureHandler;
+import org.apache.flink.connector.kudu.connector.KuduTableInfo;
+import
org.apache.flink.connector.kudu.connector.failure.DefaultKuduFailureHandler;
+import org.apache.flink.connector.kudu.connector.failure.KuduFailureHandler;
import org.apache.kudu.client.DeleteTableResponse;
import org.apache.kudu.client.KuduClient;
diff --git
a/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/connector/writer/KuduWriterConfig.java
b/flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/connector/writer/KuduWriterConfig.java
similarity index 95%
rename from
flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/connector/writer/KuduWriterConfig.java
rename to
flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/connector/writer/KuduWriterConfig.java
index 0bf0e88..38db17a 100644
---
a/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/connector/writer/KuduWriterConfig.java
+++
b/flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/connector/writer/KuduWriterConfig.java
@@ -15,9 +15,11 @@
* limitations under the License.
*/
-package org.apache.flink.connectors.kudu.connector.writer;
+package org.apache.flink.connector.kudu.connector.writer;
import org.apache.flink.annotation.PublicEvolving;
+import org.apache.flink.connector.kudu.format.KuduOutputFormat;
+import org.apache.flink.connector.kudu.streaming.KuduSink;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.kudu.client.AsyncKuduClient;
@@ -29,9 +31,8 @@ import static
org.apache.flink.util.Preconditions.checkNotNull;
import static org.apache.kudu.client.SessionConfiguration.FlushMode;
/**
- * Configuration used by {@link
org.apache.flink.connectors.kudu.streaming.KuduSink} and {@link
- * org.apache.flink.connectors.kudu.format.KuduOutputFormat}. Specifies
connection and other
- * necessary properties.
+ * Configuration used by {@link KuduSink} and {@link KuduOutputFormat}.
Specifies connection and
+ * other necessary properties.
*/
@PublicEvolving
public class KuduWriterConfig implements Serializable {
diff --git
a/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/connector/writer/PojoOperationMapper.java
b/flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/connector/writer/PojoOperationMapper.java
similarity index 98%
rename from
flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/connector/writer/PojoOperationMapper.java
rename to
flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/connector/writer/PojoOperationMapper.java
index fbff653..226cecf 100644
---
a/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/connector/writer/PojoOperationMapper.java
+++
b/flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/connector/writer/PojoOperationMapper.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.flink.connectors.kudu.connector.writer;
+package org.apache.flink.connector.kudu.connector.writer;
import org.apache.flink.annotation.PublicEvolving;
diff --git
a/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/connector/writer/RowDataUpsertOperationMapper.java
b/flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/connector/writer/RowDataUpsertOperationMapper.java
similarity index 99%
rename from
flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/connector/writer/RowDataUpsertOperationMapper.java
rename to
flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/connector/writer/RowDataUpsertOperationMapper.java
index 85b9a13..5b0f56a 100644
---
a/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/connector/writer/RowDataUpsertOperationMapper.java
+++
b/flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/connector/writer/RowDataUpsertOperationMapper.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.flink.connectors.kudu.connector.writer;
+package org.apache.flink.connector.kudu.connector.writer;
import org.apache.flink.annotation.Internal;
import org.apache.flink.table.api.TableSchema;
diff --git
a/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/connector/writer/RowOperationMapper.java
b/flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/connector/writer/RowOperationMapper.java
similarity index 95%
rename from
flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/connector/writer/RowOperationMapper.java
rename to
flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/connector/writer/RowOperationMapper.java
index 0351814..6b2e073 100644
---
a/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/connector/writer/RowOperationMapper.java
+++
b/flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/connector/writer/RowOperationMapper.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.flink.connectors.kudu.connector.writer;
+package org.apache.flink.connector.kudu.connector.writer;
import org.apache.flink.annotation.PublicEvolving;
import org.apache.flink.types.Row;
diff --git
a/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/connector/writer/TupleOperationMapper.java
b/flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/connector/writer/TupleOperationMapper.java
similarity index 95%
rename from
flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/connector/writer/TupleOperationMapper.java
rename to
flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/connector/writer/TupleOperationMapper.java
index 6da4aa4..bb80a14 100644
---
a/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/connector/writer/TupleOperationMapper.java
+++
b/flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/connector/writer/TupleOperationMapper.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.flink.connectors.kudu.connector.writer;
+package org.apache.flink.connector.kudu.connector.writer;
import org.apache.flink.annotation.PublicEvolving;
import org.apache.flink.api.java.tuple.Tuple;
diff --git
a/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/format/AbstractKuduInputFormat.java
b/flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/format/AbstractKuduInputFormat.java
similarity index 90%
rename from
flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/format/AbstractKuduInputFormat.java
rename to
flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/format/AbstractKuduInputFormat.java
index 825da03..f1d8e6b 100644
---
a/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/format/AbstractKuduInputFormat.java
+++
b/flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/format/AbstractKuduInputFormat.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.flink.connectors.kudu.format;
+package org.apache.flink.connector.kudu.format;
import org.apache.flink.annotation.PublicEvolving;
import org.apache.flink.api.common.io.LocatableInputSplitAssigner;
@@ -23,14 +23,14 @@ import org.apache.flink.api.common.io.RichInputFormat;
import org.apache.flink.api.common.io.statistics.BaseStatistics;
import org.apache.flink.api.java.typeutils.ResultTypeQueryable;
import org.apache.flink.configuration.Configuration;
-import org.apache.flink.connectors.kudu.connector.KuduFilterInfo;
-import org.apache.flink.connectors.kudu.connector.KuduTableInfo;
-import org.apache.flink.connectors.kudu.connector.converter.RowResultConverter;
-import org.apache.flink.connectors.kudu.connector.reader.KuduInputSplit;
-import org.apache.flink.connectors.kudu.connector.reader.KuduReader;
-import org.apache.flink.connectors.kudu.connector.reader.KuduReaderConfig;
-import org.apache.flink.connectors.kudu.connector.reader.KuduReaderIterator;
-import org.apache.flink.connectors.kudu.table.KuduCatalog;
+import org.apache.flink.connector.kudu.connector.KuduFilterInfo;
+import org.apache.flink.connector.kudu.connector.KuduTableInfo;
+import org.apache.flink.connector.kudu.connector.converter.RowResultConverter;
+import org.apache.flink.connector.kudu.connector.reader.KuduInputSplit;
+import org.apache.flink.connector.kudu.connector.reader.KuduReader;
+import org.apache.flink.connector.kudu.connector.reader.KuduReaderConfig;
+import org.apache.flink.connector.kudu.connector.reader.KuduReaderIterator;
+import org.apache.flink.connector.kudu.table.KuduCatalog;
import org.apache.flink.core.io.InputSplitAssigner;
import org.apache.kudu.client.KuduException;
diff --git
a/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/format/KuduOutputFormat.java
b/flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/format/KuduOutputFormat.java
similarity index 87%
rename from
flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/format/KuduOutputFormat.java
rename to
flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/format/KuduOutputFormat.java
index 7a2227c..824be30 100644
---
a/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/format/KuduOutputFormat.java
+++
b/flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/format/KuduOutputFormat.java
@@ -15,17 +15,17 @@
* limitations under the License.
*/
-package org.apache.flink.connectors.kudu.format;
+package org.apache.flink.connector.kudu.format;
import org.apache.flink.annotation.PublicEvolving;
import org.apache.flink.api.common.io.RichOutputFormat;
import org.apache.flink.configuration.Configuration;
-import org.apache.flink.connectors.kudu.connector.KuduTableInfo;
-import
org.apache.flink.connectors.kudu.connector.failure.DefaultKuduFailureHandler;
-import org.apache.flink.connectors.kudu.connector.failure.KuduFailureHandler;
-import org.apache.flink.connectors.kudu.connector.writer.KuduOperationMapper;
-import org.apache.flink.connectors.kudu.connector.writer.KuduWriter;
-import org.apache.flink.connectors.kudu.connector.writer.KuduWriterConfig;
+import org.apache.flink.connector.kudu.connector.KuduTableInfo;
+import
org.apache.flink.connector.kudu.connector.failure.DefaultKuduFailureHandler;
+import org.apache.flink.connector.kudu.connector.failure.KuduFailureHandler;
+import org.apache.flink.connector.kudu.connector.writer.KuduOperationMapper;
+import org.apache.flink.connector.kudu.connector.writer.KuduWriter;
+import org.apache.flink.connector.kudu.connector.writer.KuduWriterConfig;
import org.apache.flink.runtime.state.FunctionInitializationContext;
import org.apache.flink.runtime.state.FunctionSnapshotContext;
import org.apache.flink.streaming.api.checkpoint.CheckpointedFunction;
diff --git
a/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/format/KuduRowDataInputFormat.java
b/flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/format/KuduRowDataInputFormat.java
similarity index 86%
rename from
flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/format/KuduRowDataInputFormat.java
rename to
flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/format/KuduRowDataInputFormat.java
index 0cf07c3..6a100c5 100644
---
a/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/format/KuduRowDataInputFormat.java
+++
b/flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/format/KuduRowDataInputFormat.java
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package org.apache.flink.connectors.kudu.format;
+package org.apache.flink.connector.kudu.format;
import org.apache.flink.annotation.PublicEvolving;
import org.apache.flink.api.common.typeinfo.TypeInformation;
-import org.apache.flink.connectors.kudu.connector.KuduFilterInfo;
-import org.apache.flink.connectors.kudu.connector.KuduTableInfo;
-import org.apache.flink.connectors.kudu.connector.converter.RowResultConverter;
-import org.apache.flink.connectors.kudu.connector.reader.KuduReaderConfig;
+import org.apache.flink.connector.kudu.connector.KuduFilterInfo;
+import org.apache.flink.connector.kudu.connector.KuduTableInfo;
+import org.apache.flink.connector.kudu.connector.converter.RowResultConverter;
+import org.apache.flink.connector.kudu.connector.reader.KuduReaderConfig;
import org.apache.flink.table.data.RowData;
import java.util.List;
diff --git
a/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/format/KuduRowInputFormat.java
b/flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/format/KuduRowInputFormat.java
similarity index 86%
rename from
flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/format/KuduRowInputFormat.java
rename to
flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/format/KuduRowInputFormat.java
index c220be3..5f0dc12 100644
---
a/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/format/KuduRowInputFormat.java
+++
b/flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/format/KuduRowInputFormat.java
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package org.apache.flink.connectors.kudu.format;
+package org.apache.flink.connector.kudu.format;
import org.apache.flink.annotation.PublicEvolving;
import org.apache.flink.api.common.typeinfo.TypeInformation;
-import org.apache.flink.connectors.kudu.connector.KuduFilterInfo;
-import org.apache.flink.connectors.kudu.connector.KuduTableInfo;
-import org.apache.flink.connectors.kudu.connector.converter.RowResultConverter;
-import org.apache.flink.connectors.kudu.connector.reader.KuduReaderConfig;
+import org.apache.flink.connector.kudu.connector.KuduFilterInfo;
+import org.apache.flink.connector.kudu.connector.KuduTableInfo;
+import org.apache.flink.connector.kudu.connector.converter.RowResultConverter;
+import org.apache.flink.connector.kudu.connector.reader.KuduReaderConfig;
import org.apache.flink.types.Row;
import java.util.List;
diff --git
a/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/streaming/KuduSink.java
b/flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/streaming/KuduSink.java
similarity index 90%
rename from
flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/streaming/KuduSink.java
rename to
flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/streaming/KuduSink.java
index 7374f3a..2943a19 100644
---
a/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/streaming/KuduSink.java
+++
b/flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/streaming/KuduSink.java
@@ -15,16 +15,16 @@
* limitations under the License.
*/
-package org.apache.flink.connectors.kudu.streaming;
+package org.apache.flink.connector.kudu.streaming;
import org.apache.flink.annotation.PublicEvolving;
import org.apache.flink.configuration.Configuration;
-import org.apache.flink.connectors.kudu.connector.KuduTableInfo;
-import
org.apache.flink.connectors.kudu.connector.failure.DefaultKuduFailureHandler;
-import org.apache.flink.connectors.kudu.connector.failure.KuduFailureHandler;
-import org.apache.flink.connectors.kudu.connector.writer.KuduOperationMapper;
-import org.apache.flink.connectors.kudu.connector.writer.KuduWriter;
-import org.apache.flink.connectors.kudu.connector.writer.KuduWriterConfig;
+import org.apache.flink.connector.kudu.connector.KuduTableInfo;
+import
org.apache.flink.connector.kudu.connector.failure.DefaultKuduFailureHandler;
+import org.apache.flink.connector.kudu.connector.failure.KuduFailureHandler;
+import org.apache.flink.connector.kudu.connector.writer.KuduOperationMapper;
+import org.apache.flink.connector.kudu.connector.writer.KuduWriter;
+import org.apache.flink.connector.kudu.connector.writer.KuduWriterConfig;
import org.apache.flink.runtime.state.FunctionInitializationContext;
import org.apache.flink.runtime.state.FunctionSnapshotContext;
import org.apache.flink.streaming.api.checkpoint.CheckpointedFunction;
diff --git
a/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/table/AbstractReadOnlyCatalog.java
b/flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/table/AbstractReadOnlyCatalog.java
similarity index 99%
rename from
flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/table/AbstractReadOnlyCatalog.java
rename to
flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/table/AbstractReadOnlyCatalog.java
index eb53e85..f3d01cf 100644
---
a/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/table/AbstractReadOnlyCatalog.java
+++
b/flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/table/AbstractReadOnlyCatalog.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.connectors.kudu.table;
+package org.apache.flink.connector.kudu.table;
import org.apache.flink.annotation.Internal;
import org.apache.flink.table.catalog.AbstractCatalog;
diff --git
a/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/table/KuduCatalog.java
b/flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/table/KuduCatalog.java
similarity index 92%
rename from
flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/table/KuduCatalog.java
rename to
flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/table/KuduCatalog.java
index bd33250..37e554d 100644
---
a/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/table/KuduCatalog.java
+++
b/flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/table/KuduCatalog.java
@@ -16,11 +16,13 @@
* limitations under the License.
*/
-package org.apache.flink.connectors.kudu.table;
+package org.apache.flink.connector.kudu.table;
import org.apache.flink.annotation.PublicEvolving;
-import org.apache.flink.connectors.kudu.connector.KuduTableInfo;
-import org.apache.flink.connectors.kudu.table.utils.KuduTableUtils;
+import org.apache.flink.connector.kudu.connector.KuduTableInfo;
+import
org.apache.flink.connector.kudu.table.dynamic.KuduDynamicTableSourceSinkFactory;
+import
org.apache.flink.connector.kudu.table.dynamic.catalog.KuduDynamicCatalog;
+import org.apache.flink.connector.kudu.table.utils.KuduTableUtils;
import org.apache.flink.table.api.TableSchema;
import org.apache.flink.table.catalog.CatalogBaseTable;
import org.apache.flink.table.catalog.CatalogDatabase;
@@ -60,9 +62,6 @@ import java.util.Optional;
import java.util.Set;
import java.util.stream.Collectors;
-import static
org.apache.flink.connectors.kudu.table.KuduTableFactory.KUDU_HASH_COLS;
-import static
org.apache.flink.connectors.kudu.table.KuduTableFactory.KUDU_PRIMARY_KEY_COLS;
-import static
org.apache.flink.connectors.kudu.table.KuduTableFactory.KUDU_REPLICAS;
import static org.apache.flink.util.Preconditions.checkArgument;
import static org.apache.flink.util.Preconditions.checkNotNull;
@@ -70,10 +69,8 @@ import static
org.apache.flink.util.Preconditions.checkNotNull;
* Catalog for reading and creating Kudu tables.
*
* @deprecated After this class based on {@link KuduTableFactory}, but flink
upgrade {@link
- *
org.apache.flink.connectors.kudu.table.dynamic.KuduDynamicTableSourceSinkFactory}
{@link
- * KuduCatalog} underlying the use of TableFactory also needs to update,So
this class is
- * replaced by the {@link
- *
org.apache.flink.connectors.kudu.table.dynamic.catalog.KuduDynamicCatalog} class
+ * KuduDynamicTableSourceSinkFactory} {@link KuduCatalog} underlying the
use of TableFactory
+ * also needs to update,So this class is replaced by the {@link
KuduDynamicCatalog} class
*/
@PublicEvolving
@Deprecated
@@ -257,11 +254,13 @@ public class KuduCatalog extends AbstractReadOnlyCatalog {
Map<String, String> tableProperties = table.getOptions();
TableSchema tableSchema = table.getSchema();
- Set<String> optionalProperties = new
HashSet<>(Arrays.asList(KUDU_REPLICAS));
- Set<String> requiredProperties = new
HashSet<>(Arrays.asList(KUDU_HASH_COLS));
+ Set<String> optionalProperties =
+ new HashSet<>(Arrays.asList(KuduTableFactory.KUDU_REPLICAS));
+ Set<String> requiredProperties =
+ new HashSet<>(Arrays.asList(KuduTableFactory.KUDU_HASH_COLS));
if (!tableSchema.getPrimaryKey().isPresent()) {
- requiredProperties.add(KUDU_PRIMARY_KEY_COLS);
+ requiredProperties.add(KuduTableFactory.KUDU_PRIMARY_KEY_COLS);
}
if (!tableProperties.keySet().containsAll(requiredProperties)) {
diff --git
a/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/table/KuduTableFactory.java
b/flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/table/KuduTableFactory.java
similarity index 96%
rename from
flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/table/KuduTableFactory.java
rename to
flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/table/KuduTableFactory.java
index f4eab75..943030f 100644
---
a/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/table/KuduTableFactory.java
+++
b/flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/table/KuduTableFactory.java
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package org.apache.flink.connectors.kudu.table;
+package org.apache.flink.connector.kudu.table;
import org.apache.flink.api.java.tuple.Tuple2;
-import org.apache.flink.connectors.kudu.connector.KuduTableInfo;
-import org.apache.flink.connectors.kudu.connector.reader.KuduReaderConfig;
-import org.apache.flink.connectors.kudu.connector.writer.KuduWriterConfig;
-import org.apache.flink.connectors.kudu.table.utils.KuduTableUtils;
+import org.apache.flink.connector.kudu.connector.KuduTableInfo;
+import org.apache.flink.connector.kudu.connector.reader.KuduReaderConfig;
+import org.apache.flink.connector.kudu.connector.writer.KuduWriterConfig;
+import org.apache.flink.connector.kudu.table.utils.KuduTableUtils;
import org.apache.flink.table.api.TableSchema;
import org.apache.flink.table.catalog.CatalogTable;
import org.apache.flink.table.catalog.ObjectPath;
diff --git
a/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/table/KuduTableSink.java
b/flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/table/KuduTableSink.java
similarity index 93%
rename from
flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/table/KuduTableSink.java
rename to
flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/table/KuduTableSink.java
index c867343..4fc0984 100644
---
a/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/table/KuduTableSink.java
+++
b/flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/table/KuduTableSink.java
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package org.apache.flink.connectors.kudu.table;
+package org.apache.flink.connector.kudu.table;
import org.apache.flink.api.common.typeinfo.TypeInformation;
import org.apache.flink.api.java.tuple.Tuple2;
-import org.apache.flink.connectors.kudu.connector.KuduTableInfo;
-import org.apache.flink.connectors.kudu.connector.writer.KuduWriterConfig;
-import org.apache.flink.connectors.kudu.streaming.KuduSink;
+import org.apache.flink.connector.kudu.connector.KuduTableInfo;
+import org.apache.flink.connector.kudu.connector.writer.KuduWriterConfig;
+import org.apache.flink.connector.kudu.streaming.KuduSink;
import org.apache.flink.streaming.api.datastream.DataStream;
import org.apache.flink.streaming.api.datastream.DataStreamSink;
import org.apache.flink.table.api.TableSchema;
diff --git
a/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/table/KuduTableSource.java
b/flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/table/KuduTableSource.java
similarity index 93%
rename from
flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/table/KuduTableSource.java
rename to
flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/table/KuduTableSource.java
index c750db4..82ed1e9 100644
---
a/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/table/KuduTableSource.java
+++
b/flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/table/KuduTableSource.java
@@ -15,14 +15,15 @@
* limitations under the License.
*/
-package org.apache.flink.connectors.kudu.table;
+package org.apache.flink.connector.kudu.table;
import org.apache.flink.api.common.typeinfo.TypeInformation;
-import org.apache.flink.connectors.kudu.connector.KuduFilterInfo;
-import org.apache.flink.connectors.kudu.connector.KuduTableInfo;
-import
org.apache.flink.connectors.kudu.connector.converter.RowResultRowConverter;
-import org.apache.flink.connectors.kudu.connector.reader.KuduReaderConfig;
-import org.apache.flink.connectors.kudu.format.KuduRowInputFormat;
+import org.apache.flink.connector.kudu.connector.KuduFilterInfo;
+import org.apache.flink.connector.kudu.connector.KuduTableInfo;
+import
org.apache.flink.connector.kudu.connector.converter.RowResultRowConverter;
+import org.apache.flink.connector.kudu.connector.reader.KuduReaderConfig;
+import org.apache.flink.connector.kudu.format.KuduRowInputFormat;
+import org.apache.flink.connector.kudu.table.utils.KuduTableUtils;
import org.apache.flink.streaming.api.datastream.DataStream;
import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment;
import org.apache.flink.table.api.DataTypes;
@@ -50,8 +51,6 @@ import java.util.List;
import java.util.ListIterator;
import java.util.Optional;
-import static
org.apache.flink.connectors.kudu.table.utils.KuduTableUtils.toKuduFilterInfo;
-
/** DataStream source implementation for Kudu. */
public class KuduTableSource
implements StreamTableSource<Row>,
@@ -173,7 +172,7 @@ public class KuduTableSource
ListIterator<Expression> predicatesIter = predicates.listIterator();
while (predicatesIter.hasNext()) {
Expression predicate = predicatesIter.next();
- Optional<KuduFilterInfo> kuduPred = toKuduFilterInfo(predicate);
+ Optional<KuduFilterInfo> kuduPred =
KuduTableUtils.toKuduFilterInfo(predicate);
if (kuduPred != null && kuduPred.isPresent()) {
LOG.debug(
"Predicate [{}] converted into KuduFilterInfo and
pushed into "
diff --git
a/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/table/UpsertOperationMapper.java
b/flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/table/UpsertOperationMapper.java
similarity index 92%
rename from
flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/table/UpsertOperationMapper.java
rename to
flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/table/UpsertOperationMapper.java
index 5813fee..9fe5597 100644
---
a/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/table/UpsertOperationMapper.java
+++
b/flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/table/UpsertOperationMapper.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.flink.connectors.kudu.table;
+package org.apache.flink.connector.kudu.table;
import org.apache.flink.annotation.Internal;
import org.apache.flink.api.java.tuple.Tuple2;
-import
org.apache.flink.connectors.kudu.connector.writer.AbstractSingleOperationMapper;
+import
org.apache.flink.connector.kudu.connector.writer.AbstractSingleOperationMapper;
import org.apache.flink.types.Row;
import org.apache.kudu.client.KuduTable;
diff --git
a/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/table/dynamic/KuduDynamicTableSink.java
b/flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/table/dynamic/KuduDynamicTableSink.java
similarity index 91%
rename from
flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/table/dynamic/KuduDynamicTableSink.java
rename to
flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/table/dynamic/KuduDynamicTableSink.java
index 747e47b..999f90f 100644
---
a/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/table/dynamic/KuduDynamicTableSink.java
+++
b/flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/table/dynamic/KuduDynamicTableSink.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.flink.connectors.kudu.table.dynamic;
+package org.apache.flink.connector.kudu.table.dynamic;
-import org.apache.flink.connectors.kudu.connector.KuduTableInfo;
-import org.apache.flink.connectors.kudu.connector.writer.KuduWriterConfig;
-import
org.apache.flink.connectors.kudu.connector.writer.RowDataUpsertOperationMapper;
-import org.apache.flink.connectors.kudu.streaming.KuduSink;
+import org.apache.flink.connector.kudu.connector.KuduTableInfo;
+import org.apache.flink.connector.kudu.connector.writer.KuduWriterConfig;
+import
org.apache.flink.connector.kudu.connector.writer.RowDataUpsertOperationMapper;
+import org.apache.flink.connector.kudu.streaming.KuduSink;
import org.apache.flink.table.api.TableSchema;
import org.apache.flink.table.connector.ChangelogMode;
import org.apache.flink.table.connector.sink.DynamicTableSink;
diff --git
a/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/table/dynamic/KuduDynamicTableSource.java
b/flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/table/dynamic/KuduDynamicTableSource.java
similarity index 93%
rename from
flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/table/dynamic/KuduDynamicTableSource.java
rename to
flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/table/dynamic/KuduDynamicTableSource.java
index 585c5b9..bc19696 100644
---
a/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/table/dynamic/KuduDynamicTableSource.java
+++
b/flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/table/dynamic/KuduDynamicTableSource.java
@@ -15,16 +15,16 @@
* limitations under the License.
*/
-package org.apache.flink.connectors.kudu.table.dynamic;
-
-import org.apache.flink.connectors.kudu.connector.KuduFilterInfo;
-import org.apache.flink.connectors.kudu.connector.KuduTableInfo;
-import
org.apache.flink.connectors.kudu.connector.converter.RowResultRowDataConverter;
-import org.apache.flink.connectors.kudu.connector.reader.KuduReaderConfig;
-import org.apache.flink.connectors.kudu.format.KuduRowDataInputFormat;
-import
org.apache.flink.connectors.kudu.table.function.lookup.KuduLookupOptions;
-import
org.apache.flink.connectors.kudu.table.function.lookup.KuduRowDataLookupFunction;
-import org.apache.flink.connectors.kudu.table.utils.KuduTableUtils;
+package org.apache.flink.connector.kudu.table.dynamic;
+
+import org.apache.flink.connector.kudu.connector.KuduFilterInfo;
+import org.apache.flink.connector.kudu.connector.KuduTableInfo;
+import
org.apache.flink.connector.kudu.connector.converter.RowResultRowDataConverter;
+import org.apache.flink.connector.kudu.connector.reader.KuduReaderConfig;
+import org.apache.flink.connector.kudu.format.KuduRowDataInputFormat;
+import org.apache.flink.connector.kudu.table.function.lookup.KuduLookupOptions;
+import
org.apache.flink.connector.kudu.table.function.lookup.KuduRowDataLookupFunction;
+import org.apache.flink.connector.kudu.table.utils.KuduTableUtils;
import org.apache.flink.table.api.TableSchema;
import org.apache.flink.table.connector.ChangelogMode;
import org.apache.flink.table.connector.source.DynamicTableSource;
diff --git
a/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/table/dynamic/KuduDynamicTableSourceSinkFactory.java
b/flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/table/dynamic/KuduDynamicTableSourceSinkFactory.java
similarity index 96%
rename from
flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/table/dynamic/KuduDynamicTableSourceSinkFactory.java
rename to
flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/table/dynamic/KuduDynamicTableSourceSinkFactory.java
index 879fc1a..9bf3816 100644
---
a/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/table/dynamic/KuduDynamicTableSourceSinkFactory.java
+++
b/flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/table/dynamic/KuduDynamicTableSourceSinkFactory.java
@@ -15,16 +15,16 @@
* limitations under the License.
*/
-package org.apache.flink.connectors.kudu.table.dynamic;
+package org.apache.flink.connector.kudu.table.dynamic;
import org.apache.flink.configuration.ConfigOption;
import org.apache.flink.configuration.ConfigOptions;
import org.apache.flink.configuration.ReadableConfig;
-import org.apache.flink.connectors.kudu.connector.KuduTableInfo;
-import org.apache.flink.connectors.kudu.connector.reader.KuduReaderConfig;
-import org.apache.flink.connectors.kudu.connector.writer.KuduWriterConfig;
-import
org.apache.flink.connectors.kudu.table.function.lookup.KuduLookupOptions;
-import org.apache.flink.connectors.kudu.table.utils.KuduTableUtils;
+import org.apache.flink.connector.kudu.connector.KuduTableInfo;
+import org.apache.flink.connector.kudu.connector.reader.KuduReaderConfig;
+import org.apache.flink.connector.kudu.connector.writer.KuduWriterConfig;
+import org.apache.flink.connector.kudu.table.function.lookup.KuduLookupOptions;
+import org.apache.flink.connector.kudu.table.utils.KuduTableUtils;
import org.apache.flink.table.api.TableSchema;
import org.apache.flink.table.connector.sink.DynamicTableSink;
import org.apache.flink.table.connector.source.DynamicTableSource;
diff --git
a/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/table/dynamic/catalog/KuduCatalogFactory.java
b/flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/table/dynamic/catalog/KuduCatalogFactory.java
similarity index 88%
rename from
flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/table/dynamic/catalog/KuduCatalogFactory.java
rename to
flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/table/dynamic/catalog/KuduCatalogFactory.java
index 3b04e9b..21f5e4c 100644
---
a/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/table/dynamic/catalog/KuduCatalogFactory.java
+++
b/flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/table/dynamic/catalog/KuduCatalogFactory.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.connectors.kudu.table.dynamic.catalog;
+package org.apache.flink.connector.kudu.table.dynamic.catalog;
import org.apache.flink.annotation.Internal;
import org.apache.flink.configuration.ConfigOption;
@@ -30,8 +30,8 @@ import org.slf4j.LoggerFactory;
import java.util.HashSet;
import java.util.Set;
-import static
org.apache.flink.connectors.kudu.table.dynamic.KuduDynamicTableSourceSinkFactory.IDENTIFIER;
-import static
org.apache.flink.connectors.kudu.table.dynamic.KuduDynamicTableSourceSinkFactory.KUDU_MASTERS;
+import static
org.apache.flink.connector.kudu.table.dynamic.KuduDynamicTableSourceSinkFactory.IDENTIFIER;
+import static
org.apache.flink.connector.kudu.table.dynamic.KuduDynamicTableSourceSinkFactory.KUDU_MASTERS;
import static org.apache.flink.table.factories.FactoryUtil.PROPERTY_VERSION;
/** Factory for {@link KuduDynamicCatalog}. */
diff --git
a/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/table/dynamic/catalog/KuduDynamicCatalog.java
b/flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/table/dynamic/catalog/KuduDynamicCatalog.java
similarity index 94%
rename from
flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/table/dynamic/catalog/KuduDynamicCatalog.java
rename to
flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/table/dynamic/catalog/KuduDynamicCatalog.java
index 5cf35af..5f51e06 100644
---
a/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/table/dynamic/catalog/KuduDynamicCatalog.java
+++
b/flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/table/dynamic/catalog/KuduDynamicCatalog.java
@@ -16,12 +16,12 @@
* limitations under the License.
*/
-package org.apache.flink.connectors.kudu.table.dynamic.catalog;
+package org.apache.flink.connector.kudu.table.dynamic.catalog;
-import org.apache.flink.connectors.kudu.connector.KuduTableInfo;
-import org.apache.flink.connectors.kudu.table.AbstractReadOnlyCatalog;
-import
org.apache.flink.connectors.kudu.table.dynamic.KuduDynamicTableSourceSinkFactory;
-import org.apache.flink.connectors.kudu.table.utils.KuduTableUtils;
+import org.apache.flink.connector.kudu.connector.KuduTableInfo;
+import org.apache.flink.connector.kudu.table.AbstractReadOnlyCatalog;
+import
org.apache.flink.connector.kudu.table.dynamic.KuduDynamicTableSourceSinkFactory;
+import org.apache.flink.connector.kudu.table.utils.KuduTableUtils;
import org.apache.flink.table.api.TableSchema;
import org.apache.flink.table.catalog.CatalogBaseTable;
import org.apache.flink.table.catalog.CatalogDatabase;
@@ -62,10 +62,10 @@ import java.util.Optional;
import java.util.Set;
import java.util.stream.Collectors;
-import static
org.apache.flink.connectors.kudu.table.dynamic.KuduDynamicTableSourceSinkFactory.KUDU_HASH_COLS;
-import static
org.apache.flink.connectors.kudu.table.dynamic.KuduDynamicTableSourceSinkFactory.KUDU_HASH_PARTITION_NUMS;
-import static
org.apache.flink.connectors.kudu.table.dynamic.KuduDynamicTableSourceSinkFactory.KUDU_PRIMARY_KEY_COLS;
-import static
org.apache.flink.connectors.kudu.table.dynamic.KuduDynamicTableSourceSinkFactory.KUDU_REPLICAS;
+import static
org.apache.flink.connector.kudu.table.dynamic.KuduDynamicTableSourceSinkFactory.KUDU_HASH_COLS;
+import static
org.apache.flink.connector.kudu.table.dynamic.KuduDynamicTableSourceSinkFactory.KUDU_HASH_PARTITION_NUMS;
+import static
org.apache.flink.connector.kudu.table.dynamic.KuduDynamicTableSourceSinkFactory.KUDU_PRIMARY_KEY_COLS;
+import static
org.apache.flink.connector.kudu.table.dynamic.KuduDynamicTableSourceSinkFactory.KUDU_REPLICAS;
import static org.apache.flink.util.Preconditions.checkArgument;
import static org.apache.flink.util.Preconditions.checkNotNull;
diff --git
a/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/table/function/lookup/KuduLookupOptions.java
b/flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/table/function/lookup/KuduLookupOptions.java
similarity index 97%
rename from
flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/table/function/lookup/KuduLookupOptions.java
rename to
flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/table/function/lookup/KuduLookupOptions.java
index 537a4c0..f05b988 100644
---
a/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/table/function/lookup/KuduLookupOptions.java
+++
b/flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/table/function/lookup/KuduLookupOptions.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.connectors.kudu.table.function.lookup;
+package org.apache.flink.connector.kudu.table.function.lookup;
/** Options for the Kudu lookup. */
public class KuduLookupOptions {
diff --git
a/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/table/function/lookup/KuduRowDataLookupFunction.java
b/flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/table/function/lookup/KuduRowDataLookupFunction.java
similarity index 93%
rename from
flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/table/function/lookup/KuduRowDataLookupFunction.java
rename to
flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/table/function/lookup/KuduRowDataLookupFunction.java
index b1198e7..4ae4121 100644
---
a/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/table/function/lookup/KuduRowDataLookupFunction.java
+++
b/flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/table/function/lookup/KuduRowDataLookupFunction.java
@@ -16,16 +16,16 @@
* limitations under the License.
*/
-package org.apache.flink.connectors.kudu.table.function.lookup;
-
-import org.apache.flink.connectors.kudu.connector.KuduFilterInfo;
-import org.apache.flink.connectors.kudu.connector.KuduTableInfo;
-import org.apache.flink.connectors.kudu.connector.converter.RowResultConverter;
-import
org.apache.flink.connectors.kudu.connector.converter.RowResultRowDataConverter;
-import org.apache.flink.connectors.kudu.connector.reader.KuduInputSplit;
-import org.apache.flink.connectors.kudu.connector.reader.KuduReader;
-import org.apache.flink.connectors.kudu.connector.reader.KuduReaderConfig;
-import org.apache.flink.connectors.kudu.connector.reader.KuduReaderIterator;
+package org.apache.flink.connector.kudu.table.function.lookup;
+
+import org.apache.flink.connector.kudu.connector.KuduFilterInfo;
+import org.apache.flink.connector.kudu.connector.KuduTableInfo;
+import org.apache.flink.connector.kudu.connector.converter.RowResultConverter;
+import
org.apache.flink.connector.kudu.connector.converter.RowResultRowDataConverter;
+import org.apache.flink.connector.kudu.connector.reader.KuduInputSplit;
+import org.apache.flink.connector.kudu.connector.reader.KuduReader;
+import org.apache.flink.connector.kudu.connector.reader.KuduReaderConfig;
+import org.apache.flink.connector.kudu.connector.reader.KuduReaderIterator;
import org.apache.flink.table.data.GenericRowData;
import org.apache.flink.table.data.RowData;
import org.apache.flink.table.functions.FunctionContext;
diff --git
a/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/table/utils/KuduTableUtils.java
b/flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/table/utils/KuduTableUtils.java
similarity index 89%
rename from
flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/table/utils/KuduTableUtils.java
rename to
flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/table/utils/KuduTableUtils.java
index 0b99333..63d721e 100644
---
a/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/table/utils/KuduTableUtils.java
+++
b/flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/table/utils/KuduTableUtils.java
@@ -15,13 +15,14 @@
* limitations under the License.
*/
-package org.apache.flink.connectors.kudu.table.utils;
+package org.apache.flink.connector.kudu.table.utils;
import org.apache.flink.api.java.tuple.Tuple2;
-import org.apache.flink.connectors.kudu.connector.ColumnSchemasFactory;
-import org.apache.flink.connectors.kudu.connector.CreateTableOptionsFactory;
-import org.apache.flink.connectors.kudu.connector.KuduFilterInfo;
-import org.apache.flink.connectors.kudu.connector.KuduTableInfo;
+import org.apache.flink.connector.kudu.connector.ColumnSchemasFactory;
+import org.apache.flink.connector.kudu.connector.CreateTableOptionsFactory;
+import org.apache.flink.connector.kudu.connector.KuduFilterInfo;
+import org.apache.flink.connector.kudu.connector.KuduTableInfo;
+import
org.apache.flink.connector.kudu.table.dynamic.KuduDynamicTableSourceSinkFactory;
import org.apache.flink.table.api.TableSchema;
import org.apache.flink.table.expressions.CallExpression;
import org.apache.flink.table.expressions.Expression;
@@ -52,11 +53,6 @@ import java.util.Map;
import java.util.Optional;
import java.util.stream.Collectors;
-import static
org.apache.flink.connectors.kudu.table.dynamic.KuduDynamicTableSourceSinkFactory.KUDU_HASH_COLS;
-import static
org.apache.flink.connectors.kudu.table.dynamic.KuduDynamicTableSourceSinkFactory.KUDU_HASH_PARTITION_NUMS;
-import static
org.apache.flink.connectors.kudu.table.dynamic.KuduDynamicTableSourceSinkFactory.KUDU_PRIMARY_KEY_COLS;
-import static
org.apache.flink.connectors.kudu.table.dynamic.KuduDynamicTableSourceSinkFactory.KUDU_REPLICAS;
-
/** Kudu table utilities. */
public class KuduTableUtils {
@@ -67,7 +63,7 @@ public class KuduTableUtils {
// Since KUDU_HASH_COLS is a required property for table creation, we
use it to infer
// whether to create table
boolean createIfMissing =
- props.containsKey(KUDU_PRIMARY_KEY_COLS.key())
+
props.containsKey(KuduDynamicTableSourceSinkFactory.KUDU_PRIMARY_KEY_COLS.key())
|| schema.getPrimaryKey().isPresent();
KuduTableInfo tableInfo = KuduTableInfo.forTable(tableName);
@@ -81,12 +77,18 @@ public class KuduTableUtils {
List<String> keyColumns = getPrimaryKeyColumns(props, schema);
ColumnSchemasFactory schemasFactory = () ->
toKuduConnectorColumns(columns, keyColumns);
int replicas =
- Optional.ofNullable(props.get(KUDU_REPLICAS.key()))
+ Optional.ofNullable(
+ props.get(
+
KuduDynamicTableSourceSinkFactory.KUDU_REPLICAS.key()))
.map(Integer::parseInt)
.orElse(1);
// if hash partitions nums not exists,default 3;
int hashPartitionNums =
-
Optional.ofNullable(props.get(KUDU_HASH_PARTITION_NUMS.key()))
+ Optional.ofNullable(
+ props.get(
+ KuduDynamicTableSourceSinkFactory
+ .KUDU_HASH_PARTITION_NUMS
+ .key()))
.map(Integer::parseInt)
.orElse(3);
CreateTableOptionsFactory optionsFactory =
@@ -98,7 +100,7 @@ public class KuduTableUtils {
} else {
LOG.debug(
"Property {} is missing, assuming the table is already
created.",
- KUDU_HASH_COLS.key());
+ KuduDynamicTableSourceSinkFactory.KUDU_HASH_COLS.key());
}
return tableInfo;
@@ -144,13 +146,20 @@ public class KuduTableUtils {
public static List<String> getPrimaryKeyColumns(
Map<String, String> tableProperties, TableSchema tableSchema) {
- return tableProperties.containsKey(KUDU_PRIMARY_KEY_COLS.key())
- ?
Arrays.asList(tableProperties.get(KUDU_PRIMARY_KEY_COLS.key()).split(","))
+ return tableProperties.containsKey(
+
KuduDynamicTableSourceSinkFactory.KUDU_PRIMARY_KEY_COLS.key())
+ ? Arrays.asList(
+ tableProperties
+
.get(KuduDynamicTableSourceSinkFactory.KUDU_PRIMARY_KEY_COLS.key())
+ .split(","))
: tableSchema.getPrimaryKey().get().getColumns();
}
public static List<String> getHashColumns(Map<String, String>
tableProperties) {
- return
Arrays.asList(tableProperties.get(KUDU_HASH_COLS.key()).split(","));
+ return Arrays.asList(
+ tableProperties
+
.get(KuduDynamicTableSourceSinkFactory.KUDU_HASH_COLS.key())
+ .split(","));
}
public static TableSchema getSchemaWithSqlTimestamp(TableSchema schema) {
diff --git
a/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/table/utils/KuduTypeUtils.java
b/flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/table/utils/KuduTypeUtils.java
similarity index 98%
rename from
flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/table/utils/KuduTypeUtils.java
rename to
flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/table/utils/KuduTypeUtils.java
index 3f18bb9..55a40ac 100644
---
a/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/table/utils/KuduTypeUtils.java
+++
b/flink-connector-kudu/src/main/java/org/apache/flink/connector/kudu/table/utils/KuduTypeUtils.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.flink.connectors.kudu.table.utils;
+package org.apache.flink.connector.kudu.table.utils;
import org.apache.flink.table.api.DataTypes;
import org.apache.flink.table.types.AtomicDataType;
diff --git
a/flink-connector-kudu/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory
b/flink-connector-kudu/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory
index 6da911f..48d5746 100644
---
a/flink-connector-kudu/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory
+++
b/flink-connector-kudu/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.
-org.apache.flink.connectors.kudu.table.dynamic.KuduDynamicTableSourceSinkFactory
\ No newline at end of file
+org.apache.flink.connector.kudu.table.dynamic.KuduDynamicTableSourceSinkFactory
diff --git
a/flink-connector-kudu/src/main/resources/META-INF/services/org.apache.flink.table.factories.TableFactory
b/flink-connector-kudu/src/main/resources/META-INF/services/org.apache.flink.table.factories.TableFactory
index 3ae32fe..ca6fe21 100644
---
a/flink-connector-kudu/src/main/resources/META-INF/services/org.apache.flink.table.factories.TableFactory
+++
b/flink-connector-kudu/src/main/resources/META-INF/services/org.apache.flink.table.factories.TableFactory
@@ -13,5 +13,5 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-org.apache.flink.connectors.kudu.table.KuduTableFactory
-org.apache.flink.connectors.kudu.table.dynamic.catalog.KuduCatalogFactory
+org.apache.flink.connector.kudu.table.KuduTableFactory
+org.apache.flink.connector.kudu.table.dynamic.catalog.KuduCatalogFactory
diff --git
a/flink-connector-kudu/src/test/java/org/apache/flink/connectors/kudu/connector/KuduFilterInfoTest.java
b/flink-connector-kudu/src/test/java/org/apache/flink/connector/kudu/connector/KuduFilterInfoTest.java
similarity index 96%
rename from
flink-connector-kudu/src/test/java/org/apache/flink/connectors/kudu/connector/KuduFilterInfoTest.java
rename to
flink-connector-kudu/src/test/java/org/apache/flink/connector/kudu/connector/KuduFilterInfoTest.java
index 731af29..b1164da 100644
---
a/flink-connector-kudu/src/test/java/org/apache/flink/connectors/kudu/connector/KuduFilterInfoTest.java
+++
b/flink-connector-kudu/src/test/java/org/apache/flink/connector/kudu/connector/KuduFilterInfoTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.flink.connectors.kudu.connector;
+package org.apache.flink.connector.kudu.connector;
import org.apache.flink.table.data.binary.BinaryStringData;
diff --git
a/flink-connector-kudu/src/test/java/org/apache/flink/connectors/kudu/connector/KuduTestBase.java
b/flink-connector-kudu/src/test/java/org/apache/flink/connector/kudu/connector/KuduTestBase.java
similarity index 95%
rename from
flink-connector-kudu/src/test/java/org/apache/flink/connectors/kudu/connector/KuduTestBase.java
rename to
flink-connector-kudu/src/test/java/org/apache/flink/connector/kudu/connector/KuduTestBase.java
index b6772e6..7ebb062 100644
---
a/flink-connector-kudu/src/test/java/org/apache/flink/connectors/kudu/connector/KuduTestBase.java
+++
b/flink-connector-kudu/src/test/java/org/apache/flink/connector/kudu/connector/KuduTestBase.java
@@ -15,19 +15,19 @@
* limitations under the License.
*/
-package org.apache.flink.connectors.kudu.connector;
+package org.apache.flink.connector.kudu.connector;
import org.apache.flink.api.java.tuple.Tuple5;
-import
org.apache.flink.connectors.kudu.connector.converter.RowResultRowConverter;
-import
org.apache.flink.connectors.kudu.connector.converter.RowResultRowDataConverter;
-import org.apache.flink.connectors.kudu.connector.reader.KuduInputSplit;
-import org.apache.flink.connectors.kudu.connector.reader.KuduReader;
-import org.apache.flink.connectors.kudu.connector.reader.KuduReaderConfig;
-import org.apache.flink.connectors.kudu.connector.reader.KuduReaderIterator;
-import
org.apache.flink.connectors.kudu.connector.writer.AbstractSingleOperationMapper;
-import org.apache.flink.connectors.kudu.connector.writer.KuduWriter;
-import org.apache.flink.connectors.kudu.connector.writer.KuduWriterConfig;
-import org.apache.flink.connectors.kudu.connector.writer.RowOperationMapper;
+import
org.apache.flink.connector.kudu.connector.converter.RowResultRowConverter;
+import
org.apache.flink.connector.kudu.connector.converter.RowResultRowDataConverter;
+import org.apache.flink.connector.kudu.connector.reader.KuduInputSplit;
+import org.apache.flink.connector.kudu.connector.reader.KuduReader;
+import org.apache.flink.connector.kudu.connector.reader.KuduReaderConfig;
+import org.apache.flink.connector.kudu.connector.reader.KuduReaderIterator;
+import
org.apache.flink.connector.kudu.connector.writer.AbstractSingleOperationMapper;
+import org.apache.flink.connector.kudu.connector.writer.KuduWriter;
+import org.apache.flink.connector.kudu.connector.writer.KuduWriterConfig;
+import org.apache.flink.connector.kudu.connector.writer.RowOperationMapper;
import org.apache.flink.table.api.DataTypes;
import org.apache.flink.table.api.TableSchema;
import org.apache.flink.table.data.GenericRowData;
diff --git
a/flink-connector-kudu/src/test/java/org/apache/flink/connectors/kudu/format/KuduOutputFormatTest.java
b/flink-connector-kudu/src/test/java/org/apache/flink/connector/kudu/format/KuduOutputFormatTest.java
similarity index 91%
rename from
flink-connector-kudu/src/test/java/org/apache/flink/connectors/kudu/format/KuduOutputFormatTest.java
rename to
flink-connector-kudu/src/test/java/org/apache/flink/connector/kudu/format/KuduOutputFormatTest.java
index 53b285a..32c454f 100644
---
a/flink-connector-kudu/src/test/java/org/apache/flink/connectors/kudu/format/KuduOutputFormatTest.java
+++
b/flink-connector-kudu/src/test/java/org/apache/flink/connector/kudu/format/KuduOutputFormatTest.java
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package org.apache.flink.connectors.kudu.format;
+package org.apache.flink.connector.kudu.format;
-import org.apache.flink.connectors.kudu.connector.KuduTableInfo;
-import org.apache.flink.connectors.kudu.connector.KuduTestBase;
-import
org.apache.flink.connectors.kudu.connector.writer.AbstractSingleOperationMapper;
-import org.apache.flink.connectors.kudu.connector.writer.KuduWriterConfig;
-import org.apache.flink.connectors.kudu.connector.writer.RowOperationMapper;
+import org.apache.flink.connector.kudu.connector.KuduTableInfo;
+import org.apache.flink.connector.kudu.connector.KuduTestBase;
+import
org.apache.flink.connector.kudu.connector.writer.AbstractSingleOperationMapper;
+import org.apache.flink.connector.kudu.connector.writer.KuduWriterConfig;
+import org.apache.flink.connector.kudu.connector.writer.RowOperationMapper;
import org.apache.flink.types.Row;
import org.junit.jupiter.api.Assertions;
diff --git
a/flink-connector-kudu/src/test/java/org/apache/flink/connectors/kudu/format/KuduRowDataInputFormatTest.java
b/flink-connector-kudu/src/test/java/org/apache/flink/connector/kudu/format/KuduRowDataInputFormatTest.java
similarity index 90%
rename from
flink-connector-kudu/src/test/java/org/apache/flink/connectors/kudu/format/KuduRowDataInputFormatTest.java
rename to
flink-connector-kudu/src/test/java/org/apache/flink/connector/kudu/format/KuduRowDataInputFormatTest.java
index f5996f8..8c4f648 100644
---
a/flink-connector-kudu/src/test/java/org/apache/flink/connectors/kudu/format/KuduRowDataInputFormatTest.java
+++
b/flink-connector-kudu/src/test/java/org/apache/flink/connector/kudu/format/KuduRowDataInputFormatTest.java
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package org.apache.flink.connectors.kudu.format;
-
-import org.apache.flink.connectors.kudu.connector.KuduTableInfo;
-import org.apache.flink.connectors.kudu.connector.KuduTestBase;
-import
org.apache.flink.connectors.kudu.connector.converter.RowResultRowConverter;
-import
org.apache.flink.connectors.kudu.connector.converter.RowResultRowDataConverter;
-import org.apache.flink.connectors.kudu.connector.reader.KuduInputSplit;
-import org.apache.flink.connectors.kudu.connector.reader.KuduReaderConfig;
+package org.apache.flink.connector.kudu.format;
+
+import org.apache.flink.connector.kudu.connector.KuduTableInfo;
+import org.apache.flink.connector.kudu.connector.KuduTestBase;
+import
org.apache.flink.connector.kudu.connector.converter.RowResultRowConverter;
+import
org.apache.flink.connector.kudu.connector.converter.RowResultRowDataConverter;
+import org.apache.flink.connector.kudu.connector.reader.KuduInputSplit;
+import org.apache.flink.connector.kudu.connector.reader.KuduReaderConfig;
import org.apache.flink.table.data.GenericRowData;
import org.apache.flink.table.data.RowData;
import org.apache.flink.types.Row;
diff --git
a/flink-connector-kudu/src/test/java/org/apache/flink/connectors/kudu/format/KuduRowInputFormatTest.java
b/flink-connector-kudu/src/test/java/org/apache/flink/connector/kudu/format/KuduRowInputFormatTest.java
similarity index 89%
rename from
flink-connector-kudu/src/test/java/org/apache/flink/connectors/kudu/format/KuduRowInputFormatTest.java
rename to
flink-connector-kudu/src/test/java/org/apache/flink/connector/kudu/format/KuduRowInputFormatTest.java
index 3bb0b3c..c5a9f46 100644
---
a/flink-connector-kudu/src/test/java/org/apache/flink/connectors/kudu/format/KuduRowInputFormatTest.java
+++
b/flink-connector-kudu/src/test/java/org/apache/flink/connector/kudu/format/KuduRowInputFormatTest.java
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package org.apache.flink.connectors.kudu.format;
+package org.apache.flink.connector.kudu.format;
-import org.apache.flink.connectors.kudu.connector.KuduTableInfo;
-import org.apache.flink.connectors.kudu.connector.KuduTestBase;
-import
org.apache.flink.connectors.kudu.connector.converter.RowResultRowConverter;
-import org.apache.flink.connectors.kudu.connector.reader.KuduInputSplit;
-import org.apache.flink.connectors.kudu.connector.reader.KuduReaderConfig;
+import org.apache.flink.connector.kudu.connector.KuduTableInfo;
+import org.apache.flink.connector.kudu.connector.KuduTestBase;
+import
org.apache.flink.connector.kudu.connector.converter.RowResultRowConverter;
+import org.apache.flink.connector.kudu.connector.reader.KuduInputSplit;
+import org.apache.flink.connector.kudu.connector.reader.KuduReaderConfig;
import org.apache.flink.types.Row;
import org.junit.jupiter.api.Assertions;
diff --git
a/flink-connector-kudu/src/test/java/org/apache/flink/connectors/kudu/streaming/KuduSinkTest.java
b/flink-connector-kudu/src/test/java/org/apache/flink/connector/kudu/streaming/KuduSinkTest.java
similarity index 95%
rename from
flink-connector-kudu/src/test/java/org/apache/flink/connectors/kudu/streaming/KuduSinkTest.java
rename to
flink-connector-kudu/src/test/java/org/apache/flink/connector/kudu/streaming/KuduSinkTest.java
index b8a30e5..957a1ad 100644
---
a/flink-connector-kudu/src/test/java/org/apache/flink/connectors/kudu/streaming/KuduSinkTest.java
+++
b/flink-connector-kudu/src/test/java/org/apache/flink/connector/kudu/streaming/KuduSinkTest.java
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package org.apache.flink.connectors.kudu.streaming;
+package org.apache.flink.connector.kudu.streaming;
import org.apache.flink.configuration.Configuration;
-import org.apache.flink.connectors.kudu.connector.KuduTableInfo;
-import org.apache.flink.connectors.kudu.connector.KuduTestBase;
-import
org.apache.flink.connectors.kudu.connector.writer.AbstractSingleOperationMapper;
-import org.apache.flink.connectors.kudu.connector.writer.KuduWriterConfig;
-import org.apache.flink.connectors.kudu.connector.writer.RowOperationMapper;
+import org.apache.flink.connector.kudu.connector.KuduTableInfo;
+import org.apache.flink.connector.kudu.connector.KuduTestBase;
+import
org.apache.flink.connector.kudu.connector.writer.AbstractSingleOperationMapper;
+import org.apache.flink.connector.kudu.connector.writer.KuduWriterConfig;
+import org.apache.flink.connector.kudu.connector.writer.RowOperationMapper;
import org.apache.flink.streaming.api.operators.StreamingRuntimeContext;
import org.apache.flink.types.Row;
diff --git
a/flink-connector-kudu/src/test/java/org/apache/flink/connectors/kudu/table/KuduCatalogTest.java
b/flink-connector-kudu/src/test/java/org/apache/flink/connector/kudu/table/KuduCatalogTest.java
similarity index 97%
rename from
flink-connector-kudu/src/test/java/org/apache/flink/connectors/kudu/table/KuduCatalogTest.java
rename to
flink-connector-kudu/src/test/java/org/apache/flink/connector/kudu/table/KuduCatalogTest.java
index fe6e15d..54cb625 100644
---
a/flink-connector-kudu/src/test/java/org/apache/flink/connectors/kudu/table/KuduCatalogTest.java
+++
b/flink-connector-kudu/src/test/java/org/apache/flink/connector/kudu/table/KuduCatalogTest.java
@@ -15,17 +15,17 @@
* limitations under the License.
*/
-package org.apache.flink.connectors.kudu.table;
+package org.apache.flink.connector.kudu.table;
import org.apache.flink.api.common.typeinfo.TypeHint;
import org.apache.flink.api.common.typeinfo.Types;
import org.apache.flink.api.java.tuple.Tuple2;
-import org.apache.flink.connectors.kudu.connector.KuduTableInfo;
-import org.apache.flink.connectors.kudu.connector.KuduTestBase;
-import
org.apache.flink.connectors.kudu.connector.writer.AbstractSingleOperationMapper;
-import org.apache.flink.connectors.kudu.connector.writer.KuduWriterConfig;
-import org.apache.flink.connectors.kudu.connector.writer.TupleOperationMapper;
-import org.apache.flink.connectors.kudu.streaming.KuduSink;
+import org.apache.flink.connector.kudu.connector.KuduTableInfo;
+import org.apache.flink.connector.kudu.connector.KuduTestBase;
+import
org.apache.flink.connector.kudu.connector.writer.AbstractSingleOperationMapper;
+import org.apache.flink.connector.kudu.connector.writer.KuduWriterConfig;
+import org.apache.flink.connector.kudu.connector.writer.TupleOperationMapper;
+import org.apache.flink.connector.kudu.streaming.KuduSink;
import org.apache.flink.streaming.api.datastream.DataStream;
import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment;
import org.apache.flink.streaming.api.functions.sink.SinkFunction;
diff --git
a/flink-connector-kudu/src/test/java/org/apache/flink/connectors/kudu/table/KuduTableFactoryTest.java
b/flink-connector-kudu/src/test/java/org/apache/flink/connector/kudu/table/KuduTableFactoryTest.java
similarity index 97%
rename from
flink-connector-kudu/src/test/java/org/apache/flink/connectors/kudu/table/KuduTableFactoryTest.java
rename to
flink-connector-kudu/src/test/java/org/apache/flink/connector/kudu/table/KuduTableFactoryTest.java
index 69b8e88..8f27e61 100644
---
a/flink-connector-kudu/src/test/java/org/apache/flink/connectors/kudu/table/KuduTableFactoryTest.java
+++
b/flink-connector-kudu/src/test/java/org/apache/flink/connector/kudu/table/KuduTableFactoryTest.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.flink.connectors.kudu.table;
+package org.apache.flink.connector.kudu.table;
-import org.apache.flink.connectors.kudu.connector.KuduTableInfo;
-import org.apache.flink.connectors.kudu.connector.KuduTestBase;
-import org.apache.flink.connectors.kudu.connector.writer.KuduWriterConfig;
+import org.apache.flink.connector.kudu.connector.KuduTableInfo;
+import org.apache.flink.connector.kudu.connector.KuduTestBase;
+import org.apache.flink.connector.kudu.connector.writer.KuduWriterConfig;
import org.apache.flink.core.execution.JobClient;
import org.apache.flink.runtime.client.JobExecutionException;
import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment;
diff --git
a/flink-connector-kudu/src/test/java/org/apache/flink/connectors/kudu/table/KuduTableSourceITCase.java
b/flink-connector-kudu/src/test/java/org/apache/flink/connector/kudu/table/KuduTableSourceITCase.java
similarity index 94%
rename from
flink-connector-kudu/src/test/java/org/apache/flink/connectors/kudu/table/KuduTableSourceITCase.java
rename to
flink-connector-kudu/src/test/java/org/apache/flink/connector/kudu/table/KuduTableSourceITCase.java
index 9d2b378..2468e77 100644
---
a/flink-connector-kudu/src/test/java/org/apache/flink/connectors/kudu/table/KuduTableSourceITCase.java
+++
b/flink-connector-kudu/src/test/java/org/apache/flink/connector/kudu/table/KuduTableSourceITCase.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.apache.flink.connectors.kudu.table;
+package org.apache.flink.connector.kudu.table;
-import org.apache.flink.connectors.kudu.connector.KuduTableInfo;
-import org.apache.flink.connectors.kudu.connector.KuduTestBase;
+import org.apache.flink.connector.kudu.connector.KuduTableInfo;
+import org.apache.flink.connector.kudu.connector.KuduTestBase;
import org.apache.flink.table.api.TableEnvironment;
import org.apache.flink.types.Row;
import org.apache.flink.util.CloseableIterator;
diff --git
a/flink-connector-kudu/src/test/java/org/apache/flink/connectors/kudu/table/KuduTableSourceTest.java
b/flink-connector-kudu/src/test/java/org/apache/flink/connector/kudu/table/KuduTableSourceTest.java
similarity index 97%
rename from
flink-connector-kudu/src/test/java/org/apache/flink/connectors/kudu/table/KuduTableSourceTest.java
rename to
flink-connector-kudu/src/test/java/org/apache/flink/connector/kudu/table/KuduTableSourceTest.java
index 1407dda..ac04d17 100644
---
a/flink-connector-kudu/src/test/java/org/apache/flink/connectors/kudu/table/KuduTableSourceTest.java
+++
b/flink-connector-kudu/src/test/java/org/apache/flink/connector/kudu/table/KuduTableSourceTest.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.apache.flink.connectors.kudu.table;
+package org.apache.flink.connector.kudu.table;
-import org.apache.flink.connectors.kudu.connector.KuduTableInfo;
-import org.apache.flink.connectors.kudu.connector.KuduTestBase;
+import org.apache.flink.connector.kudu.connector.KuduTableInfo;
+import org.apache.flink.connector.kudu.connector.KuduTestBase;
import org.apache.flink.table.api.DataTypes;
import org.apache.flink.table.api.TableSchema;
import org.apache.flink.table.catalog.ObjectPath;
diff --git
a/flink-connector-kudu/src/test/java/org/apache/flink/connectors/kudu/table/KuduTableTestUtils.java
b/flink-connector-kudu/src/test/java/org/apache/flink/connector/kudu/table/KuduTableTestUtils.java
similarity index 97%
rename from
flink-connector-kudu/src/test/java/org/apache/flink/connectors/kudu/table/KuduTableTestUtils.java
rename to
flink-connector-kudu/src/test/java/org/apache/flink/connector/kudu/table/KuduTableTestUtils.java
index aadb031..88cb81d 100644
---
a/flink-connector-kudu/src/test/java/org/apache/flink/connectors/kudu/table/KuduTableTestUtils.java
+++
b/flink-connector-kudu/src/test/java/org/apache/flink/connector/kudu/table/KuduTableTestUtils.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.flink.connectors.kudu.table;
+package org.apache.flink.connector.kudu.table;
import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment;
import org.apache.flink.table.api.EnvironmentSettings;
diff --git
a/flink-connector-kudu/src/test/java/org/apache/flink/connectors/kudu/table/dynamic/KuduDynamicSinkTest.java
b/flink-connector-kudu/src/test/java/org/apache/flink/connector/kudu/table/dynamic/KuduDynamicSinkTest.java
similarity index 94%
rename from
flink-connector-kudu/src/test/java/org/apache/flink/connectors/kudu/table/dynamic/KuduDynamicSinkTest.java
rename to
flink-connector-kudu/src/test/java/org/apache/flink/connector/kudu/table/dynamic/KuduDynamicSinkTest.java
index c198048..5b417c8 100644
---
a/flink-connector-kudu/src/test/java/org/apache/flink/connectors/kudu/table/dynamic/KuduDynamicSinkTest.java
+++
b/flink-connector-kudu/src/test/java/org/apache/flink/connector/kudu/table/dynamic/KuduDynamicSinkTest.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.apache.flink.connectors.kudu.table.dynamic;
+package org.apache.flink.connector.kudu.table.dynamic;
-import org.apache.flink.connectors.kudu.connector.KuduTableInfo;
-import org.apache.flink.connectors.kudu.connector.KuduTestBase;
+import org.apache.flink.connector.kudu.connector.KuduTableInfo;
+import org.apache.flink.connector.kudu.connector.KuduTestBase;
import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment;
import org.apache.flink.table.api.TableEnvironment;
import org.apache.flink.table.api.bridge.java.StreamTableEnvironment;
diff --git
a/flink-connector-kudu/src/test/java/org/apache/flink/connectors/kudu/table/dynamic/KuduDynamicSourceTest.java
b/flink-connector-kudu/src/test/java/org/apache/flink/connector/kudu/table/dynamic/KuduDynamicSourceTest.java
similarity index 97%
rename from
flink-connector-kudu/src/test/java/org/apache/flink/connectors/kudu/table/dynamic/KuduDynamicSourceTest.java
rename to
flink-connector-kudu/src/test/java/org/apache/flink/connector/kudu/table/dynamic/KuduDynamicSourceTest.java
index 1741ca0..967d61c 100644
---
a/flink-connector-kudu/src/test/java/org/apache/flink/connectors/kudu/table/dynamic/KuduDynamicSourceTest.java
+++
b/flink-connector-kudu/src/test/java/org/apache/flink/connector/kudu/table/dynamic/KuduDynamicSourceTest.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.apache.flink.connectors.kudu.table.dynamic;
+package org.apache.flink.connector.kudu.table.dynamic;
-import org.apache.flink.connectors.kudu.connector.KuduTableInfo;
-import org.apache.flink.connectors.kudu.connector.KuduTestBase;
+import org.apache.flink.connector.kudu.connector.KuduTableInfo;
+import org.apache.flink.connector.kudu.connector.KuduTestBase;
import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment;
import org.apache.flink.table.api.TableEnvironment;
import org.apache.flink.table.api.bridge.java.StreamTableEnvironment;
diff --git
a/flink-connector-kudu/src/test/java/org/apache/flink/connectors/kudu/table/dynamic/KuduRowDataLookupFunctionTest.java
b/flink-connector-kudu/src/test/java/org/apache/flink/connector/kudu/table/dynamic/KuduRowDataLookupFunctionTest.java
similarity index 91%
rename from
flink-connector-kudu/src/test/java/org/apache/flink/connectors/kudu/table/dynamic/KuduRowDataLookupFunctionTest.java
rename to
flink-connector-kudu/src/test/java/org/apache/flink/connector/kudu/table/dynamic/KuduRowDataLookupFunctionTest.java
index 5775d5f..bc728ec 100644
---
a/flink-connector-kudu/src/test/java/org/apache/flink/connectors/kudu/table/dynamic/KuduRowDataLookupFunctionTest.java
+++
b/flink-connector-kudu/src/test/java/org/apache/flink/connector/kudu/table/dynamic/KuduRowDataLookupFunctionTest.java
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package org.apache.flink.connectors.kudu.table.dynamic;
+package org.apache.flink.connector.kudu.table.dynamic;
-import org.apache.flink.connectors.kudu.connector.KuduTableInfo;
-import org.apache.flink.connectors.kudu.connector.KuduTestBase;
-import org.apache.flink.connectors.kudu.connector.reader.KuduReaderConfig;
-import
org.apache.flink.connectors.kudu.table.function.lookup.KuduLookupOptions;
-import
org.apache.flink.connectors.kudu.table.function.lookup.KuduRowDataLookupFunction;
+import org.apache.flink.connector.kudu.connector.KuduTableInfo;
+import org.apache.flink.connector.kudu.connector.KuduTestBase;
+import org.apache.flink.connector.kudu.connector.reader.KuduReaderConfig;
+import org.apache.flink.connector.kudu.table.function.lookup.KuduLookupOptions;
+import
org.apache.flink.connector.kudu.table.function.lookup.KuduRowDataLookupFunction;
import org.apache.flink.table.data.RowData;
import org.apache.flink.util.Collector;
diff --git
a/flink-connector-kudu/src/test/java/org/apache/flink/connectors/kudu/writer/AbstractOperationTest.java
b/flink-connector-kudu/src/test/java/org/apache/flink/connector/kudu/writer/AbstractOperationTest.java
similarity index 95%
rename from
flink-connector-kudu/src/test/java/org/apache/flink/connectors/kudu/writer/AbstractOperationTest.java
rename to
flink-connector-kudu/src/test/java/org/apache/flink/connector/kudu/writer/AbstractOperationTest.java
index c5f7d28..6b8fa0b 100644
---
a/flink-connector-kudu/src/test/java/org/apache/flink/connectors/kudu/writer/AbstractOperationTest.java
+++
b/flink-connector-kudu/src/test/java/org/apache/flink/connector/kudu/writer/AbstractOperationTest.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.flink.connectors.kudu.writer;
+package org.apache.flink.connector.kudu.writer;
-import org.apache.flink.connectors.kudu.connector.KuduTestBase;
+import org.apache.flink.connector.kudu.connector.KuduTestBase;
import org.apache.kudu.Schema;
import org.apache.kudu.client.Delete;
diff --git
a/flink-connector-kudu/src/test/java/org/apache/flink/connectors/kudu/writer/PojoOperationMapperTest.java
b/flink-connector-kudu/src/test/java/org/apache/flink/connector/kudu/writer/PojoOperationMapperTest.java
similarity index 85%
rename from
flink-connector-kudu/src/test/java/org/apache/flink/connectors/kudu/writer/PojoOperationMapperTest.java
rename to
flink-connector-kudu/src/test/java/org/apache/flink/connector/kudu/writer/PojoOperationMapperTest.java
index 2054864..781f73f 100644
---
a/flink-connector-kudu/src/test/java/org/apache/flink/connectors/kudu/writer/PojoOperationMapperTest.java
+++
b/flink-connector-kudu/src/test/java/org/apache/flink/connector/kudu/writer/PojoOperationMapperTest.java
@@ -15,12 +15,11 @@
* limitations under the License.
*/
-package org.apache.flink.connectors.kudu.writer;
+package org.apache.flink.connector.kudu.writer;
-import org.apache.flink.connectors.kudu.connector.KuduTestBase;
-import org.apache.flink.connectors.kudu.connector.KuduTestBase.BookInfo;
-import
org.apache.flink.connectors.kudu.connector.writer.AbstractSingleOperationMapper;
-import org.apache.flink.connectors.kudu.connector.writer.PojoOperationMapper;
+import org.apache.flink.connector.kudu.connector.KuduTestBase;
+import
org.apache.flink.connector.kudu.connector.writer.AbstractSingleOperationMapper;
+import org.apache.flink.connector.kudu.connector.writer.PojoOperationMapper;
import org.apache.kudu.client.Operation;
import org.apache.kudu.client.PartialRow;
@@ -37,13 +36,13 @@ public class PojoOperationMapperTest extends
AbstractOperationTest {
@Test
void testPojoMapper() {
- PojoOperationMapper<BookInfo> mapper =
+ PojoOperationMapper<KuduTestBase.BookInfo> mapper =
new PojoOperationMapper<>(
- BookInfo.class,
+ KuduTestBase.BookInfo.class,
KuduTestBase.columns,
AbstractSingleOperationMapper.KuduOperation.INSERT);
- BookInfo bookInfo = KuduTestBase.booksDataPojo().get(0);
+ KuduTestBase.BookInfo bookInfo = KuduTestBase.booksDataPojo().get(0);
assertEquals(bookInfo.id, mapper.getField(bookInfo, 0));
assertEquals(bookInfo.title, mapper.getField(bookInfo, 1));
diff --git
a/flink-connector-kudu/src/test/java/org/apache/flink/connectors/kudu/writer/RowDataUpsertOperationMapperTest.java
b/flink-connector-kudu/src/test/java/org/apache/flink/connector/kudu/writer/RowDataUpsertOperationMapperTest.java
similarity index 90%
rename from
flink-connector-kudu/src/test/java/org/apache/flink/connectors/kudu/writer/RowDataUpsertOperationMapperTest.java
rename to
flink-connector-kudu/src/test/java/org/apache/flink/connector/kudu/writer/RowDataUpsertOperationMapperTest.java
index 28f91d5..8e6f441 100644
---
a/flink-connector-kudu/src/test/java/org/apache/flink/connectors/kudu/writer/RowDataUpsertOperationMapperTest.java
+++
b/flink-connector-kudu/src/test/java/org/apache/flink/connector/kudu/writer/RowDataUpsertOperationMapperTest.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.apache.flink.connectors.kudu.writer;
+package org.apache.flink.connector.kudu.writer;
-import org.apache.flink.connectors.kudu.connector.KuduTestBase;
-import
org.apache.flink.connectors.kudu.connector.writer.RowDataUpsertOperationMapper;
+import org.apache.flink.connector.kudu.connector.KuduTestBase;
+import
org.apache.flink.connector.kudu.connector.writer.RowDataUpsertOperationMapper;
import org.apache.flink.table.data.RowData;
import org.apache.kudu.client.Operation;
diff --git
a/flink-connector-kudu/src/test/java/org/apache/flink/connectors/kudu/writer/RowOperationMapperTest.java
b/flink-connector-kudu/src/test/java/org/apache/flink/connector/kudu/writer/RowOperationMapperTest.java
similarity index 90%
rename from
flink-connector-kudu/src/test/java/org/apache/flink/connectors/kudu/writer/RowOperationMapperTest.java
rename to
flink-connector-kudu/src/test/java/org/apache/flink/connector/kudu/writer/RowOperationMapperTest.java
index 57c46c7..0a5f196 100644
---
a/flink-connector-kudu/src/test/java/org/apache/flink/connectors/kudu/writer/RowOperationMapperTest.java
+++
b/flink-connector-kudu/src/test/java/org/apache/flink/connector/kudu/writer/RowOperationMapperTest.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.flink.connectors.kudu.writer;
+package org.apache.flink.connector.kudu.writer;
-import org.apache.flink.connectors.kudu.connector.KuduTestBase;
-import
org.apache.flink.connectors.kudu.connector.writer.AbstractSingleOperationMapper;
-import org.apache.flink.connectors.kudu.connector.writer.RowOperationMapper;
+import org.apache.flink.connector.kudu.connector.KuduTestBase;
+import
org.apache.flink.connector.kudu.connector.writer.AbstractSingleOperationMapper;
+import org.apache.flink.connector.kudu.connector.writer.RowOperationMapper;
import org.apache.flink.types.Row;
import org.apache.kudu.client.Operation;
diff --git
a/flink-connector-kudu/src/test/java/org/apache/flink/connectors/kudu/writer/TupleOperationMapperTest.java
b/flink-connector-kudu/src/test/java/org/apache/flink/connector/kudu/writer/TupleOperationMapperTest.java
similarity index 91%
rename from
flink-connector-kudu/src/test/java/org/apache/flink/connectors/kudu/writer/TupleOperationMapperTest.java
rename to
flink-connector-kudu/src/test/java/org/apache/flink/connector/kudu/writer/TupleOperationMapperTest.java
index 774d3ed..cd7c721 100644
---
a/flink-connector-kudu/src/test/java/org/apache/flink/connectors/kudu/writer/TupleOperationMapperTest.java
+++
b/flink-connector-kudu/src/test/java/org/apache/flink/connector/kudu/writer/TupleOperationMapperTest.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.flink.connectors.kudu.writer;
+package org.apache.flink.connector.kudu.writer;
import org.apache.flink.api.java.tuple.Tuple5;
-import org.apache.flink.connectors.kudu.connector.KuduTestBase;
-import
org.apache.flink.connectors.kudu.connector.writer.AbstractSingleOperationMapper;
-import org.apache.flink.connectors.kudu.connector.writer.TupleOperationMapper;
+import org.apache.flink.connector.kudu.connector.KuduTestBase;
+import
org.apache.flink.connector.kudu.connector.writer.AbstractSingleOperationMapper;
+import org.apache.flink.connector.kudu.connector.writer.TupleOperationMapper;
import org.apache.kudu.client.Operation;
import org.junit.jupiter.api.Assertions;
