You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rocketmq.apache.org by li...@apache.org on 2026/07/22 03:56:41 UTC

(rocketmq-flink) branch main updated: [ISSUE #133] refactor: restructure to multi-module layout and harden the remoting connector (#134)

This is an automated email from the ASF dual-hosted git repository.

lizhimins pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/rocketmq-flink.git


The following commit(s) were added to refs/heads/main by this push:
     new 3d803c2  [ISSUE #133] refactor: restructure to multi-module layout and harden the remoting connector (#134)
3d803c2 is described below

commit 3d803c292059f21a90c578904139e21fa9642f9e
Author: lizhimins <70...@qq.com>
AuthorDate: Wed Jul 22 11:56:35 2026 +0800

    [ISSUE #133] refactor: restructure to multi-module layout and harden the remoting connector (#134)
    
    Split the single-module project into flink-connector-rocketmq +
    flink-sql-connector-rocketmq, move legacy classes under
    streaming.connectors.rocketmq, and fix a batch of issues found in
    review and verified against an Aliyun commercial instance:
    
    - implement the no-op SQL row deserialization (source rows were empty)
    - close the producer in RocketMQWriter, rework AT_LEAST_ONCE to async
      send with pending counter and flush barrier, call
      serializationSchema.open() on construction
    - propagate fetch()/fetchOffsets failures instead of swallowing them
    - add consumer-side fallback for min/max/committed/timestamp offset
      lookup when admin broker-name resolution fails on cloud instances
    - implement sanityCheck() in source/sink builders
    - apply parameter passthrough fixes (send timeout/retry, batch size,
      namespace, filters, scan.mode auto-infer, transaction timeout unit)
    - wire USE_TLS, MQ_CLIENT_API_TIMEOUT, CLIENT_CALLBACK_EXECUTOR_THREADS
      and the pull flow-control options; drop dead options and unused code
    
    Tests: migrate unit tests to the new layout and add manual integration
    tests against a real commercial instance (FLIP-27 datastream pipeline,
    EXACTLY_ONCE two-phase commit, SQL DDL end-to-end); credentials are
    read from the environment.
    
    CI and docs: add GitHub Actions (spotless:check + clean package on a
    JDK 11/17 matrix, replacing the stale .travis.yml), rewrite the README
    following the official Flink connector layout, split detailed
    configuration into docs/ (remoting-connector.md, sql-connector.md,
    legacy-connector.md) and add url/licenses/mailing lists to the pom.
---
 .github/workflows/build.yml                        |  56 ++
 .gitignore                                         |   5 +-
 .travis.yml                                        |  29 -
 README.md                                          | 314 +++------
 docs/connector-overview.md                         |  58 ++
 docs/grpc-connector.md                             | 119 ++++
 docs/legacy-connector.md                           |  92 +++
 docs/remoting-connector.md                         | 108 +++
 docs/sql-connector.md                              |  68 ++
 flink-connector-rocketmq/pom.xml                   | 296 ++++++++
 .../rocketmq/catalog/RocketMQCatalog.java          |   0
 .../rocketmq/catalog/RocketMQCatalogFactory.java   |   0
 .../catalog/RocketMQCatalogFactoryOptions.java     |   4 +-
 .../common/config/RocketMQConfigBuilder.java       |   0
 .../common/config/RocketMQConfigValidator.java     |  12 +-
 .../common/config/RocketMQConfiguration.java       |   0
 .../rocketmq/common/config/RocketMQOptions.java    |  28 +-
 .../common/constant/RocketMqCatalogConstant.java   |   0
 .../common/constant/SchemaRegistryConstant.java    |   2 +-
 .../rocketmq/common/event/SourceCheckEvent.java    |   0
 .../rocketmq/common/event/SourceDetectEvent.java   |   0
 .../common/event/SourceInitAssignEvent.java        |   0
 .../common/event/SourceReportOffsetEvent.java      |   0
 .../connector/rocketmq/common/lock/SpinLock.java   |   3 +-
 .../connector/rocketmq/sink/InnerProducer.java     |   0
 .../connector/rocketmq/sink/InnerProducerImpl.java |  57 +-
 .../connector/rocketmq/sink/RocketMQSink.java      |   2 +-
 .../rocketmq/sink/RocketMQSinkBuilder.java         |  18 +-
 .../rocketmq/sink/RocketMQSinkOptions.java         |  26 +-
 .../connector/rocketmq/sink/TransactionResult.java |   0
 .../rocketmq/sink/committer/RocketMQCommitter.java |   5 +-
 .../rocketmq/sink/committer/SendCommittable.java   |   0
 .../sink/committer/SendCommittableSerializer.java  |   0
 .../rocketmq/sink/writer/RocketMQWriter.java       | 113 +++-
 .../sink/writer/context/RocketMQSinkContext.java   |   0
 .../writer/context/RocketMQSinkContextImpl.java    |   0
 .../serializer/RocketMQSerializationSchema.java    |   0
 .../serializer/RocketMQSerializerWrapper.java      |   0
 .../connector/rocketmq/source/InnerConsumer.java   |   0
 .../rocketmq/source/InnerConsumerImpl.java         | 292 +++++---
 .../connector/rocketmq/source/RocketMQSource.java  |   4 -
 .../rocketmq/source/RocketMQSourceBuilder.java     |  19 +-
 .../rocketmq/source/RocketMQSourceOptions.java     |   2 +-
 .../rocketmq/source/config/OffsetVerification.java |   0
 .../source/enumerator/RocketMQSourceEnumState.java |   0
 .../RocketMQSourceEnumStateSerializer.java         |   0
 .../enumerator/RocketMQSourceEnumerator.java       |  19 +-
 .../enumerator/allocate/AllocateStrategy.java      |   0
 .../allocate/AllocateStrategyFactory.java          |   0
 .../allocate/AverageAllocateStrategy.java          |   0
 .../allocate/BroadcastAllocateStrategy.java        |   0
 .../allocate/ConsistentHashAllocateStrategy.java   |   0
 .../source/enumerator/offset/OffsetsSelector.java  |   2 +-
 .../offset/OffsetsSelectorBySpecified.java         |   2 +-
 .../offset/OffsetsSelectorByStrategy.java          |   2 +-
 .../offset/OffsetsSelectorByTimestamp.java         |   2 +-
 .../offset/OffsetsSelectorNoStopping.java          |   2 +-
 .../source/enumerator/offset/OffsetsValidator.java |   0
 .../metrics/RocketMQSourceReaderMetrics.java       |   4 -
 .../rocketmq/source/reader/MessageView.java        |   0
 .../rocketmq/source/reader/MessageViewExt.java     |   0
 .../source/reader/RocketMQRecordEmitter.java       |   0
 .../reader/RocketMQSourceFetcherManager.java       |   3 +-
 .../source/reader/RocketMQSourceReader.java        |   8 +-
 .../source/reader/RocketMQSplitReader.java         |  52 +-
 .../source/reader/deserializer/BytesMessage.java   |   0
 .../reader/deserializer/DirtyDataStrategy.java     |   0
 .../reader/deserializer/QueryableSchema.java       |   0
 .../RocketMQDeserializationSchema.java             |   0
 .../RocketMQDeserializationSchemaWrapper.java      |   0
 .../RocketMQRowDeserializationSchema.java          |  51 +-
 .../reader/deserializer/RocketMQSchemaWrapper.java |   0
 .../deserializer/RowDeserializationSchema.java     |   0
 .../split/RocketMQPartitionSplitSerializer.java    |   0
 .../rocketmq/source/split/RocketMQSourceSplit.java |   5 +-
 .../source/split/RocketMQSourceSplitState.java     |   0
 .../rocketmq/source/util/ByteSerializer.java       |   0
 .../connector/rocketmq/source/util/ByteUtils.java  |   0
 .../rocketmq/source/util/StringSerializer.java     |   0
 .../connector/rocketmq/source/util/UtilAll.java    |   0
 .../connectors/rocketmq}/RocketMQConfig.java       |   8 +-
 .../connectors/rocketmq}/RocketMQSink.java         |   6 +-
 .../rocketmq}/RocketMQSourceFunction.java          | 225 +++----
 .../connectors/rocketmq}/RunningChecker.java       |   2 +-
 .../common/config/OffsetResetStrategy.java         |   2 +-
 .../rocketmq}/common/config/StartupMode.java       |   2 +-
 .../common/selector/DefaultTopicSelector.java      |   2 +-
 .../common/selector/HashMessageQueueSelector.java  |   2 +-
 .../common/selector/MessageQueueSelector.java      |   2 +-
 .../selector/RandomMessageQueueSelector.java       |   2 +-
 .../common/selector/SimpleTopicSelector.java       |   2 +-
 .../rocketmq}/common/selector/TopicSelector.java   |   2 +-
 .../ForwardMessageExtDeserialization.java          |   2 +-
 .../KeyValueDeserializationSchema.java             |   2 +-
 .../serialization/KeyValueSerializationSchema.java |   2 +-
 .../MessageExtDeserializationScheme.java           |   2 +-
 .../RowKeyValueDeserializationSchema.java          |   2 +-
 .../SimpleKeyValueDeserializationSchema.java       |   2 +-
 .../SimpleKeyValueSerializationSchema.java         |   2 +-
 .../SimpleStringDeserializationSchema.java         |   2 +-
 .../SimpleTupleDeserializationSchema.java          |   2 +-
 .../rocketmq}/common/util/MetricUtils.java         |   2 +-
 .../rocketmq}/common/util/RetryUtil.java           |   4 +-
 .../rocketmq}/common/util/RocketMQUtils.java       |   2 +-
 .../rocketmq}/common/util/TestUtils.java           |   2 +-
 .../rocketmq}/function/SinkMapFunction.java        |   2 +-
 .../rocketmq}/function/SourceMapFunction.java      |   2 +-
 .../rocketmq}/table/RocketMQDynamicTableSink.java  |  97 ++-
 .../table/RocketMQDynamicTableSinkFactory.java     |  21 +-
 .../table/RocketMQDynamicTableSourceFactory.java   |  32 +-
 .../rocketmq}/table/RocketMQRowDataConverter.java  |   8 +-
 .../table/RocketMQRowDataSerializationSchema.java  |  53 ++
 .../rocketmq}/table/RocketMQRowDataSink.java       |   4 +-
 .../rocketmq}/table/RocketMQScanTableSource.java   |  91 ++-
 .../catalog/RocketMQCatalogFactoryTest.java        |   0
 .../rocketmq/catalog/RocketMQCatalogTest.java      | 206 +++---
 .../common/config/RocketMQConfigBuilderTest.java   |   0
 .../rocketmq/example/ConnectorConfig.java          |   6 +-
 .../rocketmq/example/ConnectorIntegrationTest.java | 291 ++++++++
 .../connector/rocketmq/example/SimpleAdmin.java    |   0
 .../connector/rocketmq/example/SimpleConsumer.java |   6 +-
 .../connector/rocketmq/example/SimpleProducer.java |  14 +-
 .../rocketmq/example/SqlIntegrationTest.java       | 185 +++++
 .../example/TransactionSinkIntegrationTest.java    | 154 +++++
 .../rocketmq/sink/InnerProducerImplTest.java       |  89 +++
 .../connector/rocketmq/sink/RocketMQSinkTest.java  |   0
 .../rocketmq/source/InnerConsumerImplTest.java     |  77 +++
 .../rocketmq/source/RocketMQSourceTest.java        |   0
 .../RocketMQSourceEnumStateSerializerTest.java     |   0
 .../allocate/AverageAllocateStrategyTest.java      |   0
 .../allocate/BroadcastAllocateStrategyTest.java    |   0
 .../ConsistentHashAllocateStrategyTest.java        |   0
 .../source/reader/RocketMQRecordEmitterTest.java   |   4 +-
 .../RocketMQRowDeserializationSchemaTest.java      |  12 +-
 .../RocketMQPartitionSplitSerializerTest.java      |   0
 .../connectors/rocketmq}/RocketMQSinkTest.java     |  12 +-
 .../connectors/rocketmq}/RocketMQSourceTest.java   |  12 +-
 .../common/selector/DefaultTopicSelectorTest.java  |   2 +-
 .../selector/HashMessageQueueSelectorTest.java     |   2 +-
 .../selector/RandomMessageQueueSelectorTest.java   |   2 +-
 .../common/selector/SimpleTopicSelectorTest.java   |   2 +-
 .../RowKeyValueDeserializationSchemaTest.java      |   2 +-
 .../SimpleKeyValueSerializationSchemaTest.java     |   2 +-
 .../rocketmq}/common/util/RetryUtilTest.java       |  32 +-
 .../rocketmq/example/LegacyConnectorExample.java   |  18 +-
 .../sourceFunction/RocketMQSourceFunctionTest.java |  14 +-
 .../table/RocketMQDynamicTableSinkFactoryTest.java |   2 +-
 .../RocketMQDynamicTableSinkMigrationTest.java     | 130 ++++
 ...ocketMQDynamicTableSourceFactoryOffsetTest.java | 110 +++
 .../RocketMQDynamicTableSourceFactoryTest.java     |   6 +-
 .../rocketmq/table/RocketMQParameterChainTest.java | 112 ++++
 .../table/RocketMQScanTableSourceFilterTest.java   | 125 ++++
 .../table/RocketMQScanTableSourceTest.java         | 184 +++++
 .../org.apache.flink.table.factories.Factory       |   2 +
 .../src/test/resources/log4j2-test.xml             |  24 +
 flink-sql-connector-rocketmq/pom.xml               | 160 +++++
 .../org.apache.flink.table.factories.Factory       |   4 +-
 pom.xml                                            | 743 +++++++++++++--------
 .../flink/connector/rocketmq/MetricUtil.java       |  20 -
 .../watermark/BoundedOutOfOrdernessGenerator.java  |  59 --
 .../BoundedOutOfOrdernessGeneratorPerQueue.java    |  69 --
 .../common/watermark/PunctuatedAssigner.java       |  48 --
 .../watermark/TimeLagWatermarkGenerator.java       |  53 --
 .../legacy/common/watermark/WaterMarkForAll.java   |  41 --
 .../legacy/common/watermark/WaterMarkPerQueue.java |  64 --
 src/test/resources/logback-test.xml                |  37 -
 tools/maven/checkstyle.xml                         | 562 ++++++++++++++++
 tools/maven/suppressions.xml                       |  54 ++
 168 files changed, 4693 insertions(+), 1539 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
new file mode 100644
index 0000000..7f8acaa
--- /dev/null
+++ b/.github/workflows/build.yml
@@ -0,0 +1,56 @@
+################################################################################
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+# limitations under the License.
+################################################################################
+
+name: Build
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  build:
+    name: Build (JDK ${{ matrix.java }})
+    runs-on: ubuntu-latest
+    timeout-minutes: 60
+    strategy:
+      fail-fast: false
+      matrix:
+        java: [11, 17]
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up JDK ${{ matrix.java }}
+        uses: actions/setup-java@v4
+        with:
+          distribution: temurin
+          java-version: ${{ matrix.java }}
+          cache: maven
+
+      - name: Check code style
+        run: mvn -B -ntp spotless:check
+
+      - name: Build and run tests
+        # `package` runs unit tests and the shade plugin for the SQL fat-jars.
+        # dependency:analyze (bound to `verify`) is skipped until declarations are cleaned up.
+        run: mvn -B -ntp clean package
diff --git a/.gitignore b/.gitignore
index 7c74295..b16b393 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,4 +34,7 @@ nohup.out
 
 # Ignore it while not disable for some reason.
 dependency-reduced-pom.xml
-/logs/output.log.*
\ No newline at end of file
+/logs/output.log.*
+
+# Environment / credentials
+.env
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 17624ca..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-dist: trusty
-
-notifications:
-  email:
-    recipients:
-      - dev@rocketmq.apache.org
-  on_success: change
-  on_failure: always
-
-language: java
-
-jdk:
-    - oraclejdk8
-    - oraclejdk9
-    - oraclejdk11
-    - openjdk8
-
-# before_install:
-#   - echo 'MAVEN_OPTS="$MAVEN_OPTS -Xmx1024m -XX:MaxPermSize=512m -XX:+BytecodeVerificationLocal"' >> ~/.mavenrc
-#   - cat ~/.mavenrc
-#   - if [ "$TRAVIS_OS_NAME" == "osx" ]; then export JAVA_HOME=$(/usr/libexec/java_home); fi
-#   - if [ "$TRAVIS_OS_NAME" == "linux" ]; then jdk_switcher use "$CUSTOM_JDK"; fi
-
-script:
-  - travis_retry mvn -B clean apache-rat:check -debug
-  - travis_retry mvn -B clean install jacoco:report coveralls:report
-  
-after_success:
-  - bash <(curl -s https://codecov.io/bash) || echo 'Codecov failed to upload'
diff --git a/README.md b/README.md
index 67d04de..37084b2 100644
--- a/README.md
+++ b/README.md
@@ -1,254 +1,140 @@
-# RocketMQ-Flink
-[![Build Status](https://app.travis-ci.com/apache/rocketmq-flink.svg?branch=main)](https://app.travis-ci.com/apache/rocketmq-flink) [![Coverage Status](https://coveralls.io/repos/github/apache/rocketmq-flink/badge.svg?branch=main)](https://coveralls.io/github/apache/rocketmq-flink?branch=main)
+# Apache Flink RocketMQ Connector
+
+[![Build](https://github.com/apache/rocketmq-flink/actions/workflows/build.yml/badge.svg)](https://github.com/apache/rocketmq-flink/actions/workflows/build.yml)
 [![License](https://img.shields.io/badge/license-Apache%202-4EB1BA.svg)](https://www.apache.org/licenses/LICENSE-2.0.html)
-[![Average time to resolve an issue](http://isitmaintained.com/badge/resolution/apache/rocketmq-flink.svg)](http://isitmaintained.com/project/apache/rocketmq-flink "Average time to resolve an issue")
-[![Percentage of issues still open](http://isitmaintained.com/badge/open/apache/rocketmq-flink.svg)](http://isitmaintained.com/project/apache/rocketmq-flink "Percentage of issues still open")
-[![Twitter Follow](https://img.shields.io/twitter/follow/ApacheRocketMQ?style=social)](https://twitter.com/intent/follow?screen_name=ApacheRocketMQ)
 
-RocketMQ integration for [Apache Flink](https://flink.apache.org/). This module includes the RocketMQ source and sink that allows a flink job to either write messages into a topic or read from topics in a flink job.
+This repository contains the Apache Flink RocketMQ connector. It provides Flink sources and sinks
+that read from and write to Apache RocketMQ, for both the DataStream API and the Table/SQL API.
 
-## RocketMQSourceFunction
-To use the `RocketMQSourceFunction`,  you construct an instance of it by specifying a KeyValueDeserializationSchema instance and a Properties instance which including rocketmq configs.
-`RocketMQSourceFunction(KeyValueDeserializationSchema<OUT> schema, Properties props)`
-The RocketMQSourceFunction is based on RocketMQ pull consumer mode, and provides exactly once reliability guarantees when checkpoints are enabled.
-Otherwise, the source doesn't provide any reliability guarantees.
+Two connector tracks are shipped:
 
-### KeyValueDeserializationSchema
-The main API for deserializing topic and tags is the `org.apache.rocketmq.flink.legacy.common.serialization.KeyValueDeserializationSchema` interface.
-`rocketmq-flink` includes general purpose `KeyValueDeserializationSchema` implementations called `SimpleKeyValueDeserializationSchema`.
+| Track | Module | RocketMQ client | Best for |
+| --- | --- | --- | --- |
+| **Remoting** | `flink-connector-rocketmq` | `rocketmq-client` (remoting protocol) | Classic topics, FLIP-27 source + SinkV2 sink, SQL |
 
-```java
-public interface KeyValueDeserializationSchema<T> extends ResultTypeQueryable<T>, Serializable {
-    T deserializeKeyAndValue(byte[] key, byte[] value);
-}
-```
+The SQL fat-jar is packaged by `flink-sql-connector-rocketmq`.
 
-## RocketMQSink
-To use the `RocketMQSink`,  you construct an instance of it by specifying KeyValueSerializationSchema & TopicSelector instances and a Properties instance which including rocketmq configs.
-`RocketMQSink(KeyValueSerializationSchema<IN> schema, TopicSelector<IN> topicSelector, Properties props)`
-The RocketMQSink provides at-least-once reliability guarantees when checkpoints are enabled and `withBatchFlushOnCheckpoint(true)` is set.
-Otherwise, the sink reliability guarantees depends on rocketmq producer's retry policy, for this case, the messages sending way is sync by default,
-but you can change it by invoking `withAsync(true)`. 
+## Apache Flink
 
-### KeyValueSerializationSchema
-The main API for serializing topic and tags is the `org.apache.rocketmq.flink.legacy.common.serialization.KeyValueSerializationSchema` interface.
-`rocketmq-flink` includes general purpose `KeyValueSerializationSchema` implementations called `SimpleKeyValueSerializationSchema`.
+Apache Flink is an open source stream processing framework with powerful stream- and
+batch-processing capabilities.
 
-```java
-public interface KeyValueSerializationSchema<T> extends Serializable {
+Learn more about Flink at [https://flink.apache.org/](https://flink.apache.org/)
 
-    byte[] serializeKey(T tuple);
+## Apache RocketMQ
 
-    byte[] serializeValue(T tuple);
-}
-```
+Apache RocketMQ is a cloud native messaging and streaming platform, making it simple to build
+event-driven applications.
 
-### TopicSelector
-The main API for selecting topic and tags is the `org.apache.rocketmq.flink.legacy.common.selector.TopicSelector` interface.
-`rocketmq-flink` includes general purpose `TopicSelector` implementations called `DefaultTopicSelector` and `SimpleTopicSelector`.
+Learn more about RocketMQ at [https://rocketmq.apache.org/](https://rocketmq.apache.org/)
 
-```java
-public interface TopicSelector<T> extends Serializable {
+## Building the Apache Flink RocketMQ Connector from Source
 
-    String getTopic(T tuple);
+Prerequisites:
 
-    String getTag(T tuple);
-}
-```
+* Unix-like environment (we use Linux, Mac OS X)
+* Git
+* Maven (we recommend version 3.8.6)
+* Java 11
 
-## Examples
-The following is an example which receive messages from RocketMQ brokers and send messages to broker after processing.
+```
+git clone https://github.com/apache/rocketmq-flink.git
+cd rocketmq-flink
+mvn clean package -DskipTests
+```
 
- ```java
-StreamExecutionEnvironment env = StreamExecutionEnvironment.getExecutionEnvironment();
+The resulting jars can be found in the `target` directory of the respective module.
 
-        // enable checkpoint
-        env.enableCheckpointing(3000);
-
-        Properties consumerProps = new Properties();
-        consumerProps.setProperty(RocketMQConfig.NAME_SERVER_ADDR, "localhost:9876");
-        consumerProps.setProperty(RocketMQConfig.CONSUMER_GROUP, "c002");
-        consumerProps.setProperty(RocketMQConfig.CONSUMER_TOPIC, "flink-source2");
-
-        Properties producerProps = new Properties();
-        producerProps.setProperty(RocketMQConfig.NAME_SERVER_ADDR, "localhost:9876");
-
-        RocketMQSourceFunction<Map<Object,Object>> source = new RocketMQSourceFunction(
-                new SimpleKeyValueDeserializationSchema("id", "address"), consumerProps);
-        // use group offsets.
-        // If there is no committed offset,consumer would start from the latest offset.
-        source.setStartFromGroupOffsets(OffsetResetStrategy.LATEST);
-        env.addSource(source)
-            .name("rocketmq-source")
-            .setParallelism(2)
-            .process(new ProcessFunction<Map<Object, Object>, Map<Object, Object>>() {
-                @Override
-                public void processElement(
-                        Map<Object, Object> in,
-                        Context ctx,
-                        Collector<Map<Object, Object>> out) {
-                    HashMap result = new HashMap();
-                    result.put("id", in.get("id"));
-                    String[] arr = in.get("address").toString().split("\\s+");
-                    result.put("province", arr[arr.length - 1]);
-                    out.collect(result);
-                }
-            })
-            .name("upper-processor")
-            .setParallelism(2)
-            .process(new ProcessFunction<Map<Object, Object>, Message>() {
-                @Override
-                public void processElement(Map<Object, Object> value, Context ctx, Collector<Message> out) {
-                    String jsonString = JSONObject.toJSONString(value);
-                    Message message =
-                            new Message(
-                                    "flink-sink2",
-                                    "",
-                                    jsonString.getBytes(StandardCharsets.UTF_8));
-                    out.collect(message);
-                }
-            })
-            .addSink(new RocketMQSink(producerProps).withBatchFlushOnCheckpoint(true))
-            .name("rocketmq-sink")
-            .setParallelism(2);
-
-        try {
-            env.execute("rocketmq-flink-example");
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
- ```
-
-## Configurations
-The following configurations are all from the class `org.apache.rocketmq.flink.legacy.RocketMQConfig`.
-
-### Producer Configurations
-| NAME        | DESCRIPTION           | DEFAULT  |
-| ------------- |:-------------:|:------:|
-| nameserver.address      | name server address *Required* | null |
-| nameserver.poll.interval      | name server poll topic info interval     |   30000 |
-| brokerserver.heartbeat.interval | broker server heartbeat interval      |    30000 |
-| producer.group | producer group      |    `UUID.randomUUID().toString()` |
-| producer.retry.times | producer send messages retry times      |    3 |
-| producer.timeout | producer send messages timeout      |    3000 |
-
-
-### Consumer Configurations
-| NAME        | DESCRIPTION           | DEFAULT  |
-| ------------- |:-------------:|:------:|
-| nameserver.address      | name server address *Required* | null |
-| nameserver.poll.interval      | name server poll topic info interval     |   30000 |
-| brokerserver.heartbeat.interval | broker server heartbeat interval      |    30000 |
-| consumer.group | consumer group *Required*     |    null |
-| consumer.topic | consumer topic *Required*       |    null |
-| consumer.tag | consumer topic tag      |    * |
-| consumer.offset.persist.interval | auto commit offset interval      |    5000 |
-| consumer.pull.thread.pool.size | consumer pull thread pool size      |    20 |
-| consumer.batch.size | consumer messages batch size      |    32 |
-| consumer.delay.when.message.not.found | the delay time when messages were not found      |    10 |
-
-### Consumer Strategy
+Before opening a pull request, format the code and run the tests:
 
-```java
-RocketMQSourceFunction<String> source = new RocketMQSourceFunction<>(
-        new SimpleStringDeserializationSchema(), props);
-HashMap<MessageQueue, Long> brokerMap = new HashMap<>();
-brokerMap.put(new MessageQueue("tp_driver_tag_sync_back", "broker-a", 1), 201L);
-brokerMap.put(new MessageQueue("tp_driver_tag_sync_back", "broker-c", 3), 123L);
-source.setStartFromSpecificOffsets(brokerMap);
 ```
-RocketMQSourceFunction offer five initialization policies 
-* setStartFromEarliest
-* setStartFromLatest
-* setStartFromTimeStamp with timestamp
-* setStartFromGroupOffsets with `OffsetResetStrategy`
-* setStartFromSpecificOffsets
-
-| STRATEGY                    | DESCRIPTION                                                  |
-| --------------------------- | ------------------------------------------------------------ |
-| EARLIEST                    | consume from the earliest offset after restart with no state |
-| LATEST                      | consume from the latest offset after restart with no state   |
-| TIMESTAMP                   | consume from the closest timestamp of data in each broker's queue |
-| GROUP_OFFSETS with LATEST   | If broker has the committed offset then consume from the next else consume from the latest offset |
-| GROUP_OFFSETS with EARLIEST | If broker has the committed offset ,consume from the next ,otherwise consume from the earlist offset.It's useful when server  expand  broker |
-| SPECIFIC_OFFSETS            | consumer from the specificOffsets in broker's queues.Group offsets will be returned from those broker's queues whose didn't be specified |
-
-**Attention**
+mvn spotless:apply clean package
+```
 
-Only if Flink job starts with none state, these strategies are effective. If the job recovers from the checkpoint, the offset would intialize from the stored data.
+## Quick Start
 
-## RocketMQ SQL Connector
+### DataStream source & sink (remoting)
 
-### How to create a RocketMQ table
+```java
+StreamExecutionEnvironment env = StreamExecutionEnvironment.getExecutionEnvironment();
+env.enableCheckpointing(3000);
+
+RocketMQSource<String> source = RocketMQSource.<String>builder()
+        .setEndpoints("127.0.0.1:9876")
+        .setGroupId("GID-flink")
+        .setTopics("flink-source")
+        .setMinOffsets(OffsetsSelector.latest())
+        .setBodyOnlyDeserializer(new SimpleStringSchema())
+        .build();
+
+RocketMQSink<String> sink = RocketMQSink.<String>builder()
+        .setEndpoints("127.0.0.1:9876")
+        .setGroupId("PID-flink")
+        .setDeliveryGuarantee(DeliveryGuarantee.AT_LEAST_ONCE)
+        .setSerializer(new MySerializationSchema("flink-sink"))
+        .build();
+
+env.fromSource(source, WatermarkStrategy.noWatermarks(), "rocketmq-source")
+        .sinkTo(sink);
+env.execute();
+```
 
-The example below shows how to create a RocketMQ table:
+### SQL
 
 ```sql
 CREATE TABLE rocketmq_source (
-  `user_id` BIGINT,
-  `item_id` BIGINT,
-  `behavior` STRING
-) WITH (
-  'connector' = 'rocketmq',
-  'topic' = 'user_behavior',
-  'consumerGroup' = 'behavior_consumer_group',
-  'nameServerAddress' = '127.0.0.1:9876'
-);
-
-CREATE TABLE rocketmq_sink (
-  `user_id` BIGINT,
-  `item_id` BIGINT,
-  `behavior` STRING
+  `id` BIGINT,
+  `message` STRING
 ) WITH (
   'connector' = 'rocketmq',
-  'topic' = 'user_behavior',
-  'produceGroup' = 'behavior_produce_group',
-  'nameServerAddress' = '127.0.0.1:9876'
+  'rocketmq.client.endpoints' = '127.0.0.1:9876',
+  'rocketmq.source.topic' = 'flink-source',
+  'rocketmq.source.group' = 'GID-flink'
 );
 ```
 
-### Available Metadata
+## Documentation
 
-The following connector metadata can be accessed as metadata columns in a table definition.
+Connector documentation is located in the `docs/` directory of this repository:
 
-The `R/W` column defines whether a metadata field is readable (`R`) and/or writable (`W`).
-Read-only columns must be declared `VIRTUAL` to exclude them during an `INSERT INTO` operation.
+| Document | Content |
+| --- | --- |
+| [docs/remoting-connector.md](docs/remoting-connector.md) | Remoting DataStream connector: usage and all configuration options |
+| [docs/sql-connector.md](docs/sql-connector.md) | Table/SQL connector: DDL, metadata columns, fat-jar notes |
+| [docs/legacy-connector.md](docs/legacy-connector.md) | Legacy `RocketMQSourceFunction` / `RocketMQSink` (deprecated) |
+| [docs/connector-overview.md](docs/connector-overview.md) | Feature comparison with other messaging connectors |
 
-| KEY            | DATA TYPE              | DESCRIPTION                                     | DEFAULT       |
-| --------------   |:-----------------------------:|:---------------------------------------------------:|:--------------------:|
-| topic            | STRING NOT NULL | Topic name of the RocketMQ record. | R                        |
+The documentation of Apache Flink is located on the website
+[https://flink.apache.org](https://flink.apache.org), and the documentation of Apache RocketMQ on
+[https://rocketmq.apache.org](https://rocketmq.apache.org).
 
-The extended `CREATE TABLE` example demonstrates the syntax for exposing these metadata fields:
+## Developing
 
-```sql
-CREATE TABLE rocketmq_source (
-  `topic` STRING METADATA VIRTUAL,
-  `user_id` BIGINT,
-  `item_id` BIGINT,
-  `behavior` STRING
-) WITH (
-  'connector' = 'rocketmq',
-  'topic' = 'user_behavior',
-  'consumerGroup' = 'behavior_consumer_group',
-  'nameServerAddress' = '127.0.0.1:9876'
-);
-```
+The Flink committers use IntelliJ IDEA to develop the Flink codebase. IntelliJ supports Maven out
+of the box. Check out the
+[Setting up IntelliJ](https://nightlies.apache.org/flink/flink-docs-master/flinkDev/ide_setup.html#intellij-idea)
+guide for details.
+
+Run `mvn spotless:apply` before committing to keep the code style consistent.
+
+## Support
+
+Don't hesitate to ask!
+
+Contact the developers and community on the
+[Apache Flink mailing lists](https://flink.apache.org/community.html#mailing-lists) or the
+[Apache RocketMQ mailing lists](https://rocketmq.apache.org/contact/) if you need any help.
+
+[Open an issue](https://github.com/apache/rocketmq-flink/issues) if you find a bug in the
+connector.
 
-## License
+## Fork and Contribute
 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
+This is an active open-source project. We are always open to people who want to use the system or
+contribute to it. If you find a bug or want a new feature, open an issue first and discuss it with
+the community. See [how to contribute to Apache RocketMQ](https://rocketmq.apache.org/contribute/)
+and [how to contribute to Apache Flink](https://flink.apache.org/contributing/how-to-contribute.html).
 
-  http://www.apache.org/licenses/LICENSE-2.0
+## About
 
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
+Apache Flink and Apache RocketMQ are open source projects of The Apache Software Foundation (ASF).
diff --git a/docs/connector-overview.md b/docs/connector-overview.md
new file mode 100644
index 0000000..0d2cb65
--- /dev/null
+++ b/docs/connector-overview.md
@@ -0,0 +1,58 @@
+# Flink MQ Connectors Overview
+
+> 基于 `flink-connectors` 目录的分析结果,涵盖 Source/Sink 支持、消费模型、Spotless 代码格式化等维度。
+
+## 连接器全景对比
+
+| 厂商 | 产品 | Java | 分区指派模型 | Pop/共享消费模型 | Source | Sink | 新 Source API (FLIP-27) | 新 Sink API (FLIP-143) | Table/SQL API | SQL Connector | Spotless |
+| --- | --- | --- | :--- | :--- | :---: | :---: | :--- | :--- | :--- | :---: | :---: |
+| Apache | **Kafka** | 11/17 ¹ | ✅ | ❌ | ✅ | ✅ | ✅ `KafkaSource` | ✅ `KafkaSink` | ✅ | ✅ | ✅ |
+| Apache | **RocketMQ** | 11 ² | ✅ Clustering | ✅ Pop ³ | ✅ | ✅ | ✅ `RocketMQSource` | ✅ `RocketMQSink` | ✅ | ✅ | ✅ |
+| Apache | **Pulsar** | 8 | ✅ Exclusive | ✅ Shared ⁴ | ✅ | ✅ | ✅ `PulsarSource` | ✅ `PulsarSink` | ✅ | ✅ | ✅ |
+| Rabbit Technologies | **RabbitMQ** | 8 | ❌ | ✅ | ✅ | ✅ | ❌ `RMQSource` ⁵ | ❌ `RMQSink` ⁵ | ❌ | ✅ | ✅ |
+| Google | **Cloud Pub/Sub** | 8 | ❌ | ✅ | ✅ | ✅ | ❌ `PubSubSource` ⁵ | ✅ `PubSubSinkV2` | ✅ | ❌ | ✅ |
+| AWS | **Kinesis Data Streams** | 8 | ✅ Shard | ❌ | ✅ | ✅ | ✅ `KinesisStreamsSource` | ✅ AsyncSinkBase | ✅ | ✅ | ✅ |
+| AWS | **Kinesis Firehose** | 8 | — | — | ❌ | ✅ | — | ✅ AsyncSinkBase | ✅ | ✅ | ✅ |
+| AWS | **SQS** | 8 | — | ✅ | ❌ | ✅ | — | ✅ AsyncSinkBase | ✅ | ❌ | ✅ |
+| AWS | **DynamoDB Streams** | 8 | ✅ Shard | ❌ | ✅ | ✅ | ✅ `DynamoDbStreamsSource` | ✅ AsyncSinkBase | ✅ | ✅ | ✅ |
+
+## 列说明
+
+### Table/SQL API vs SQL Connector
+
+| 列 | 含义 | 本质 |
+| --- | --- | --- |
+| **Table/SQL API** | 连接器代码中实现了 Flink Table/SQL 接口(`DynamicTableSource`、`DynamicTableSink` 等) | **代码层面** — 有没有写 SQL 集成的 Java 类 |
+| **SQL Connector** | 存在 `flink-sql-connector-*` shade 模块,打成一个包含所有依赖的 fat JAR | **分发层面** — 能不能直接丢进 `lib/` 目录就用 |
+
+典型差异场景:GCP Pub/Sub
+
+- Table/SQL API ✅ — 代码里有 `PubSubDynamicSink`、`PubSubDynamicSinkFactory`,支持 SQL DDL
+- SQL Connector ❌ — 没有打包成 shade JAR
+
+这意味着用户虽然可以在 SQL 中声明 `'connector' = 'gcp-pubsub'`,但需要自己手动管理依赖(把 connector JAR + gRPC JAR + Google SDK JAR 等全部放进 classpath),而不能像 Kafka 那样直接下载一个 `flink-sql-connector-kafka-xxx.jar` 丢进 `lib/` 就完事。
+
+总结:Table/SQL API 是"能不能用",SQL Connector 是"好不好用"。
+
+## 脚注
+
+1. **Kafka Java 版本**: 继承 `flink-connector-parent` 2.0.0,source 11 / target 17(字节码)。
+2. **RocketMQ Java 版本**: 显式覆盖 `maven-compiler-plugin` 为 source 11 / target 11。
+3. **RocketMQ Pop**: RocketMQ 产品本身支持 Pop 消费模式,但 Flink 连接器未实现。连接器使用 `DefaultLitePullConsumer` + Flink 侧分区指派(Clustering),硬编码 `MessageModel.CLUSTERING`。
+4. **Pulsar Shared**: Flink 连接器实际硬编码为 `Exclusive`(分区模型)。Table API 暴露了 `Shared` 选项,但存在 bug 未正确传递给底层 Source,实际不可用。
+5. **旧 API**: 仍使用 `RichSourceFunction` / `RichSinkFunction`,未迁移到 FLIP-27 / FLIP-143 新 API。
+
+## 消费模型说明
+
+**分区指派模型** — 消息按 partition/shard/queue 有序,消费者能看到自己被分配了哪些分区,适合需要严格顺序或精确位点管理的场景。
+
+**Pop / 共享消费模型** — 消费者不感知分区,broker 将消息分发给组内任意空闲消费者,适合高吞吐、不关心顺序的负载均衡场景。
+
+## Spotless 代码格式化
+
+所有连接器均使用 Spotless 进行代码格式化:
+
+- 继承自 `flink-connector-parent` 统一定义规则
+- 每个连接器在 `<build><plugins>` 中显式声明 `com.diffplug.spotless:spotless-maven-plugin`
+- 无任何连接器设置 `<spotless.skip>true</spotless.skip>`
+- Flink 主仓库 Spotless 版本:`2.43.0`
diff --git a/docs/grpc-connector.md b/docs/grpc-connector.md
new file mode 100644
index 0000000..a799a67
--- /dev/null
+++ b/docs/grpc-connector.md
@@ -0,0 +1,119 @@
+# gRPC Connector (LiteSimpleConsumer)
+
+The gRPC connector (`flink-connector-rocketmq-grpc`) targets RocketMQ 5.x **lite topics** using
+`rocketmq-client-java` 5.2.1+. The source binds one main lite topic with a wildcard subscription,
+never acks by itself, and hands the ack / throttle decision to downstream operators.
+
+## Prerequisites
+
+- RocketMQ 5.x cluster with lite topic support enabled on the broker
+  (`enableMultiDispatch`, `enableLmq`, etc. — preset by the official Helm chart).
+- A LITE-type main topic and a consumer group with the wildcard attribute:
+
+```bash
+mqadmin updateTopic -n <ns:9876> -c <cluster> -t LiteMainTopic -a "+message.type=LITE"
+mqadmin updateSubGroup -n <ns:9876> -c <cluster> -g GID-lite \
+    --attributes "+lite.sub.wildcard=true"
+```
+
+`lite.sub.wildcard` is a **consumer group** attribute, not a topic attribute. Without it the
+wildcard subscription receives nothing.
+
+## Source
+
+```java
+RocketMQGrpcSource<String> source = RocketMQGrpcSource.<String>builder()
+        .setEndpoints("127.0.0.1:8081")
+        .setConsumerGroup("GID-lite")
+        .setMainTopic("LiteMainTopic")
+        .setFetchConcurrency(4)
+        .setValueOnlyDeserializer(new SimpleStringSchema())
+        .build();
+
+DataStream<AckableMessage<String>> stream =
+        env.fromSource(source, WatermarkStrategy.noWatermarks(), "grpc-source");
+```
+
+The output type is `AckableMessage<OUT>`: the payload plus a serializable
+`RocketMQReceiptHandle` (endpoint, namespace, consumerGroup, lite topic, receipt handle). The
+handle can cross keyBy/shuffle boundaries; credentials never travel with it.
+
+### Downstream ack / throttling
+
+Unacked messages are redelivered by the broker after `invisible-duration` expires
+(at-least-once — downstream must be idempotent). Three wirings are provided:
+
+1. **Standalone ack operator** — user operators emit `AckCommand{handle, action, delay}`,
+   `RocketMQAckOperator` executes them. Users never touch the SDK.
+2. **Client injection** — extend `RocketMQAckProcessFunction` and call `ack()` /
+   `changeInvisibleDuration()` directly.
+3. **Policy-based throttling** — implement `MessageThrottlePolicy<T>`
+   (`Optional<Duration> onMessage(value)`: empty = ack, duration = defer via
+   `changeInvisibleDuration`) and run it with `RocketMQThrottleProcessFunction<T>`.
+   Built-in safety valves: maxDeliveryAttempt=16, maxInvisibleDuration=30min (avoids DLQ from
+   repeated defers).
+
+Ack clients are pooled per TaskManager keyed by (endpoint, namespace, consumerGroup) with
+reference counting; ack RPCs retry with bounded exponential backoff, and
+`INVALID_RECEIPT_HANDLE` is tolerated as a warning (the message will simply be redelivered).
+
+### Invisible-duration renewal
+
+Under backpressure, messages waiting in the reader queue may exceed `invisible-duration` and get
+redelivered. Configure a renewal policy to extend the invisible time before it expires:
+
+```java
+builder.setRenewalPolicyClass("com.example.MyRenewalPolicy")
+       .setRenewalAheadTime(Duration.ofSeconds(5));
+```
+
+## Sink
+
+```java
+RocketMQGrpcSink<String> sink = RocketMQGrpcSink.<String>builder()
+        .setEndpoints("127.0.0.1:8081")
+        .setTopic("LiteMainTopic")
+        .setLiteTopic("my-lite-topic")
+        .setValueOnlySerializer(new SimpleStringSchema())
+        .build();
+```
+
+## Options
+
+### Client (`rocketmq.client.*`)
+
+| Key | Type | Default | Description |
+| --- | --- | --- | --- |
+| `rocketmq.client.endpoints` | String | (none) | gRPC proxy endpoints, required |
+| `rocketmq.client.namespace` | String | `""` | Instance namespace |
+| `rocketmq.client.access-key` / `rocketmq.client.secret-key` | String | (none) | ACL credentials (skipped when unset) |
+| `rocketmq.client.credentials-resolver-class` | String | (none) | Pluggable per-endpoint `CredentialsResolver` |
+| `rocketmq.client.tls-enabled` | Boolean | false | TLS transport |
+| `rocketmq.client.request-timeout` | Duration | 3s | gRPC request timeout |
+
+### Source (`rocketmq.source.*`)
+
+| Key | Type | Default | Description |
+| --- | --- | --- | --- |
+| `rocketmq.source.main-topic` | String | (none) | Main lite topic to bind, required |
+| `rocketmq.source.consumer-group` | String | (none) | Consumer group, required |
+| `rocketmq.source.fetch-concurrency` | Integer | 1 | Concurrent long-polling receive workers |
+| `rocketmq.source.await-duration` | Duration | 30s | Long-polling await time |
+| `rocketmq.source.invisible-duration` | Duration | 60s | Invisible time per receive (min 10s) |
+| `rocketmq.source.max-message-num` | Integer | 32 | Max messages per receive |
+| `rocketmq.source.renewal-policy-class` | String | (none) | `InvisibleDurationRenewalPolicy` implementation |
+| `rocketmq.source.renewal-ahead-time` | Duration | 5s | Renew this long before invisible expiry |
+
+### Sink (`rocketmq.sink.*`)
+
+| Key | Type | Default | Description |
+| --- | --- | --- | --- |
+| `rocketmq.sink.topic` | String | (none) | Main lite topic, required |
+| `rocketmq.sink.lite-topic` | String | (none) | Lite topic within the main topic |
+| `rocketmq.sink.max-attempts` | Integer | 3 | Producer send attempts |
+
+## SQL
+
+The SQL connector identifier is `rocketmq-grpc` (fat-jar module
+`flink-sql-connector-rocketmq-grpc`). It exposes the same option keys as above, plus
+`rocketmq.source.fetch-concurrency`.
diff --git a/docs/legacy-connector.md b/docs/legacy-connector.md
new file mode 100644
index 0000000..1a2bb66
--- /dev/null
+++ b/docs/legacy-connector.md
@@ -0,0 +1,92 @@
+# Legacy Connector (Deprecated)
+
+> The legacy `RocketMQSourceFunction` / `RocketMQSink` are based on the deprecated Flink
+> `SourceFunction` / `SinkFunction` APIs. New jobs should use the FLIP-27 `RocketMQSource` and
+> SinkV2 `RocketMQSink` documented in [remoting-connector.md](remoting-connector.md). This page
+> is kept for existing jobs only.
+
+The legacy classes live under `org.apache.flink.streaming.connectors.rocketmq`.
+
+## RocketMQSourceFunction
+
+Construct it with a `KeyValueDeserializationSchema` and a `Properties` holding RocketMQ configs:
+
+```java
+RocketMQSourceFunction<Map<Object, Object>> source = new RocketMQSourceFunction<>(
+        new SimpleKeyValueDeserializationSchema("id", "address"), consumerProps);
+source.setStartFromGroupOffsets(OffsetResetStrategy.LATEST);
+env.addSource(source);
+```
+
+Based on the RocketMQ pull consumer; provides exactly-once when checkpointing is enabled,
+otherwise no reliability guarantee.
+
+```java
+public interface KeyValueDeserializationSchema<T> extends ResultTypeQueryable<T>, Serializable {
+    T deserializeKeyAndValue(byte[] key, byte[] value);
+}
+```
+
+### Startup policies
+
+| Method | Description |
+| --- | --- |
+| `setStartFromEarliest()` | Consume from the earliest offset (no-state restart) |
+| `setStartFromLatest()` | Consume from the latest offset (no-state restart) |
+| `setStartFromTimeStamp(ts)` | Consume from the closest timestamp in each queue |
+| `setStartFromGroupOffsets(OffsetResetStrategy)` | Committed offset if present, else LATEST/EARLIEST fallback |
+| `setStartFromSpecificOffsets(Map<MessageQueue, Long>)` | Explicit per-queue offsets; unspecified queues use group offsets |
+
+These policies only take effect when the job starts without state. When recovering from a
+checkpoint, offsets are restored from the checkpointed state.
+
+## RocketMQSink (SinkFunction)
+
+Construct it with a `Properties`; provides at-least-once when checkpointing is enabled and
+`withBatchFlushOnCheckpoint(true)` is set. Otherwise reliability depends on the producer retry
+policy (sync by default; `withAsync(true)` switches to async).
+
+```java
+stream.addSink(new RocketMQSink(producerProps).withBatchFlushOnCheckpoint(true));
+```
+
+Per-record topic/tag selection uses `TopicSelector`, serialization uses
+`KeyValueSerializationSchema` (`SimpleKeyValueSerializationSchema`, `DefaultTopicSelector` and
+`SimpleTopicSelector` are provided):
+
+```java
+public interface KeyValueSerializationSchema<T> extends Serializable {
+    byte[] serializeKey(T tuple);
+    byte[] serializeValue(T tuple);
+}
+
+public interface TopicSelector<T> extends Serializable {
+    String getTopic(T tuple);
+    String getTag(T tuple);
+}
+```
+
+## RocketMQConfig properties
+
+### Common / producer
+
+| Name | Description | Default |
+| --- | --- | --- |
+| `nameserver.address` | Name server address (required) | null |
+| `nameserver.poll.interval` | Name server poll interval (ms) | 30000 |
+| `brokerserver.heartbeat.interval` | Broker heartbeat interval (ms) | 30000 |
+| `producer.group` | Producer group | random UUID |
+| `producer.retry.times` | Send retry times | 3 |
+| `producer.timeout` | Send timeout (ms) | 3000 |
+
+### Consumer
+
+| Name | Description | Default |
+| --- | --- | --- |
+| `consumer.group` | Consumer group (required) | null |
+| `consumer.topic` | Topic (required) | null |
+| `consumer.tag` | Tag filter | `*` |
+| `consumer.offset.persist.interval` | Auto commit offset interval (ms) | 5000 |
+| `consumer.pull.thread.pool.size` | Pull thread pool size | 20 |
+| `consumer.batch.size` | Pull batch size | 32 |
+| `consumer.delay.when.message.not.found` | Delay when no message found (ms) | 10 |
diff --git a/docs/remoting-connector.md b/docs/remoting-connector.md
new file mode 100644
index 0000000..74981f2
--- /dev/null
+++ b/docs/remoting-connector.md
@@ -0,0 +1,108 @@
+# Remoting Connector (DataStream API)
+
+The remoting connector (`flink-connector-rocketmq`) talks to RocketMQ over the classic remoting
+protocol using `rocketmq-client`. It provides a FLIP-27 `RocketMQSource` and a SinkV2
+`RocketMQSink` with two-phase-commit support.
+
+## Source
+
+```java
+RocketMQSource<String> source = RocketMQSource.<String>builder()
+        .setEndpoints("127.0.0.1:9876")
+        .setGroupId("GID-flink")
+        .setTopics("topic-a", "topic-b")
+        .setMinOffsets(OffsetsSelector.latest())      // starting offsets
+        .setBodyOnlyDeserializer(new SimpleStringSchema())
+        .build();
+```
+
+Builder methods:
+
+| Method | Description |
+| --- | --- |
+| `setEndpoints(String)` | Name server address, required |
+| `setGroupId(String)` | Consumer group, required |
+| `setTopics(String... / List<String>)` | Topics to consume, required |
+| `setMinOffsets(OffsetsSelector)` | Starting offsets: `earliest()` / `latest()` / `committedOffsets()` / `timestamp(ts)` |
+| `setBounded(OffsetsSelector)` / `setUnbounded(OffsetsSelector)` | Stopping offsets and boundedness |
+| `setDeserializer(...)` / `setBodyOnlyDeserializer(...)` | Record deserialization |
+| `setConfig(Configuration)` / `setProperties(Properties)` | Pass any option from the tables below |
+
+Notes:
+
+- The source consumes with `DefaultLitePullConsumer.assign()`; with checkpointing enabled offsets
+  are committed on checkpoint (`rocketmq.source.offset.commit.checkpoint`, default true).
+- On Aliyun commercial 5.x instances the admin route lookup is not available; the source falls
+  back to consumer-side offset lookup automatically. Topics and groups must be created in the
+  console (mqadmin is not supported there).
+
+## Sink
+
+```java
+RocketMQSink<String> sink = RocketMQSink.<String>builder()
+        .setEndpoints("127.0.0.1:9876")
+        .setGroupId("PID-flink")
+        .setDeliveryGuarantee(DeliveryGuarantee.EXACTLY_ONCE)   // or AT_LEAST_ONCE / NONE
+        .setSerializer(mySerializationSchema)                   // builds Message objects (topic/tag/keys per record)
+        .build();
+```
+
+- `AT_LEAST_ONCE` uses async sends with a pending counter and a flush barrier on checkpoint.
+- `EXACTLY_ONCE` uses `TransactionMQProducer` two-phase commit driven by Flink checkpoints;
+  set `rocketmq.sink.transaction.timeout` larger than the checkpoint interval.
+
+## Client options (`rocketmq.client.*`)
+
+Shared by source and sink.
+
+| Key | Type | Default | Description |
+| --- | --- | --- | --- |
+| `rocketmq.client.endpoints` | String | (none) | Name server address, required |
+| `rocketmq.client.namespace` | String | (none) | Instance namespace |
+| `rocketmq.client.accessKey` / `rocketmq.client.secretKey` | String | (none) | ACL credentials |
+| `rocketmq.client.channel` | Enum | `CLOUD` | Access channel (`LOCAL` / `CLOUD`) |
+| `rocketmq.client.tls.enable` | Boolean | false | TLS transport |
+| `rocketmq.client.network.timeout.ms` | Long | 30000 | Client API timeout |
+| `rocketmq.client.callback.threads` | Integer | CPU cores | Client callback executor threads |
+| `rocketmq.client.partition.discovery.interval.ms` | Long | 10000 | Route/partition discovery interval |
+| `rocketmq.client.unitMode` / `rocketmq.client.unitName` | Boolean / String | false / (none) | Unit mode routing |
+| `rocketmq.client.debug` | Boolean | false | Verbose client logs |
+
+## Source options (`rocketmq.source.*`)
+
+| Key | Type | Default | Description |
+| --- | --- | --- | --- |
+| `rocketmq.source.topic` | String | (none) | Topic, required |
+| `rocketmq.source.group` | String | (none) | Consumer group, required |
+| `rocketmq.source.filter.tag` | String | `*` | Tag filter (client-side in assign mode) |
+| `rocketmq.source.filter.sql` | String | (none) | SQL92 filter (client-side in assign mode) |
+| `rocketmq.source.startup.scan.mode` | String | `latest` | `earliest` / `latest` / `group` / `timestamp` / `specific` |
+| `rocketmq.source.startup.offset.timestamp` | Long | (none) | Startup timestamp; auto-infers `scan.mode=timestamp` |
+| `rocketmq.source.allocate.strategy` | String | `consistent-hash` | Queue-to-subtask allocation strategy |
+| `rocketmq.source.pull.threads.num` | Integer | 20 | Pull thread pool size |
+| `rocketmq.source.pull.batch.size` | Long | 32 | Max messages per pull |
+| `rocketmq.source.pull.threshold.queue` | Long | 1000 | Queue-level flow control threshold |
+| `rocketmq.source.pull.threshold.all` | Long | 10000 | Total flow control threshold |
+| `rocketmq.source.pull.rpc.timeout` | Long | 20000 | Pull RPC timeout (ms) |
+| `rocketmq.source.pull.rpc.exception.delay` | Long | 3000 | Pull retry delay on exception (ms) |
+| `rocketmq.source.offset.commit.auto` | Boolean | true | Auto offset commit |
+| `rocketmq.source.offset.commit.interval` | Long | 5000 | Auto commit interval (ms) |
+| `rocketmq.source.offset.commit.checkpoint` | Boolean | true | Commit offsets on checkpoint |
+| `rocketmq.source.trace.enable` | Boolean | true | Message trace |
+| `rocketmq.source.trace.topic` | String | (none) | Customized trace topic |
+
+## Sink options (`rocketmq.sink.*`)
+
+| Key | Type | Default | Description |
+| --- | --- | --- | --- |
+| `rocketmq.sink.topic` | String | (none) | Topic, required for SQL |
+| `rocketmq.sink.group` | String | `PID-flink-producer` | Producer group |
+| `rocketmq.sink.tag` | String | (none) | Static message tag |
+| `rocketmq.sink.delivery.guarantee` | String | `AT_LEAST_ONCE` | `NONE` / `AT_LEAST_ONCE` / `EXACTLY_ONCE` |
+| `rocketmq.sink.transaction.timeout` | Long | 900 (s) | Transaction timeout for EXACTLY_ONCE |
+| `rocketmq.sink.send.timeout` | Long | 5000 | Send timeout (ms) |
+| `rocketmq.sink.send.retry.times` | Integer | 3 | Send retry times |
+| `rocketmq.sink.send.pending.max` | Integer | 1000 | Max in-flight async sends (AT_LEAST_ONCE) |
+| `rocketmq.sink.executor.num` | Integer | 4 | Producer executor threads |
+| `rocketmq.sink.key.columns` | String | (none) | SQL: columns used as message keys |
+| `rocketmq.sink.tag.dynamic.enable` / `rocketmq.sink.tag.dynamic.column` | Boolean / String | false / (none) | SQL: derive the tag from a column |
diff --git a/docs/sql-connector.md b/docs/sql-connector.md
new file mode 100644
index 0000000..9f0b015
--- /dev/null
+++ b/docs/sql-connector.md
@@ -0,0 +1,68 @@
+# Table / SQL Connector
+
+The remoting SQL connector is packaged as the fat-jar `flink-sql-connector-rocketmq`
+(identifier `rocketmq`).
+
+## Creating tables
+
+Required options for a source table: `rocketmq.client.endpoints`, `rocketmq.source.topic`,
+`rocketmq.source.group`.
+
+```sql
+CREATE TABLE rocketmq_source (
+  `id` BIGINT,
+  `name` STRING,
+  `message` STRING
+) WITH (
+  'connector' = 'rocketmq',
+  'rocketmq.client.endpoints' = '127.0.0.1:9876',
+  'rocketmq.source.topic' = 'flink-source',
+  'rocketmq.source.group' = 'GID-flink'
+);
+
+CREATE TABLE rocketmq_sink (
+  `id` BIGINT,
+  `name` STRING,
+  `message` STRING
+) WITH (
+  'connector' = 'rocketmq',
+  'rocketmq.client.endpoints' = '127.0.0.1:9876',
+  'rocketmq.sink.topic' = 'flink-sink',
+  'rocketmq.sink.group' = 'PID-flink'
+);
+```
+
+For ACL-enabled instances add `'rocketmq.client.accessKey'` / `'rocketmq.client.secretKey'`
+(and `'rocketmq.client.namespace'` where applicable).
+
+All `rocketmq.client.*`, `rocketmq.source.*` and `rocketmq.sink.*` options listed in
+[remoting-connector.md](remoting-connector.md) can be used in the `WITH` clause.
+
+## Available metadata
+
+Read-only columns must be declared `VIRTUAL`.
+
+| Key | Data type | R/W | Description |
+| --- | --- | --- | --- |
+| `topic` | STRING NOT NULL | R | Topic name of the RocketMQ record |
+
+```sql
+CREATE TABLE rocketmq_source (
+  `topic` STRING METADATA VIRTUAL,
+  `id` BIGINT
+) WITH (
+  'connector' = 'rocketmq',
+  'rocketmq.client.endpoints' = '127.0.0.1:9876',
+  'rocketmq.source.topic' = 'flink-source',
+  'rocketmq.source.group' = 'GID-flink'
+);
+```
+
+## Notes
+
+- `rocketmq.source.api.new.enable` (default true) selects the FLIP-27 source; setting it to
+  false falls back to the legacy `SourceFunction` path, which has no FLIP-27 fault-tolerance
+  integration and is not recommended.
+- In assign mode, tag / SQL92 filters are evaluated on the client side.
+- Message keys can be derived from columns via `rocketmq.sink.key.columns`; a dynamic tag column
+  via `rocketmq.sink.tag.dynamic.enable` + `rocketmq.sink.tag.dynamic.column`.
diff --git a/flink-connector-rocketmq/pom.xml b/flink-connector-rocketmq/pom.xml
new file mode 100644
index 0000000..8f71191
--- /dev/null
+++ b/flink-connector-rocketmq/pom.xml
@@ -0,0 +1,296 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.flink</groupId>
+        <artifactId>flink-connector-rocketmq-parent</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>flink-connector-rocketmq</artifactId>
+    <name>Flink : Connectors : RocketMQ</name>
+    <packaging>jar</packaging>
+
+    <dependencies>
+        <!-- Core -->
+
+        <dependency>
+            <groupId>org.apache.flink</groupId>
+            <artifactId>flink-streaming-java</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.flink</groupId>
+            <artifactId>flink-connector-base</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <!-- Table ecosystem (optional, for Table API integration) -->
+
+        <dependency>
+            <groupId>org.apache.flink</groupId>
+            <artifactId>flink-table-runtime</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.flink</groupId>
+            <artifactId>flink-table-common</artifactId>
+            <scope>provided</scope>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.flink</groupId>
+            <artifactId>flink-table-api-java-bridge</artifactId>
+            <scope>provided</scope>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.flink</groupId>
+            <artifactId>flink-avro</artifactId>
+            <scope>provided</scope>
+            <optional>true</optional>
+        </dependency>
+
+        <!-- RocketMQ -->
+
+        <dependency>
+            <groupId>org.apache.rocketmq</groupId>
+            <artifactId>rocketmq-client</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.rocketmq</groupId>
+            <artifactId>rocketmq-acl</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.rocketmq</groupId>
+            <artifactId>rocketmq-common</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.rocketmq</groupId>
+            <artifactId>rocketmq-tools</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.rocketmq</groupId>
+            <artifactId>schema-registry-client</artifactId>
+        </dependency>
+
+        <!-- Utility -->
+
+        <dependency>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
+        </dependency>
+
+        <!-- Tests -->
+
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.flink</groupId>
+            <artifactId>flink-clients</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.flink</groupId>
+            <artifactId>flink-test-utils</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.flink</groupId>
+            <artifactId>flink-connector-test-utils</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.flink</groupId>
+            <artifactId>flink-core</artifactId>
+            <scope>test</scope>
+            <type>test-jar</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.flink</groupId>
+            <artifactId>flink-streaming-java</artifactId>
+            <scope>test</scope>
+            <type>test-jar</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.flink</groupId>
+            <artifactId>flink-connector-base</artifactId>
+            <scope>test</scope>
+            <type>test-jar</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.flink</groupId>
+            <artifactId>flink-runtime</artifactId>
+            <scope>test</scope>
+            <type>test-jar</type>
+        </dependency>
+
+        <!-- ArchUnit test dependencies -->
+
+        <dependency>
+            <groupId>com.tngtech.archunit</groupId>
+            <artifactId>archunit</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.tngtech.archunit</groupId>
+            <artifactId>archunit-junit5-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.flink</groupId>
+            <artifactId>flink-architecture-tests-base</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.flink</groupId>
+            <artifactId>flink-architecture-tests-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.flink</groupId>
+            <artifactId>flink-architecture-tests-production</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>test-jar</goal>
+                        </goals>
+                        <configuration>
+                            <includes>
+                                <include>**/testutils/*</include>
+                                <include>META-INF/LICENSE</include>
+                                <include>META-INF/NOTICE</include>
+                            </includes>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>attach-test-sources</id>
+                        <goals>
+                            <goal>test-jar-no-fork</goal>
+                        </goals>
+                        <configuration>
+                            <archive>
+                                <!-- Globally exclude maven metadata, because it may
+                                     accidentally bundle files we don't intend to -->
+                                <addMavenDescriptor>false</addMavenDescriptor>
+                            </archive>
+                            <includes>
+                                <include>**/testutils/*</include>
+                                <include>META-INF/LICENSE</include>
+                                <include>META-INF/NOTICE</include>
+                            </includes>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>enforce-banned-deps</id>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
+                        <configuration>
+                            <rules>
+                                <bannedDependencies>
+                                    <excludes>
+                                        <exclude>com.google.guava:guava</exclude>
+                                        <exclude>org.powermock</exclude>
+                                    </excludes>
+                                    <includes>
+                                        <include>com.google.guava:guava:*:*:test</include>
+                                    </includes>
+                                </bannedDependencies>
+                            </rules>
+                            <fail>true</fail>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>analyze-deps</id>
+                        <goals>
+                            <goal>analyze</goal>
+                        </goals>
+                        <phase>verify</phase>
+                        <configuration>
+                            <ignoredUnusedDeclaredDependencies>
+                                org.apache.flink:flink-table-runtime,
+                                org.apache.flink:flink-architecture-tests-test,
+                                org.apache.flink:flink-architecture-tests-production
+                            </ignoredUnusedDeclaredDependencies>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/catalog/RocketMQCatalog.java b/flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/catalog/RocketMQCatalog.java
similarity index 100%
rename from src/main/java/org/apache/flink/connector/rocketmq/catalog/RocketMQCatalog.java
rename to flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/catalog/RocketMQCatalog.java
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/catalog/RocketMQCatalogFactory.java b/flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/catalog/RocketMQCatalogFactory.java
similarity index 100%
rename from src/main/java/org/apache/flink/connector/rocketmq/catalog/RocketMQCatalogFactory.java
rename to flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/catalog/RocketMQCatalogFactory.java
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/catalog/RocketMQCatalogFactoryOptions.java b/flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/catalog/RocketMQCatalogFactoryOptions.java
similarity index 94%
rename from src/main/java/org/apache/flink/connector/rocketmq/catalog/RocketMQCatalogFactoryOptions.java
rename to flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/catalog/RocketMQCatalogFactoryOptions.java
index 308a1a3..870809b 100644
--- a/src/main/java/org/apache/flink/connector/rocketmq/catalog/RocketMQCatalogFactoryOptions.java
+++ b/flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/catalog/RocketMQCatalogFactoryOptions.java
@@ -22,7 +22,7 @@ import org.apache.flink.annotation.Internal;
 import org.apache.flink.configuration.ConfigOption;
 import org.apache.flink.configuration.ConfigOptions;
 import org.apache.flink.connector.rocketmq.common.constant.SchemaRegistryConstant;
-import org.apache.flink.connector.rocketmq.legacy.RocketMQConfig;
+import org.apache.flink.streaming.connectors.rocketmq.RocketMQConfig;
 import org.apache.flink.table.catalog.CommonCatalogOptions;
 
 /** {@link ConfigOption}s for {@link RocketMQCatalog}. */
@@ -39,7 +39,7 @@ public final class RocketMQCatalogFactoryOptions {
     public static final ConfigOption<String> NAME_SERVER_ADDR =
             ConfigOptions.key(RocketMQConfig.NAME_SERVER_ADDR)
                     .stringType()
-                    .defaultValue("http://localhost:9876")
+                    .defaultValue("http://127.0.0.1:9876")
                     .withDescription("Required rocketmq name server address");
 
     public static final ConfigOption<String> SCHEMA_REGISTRY_BASE_URL =
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/common/config/RocketMQConfigBuilder.java b/flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/common/config/RocketMQConfigBuilder.java
similarity index 100%
rename from src/main/java/org/apache/flink/connector/rocketmq/common/config/RocketMQConfigBuilder.java
rename to flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/common/config/RocketMQConfigBuilder.java
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/common/config/RocketMQConfigValidator.java b/flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/common/config/RocketMQConfigValidator.java
similarity index 89%
rename from src/main/java/org/apache/flink/connector/rocketmq/common/config/RocketMQConfigValidator.java
rename to flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/common/config/RocketMQConfigValidator.java
index 9661042..39ada10 100644
--- a/src/main/java/org/apache/flink/connector/rocketmq/common/config/RocketMQConfigValidator.java
+++ b/flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/common/config/RocketMQConfigValidator.java
@@ -21,10 +21,8 @@ import org.apache.flink.annotation.Internal;
 import org.apache.flink.configuration.ConfigOption;
 import org.apache.flink.configuration.Configuration;
 
-import org.apache.flink.shaded.guava30.com.google.common.collect.ImmutableList;
-import org.apache.flink.shaded.guava30.com.google.common.collect.ImmutableSet;
-
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -87,7 +85,9 @@ public class RocketMQConfigValidator {
 
         public RocketMQConfigValidatorBuilder conflictOptions(ConfigOption<?>... options) {
             checkArgument(options.length > 1, "You should provide at least two conflict options.");
-            conflictOptions.add(ImmutableSet.copyOf(options));
+            Set<ConfigOption<?>> optionSet = new HashSet<>();
+            Collections.addAll(optionSet, options);
+            conflictOptions.add(Collections.unmodifiableSet(optionSet));
             return this;
         }
 
@@ -97,8 +97,8 @@ public class RocketMQConfigValidator {
         }
 
         public RocketMQConfigValidator build() {
-            ImmutableList<Set<ConfigOption<?>>> conflict = ImmutableList.copyOf(conflictOptions);
-            Set<ConfigOption<?>> required = ImmutableSet.copyOf(requiredOptions);
+            List<Set<ConfigOption<?>>> conflict = Collections.unmodifiableList(new ArrayList<>(conflictOptions));
+            Set<ConfigOption<?>> required = Collections.unmodifiableSet(new HashSet<>(requiredOptions));
 
             return new RocketMQConfigValidator(conflict, required);
         }
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/common/config/RocketMQConfiguration.java b/flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/common/config/RocketMQConfiguration.java
similarity index 100%
rename from src/main/java/org/apache/flink/connector/rocketmq/common/config/RocketMQConfiguration.java
rename to flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/common/config/RocketMQConfiguration.java
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/common/config/RocketMQOptions.java b/flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/common/config/RocketMQOptions.java
similarity index 82%
rename from src/main/java/org/apache/flink/connector/rocketmq/common/config/RocketMQOptions.java
rename to flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/common/config/RocketMQOptions.java
index 444db59..3df6b41 100644
--- a/src/main/java/org/apache/flink/connector/rocketmq/common/config/RocketMQOptions.java
+++ b/flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/common/config/RocketMQOptions.java
@@ -24,7 +24,6 @@ import org.apache.flink.configuration.ConfigOption;
 import org.apache.flink.configuration.ConfigOptions;
 
 import org.apache.rocketmq.client.AccessChannel;
-import org.apache.rocketmq.remoting.protocol.LanguageCode;
 
 import static org.apache.flink.connector.rocketmq.common.config.RocketMQOptions.CLIENT_CONFIG_PREFIX;
 
@@ -87,25 +86,12 @@ public class RocketMQOptions {
                     .withDescription(
                             "Time interval for polling route information from nameserver or proxy");
 
-    public static final ConfigOption<Long> HEARTBEAT_INTERVAL =
-            ConfigOptions.key(CLIENT_CONFIG_PREFIX + "heartbeat.interval.ms")
-                    .longType()
-                    .defaultValue(30000L)
-                    .withDescription(
-                            "Interval for regularly sending registration heartbeats to broker");
-
     public static final ConfigOption<Boolean> OPTIONAL_UNIT_MODE =
             ConfigOptions.key(CLIENT_CONFIG_PREFIX + "unitMode").booleanType().defaultValue(false);
 
     public static final ConfigOption<String> OPTIONAL_UNIT_NAME =
             ConfigOptions.key(CLIENT_CONFIG_PREFIX + "unitName").stringType().noDefaultValue();
 
-    public static final ConfigOption<Boolean> VIP_CHANNEL_ENABLED =
-            ConfigOptions.key(CLIENT_CONFIG_PREFIX + "channel.vip.enable")
-                    .booleanType()
-                    .defaultValue(false)
-                    .withDescription("Whether to enable vip netty channel for sending messages");
-
     public static final ConfigOption<Boolean> USE_TLS =
             ConfigOptions.key(CLIENT_CONFIG_PREFIX + "tls.enable")
                     .booleanType()
@@ -118,12 +104,6 @@ public class RocketMQOptions {
                     .defaultValue(30000L)
                     .withDescription("RocketMQ client api timeout setting");
 
-    public static final ConfigOption<LanguageCode> LANGUAGE_CODE =
-            ConfigOptions.key(CLIENT_CONFIG_PREFIX + "language")
-                    .enumType(LanguageCode.class)
-                    .defaultValue(LanguageCode.JAVA)
-                    .withDescription("Client implementation language");
-
     public static final ConfigOption<String> OPTIONAL_TIME_ZONE =
             ConfigOptions.key(CLIENT_CONFIG_PREFIX + "timeZone").stringType().noDefaultValue();
 
@@ -155,14 +135,8 @@ public class RocketMQOptions {
     public static final ConfigOption<String> OPTIONAL_SECRET_KEY =
             ConfigOptions.key(CLIENT_CONFIG_PREFIX + "secretKey").stringType().noDefaultValue();
 
-    public static final ConfigOption<Boolean> COMMIT_OFFSETS_ON_CHECKPOINT =
-            ConfigOptions.key("commit.offsets.on.checkpoint")
-                    .booleanType()
-                    .defaultValue(true)
-                    .withDescription("Whether to commit consuming offset on checkpoint.");
-
     public static final ConfigOption<Long> POLL_TIMEOUT =
-            ConfigOptions.key("poll.timeout")
+            ConfigOptions.key(CLIENT_CONFIG_PREFIX + "poll.timeout")
                     .longType()
                     .defaultValue(10L)
                     .withDescription("how long to wait before giving up, the unit is milliseconds");
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/common/constant/RocketMqCatalogConstant.java b/flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/common/constant/RocketMqCatalogConstant.java
similarity index 100%
rename from src/main/java/org/apache/flink/connector/rocketmq/common/constant/RocketMqCatalogConstant.java
rename to flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/common/constant/RocketMqCatalogConstant.java
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/common/constant/SchemaRegistryConstant.java b/flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/common/constant/SchemaRegistryConstant.java
similarity index 98%
rename from src/main/java/org/apache/flink/connector/rocketmq/common/constant/SchemaRegistryConstant.java
rename to flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/common/constant/SchemaRegistryConstant.java
index 416bb0f..dc999fb 100644
--- a/src/main/java/org/apache/flink/connector/rocketmq/common/constant/SchemaRegistryConstant.java
+++ b/flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/common/constant/SchemaRegistryConstant.java
@@ -21,7 +21,7 @@ package org.apache.flink.connector.rocketmq.common.constant;
 /** SchemaRegistryConstant. */
 public class SchemaRegistryConstant {
 
-    public static final String SCHEMA_REGISTRY_BASE_URL = "http://localhost:8080";
+    public static final String SCHEMA_REGISTRY_BASE_URL = "http://127.0.0.1:8080";
 
     public static final String SCHEMA_REGISTRY_BASE_URL_KEY = "schema.registry.base.url";
 }
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/common/event/SourceCheckEvent.java b/flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/common/event/SourceCheckEvent.java
similarity index 100%
rename from src/main/java/org/apache/flink/connector/rocketmq/common/event/SourceCheckEvent.java
rename to flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/common/event/SourceCheckEvent.java
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/common/event/SourceDetectEvent.java b/flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/common/event/SourceDetectEvent.java
similarity index 100%
rename from src/main/java/org/apache/flink/connector/rocketmq/common/event/SourceDetectEvent.java
rename to flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/common/event/SourceDetectEvent.java
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/common/event/SourceInitAssignEvent.java b/flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/common/event/SourceInitAssignEvent.java
similarity index 100%
rename from src/main/java/org/apache/flink/connector/rocketmq/common/event/SourceInitAssignEvent.java
rename to flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/common/event/SourceInitAssignEvent.java
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/common/event/SourceReportOffsetEvent.java b/flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/common/event/SourceReportOffsetEvent.java
similarity index 100%
rename from src/main/java/org/apache/flink/connector/rocketmq/common/event/SourceReportOffsetEvent.java
rename to flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/common/event/SourceReportOffsetEvent.java
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/common/lock/SpinLock.java b/flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/common/lock/SpinLock.java
similarity index 94%
rename from src/main/java/org/apache/flink/connector/rocketmq/common/lock/SpinLock.java
rename to flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/common/lock/SpinLock.java
index dbb32c2..c4d9845 100644
--- a/src/main/java/org/apache/flink/connector/rocketmq/common/lock/SpinLock.java
+++ b/flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/common/lock/SpinLock.java
@@ -20,7 +20,8 @@ package org.apache.flink.connector.rocketmq.common.lock;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 public class SpinLock {
-    private AtomicBoolean lock = new AtomicBoolean(false);
+
+    private final AtomicBoolean lock = new AtomicBoolean(false);
 
     public void lock() {
         boolean lock = false;
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/sink/InnerProducer.java b/flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/sink/InnerProducer.java
similarity index 100%
rename from src/main/java/org/apache/flink/connector/rocketmq/sink/InnerProducer.java
rename to flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/sink/InnerProducer.java
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/sink/InnerProducerImpl.java b/flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/sink/InnerProducerImpl.java
similarity index 82%
rename from src/main/java/org/apache/flink/connector/rocketmq/sink/InnerProducerImpl.java
rename to flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/sink/InnerProducerImpl.java
index 24897c7..84581b2 100644
--- a/src/main/java/org/apache/flink/connector/rocketmq/sink/InnerProducerImpl.java
+++ b/flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/sink/InnerProducerImpl.java
@@ -18,10 +18,10 @@
 package org.apache.flink.connector.rocketmq.sink;
 
 import org.apache.flink.configuration.Configuration;
+import org.apache.flink.connector.rocketmq.common.config.RocketMQOptions;
 import org.apache.flink.connector.rocketmq.sink.committer.SendCommittable;
 import org.apache.flink.util.StringUtils;
 
-import com.google.common.util.concurrent.MoreExecutors;
 import org.apache.rocketmq.acl.common.AclClientRPCHook;
 import org.apache.rocketmq.acl.common.SessionCredentials;
 import org.apache.rocketmq.client.exception.MQClientException;
@@ -102,6 +102,52 @@ public class InnerProducerImpl implements InnerProducer {
                             return thread;
                         }));
 
+        // Apply send timeout — previously a ghost parameter (P0 fix)
+        long sendTimeout = configuration.getLong(RocketMQSinkOptions.SEND_TIMEOUT);
+        producer.setSendMsgTimeout((int) sendTimeout);
+
+        // Apply retry times — previously a ghost parameter (P0 fix)
+        int retryTimes = configuration.getInteger(RocketMQSinkOptions.SEND_RETRY_TIMES);
+        producer.setRetryTimesWhenSendFailed(retryTimes);
+        producer.setRetryTimesWhenSendAsyncFailed(retryTimes);
+
+        // Apply common client parameters (P2 fix)
+        String namespace = configuration.getString(RocketMQOptions.NAMESPACE);
+        if (namespace != null && !namespace.isEmpty()) {
+            producer.setNamespace(namespace);
+        }
+        if (configuration.contains(RocketMQOptions.OPTIONAL_ACCESS_CHANNEL)) {
+            producer.setAccessChannel(configuration.get(RocketMQOptions.OPTIONAL_ACCESS_CHANNEL));
+        }
+        boolean unitMode = configuration.getBoolean(RocketMQOptions.OPTIONAL_UNIT_MODE);
+        producer.setUnitMode(unitMode);
+        String unitName = configuration.getString(RocketMQOptions.OPTIONAL_UNIT_NAME);
+        if (unitName != null) {
+            producer.setUnitName(unitName);
+        }
+        if (configuration.contains(RocketMQOptions.CLIENT_CALLBACK_EXECUTOR_THREADS)) {
+            producer.setClientCallbackExecutorThreads(
+                    configuration.getInteger(RocketMQOptions.CLIENT_CALLBACK_EXECUTOR_THREADS));
+        }
+        if (configuration.contains(RocketMQOptions.USE_TLS)) {
+            producer.setUseTLS(configuration.getBoolean(RocketMQOptions.USE_TLS));
+        }
+        if (configuration.contains(RocketMQOptions.MQ_CLIENT_API_TIMEOUT)) {
+            producer.setMqClientApiTimeout(
+                    (int) configuration.getLong(RocketMQOptions.MQ_CLIENT_API_TIMEOUT));
+        }
+        boolean debugMode = configuration.getBoolean(RocketMQOptions.GLOBAL_DEBUG_MODE);
+        if (debugMode) {
+            System.setProperty(
+                    "rocketmq.client.logRoot",
+                    System.getProperty("user.home") + "/logs/rocketmqlogs");
+            LOG.info("RocketMQ debug mode enabled for producer");
+        }
+
+        // Note: TRANSACTION_TIMEOUT is applied at message level in sendMessageInTransaction()
+        // via PROPERTY_CHECK_IMMUNITY_TIME_IN_SECONDS, and in checkLocalTransaction() for
+        // the Flink-side timeout check. No producer-level setter exists in this client version.
+
         // always response unknown result
         producer.setTransactionListener(
                 new TransactionListener() {
@@ -114,10 +160,11 @@ public class InnerProducerImpl implements InnerProducer {
 
                     @Override
                     public LocalTransactionState checkLocalTransaction(MessageExt msg) {
-                        long transactionTimeout =
+                        long transactionTimeoutSec =
                                 configuration.get(RocketMQSinkOptions.TRANSACTION_TIMEOUT);
+                        // Convert seconds to milliseconds for comparison (bug fix)
                         if (System.currentTimeMillis() - msg.getBornTimestamp()
-                                > transactionTimeout) {
+                                > transactionTimeoutSec * 1000) {
                             LOG.info(
                                     "Exceeded the transaction maximum time, return rollback. topic={}, msgId={}",
                                     msg.getTopic(),
@@ -172,7 +219,7 @@ public class InnerProducerImpl implements InnerProducer {
                         throw new RuntimeException(e);
                     }
                 },
-                MoreExecutors.directExecutor());
+                Runnable::run);
     }
 
     @Override
@@ -221,7 +268,7 @@ public class InnerProducerImpl implements InnerProducer {
                         throw new RuntimeException(e);
                     }
                 },
-                MoreExecutors.directExecutor());
+                Runnable::run);
     }
 
     public void endTransaction(
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/sink/RocketMQSink.java b/flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/sink/RocketMQSink.java
similarity index 97%
rename from src/main/java/org/apache/flink/connector/rocketmq/sink/RocketMQSink.java
rename to flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/sink/RocketMQSink.java
index 5ea2fd8..f2562e5 100644
--- a/src/main/java/org/apache/flink/connector/rocketmq/sink/RocketMQSink.java
+++ b/flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/sink/RocketMQSink.java
@@ -21,7 +21,7 @@ import org.apache.flink.annotation.PublicEvolving;
 import org.apache.flink.api.connector.sink2.Committer;
 import org.apache.flink.api.connector.sink2.TwoPhaseCommittingSink;
 import org.apache.flink.configuration.Configuration;
-import org.apache.flink.connector.rocketmq.legacy.common.selector.MessageQueueSelector;
+import org.apache.flink.streaming.connectors.rocketmq.common.selector.MessageQueueSelector;
 import org.apache.flink.connector.rocketmq.sink.committer.RocketMQCommitter;
 import org.apache.flink.connector.rocketmq.sink.committer.SendCommittable;
 import org.apache.flink.connector.rocketmq.sink.committer.SendCommittableSerializer;
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/sink/RocketMQSinkBuilder.java b/flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/sink/RocketMQSinkBuilder.java
similarity index 90%
rename from src/main/java/org/apache/flink/connector/rocketmq/sink/RocketMQSinkBuilder.java
rename to flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/sink/RocketMQSinkBuilder.java
index 426d43c..5895612 100644
--- a/src/main/java/org/apache/flink/connector/rocketmq/sink/RocketMQSinkBuilder.java
+++ b/flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/sink/RocketMQSinkBuilder.java
@@ -26,17 +26,17 @@ import org.apache.flink.connector.base.DeliveryGuarantee;
 import org.apache.flink.connector.rocketmq.common.config.RocketMQConfigBuilder;
 import org.apache.flink.connector.rocketmq.common.config.RocketMQConfigValidator;
 import org.apache.flink.connector.rocketmq.common.config.RocketMQOptions;
-import org.apache.flink.connector.rocketmq.legacy.common.selector.MessageQueueSelector;
+import org.apache.flink.streaming.connectors.rocketmq.common.selector.MessageQueueSelector;
 import org.apache.flink.connector.rocketmq.sink.writer.serializer.RocketMQSerializationSchema;
 import org.apache.flink.connector.rocketmq.source.RocketMQSource;
 import org.apache.flink.connector.rocketmq.source.RocketMQSourceOptions;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.commons.lang3.StringUtils;
 
 import java.util.Properties;
 
 import static org.apache.flink.util.Preconditions.checkNotNull;
+import static org.apache.flink.util.Preconditions.checkState;
 
 /**
  * Builder to construct {@link RocketMQSink}.
@@ -46,8 +46,6 @@ import static org.apache.flink.util.Preconditions.checkNotNull;
 @PublicEvolving
 public class RocketMQSinkBuilder<IN> {
 
-    private static final Logger LOG = LoggerFactory.getLogger(RocketMQSinkBuilder.class);
-
     public static final RocketMQConfigValidator SINK_CONFIG_VALIDATOR =
             RocketMQConfigValidator.builder().build();
 
@@ -164,7 +162,15 @@ public class RocketMQSinkBuilder<IN> {
     }
 
     // ------------- private helpers  --------------
-    private void sanityCheck() {}
+    private void sanityCheck() {
+        checkState(
+                StringUtils.isNotBlank(configBuilder.get(RocketMQSinkOptions.ENDPOINTS)),
+                "endpoints must be set via setEndpoints()");
+        checkState(
+                StringUtils.isNotBlank(configBuilder.get(RocketMQSinkOptions.PRODUCER_GROUP)),
+                "producer group must be set via setGroupId()");
+        checkNotNull(serializer, "serializer must be set via setSerializer()");
+    }
 
     private void parseAndSetRequiredProperties() {}
 }
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/sink/RocketMQSinkOptions.java b/flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/sink/RocketMQSinkOptions.java
similarity index 80%
rename from src/main/java/org/apache/flink/connector/rocketmq/sink/RocketMQSinkOptions.java
rename to flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/sink/RocketMQSinkOptions.java
index 0ddd850..61e7263 100644
--- a/src/main/java/org/apache/flink/connector/rocketmq/sink/RocketMQSinkOptions.java
+++ b/flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/sink/RocketMQSinkOptions.java
@@ -63,7 +63,7 @@ public class RocketMQSinkOptions extends RocketMQOptions {
             ConfigOptions.key(PRODUCER_PREFIX + "send.pending.max")
                     .intType()
                     .defaultValue(1000)
-                    .withDescription("Message send timeout in ms.");
+                    .withDescription("Maximum number of pending messages in the send buffer.");
 
     public static final ConfigOption<Long> SEND_TIMEOUT =
             ConfigOptions.key(PRODUCER_PREFIX + "send.timeout")
@@ -75,39 +75,33 @@ public class RocketMQSinkOptions extends RocketMQOptions {
             ConfigOptions.key(PRODUCER_PREFIX + "executor.num")
                     .intType()
                     .defaultValue(4)
-                    .withDescription("Message send timeout in ms.");
+                    .withDescription("Number of executor threads for sending messages.");
 
     public static final ConfigOption<String> TAG =
             ConfigOptions.key(PRODUCER_PREFIX + "tag")
                     .stringType()
                     .noDefaultValue()
-                    .withDescription("The name of the persist topic");
-
-    public static final ConfigOption<String> KEY =
-            ConfigOptions.key(PRODUCER_PREFIX + "key")
-                    .stringType()
-                    .noDefaultValue()
-                    .withDescription("The name of the persist topic");
+                    .withDescription("Message tag for filtering.");
 
     // old config
     public static final ConfigOption<Integer> OPTIONAL_WRITE_RETRY_TIMES =
-            ConfigOptions.key("retryTimes").intType().defaultValue(10);
+            ConfigOptions.key("rocketmq.sink.retry.times").intType().defaultValue(10);
 
     public static final ConfigOption<Long> OPTIONAL_WRITE_SLEEP_TIME_MS =
-            ConfigOptions.key("sleepTimeMs").longType().defaultValue(5000L);
+            ConfigOptions.key("rocketmq.sink.retry.sleep.ms").longType().defaultValue(5000L);
 
     public static final ConfigOption<Boolean> OPTIONAL_WRITE_IS_DYNAMIC_TAG =
-            ConfigOptions.key("isDynamicTag").booleanType().defaultValue(false);
+            ConfigOptions.key("rocketmq.sink.tag.dynamic.enable").booleanType().defaultValue(false);
 
     public static final ConfigOption<String> OPTIONAL_WRITE_DYNAMIC_TAG_COLUMN =
-            ConfigOptions.key("dynamicTagColumn").stringType().noDefaultValue();
+            ConfigOptions.key("rocketmq.sink.tag.dynamic.column").stringType().noDefaultValue();
 
     public static final ConfigOption<Boolean> OPTIONAL_WRITE_DYNAMIC_TAG_COLUMN_WRITE_INCLUDED =
-            ConfigOptions.key("dynamicTagColumnWriteIncluded").booleanType().defaultValue(true);
+            ConfigOptions.key("rocketmq.sink.tag.dynamic.write.included").booleanType().defaultValue(true);
 
     public static final ConfigOption<String> OPTIONAL_WRITE_KEY_COLUMNS =
-            ConfigOptions.key("keyColumns").stringType().noDefaultValue();
+            ConfigOptions.key("rocketmq.sink.key.columns").stringType().noDefaultValue();
 
     public static final ConfigOption<Boolean> OPTIONAL_WRITE_KEYS_TO_BODY =
-            ConfigOptions.key("writeKeysToBody").booleanType().defaultValue(false);
+            ConfigOptions.key("rocketmq.sink.key.write.to.body").booleanType().defaultValue(false);
 }
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/sink/TransactionResult.java b/flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/sink/TransactionResult.java
similarity index 100%
rename from src/main/java/org/apache/flink/connector/rocketmq/sink/TransactionResult.java
rename to flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/sink/TransactionResult.java
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/sink/committer/RocketMQCommitter.java b/flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/sink/committer/RocketMQCommitter.java
similarity index 96%
rename from src/main/java/org/apache/flink/connector/rocketmq/sink/committer/RocketMQCommitter.java
rename to flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/sink/committer/RocketMQCommitter.java
index 55bacca..4262b7b 100644
--- a/src/main/java/org/apache/flink/connector/rocketmq/sink/committer/RocketMQCommitter.java
+++ b/flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/sink/committer/RocketMQCommitter.java
@@ -29,10 +29,9 @@ import org.slf4j.LoggerFactory;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+import java.util.Objects;
 import java.util.concurrent.CompletableFuture;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 /**
  * Committer implementation for {@link RocketMQSink}
  *
@@ -87,7 +86,7 @@ public class RocketMQCommitter implements Committer<SendCommittable>, Cloneable
         if (producer == null) {
             this.producer = new InnerProducerImpl(configuration);
             this.producer.start();
-            checkNotNull(producer, "You haven't enable rocketmq transaction client.");
+            Objects.requireNonNull(producer, "You haven't enable rocketmq transaction client.");
         }
         return producer;
     }
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/sink/committer/SendCommittable.java b/flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/sink/committer/SendCommittable.java
similarity index 100%
rename from src/main/java/org/apache/flink/connector/rocketmq/sink/committer/SendCommittable.java
rename to flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/sink/committer/SendCommittable.java
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/sink/committer/SendCommittableSerializer.java b/flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/sink/committer/SendCommittableSerializer.java
similarity index 100%
rename from src/main/java/org/apache/flink/connector/rocketmq/sink/committer/SendCommittableSerializer.java
rename to flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/sink/committer/SendCommittableSerializer.java
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/sink/writer/RocketMQWriter.java b/flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/sink/writer/RocketMQWriter.java
similarity index 55%
rename from src/main/java/org/apache/flink/connector/rocketmq/sink/writer/RocketMQWriter.java
rename to flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/sink/writer/RocketMQWriter.java
index 5118e0b..a5f2a6f 100644
--- a/src/main/java/org/apache/flink/connector/rocketmq/sink/writer/RocketMQWriter.java
+++ b/flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/sink/writer/RocketMQWriter.java
@@ -22,7 +22,7 @@ import org.apache.flink.api.connector.sink2.Sink;
 import org.apache.flink.api.connector.sink2.TwoPhaseCommittingSink;
 import org.apache.flink.configuration.Configuration;
 import org.apache.flink.connector.base.DeliveryGuarantee;
-import org.apache.flink.connector.rocketmq.legacy.common.selector.MessageQueueSelector;
+import org.apache.flink.streaming.connectors.rocketmq.common.selector.MessageQueueSelector;
 import org.apache.flink.connector.rocketmq.sink.InnerProducer;
 import org.apache.flink.connector.rocketmq.sink.InnerProducerImpl;
 import org.apache.flink.connector.rocketmq.sink.RocketMQSinkOptions;
@@ -30,6 +30,7 @@ import org.apache.flink.connector.rocketmq.sink.committer.SendCommittable;
 import org.apache.flink.connector.rocketmq.sink.writer.context.RocketMQSinkContext;
 import org.apache.flink.connector.rocketmq.sink.writer.context.RocketMQSinkContextImpl;
 import org.apache.flink.connector.rocketmq.sink.writer.serializer.RocketMQSerializationSchema;
+import org.apache.flink.util.FlinkRuntimeException;
 
 import org.apache.rocketmq.client.producer.SendResult;
 import org.apache.rocketmq.common.message.Message;
@@ -43,17 +44,13 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.atomic.AtomicReference;
 
 public class RocketMQWriter<IN>
         implements TwoPhaseCommittingSink.PrecommittingSinkWriter<IN, SendCommittable> {
 
     private static final Logger LOG = LoggerFactory.getLogger(RocketMQWriter.class);
-    private static final String RMQ_PRODUCER_METRIC_NAME = "RocketMQProducer";
-    private static final long METRIC_UPDATE_INTERVAL_MILLIS = 500;
-
-    private static final String KEY_DISABLE_METRICS = "flink.disable-metrics";
-    private static final String KEY_REGISTER_METRICS = "register.producer.metrics";
-    private static final String ROCKETMQ_PRODUCER_METRICS = "producer-metrics";
 
     private final transient InnerProducer producer;
 
@@ -62,6 +59,10 @@ public class RocketMQWriter<IN>
     private final RocketMQSinkContext rocketmqSinkContext;
     private final RocketMQSerializationSchema<IN> serializationSchema;
     private final Map<String, SendResult> sendResultMap;
+    private final int sendRetryTimes;
+    private final long sendSleepTimeMs;
+    private final AtomicLong pendingRecords = new AtomicLong(0);
+    private final AtomicReference<Throwable> asyncSendException = new AtomicReference<>();
 
     public RocketMQWriter(
             Configuration configuration,
@@ -76,38 +77,90 @@ public class RocketMQWriter<IN>
         this.serializationSchema = serializationSchema;
         this.rocketmqSinkContext = new RocketMQSinkContextImpl(initContext, configuration);
         this.sendResultMap = new ConcurrentHashMap<>();
+        this.sendRetryTimes = configuration.getInteger(RocketMQSinkOptions.SEND_RETRY_TIMES);
+        this.sendSleepTimeMs =
+                configuration.getLong(RocketMQSinkOptions.OPTIONAL_WRITE_SLEEP_TIME_MS);
+        try {
+            serializationSchema.open(
+                    initContext.asSerializationSchemaInitializationContext(), rocketmqSinkContext);
+        } catch (Exception e) {
+            throw new FlinkRuntimeException("Failed to open serialization schema", e);
+        }
         this.producer = new InnerProducerImpl(configuration);
         this.producer.start();
     }
 
     @Override
     public void write(IN element, Context context) throws IOException {
-        try {
-            Message message =
-                    serializationSchema.serialize(
-                            element, rocketmqSinkContext, System.currentTimeMillis());
-            if (deliveryGuarantee == DeliveryGuarantee.EXACTLY_ONCE) {
-                producer.sendMessageInTransaction(message)
-                        .whenComplete(
-                                (sendResult, throwable) -> {
-                                    sendResultMap.put(sendResult.getTransactionId(), sendResult);
-                                });
-            } else {
-                producer.send(message)
-                        .whenComplete(
-                                (sendResult, throwable) -> {
-                                    sendResultMap.put(sendResult.getTransactionId(), sendResult);
-                                });
+        checkAsyncException();
+        Message message =
+                serializationSchema.serialize(
+                        element, rocketmqSinkContext, System.currentTimeMillis());
+
+        if (deliveryGuarantee == DeliveryGuarantee.EXACTLY_ONCE) {
+            writeInTransaction(message);
+        } else {
+            pendingRecords.incrementAndGet();
+            producer.send(message)
+                    .whenComplete(
+                            (sendResult, throwable) -> {
+                                if (throwable != null) {
+                                    asyncSendException.compareAndSet(null, throwable);
+                                }
+                                pendingRecords.decrementAndGet();
+                            });
+        }
+    }
+
+    private void writeInTransaction(Message message) throws IOException {
+        int attempt = 0;
+        Exception lastException = null;
+        while (attempt <= sendRetryTimes) {
+            try {
+                SendResult sendResult = producer.sendMessageInTransaction(message).get();
+                sendResultMap.put(sendResult.getTransactionId(), sendResult);
+                return; // success
+            } catch (Exception e) {
+                lastException = e;
+                attempt++;
+                if (attempt <= sendRetryTimes) {
+                    LOG.warn(
+                            "Send message failed (attempt {}/{}), retrying. topic={}",
+                            attempt,
+                            sendRetryTimes,
+                            message.getTopic(),
+                            e);
+                    try {
+                        Thread.sleep(sendSleepTimeMs);
+                    } catch (InterruptedException ie) {
+                        Thread.currentThread().interrupt();
+                        throw new IOException("Interrupted during send retry", ie);
+                    }
+                }
             }
-        } catch (Exception e) {
-            LOG.error("Send message error", e);
-            throw new IOException(e);
         }
+        LOG.error(
+                "Send message failed after {} retries, topic={}",
+                sendRetryTimes,
+                message.getTopic());
+        throw new IOException(
+                "Failed to send message after " + sendRetryTimes + " retries", lastException);
     }
 
     @Override
     public void flush(boolean endOfInput) throws IOException, InterruptedException {
-        // rocketmq client send message to server immediately, no need flush here
+        while (pendingRecords.get() > 0) {
+            checkAsyncException();
+            Thread.sleep(10);
+        }
+        checkAsyncException();
+    }
+
+    private void checkAsyncException() throws IOException {
+        Throwable throwable = asyncSendException.getAndSet(null);
+        if (throwable != null) {
+            throw new IOException("Async send message failed", throwable);
+        }
     }
 
     @Override
@@ -131,5 +184,9 @@ public class RocketMQWriter<IN>
     }
 
     @Override
-    public void close() throws Exception {}
+    public void close() throws Exception {
+        if (producer != null) {
+            producer.close();
+        }
+    }
 }
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/sink/writer/context/RocketMQSinkContext.java b/flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/sink/writer/context/RocketMQSinkContext.java
similarity index 100%
rename from src/main/java/org/apache/flink/connector/rocketmq/sink/writer/context/RocketMQSinkContext.java
rename to flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/sink/writer/context/RocketMQSinkContext.java
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/sink/writer/context/RocketMQSinkContextImpl.java b/flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/sink/writer/context/RocketMQSinkContextImpl.java
similarity index 100%
rename from src/main/java/org/apache/flink/connector/rocketmq/sink/writer/context/RocketMQSinkContextImpl.java
rename to flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/sink/writer/context/RocketMQSinkContextImpl.java
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/sink/writer/serializer/RocketMQSerializationSchema.java b/flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/sink/writer/serializer/RocketMQSerializationSchema.java
similarity index 100%
rename from src/main/java/org/apache/flink/connector/rocketmq/sink/writer/serializer/RocketMQSerializationSchema.java
rename to flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/sink/writer/serializer/RocketMQSerializationSchema.java
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/sink/writer/serializer/RocketMQSerializerWrapper.java b/flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/sink/writer/serializer/RocketMQSerializerWrapper.java
similarity index 100%
rename from src/main/java/org/apache/flink/connector/rocketmq/sink/writer/serializer/RocketMQSerializerWrapper.java
rename to flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/sink/writer/serializer/RocketMQSerializerWrapper.java
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/source/InnerConsumer.java b/flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/source/InnerConsumer.java
similarity index 100%
rename from src/main/java/org/apache/flink/connector/rocketmq/source/InnerConsumer.java
rename to flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/source/InnerConsumer.java
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/source/InnerConsumerImpl.java b/flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/source/InnerConsumerImpl.java
similarity index 62%
rename from src/main/java/org/apache/flink/connector/rocketmq/source/InnerConsumerImpl.java
rename to flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/source/InnerConsumerImpl.java
index a76a198..c1c6907 100644
--- a/src/main/java/org/apache/flink/connector/rocketmq/source/InnerConsumerImpl.java
+++ b/flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/source/InnerConsumerImpl.java
@@ -19,6 +19,7 @@ package org.apache.flink.connector.rocketmq.source;
 
 import org.apache.flink.annotation.VisibleForTesting;
 import org.apache.flink.configuration.Configuration;
+import org.apache.flink.connector.rocketmq.common.config.RocketMQOptions;
 import org.apache.flink.connector.rocketmq.source.enumerator.offset.OffsetsSelector;
 import org.apache.flink.connector.rocketmq.source.reader.MessageView;
 import org.apache.flink.connector.rocketmq.source.reader.MessageViewExt;
@@ -48,6 +49,7 @@ import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionException;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.LinkedBlockingQueue;
@@ -72,6 +74,11 @@ public class InnerConsumerImpl implements InnerConsumer {
         String accessKey = configuration.getString(RocketMQSourceOptions.OPTIONAL_ACCESS_KEY);
         String secretKey = configuration.getString(RocketMQSourceOptions.OPTIONAL_SECRET_KEY);
 
+        boolean enableTrace =
+                configuration.getBoolean(RocketMQSourceOptions.ENABLE_MESSAGE_TRACE);
+        String traceTopic =
+                configuration.getString(RocketMQSourceOptions.CUSTOMIZED_TRACE_TOPIC);
+
         // Note: sync pull thread num may not enough
         if (!StringUtils.isNullOrWhitespaceOnly(accessKey)
                 && !StringUtils.isNullOrWhitespaceOnly(secretKey)) {
@@ -84,6 +91,12 @@ public class InnerConsumerImpl implements InnerConsumer {
             this.consumer = new DefaultLitePullConsumer();
         }
 
+        // Enable message trace if configured (P1 fix — previously a ghost parameter)
+        this.consumer.setEnableMsgTrace(enableTrace);
+        if (traceTopic != null) {
+            this.consumer.setCustomizedTraceTopic(traceTopic);
+        }
+
         String groupId = configuration.getString(RocketMQSourceOptions.CONSUMER_GROUP);
         String endPoints = configuration.getString(RocketMQSourceOptions.ENDPOINTS);
 
@@ -98,9 +111,88 @@ public class InnerConsumerImpl implements InnerConsumer {
                         groupId,
                         UUID.randomUUID().toString()));
 
+        // Apply pull batch size from config (P1 fix — previously a ghost parameter)
+        long pullBatchSize = configuration.getLong(RocketMQSourceOptions.PULL_BATCH_SIZE);
+        if (pullBatchSize > 0) {
+            this.consumer.setPullBatchSize((int) pullBatchSize);
+        }
+
+        // Apply namespace from config (P2 fix)
+        String namespace = configuration.getString(RocketMQOptions.NAMESPACE);
+        if (namespace != null && !namespace.isEmpty()) {
+            this.consumer.setNamespace(namespace);
+        }
+
+        // Log auto-commit configuration for observability (P1 fix)
+        boolean autoCommit = configuration.getBoolean(RocketMQSourceOptions.AUTO_COMMIT_OFFSET);
+        long commitInterval =
+                configuration.getLong(RocketMQSourceOptions.AUTO_COMMIT_OFFSET_INTERVAL);
+        LOG.info(
+                "Consumer offset commit config: autoCommit={}, commitInterval={}ms, checkpointCommit={}",
+                autoCommit,
+                commitInterval,
+                configuration.getBoolean(RocketMQSourceOptions.COMMIT_OFFSETS_ON_CHECKPOINT));
+
+        // Apply common client parameters (P2 fix)
+        if (configuration.contains(RocketMQOptions.OPTIONAL_ACCESS_CHANNEL)) {
+            this.consumer.setAccessChannel(
+                    configuration.get(RocketMQOptions.OPTIONAL_ACCESS_CHANNEL));
+        }
+        boolean unitMode = configuration.getBoolean(RocketMQOptions.OPTIONAL_UNIT_MODE);
+        this.consumer.setUnitMode(unitMode);
+        String unitName = configuration.getString(RocketMQOptions.OPTIONAL_UNIT_NAME);
+        if (unitName != null) {
+            this.consumer.setUnitName(unitName);
+        }
+        if (configuration.contains(RocketMQOptions.CLIENT_CALLBACK_EXECUTOR_THREADS)) {
+            this.consumer.setClientCallbackExecutorThreads(
+                    configuration.getInteger(RocketMQOptions.CLIENT_CALLBACK_EXECUTOR_THREADS));
+        }
+        if (configuration.contains(RocketMQOptions.USE_TLS)) {
+            this.consumer.setUseTLS(configuration.getBoolean(RocketMQOptions.USE_TLS));
+        }
+        if (configuration.contains(RocketMQOptions.MQ_CLIENT_API_TIMEOUT)) {
+            this.consumer.setMqClientApiTimeout(
+                    (int) configuration.getLong(RocketMQOptions.MQ_CLIENT_API_TIMEOUT));
+        }
+        if (configuration.contains(RocketMQSourceOptions.PULL_THRESHOLD_FOR_QUEUE)) {
+            this.consumer.setPullThresholdForQueue(
+                    (int) configuration.getLong(RocketMQSourceOptions.PULL_THRESHOLD_FOR_QUEUE));
+        }
+        if (configuration.contains(RocketMQSourceOptions.PULL_THRESHOLD_FOR_ALL)) {
+            this.consumer.setPullThresholdForAll(
+                    (int) configuration.getLong(RocketMQSourceOptions.PULL_THRESHOLD_FOR_ALL));
+        }
+        if (configuration.contains(RocketMQSourceOptions.PULL_TIME_DELAY_MILLS_WHEN_EXCEPTION)) {
+            this.consumer.setPullTimeDelayMillsWhenException(
+                    configuration.getLong(
+                            RocketMQSourceOptions.PULL_TIME_DELAY_MILLS_WHEN_EXCEPTION));
+        }
+        boolean debugMode = configuration.getBoolean(RocketMQOptions.GLOBAL_DEBUG_MODE);
+        if (debugMode) {
+            System.setProperty(
+                    "rocketmq.client.logRoot",
+                    System.getProperty("user.home") + "/logs/rocketmqlogs");
+            LOG.info("RocketMQ debug mode enabled");
+        }
+
         this.adminExt.setNamesrvAddr(endPoints);
         this.adminExt.setAdminExtGroup(groupId);
         this.adminExt.setVipChannelEnabled(false);
+        if (configuration.contains(RocketMQOptions.OPTIONAL_ACCESS_CHANNEL)) {
+            this.adminExt.setAccessChannel(
+                    configuration.get(RocketMQOptions.OPTIONAL_ACCESS_CHANNEL));
+        }
+        if (namespace != null && !namespace.isEmpty()) {
+            this.adminExt.setNamespace(namespace);
+        }
+        if (configuration.contains(RocketMQOptions.USE_TLS)) {
+            this.adminExt.setUseTLS(configuration.getBoolean(RocketMQOptions.USE_TLS));
+        }
+        if (configuration.contains(RocketMQOptions.MQ_CLIENT_API_TIMEOUT)) {
+            this.adminExt.setMqClientApiTimeout(
+                    (int) configuration.getLong(RocketMQOptions.MQ_CLIENT_API_TIMEOUT));
+        }
         this.adminExt.setInstanceName(
                 String.join(
                         "#",
@@ -242,7 +334,7 @@ public class InnerConsumerImpl implements InnerConsumer {
                                         .readOffset(messageQueue, ReadOffsetType.READ_FROM_STORE);
 
                         if (offset == -1) {
-                            offset = adminExt.minOffset(messageQueue);
+                            offset = minOffset(messageQueue);
                             LOG.info(
                                     "Consumer seek committed offset from remote, offset=-1,mq={},use minOffset={}",
                                     UtilAll.getQueueDescription(messageQueue),
@@ -269,7 +361,7 @@ public class InnerConsumerImpl implements InnerConsumer {
         return CompletableFuture.supplyAsync(
                 () -> {
                     try {
-                        long offset = adminExt.minOffset(messageQueue);
+                        long offset = minOffset(messageQueue);
                         LOG.info(
                                 "Consumer seek min offset from remote, mq={}, offset={}",
                                 UtilAll.getQueueDescription(messageQueue),
@@ -291,7 +383,7 @@ public class InnerConsumerImpl implements InnerConsumer {
         return CompletableFuture.supplyAsync(
                 () -> {
                     try {
-                        long offset = adminExt.maxOffset(messageQueue);
+                        long offset = maxOffset(messageQueue);
                         LOG.info(
                                 "Consumer seek max offset from remote, mq={}, offset={}",
                                 UtilAll.getQueueDescription(messageQueue),
@@ -308,13 +400,50 @@ public class InnerConsumerImpl implements InnerConsumer {
                 commonExecutorService);
     }
 
+    /**
+     * Query the min offset via the admin client, falling back to a consumer-side timestamp lookup.
+     * Aliyun commercial instances expose logical broker names that the admin publish-route lookup
+     * cannot resolve, while the consumer request path resolves them through the proxy.
+     */
+    private long minOffset(MessageQueue messageQueue) throws MQClientException {
+        try {
+            return adminExt.minOffset(messageQueue);
+        } catch (MQClientException e) {
+            LOG.info(
+                    "Admin min offset lookup failed for mq={}, falling back to consumer lookup",
+                    UtilAll.getQueueDescription(messageQueue));
+            return consumer.offsetForTimestamp(messageQueue, 0L);
+        }
+    }
+
+    /** Same admin-first, consumer-fallback strategy as {@link #minOffset(MessageQueue)}. */
+    private long maxOffset(MessageQueue messageQueue) throws MQClientException {
+        try {
+            return adminExt.maxOffset(messageQueue);
+        } catch (MQClientException e) {
+            LOG.info(
+                    "Admin max offset lookup failed for mq={}, falling back to consumer lookup",
+                    UtilAll.getQueueDescription(messageQueue));
+            return consumer.offsetForTimestamp(
+                    messageQueue, System.currentTimeMillis() + TimeUnit.DAYS.toMillis(365));
+        }
+    }
+
     @Override
     public CompletableFuture<Long> seekOffsetByTimestamp(
             MessageQueue messageQueue, long timestamp) {
         return CompletableFuture.supplyAsync(
                 () -> {
                     try {
-                        long offset = adminExt.searchOffset(messageQueue, timestamp);
+                        long offset;
+                        try {
+                            offset = adminExt.searchOffset(messageQueue, timestamp);
+                        } catch (MQClientException e) {
+                            LOG.info(
+                                    "Admin search offset failed for mq={}, falling back to consumer lookup",
+                                    UtilAll.getQueueDescription(messageQueue));
+                            offset = consumer.offsetForTimestamp(messageQueue, timestamp);
+                        }
                         LOG.info(
                                 "Consumer seek offset by timestamp from remote, mq={}, timestamp={}, offset={}",
                                 UtilAll.getQueueDescription(messageQueue),
@@ -358,121 +487,74 @@ public class InnerConsumerImpl implements InnerConsumer {
 
         @Override
         public Map<MessageQueue, Long> committedOffsets(Collection<MessageQueue> messageQueues) {
-            Map<MessageQueue, Long> result = new ConcurrentHashMap<>();
-            CompletableFuture.allOf(
-                            messageQueues.stream()
-                                    .map(
-                                            messageQueue ->
-                                                    CompletableFuture.supplyAsync(
-                                                                    () ->
-                                                                            innerConsumer
-                                                                                    .seekCommittedOffset(
-                                                                                            messageQueue))
-                                                            .thenAccept(
-                                                                    future -> {
-                                                                        try {
-                                                                            result.put(
-                                                                                    messageQueue,
-                                                                                    future.get());
-                                                                        } catch (Exception e) {
-                                                                            LOG.error(
-                                                                                    "Consumer offsets retriever fetch committed offset error",
-                                                                                    e);
-                                                                        }
-                                                                    }))
-                                    .toArray(CompletableFuture[]::new))
-                    .join();
-            return result;
+            return fetchOffsets(
+                    messageQueues,
+                    mq -> innerConsumer.seekCommittedOffset(mq),
+                    "fetch committed offset");
         }
 
         @Override
         public Map<MessageQueue, Long> minOffsets(Collection<MessageQueue> messageQueues) {
-            Map<MessageQueue, Long> result = new ConcurrentHashMap<>();
-            CompletableFuture.allOf(
-                            messageQueues.stream()
-                                    .map(
-                                            messageQueue ->
-                                                    CompletableFuture.supplyAsync(
-                                                                    () ->
-                                                                            innerConsumer
-                                                                                    .seekMinOffset(
-                                                                                            messageQueue))
-                                                            .thenAccept(
-                                                                    future -> {
-                                                                        try {
-                                                                            result.put(
-                                                                                    messageQueue,
-                                                                                    future.get());
-                                                                        } catch (Exception e) {
-                                                                            LOG.error(
-                                                                                    "Consumer offsets retriever fetch min offset error",
-                                                                                    e);
-                                                                        }
-                                                                    }))
-                                    .toArray(CompletableFuture[]::new))
-                    .join();
-            return result;
+            return fetchOffsets(
+                    messageQueues,
+                    mq -> innerConsumer.seekMinOffset(mq),
+                    "fetch min offset");
         }
 
         @Override
         public Map<MessageQueue, Long> maxOffsets(Collection<MessageQueue> messageQueues) {
-            Map<MessageQueue, Long> result = new ConcurrentHashMap<>();
-            CompletableFuture.allOf(
-                            messageQueues.stream()
-                                    .map(
-                                            messageQueue ->
-                                                    CompletableFuture.supplyAsync(
-                                                                    () ->
-                                                                            innerConsumer
-                                                                                    .seekMaxOffset(
-                                                                                            messageQueue))
-                                                            .thenAccept(
-                                                                    future -> {
-                                                                        try {
-                                                                            result.put(
-                                                                                    messageQueue,
-                                                                                    future.get());
-                                                                        } catch (Exception e) {
-                                                                            LOG.error(
-                                                                                    "Consumer offsets retriever fetch committed offset error",
-                                                                                    e);
-                                                                        }
-                                                                    }))
-                                    .toArray(CompletableFuture[]::new))
-                    .join();
-            return result;
+            return fetchOffsets(
+                    messageQueues,
+                    mq -> innerConsumer.seekMaxOffset(mq),
+                    "fetch max offset");
         }
 
         @Override
         public Map<MessageQueue, Long> offsetsForTimes(
                 Map<MessageQueue, Long> messageQueueWithTimeMap) {
             Map<MessageQueue, Long> result = new ConcurrentHashMap<>();
-            CompletableFuture.allOf(
-                            messageQueueWithTimeMap.entrySet().stream()
-                                    .map(
-                                            entry ->
-                                                    CompletableFuture.supplyAsync(
-                                                                    () ->
-                                                                            innerConsumer
-                                                                                    .seekOffsetByTimestamp(
-                                                                                            entry
-                                                                                                    .getKey(),
-                                                                                            entry
-                                                                                                    .getValue()))
-                                                            .thenAccept(
-                                                                    future -> {
-                                                                        try {
-                                                                            result.put(
-                                                                                    entry.getKey(),
-                                                                                    future.get());
-                                                                        } catch (Exception e) {
-                                                                            LOG.error(
-                                                                                    "Consumer offsets retriever fetch offset by timestamp error",
-                                                                                    e);
-                                                                        }
-                                                                    }))
-                                    .toArray(CompletableFuture[]::new))
-                    .join();
+            CompletableFuture<?>[] futures =
+                    messageQueueWithTimeMap.entrySet().stream()
+                            .map(
+                                    entry ->
+                                            innerConsumer
+                                                    .seekOffsetByTimestamp(
+                                                            entry.getKey(), entry.getValue())
+                                                    .thenAccept(
+                                                            offset ->
+                                                                    result.put(
+                                                                            entry.getKey(), offset))
+                                                    .exceptionally(
+                                                            ex -> {
+                                                                LOG.error(
+                                                                        "Consumer offsets retriever fetch offset by timestamp error",
+                                                                        ex);
+                                                                return null;
+                                                            }))
+                            .toArray(CompletableFuture[]::new);
+            CompletableFuture.allOf(futures).join();
+            return result;
+        }
+
+        private Map<MessageQueue, Long> fetchOffsets(
+                Collection<MessageQueue> messageQueues,
+                Function<MessageQueue, CompletableFuture<Long>> offsetFetcher,
+                String errorDescription) {
+            Map<MessageQueue, Long> result = new ConcurrentHashMap<>();
+            CompletableFuture<?>[] futures =
+                    messageQueues.stream()
+                            .map(
+                                    mq ->
+                                            offsetFetcher
+                                                    .apply(mq)
+                                                    .thenAccept(offset -> result.put(mq, offset)))
+                            .toArray(CompletableFuture[]::new);
+            try {
+                CompletableFuture.allOf(futures).join();
+            } catch (CompletionException e) {
+                throw new FlinkRuntimeException(
+                        "Consumer offsets retriever " + errorDescription + " error", e.getCause());
+            }
             return result;
         }
     }
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/source/RocketMQSource.java b/flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/source/RocketMQSource.java
similarity index 98%
rename from src/main/java/org/apache/flink/connector/rocketmq/source/RocketMQSource.java
rename to flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/source/RocketMQSource.java
index cfdc0a1..7f26d87 100644
--- a/src/main/java/org/apache/flink/connector/rocketmq/source/RocketMQSource.java
+++ b/flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/source/RocketMQSource.java
@@ -48,8 +48,6 @@ import org.apache.flink.core.io.SimpleVersionedSerializer;
 import org.apache.flink.metrics.MetricGroup;
 import org.apache.flink.util.UserCodeClassLoader;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.util.function.Supplier;
 
@@ -59,8 +57,6 @@ public class RocketMQSource<OUT>
                 ResultTypeQueryable<OUT> {
 
     private static final long serialVersionUID = -1L;
-    private static final Logger log = LoggerFactory.getLogger(RocketMQSource.class);
-
     // Users can specify the starting / stopping offset initializer.
     private final OffsetsSelector startingOffsetsSelector;
     private final OffsetsSelector stoppingOffsetsSelector;
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/source/RocketMQSourceBuilder.java b/flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/source/RocketMQSourceBuilder.java
similarity index 90%
rename from src/main/java/org/apache/flink/connector/rocketmq/source/RocketMQSourceBuilder.java
rename to flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/source/RocketMQSourceBuilder.java
index 00237a4..9f24bd9 100644
--- a/src/main/java/org/apache/flink/connector/rocketmq/source/RocketMQSourceBuilder.java
+++ b/flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/source/RocketMQSourceBuilder.java
@@ -28,20 +28,18 @@ import org.apache.flink.connector.rocketmq.source.enumerator.offset.OffsetsSelec
 import org.apache.flink.connector.rocketmq.source.reader.deserializer.RocketMQDeserializationSchema;
 
 import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.util.Arrays;
 import java.util.List;
 import java.util.Properties;
 
 import static org.apache.flink.connector.rocketmq.source.RocketMQSourceOptions.SOURCE_CONFIG_VALIDATOR;
+import static org.apache.flink.util.Preconditions.checkNotNull;
+import static org.apache.flink.util.Preconditions.checkState;
 
 @PublicEvolving
 public class RocketMQSourceBuilder<OUT> {
 
-    private static final Logger log = LoggerFactory.getLogger(RocketMQSourceBuilder.class);
-
     // The configurations.
     protected final RocketMQConfigBuilder configBuilder;
 
@@ -195,7 +193,18 @@ public class RocketMQSourceBuilder<OUT> {
     }
 
     // ------------- private helpers  --------------
-    private void sanityCheck() {}
+    private void sanityCheck() {
+        checkState(
+                StringUtils.isNotBlank(configBuilder.get(RocketMQSourceOptions.ENDPOINTS)),
+                "endpoints must be set via setEndpoints()");
+        checkState(
+                StringUtils.isNotBlank(configBuilder.get(RocketMQSourceOptions.CONSUMER_GROUP)),
+                "consumer group must be set via setGroupId()");
+        checkState(
+                StringUtils.isNotBlank(configBuilder.get(RocketMQSourceOptions.TOPIC)),
+                "topic must be set via setTopics()");
+        checkNotNull(deserializationSchema, "deserialization schema must be set");
+    }
 
     private void parseAndSetRequiredProperties() {}
 }
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/source/RocketMQSourceOptions.java b/flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/source/RocketMQSourceOptions.java
similarity index 99%
rename from src/main/java/org/apache/flink/connector/rocketmq/source/RocketMQSourceOptions.java
rename to flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/source/RocketMQSourceOptions.java
index 22992fd..e14667f 100644
--- a/src/main/java/org/apache/flink/connector/rocketmq/source/RocketMQSourceOptions.java
+++ b/flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/source/RocketMQSourceOptions.java
@@ -22,7 +22,7 @@ import org.apache.flink.configuration.ConfigOption;
 import org.apache.flink.configuration.ConfigOptions;
 import org.apache.flink.connector.rocketmq.common.config.RocketMQConfigValidator;
 import org.apache.flink.connector.rocketmq.common.config.RocketMQOptions;
-import org.apache.flink.connector.rocketmq.legacy.RocketMQConfig;
+import org.apache.flink.streaming.connectors.rocketmq.RocketMQConfig;
 import org.apache.flink.connector.rocketmq.source.enumerator.allocate.AllocateStrategyFactory;
 
 /** Includes config options of RocketMQ connector type. */
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/source/config/OffsetVerification.java b/flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/source/config/OffsetVerification.java
similarity index 100%
rename from src/main/java/org/apache/flink/connector/rocketmq/source/config/OffsetVerification.java
rename to flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/source/config/OffsetVerification.java
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/source/enumerator/RocketMQSourceEnumState.java b/flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/source/enumerator/RocketMQSourceEnumState.java
similarity index 100%
rename from src/main/java/org/apache/flink/connector/rocketmq/source/enumerator/RocketMQSourceEnumState.java
rename to flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/source/enumerator/RocketMQSourceEnumState.java
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/source/enumerator/RocketMQSourceEnumStateSerializer.java b/flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/source/enumerator/RocketMQSourceEnumStateSerializer.java
similarity index 100%
rename from src/main/java/org/apache/flink/connector/rocketmq/source/enumerator/RocketMQSourceEnumStateSerializer.java
rename to flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/source/enumerator/RocketMQSourceEnumStateSerializer.java
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/source/enumerator/RocketMQSourceEnumerator.java b/flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/source/enumerator/RocketMQSourceEnumerator.java
similarity index 98%
rename from src/main/java/org/apache/flink/connector/rocketmq/source/enumerator/RocketMQSourceEnumerator.java
rename to flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/source/enumerator/RocketMQSourceEnumerator.java
index c228309..45b1132 100644
--- a/src/main/java/org/apache/flink/connector/rocketmq/source/enumerator/RocketMQSourceEnumerator.java
+++ b/flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/source/enumerator/RocketMQSourceEnumerator.java
@@ -43,7 +43,6 @@ import org.apache.flink.connector.rocketmq.source.split.RocketMQSourceSplit;
 import org.apache.flink.util.FlinkRuntimeException;
 
 import com.alibaba.fastjson.JSON;
-import com.google.common.collect.Sets;
 import org.apache.rocketmq.common.message.MessageQueue;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -51,6 +50,7 @@ import org.slf4j.LoggerFactory;
 import javax.annotation.Nullable;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -275,10 +275,11 @@ public class RocketMQSourceEnumerator
         }
 
         Set<String> topicSet =
-                Sets.newHashSet(
-                        configuration
-                                .getString(RocketMQSourceOptions.TOPIC)
-                                .split(RocketMQSourceOptions.TOPIC_SEPARATOR));
+                new HashSet<>(
+                        Arrays.asList(
+                                configuration
+                                        .getString(RocketMQSourceOptions.TOPIC)
+                                        .split(RocketMQSourceOptions.TOPIC_SEPARATOR)));
 
         return topicSet.stream()
                 .flatMap(
@@ -697,7 +698,7 @@ public class RocketMQSourceEnumerator
 
         private SourceSplitChangeResult(Set<RocketMQSourceSplit> increaseSet) {
             this.increaseSet = Collections.unmodifiableSet(increaseSet);
-            this.decreaseSet = Sets.newHashSet();
+            this.decreaseSet = new HashSet<>();
         }
 
         private SourceSplitChangeResult(
@@ -718,8 +719,10 @@ public class RocketMQSourceEnumerator
     @VisibleForTesting
     private SourceChangeResult getSourceChangeResult(Set<MessageQueue> latestSet) {
         Set<MessageQueue> currentSet = Collections.unmodifiableSet(this.allocatedSet.keySet());
-        Set<MessageQueue> increaseSet = Sets.difference(latestSet, currentSet);
-        Set<MessageQueue> decreaseSet = Sets.difference(currentSet, latestSet);
+        Set<MessageQueue> increaseSet = new HashSet<>(latestSet);
+        increaseSet.removeAll(currentSet);
+        Set<MessageQueue> decreaseSet = new HashSet<>(currentSet);
+        decreaseSet.removeAll(latestSet);
 
         SourceChangeResult changeResult = new SourceChangeResult(increaseSet, decreaseSet);
 
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/source/enumerator/allocate/AllocateStrategy.java b/flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/source/enumerator/allocate/AllocateStrategy.java
similarity index 100%
rename from src/main/java/org/apache/flink/connector/rocketmq/source/enumerator/allocate/AllocateStrategy.java
rename to flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/source/enumerator/allocate/AllocateStrategy.java
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/source/enumerator/allocate/AllocateStrategyFactory.java b/flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/source/enumerator/allocate/AllocateStrategyFactory.java
similarity index 100%
rename from src/main/java/org/apache/flink/connector/rocketmq/source/enumerator/allocate/AllocateStrategyFactory.java
rename to flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/source/enumerator/allocate/AllocateStrategyFactory.java
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/source/enumerator/allocate/AverageAllocateStrategy.java b/flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/source/enumerator/allocate/AverageAllocateStrategy.java
similarity index 100%
rename from src/main/java/org/apache/flink/connector/rocketmq/source/enumerator/allocate/AverageAllocateStrategy.java
rename to flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/source/enumerator/allocate/AverageAllocateStrategy.java
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/source/enumerator/allocate/BroadcastAllocateStrategy.java b/flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/source/enumerator/allocate/BroadcastAllocateStrategy.java
similarity index 100%
rename from src/main/java/org/apache/flink/connector/rocketmq/source/enumerator/allocate/BroadcastAllocateStrategy.java
rename to flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/source/enumerator/allocate/BroadcastAllocateStrategy.java
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/source/enumerator/allocate/ConsistentHashAllocateStrategy.java b/flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/source/enumerator/allocate/ConsistentHashAllocateStrategy.java
similarity index 100%
rename from src/main/java/org/apache/flink/connector/rocketmq/source/enumerator/allocate/ConsistentHashAllocateStrategy.java
rename to flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/source/enumerator/allocate/ConsistentHashAllocateStrategy.java
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/source/enumerator/offset/OffsetsSelector.java b/flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/source/enumerator/offset/OffsetsSelector.java
similarity index 98%
rename from src/main/java/org/apache/flink/connector/rocketmq/source/enumerator/offset/OffsetsSelector.java
rename to flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/source/enumerator/offset/OffsetsSelector.java
index 14ada53..68ceff2 100644
--- a/src/main/java/org/apache/flink/connector/rocketmq/source/enumerator/offset/OffsetsSelector.java
+++ b/flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/source/enumerator/offset/OffsetsSelector.java
@@ -19,7 +19,7 @@
 package org.apache.flink.connector.rocketmq.source.enumerator.offset;
 
 import org.apache.flink.annotation.PublicEvolving;
-import org.apache.flink.connector.rocketmq.legacy.common.config.OffsetResetStrategy;
+import org.apache.flink.streaming.connectors.rocketmq.common.config.OffsetResetStrategy;
 import org.apache.flink.connector.rocketmq.source.RocketMQSource;
 import org.apache.flink.connector.rocketmq.source.split.RocketMQSourceSplit;
 
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/source/enumerator/offset/OffsetsSelectorBySpecified.java b/flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/source/enumerator/offset/OffsetsSelectorBySpecified.java
similarity index 97%
rename from src/main/java/org/apache/flink/connector/rocketmq/source/enumerator/offset/OffsetsSelectorBySpecified.java
rename to flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/source/enumerator/offset/OffsetsSelectorBySpecified.java
index edf7010..1c10cc1 100644
--- a/src/main/java/org/apache/flink/connector/rocketmq/source/enumerator/offset/OffsetsSelectorBySpecified.java
+++ b/flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/source/enumerator/offset/OffsetsSelectorBySpecified.java
@@ -17,7 +17,7 @@
 
 package org.apache.flink.connector.rocketmq.source.enumerator.offset;
 
-import org.apache.flink.connector.rocketmq.legacy.common.config.OffsetResetStrategy;
+import org.apache.flink.streaming.connectors.rocketmq.common.config.OffsetResetStrategy;
 
 import org.apache.rocketmq.common.message.MessageQueue;
 
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/source/enumerator/offset/OffsetsSelectorByStrategy.java b/flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/source/enumerator/offset/OffsetsSelectorByStrategy.java
similarity index 96%
rename from src/main/java/org/apache/flink/connector/rocketmq/source/enumerator/offset/OffsetsSelectorByStrategy.java
rename to flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/source/enumerator/offset/OffsetsSelectorByStrategy.java
index b6be92d..5c9a667 100644
--- a/src/main/java/org/apache/flink/connector/rocketmq/source/enumerator/offset/OffsetsSelectorByStrategy.java
+++ b/flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/source/enumerator/offset/OffsetsSelectorByStrategy.java
@@ -17,7 +17,7 @@
 
 package org.apache.flink.connector.rocketmq.source.enumerator.offset;
 
-import org.apache.flink.connector.rocketmq.legacy.common.config.OffsetResetStrategy;
+import org.apache.flink.streaming.connectors.rocketmq.common.config.OffsetResetStrategy;
 
 import org.apache.rocketmq.common.consumer.ConsumeFromWhere;
 import org.apache.rocketmq.common.message.MessageQueue;
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/source/enumerator/offset/OffsetsSelectorByTimestamp.java b/flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/source/enumerator/offset/OffsetsSelectorByTimestamp.java
similarity index 97%
rename from src/main/java/org/apache/flink/connector/rocketmq/source/enumerator/offset/OffsetsSelectorByTimestamp.java
rename to flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/source/enumerator/offset/OffsetsSelectorByTimestamp.java
index b685661..e5ea0ed 100644
--- a/src/main/java/org/apache/flink/connector/rocketmq/source/enumerator/offset/OffsetsSelectorByTimestamp.java
+++ b/flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/source/enumerator/offset/OffsetsSelectorByTimestamp.java
@@ -17,7 +17,7 @@
 
 package org.apache.flink.connector.rocketmq.source.enumerator.offset;
 
-import org.apache.flink.connector.rocketmq.legacy.common.config.OffsetResetStrategy;
+import org.apache.flink.streaming.connectors.rocketmq.common.config.OffsetResetStrategy;
 
 import org.apache.rocketmq.common.message.MessageQueue;
 
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/source/enumerator/offset/OffsetsSelectorNoStopping.java b/flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/source/enumerator/offset/OffsetsSelectorNoStopping.java
similarity index 94%
rename from src/main/java/org/apache/flink/connector/rocketmq/source/enumerator/offset/OffsetsSelectorNoStopping.java
rename to flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/source/enumerator/offset/OffsetsSelectorNoStopping.java
index ccd916f..78c5892 100644
--- a/src/main/java/org/apache/flink/connector/rocketmq/source/enumerator/offset/OffsetsSelectorNoStopping.java
+++ b/flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/source/enumerator/offset/OffsetsSelectorNoStopping.java
@@ -18,7 +18,7 @@
 package org.apache.flink.connector.rocketmq.source.enumerator.offset;
 
 import org.apache.flink.annotation.Internal;
-import org.apache.flink.connector.rocketmq.legacy.common.config.OffsetResetStrategy;
+import org.apache.flink.streaming.connectors.rocketmq.common.config.OffsetResetStrategy;
 
 import org.apache.rocketmq.common.message.MessageQueue;
 
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/source/enumerator/offset/OffsetsValidator.java b/flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/source/enumerator/offset/OffsetsValidator.java
similarity index 100%
rename from src/main/java/org/apache/flink/connector/rocketmq/source/enumerator/offset/OffsetsValidator.java
rename to flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/source/enumerator/offset/OffsetsValidator.java
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/source/metrics/RocketMQSourceReaderMetrics.java b/flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/source/metrics/RocketMQSourceReaderMetrics.java
similarity index 93%
rename from src/main/java/org/apache/flink/connector/rocketmq/source/metrics/RocketMQSourceReaderMetrics.java
rename to flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/source/metrics/RocketMQSourceReaderMetrics.java
index 57c8a63..f21e12a 100644
--- a/src/main/java/org/apache/flink/connector/rocketmq/source/metrics/RocketMQSourceReaderMetrics.java
+++ b/flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/source/metrics/RocketMQSourceReaderMetrics.java
@@ -21,14 +21,10 @@ import org.apache.flink.annotation.PublicEvolving;
 import org.apache.flink.metrics.groups.SourceReaderMetricGroup;
 
 import org.apache.rocketmq.common.message.MessageQueue;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 @PublicEvolving
 public class RocketMQSourceReaderMetrics {
 
-    private static final Logger LOG = LoggerFactory.getLogger(RocketMQSourceReaderMetrics.class);
-
     public static final String ROCKETMQ_SOURCE_READER_METRIC_GROUP = "RocketmqSourceReader";
     public static final String TOPIC_GROUP = "topic";
     public static final String QUEUE_GROUP = "queue";
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/source/reader/MessageView.java b/flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/source/reader/MessageView.java
similarity index 100%
rename from src/main/java/org/apache/flink/connector/rocketmq/source/reader/MessageView.java
rename to flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/source/reader/MessageView.java
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/source/reader/MessageViewExt.java b/flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/source/reader/MessageViewExt.java
similarity index 100%
rename from src/main/java/org/apache/flink/connector/rocketmq/source/reader/MessageViewExt.java
rename to flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/source/reader/MessageViewExt.java
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/source/reader/RocketMQRecordEmitter.java b/flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/source/reader/RocketMQRecordEmitter.java
similarity index 100%
rename from src/main/java/org/apache/flink/connector/rocketmq/source/reader/RocketMQRecordEmitter.java
rename to flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/source/reader/RocketMQRecordEmitter.java
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/source/reader/RocketMQSourceFetcherManager.java b/flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/source/reader/RocketMQSourceFetcherManager.java
similarity index 97%
rename from src/main/java/org/apache/flink/connector/rocketmq/source/reader/RocketMQSourceFetcherManager.java
rename to flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/source/reader/RocketMQSourceFetcherManager.java
index 242e19e..e04b771 100644
--- a/src/main/java/org/apache/flink/connector/rocketmq/source/reader/RocketMQSourceFetcherManager.java
+++ b/flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/source/reader/RocketMQSourceFetcherManager.java
@@ -25,6 +25,7 @@ import org.apache.flink.connector.base.source.reader.fetcher.SplitFetcher;
 import org.apache.flink.connector.base.source.reader.fetcher.SplitFetcherTask;
 import org.apache.flink.connector.base.source.reader.splitreader.SplitReader;
 import org.apache.flink.connector.base.source.reader.synchronization.FutureCompletingBlockingQueue;
+import org.apache.flink.configuration.Configuration;
 import org.apache.flink.connector.rocketmq.source.split.RocketMQSourceSplit;
 
 import org.apache.rocketmq.common.message.MessageQueue;
@@ -57,7 +58,7 @@ public class RocketMQSourceFetcherManager
             Supplier<SplitReader<MessageView, RocketMQSourceSplit>> splitReaderSupplier,
             Consumer<Collection<String>> splitFinishedHook) {
 
-        super(elementsQueue, splitReaderSupplier, splitFinishedHook);
+        super(elementsQueue, splitReaderSupplier, new Configuration());
     }
 
     public void commitOffsets(Map<MessageQueue, Long> offsetsToCommit) {
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/source/reader/RocketMQSourceReader.java b/flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/source/reader/RocketMQSourceReader.java
similarity index 97%
rename from src/main/java/org/apache/flink/connector/rocketmq/source/reader/RocketMQSourceReader.java
rename to flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/source/reader/RocketMQSourceReader.java
index 042c12a..db68893 100644
--- a/src/main/java/org/apache/flink/connector/rocketmq/source/reader/RocketMQSourceReader.java
+++ b/flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/source/reader/RocketMQSourceReader.java
@@ -39,13 +39,13 @@ import org.apache.flink.connector.rocketmq.source.split.RocketMQSourceSplit;
 import org.apache.flink.connector.rocketmq.source.split.RocketMQSourceSplitState;
 import org.apache.flink.connector.rocketmq.source.util.UtilAll;
 
-import com.google.common.collect.Sets;
 import org.apache.rocketmq.common.message.MessageQueue;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
@@ -199,8 +199,10 @@ public class RocketMQSourceReader<T>
         Map<MessageQueue, Tuple2<Long, Long>> checkMap = sourceEvent.getAssignedMq();
         Set<MessageQueue> assignedMq = checkMap.keySet();
         Set<MessageQueue> currentMq = reader.getCurrentOffsetTable().keySet();
-        Set<MessageQueue> increaseSet = Sets.difference(assignedMq, currentMq);
-        Set<MessageQueue> decreaseSet = Sets.difference(currentMq, assignedMq);
+        Set<MessageQueue> increaseSet = new HashSet<>(assignedMq);
+        increaseSet.removeAll(currentMq);
+        Set<MessageQueue> decreaseSet = new HashSet<>(currentMq);
+        decreaseSet.removeAll(assignedMq);
 
         if (increaseSet.isEmpty() && decreaseSet.isEmpty()) {
             LOG.info("No need to checkpoint, current assigned mq is same as before.");
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/source/reader/RocketMQSplitReader.java b/flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/source/reader/RocketMQSplitReader.java
similarity index 87%
rename from src/main/java/org/apache/flink/connector/rocketmq/source/reader/RocketMQSplitReader.java
rename to flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/source/reader/RocketMQSplitReader.java
index 9a0833c..b8349e5 100644
--- a/src/main/java/org/apache/flink/connector/rocketmq/source/reader/RocketMQSplitReader.java
+++ b/flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/source/reader/RocketMQSplitReader.java
@@ -90,6 +90,10 @@ public class RocketMQSplitReader<T> implements SplitReader<MessageView, RocketMQ
     private final RocketMQRecordsWithSplitIds<MessageView> recordsWithSplitIds;
     private final SpinLock lock;
 
+    // Client-side filter configuration (P0 fix — tag/sql were dead in new API path)
+    private final String filterTag;
+    private final String filterSql;
+
     public RocketMQSplitReader(
             Configuration configuration,
             SourceReaderContext sourceReaderContext,
@@ -110,7 +114,17 @@ public class RocketMQSplitReader<T> implements SplitReader<MessageView, RocketMQ
 
         this.rocketmqSourceReaderMetrics = rocketmqSourceReaderMetrics;
         this.commitOffsetsOnCheckpoint =
-                configuration.getBoolean(RocketMQOptions.COMMIT_OFFSETS_ON_CHECKPOINT);
+                configuration.getBoolean(RocketMQSourceOptions.COMMIT_OFFSETS_ON_CHECKPOINT);
+
+        // Read filter configuration for client-side filtering (P0 fix)
+        this.filterTag = configuration.getString(RocketMQSourceOptions.OPTIONAL_TAG);
+        this.filterSql = configuration.get(RocketMQSourceOptions.OPTIONAL_SQL);
+        if (filterSql != null) {
+            LOG.warn(
+                    "SQL filter expression '{}' is set but client-side SQL evaluation "
+                            + "is not supported with assign() mode. Only tag-based filtering will be applied.",
+                    filterSql);
+        }
     }
 
     @Override
@@ -131,6 +145,10 @@ public class RocketMQSplitReader<T> implements SplitReader<MessageView, RocketMQ
                     Duration.ofMillis(this.configuration.getLong(RocketMQOptions.POLL_TIMEOUT));
             List<MessageView> messageExtList = consumer.poll(duration);
             for (MessageView messageView : messageExtList) {
+                // Client-side tag filtering (P0 fix)
+                if (!matchesFilter(messageView)) {
+                    continue;
+                }
                 String splitId =
                         UtilAll.getSplitId(
                                 new MessageQueue(
@@ -147,7 +165,11 @@ public class RocketMQSplitReader<T> implements SplitReader<MessageView, RocketMQ
             }
             recordsWithSplitIds.prepareForRead();
         } catch (Exception e) {
-            LOG.error("Reader fetch split error", e);
+            if (wakeup) {
+                LOG.debug("Reader fetch interrupted by wakeup", e);
+                return recordsWithSplitIds;
+            }
+            throw new IOException("Reader fetch split error", e);
         }
 
         return recordsWithSplitIds;
@@ -235,6 +257,32 @@ public class RocketMQSplitReader<T> implements SplitReader<MessageView, RocketMQ
         }
     }
 
+    /**
+     * Client-side message filtering. Applies tag-based filtering for consumers using assign() mode
+     * where server-side MessageSelector is not available.
+     */
+    private boolean matchesFilter(MessageView messageView) {
+        if (filterTag != null && !"*".equals(filterTag) && !filterTag.isEmpty()) {
+            String messageTag = messageView.getTag();
+            if (messageTag == null) {
+                return false;
+            }
+            // Support "||" separated multi-tag filter expression
+            String[] filterTags = filterTag.split("\\|\\|");
+            boolean matched = false;
+            for (String ft : filterTags) {
+                if (ft.trim().equals(messageTag)) {
+                    matched = true;
+                    break;
+                }
+            }
+            if (!matched) {
+                return false;
+            }
+        }
+        return true;
+    }
+
     public void notifyCheckpointComplete(Map<MessageQueue, Long> offsetsToCommit) {
         if (offsetsToCommit != null) {
             for (Map.Entry<MessageQueue, Long> entry : offsetsToCommit.entrySet()) {
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/source/reader/deserializer/BytesMessage.java b/flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/source/reader/deserializer/BytesMessage.java
similarity index 100%
rename from src/main/java/org/apache/flink/connector/rocketmq/source/reader/deserializer/BytesMessage.java
rename to flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/source/reader/deserializer/BytesMessage.java
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/source/reader/deserializer/DirtyDataStrategy.java b/flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/source/reader/deserializer/DirtyDataStrategy.java
similarity index 100%
rename from src/main/java/org/apache/flink/connector/rocketmq/source/reader/deserializer/DirtyDataStrategy.java
rename to flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/source/reader/deserializer/DirtyDataStrategy.java
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/source/reader/deserializer/QueryableSchema.java b/flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/source/reader/deserializer/QueryableSchema.java
similarity index 100%
rename from src/main/java/org/apache/flink/connector/rocketmq/source/reader/deserializer/QueryableSchema.java
rename to flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/source/reader/deserializer/QueryableSchema.java
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/source/reader/deserializer/RocketMQDeserializationSchema.java b/flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/source/reader/deserializer/RocketMQDeserializationSchema.java
similarity index 100%
rename from src/main/java/org/apache/flink/connector/rocketmq/source/reader/deserializer/RocketMQDeserializationSchema.java
rename to flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/source/reader/deserializer/RocketMQDeserializationSchema.java
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/source/reader/deserializer/RocketMQDeserializationSchemaWrapper.java b/flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/source/reader/deserializer/RocketMQDeserializationSchemaWrapper.java
similarity index 100%
rename from src/main/java/org/apache/flink/connector/rocketmq/source/reader/deserializer/RocketMQDeserializationSchemaWrapper.java
rename to flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/source/reader/deserializer/RocketMQDeserializationSchemaWrapper.java
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/source/reader/deserializer/RocketMQRowDeserializationSchema.java b/flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/source/reader/deserializer/RocketMQRowDeserializationSchema.java
similarity index 67%
rename from src/main/java/org/apache/flink/connector/rocketmq/source/reader/deserializer/RocketMQRowDeserializationSchema.java
rename to flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/source/reader/deserializer/RocketMQRowDeserializationSchema.java
index c4cefca..ac9ef7d 100644
--- a/src/main/java/org/apache/flink/connector/rocketmq/source/reader/deserializer/RocketMQRowDeserializationSchema.java
+++ b/flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/source/reader/deserializer/RocketMQRowDeserializationSchema.java
@@ -27,8 +27,6 @@ import org.apache.flink.table.api.TableSchema;
 import org.apache.flink.table.data.RowData;
 import org.apache.flink.util.Collector;
 
-import org.apache.rocketmq.common.message.MessageExt;
-
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
@@ -36,7 +34,7 @@ import java.util.Map;
 
 /**
  * A row data wrapper class that wraps a {@link RocketMQDeserializationSchema} to deserialize {@link
- * MessageExt}.
+ * MessageView}.
  */
 public class RocketMQRowDeserializationSchema implements RocketMQDeserializationSchema<RowData> {
 
@@ -69,40 +67,35 @@ public class RocketMQRowDeserializationSchema implements RocketMQDeserialization
     @Override
     public void deserialize(MessageView messageView, Collector<RowData> collector)
             throws IOException {
-
-        // extractMessages(input);
-        // deserializationSchema.deserialize(bytesMessages, collector);
+        BytesMessage bytesMessage = toBytesMessage(messageView);
+        bytesMessages = new ArrayList<>(1);
+        bytesMessages.add(bytesMessage);
+        deserializationSchema.deserialize(bytesMessages, collector);
     }
 
-    // @Override
-    // public void deserialize(List<MessageExt> input, Collector<RowData> collector) {
-    // }
-
     @Override
     public TypeInformation<RowData> getProducedType() {
         return deserializationSchema.getProducedType();
     }
 
-    private void extractMessages(List<MessageExt> messages) {
-        bytesMessages = new ArrayList<>(messages.size());
-        for (MessageExt message : messages) {
-            BytesMessage bytesMessage = new BytesMessage();
-            bytesMessage.setData(message.getBody());
-            if (message.getProperties() != null) {
-                bytesMessage.setProperties(message.getProperties());
-            }
-            bytesMessage.setProperty("__topic__", message.getTopic());
-            bytesMessage.setProperty(
-                    "__store_timestamp__", String.valueOf(message.getStoreTimestamp()));
-            bytesMessage.setProperty(
-                    "__born_timestamp__", String.valueOf(message.getBornTimestamp()));
-            bytesMessage.setProperty("__queue_id__", String.valueOf(message.getQueueId()));
-            bytesMessage.setProperty("__queue_offset__", String.valueOf(message.getQueueOffset()));
-            bytesMessage.setProperty("__msg_id__", message.getMsgId());
-            bytesMessage.setProperty("__keys__", message.getKeys());
-            bytesMessage.setProperty("__tags__", message.getTags());
-            bytesMessages.add(bytesMessage);
+    private static BytesMessage toBytesMessage(MessageView message) {
+        BytesMessage bytesMessage = new BytesMessage();
+        bytesMessage.setData(message.getBody());
+        if (message.getProperties() != null) {
+            bytesMessage.setProperties(message.getProperties());
+        }
+        bytesMessage.setProperty("__topic__", message.getTopic());
+        bytesMessage.setProperty(
+                "__store_timestamp__", String.valueOf(message.getIngestionTime()));
+        bytesMessage.setProperty("__born_timestamp__", String.valueOf(message.getEventTime()));
+        bytesMessage.setProperty("__queue_id__", String.valueOf(message.getQueueId()));
+        bytesMessage.setProperty("__queue_offset__", String.valueOf(message.getQueueOffset()));
+        bytesMessage.setProperty("__msg_id__", message.getMessageId());
+        if (message.getKeys() != null) {
+            bytesMessage.setProperty("__keys__", String.join(" ", message.getKeys()));
         }
+        bytesMessage.setProperty("__tags__", message.getTag());
+        return bytesMessage;
     }
 
     @VisibleForTesting
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/source/reader/deserializer/RocketMQSchemaWrapper.java b/flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/source/reader/deserializer/RocketMQSchemaWrapper.java
similarity index 100%
rename from src/main/java/org/apache/flink/connector/rocketmq/source/reader/deserializer/RocketMQSchemaWrapper.java
rename to flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/source/reader/deserializer/RocketMQSchemaWrapper.java
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/source/reader/deserializer/RowDeserializationSchema.java b/flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/source/reader/deserializer/RowDeserializationSchema.java
similarity index 100%
rename from src/main/java/org/apache/flink/connector/rocketmq/source/reader/deserializer/RowDeserializationSchema.java
rename to flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/source/reader/deserializer/RowDeserializationSchema.java
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/source/split/RocketMQPartitionSplitSerializer.java b/flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/source/split/RocketMQPartitionSplitSerializer.java
similarity index 100%
rename from src/main/java/org/apache/flink/connector/rocketmq/source/split/RocketMQPartitionSplitSerializer.java
rename to flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/source/split/RocketMQPartitionSplitSerializer.java
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/source/split/RocketMQSourceSplit.java b/flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/source/split/RocketMQSourceSplit.java
similarity index 97%
rename from src/main/java/org/apache/flink/connector/rocketmq/source/split/RocketMQSourceSplit.java
rename to flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/source/split/RocketMQSourceSplit.java
index a94044d..d8211a4 100644
--- a/src/main/java/org/apache/flink/connector/rocketmq/source/split/RocketMQSourceSplit.java
+++ b/flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/source/split/RocketMQSourceSplit.java
@@ -22,12 +22,15 @@ import org.apache.flink.api.connector.source.SourceSplit;
 
 import org.apache.rocketmq.common.message.MessageQueue;
 
+import java.io.Serializable;
 import java.util.Objects;
 
 import static org.apache.flink.connector.rocketmq.source.util.UtilAll.SEPARATOR;
 
 /** A {@link SourceSplit} for a RocketMQ partition. */
-public class RocketMQSourceSplit implements SourceSplit {
+public class RocketMQSourceSplit implements SourceSplit, Serializable {
+
+    private static final long serialVersionUID = 1L;
 
     // -1 means Long.MAX_VALUE
     public static final long NO_STOPPING_OFFSET = -1L;
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/source/split/RocketMQSourceSplitState.java b/flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/source/split/RocketMQSourceSplitState.java
similarity index 100%
rename from src/main/java/org/apache/flink/connector/rocketmq/source/split/RocketMQSourceSplitState.java
rename to flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/source/split/RocketMQSourceSplitState.java
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/source/util/ByteSerializer.java b/flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/source/util/ByteSerializer.java
similarity index 100%
rename from src/main/java/org/apache/flink/connector/rocketmq/source/util/ByteSerializer.java
rename to flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/source/util/ByteSerializer.java
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/source/util/ByteUtils.java b/flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/source/util/ByteUtils.java
similarity index 100%
rename from src/main/java/org/apache/flink/connector/rocketmq/source/util/ByteUtils.java
rename to flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/source/util/ByteUtils.java
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/source/util/StringSerializer.java b/flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/source/util/StringSerializer.java
similarity index 100%
rename from src/main/java/org/apache/flink/connector/rocketmq/source/util/StringSerializer.java
rename to flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/source/util/StringSerializer.java
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/source/util/UtilAll.java b/flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/source/util/UtilAll.java
similarity index 100%
rename from src/main/java/org/apache/flink/connector/rocketmq/source/util/UtilAll.java
rename to flink-connector-rocketmq/src/main/java/org/apache/flink/connector/rocketmq/source/util/UtilAll.java
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/legacy/RocketMQConfig.java b/flink-connector-rocketmq/src/main/java/org/apache/flink/streaming/connectors/rocketmq/RocketMQConfig.java
similarity index 96%
rename from src/main/java/org/apache/flink/connector/rocketmq/legacy/RocketMQConfig.java
rename to flink-connector-rocketmq/src/main/java/org/apache/flink/streaming/connectors/rocketmq/RocketMQConfig.java
index d94188a..6273d51 100644
--- a/src/main/java/org/apache/flink/connector/rocketmq/legacy/RocketMQConfig.java
+++ b/flink-connector-rocketmq/src/main/java/org/apache/flink/streaming/connectors/rocketmq/RocketMQConfig.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.flink.connector.rocketmq.legacy;
+package org.apache.flink.streaming.connectors.rocketmq;
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.Validate;
@@ -29,8 +29,8 @@ import org.apache.rocketmq.remoting.protocol.heartbeat.MessageModel;
 import java.util.Properties;
 import java.util.UUID;
 
-import static org.apache.flink.connector.rocketmq.legacy.common.util.RocketMQUtils.getAccessChannel;
-import static org.apache.flink.connector.rocketmq.legacy.common.util.RocketMQUtils.getInteger;
+import static org.apache.flink.streaming.connectors.rocketmq.common.util.RocketMQUtils.getAccessChannel;
+import static org.apache.flink.streaming.connectors.rocketmq.common.util.RocketMQUtils.getInteger;
 
 /** RocketMQConfig for Consumer/Producer. */
 public class RocketMQConfig {
@@ -48,7 +48,7 @@ public class RocketMQConfig {
     public static final String SECRET_KEY = "secret.key";
 
     public static final String ACCESS_CHANNEL = "access.channel";
-    public static final AccessChannel DEFAULT_ACCESS_CHANNEL = AccessChannel.LOCAL;
+    public static final AccessChannel DEFAULT_ACCESS_CHANNEL = AccessChannel.CLOUD;
 
     // Producer related config
     public static final String PRODUCER_TOPIC = "producer.topic";
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/legacy/RocketMQSink.java b/flink-connector-rocketmq/src/main/java/org/apache/flink/streaming/connectors/rocketmq/RocketMQSink.java
similarity index 97%
rename from src/main/java/org/apache/flink/connector/rocketmq/legacy/RocketMQSink.java
rename to flink-connector-rocketmq/src/main/java/org/apache/flink/streaming/connectors/rocketmq/RocketMQSink.java
index 9ff2812..d95c212 100644
--- a/src/main/java/org/apache/flink/connector/rocketmq/legacy/RocketMQSink.java
+++ b/flink-connector-rocketmq/src/main/java/org/apache/flink/streaming/connectors/rocketmq/RocketMQSink.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.flink.connector.rocketmq.legacy;
+package org.apache.flink.streaming.connectors.rocketmq;
 
 import org.apache.flink.configuration.Configuration;
-import org.apache.flink.connector.rocketmq.legacy.common.selector.MessageQueueSelector;
-import org.apache.flink.connector.rocketmq.legacy.common.util.MetricUtils;
+import org.apache.flink.streaming.connectors.rocketmq.common.selector.MessageQueueSelector;
+import org.apache.flink.streaming.connectors.rocketmq.common.util.MetricUtils;
 import org.apache.flink.metrics.Meter;
 import org.apache.flink.runtime.state.FunctionInitializationContext;
 import org.apache.flink.runtime.state.FunctionSnapshotContext;
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/legacy/RocketMQSourceFunction.java b/flink-connector-rocketmq/src/main/java/org/apache/flink/streaming/connectors/rocketmq/RocketMQSourceFunction.java
similarity index 74%
rename from src/main/java/org/apache/flink/connector/rocketmq/legacy/RocketMQSourceFunction.java
rename to flink-connector-rocketmq/src/main/java/org/apache/flink/streaming/connectors/rocketmq/RocketMQSourceFunction.java
index 91d1d39..c660335 100644
--- a/src/main/java/org/apache/flink/connector/rocketmq/legacy/RocketMQSourceFunction.java
+++ b/flink-connector-rocketmq/src/main/java/org/apache/flink/streaming/connectors/rocketmq/RocketMQSourceFunction.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.flink.connector.rocketmq.legacy;
+package org.apache.flink.streaming.connectors.rocketmq;
 
 import org.apache.flink.api.common.functions.RuntimeContext;
 import org.apache.flink.api.common.state.ListState;
@@ -25,14 +25,12 @@ import org.apache.flink.api.common.typeinfo.TypeInformation;
 import org.apache.flink.api.java.tuple.Tuple2;
 import org.apache.flink.api.java.typeutils.ResultTypeQueryable;
 import org.apache.flink.configuration.Configuration;
-import org.apache.flink.connector.rocketmq.legacy.common.config.OffsetResetStrategy;
-import org.apache.flink.connector.rocketmq.legacy.common.config.StartupMode;
-import org.apache.flink.connector.rocketmq.legacy.common.serialization.KeyValueDeserializationSchema;
-import org.apache.flink.connector.rocketmq.legacy.common.util.MetricUtils;
-import org.apache.flink.connector.rocketmq.legacy.common.util.RetryUtil;
-import org.apache.flink.connector.rocketmq.legacy.common.util.RocketMQUtils;
-import org.apache.flink.connector.rocketmq.legacy.common.watermark.WaterMarkForAll;
-import org.apache.flink.connector.rocketmq.legacy.common.watermark.WaterMarkPerQueue;
+import org.apache.flink.streaming.connectors.rocketmq.common.config.OffsetResetStrategy;
+import org.apache.flink.streaming.connectors.rocketmq.common.config.StartupMode;
+import org.apache.flink.streaming.connectors.rocketmq.common.serialization.KeyValueDeserializationSchema;
+import org.apache.flink.streaming.connectors.rocketmq.common.util.MetricUtils;
+import org.apache.flink.streaming.connectors.rocketmq.common.util.RetryUtil;
+import org.apache.flink.streaming.connectors.rocketmq.common.util.RocketMQUtils;
 import org.apache.flink.metrics.Counter;
 import org.apache.flink.metrics.Meter;
 import org.apache.flink.metrics.MeterView;
@@ -45,9 +43,6 @@ import org.apache.flink.streaming.api.functions.source.RichParallelSourceFunctio
 import org.apache.flink.streaming.api.operators.StreamingRuntimeContext;
 import org.apache.flink.util.Preconditions;
 
-import org.apache.flink.shaded.curator5.com.google.common.collect.Lists;
-import org.apache.flink.shaded.curator5.com.google.common.util.concurrent.ThreadFactoryBuilder;
-
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.map.LinkedMap;
 import org.apache.commons.lang.Validate;
@@ -66,6 +61,7 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
@@ -75,6 +71,7 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicLong;
 import java.util.concurrent.locks.ReentrantLock;
 
 /**
@@ -100,10 +97,6 @@ public class RocketMQSourceFunction<OUT> extends RichParallelSourceFunction<OUT>
     private List<MessageQueue> messageQueues;
     private ExecutorService executor;
 
-    // watermark in source
-    private WaterMarkPerQueue waterMarkPerQueue;
-    private WaterMarkForAll waterMarkForAll;
-
     private ScheduledExecutorService timer;
     /** Data for pending but uncommitted offsets. */
     private LinkedMap pendingOffsetsToCommit;
@@ -176,12 +169,6 @@ public class RocketMQSourceFunction<OUT> extends RichParallelSourceFunction<OUT>
         if (checkPointLock == null) {
             checkPointLock = new ReentrantLock();
         }
-        if (waterMarkPerQueue == null) {
-            waterMarkPerQueue = new WaterMarkPerQueue(5000);
-        }
-        if (waterMarkForAll == null) {
-            waterMarkForAll = new WaterMarkForAll(5000);
-        }
         if (timer == null) {
             timer = Executors.newSingleThreadScheduledExecutor();
         }
@@ -189,11 +176,14 @@ public class RocketMQSourceFunction<OUT> extends RichParallelSourceFunction<OUT>
         runningChecker = new RunningChecker();
         runningChecker.setRunning(true);
 
+        final AtomicLong threadCount = new AtomicLong(0);
         final ThreadFactory threadFactory =
-                new ThreadFactoryBuilder()
-                        .setDaemon(true)
-                        .setNameFormat("rmq-pull-thread-%d")
-                        .build();
+                r -> {
+                    Thread thread = new Thread(r);
+                    thread.setDaemon(true);
+                    thread.setName("rmq-pull-thread-" + threadCount.getAndIncrement());
+                    return thread;
+                };
         executor = Executors.newCachedThreadPool(threadFactory);
 
         int indexOfThisSubTask = getRuntimeContext().getIndexOfThisSubtask();
@@ -248,6 +238,7 @@ public class RocketMQSourceFunction<OUT> extends RichParallelSourceFunction<OUT>
     }
 
     @Override
+    @SuppressWarnings({"rawtypes", "unchecked"})
     public void run(SourceContext context) throws Exception {
         String sql = props.getProperty(RocketMQConfig.CONSUMER_SQL);
         String tag =
@@ -257,14 +248,8 @@ public class RocketMQSourceFunction<OUT> extends RichParallelSourceFunction<OUT>
                         props,
                         RocketMQConfig.CONSUMER_BATCH_SIZE,
                         RocketMQConfig.DEFAULT_CONSUMER_BATCH_SIZE);
-        timer.scheduleAtFixedRate(
-                () -> {
-                    // context.emitWatermark(waterMarkPerQueue.getCurrentWatermark());
-                    context.emitWatermark(waterMarkForAll.getCurrentWatermark());
-                },
-                5,
-                5,
-                TimeUnit.SECONDS);
+        // Watermark emission removed: legacy watermark assigners are no longer available.
+        // Use WatermarkStrategy with the new Source API instead.
         if (StringUtils.isEmpty(sql)) {
             consumer.subscribe(topic, tag);
         } else {
@@ -272,89 +257,8 @@ public class RocketMQSourceFunction<OUT> extends RichParallelSourceFunction<OUT>
             consumer.subscribe(topic, MessageSelector.bySql(sql));
         }
         for (MessageQueue mq : messageQueues) {
-            this.executor.execute(
-                    () ->
-                            RetryUtil.call(
-                                    () -> {
-                                        while (runningChecker.isRunning()) {
-                                            try {
-                                                Long offset = offsetTable.get(mq);
-                                                consumer.setPullBatchSize(pullBatchSize);
-                                                consumer.seek(mq, offset);
-                                                boolean found = false;
-                                                List<MessageExt> messages =
-                                                        consumer.poll(
-                                                                RocketMQUtils.getInteger(
-                                                                        props,
-                                                                        RocketMQConfig
-                                                                                .CONSUMER_TIMEOUT,
-                                                                        RocketMQConfig
-                                                                                .DEFAULT_CONSUMER_TIMEOUT));
-                                                if (CollectionUtils.isNotEmpty(messages)) {
-                                                    long fetchTime = System.currentTimeMillis();
-                                                    for (MessageExt msg : messages) {
-                                                        byte[] key =
-                                                                msg.getKeys() != null
-                                                                        ? msg.getKeys()
-                                                                                .getBytes(
-                                                                                        StandardCharsets
-                                                                                                .UTF_8)
-                                                                        : null;
-                                                        byte[] value = msg.getBody();
-                                                        OUT data =
-                                                                schema.deserializeKeyAndValue(
-                                                                        key, value);
-
-                                                        // output and state update are atomic
-                                                        synchronized (checkPointLock) {
-                                                            log.debug(
-                                                                    msg.getMsgId()
-                                                                            + "_"
-                                                                            + msg.getBrokerName()
-                                                                            + " "
-                                                                            + msg.getQueueId()
-                                                                            + " "
-                                                                            + msg.getQueueOffset());
-                                                            context.collectWithTimestamp(
-                                                                    data, msg.getBornTimestamp());
-                                                            long emitTime =
-                                                                    System.currentTimeMillis();
-                                                            // update max eventTime per queue
-                                                            // waterMarkPerQueue.extractTimestamp(mq, msg.getBornTimestamp());
-                                                            waterMarkForAll.extractTimestamp(
-                                                                    msg.getBornTimestamp());
-                                                            tpsMetric.markEvent();
-                                                            long eventTime =
-                                                                    msg.getStoreTimestamp();
-                                                            fetchDelay.report(
-                                                                    Math.abs(
-                                                                            fetchTime - eventTime));
-                                                            emitDelay.report(
-                                                                    Math.abs(emitTime - eventTime));
-                                                        }
-                                                    }
-                                                    found = true;
-                                                }
-                                                synchronized (checkPointLock) {
-                                                    updateMessageQueueOffset(
-                                                            mq, consumer.committed(mq));
-                                                }
-
-                                                if (!found) {
-                                                    RetryUtil.waitForMs(
-                                                            RocketMQConfig
-                                                                    .DEFAULT_CONSUMER_DELAY_WHEN_MESSAGE_NOT_FOUND);
-                                                }
-                                            } catch (Exception e) {
-                                                throw new RuntimeException(e);
-                                            }
-                                        }
-                                        return true;
-                                    },
-                                    "RuntimeException",
-                                    runningChecker));
+            this.executor.execute(() -> consumeMessages(mq, context, pullBatchSize));
         }
-
         awaitTermination();
     }
 
@@ -364,6 +268,88 @@ public class RocketMQSourceFunction<OUT> extends RichParallelSourceFunction<OUT>
         }
     }
 
+    private void consumeMessages(
+            MessageQueue mq, SourceContext<OUT> context, int pullBatchSize) {
+        RetryUtil.call(
+                () -> {
+                    pollAndEmitLoop(mq, context, pullBatchSize);
+                    return true;
+                },
+                "RuntimeException",
+                runningChecker);
+    }
+
+    private void pollAndEmitLoop(
+            MessageQueue mq, SourceContext<OUT> context, int pullBatchSize) {
+        while (runningChecker.isRunning()) {
+            try {
+                pollAndEmit(mq, context, pullBatchSize);
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+        }
+    }
+
+    private void pollAndEmit(MessageQueue mq, SourceContext<OUT> context, int pullBatchSize)
+            throws Exception {
+        Long offset = offsetTable.get(mq);
+        consumer.setPullBatchSize(pullBatchSize);
+        consumer.seek(mq, offset);
+
+        List<MessageExt> messages =
+                consumer.poll(
+                        RocketMQUtils.getInteger(
+                                props,
+                                RocketMQConfig.CONSUMER_TIMEOUT,
+                                RocketMQConfig.DEFAULT_CONSUMER_TIMEOUT));
+
+        boolean found = CollectionUtils.isNotEmpty(messages);
+        if (found) {
+            emitMessages(messages, context);
+        }
+
+        synchronized (checkPointLock) {
+            updateMessageQueueOffset(mq, consumer.committed(mq));
+        }
+
+        if (!found) {
+            RetryUtil.waitForMs(
+                    RocketMQConfig.DEFAULT_CONSUMER_DELAY_WHEN_MESSAGE_NOT_FOUND);
+        }
+    }
+
+    private void emitMessages(List<MessageExt> messages, SourceContext<OUT> context) {
+        long fetchTime = System.currentTimeMillis();
+        for (MessageExt msg : messages) {
+            byte[] key =
+                    msg.getKeys() != null
+                            ? msg.getKeys().getBytes(StandardCharsets.UTF_8)
+                            : null;
+            byte[] value = msg.getBody();
+            OUT data = schema.deserializeKeyAndValue(key, value);
+
+            // output and state update are atomic
+            synchronized (checkPointLock) {
+                log.debug(
+                        msg.getMsgId()
+                                + "_"
+                                + msg.getBrokerName()
+                                + " "
+                                + msg.getQueueId()
+                                + " "
+                                + msg.getQueueOffset());
+                context.collectWithTimestamp(data, msg.getBornTimestamp());
+                long emitTime = System.currentTimeMillis();
+                // Watermark extraction removed: legacy watermark assigners
+                // are no longer available.
+                tpsMetric.markEvent();
+                long eventTime = msg.getStoreTimestamp();
+                fetchDelay.report(Math.abs(fetchTime - eventTime));
+                emitDelay.report(Math.abs(emitTime - eventTime));
+            }
+        }
+    }
+
     /**
      * only flink job start with no state can init offsets from broker
      *
@@ -594,8 +580,11 @@ public class RocketMQSourceFunction<OUT> extends RichParallelSourceFunction<OUT>
             log.warn("Retry failed multiple times for topic route change, keep previous offset.");
             // If the retry fails for multiple times, the message queue and its offset in the
             // previous checkpoint will be retained.
-            List<Tuple2<MessageQueue, Long>> unionOffsets =
-                    Lists.newArrayList(unionOffsetStates.get().iterator());
+            List<Tuple2<MessageQueue, Long>> unionOffsets = new ArrayList<>();
+            Iterator<Tuple2<MessageQueue, Long>> it = unionOffsetStates.get().iterator();
+            while (it.hasNext()) {
+                unionOffsets.add(it.next());
+            }
             Map<MessageQueue, Long> queueOffsets = new HashMap<>(unionOffsets.size());
             unionOffsets.forEach(queueOffset -> queueOffsets.put(queueOffset.f0, queueOffset.f1));
             currentOffsets = new HashMap<>(unionOffsets.size() + offsetTable.size());
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/legacy/RunningChecker.java b/flink-connector-rocketmq/src/main/java/org/apache/flink/streaming/connectors/rocketmq/RunningChecker.java
similarity index 95%
rename from src/main/java/org/apache/flink/connector/rocketmq/legacy/RunningChecker.java
rename to flink-connector-rocketmq/src/main/java/org/apache/flink/streaming/connectors/rocketmq/RunningChecker.java
index 961a302..6d5a8ac 100644
--- a/src/main/java/org/apache/flink/connector/rocketmq/legacy/RunningChecker.java
+++ b/flink-connector-rocketmq/src/main/java/org/apache/flink/streaming/connectors/rocketmq/RunningChecker.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.flink.connector.rocketmq.legacy;
+package org.apache.flink.streaming.connectors.rocketmq;
 
 import java.io.Serializable;
 
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/legacy/common/config/OffsetResetStrategy.java b/flink-connector-rocketmq/src/main/java/org/apache/flink/streaming/connectors/rocketmq/common/config/OffsetResetStrategy.java
similarity index 94%
rename from src/main/java/org/apache/flink/connector/rocketmq/legacy/common/config/OffsetResetStrategy.java
rename to flink-connector-rocketmq/src/main/java/org/apache/flink/streaming/connectors/rocketmq/common/config/OffsetResetStrategy.java
index 7a9f13a..808a84e 100644
--- a/src/main/java/org/apache/flink/connector/rocketmq/legacy/common/config/OffsetResetStrategy.java
+++ b/flink-connector-rocketmq/src/main/java/org/apache/flink/streaming/connectors/rocketmq/common/config/OffsetResetStrategy.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.flink.connector.rocketmq.legacy.common.config;
+package org.apache.flink.streaming.connectors.rocketmq.common.config;
 
 /** Config for #{@link StartupMode#GROUP_OFFSETS}. */
 public enum OffsetResetStrategy {
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/legacy/common/config/StartupMode.java b/flink-connector-rocketmq/src/main/java/org/apache/flink/streaming/connectors/rocketmq/common/config/StartupMode.java
similarity index 93%
rename from src/main/java/org/apache/flink/connector/rocketmq/legacy/common/config/StartupMode.java
rename to flink-connector-rocketmq/src/main/java/org/apache/flink/streaming/connectors/rocketmq/common/config/StartupMode.java
index d56e605..13963d4 100644
--- a/src/main/java/org/apache/flink/connector/rocketmq/legacy/common/config/StartupMode.java
+++ b/flink-connector-rocketmq/src/main/java/org/apache/flink/streaming/connectors/rocketmq/common/config/StartupMode.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.flink.connector.rocketmq.legacy.common.config;
+package org.apache.flink.streaming.connectors.rocketmq.common.config;
 
 /** RocketMQ startup mode. */
 public enum StartupMode {
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/legacy/common/selector/DefaultTopicSelector.java b/flink-connector-rocketmq/src/main/java/org/apache/flink/streaming/connectors/rocketmq/common/selector/DefaultTopicSelector.java
similarity index 94%
rename from src/main/java/org/apache/flink/connector/rocketmq/legacy/common/selector/DefaultTopicSelector.java
rename to flink-connector-rocketmq/src/main/java/org/apache/flink/streaming/connectors/rocketmq/common/selector/DefaultTopicSelector.java
index d98ff71..abf8843 100644
--- a/src/main/java/org/apache/flink/connector/rocketmq/legacy/common/selector/DefaultTopicSelector.java
+++ b/flink-connector-rocketmq/src/main/java/org/apache/flink/streaming/connectors/rocketmq/common/selector/DefaultTopicSelector.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.flink.connector.rocketmq.legacy.common.selector;
+package org.apache.flink.streaming.connectors.rocketmq.common.selector;
 
 public class DefaultTopicSelector<T> implements TopicSelector<T> {
     private final String topicName;
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/legacy/common/selector/HashMessageQueueSelector.java b/flink-connector-rocketmq/src/main/java/org/apache/flink/streaming/connectors/rocketmq/common/selector/HashMessageQueueSelector.java
similarity index 94%
rename from src/main/java/org/apache/flink/connector/rocketmq/legacy/common/selector/HashMessageQueueSelector.java
rename to flink-connector-rocketmq/src/main/java/org/apache/flink/streaming/connectors/rocketmq/common/selector/HashMessageQueueSelector.java
index a3b5db3..0fc66ff 100644
--- a/src/main/java/org/apache/flink/connector/rocketmq/legacy/common/selector/HashMessageQueueSelector.java
+++ b/flink-connector-rocketmq/src/main/java/org/apache/flink/streaming/connectors/rocketmq/common/selector/HashMessageQueueSelector.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.flink.connector.rocketmq.legacy.common.selector;
+package org.apache.flink.streaming.connectors.rocketmq.common.selector;
 
 import org.apache.rocketmq.common.message.Message;
 import org.apache.rocketmq.common.message.MessageQueue;
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/legacy/common/selector/MessageQueueSelector.java b/flink-connector-rocketmq/src/main/java/org/apache/flink/streaming/connectors/rocketmq/common/selector/MessageQueueSelector.java
similarity index 93%
rename from src/main/java/org/apache/flink/connector/rocketmq/legacy/common/selector/MessageQueueSelector.java
rename to flink-connector-rocketmq/src/main/java/org/apache/flink/streaming/connectors/rocketmq/common/selector/MessageQueueSelector.java
index 0eac1bf..ef5c262 100644
--- a/src/main/java/org/apache/flink/connector/rocketmq/legacy/common/selector/MessageQueueSelector.java
+++ b/flink-connector-rocketmq/src/main/java/org/apache/flink/streaming/connectors/rocketmq/common/selector/MessageQueueSelector.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.flink.connector.rocketmq.legacy.common.selector;
+package org.apache.flink.streaming.connectors.rocketmq.common.selector;
 
 import java.io.Serializable;
 
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/legacy/common/selector/RandomMessageQueueSelector.java b/flink-connector-rocketmq/src/main/java/org/apache/flink/streaming/connectors/rocketmq/common/selector/RandomMessageQueueSelector.java
similarity index 94%
rename from src/main/java/org/apache/flink/connector/rocketmq/legacy/common/selector/RandomMessageQueueSelector.java
rename to flink-connector-rocketmq/src/main/java/org/apache/flink/streaming/connectors/rocketmq/common/selector/RandomMessageQueueSelector.java
index 7580684..a3d5a57 100644
--- a/src/main/java/org/apache/flink/connector/rocketmq/legacy/common/selector/RandomMessageQueueSelector.java
+++ b/flink-connector-rocketmq/src/main/java/org/apache/flink/streaming/connectors/rocketmq/common/selector/RandomMessageQueueSelector.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.flink.connector.rocketmq.legacy.common.selector;
+package org.apache.flink.streaming.connectors.rocketmq.common.selector;
 
 import org.apache.rocketmq.common.message.Message;
 import org.apache.rocketmq.common.message.MessageQueue;
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/legacy/common/selector/SimpleTopicSelector.java b/flink-connector-rocketmq/src/main/java/org/apache/flink/streaming/connectors/rocketmq/common/selector/SimpleTopicSelector.java
similarity index 97%
rename from src/main/java/org/apache/flink/connector/rocketmq/legacy/common/selector/SimpleTopicSelector.java
rename to flink-connector-rocketmq/src/main/java/org/apache/flink/streaming/connectors/rocketmq/common/selector/SimpleTopicSelector.java
index d74e52c..003cbcc 100644
--- a/src/main/java/org/apache/flink/connector/rocketmq/legacy/common/selector/SimpleTopicSelector.java
+++ b/flink-connector-rocketmq/src/main/java/org/apache/flink/streaming/connectors/rocketmq/common/selector/SimpleTopicSelector.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.flink.connector.rocketmq.legacy.common.selector;
+package org.apache.flink.streaming.connectors.rocketmq.common.selector;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/legacy/common/selector/TopicSelector.java b/flink-connector-rocketmq/src/main/java/org/apache/flink/streaming/connectors/rocketmq/common/selector/TopicSelector.java
similarity index 92%
rename from src/main/java/org/apache/flink/connector/rocketmq/legacy/common/selector/TopicSelector.java
rename to flink-connector-rocketmq/src/main/java/org/apache/flink/streaming/connectors/rocketmq/common/selector/TopicSelector.java
index b24cfb4..71b9564 100644
--- a/src/main/java/org/apache/flink/connector/rocketmq/legacy/common/selector/TopicSelector.java
+++ b/flink-connector-rocketmq/src/main/java/org/apache/flink/streaming/connectors/rocketmq/common/selector/TopicSelector.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.flink.connector.rocketmq.legacy.common.selector;
+package org.apache.flink.streaming.connectors.rocketmq.common.selector;
 
 import java.io.Serializable;
 
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/legacy/common/serialization/ForwardMessageExtDeserialization.java b/flink-connector-rocketmq/src/main/java/org/apache/flink/streaming/connectors/rocketmq/common/serialization/ForwardMessageExtDeserialization.java
similarity index 94%
rename from src/main/java/org/apache/flink/connector/rocketmq/legacy/common/serialization/ForwardMessageExtDeserialization.java
rename to flink-connector-rocketmq/src/main/java/org/apache/flink/streaming/connectors/rocketmq/common/serialization/ForwardMessageExtDeserialization.java
index 598d72a..8ab4755 100644
--- a/src/main/java/org/apache/flink/connector/rocketmq/legacy/common/serialization/ForwardMessageExtDeserialization.java
+++ b/flink-connector-rocketmq/src/main/java/org/apache/flink/streaming/connectors/rocketmq/common/serialization/ForwardMessageExtDeserialization.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.flink.connector.rocketmq.legacy.common.serialization;
+package org.apache.flink.streaming.connectors.rocketmq.common.serialization;
 
 import org.apache.flink.api.common.typeinfo.TypeInformation;
 
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/legacy/common/serialization/KeyValueDeserializationSchema.java b/flink-connector-rocketmq/src/main/java/org/apache/flink/streaming/connectors/rocketmq/common/serialization/KeyValueDeserializationSchema.java
similarity index 93%
rename from src/main/java/org/apache/flink/connector/rocketmq/legacy/common/serialization/KeyValueDeserializationSchema.java
rename to flink-connector-rocketmq/src/main/java/org/apache/flink/streaming/connectors/rocketmq/common/serialization/KeyValueDeserializationSchema.java
index 21aa485..b491fca 100644
--- a/src/main/java/org/apache/flink/connector/rocketmq/legacy/common/serialization/KeyValueDeserializationSchema.java
+++ b/flink-connector-rocketmq/src/main/java/org/apache/flink/streaming/connectors/rocketmq/common/serialization/KeyValueDeserializationSchema.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.flink.connector.rocketmq.legacy.common.serialization;
+package org.apache.flink.streaming.connectors.rocketmq.common.serialization;
 
 import org.apache.flink.api.java.typeutils.ResultTypeQueryable;
 
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/legacy/common/serialization/KeyValueSerializationSchema.java b/flink-connector-rocketmq/src/main/java/org/apache/flink/streaming/connectors/rocketmq/common/serialization/KeyValueSerializationSchema.java
similarity index 92%
rename from src/main/java/org/apache/flink/connector/rocketmq/legacy/common/serialization/KeyValueSerializationSchema.java
rename to flink-connector-rocketmq/src/main/java/org/apache/flink/streaming/connectors/rocketmq/common/serialization/KeyValueSerializationSchema.java
index a19a445..ddc9189 100644
--- a/src/main/java/org/apache/flink/connector/rocketmq/legacy/common/serialization/KeyValueSerializationSchema.java
+++ b/flink-connector-rocketmq/src/main/java/org/apache/flink/streaming/connectors/rocketmq/common/serialization/KeyValueSerializationSchema.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.flink.connector.rocketmq.legacy.common.serialization;
+package org.apache.flink.streaming.connectors.rocketmq.common.serialization;
 
 import java.io.Serializable;
 
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/legacy/common/serialization/MessageExtDeserializationScheme.java b/flink-connector-rocketmq/src/main/java/org/apache/flink/streaming/connectors/rocketmq/common/serialization/MessageExtDeserializationScheme.java
similarity index 94%
rename from src/main/java/org/apache/flink/connector/rocketmq/legacy/common/serialization/MessageExtDeserializationScheme.java
rename to flink-connector-rocketmq/src/main/java/org/apache/flink/streaming/connectors/rocketmq/common/serialization/MessageExtDeserializationScheme.java
index 5ee8da7..cc0daaa 100644
--- a/src/main/java/org/apache/flink/connector/rocketmq/legacy/common/serialization/MessageExtDeserializationScheme.java
+++ b/flink-connector-rocketmq/src/main/java/org/apache/flink/streaming/connectors/rocketmq/common/serialization/MessageExtDeserializationScheme.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.flink.connector.rocketmq.legacy.common.serialization;
+package org.apache.flink.streaming.connectors.rocketmq.common.serialization;
 
 import org.apache.flink.api.java.typeutils.ResultTypeQueryable;
 
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/legacy/common/serialization/RowKeyValueDeserializationSchema.java b/flink-connector-rocketmq/src/main/java/org/apache/flink/streaming/connectors/rocketmq/common/serialization/RowKeyValueDeserializationSchema.java
similarity index 99%
rename from src/main/java/org/apache/flink/connector/rocketmq/legacy/common/serialization/RowKeyValueDeserializationSchema.java
rename to flink-connector-rocketmq/src/main/java/org/apache/flink/streaming/connectors/rocketmq/common/serialization/RowKeyValueDeserializationSchema.java
index ca934bd..bf7d58d 100644
--- a/src/main/java/org/apache/flink/connector/rocketmq/legacy/common/serialization/RowKeyValueDeserializationSchema.java
+++ b/flink-connector-rocketmq/src/main/java/org/apache/flink/streaming/connectors/rocketmq/common/serialization/RowKeyValueDeserializationSchema.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.flink.connector.rocketmq.legacy.common.serialization;
+package org.apache.flink.streaming.connectors.rocketmq.common.serialization;
 
 import org.apache.flink.api.common.typeinfo.TypeInformation;
 import org.apache.flink.configuration.ConfigOption;
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/legacy/common/serialization/SimpleKeyValueDeserializationSchema.java b/flink-connector-rocketmq/src/main/java/org/apache/flink/streaming/connectors/rocketmq/common/serialization/SimpleKeyValueDeserializationSchema.java
similarity index 96%
rename from src/main/java/org/apache/flink/connector/rocketmq/legacy/common/serialization/SimpleKeyValueDeserializationSchema.java
rename to flink-connector-rocketmq/src/main/java/org/apache/flink/streaming/connectors/rocketmq/common/serialization/SimpleKeyValueDeserializationSchema.java
index c3e54c9..a6202eb 100644
--- a/src/main/java/org/apache/flink/connector/rocketmq/legacy/common/serialization/SimpleKeyValueDeserializationSchema.java
+++ b/flink-connector-rocketmq/src/main/java/org/apache/flink/streaming/connectors/rocketmq/common/serialization/SimpleKeyValueDeserializationSchema.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.flink.connector.rocketmq.legacy.common.serialization;
+package org.apache.flink.streaming.connectors.rocketmq.common.serialization;
 
 import org.apache.flink.api.common.typeinfo.TypeInformation;
 import org.apache.flink.api.java.typeutils.MapTypeInfo;
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/legacy/common/serialization/SimpleKeyValueSerializationSchema.java b/flink-connector-rocketmq/src/main/java/org/apache/flink/streaming/connectors/rocketmq/common/serialization/SimpleKeyValueSerializationSchema.java
similarity index 96%
rename from src/main/java/org/apache/flink/connector/rocketmq/legacy/common/serialization/SimpleKeyValueSerializationSchema.java
rename to flink-connector-rocketmq/src/main/java/org/apache/flink/streaming/connectors/rocketmq/common/serialization/SimpleKeyValueSerializationSchema.java
index 830cfb6..97dd631 100644
--- a/src/main/java/org/apache/flink/connector/rocketmq/legacy/common/serialization/SimpleKeyValueSerializationSchema.java
+++ b/flink-connector-rocketmq/src/main/java/org/apache/flink/streaming/connectors/rocketmq/common/serialization/SimpleKeyValueSerializationSchema.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.flink.connector.rocketmq.legacy.common.serialization;
+package org.apache.flink.streaming.connectors.rocketmq.common.serialization;
 
 import java.nio.charset.StandardCharsets;
 import java.util.Map;
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/legacy/common/serialization/SimpleStringDeserializationSchema.java b/flink-connector-rocketmq/src/main/java/org/apache/flink/streaming/connectors/rocketmq/common/serialization/SimpleStringDeserializationSchema.java
similarity index 94%
rename from src/main/java/org/apache/flink/connector/rocketmq/legacy/common/serialization/SimpleStringDeserializationSchema.java
rename to flink-connector-rocketmq/src/main/java/org/apache/flink/streaming/connectors/rocketmq/common/serialization/SimpleStringDeserializationSchema.java
index 7f8c4c6..be657e4 100644
--- a/src/main/java/org/apache/flink/connector/rocketmq/legacy/common/serialization/SimpleStringDeserializationSchema.java
+++ b/flink-connector-rocketmq/src/main/java/org/apache/flink/streaming/connectors/rocketmq/common/serialization/SimpleStringDeserializationSchema.java
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.flink.connector.rocketmq.legacy.common.serialization;
+package org.apache.flink.streaming.connectors.rocketmq.common.serialization;
 
 import org.apache.flink.api.common.typeinfo.TypeInformation;
 
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/legacy/common/serialization/SimpleTupleDeserializationSchema.java b/flink-connector-rocketmq/src/main/java/org/apache/flink/streaming/connectors/rocketmq/common/serialization/SimpleTupleDeserializationSchema.java
similarity index 95%
rename from src/main/java/org/apache/flink/connector/rocketmq/legacy/common/serialization/SimpleTupleDeserializationSchema.java
rename to flink-connector-rocketmq/src/main/java/org/apache/flink/streaming/connectors/rocketmq/common/serialization/SimpleTupleDeserializationSchema.java
index 28e94ba..a471b50 100644
--- a/src/main/java/org/apache/flink/connector/rocketmq/legacy/common/serialization/SimpleTupleDeserializationSchema.java
+++ b/flink-connector-rocketmq/src/main/java/org/apache/flink/streaming/connectors/rocketmq/common/serialization/SimpleTupleDeserializationSchema.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.flink.connector.rocketmq.legacy.common.serialization;
+package org.apache.flink.streaming.connectors.rocketmq.common.serialization;
 
 import org.apache.flink.api.common.typeinfo.TypeHint;
 import org.apache.flink.api.common.typeinfo.TypeInformation;
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/legacy/common/util/MetricUtils.java b/flink-connector-rocketmq/src/main/java/org/apache/flink/streaming/connectors/rocketmq/common/util/MetricUtils.java
similarity index 98%
rename from src/main/java/org/apache/flink/connector/rocketmq/legacy/common/util/MetricUtils.java
rename to flink-connector-rocketmq/src/main/java/org/apache/flink/streaming/connectors/rocketmq/common/util/MetricUtils.java
index d98e3c3..7ecebc5 100644
--- a/src/main/java/org/apache/flink/connector/rocketmq/legacy/common/util/MetricUtils.java
+++ b/flink-connector-rocketmq/src/main/java/org/apache/flink/streaming/connectors/rocketmq/common/util/MetricUtils.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.flink.connector.rocketmq.legacy.common.util;
+package org.apache.flink.streaming.connectors.rocketmq.common.util;
 
 import org.apache.flink.api.common.functions.RuntimeContext;
 import org.apache.flink.metrics.Counter;
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/legacy/common/util/RetryUtil.java b/flink-connector-rocketmq/src/main/java/org/apache/flink/streaming/connectors/rocketmq/common/util/RetryUtil.java
similarity index 94%
rename from src/main/java/org/apache/flink/connector/rocketmq/legacy/common/util/RetryUtil.java
rename to flink-connector-rocketmq/src/main/java/org/apache/flink/streaming/connectors/rocketmq/common/util/RetryUtil.java
index d11105b..453ad25 100644
--- a/src/main/java/org/apache/flink/connector/rocketmq/legacy/common/util/RetryUtil.java
+++ b/flink-connector-rocketmq/src/main/java/org/apache/flink/streaming/connectors/rocketmq/common/util/RetryUtil.java
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.flink.connector.rocketmq.legacy.common.util;
+package org.apache.flink.streaming.connectors.rocketmq.common.util;
 
-import org.apache.flink.connector.rocketmq.legacy.RunningChecker;
+import org.apache.flink.streaming.connectors.rocketmq.RunningChecker;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/legacy/common/util/RocketMQUtils.java b/flink-connector-rocketmq/src/main/java/org/apache/flink/streaming/connectors/rocketmq/common/util/RocketMQUtils.java
similarity index 98%
rename from src/main/java/org/apache/flink/connector/rocketmq/legacy/common/util/RocketMQUtils.java
rename to flink-connector-rocketmq/src/main/java/org/apache/flink/streaming/connectors/rocketmq/common/util/RocketMQUtils.java
index 9f3d913..cf38c0b 100644
--- a/src/main/java/org/apache/flink/connector/rocketmq/legacy/common/util/RocketMQUtils.java
+++ b/flink-connector-rocketmq/src/main/java/org/apache/flink/streaming/connectors/rocketmq/common/util/RocketMQUtils.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.flink.connector.rocketmq.legacy.common.util;
+package org.apache.flink.streaming.connectors.rocketmq.common.util;
 
 import org.apache.rocketmq.client.AccessChannel;
 import org.apache.rocketmq.common.message.MessageQueue;
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/legacy/common/util/TestUtils.java b/flink-connector-rocketmq/src/main/java/org/apache/flink/streaming/connectors/rocketmq/common/util/TestUtils.java
similarity index 95%
rename from src/main/java/org/apache/flink/connector/rocketmq/legacy/common/util/TestUtils.java
rename to flink-connector-rocketmq/src/main/java/org/apache/flink/streaming/connectors/rocketmq/common/util/TestUtils.java
index 1bde818..f030d82 100644
--- a/src/main/java/org/apache/flink/connector/rocketmq/legacy/common/util/TestUtils.java
+++ b/flink-connector-rocketmq/src/main/java/org/apache/flink/streaming/connectors/rocketmq/common/util/TestUtils.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.flink.connector.rocketmq.legacy.common.util;
+package org.apache.flink.streaming.connectors.rocketmq.common.util;
 
 import java.lang.reflect.Field;
 
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/legacy/function/SinkMapFunction.java b/flink-connector-rocketmq/src/main/java/org/apache/flink/streaming/connectors/rocketmq/function/SinkMapFunction.java
similarity index 96%
rename from src/main/java/org/apache/flink/connector/rocketmq/legacy/function/SinkMapFunction.java
rename to flink-connector-rocketmq/src/main/java/org/apache/flink/streaming/connectors/rocketmq/function/SinkMapFunction.java
index 8cda235..1a73b92 100644
--- a/src/main/java/org/apache/flink/connector/rocketmq/legacy/function/SinkMapFunction.java
+++ b/flink-connector-rocketmq/src/main/java/org/apache/flink/streaming/connectors/rocketmq/function/SinkMapFunction.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.flink.connector.rocketmq.legacy.function;
+package org.apache.flink.streaming.connectors.rocketmq.function;
 
 import org.apache.flink.api.java.tuple.Tuple2;
 import org.apache.flink.streaming.api.functions.ProcessFunction;
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/legacy/function/SourceMapFunction.java b/flink-connector-rocketmq/src/main/java/org/apache/flink/streaming/connectors/rocketmq/function/SourceMapFunction.java
similarity index 95%
rename from src/main/java/org/apache/flink/connector/rocketmq/legacy/function/SourceMapFunction.java
rename to flink-connector-rocketmq/src/main/java/org/apache/flink/streaming/connectors/rocketmq/function/SourceMapFunction.java
index 1945c70..8a7a456 100644
--- a/src/main/java/org/apache/flink/connector/rocketmq/legacy/function/SourceMapFunction.java
+++ b/flink-connector-rocketmq/src/main/java/org/apache/flink/streaming/connectors/rocketmq/function/SourceMapFunction.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.flink.connector.rocketmq.legacy.function;
+package org.apache.flink.streaming.connectors.rocketmq.function;
 
 import org.apache.flink.api.java.tuple.Tuple2;
 import org.apache.flink.streaming.api.functions.ProcessFunction;
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/sink/table/RocketMQDynamicTableSink.java b/flink-connector-rocketmq/src/main/java/org/apache/flink/streaming/connectors/rocketmq/table/RocketMQDynamicTableSink.java
similarity index 75%
rename from src/main/java/org/apache/flink/connector/rocketmq/sink/table/RocketMQDynamicTableSink.java
rename to flink-connector-rocketmq/src/main/java/org/apache/flink/streaming/connectors/rocketmq/table/RocketMQDynamicTableSink.java
index 98a15e6..bb05b67 100644
--- a/src/main/java/org/apache/flink/connector/rocketmq/sink/table/RocketMQDynamicTableSink.java
+++ b/flink-connector-rocketmq/src/main/java/org/apache/flink/streaming/connectors/rocketmq/table/RocketMQDynamicTableSink.java
@@ -15,17 +15,20 @@
  * limitations under the License.
  */
 
-package org.apache.flink.connector.rocketmq.sink.table;
+package org.apache.flink.streaming.connectors.rocketmq.table;
 
 import org.apache.flink.api.common.typeinfo.TypeInformation;
 import org.apache.flink.api.java.typeutils.RowTypeInfo;
-import org.apache.flink.connector.rocketmq.legacy.RocketMQConfig;
-import org.apache.flink.connector.rocketmq.legacy.RocketMQSink;
+import org.apache.flink.configuration.Configuration;
+import org.apache.flink.connector.rocketmq.common.config.RocketMQOptions;
+import org.apache.flink.connector.rocketmq.sink.RocketMQSinkOptions;
+import org.apache.flink.connector.rocketmq.sink.RocketMQSink;
+import org.apache.flink.connector.rocketmq.sink.RocketMQSinkBuilder;
 import org.apache.flink.table.api.DataTypes;
 import org.apache.flink.table.api.TableSchema;
 import org.apache.flink.table.connector.ChangelogMode;
 import org.apache.flink.table.connector.sink.DynamicTableSink;
-import org.apache.flink.table.connector.sink.SinkFunctionProvider;
+import org.apache.flink.table.connector.sink.SinkV2Provider;
 import org.apache.flink.table.connector.sink.abilities.SupportsWritingMetadata;
 import org.apache.flink.table.data.RowData;
 import org.apache.flink.table.descriptors.DescriptorProperties;
@@ -37,7 +40,6 @@ import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Properties;
 import java.util.stream.Stream;
 
 /** Defines the dynamic table sink of RocketMQ. */
@@ -66,6 +68,12 @@ public class RocketMQDynamicTableSink implements DynamicTableSink, SupportsWriti
 
     private final String[] keyColumns;
 
+    private final String deliveryGuarantee;
+    private final int sendRetryTimes;
+    private final long sendTimeout;
+    private final int sendPendingMax;
+    private final int executorNum;
+
     private List<String> metadataKeys;
 
     public RocketMQDynamicTableSink(
@@ -83,7 +91,12 @@ public class RocketMQDynamicTableSink implements DynamicTableSink, SupportsWriti
             boolean isDynamicTag,
             boolean isDynamicTagIncluded,
             boolean writeKeysToBody,
-            String[] keyColumns) {
+            String[] keyColumns,
+            String deliveryGuarantee,
+            int sendRetryTimes,
+            long sendTimeout,
+            int sendPendingMax,
+            int executorNum) {
 
         this(
                 properties,
@@ -102,7 +115,12 @@ public class RocketMQDynamicTableSink implements DynamicTableSink, SupportsWriti
                 isDynamicTag,
                 isDynamicTagIncluded,
                 writeKeysToBody,
-                keyColumns);
+                keyColumns,
+                deliveryGuarantee,
+                sendRetryTimes,
+                sendTimeout,
+                sendPendingMax,
+                executorNum);
     }
 
     public RocketMQDynamicTableSink(
@@ -122,7 +140,12 @@ public class RocketMQDynamicTableSink implements DynamicTableSink, SupportsWriti
             boolean isDynamicTag,
             boolean isDynamicTagIncluded,
             boolean writeKeysToBody,
-            String[] keyColumns) {
+            String[] keyColumns,
+            String deliveryGuarantee,
+            int sendRetryTimes,
+            long sendTimeout,
+            int sendPendingMax,
+            int executorNum) {
         this.properties = properties;
         this.schema = schema;
         this.topic = topic;
@@ -140,6 +163,11 @@ public class RocketMQDynamicTableSink implements DynamicTableSink, SupportsWriti
         this.isDynamicTagIncluded = isDynamicTagIncluded;
         this.writeKeysToBody = writeKeysToBody;
         this.keyColumns = keyColumns;
+        this.deliveryGuarantee = deliveryGuarantee;
+        this.sendRetryTimes = sendRetryTimes;
+        this.sendTimeout = sendTimeout;
+        this.sendPendingMax = sendPendingMax;
+        this.executorNum = executorNum;
         this.metadataKeys = Collections.emptyList();
     }
 
@@ -157,7 +185,35 @@ public class RocketMQDynamicTableSink implements DynamicTableSink, SupportsWriti
     @Override
     public DynamicTableSink.SinkRuntimeProvider getSinkRuntimeProvider(
             DynamicTableSink.Context context) {
-        return SinkFunctionProvider.of(new RocketMQRowDataSink(createSink(), createConverter()));
+        RocketMQRowDataConverter converter = createConverter();
+        RocketMQRowDataSerializationSchema serializationSchema =
+                new RocketMQRowDataSerializationSchema(converter);
+
+        RocketMQSinkBuilder<RowData> sinkBuilder =
+                RocketMQSink.<RowData>builder()
+                        .setEndpoints(nameServerAddress)
+                        .setGroupId(producerGroup)
+                        .setSerializer(serializationSchema);
+
+        if (accessKey != null) {
+            sinkBuilder.setConfig(RocketMQOptions.OPTIONAL_ACCESS_KEY, accessKey);
+        }
+        if (secretKey != null) {
+            sinkBuilder.setConfig(RocketMQOptions.OPTIONAL_SECRET_KEY, secretKey);
+        }
+
+        Configuration sinkConfig = new Configuration();
+        sinkConfig.setString(RocketMQSinkOptions.DELIVERY_GUARANTEE, deliveryGuarantee);
+        sinkConfig.setInteger(RocketMQSinkOptions.SEND_RETRY_TIMES, sendRetryTimes);
+        sinkConfig.setLong(RocketMQSinkOptions.SEND_TIMEOUT, sendTimeout);
+        sinkConfig.setInteger(RocketMQSinkOptions.SEND_PENDING_MAX, sendPendingMax);
+        sinkConfig.setInteger(RocketMQSinkOptions.EXECUTOR_NUM, executorNum);
+        // Pass legacy retry config that was previously stored but never forwarded (P1 fix)
+        sinkConfig.setInteger(RocketMQSinkOptions.OPTIONAL_WRITE_RETRY_TIMES, (int) retryTimes);
+        sinkConfig.setLong(RocketMQSinkOptions.OPTIONAL_WRITE_SLEEP_TIME_MS, sleepTime);
+        sinkBuilder.setConfig(sinkConfig);
+
+        return SinkV2Provider.of(sinkBuilder.build());
     }
 
     @Override
@@ -193,7 +249,12 @@ public class RocketMQDynamicTableSink implements DynamicTableSink, SupportsWriti
                         isDynamicTag,
                         isDynamicTagIncluded,
                         writeKeysToBody,
-                        keyColumns);
+                        keyColumns,
+                        deliveryGuarantee,
+                        sendRetryTimes,
+                        sendTimeout,
+                        sendPendingMax,
+                        executorNum);
         tableSink.metadataKeys = metadataKeys;
         return tableSink;
     }
@@ -203,10 +264,6 @@ public class RocketMQDynamicTableSink implements DynamicTableSink, SupportsWriti
         return RocketMQDynamicTableSink.class.getName();
     }
 
-    private RocketMQSink createSink() {
-        return new RocketMQSink(getProducerProps());
-    }
-
     private RocketMQRowDataConverter createConverter() {
         final int[] metadataPositions =
                 Stream.of(WritableMetadata.values())
@@ -235,18 +292,6 @@ public class RocketMQDynamicTableSink implements DynamicTableSink, SupportsWriti
                 metadataPositions);
     }
 
-    private Properties getProducerProps() {
-        Properties producerProps = new Properties();
-        producerProps.setProperty(RocketMQConfig.PRODUCER_GROUP, producerGroup);
-        producerProps.setProperty(RocketMQConfig.NAME_SERVER_ADDR, nameServerAddress);
-        producerProps.setProperty(RocketMQConfig.PRODUCER_RETRY_TIMES, String.valueOf(retryTimes));
-        if (accessKey != null && secretKey != null) {
-            producerProps.setProperty(RocketMQConfig.ACCESS_KEY, accessKey);
-            producerProps.setProperty(RocketMQConfig.SECRET_KEY, secretKey);
-        }
-        return producerProps;
-    }
-
     protected static RowTypeInfo convertToRowTypeInfo(
             DataType fieldsDataType, String[] fieldNames) {
         final TypeInformation<?>[] fieldTypes =
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/sink/table/RocketMQDynamicTableSinkFactory.java b/flink-connector-rocketmq/src/main/java/org/apache/flink/streaming/connectors/rocketmq/table/RocketMQDynamicTableSinkFactory.java
similarity index 85%
rename from src/main/java/org/apache/flink/connector/rocketmq/sink/table/RocketMQDynamicTableSinkFactory.java
rename to flink-connector-rocketmq/src/main/java/org/apache/flink/streaming/connectors/rocketmq/table/RocketMQDynamicTableSinkFactory.java
index 9c1ca11..1210268 100644
--- a/src/main/java/org/apache/flink/connector/rocketmq/sink/table/RocketMQDynamicTableSinkFactory.java
+++ b/flink-connector-rocketmq/src/main/java/org/apache/flink/streaming/connectors/rocketmq/table/RocketMQDynamicTableSinkFactory.java
@@ -16,10 +16,11 @@
  * limitations under the License.
  */
 
-package org.apache.flink.connector.rocketmq.sink.table;
+package org.apache.flink.streaming.connectors.rocketmq.table;
 
 import org.apache.flink.configuration.ConfigOption;
 import org.apache.flink.configuration.Configuration;
+import org.apache.flink.connector.rocketmq.sink.RocketMQSinkOptions;
 import org.apache.flink.table.api.TableSchema;
 import org.apache.flink.table.connector.sink.DynamicTableSink;
 import org.apache.flink.table.descriptors.DescriptorProperties;
@@ -85,6 +86,12 @@ public class RocketMQDynamicTableSinkFactory implements DynamicTableSinkFactory
         optionalOptions.add(OPTIONAL_WRITE_DYNAMIC_TAG_COLUMN_WRITE_INCLUDED);
         optionalOptions.add(OPTIONAL_WRITE_KEYS_TO_BODY);
         optionalOptions.add(OPTIONAL_WRITE_KEY_COLUMNS);
+        optionalOptions.add(RocketMQSinkOptions.DELIVERY_GUARANTEE);
+        optionalOptions.add(RocketMQSinkOptions.SEND_RETRY_TIMES);
+        optionalOptions.add(RocketMQSinkOptions.SEND_TIMEOUT);
+        optionalOptions.add(RocketMQSinkOptions.SEND_PENDING_MAX);
+        optionalOptions.add(RocketMQSinkOptions.EXECUTOR_NUM);
+        optionalOptions.add(RocketMQSinkOptions.TRANSACTION_TIMEOUT);
         return optionalOptions;
     }
 
@@ -114,6 +121,11 @@ public class RocketMQDynamicTableSinkFactory implements DynamicTableSinkFactory
         if (keyColumnsConfig != null && keyColumnsConfig.length() > 0) {
             keyColumns = keyColumnsConfig.split(",");
         }
+        String deliveryGuarantee = properties.getString(RocketMQSinkOptions.DELIVERY_GUARANTEE);
+        int sendRetryTimes = properties.getInteger(RocketMQSinkOptions.SEND_RETRY_TIMES);
+        long sendTimeout = properties.getLong(RocketMQSinkOptions.SEND_TIMEOUT);
+        int sendPendingMax = properties.getInteger(RocketMQSinkOptions.SEND_PENDING_MAX);
+        int executorNum = properties.getInteger(RocketMQSinkOptions.EXECUTOR_NUM);
         DescriptorProperties descriptorProperties = new DescriptorProperties();
         descriptorProperties.putProperties(rawProperties);
         TableSchema physicalSchema =
@@ -136,6 +148,11 @@ public class RocketMQDynamicTableSinkFactory implements DynamicTableSinkFactory
                 isDynamicTag,
                 isDynamicTagIncluded,
                 writeKeysToBody,
-                keyColumns);
+                keyColumns,
+                deliveryGuarantee,
+                sendRetryTimes,
+                sendTimeout,
+                sendPendingMax,
+                executorNum);
     }
 }
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/source/table/RocketMQDynamicTableSourceFactory.java b/flink-connector-rocketmq/src/main/java/org/apache/flink/streaming/connectors/rocketmq/table/RocketMQDynamicTableSourceFactory.java
similarity index 84%
rename from src/main/java/org/apache/flink/connector/rocketmq/source/table/RocketMQDynamicTableSourceFactory.java
rename to flink-connector-rocketmq/src/main/java/org/apache/flink/streaming/connectors/rocketmq/table/RocketMQDynamicTableSourceFactory.java
index 2161385..4807c4d 100644
--- a/src/main/java/org/apache/flink/connector/rocketmq/source/table/RocketMQDynamicTableSourceFactory.java
+++ b/flink-connector-rocketmq/src/main/java/org/apache/flink/streaming/connectors/rocketmq/table/RocketMQDynamicTableSourceFactory.java
@@ -16,11 +16,12 @@
  * limitations under the License.
  */
 
-package org.apache.flink.connector.rocketmq.source.table;
+package org.apache.flink.streaming.connectors.rocketmq.table;
 
 import org.apache.flink.configuration.ConfigOption;
 import org.apache.flink.configuration.Configuration;
-import org.apache.flink.connector.rocketmq.legacy.RocketMQConfig;
+import org.apache.flink.streaming.connectors.rocketmq.RocketMQConfig;
+import org.apache.flink.connector.rocketmq.common.config.RocketMQOptions;
 import org.apache.flink.connector.rocketmq.source.RocketMQSourceOptions;
 import org.apache.flink.table.api.TableSchema;
 import org.apache.flink.table.connector.source.DynamicTableSource;
@@ -59,6 +60,7 @@ public class RocketMQDynamicTableSourceFactory implements DynamicTableSourceFact
         Set<ConfigOption<?>> requiredOptions = new HashSet<>();
         requiredOptions.add(RocketMQSourceOptions.TOPIC);
         requiredOptions.add(RocketMQSourceOptions.CONSUMER_GROUP);
+        requiredOptions.add(RocketMQSourceOptions.ENDPOINTS);
         return requiredOptions;
     }
 
@@ -80,6 +82,17 @@ public class RocketMQDynamicTableSourceFactory implements DynamicTableSourceFact
         optionalOptions.add(RocketMQSourceOptions.OPTIONAL_ACCESS_KEY);
         optionalOptions.add(RocketMQSourceOptions.OPTIONAL_SECRET_KEY);
         optionalOptions.add(RocketMQSourceOptions.OPTIONAL_STARTUP_SCAN_MODE);
+        optionalOptions.add(RocketMQSourceOptions.OPTIONAL_STARTUP_OFFSET_DATE);
+        optionalOptions.add(RocketMQSourceOptions.OPTIONAL_STARTUP_OFFSET_STRATEGY);
+        optionalOptions.add(RocketMQSourceOptions.OPTIONAL_USE_NEW_API);
+        optionalOptions.add(RocketMQSourceOptions.PULL_BATCH_SIZE);
+        optionalOptions.add(RocketMQSourceOptions.ALLOCATE_MESSAGE_QUEUE_STRATEGY);
+        optionalOptions.add(RocketMQSourceOptions.AUTO_COMMIT_OFFSET);
+        optionalOptions.add(RocketMQSourceOptions.AUTO_COMMIT_OFFSET_INTERVAL);
+        optionalOptions.add(RocketMQSourceOptions.ENABLE_MESSAGE_TRACE);
+        optionalOptions.add(RocketMQSourceOptions.CUSTOMIZED_TRACE_TOPIC);
+        optionalOptions.add(RocketMQOptions.PARTITION_DISCOVERY_INTERVAL_MS);
+        optionalOptions.add(RocketMQOptions.OPTIONAL_ACCESS_CHANNEL);
         return optionalOptions;
     }
 
@@ -100,9 +113,10 @@ public class RocketMQDynamicTableSourceFactory implements DynamicTableSourceFact
                                 RocketMQSourceOptions.OPTIONAL_STARTUP_OFFSET_DATE))) {
             throw new IllegalArgumentException(
                     String.format(
-                            "cannot support these configs when %s has been set: [%s] !",
-                            RocketMQSourceOptions.OPTIONAL_STARTUP_SCAN_MODE.key(),
-                            RocketMQSourceOptions.OPTIONAL_STARTUP_OFFSET_SPECIFIC.key()));
+                            "Cannot set %s or %s when %s has been set.",
+                            RocketMQSourceOptions.OPTIONAL_STARTUP_OFFSET_TIMESTAMP.key(),
+                            RocketMQSourceOptions.OPTIONAL_STARTUP_OFFSET_DATE.key(),
+                            RocketMQSourceOptions.OPTIONAL_STARTUP_SCAN_MODE.key()));
         }
         long startMessageOffset =
                 configuration.getLong(RocketMQSourceOptions.OPTIONAL_STARTUP_OFFSET_SPECIFIC);
@@ -160,7 +174,13 @@ public class RocketMQDynamicTableSourceFactory implements DynamicTableSourceFact
         long consumerOffsetTimestamp =
                 configuration.getLong(
                         RocketMQSourceOptions.OPTIONAL_STARTUP_OFFSET_TIMESTAMP,
-                        System.currentTimeMillis());
+                        RocketMQConfig.DEFAULT_START_MESSAGE_OFFSET);
+
+        // Auto-infer scan mode when user sets timestamp but not scan.mode (P0 bug fix)
+        if (configuration.contains(RocketMQSourceOptions.OPTIONAL_STARTUP_OFFSET_TIMESTAMP)
+                && !configuration.contains(RocketMQSourceOptions.OPTIONAL_STARTUP_SCAN_MODE)) {
+            consumerOffsetMode = "timestamp";
+        }
         return new RocketMQScanTableSource(
                 configuration.getLong(RocketMQSourceOptions.PULL_TIMEOUT_LONG_POLLING_SUSPEND),
                 descriptorProperties,
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/sink/table/RocketMQRowDataConverter.java b/flink-connector-rocketmq/src/main/java/org/apache/flink/streaming/connectors/rocketmq/table/RocketMQRowDataConverter.java
similarity index 95%
rename from src/main/java/org/apache/flink/connector/rocketmq/sink/table/RocketMQRowDataConverter.java
rename to flink-connector-rocketmq/src/main/java/org/apache/flink/streaming/connectors/rocketmq/table/RocketMQRowDataConverter.java
index dc14363..c4cff01 100644
--- a/src/main/java/org/apache/flink/connector/rocketmq/sink/table/RocketMQRowDataConverter.java
+++ b/flink-connector-rocketmq/src/main/java/org/apache/flink/streaming/connectors/rocketmq/table/RocketMQRowDataConverter.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.flink.connector.rocketmq.sink.table;
+package org.apache.flink.streaming.connectors.rocketmq.table;
 
 import org.apache.flink.api.java.typeutils.RowTypeInfo;
 import org.apache.flink.table.data.RowData;
@@ -35,9 +35,9 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import static org.apache.flink.connector.rocketmq.sink.table.RocketMQDynamicTableSink.WritableMetadata;
-import static org.apache.flink.connector.rocketmq.sink.table.RocketMQDynamicTableSink.WritableMetadata.KEYS;
-import static org.apache.flink.connector.rocketmq.sink.table.RocketMQDynamicTableSink.WritableMetadata.TAGS;
+import static org.apache.flink.streaming.connectors.rocketmq.table.RocketMQDynamicTableSink.WritableMetadata;
+import static org.apache.flink.streaming.connectors.rocketmq.table.RocketMQDynamicTableSink.WritableMetadata.KEYS;
+import static org.apache.flink.streaming.connectors.rocketmq.table.RocketMQDynamicTableSink.WritableMetadata.TAGS;
 import static org.apache.flink.util.Preconditions.checkState;
 
 /** RocketMQRowDataConverter converts the row data of table to RocketMQ message pattern. */
diff --git a/flink-connector-rocketmq/src/main/java/org/apache/flink/streaming/connectors/rocketmq/table/RocketMQRowDataSerializationSchema.java b/flink-connector-rocketmq/src/main/java/org/apache/flink/streaming/connectors/rocketmq/table/RocketMQRowDataSerializationSchema.java
new file mode 100644
index 0000000..5cc0755
--- /dev/null
+++ b/flink-connector-rocketmq/src/main/java/org/apache/flink/streaming/connectors/rocketmq/table/RocketMQRowDataSerializationSchema.java
@@ -0,0 +1,53 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.flink.streaming.connectors.rocketmq.table;
+
+import org.apache.flink.api.common.serialization.SerializationSchema;
+import org.apache.flink.connector.rocketmq.sink.writer.context.RocketMQSinkContext;
+import org.apache.flink.connector.rocketmq.sink.writer.serializer.RocketMQSerializationSchema;
+import org.apache.flink.table.data.RowData;
+
+import org.apache.rocketmq.common.message.Message;
+
+/**
+ * A {@link RocketMQSerializationSchema} adapter that bridges the Table/SQL {@link RowData} to
+ * RocketMQ {@link Message} conversion. Delegates to {@link RocketMQRowDataConverter} for the
+ * actual conversion logic.
+ */
+public class RocketMQRowDataSerializationSchema implements RocketMQSerializationSchema<RowData> {
+
+    private static final long serialVersionUID = 1L;
+
+    private final RocketMQRowDataConverter converter;
+
+    public RocketMQRowDataSerializationSchema(RocketMQRowDataConverter converter) {
+        this.converter = converter;
+    }
+
+    @Override
+    public void open(
+            SerializationSchema.InitializationContext context, RocketMQSinkContext sinkContext)
+            throws Exception {
+        converter.open();
+    }
+
+    @Override
+    public Message serialize(RowData element, RocketMQSinkContext context, Long timestamp) {
+        return converter.convert(element);
+    }
+}
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/sink/table/RocketMQRowDataSink.java b/flink-connector-rocketmq/src/main/java/org/apache/flink/streaming/connectors/rocketmq/table/RocketMQRowDataSink.java
similarity index 94%
rename from src/main/java/org/apache/flink/connector/rocketmq/sink/table/RocketMQRowDataSink.java
rename to flink-connector-rocketmq/src/main/java/org/apache/flink/streaming/connectors/rocketmq/table/RocketMQRowDataSink.java
index c7d9a71..138d79c 100644
--- a/src/main/java/org/apache/flink/connector/rocketmq/sink/table/RocketMQRowDataSink.java
+++ b/flink-connector-rocketmq/src/main/java/org/apache/flink/streaming/connectors/rocketmq/table/RocketMQRowDataSink.java
@@ -12,11 +12,11 @@
  * express or implied. See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.flink.connector.rocketmq.sink.table;
+package org.apache.flink.streaming.connectors.rocketmq.table;
 
 import org.apache.flink.api.common.functions.RuntimeContext;
 import org.apache.flink.configuration.Configuration;
-import org.apache.flink.connector.rocketmq.legacy.RocketMQSink;
+import org.apache.flink.streaming.connectors.rocketmq.RocketMQSink;
 import org.apache.flink.streaming.api.functions.sink.RichSinkFunction;
 import org.apache.flink.table.data.RowData;
 
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/source/table/RocketMQScanTableSource.java b/flink-connector-rocketmq/src/main/java/org/apache/flink/streaming/connectors/rocketmq/table/RocketMQScanTableSource.java
similarity index 73%
rename from src/main/java/org/apache/flink/connector/rocketmq/source/table/RocketMQScanTableSource.java
rename to flink-connector-rocketmq/src/main/java/org/apache/flink/streaming/connectors/rocketmq/table/RocketMQScanTableSource.java
index 21ccdb9..32afa6e 100644
--- a/src/main/java/org/apache/flink/connector/rocketmq/source/table/RocketMQScanTableSource.java
+++ b/flink-connector-rocketmq/src/main/java/org/apache/flink/streaming/connectors/rocketmq/table/RocketMQScanTableSource.java
@@ -15,13 +15,19 @@
  * limitations under the License.
  */
 
-package org.apache.flink.connector.rocketmq.source.table;
+package org.apache.flink.streaming.connectors.rocketmq.table;
 
-import org.apache.flink.connector.rocketmq.legacy.RocketMQConfig;
-import org.apache.flink.connector.rocketmq.legacy.RocketMQSourceFunction;
-import org.apache.flink.connector.rocketmq.legacy.common.serialization.KeyValueDeserializationSchema;
-import org.apache.flink.connector.rocketmq.legacy.common.serialization.RowKeyValueDeserializationSchema;
+import org.apache.flink.configuration.Configuration;
+import org.apache.flink.connector.rocketmq.common.config.RocketMQOptions;
+import org.apache.flink.streaming.connectors.rocketmq.RocketMQConfig;
+import org.apache.flink.streaming.connectors.rocketmq.RocketMQSourceFunction;
+import org.apache.flink.streaming.connectors.rocketmq.common.serialization.KeyValueDeserializationSchema;
+import org.apache.flink.streaming.connectors.rocketmq.common.serialization.RowKeyValueDeserializationSchema;
 import org.apache.flink.connector.rocketmq.source.RocketMQSource;
+import org.apache.flink.connector.rocketmq.source.RocketMQSourceBuilder;
+import org.apache.flink.connector.rocketmq.source.RocketMQSourceOptions;
+import org.apache.flink.connector.rocketmq.source.enumerator.offset.OffsetsSelector;
+import org.apache.flink.connector.rocketmq.source.enumerator.offset.OffsetsSelectorNoStopping;
 import org.apache.flink.connector.rocketmq.source.reader.deserializer.BytesMessage;
 import org.apache.flink.connector.rocketmq.source.reader.deserializer.RocketMQDeserializationSchema;
 import org.apache.flink.connector.rocketmq.source.reader.deserializer.RocketMQRowDeserializationSchema;
@@ -119,26 +125,40 @@ public class RocketMQScanTableSource implements ScanTableSource, SupportsReading
     @Override
     public ScanRuntimeProvider getScanRuntimeProvider(ScanContext scanContext) {
         if (useNewApi) {
-            // return SourceProvider.of(
-            //        new RocketMQSource<>(
-            //                pollTime,
-            //                topic,
-            //                consumerGroup,
-            //                nameServerAddress,
-            //                accessKey,
-            //                secretKey,
-            //                tag,
-            //                sql,
-            //                stopInMs,
-            //                startTime,
-            //                startMessageOffset < 0 ? 0 : startMessageOffset,
-            //                partitionDiscoveryIntervalMs,
-            //                isBounded() ? BOUNDED : CONTINUOUS_UNBOUNDED,
-            //                createRocketMQDeserializationSchema(),
-            //                consumerOffsetMode,
-            //                consumerOffsetTimestamp));
-
-            return SourceProvider.of(new RocketMQSource<>(null, null, null, null, null));
+            Configuration sourceConfig = new Configuration();
+            sourceConfig.setString(RocketMQSourceOptions.ENDPOINTS, nameServerAddress);
+            sourceConfig.setString(RocketMQSourceOptions.CONSUMER_GROUP, consumerGroup);
+            sourceConfig.setString(RocketMQSourceOptions.TOPIC, topic);
+            if (accessKey != null) {
+                sourceConfig.setString(RocketMQOptions.OPTIONAL_ACCESS_KEY, accessKey);
+            }
+            if (secretKey != null) {
+                sourceConfig.setString(RocketMQOptions.OPTIONAL_SECRET_KEY, secretKey);
+            }
+            sourceConfig.setString(RocketMQSourceOptions.OPTIONAL_TAG, tag);
+            sourceConfig.setLong(
+                    RocketMQOptions.PARTITION_DISCOVERY_INTERVAL_MS, partitionDiscoveryIntervalMs);
+            // Pass SQL filter to new API path — previously only worked in old API (P0 fix)
+            if (sql != null) {
+                sourceConfig.setString(RocketMQSourceOptions.OPTIONAL_SQL, sql);
+            }
+
+            RocketMQSourceBuilder<RowData> builder =
+                    RocketMQSource.<RowData>builder()
+                            .setEndpoints(nameServerAddress)
+                            .setGroupId(consumerGroup)
+                            .setTopics(topic)
+                            .setDeserializer(createRocketMQDeserializationSchema())
+                            .setMinOffsets(createStartingOffsetsSelector())
+                            .setConfig(sourceConfig);
+
+            if (isBounded()) {
+                builder.setBounded(createStoppingOffsetsSelector());
+            } else {
+                builder.setUnbounded(createStoppingOffsetsSelector());
+            }
+
+            return SourceProvider.of(builder.build());
         } else {
             return SourceFunctionProvider.of(
                     new RocketMQSourceFunction<>(
@@ -209,6 +229,27 @@ public class RocketMQScanTableSource implements ScanTableSource, SupportsReading
         return stopInMs != Long.MAX_VALUE;
     }
 
+    private OffsetsSelector createStartingOffsetsSelector() {
+        switch (consumerOffsetMode) {
+            case "earliest":
+                return OffsetsSelector.earliest();
+            case "timestamp":
+                return OffsetsSelector.timestamp(consumerOffsetTimestamp);
+            case "committed":
+                return OffsetsSelector.committedOffsets();
+            case "latest":
+            default:
+                return OffsetsSelector.latest();
+        }
+    }
+
+    private OffsetsSelector createStoppingOffsetsSelector() {
+        if (isBounded()) {
+            return OffsetsSelector.timestamp(stopInMs);
+        }
+        return new OffsetsSelectorNoStopping();
+    }
+
     private KeyValueDeserializationSchema<RowData> createKeyValueDeserializationSchema() {
         return new RowKeyValueDeserializationSchema.Builder()
                 .setProperties(properties.asMap())
diff --git a/src/test/java/org/apache/flink/connector/rocketmq/catalog/RocketMQCatalogFactoryTest.java b/flink-connector-rocketmq/src/test/java/org/apache/flink/connector/rocketmq/catalog/RocketMQCatalogFactoryTest.java
similarity index 100%
rename from src/test/java/org/apache/flink/connector/rocketmq/catalog/RocketMQCatalogFactoryTest.java
rename to flink-connector-rocketmq/src/test/java/org/apache/flink/connector/rocketmq/catalog/RocketMQCatalogFactoryTest.java
diff --git a/src/test/java/org/apache/flink/connector/rocketmq/catalog/RocketMQCatalogTest.java b/flink-connector-rocketmq/src/test/java/org/apache/flink/connector/rocketmq/catalog/RocketMQCatalogTest.java
similarity index 70%
rename from src/test/java/org/apache/flink/connector/rocketmq/catalog/RocketMQCatalogTest.java
rename to flink-connector-rocketmq/src/test/java/org/apache/flink/connector/rocketmq/catalog/RocketMQCatalogTest.java
index 767822d..e8f2c1f 100644
--- a/src/test/java/org/apache/flink/connector/rocketmq/catalog/RocketMQCatalogTest.java
+++ b/flink-connector-rocketmq/src/test/java/org/apache/flink/connector/rocketmq/catalog/RocketMQCatalogTest.java
@@ -45,12 +45,11 @@ import org.apache.rocketmq.schema.registry.client.SchemaRegistryClient;
 import org.apache.rocketmq.schema.registry.common.dto.GetSchemaResponse;
 import org.apache.rocketmq.schema.registry.common.model.SchemaType;
 import org.apache.rocketmq.tools.admin.DefaultMQAdminExt;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.mockito.Mock;
 import org.mockito.Mockito;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.MockitoAnnotations;
 
 import java.lang.reflect.Field;
 import java.util.ArrayList;
@@ -58,25 +57,26 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Optional;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
-@RunWith(MockitoJUnitRunner.class)
 public class RocketMQCatalogTest {
     @Mock private SchemaRegistryClient schemaRegistryClient;
     @Mock private DefaultMQAdminExt mqAdminExt;
     @Mock private GetSchemaResponse getSchemaResponse;
     private RocketMQCatalog rocketMQCatalog;
 
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
+        MockitoAnnotations.openMocks(this);
         rocketMQCatalog =
                 new RocketMQCatalog(
                         "rocketmq_catalog",
                         "default",
-                        "http://localhost:9876",
+                        "http://127.0.0.1:9876",
                         SchemaRegistryConstant.SCHEMA_REGISTRY_BASE_URL);
 
         Field schemaRegistryClientField =
@@ -93,7 +93,7 @@ public class RocketMQCatalogTest {
         Mockito.when(schemaRegistryClient.getSubjectsByTenant("default", "default"))
                 .thenReturn(list);
 
-        Mockito.when(mqAdminExt.getNamesrvAddr()).thenReturn("localhost:9876");
+        Mockito.when(mqAdminExt.getNamesrvAddr()).thenReturn("127.0.0.1:9876");
         Mockito.when(schemaRegistryClient.getSchemaBySubject("test")).thenReturn(getSchemaResponse);
         Mockito.when(getSchemaResponse.getType()).thenReturn(SchemaType.AVRO);
         Mockito.when(getSchemaResponse.getIdl())
@@ -170,14 +170,18 @@ public class RocketMQCatalogTest {
         assertTrue(exists);
     }
 
-    @Test(expected = UnsupportedOperationException.class)
-    public void testCreateDatabase() throws DatabaseAlreadyExistException {
-        rocketMQCatalog.createDatabase("test", null, false);
+    @Test
+    public void testCreateDatabase() {
+        assertThrows(
+                UnsupportedOperationException.class,
+                () -> rocketMQCatalog.createDatabase("test", null, false));
     }
 
-    @Test(expected = UnsupportedOperationException.class)
-    public void testDropDatabase() throws DatabaseNotEmptyException, DatabaseNotExistException {
-        rocketMQCatalog.dropDatabase("test", false, false);
+    @Test
+    public void testDropDatabase() {
+        assertThrows(
+                UnsupportedOperationException.class,
+                () -> rocketMQCatalog.dropDatabase("test", false, false));
     }
 
     @Test
@@ -201,66 +205,91 @@ public class RocketMQCatalogTest {
         assertTrue(exists);
     }
 
-    @Test(expected = UnsupportedOperationException.class)
-    public void testCreateTable() throws TableAlreadyExistException, DatabaseNotExistException {
-        rocketMQCatalog.createTable(null, null, false);
+    @Test
+    public void testCreateTable() {
+        assertThrows(
+                UnsupportedOperationException.class,
+                () -> rocketMQCatalog.createTable(null, null, false));
     }
 
-    @Test(expected = UnsupportedOperationException.class)
-    public void testDropTable() throws TableNotExistException {
-        rocketMQCatalog.dropTable(null, false);
+    @Test
+    public void testDropTable() {
+        assertThrows(
+                UnsupportedOperationException.class,
+                () -> rocketMQCatalog.dropTable(null, false));
     }
 
-    @Test(expected = UnsupportedOperationException.class)
-    public void testListFunctions() throws DatabaseNotExistException {
-        rocketMQCatalog.listFunctions("default");
+    @Test
+    public void testListFunctions() {
+        assertThrows(
+                UnsupportedOperationException.class,
+                () -> rocketMQCatalog.listFunctions("default"));
     }
 
-    @Test(expected = FunctionNotExistException.class)
-    public void testGetFunction() throws FunctionNotExistException {
-        ObjectPath objectPath = new ObjectPath("default", "test");
-        rocketMQCatalog.getFunction(objectPath);
+    @Test
+    public void testGetFunction() {
+        assertThrows(
+                FunctionNotExistException.class,
+                () -> {
+                    ObjectPath objectPath = new ObjectPath("default", "test");
+                    rocketMQCatalog.getFunction(objectPath);
+                });
     }
 
-    @Test(expected = UnsupportedOperationException.class)
+    @Test
     public void testFunctionExists() {
-        boolean exists = rocketMQCatalog.functionExists(null);
+        assertThrows(
+                UnsupportedOperationException.class,
+                () -> rocketMQCatalog.functionExists(null));
     }
 
-    @Test(expected = UnsupportedOperationException.class)
-    public void testCreateFunction()
-            throws FunctionAlreadyExistException, DatabaseNotExistException {
-        rocketMQCatalog.createFunction(null, null, false);
+    @Test
+    public void testCreateFunction() {
+        assertThrows(
+                UnsupportedOperationException.class,
+                () -> rocketMQCatalog.createFunction(null, null, false));
     }
 
-    @Test(expected = UnsupportedOperationException.class)
-    public void testAlterFunction() throws FunctionNotExistException {
-        rocketMQCatalog.alterFunction(null, null, false);
+    @Test
+    public void testAlterFunction() {
+        assertThrows(
+                UnsupportedOperationException.class,
+                () -> rocketMQCatalog.alterFunction(null, null, false));
     }
 
-    @Test(expected = UnsupportedOperationException.class)
-    public void testDropFunction() throws FunctionNotExistException {
-        rocketMQCatalog.dropFunction(null, false);
+    @Test
+    public void testDropFunction() {
+        assertThrows(
+                UnsupportedOperationException.class,
+                () -> rocketMQCatalog.dropFunction(null, false));
     }
 
-    @Test(expected = UnsupportedOperationException.class)
-    public void testAlterDatabase() throws DatabaseNotExistException {
-        rocketMQCatalog.alterDatabase(null, null, false);
+    @Test
+    public void testAlterDatabase() {
+        assertThrows(
+                UnsupportedOperationException.class,
+                () -> rocketMQCatalog.alterDatabase(null, null, false));
     }
 
-    @Test(expected = UnsupportedOperationException.class)
-    public void testListViews() throws DatabaseNotExistException {
-        rocketMQCatalog.listViews("default");
+    @Test
+    public void testListViews() {
+        assertThrows(
+                UnsupportedOperationException.class,
+                () -> rocketMQCatalog.listViews("default"));
     }
 
-    @Test(expected = UnsupportedOperationException.class)
-    public void testAlterTable() throws TableNotExistException {
-        rocketMQCatalog.alterTable(null, null, false);
+    @Test
+    public void testAlterTable() {
+        assertThrows(
+                UnsupportedOperationException.class,
+                () -> rocketMQCatalog.alterTable(null, null, false));
     }
 
-    @Test(expected = UnsupportedOperationException.class)
-    public void testRenameTable() throws TableAlreadyExistException, TableNotExistException {
-        rocketMQCatalog.renameTable(null, null, false);
+    @Test
+    public void testRenameTable() {
+        assertThrows(
+                UnsupportedOperationException.class,
+                () -> rocketMQCatalog.renameTable(null, null, false));
     }
 
     @Test
@@ -290,10 +319,11 @@ public class RocketMQCatalogTest {
                 catalogPartitionSpecs);
     }
 
-    @Test(expected = UnsupportedOperationException.class)
-    public void testListPartitionsByFilter()
-            throws TableNotPartitionedException, TableNotExistException {
-        rocketMQCatalog.listPartitionsByFilter(null, null);
+    @Test
+    public void testListPartitionsByFilter() {
+        assertThrows(
+                UnsupportedOperationException.class,
+                () -> rocketMQCatalog.listPartitionsByFilter(null, null));
     }
 
     @Test
@@ -333,21 +363,25 @@ public class RocketMQCatalogTest {
         assertNotNull(test);
     }
 
-    @Test(expected = UnsupportedOperationException.class)
-    public void testCreatePartition()
-            throws TableNotPartitionedException, TableNotExistException,
-                    PartitionSpecInvalidException, PartitionAlreadyExistsException {
-        rocketMQCatalog.createPartition(null, null, null, false);
+    @Test
+    public void testCreatePartition() {
+        assertThrows(
+                UnsupportedOperationException.class,
+                () -> rocketMQCatalog.createPartition(null, null, null, false));
     }
 
-    @Test(expected = UnsupportedOperationException.class)
-    public void testDropPartition() throws PartitionNotExistException {
-        rocketMQCatalog.dropPartition(null, null, false);
+    @Test
+    public void testDropPartition() {
+        assertThrows(
+                UnsupportedOperationException.class,
+                () -> rocketMQCatalog.dropPartition(null, null, false));
     }
 
-    @Test(expected = UnsupportedOperationException.class)
-    public void testAlterPartition() throws PartitionNotExistException {
-        rocketMQCatalog.alterPartition(null, null, null, false);
+    @Test
+    public void testAlterPartition() {
+        assertThrows(
+                UnsupportedOperationException.class,
+                () -> rocketMQCatalog.alterPartition(null, null, null, false));
     }
 
     @Test
@@ -375,23 +409,31 @@ public class RocketMQCatalogTest {
         assertEquals(statistics, CatalogColumnStatistics.UNKNOWN);
     }
 
-    @Test(expected = UnsupportedOperationException.class)
-    public void testAlterTableStatistics() throws TableNotExistException {
-        rocketMQCatalog.alterTableStatistics(null, null, false);
+    @Test
+    public void testAlterTableStatistics() {
+        assertThrows(
+                UnsupportedOperationException.class,
+                () -> rocketMQCatalog.alterTableStatistics(null, null, false));
     }
 
-    @Test(expected = UnsupportedOperationException.class)
-    public void testAlterTableColumnStatistics() throws TableNotExistException {
-        rocketMQCatalog.alterTableColumnStatistics(null, null, false);
+    @Test
+    public void testAlterTableColumnStatistics() {
+        assertThrows(
+                UnsupportedOperationException.class,
+                () -> rocketMQCatalog.alterTableColumnStatistics(null, null, false));
     }
 
-    @Test(expected = UnsupportedOperationException.class)
-    public void testAlterPartitionStatistics() throws PartitionNotExistException {
-        rocketMQCatalog.alterPartitionStatistics(null, null, null, false);
+    @Test
+    public void testAlterPartitionStatistics() {
+        assertThrows(
+                UnsupportedOperationException.class,
+                () -> rocketMQCatalog.alterPartitionStatistics(null, null, null, false));
     }
 
-    @Test(expected = UnsupportedOperationException.class)
-    public void testAlterPartitionColumnStatistics() throws PartitionNotExistException {
-        rocketMQCatalog.alterPartitionColumnStatistics(null, null, null, false);
+    @Test
+    public void testAlterPartitionColumnStatistics() {
+        assertThrows(
+                UnsupportedOperationException.class,
+                () -> rocketMQCatalog.alterPartitionColumnStatistics(null, null, null, false));
     }
 }
diff --git a/src/test/java/org/apache/flink/connector/rocketmq/common/config/RocketMQConfigBuilderTest.java b/flink-connector-rocketmq/src/test/java/org/apache/flink/connector/rocketmq/common/config/RocketMQConfigBuilderTest.java
similarity index 100%
rename from src/test/java/org/apache/flink/connector/rocketmq/common/config/RocketMQConfigBuilderTest.java
rename to flink-connector-rocketmq/src/test/java/org/apache/flink/connector/rocketmq/common/config/RocketMQConfigBuilderTest.java
diff --git a/src/test/java/org/apache/flink/connector/rocketmq/example/ConnectorConfig.java b/flink-connector-rocketmq/src/test/java/org/apache/flink/connector/rocketmq/example/ConnectorConfig.java
similarity index 88%
rename from src/test/java/org/apache/flink/connector/rocketmq/example/ConnectorConfig.java
rename to flink-connector-rocketmq/src/test/java/org/apache/flink/connector/rocketmq/example/ConnectorConfig.java
index 111c220..06c34f4 100644
--- a/src/test/java/org/apache/flink/connector/rocketmq/example/ConnectorConfig.java
+++ b/flink-connector-rocketmq/src/test/java/org/apache/flink/connector/rocketmq/example/ConnectorConfig.java
@@ -24,7 +24,7 @@ import org.apache.rocketmq.remoting.RPCHook;
 public class ConnectorConfig {
 
     // for rocketmq cluster
-    public static final String ENDPOINTS = "127.0.0.1:9876";
+    public static final String ENDPOINTS = System.getenv("ROCKETMQ_NAMESRV_ADDR");
     public static final String CLUSTER_NAME = "flink-cluster";
 
     // for admin
@@ -44,8 +44,8 @@ public class ConnectorConfig {
     public static final int MESSAGE_NUM = 100;
 
     // for authentication
-    public static final String ACCESS_KEY = "accessKey";
-    public static final String SECRET_KEY = "secretKey";
+    public static final String ACCESS_KEY = System.getenv("ROCKETMQ_ACCESS_KEY");
+    public static final String SECRET_KEY = System.getenv("ROCKETMQ_SECRET_KEY");
 
     public static RPCHook getAclRpcHook() {
         return new AclClientRPCHook(new SessionCredentials(ACCESS_KEY, SECRET_KEY));
diff --git a/flink-connector-rocketmq/src/test/java/org/apache/flink/connector/rocketmq/example/ConnectorIntegrationTest.java b/flink-connector-rocketmq/src/test/java/org/apache/flink/connector/rocketmq/example/ConnectorIntegrationTest.java
new file mode 100644
index 0000000..27c4f3a
--- /dev/null
+++ b/flink-connector-rocketmq/src/test/java/org/apache/flink/connector/rocketmq/example/ConnectorIntegrationTest.java
@@ -0,0 +1,291 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.flink.connector.rocketmq.example;
+
+import org.apache.flink.api.common.eventtime.WatermarkStrategy;
+import org.apache.flink.api.common.typeinfo.BasicTypeInfo;
+import org.apache.flink.api.common.typeinfo.TypeInformation;
+import org.apache.flink.connector.base.DeliveryGuarantee;
+import org.apache.flink.connector.rocketmq.common.config.RocketMQOptions;
+import org.apache.flink.connector.rocketmq.sink.RocketMQSink;
+import org.apache.flink.connector.rocketmq.source.RocketMQSource;
+import org.apache.flink.connector.rocketmq.source.enumerator.offset.OffsetsSelector;
+import org.apache.flink.connector.rocketmq.source.reader.MessageView;
+import org.apache.flink.connector.rocketmq.source.reader.deserializer.RocketMQDeserializationSchema;
+import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment;
+import org.apache.flink.util.Collector;
+
+import org.apache.rocketmq.client.AccessChannel;
+import org.apache.rocketmq.client.consumer.DefaultLitePullConsumer;
+import org.apache.rocketmq.client.producer.DefaultMQProducer;
+import org.apache.rocketmq.client.producer.SendResult;
+import org.apache.rocketmq.common.message.Message;
+import org.apache.rocketmq.common.message.MessageExt;
+import org.apache.rocketmq.common.message.MessageQueue;
+import org.junit.Assume;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static org.apache.flink.connector.rocketmq.example.ConnectorConfig.ACCESS_KEY;
+import static org.apache.flink.connector.rocketmq.example.ConnectorConfig.CONSUMER_GROUP;
+import static org.apache.flink.connector.rocketmq.example.ConnectorConfig.ENDPOINTS;
+import static org.apache.flink.connector.rocketmq.example.ConnectorConfig.PRODUCER_GROUP;
+import static org.apache.flink.connector.rocketmq.example.ConnectorConfig.SECRET_KEY;
+import static org.apache.flink.connector.rocketmq.example.ConnectorConfig.SINK_TOPIC_1;
+import static org.apache.flink.connector.rocketmq.example.ConnectorConfig.SOURCE_TOPIC_1;
+import static org.apache.flink.connector.rocketmq.example.ConnectorConfig.TAGS;
+import static org.apache.flink.connector.rocketmq.example.ConnectorConfig.getAclRpcHook;
+import static org.junit.Assert.assertTrue;
+
+/**
+ * Integration test for the FLIP-27 Source and Sink APIs against a real RocketMQ instance.
+ *
+ * <p>Test flow:
+ *
+ * <ol>
+ *   <li>Start the Flink pipeline (Source → Sink) in a daemon thread
+ *   <li>Produce messages to the source topic — Source receives and forwards to Sink
+ *   <li>Stop the Flink job after messages flow through
+ *   <li>Verify messages arrived in the sink topic
+ * </ol>
+ *
+ * <p>Skipped automatically when environment variables are not set.
+ */
+public class ConnectorIntegrationTest {
+
+    private static final int MESSAGE_COUNT = 20;
+    private static final String MESSAGE_PREFIX = "integration-test-";
+
+    @Before
+    public void checkEnv() {
+        Assume.assumeTrue("Skipping: ROCKETMQ_NAMESRV_ADDR not set", ENDPOINTS != null);
+        Assume.assumeTrue("Skipping: ROCKETMQ_ACCESS_KEY not set", ACCESS_KEY != null);
+        Assume.assumeTrue("Skipping: ROCKETMQ_SECRET_KEY not set", SECRET_KEY != null);
+    }
+
+    @Test
+    public void sourceToSinkPipelineTest() throws Exception {
+        System.out.println("=== RocketMQ Flink Connector Integration Test ===");
+        System.out.println("Endpoints  : " + ENDPOINTS);
+        System.out.println("Source topic: " + SOURCE_TOPIC_1);
+        System.out.println("Sink topic  : " + SINK_TOPIC_1);
+        System.out.println("Messages    : " + MESSAGE_COUNT);
+        System.out.println();
+
+        // Step 1: Start Flink pipeline in a daemon thread
+        Thread jobThread = startFlinkPipeline();
+
+        // Give the Source time to initialize and start waiting for messages
+        System.out.println("[Wait] Giving Source 15s to initialize...");
+        Thread.sleep(15_000);
+
+        // Step 2: Produce messages — Source receives them and forwards to Sink
+        produceMessages();
+
+        // Give messages time to flow through the pipeline
+        System.out.println("[Wait] Giving pipeline 15s to process messages...");
+        Thread.sleep(15_000);
+
+        // Step 3: Stop the Flink job
+        System.out.println("[Step 3] Stopping Flink job...");
+        jobThread.interrupt();
+        jobThread.join(10_000);
+        System.out.println("[Step 3] Job stopped");
+
+        // Step 4: Verify messages arrived in sink topic
+        verifySinkMessages();
+
+        System.out.println("\n=== Integration Test PASSED ===");
+    }
+
+    // ---- Step 1: Start Flink Source → Sink pipeline ----
+
+    private Thread startFlinkPipeline() throws Exception {
+        System.out.println("[Step 1] Starting Flink pipeline: "
+                + SOURCE_TOPIC_1 + " → " + SINK_TOPIC_1);
+
+        StreamExecutionEnvironment env = StreamExecutionEnvironment.createLocalEnvironment(1);
+
+        // Build FLIP-27 Source (unbounded — receives messages as they arrive).
+        // Start from the latest offsets: the pipeline starts before messages are produced,
+        // and seeking to a fixed offset fails when the topic already holds data.
+        RocketMQSource<String> source =
+                RocketMQSource.<String>builder()
+                        .setEndpoints(ENDPOINTS)
+                        .setGroupId(CONSUMER_GROUP)
+                        .setTopics(SOURCE_TOPIC_1)
+                        .setMinOffsets(OffsetsSelector.latest())
+                        .setConfig(RocketMQOptions.OPTIONAL_ACCESS_KEY, ACCESS_KEY)
+                        .setConfig(RocketMQOptions.OPTIONAL_SECRET_KEY, SECRET_KEY)
+                        .setConfig(
+                                RocketMQOptions.OPTIONAL_ACCESS_CHANNEL, AccessChannel.CLOUD)
+                        .setDeserializer(new StringBodyDeserializationSchema())
+                        .build();
+
+        // Build FLIP-27 Sink
+        RocketMQSink<String> sink =
+                RocketMQSink.<String>builder()
+                        .setEndpoints(ENDPOINTS)
+                        .setGroupId(PRODUCER_GROUP)
+                        .setConfig(RocketMQOptions.OPTIONAL_ACCESS_KEY, ACCESS_KEY)
+                        .setConfig(RocketMQOptions.OPTIONAL_SECRET_KEY, SECRET_KEY)
+                        .setConfig(
+                                RocketMQOptions.OPTIONAL_ACCESS_CHANNEL, AccessChannel.CLOUD)
+                        .setDeliveryGuarantee(DeliveryGuarantee.AT_LEAST_ONCE)
+                        .setSerializer(
+                                (element, context, timestamp) ->
+                                        new Message(SINK_TOPIC_1, TAGS, element.getBytes()))
+                        .build();
+
+        // Source → Sink pipeline
+        env.fromSource(source, WatermarkStrategy.noWatermarks(), "rocketmq-source")
+                .setParallelism(1)
+                .sinkTo(sink)
+                .setParallelism(1);
+
+        // env.execute() blocks, so run in a daemon thread
+        Thread jobThread =
+                new Thread(
+                        () -> {
+                            try {
+                                env.execute("integration-test-pipeline");
+                            } catch (Exception e) {
+                                System.out.println("[Flink] Job ended: " + e.getMessage());
+                                e.printStackTrace(System.out);
+                            }
+                        },
+                        "flink-job-thread");
+        jobThread.setDaemon(true);
+        jobThread.start();
+
+        // Wait for the MiniCluster to start
+        Thread.sleep(5000);
+        System.out.println("[Step 1] Flink job started\n");
+
+        return jobThread;
+    }
+
+    // ---- Step 2: Produce messages via raw RocketMQ client ----
+
+    private void produceMessages() throws Exception {
+        System.out.println(
+                "[Step 2] Producing " + MESSAGE_COUNT + " messages to " + SOURCE_TOPIC_1);
+
+        DefaultMQProducer producer =
+                new DefaultMQProducer(PRODUCER_GROUP, getAclRpcHook(), true, null);
+        producer.setNamesrvAddr(ENDPOINTS);
+        producer.setAccessChannel(AccessChannel.CLOUD);
+        producer.start();
+
+        int successCount = 0;
+        try {
+            for (int i = 0; i < MESSAGE_COUNT; i++) {
+                String body = MESSAGE_PREFIX + i;
+                Message msg = new Message(SOURCE_TOPIC_1, TAGS, "key_" + i, body.getBytes());
+                SendResult result = producer.send(msg, 5000);
+                System.out.printf(
+                        "  Sent: msgId=%s, queue=%s-%d%n",
+                        result.getMsgId(),
+                        result.getMessageQueue().getBrokerName(),
+                        result.getMessageQueue().getQueueId());
+                successCount++;
+            }
+        } finally {
+            producer.shutdown();
+        }
+
+        System.out.printf(
+                "[Step 2] Done: %d/%d messages sent%n%n", successCount, MESSAGE_COUNT);
+        if (successCount < MESSAGE_COUNT) {
+            throw new RuntimeException(
+                    "Failed to produce all messages: " + successCount + "/" + MESSAGE_COUNT);
+        }
+    }
+
+    // ---- Step 4: Verify messages arrived in sink topic ----
+
+    private void verifySinkMessages() throws Exception {
+        System.out.println("[Step 4] Verifying messages in " + SINK_TOPIC_1);
+
+        DefaultLitePullConsumer consumer =
+                new DefaultLitePullConsumer(CONSUMER_GROUP, getAclRpcHook());
+        consumer.setNamesrvAddr(ENDPOINTS);
+        consumer.setAccessChannel(AccessChannel.CLOUD);
+        consumer.setAutoCommit(false);
+        consumer.setVipChannelEnabled(false);
+        consumer.start();
+
+        List<String> receivedMessages = new ArrayList<>();
+        try {
+            Collection<MessageQueue> queues = consumer.fetchMessageQueues(SINK_TOPIC_1);
+            System.out.println("  Found " + queues.size() + " queues for " + SINK_TOPIC_1);
+            consumer.assign(queues);
+            for (MessageQueue mq : queues) {
+                consumer.seekToBegin(mq);
+            }
+
+            long deadline = System.currentTimeMillis() + 30_000;
+            while (System.currentTimeMillis() < deadline
+                    && receivedMessages.size() < MESSAGE_COUNT) {
+                List<MessageExt> batch = consumer.poll(3000);
+                for (MessageExt msg : batch) {
+                    String body = new String(msg.getBody());
+                    if (body.startsWith(MESSAGE_PREFIX)) {
+                        receivedMessages.add(body);
+                    }
+                }
+            }
+        } finally {
+            consumer.shutdown();
+        }
+
+        System.out.printf(
+                "[Step 4] Verified: %d/%d messages received in sink topic%n",
+                receivedMessages.size(), MESSAGE_COUNT);
+
+        assertTrue(
+                "Expected at least " + MESSAGE_COUNT + " messages in sink, got "
+                        + receivedMessages.size(),
+                receivedMessages.size() >= MESSAGE_COUNT);
+    }
+
+    // ---- Inner classes ----
+
+    /** Deserializes the message body as a UTF-8 string. */
+    private static class StringBodyDeserializationSchema
+            implements RocketMQDeserializationSchema<String> {
+
+        private static final long serialVersionUID = 1L;
+
+        @Override
+        public void deserialize(MessageView messageView, Collector<String> out) {
+            out.collect(new String(messageView.getBody()));
+        }
+
+        @Override
+        public TypeInformation<String> getProducedType() {
+            return BasicTypeInfo.STRING_TYPE_INFO;
+        }
+    }
+}
diff --git a/src/test/java/org/apache/flink/connector/rocketmq/example/SimpleAdmin.java b/flink-connector-rocketmq/src/test/java/org/apache/flink/connector/rocketmq/example/SimpleAdmin.java
similarity index 100%
rename from src/test/java/org/apache/flink/connector/rocketmq/example/SimpleAdmin.java
rename to flink-connector-rocketmq/src/test/java/org/apache/flink/connector/rocketmq/example/SimpleAdmin.java
diff --git a/src/test/java/org/apache/flink/connector/rocketmq/example/SimpleConsumer.java b/flink-connector-rocketmq/src/test/java/org/apache/flink/connector/rocketmq/example/SimpleConsumer.java
similarity index 93%
rename from src/test/java/org/apache/flink/connector/rocketmq/example/SimpleConsumer.java
rename to flink-connector-rocketmq/src/test/java/org/apache/flink/connector/rocketmq/example/SimpleConsumer.java
index 85238fd..892f108 100644
--- a/src/test/java/org/apache/flink/connector/rocketmq/example/SimpleConsumer.java
+++ b/flink-connector-rocketmq/src/test/java/org/apache/flink/connector/rocketmq/example/SimpleConsumer.java
@@ -17,7 +17,6 @@
 
 package org.apache.flink.connector.rocketmq.example;
 
-import org.apache.rocketmq.client.AccessChannel;
 import org.apache.rocketmq.client.consumer.DefaultMQPushConsumer;
 import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyStatus;
 import org.apache.rocketmq.client.consumer.listener.MessageListenerConcurrently;
@@ -36,6 +35,9 @@ public class SimpleConsumer {
 
     public static void main(String[] args) throws MQClientException {
 
+        System.out.println("ENDPOINTS: " + ENDPOINTS);
+        System.out.println("CONSUMER_GROUP: " + ConnectorConfig.CONSUMER_GROUP);
+
         DefaultMQPushConsumer consumer =
                 new DefaultMQPushConsumer(
                         ConnectorConfig.CONSUMER_GROUP,
@@ -43,7 +45,6 @@ public class SimpleConsumer {
                         new AllocateMessageQueueAveragely());
 
         consumer.setNamesrvAddr(ENDPOINTS);
-        consumer.setAccessChannel(AccessChannel.CLOUD);
         consumer.subscribe(SOURCE_TOPIC_1, TAGS);
         consumer.subscribe(SOURCE_TOPIC_2, TAGS);
         consumer.setConsumeFromWhere(ConsumeFromWhere.CONSUME_FROM_FIRST_OFFSET);
@@ -62,5 +63,6 @@ public class SimpleConsumer {
                             return ConsumeConcurrentlyStatus.CONSUME_SUCCESS;
                         });
         consumer.start();
+        System.out.println("Consumer started, waiting for messages...");
     }
 }
diff --git a/src/test/java/org/apache/flink/connector/rocketmq/example/SimpleProducer.java b/flink-connector-rocketmq/src/test/java/org/apache/flink/connector/rocketmq/example/SimpleProducer.java
similarity index 85%
rename from src/test/java/org/apache/flink/connector/rocketmq/example/SimpleProducer.java
rename to flink-connector-rocketmq/src/test/java/org/apache/flink/connector/rocketmq/example/SimpleProducer.java
index ac47bdb..9f6dec6 100644
--- a/src/test/java/org/apache/flink/connector/rocketmq/example/SimpleProducer.java
+++ b/flink-connector-rocketmq/src/test/java/org/apache/flink/connector/rocketmq/example/SimpleProducer.java
@@ -23,9 +23,8 @@ import org.apache.rocketmq.client.producer.DefaultMQProducer;
 import org.apache.rocketmq.client.producer.MQProducer;
 import org.apache.rocketmq.client.producer.SendResult;
 import org.apache.rocketmq.common.message.Message;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
+import static org.apache.flink.connector.rocketmq.example.ConnectorConfig.ACCESS_KEY;
 import static org.apache.flink.connector.rocketmq.example.ConnectorConfig.ENDPOINTS;
 import static org.apache.flink.connector.rocketmq.example.ConnectorConfig.KEY_PREFIX;
 import static org.apache.flink.connector.rocketmq.example.ConnectorConfig.SOURCE_TOPIC_1;
@@ -35,10 +34,11 @@ import static org.apache.flink.connector.rocketmq.example.ConnectorConfig.getAcl
 
 public class SimpleProducer {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(SimpleProducer.class);
-
     public static void main(String[] args) {
 
+        System.out.println("ENDPOINTS: " + ENDPOINTS);
+        System.out.println("ACCESS_KEY: " + ACCESS_KEY.substring(0, 4) + "****");
+
         DefaultMQProducer producer =
                 new DefaultMQProducer(ConnectorConfig.PRODUCER_GROUP, getAclRpcHook(), true, null);
         producer.setNamesrvAddr(ENDPOINTS);
@@ -46,14 +46,18 @@ public class SimpleProducer {
 
         try {
             producer.start();
+            System.out.println("Producer started successfully");
         } catch (MQClientException e) {
+            System.err.println("Producer start failed: " + e.getMessage());
             e.printStackTrace();
+            return;
         }
 
         send(producer, SOURCE_TOPIC_1);
         send(producer, SOURCE_TOPIC_2);
 
         producer.shutdown();
+        System.out.println("Producer shutdown complete");
     }
 
     private static void send(MQProducer producer, String topic) {
@@ -70,7 +74,7 @@ public class SimpleProducer {
                         sendResult.getMessageQueue().getBrokerName(),
                         sendResult.getMessageQueue().getQueueId());
             } catch (Exception e) {
-                LOGGER.info("Send message failed. {}", e.toString());
+                System.err.println("Send message failed: " + e.getMessage());
             }
         }
     }
diff --git a/flink-connector-rocketmq/src/test/java/org/apache/flink/connector/rocketmq/example/SqlIntegrationTest.java b/flink-connector-rocketmq/src/test/java/org/apache/flink/connector/rocketmq/example/SqlIntegrationTest.java
new file mode 100644
index 0000000..9d78fe6
--- /dev/null
+++ b/flink-connector-rocketmq/src/test/java/org/apache/flink/connector/rocketmq/example/SqlIntegrationTest.java
@@ -0,0 +1,185 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.flink.connector.rocketmq.example;
+
+import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment;
+import org.apache.flink.table.api.TableResult;
+import org.apache.flink.table.api.bridge.java.StreamTableEnvironment;
+
+import org.apache.rocketmq.client.AccessChannel;
+import org.apache.rocketmq.client.consumer.DefaultLitePullConsumer;
+import org.apache.rocketmq.client.producer.DefaultMQProducer;
+import org.apache.rocketmq.common.message.Message;
+import org.apache.rocketmq.common.message.MessageExt;
+import org.apache.rocketmq.common.message.MessageQueue;
+import org.junit.Assume;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import static org.apache.flink.connector.rocketmq.example.ConnectorConfig.ACCESS_KEY;
+import static org.apache.flink.connector.rocketmq.example.ConnectorConfig.CONSUMER_GROUP;
+import static org.apache.flink.connector.rocketmq.example.ConnectorConfig.ENDPOINTS;
+import static org.apache.flink.connector.rocketmq.example.ConnectorConfig.PRODUCER_GROUP;
+import static org.apache.flink.connector.rocketmq.example.ConnectorConfig.SECRET_KEY;
+import static org.apache.flink.connector.rocketmq.example.ConnectorConfig.SINK_TOPIC_2;
+import static org.apache.flink.connector.rocketmq.example.ConnectorConfig.SOURCE_TOPIC_2;
+import static org.apache.flink.connector.rocketmq.example.ConnectorConfig.getAclRpcHook;
+import static org.junit.Assert.assertTrue;
+
+/**
+ * SQL DDL end-to-end integration test against a real RocketMQ instance.
+ *
+ * <p>Pipeline: raw producer → {@code flink-source-2} → SQL source table → INSERT INTO SQL sink
+ * table → {@code flink-sink-2} → raw consumer verification.
+ *
+ * <p>Skipped automatically when environment variables are not set.
+ */
+public class SqlIntegrationTest {
+
+    private static final int MESSAGE_COUNT = 10;
+    private static final String MESSAGE_PREFIX = "sql-test-" + System.currentTimeMillis() + "-";
+
+    @Before
+    public void checkEnv() {
+        Assume.assumeTrue("Skipping: ROCKETMQ_NAMESRV_ADDR not set", ENDPOINTS != null);
+        Assume.assumeTrue("Skipping: ROCKETMQ_ACCESS_KEY not set", ACCESS_KEY != null);
+        Assume.assumeTrue("Skipping: ROCKETMQ_SECRET_KEY not set", SECRET_KEY != null);
+    }
+
+    @Test
+    public void sqlSourceToSinkTest() throws Exception {
+        System.out.println("=== RocketMQ SQL DDL Integration Test ===");
+        System.out.println("Source topic: " + SOURCE_TOPIC_2);
+        System.out.println("Sink topic  : " + SINK_TOPIC_2);
+
+        StreamExecutionEnvironment env = StreamExecutionEnvironment.createLocalEnvironment(1);
+        StreamTableEnvironment tEnv = StreamTableEnvironment.create(env);
+
+        tEnv.executeSql(
+                "CREATE TABLE rmq_source (msg STRING) WITH ("
+                        + "'connector' = 'rocketmq',"
+                        + ("'rocketmq.client.endpoints' = '" + ENDPOINTS + "',")
+                        + ("'rocketmq.source.topic' = '" + SOURCE_TOPIC_2 + "',")
+                        + ("'rocketmq.source.group' = '" + CONSUMER_GROUP + "',")
+                        + ("'rocketmq.client.accessKey' = '" + ACCESS_KEY + "',")
+                        + ("'rocketmq.client.secretKey' = '" + SECRET_KEY + "',")
+                        + "'rocketmq.source.startup.scan.mode' = 'latest'"
+                        + ")");
+
+        tEnv.executeSql(
+                "CREATE TABLE rmq_sink (msg STRING) WITH ("
+                        + "'connector' = 'rocketmq',"
+                        + ("'rocketmq.client.endpoints' = '" + ENDPOINTS + "',")
+                        + ("'rocketmq.sink.topic' = '" + SINK_TOPIC_2 + "',")
+                        + ("'rocketmq.sink.group' = '" + PRODUCER_GROUP + "',")
+                        + ("'rocketmq.client.accessKey' = '" + ACCESS_KEY + "',")
+                        + ("'rocketmq.client.secretKey' = '" + SECRET_KEY + "'")
+                        + ")");
+
+        System.out.println("[Step 1] Submitting INSERT INTO job...");
+        TableResult result = tEnv.executeSql("INSERT INTO rmq_sink SELECT msg FROM rmq_source");
+
+        System.out.println("[Wait] Giving SQL source 15s to initialize...");
+        Thread.sleep(15_000);
+
+        produceMessages();
+
+        System.out.println("[Wait] Giving pipeline 20s to process...");
+        Thread.sleep(20_000);
+
+        result.getJobClient()
+                .ifPresent(
+                        client -> {
+                            try {
+                                client.cancel().get(10, java.util.concurrent.TimeUnit.SECONDS);
+                            } catch (Exception e) {
+                                System.out.println(
+                                        "[Flink] Job not cancellable, checking failure cause...");
+                                try {
+                                    client.getJobExecutionResult()
+                                            .get(5, java.util.concurrent.TimeUnit.SECONDS);
+                                } catch (Exception cause) {
+                                    cause.printStackTrace(System.out);
+                                }
+                            }
+                        });
+
+        verifySinkMessages();
+        System.out.println("\n=== SQL DDL Integration Test PASSED ===");
+    }
+
+    private void produceMessages() throws Exception {
+        System.out.println("[Step 2] Producing " + MESSAGE_COUNT + " messages to " + SOURCE_TOPIC_2);
+        DefaultMQProducer producer =
+                new DefaultMQProducer(PRODUCER_GROUP, getAclRpcHook(), true, null);
+        producer.setNamesrvAddr(ENDPOINTS);
+        producer.setAccessChannel(AccessChannel.CLOUD);
+        producer.start();
+        try {
+            for (int i = 0; i < MESSAGE_COUNT; i++) {
+                producer.send(
+                        new Message(SOURCE_TOPIC_2, "*", (MESSAGE_PREFIX + i).getBytes()), 5000);
+            }
+        } finally {
+            producer.shutdown();
+        }
+        System.out.println("[Step 2] Done");
+    }
+
+    private void verifySinkMessages() throws Exception {
+        System.out.println("[Step 3] Verifying messages in " + SINK_TOPIC_2);
+        DefaultLitePullConsumer consumer =
+                new DefaultLitePullConsumer(CONSUMER_GROUP, getAclRpcHook());
+        consumer.setNamesrvAddr(ENDPOINTS);
+        consumer.setAccessChannel(AccessChannel.CLOUD);
+        consumer.setAutoCommit(false);
+        consumer.setVipChannelEnabled(false);
+        consumer.start();
+
+        List<String> received = new ArrayList<>();
+        try {
+            Collection<MessageQueue> queues = consumer.fetchMessageQueues(SINK_TOPIC_2);
+            consumer.assign(queues);
+            for (MessageQueue mq : queues) {
+                consumer.seek(mq, Math.max(0, consumer.offsetForTimestamp(mq, 0L)));
+            }
+            long deadline = System.currentTimeMillis() + 30_000;
+            while (System.currentTimeMillis() < deadline && received.size() < MESSAGE_COUNT) {
+                List<MessageExt> batch = consumer.poll(3000);
+                for (MessageExt msg : batch) {
+                    String body = new String(msg.getBody());
+                    if (body.contains(MESSAGE_PREFIX)) {
+                        received.add(body);
+                    }
+                }
+            }
+        } finally {
+            consumer.shutdown();
+        }
+        System.out.printf(
+                "[Step 3] Verified: %d/%d messages received in sink topic%n",
+                received.size(), MESSAGE_COUNT);
+        assertTrue(
+                "Expected " + MESSAGE_COUNT + " messages in sink, got " + received.size(),
+                received.size() >= MESSAGE_COUNT);
+    }
+}
diff --git a/flink-connector-rocketmq/src/test/java/org/apache/flink/connector/rocketmq/example/TransactionSinkIntegrationTest.java b/flink-connector-rocketmq/src/test/java/org/apache/flink/connector/rocketmq/example/TransactionSinkIntegrationTest.java
new file mode 100644
index 0000000..7bbd015
--- /dev/null
+++ b/flink-connector-rocketmq/src/test/java/org/apache/flink/connector/rocketmq/example/TransactionSinkIntegrationTest.java
@@ -0,0 +1,154 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.flink.connector.rocketmq.example;
+
+import org.apache.flink.connector.base.DeliveryGuarantee;
+import org.apache.flink.connector.rocketmq.common.config.RocketMQOptions;
+import org.apache.flink.connector.rocketmq.sink.RocketMQSink;
+import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment;
+
+import org.apache.rocketmq.client.AccessChannel;
+import org.apache.rocketmq.client.consumer.DefaultLitePullConsumer;
+import org.apache.rocketmq.common.message.Message;
+import org.apache.rocketmq.common.message.MessageExt;
+import org.apache.rocketmq.common.message.MessageQueue;
+import org.junit.Assume;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+
+import static org.apache.flink.connector.rocketmq.example.ConnectorConfig.ACCESS_KEY;
+import static org.apache.flink.connector.rocketmq.example.ConnectorConfig.CONSUMER_GROUP;
+import static org.apache.flink.connector.rocketmq.example.ConnectorConfig.ENDPOINTS;
+import static org.apache.flink.connector.rocketmq.example.ConnectorConfig.PRODUCER_GROUP;
+import static org.apache.flink.connector.rocketmq.example.ConnectorConfig.SECRET_KEY;
+import static org.apache.flink.connector.rocketmq.example.ConnectorConfig.getAclRpcHook;
+import static org.junit.Assert.assertTrue;
+
+/**
+ * Integration test for the EXACTLY_ONCE (transactional) sink against a real RocketMQ instance.
+ *
+ * <p>Test flow:
+ *
+ * <ol>
+ *   <li>Record the current max offsets of the transaction topic
+ *   <li>Run a bounded Flink job writing messages with EXACTLY_ONCE; checkpointing triggers the
+ *       two-phase commit (prepareCommit → Committer.commit → endTransaction COMMIT)
+ *   <li>Consume the topic from the recorded offsets and verify every message became visible,
+ *       which only happens after a successful transaction commit
+ * </ol>
+ *
+ * <p>Skipped automatically when environment variables are not set. The topic must be a
+ * TRANSACTION-type topic on the target instance.
+ */
+public class TransactionSinkIntegrationTest {
+
+    private static final String TRANS_TOPIC =
+            System.getenv().getOrDefault("ROCKETMQ_TRANS_TOPIC", "TransTopic");
+    private static final int MESSAGE_COUNT = 10;
+    private static final String MESSAGE_PREFIX = "txn-test-" + System.currentTimeMillis() + "-";
+
+    @Before
+    public void checkEnv() {
+        Assume.assumeTrue("Skipping: ROCKETMQ_NAMESRV_ADDR not set", ENDPOINTS != null);
+        Assume.assumeTrue("Skipping: ROCKETMQ_ACCESS_KEY not set", ACCESS_KEY != null);
+        Assume.assumeTrue("Skipping: ROCKETMQ_SECRET_KEY not set", SECRET_KEY != null);
+    }
+
+    @Test
+    public void exactlyOnceSinkTest() throws Exception {
+        System.out.println("=== RocketMQ EXACTLY_ONCE Sink Integration Test ===");
+        System.out.println("Endpoints  : " + ENDPOINTS);
+        System.out.println("Trans topic: " + TRANS_TOPIC);
+
+        List<String> payloads =
+                IntStream.range(0, MESSAGE_COUNT)
+                        .mapToObj(i -> MESSAGE_PREFIX + i)
+                        .collect(Collectors.toList());
+
+        StreamExecutionEnvironment env = StreamExecutionEnvironment.createLocalEnvironment(1);
+        env.enableCheckpointing(3000);
+
+        RocketMQSink<String> sink =
+                RocketMQSink.<String>builder()
+                        .setEndpoints(ENDPOINTS)
+                        .setGroupId(PRODUCER_GROUP)
+                        .setConfig(RocketMQOptions.OPTIONAL_ACCESS_KEY, ACCESS_KEY)
+                        .setConfig(RocketMQOptions.OPTIONAL_SECRET_KEY, SECRET_KEY)
+                        .setConfig(RocketMQOptions.OPTIONAL_ACCESS_CHANNEL, AccessChannel.CLOUD)
+                        .setDeliveryGuarantee(DeliveryGuarantee.EXACTLY_ONCE)
+                        .setSerializer(
+                                (element, context, timestamp) ->
+                                        new Message(TRANS_TOPIC, "*", element.getBytes()))
+                        .build();
+
+        env.fromCollection(payloads).sinkTo(sink).setParallelism(1);
+        System.out.println("[Step 1] Running bounded EXACTLY_ONCE job...");
+        env.execute("transaction-sink-test");
+        System.out.println("[Step 1] Job finished");
+
+        // Transactions are committed by the Committer on checkpoint / final checkpoint.
+        // Verify all messages became visible to consumers.
+        verifyMessages(payloads);
+        System.out.println("\n=== EXACTLY_ONCE Sink Test PASSED ===");
+    }
+
+    private void verifyMessages(List<String> expected) throws Exception {
+        System.out.println("[Step 2] Verifying committed messages in " + TRANS_TOPIC);
+        DefaultLitePullConsumer consumer =
+                new DefaultLitePullConsumer(CONSUMER_GROUP, getAclRpcHook());
+        consumer.setNamesrvAddr(ENDPOINTS);
+        consumer.setAccessChannel(AccessChannel.CLOUD);
+        consumer.setAutoCommit(false);
+        consumer.setVipChannelEnabled(false);
+        consumer.start();
+
+        List<String> received = new ArrayList<>();
+        try {
+            Collection<MessageQueue> queues = consumer.fetchMessageQueues(TRANS_TOPIC);
+            consumer.assign(queues);
+            // Only need recent messages; unique prefix isolates this run.
+            for (MessageQueue mq : queues) {
+                consumer.seek(mq, Math.max(0, consumer.offsetForTimestamp(mq, 0L)));
+            }
+            long deadline = System.currentTimeMillis() + 60_000;
+            while (System.currentTimeMillis() < deadline && received.size() < expected.size()) {
+                List<MessageExt> batch = consumer.poll(3000);
+                for (MessageExt msg : batch) {
+                    String body = new String(msg.getBody());
+                    if (body.startsWith(MESSAGE_PREFIX)) {
+                        received.add(body);
+                    }
+                }
+            }
+        } finally {
+            consumer.shutdown();
+        }
+        System.out.printf(
+                "[Step 2] Verified: %d/%d committed messages visible%n",
+                received.size(), expected.size());
+        assertTrue(
+                "Expected " + expected.size() + " committed messages, got " + received.size(),
+                received.size() >= expected.size());
+    }
+}
diff --git a/flink-connector-rocketmq/src/test/java/org/apache/flink/connector/rocketmq/sink/InnerProducerImplTest.java b/flink-connector-rocketmq/src/test/java/org/apache/flink/connector/rocketmq/sink/InnerProducerImplTest.java
new file mode 100644
index 0000000..7de3db7
--- /dev/null
+++ b/flink-connector-rocketmq/src/test/java/org/apache/flink/connector/rocketmq/sink/InnerProducerImplTest.java
@@ -0,0 +1,89 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.flink.connector.rocketmq.sink;
+
+import org.apache.flink.configuration.Configuration;
+
+import org.apache.rocketmq.client.producer.TransactionMQProducer;
+import org.junit.jupiter.api.Test;
+
+import java.lang.reflect.Field;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/** Tests for verifying that configuration parameters are applied to the RocketMQ producer. */
+class InnerProducerImplTest {
+
+    private TransactionMQProducer getProducerViaReflection(InnerProducerImpl impl) throws Exception {
+        Field field = InnerProducerImpl.class.getDeclaredField("producer");
+        field.setAccessible(true);
+        return (TransactionMQProducer) field.get(impl);
+    }
+
+    @Test
+    void sendTimeoutShouldBeAppliedToProducer() throws Exception {
+        Configuration config = new Configuration();
+        config.setString(RocketMQSinkOptions.ENDPOINTS, "127.0.0.1:9876");
+        config.setString(RocketMQSinkOptions.PRODUCER_GROUP, "test-group");
+        config.setLong(RocketMQSinkOptions.SEND_TIMEOUT, 8000L);
+
+        try (InnerProducerImpl impl = new InnerProducerImpl(config)) {
+            TransactionMQProducer producer = getProducerViaReflection(impl);
+            assertThat(producer.getSendMsgTimeout()).isEqualTo(8000);
+        }
+    }
+
+    @Test
+    void sendRetryTimesShouldBeAppliedToProducer() throws Exception {
+        Configuration config = new Configuration();
+        config.setString(RocketMQSinkOptions.ENDPOINTS, "127.0.0.1:9876");
+        config.setString(RocketMQSinkOptions.PRODUCER_GROUP, "test-group");
+        config.setInteger(RocketMQSinkOptions.SEND_RETRY_TIMES, 5);
+
+        try (InnerProducerImpl impl = new InnerProducerImpl(config)) {
+            TransactionMQProducer producer = getProducerViaReflection(impl);
+            assertThat(producer.getRetryTimesWhenSendFailed()).isEqualTo(5);
+            assertThat(producer.getRetryTimesWhenSendAsyncFailed()).isEqualTo(5);
+        }
+    }
+
+    @Test
+    void defaultSendTimeoutShouldBe5000ms() throws Exception {
+        Configuration config = new Configuration();
+        config.setString(RocketMQSinkOptions.ENDPOINTS, "127.0.0.1:9876");
+        config.setString(RocketMQSinkOptions.PRODUCER_GROUP, "test-group");
+
+        try (InnerProducerImpl impl = new InnerProducerImpl(config)) {
+            TransactionMQProducer producer = getProducerViaReflection(impl);
+            assertThat(producer.getSendMsgTimeout()).isEqualTo(5000);
+        }
+    }
+
+    @Test
+    void defaultRetryTimesShouldBe3() throws Exception {
+        Configuration config = new Configuration();
+        config.setString(RocketMQSinkOptions.ENDPOINTS, "127.0.0.1:9876");
+        config.setString(RocketMQSinkOptions.PRODUCER_GROUP, "test-group");
+
+        try (InnerProducerImpl impl = new InnerProducerImpl(config)) {
+            TransactionMQProducer producer = getProducerViaReflection(impl);
+            assertThat(producer.getRetryTimesWhenSendFailed()).isEqualTo(3);
+            assertThat(producer.getRetryTimesWhenSendAsyncFailed()).isEqualTo(3);
+        }
+    }
+}
diff --git a/src/test/java/org/apache/flink/connector/rocketmq/sink/RocketMQSinkTest.java b/flink-connector-rocketmq/src/test/java/org/apache/flink/connector/rocketmq/sink/RocketMQSinkTest.java
similarity index 100%
rename from src/test/java/org/apache/flink/connector/rocketmq/sink/RocketMQSinkTest.java
rename to flink-connector-rocketmq/src/test/java/org/apache/flink/connector/rocketmq/sink/RocketMQSinkTest.java
diff --git a/flink-connector-rocketmq/src/test/java/org/apache/flink/connector/rocketmq/source/InnerConsumerImplTest.java b/flink-connector-rocketmq/src/test/java/org/apache/flink/connector/rocketmq/source/InnerConsumerImplTest.java
new file mode 100644
index 0000000..d93239b
--- /dev/null
+++ b/flink-connector-rocketmq/src/test/java/org/apache/flink/connector/rocketmq/source/InnerConsumerImplTest.java
@@ -0,0 +1,77 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.flink.connector.rocketmq.source;
+
+import org.apache.flink.configuration.Configuration;
+import org.apache.flink.connector.rocketmq.common.config.RocketMQOptions;
+
+import org.apache.rocketmq.client.consumer.DefaultLitePullConsumer;
+import org.junit.jupiter.api.Test;
+
+import java.lang.reflect.Field;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/** Tests for verifying that configuration parameters are applied to the RocketMQ consumer. */
+class InnerConsumerImplTest {
+
+    private DefaultLitePullConsumer getConsumerViaReflection(InnerConsumerImpl impl)
+            throws Exception {
+        Field field = InnerConsumerImpl.class.getDeclaredField("consumer");
+        field.setAccessible(true);
+        return (DefaultLitePullConsumer) field.get(impl);
+    }
+
+    @Test
+    void pullBatchSizeShouldBeAppliedToConsumer() throws Exception {
+        Configuration config = new Configuration();
+        config.setString(RocketMQSourceOptions.ENDPOINTS, "127.0.0.1:9876");
+        config.setString(RocketMQSourceOptions.CONSUMER_GROUP, "test-group");
+        config.setLong(RocketMQSourceOptions.PULL_BATCH_SIZE, 64L);
+
+        try (InnerConsumerImpl impl = new InnerConsumerImpl(config)) {
+            DefaultLitePullConsumer consumer = getConsumerViaReflection(impl);
+            assertThat(consumer.getPullBatchSize()).isEqualTo(64);
+        }
+    }
+
+    @Test
+    void defaultPullBatchSizeShouldBe32() throws Exception {
+        Configuration config = new Configuration();
+        config.setString(RocketMQSourceOptions.ENDPOINTS, "127.0.0.1:9876");
+        config.setString(RocketMQSourceOptions.CONSUMER_GROUP, "test-group");
+
+        try (InnerConsumerImpl impl = new InnerConsumerImpl(config)) {
+            DefaultLitePullConsumer consumer = getConsumerViaReflection(impl);
+            assertThat(consumer.getPullBatchSize()).isEqualTo(32);
+        }
+    }
+
+    @Test
+    void namespaceConfigShouldBeReadable() throws Exception {
+        Configuration config = new Configuration();
+        config.setString(RocketMQSourceOptions.ENDPOINTS, "127.0.0.1:9876");
+        config.setString(RocketMQSourceOptions.CONSUMER_GROUP, "test-group");
+        config.setString(RocketMQOptions.NAMESPACE, "my-namespace");
+
+        try (InnerConsumerImpl impl = new InnerConsumerImpl(config)) {
+
+            assertThat(impl).isNotNull(); // setNamespace verified by successful construction
+        }
+    }
+}
diff --git a/src/test/java/org/apache/flink/connector/rocketmq/source/RocketMQSourceTest.java b/flink-connector-rocketmq/src/test/java/org/apache/flink/connector/rocketmq/source/RocketMQSourceTest.java
similarity index 100%
rename from src/test/java/org/apache/flink/connector/rocketmq/source/RocketMQSourceTest.java
rename to flink-connector-rocketmq/src/test/java/org/apache/flink/connector/rocketmq/source/RocketMQSourceTest.java
diff --git a/src/test/java/org/apache/flink/connector/rocketmq/source/enumerator/RocketMQSourceEnumStateSerializerTest.java b/flink-connector-rocketmq/src/test/java/org/apache/flink/connector/rocketmq/source/enumerator/RocketMQSourceEnumStateSerializerTest.java
similarity index 100%
rename from src/test/java/org/apache/flink/connector/rocketmq/source/enumerator/RocketMQSourceEnumStateSerializerTest.java
rename to flink-connector-rocketmq/src/test/java/org/apache/flink/connector/rocketmq/source/enumerator/RocketMQSourceEnumStateSerializerTest.java
diff --git a/src/test/java/org/apache/flink/connector/rocketmq/source/enumerator/allocate/AverageAllocateStrategyTest.java b/flink-connector-rocketmq/src/test/java/org/apache/flink/connector/rocketmq/source/enumerator/allocate/AverageAllocateStrategyTest.java
similarity index 100%
rename from src/test/java/org/apache/flink/connector/rocketmq/source/enumerator/allocate/AverageAllocateStrategyTest.java
rename to flink-connector-rocketmq/src/test/java/org/apache/flink/connector/rocketmq/source/enumerator/allocate/AverageAllocateStrategyTest.java
diff --git a/src/test/java/org/apache/flink/connector/rocketmq/source/enumerator/allocate/BroadcastAllocateStrategyTest.java b/flink-connector-rocketmq/src/test/java/org/apache/flink/connector/rocketmq/source/enumerator/allocate/BroadcastAllocateStrategyTest.java
similarity index 100%
rename from src/test/java/org/apache/flink/connector/rocketmq/source/enumerator/allocate/BroadcastAllocateStrategyTest.java
rename to flink-connector-rocketmq/src/test/java/org/apache/flink/connector/rocketmq/source/enumerator/allocate/BroadcastAllocateStrategyTest.java
diff --git a/src/test/java/org/apache/flink/connector/rocketmq/source/enumerator/allocate/ConsistentHashAllocateStrategyTest.java b/flink-connector-rocketmq/src/test/java/org/apache/flink/connector/rocketmq/source/enumerator/allocate/ConsistentHashAllocateStrategyTest.java
similarity index 100%
rename from src/test/java/org/apache/flink/connector/rocketmq/source/enumerator/allocate/ConsistentHashAllocateStrategyTest.java
rename to flink-connector-rocketmq/src/test/java/org/apache/flink/connector/rocketmq/source/enumerator/allocate/ConsistentHashAllocateStrategyTest.java
diff --git a/src/test/java/org/apache/flink/connector/rocketmq/source/reader/RocketMQRecordEmitterTest.java b/flink-connector-rocketmq/src/test/java/org/apache/flink/connector/rocketmq/source/reader/RocketMQRecordEmitterTest.java
similarity index 95%
rename from src/test/java/org/apache/flink/connector/rocketmq/source/reader/RocketMQRecordEmitterTest.java
rename to flink-connector-rocketmq/src/test/java/org/apache/flink/connector/rocketmq/source/reader/RocketMQRecordEmitterTest.java
index 6c81cef..6a357e3 100644
--- a/src/test/java/org/apache/flink/connector/rocketmq/source/reader/RocketMQRecordEmitterTest.java
+++ b/flink-connector-rocketmq/src/test/java/org/apache/flink/connector/rocketmq/source/reader/RocketMQRecordEmitterTest.java
@@ -44,9 +44,9 @@ public class RocketMQRecordEmitterTest {
                 new MessageExt(
                         1,
                         System.currentTimeMillis(),
-                        InetSocketAddress.createUnresolved("localhost", 8080),
+                        InetSocketAddress.createUnresolved("127.0.0.1", 8080),
                         System.currentTimeMillis(),
-                        InetSocketAddress.createUnresolved("localhost", 8088),
+                        InetSocketAddress.createUnresolved("127.0.0.1", 8088),
                         "184019387");
         message.setBody("test_emit_record_message".getBytes());
         GenericRowData rowData = new GenericRowData(1);
diff --git a/src/test/java/org/apache/flink/connector/rocketmq/source/reader/deserializer/RocketMQRowDeserializationSchemaTest.java b/flink-connector-rocketmq/src/test/java/org/apache/flink/connector/rocketmq/source/reader/deserializer/RocketMQRowDeserializationSchemaTest.java
similarity index 92%
rename from src/test/java/org/apache/flink/connector/rocketmq/source/reader/deserializer/RocketMQRowDeserializationSchemaTest.java
rename to flink-connector-rocketmq/src/test/java/org/apache/flink/connector/rocketmq/source/reader/deserializer/RocketMQRowDeserializationSchemaTest.java
index 6005093..2c1e233 100644
--- a/src/test/java/org/apache/flink/connector/rocketmq/source/reader/deserializer/RocketMQRowDeserializationSchemaTest.java
+++ b/flink-connector-rocketmq/src/test/java/org/apache/flink/connector/rocketmq/source/reader/deserializer/RocketMQRowDeserializationSchemaTest.java
@@ -53,27 +53,27 @@ public class RocketMQRowDeserializationSchemaTest {
         //        new MessageExt(
         //                1,
         //                System.currentTimeMillis(),
-        //                InetSocketAddress.createUnresolved("localhost", 8080),
+        //                InetSocketAddress.createUnresolved("127.0.0.1", 8080),
         //                System.currentTimeMillis(),
-        //                InetSocketAddress.createUnresolved("localhost", 8088),
+        //                InetSocketAddress.createUnresolved("127.0.0.1", 8088),
         //                "184019387");
         // firstMsg.setBody("test_deserializer_raw_messages_1".getBytes());
         // MessageExt secondMsg =
         //        new MessageExt(
         //                1,
         //                System.currentTimeMillis(),
-        //                InetSocketAddress.createUnresolved("localhost", 8081),
+        //                InetSocketAddress.createUnresolved("127.0.0.1", 8080),
         //                System.currentTimeMillis(),
-        //                InetSocketAddress.createUnresolved("localhost", 8087),
+        //                InetSocketAddress.createUnresolved("127.0.0.1", 8087),
         //                "284019387");
         // secondMsg.setBody("test_deserializer_raw_messages_2".getBytes());
         // MessageExt thirdMsg =
         //        new MessageExt(
         //                1,
         //                System.currentTimeMillis(),
-        //                InetSocketAddress.createUnresolved("localhost", 8082),
+        //                InetSocketAddress.createUnresolved("127.0.0.1", 8082),
         //                System.currentTimeMillis(),
-        //                InetSocketAddress.createUnresolved("localhost", 8086),
+        //                InetSocketAddress.createUnresolved("127.0.0.1", 8086),
         //                "384019387");
         // thirdMsg.setBody("test_deserializer_raw_messages_3".getBytes());
         // List<MessageExt> messages = Arrays.asList(firstMsg, secondMsg, thirdMsg);
diff --git a/src/test/java/org/apache/flink/connector/rocketmq/source/split/RocketMQPartitionSplitSerializerTest.java b/flink-connector-rocketmq/src/test/java/org/apache/flink/connector/rocketmq/source/split/RocketMQPartitionSplitSerializerTest.java
similarity index 100%
rename from src/test/java/org/apache/flink/connector/rocketmq/source/split/RocketMQPartitionSplitSerializerTest.java
rename to flink-connector-rocketmq/src/test/java/org/apache/flink/connector/rocketmq/source/split/RocketMQPartitionSplitSerializerTest.java
diff --git a/src/test/java/org/apache/flink/connector/rocketmq/legacy/RocketMQSinkTest.java b/flink-connector-rocketmq/src/test/java/org/apache/flink/streaming/connectors/rocketmq/RocketMQSinkTest.java
similarity index 81%
rename from src/test/java/org/apache/flink/connector/rocketmq/legacy/RocketMQSinkTest.java
rename to flink-connector-rocketmq/src/test/java/org/apache/flink/streaming/connectors/rocketmq/RocketMQSinkTest.java
index e1eb863..ee3cf45 100644
--- a/src/test/java/org/apache/flink/connector/rocketmq/legacy/RocketMQSinkTest.java
+++ b/flink-connector-rocketmq/src/test/java/org/apache/flink/streaming/connectors/rocketmq/RocketMQSinkTest.java
@@ -16,14 +16,14 @@
  * limitations under the License.
  */
 
-package org.apache.flink.connector.rocketmq.legacy;
+package org.apache.flink.streaming.connectors.rocketmq;
 
 import org.apache.flink.api.java.tuple.Tuple2;
-import org.apache.flink.connector.rocketmq.legacy.common.selector.DefaultTopicSelector;
-import org.apache.flink.connector.rocketmq.legacy.common.selector.TopicSelector;
-import org.apache.flink.connector.rocketmq.legacy.common.serialization.KeyValueSerializationSchema;
-import org.apache.flink.connector.rocketmq.legacy.common.serialization.SimpleKeyValueSerializationSchema;
-import org.apache.flink.connector.rocketmq.legacy.common.util.TestUtils;
+import org.apache.flink.streaming.connectors.rocketmq.common.selector.DefaultTopicSelector;
+import org.apache.flink.streaming.connectors.rocketmq.common.selector.TopicSelector;
+import org.apache.flink.streaming.connectors.rocketmq.common.serialization.KeyValueSerializationSchema;
+import org.apache.flink.streaming.connectors.rocketmq.common.serialization.SimpleKeyValueSerializationSchema;
+import org.apache.flink.streaming.connectors.rocketmq.common.util.TestUtils;
 
 import org.apache.rocketmq.client.producer.DefaultMQProducer;
 import org.apache.rocketmq.common.message.Message;
diff --git a/src/test/java/org/apache/flink/connector/rocketmq/legacy/RocketMQSourceTest.java b/flink-connector-rocketmq/src/test/java/org/apache/flink/streaming/connectors/rocketmq/RocketMQSourceTest.java
similarity index 90%
rename from src/test/java/org/apache/flink/connector/rocketmq/legacy/RocketMQSourceTest.java
rename to flink-connector-rocketmq/src/test/java/org/apache/flink/streaming/connectors/rocketmq/RocketMQSourceTest.java
index 35a0eb7..1e60937 100644
--- a/src/test/java/org/apache/flink/connector/rocketmq/legacy/RocketMQSourceTest.java
+++ b/flink-connector-rocketmq/src/test/java/org/apache/flink/streaming/connectors/rocketmq/RocketMQSourceTest.java
@@ -16,11 +16,11 @@
  * limitations under the License.
  */
 
-package org.apache.flink.connector.rocketmq.legacy;
+package org.apache.flink.streaming.connectors.rocketmq;
 
-import org.apache.flink.connector.rocketmq.legacy.common.serialization.KeyValueDeserializationSchema;
-import org.apache.flink.connector.rocketmq.legacy.common.serialization.SimpleKeyValueDeserializationSchema;
-import org.apache.flink.connector.rocketmq.legacy.common.util.TestUtils;
+import org.apache.flink.streaming.connectors.rocketmq.common.serialization.KeyValueDeserializationSchema;
+import org.apache.flink.streaming.connectors.rocketmq.common.serialization.SimpleKeyValueDeserializationSchema;
+import org.apache.flink.streaming.connectors.rocketmq.common.util.TestUtils;
 import org.apache.flink.streaming.api.functions.source.SourceFunction.SourceContext;
 
 import org.apache.rocketmq.client.consumer.DefaultLitePullConsumer;
@@ -40,8 +40,8 @@ import java.util.Properties;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyLong;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyLong;
 import static org.mockito.Mockito.atLeastOnce;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
diff --git a/src/test/java/org/apache/flink/connector/rocketmq/legacy/common/selector/DefaultTopicSelectorTest.java b/flink-connector-rocketmq/src/test/java/org/apache/flink/streaming/connectors/rocketmq/common/selector/DefaultTopicSelectorTest.java
similarity index 94%
rename from src/test/java/org/apache/flink/connector/rocketmq/legacy/common/selector/DefaultTopicSelectorTest.java
rename to flink-connector-rocketmq/src/test/java/org/apache/flink/streaming/connectors/rocketmq/common/selector/DefaultTopicSelectorTest.java
index d91a045..d1d9ec0 100644
--- a/src/test/java/org/apache/flink/connector/rocketmq/legacy/common/selector/DefaultTopicSelectorTest.java
+++ b/flink-connector-rocketmq/src/test/java/org/apache/flink/streaming/connectors/rocketmq/common/selector/DefaultTopicSelectorTest.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.flink.connector.rocketmq.legacy.common.selector;
+package org.apache.flink.streaming.connectors.rocketmq.common.selector;
 
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/flink/connector/rocketmq/legacy/common/selector/HashMessageQueueSelectorTest.java b/flink-connector-rocketmq/src/test/java/org/apache/flink/streaming/connectors/rocketmq/common/selector/HashMessageQueueSelectorTest.java
similarity index 96%
rename from src/test/java/org/apache/flink/connector/rocketmq/legacy/common/selector/HashMessageQueueSelectorTest.java
rename to flink-connector-rocketmq/src/test/java/org/apache/flink/streaming/connectors/rocketmq/common/selector/HashMessageQueueSelectorTest.java
index ddb88fa..b9f65f8 100644
--- a/src/test/java/org/apache/flink/connector/rocketmq/legacy/common/selector/HashMessageQueueSelectorTest.java
+++ b/flink-connector-rocketmq/src/test/java/org/apache/flink/streaming/connectors/rocketmq/common/selector/HashMessageQueueSelectorTest.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.flink.connector.rocketmq.legacy.common.selector;
+package org.apache.flink.streaming.connectors.rocketmq.common.selector;
 
 import org.apache.rocketmq.common.message.Message;
 import org.apache.rocketmq.common.message.MessageQueue;
diff --git a/src/test/java/org/apache/flink/connector/rocketmq/legacy/common/selector/RandomMessageQueueSelectorTest.java b/flink-connector-rocketmq/src/test/java/org/apache/flink/streaming/connectors/rocketmq/common/selector/RandomMessageQueueSelectorTest.java
similarity index 96%
rename from src/test/java/org/apache/flink/connector/rocketmq/legacy/common/selector/RandomMessageQueueSelectorTest.java
rename to flink-connector-rocketmq/src/test/java/org/apache/flink/streaming/connectors/rocketmq/common/selector/RandomMessageQueueSelectorTest.java
index cad43a3..f67ffde 100644
--- a/src/test/java/org/apache/flink/connector/rocketmq/legacy/common/selector/RandomMessageQueueSelectorTest.java
+++ b/flink-connector-rocketmq/src/test/java/org/apache/flink/streaming/connectors/rocketmq/common/selector/RandomMessageQueueSelectorTest.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.flink.connector.rocketmq.legacy.common.selector;
+package org.apache.flink.streaming.connectors.rocketmq.common.selector;
 
 import org.apache.rocketmq.common.message.Message;
 import org.apache.rocketmq.common.message.MessageQueue;
diff --git a/src/test/java/org/apache/flink/connector/rocketmq/legacy/common/selector/SimpleTopicSelectorTest.java b/flink-connector-rocketmq/src/test/java/org/apache/flink/streaming/connectors/rocketmq/common/selector/SimpleTopicSelectorTest.java
similarity index 95%
rename from src/test/java/org/apache/flink/connector/rocketmq/legacy/common/selector/SimpleTopicSelectorTest.java
rename to flink-connector-rocketmq/src/test/java/org/apache/flink/streaming/connectors/rocketmq/common/selector/SimpleTopicSelectorTest.java
index be55514..548bc67 100644
--- a/src/test/java/org/apache/flink/connector/rocketmq/legacy/common/selector/SimpleTopicSelectorTest.java
+++ b/flink-connector-rocketmq/src/test/java/org/apache/flink/streaming/connectors/rocketmq/common/selector/SimpleTopicSelectorTest.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.flink.connector.rocketmq.legacy.common.selector;
+package org.apache.flink.streaming.connectors.rocketmq.common.selector;
 
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/flink/connector/rocketmq/legacy/common/serialization/RowKeyValueDeserializationSchemaTest.java b/flink-connector-rocketmq/src/test/java/org/apache/flink/streaming/connectors/rocketmq/common/serialization/RowKeyValueDeserializationSchemaTest.java
similarity index 96%
rename from src/test/java/org/apache/flink/connector/rocketmq/legacy/common/serialization/RowKeyValueDeserializationSchemaTest.java
rename to flink-connector-rocketmq/src/test/java/org/apache/flink/streaming/connectors/rocketmq/common/serialization/RowKeyValueDeserializationSchemaTest.java
index a8ff892..66253ea 100644
--- a/src/test/java/org/apache/flink/connector/rocketmq/legacy/common/serialization/RowKeyValueDeserializationSchemaTest.java
+++ b/flink-connector-rocketmq/src/test/java/org/apache/flink/streaming/connectors/rocketmq/common/serialization/RowKeyValueDeserializationSchemaTest.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.flink.connector.rocketmq.legacy.common.serialization;
+package org.apache.flink.streaming.connectors.rocketmq.common.serialization;
 
 import org.apache.flink.table.api.DataTypes;
 import org.apache.flink.table.api.TableSchema;
diff --git a/src/test/java/org/apache/flink/connector/rocketmq/legacy/common/serialization/SimpleKeyValueSerializationSchemaTest.java b/flink-connector-rocketmq/src/test/java/org/apache/flink/streaming/connectors/rocketmq/common/serialization/SimpleKeyValueSerializationSchemaTest.java
similarity index 95%
rename from src/test/java/org/apache/flink/connector/rocketmq/legacy/common/serialization/SimpleKeyValueSerializationSchemaTest.java
rename to flink-connector-rocketmq/src/test/java/org/apache/flink/streaming/connectors/rocketmq/common/serialization/SimpleKeyValueSerializationSchemaTest.java
index 680aab6..9f798a6 100644
--- a/src/test/java/org/apache/flink/connector/rocketmq/legacy/common/serialization/SimpleKeyValueSerializationSchemaTest.java
+++ b/flink-connector-rocketmq/src/test/java/org/apache/flink/streaming/connectors/rocketmq/common/serialization/SimpleKeyValueSerializationSchemaTest.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.flink.connector.rocketmq.legacy.common.serialization;
+package org.apache.flink.streaming.connectors.rocketmq.common.serialization;
 
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/flink/connector/rocketmq/legacy/common/util/RetryUtilTest.java b/flink-connector-rocketmq/src/test/java/org/apache/flink/streaming/connectors/rocketmq/common/util/RetryUtilTest.java
similarity index 76%
rename from src/test/java/org/apache/flink/connector/rocketmq/legacy/common/util/RetryUtilTest.java
rename to flink-connector-rocketmq/src/test/java/org/apache/flink/streaming/connectors/rocketmq/common/util/RetryUtilTest.java
index d719aa3..3e58384 100644
--- a/src/test/java/org/apache/flink/connector/rocketmq/legacy/common/util/RetryUtilTest.java
+++ b/flink-connector-rocketmq/src/test/java/org/apache/flink/streaming/connectors/rocketmq/common/util/RetryUtilTest.java
@@ -16,21 +16,22 @@
  * limitations under the License.
  */
 
-package org.apache.flink.connector.rocketmq.legacy.common.util;
+package org.apache.flink.streaming.connectors.rocketmq.common.util;
 
-import org.apache.flink.connector.rocketmq.legacy.RunningChecker;
+import org.apache.flink.streaming.connectors.rocketmq.RunningChecker;
 
 import junit.framework.TestCase;
-import lombok.Data;
-import lombok.extern.slf4j.Slf4j;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
 /** Tests for {@link RetryUtil}. */
-@Slf4j
 public class RetryUtilTest extends TestCase {
 
+    private static final Logger log = LoggerFactory.getLogger(RetryUtilTest.class);
+
     public void testCall() {
         try {
             User user = new User();
@@ -50,17 +51,32 @@ public class RetryUtilTest extends TestCase {
             Thread.sleep(10000);
             executorService.shutdown();
             log.info("Thread has finished");
-            assertEquals(0, user.age);
-            assertEquals("test", user.name);
+            assertEquals(0, user.getAge());
+            assertEquals("test", user.getName());
             assertEquals(false, runningChecker.isRunning());
         } catch (Exception e) {
             log.warn("Exception has been caught");
         }
     }
 
-    @Data
     public class User {
         String name;
         int age;
+
+        public String getName() {
+            return name;
+        }
+
+        public void setName(String name) {
+            this.name = name;
+        }
+
+        public int getAge() {
+            return age;
+        }
+
+        public void setAge(int age) {
+            this.age = age;
+        }
     }
 }
diff --git a/src/test/java/org/apache/flink/connector/rocketmq/example/LegacyConnectorExample.java b/flink-connector-rocketmq/src/test/java/org/apache/flink/streaming/connectors/rocketmq/example/LegacyConnectorExample.java
similarity index 87%
rename from src/test/java/org/apache/flink/connector/rocketmq/example/LegacyConnectorExample.java
rename to flink-connector-rocketmq/src/test/java/org/apache/flink/streaming/connectors/rocketmq/example/LegacyConnectorExample.java
index d9ec711..c65fa1e 100644
--- a/src/test/java/org/apache/flink/connector/rocketmq/example/LegacyConnectorExample.java
+++ b/flink-connector-rocketmq/src/test/java/org/apache/flink/streaming/connectors/rocketmq/example/LegacyConnectorExample.java
@@ -15,16 +15,16 @@
  * limitations under the License.
  */
 
-package org.apache.flink.connector.rocketmq.example;
+package org.apache.flink.streaming.connectors.rocketmq.example;
 
 import org.apache.flink.api.java.tuple.Tuple2;
 import org.apache.flink.api.java.utils.ParameterTool;
-import org.apache.flink.connector.rocketmq.legacy.RocketMQConfig;
-import org.apache.flink.connector.rocketmq.legacy.RocketMQSink;
-import org.apache.flink.connector.rocketmq.legacy.RocketMQSourceFunction;
-import org.apache.flink.connector.rocketmq.legacy.common.serialization.SimpleTupleDeserializationSchema;
-import org.apache.flink.connector.rocketmq.legacy.function.SinkMapFunction;
-import org.apache.flink.connector.rocketmq.legacy.function.SourceMapFunction;
+import org.apache.flink.streaming.connectors.rocketmq.RocketMQConfig;
+import org.apache.flink.streaming.connectors.rocketmq.RocketMQSink;
+import org.apache.flink.streaming.connectors.rocketmq.RocketMQSourceFunction;
+import org.apache.flink.streaming.connectors.rocketmq.common.serialization.SimpleTupleDeserializationSchema;
+import org.apache.flink.streaming.connectors.rocketmq.function.SinkMapFunction;
+import org.apache.flink.streaming.connectors.rocketmq.function.SourceMapFunction;
 import org.apache.flink.runtime.state.memory.MemoryStateBackend;
 import org.apache.flink.streaming.api.CheckpointingMode;
 import org.apache.flink.streaming.api.TimeCharacteristic;
@@ -36,8 +36,8 @@ import org.apache.rocketmq.client.AccessChannel;
 
 import java.util.Properties;
 
-import static org.apache.flink.connector.rocketmq.legacy.RocketMQConfig.CONSUMER_OFFSET_LATEST;
-import static org.apache.flink.connector.rocketmq.legacy.RocketMQConfig.DEFAULT_CONSUMER_TAG;
+import static org.apache.flink.streaming.connectors.rocketmq.RocketMQConfig.CONSUMER_OFFSET_LATEST;
+import static org.apache.flink.streaming.connectors.rocketmq.RocketMQConfig.DEFAULT_CONSUMER_TAG;
 
 public class LegacyConnectorExample {
 
diff --git a/src/test/java/org/apache/flink/connector/rocketmq/legacy/sourceFunction/RocketMQSourceFunctionTest.java b/flink-connector-rocketmq/src/test/java/org/apache/flink/streaming/connectors/rocketmq/sourceFunction/RocketMQSourceFunctionTest.java
similarity index 89%
rename from src/test/java/org/apache/flink/connector/rocketmq/legacy/sourceFunction/RocketMQSourceFunctionTest.java
rename to flink-connector-rocketmq/src/test/java/org/apache/flink/streaming/connectors/rocketmq/sourceFunction/RocketMQSourceFunctionTest.java
index 78ffd17..af70aac 100644
--- a/src/test/java/org/apache/flink/connector/rocketmq/legacy/sourceFunction/RocketMQSourceFunctionTest.java
+++ b/flink-connector-rocketmq/src/test/java/org/apache/flink/streaming/connectors/rocketmq/sourceFunction/RocketMQSourceFunctionTest.java
@@ -16,14 +16,14 @@
  * limitations under the License.
  */
 
-package org.apache.flink.connector.rocketmq.legacy.sourceFunction;
+package org.apache.flink.streaming.connectors.rocketmq.sourceFunction;
 
-import org.apache.flink.connector.rocketmq.legacy.RocketMQConfig;
-import org.apache.flink.connector.rocketmq.legacy.RocketMQSourceFunction;
-import org.apache.flink.connector.rocketmq.legacy.common.config.OffsetResetStrategy;
-import org.apache.flink.connector.rocketmq.legacy.common.config.StartupMode;
-import org.apache.flink.connector.rocketmq.legacy.common.serialization.SimpleStringDeserializationSchema;
-import org.apache.flink.connector.rocketmq.legacy.common.util.TestUtils;
+import org.apache.flink.streaming.connectors.rocketmq.RocketMQConfig;
+import org.apache.flink.streaming.connectors.rocketmq.RocketMQSourceFunction;
+import org.apache.flink.streaming.connectors.rocketmq.common.config.OffsetResetStrategy;
+import org.apache.flink.streaming.connectors.rocketmq.common.config.StartupMode;
+import org.apache.flink.streaming.connectors.rocketmq.common.serialization.SimpleStringDeserializationSchema;
+import org.apache.flink.streaming.connectors.rocketmq.common.util.TestUtils;
 
 import org.apache.rocketmq.client.consumer.DefaultLitePullConsumer;
 import org.apache.rocketmq.common.message.MessageQueue;
diff --git a/src/test/java/org/apache/flink/connector/rocketmq/sink/table/RocketMQDynamicTableSinkFactoryTest.java b/flink-connector-rocketmq/src/test/java/org/apache/flink/streaming/connectors/rocketmq/table/RocketMQDynamicTableSinkFactoryTest.java
similarity index 98%
rename from src/test/java/org/apache/flink/connector/rocketmq/sink/table/RocketMQDynamicTableSinkFactoryTest.java
rename to flink-connector-rocketmq/src/test/java/org/apache/flink/streaming/connectors/rocketmq/table/RocketMQDynamicTableSinkFactoryTest.java
index 0da51c3..a06c8af 100644
--- a/src/test/java/org/apache/flink/connector/rocketmq/sink/table/RocketMQDynamicTableSinkFactoryTest.java
+++ b/flink-connector-rocketmq/src/test/java/org/apache/flink/streaming/connectors/rocketmq/table/RocketMQDynamicTableSinkFactoryTest.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.flink.connector.rocketmq.sink.table;
+package org.apache.flink.streaming.connectors.rocketmq.table;
 
 import org.apache.flink.configuration.Configuration;
 import org.apache.flink.connector.rocketmq.source.RocketMQSourceOptions;
diff --git a/flink-connector-rocketmq/src/test/java/org/apache/flink/streaming/connectors/rocketmq/table/RocketMQDynamicTableSinkMigrationTest.java b/flink-connector-rocketmq/src/test/java/org/apache/flink/streaming/connectors/rocketmq/table/RocketMQDynamicTableSinkMigrationTest.java
new file mode 100644
index 0000000..ad09869
--- /dev/null
+++ b/flink-connector-rocketmq/src/test/java/org/apache/flink/streaming/connectors/rocketmq/table/RocketMQDynamicTableSinkMigrationTest.java
@@ -0,0 +1,130 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.flink.streaming.connectors.rocketmq.table;
+
+import org.apache.flink.connector.rocketmq.sink.RocketMQSink;
+import org.apache.flink.table.api.DataTypes;
+import org.apache.flink.table.api.TableSchema;
+import org.apache.flink.table.connector.sink.DynamicTableSink;
+import org.apache.flink.table.connector.sink.SinkV2Provider;
+import org.apache.flink.table.descriptors.DescriptorProperties;
+import org.apache.flink.table.runtime.connector.sink.SinkRuntimeProviderContext;
+
+import org.junit.jupiter.api.Test;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/** Tests for {@link RocketMQDynamicTableSink} FLIP-143 migration. */
+class RocketMQDynamicTableSinkMigrationTest {
+
+    @Test
+    void sinkRuntimeProviderShouldReturnSinkV2ProviderTest() {
+        DescriptorProperties properties = createBaseProperties();
+        TableSchema schema = createTableSchema();
+
+        RocketMQDynamicTableSink tableSink =
+                new RocketMQDynamicTableSink(
+                        properties,
+                        schema,
+                        "test-topic",
+                        "test-producer-group",
+                        "127.0.0.1:9876",
+                        null, // accessKey
+                        null, // secretKey
+                        null, // tag
+                        null, // dynamicColumn
+                        String.valueOf((char) 1), // fieldDelimiter (default SOH)
+                        "UTF-8", // encoding
+                        10, // retryTimes
+                        5000L, // sleepTime
+                        false, // isDynamicTag
+                        true, // isDynamicTagIncluded
+                        false, // writeKeysToBody
+                        new String[0], // keyColumns
+                        "AT_LEAST_ONCE", // deliveryGuarantee
+                        3, // sendRetryTimes
+                        5000L, // sendTimeout
+                        1000, // sendPendingMax
+                        4); // executorNum
+
+        DynamicTableSink.SinkRuntimeProvider provider =
+                tableSink.getSinkRuntimeProvider(new SinkRuntimeProviderContext(false));
+
+        assertThat(provider).isInstanceOf(SinkV2Provider.class);
+        SinkV2Provider sinkV2Provider = (SinkV2Provider) provider;
+        assertThat(sinkV2Provider.createSink()).isInstanceOf(RocketMQSink.class);
+    }
+
+    @Test
+    void sinkRuntimeProviderWithCredentialsShouldSucceedTest() {
+        DescriptorProperties properties = createBaseProperties();
+        TableSchema schema = createTableSchema();
+
+        RocketMQDynamicTableSink tableSink =
+                new RocketMQDynamicTableSink(
+                        properties,
+                        schema,
+                        "test-topic",
+                        "test-producer-group",
+                        "127.0.0.1:9876",
+                        "myAccessKey", // accessKey
+                        "mySecretKey", // secretKey
+                        "testTag", // tag
+                        null, // dynamicColumn
+                        String.valueOf((char) 1), // fieldDelimiter
+                        "UTF-8", // encoding
+                        10, // retryTimes
+                        5000L, // sleepTime
+                        false, // isDynamicTag
+                        true, // isDynamicTagIncluded
+                        false, // writeKeysToBody
+                        new String[0], // keyColumns
+                        "AT_LEAST_ONCE", // deliveryGuarantee
+                        3, // sendRetryTimes
+                        5000L, // sendTimeout
+                        1000, // sendPendingMax
+                        4); // executorNum
+
+        DynamicTableSink.SinkRuntimeProvider provider =
+                tableSink.getSinkRuntimeProvider(new SinkRuntimeProviderContext(false));
+
+        assertThat(provider).isInstanceOf(SinkV2Provider.class);
+    }
+
+    private DescriptorProperties createBaseProperties() {
+        Map<String, String> props = new HashMap<>();
+        props.put("connector", "rocketmq");
+        props.put("rocketmq.sink.topic", "test-topic");
+        props.put("rocketmq.sink.group", "test-producer-group");
+        props.put("rocketmq.client.endpoints", "127.0.0.1:9876");
+        DescriptorProperties descriptorProperties = new DescriptorProperties();
+        descriptorProperties.putProperties(props);
+        descriptorProperties.putTableSchema("schema", createTableSchema());
+        return descriptorProperties;
+    }
+
+    private TableSchema createTableSchema() {
+        return TableSchema.builder()
+                .field("id", DataTypes.BIGINT())
+                .field("name", DataTypes.STRING())
+                .build();
+    }
+}
diff --git a/flink-connector-rocketmq/src/test/java/org/apache/flink/streaming/connectors/rocketmq/table/RocketMQDynamicTableSourceFactoryOffsetTest.java b/flink-connector-rocketmq/src/test/java/org/apache/flink/streaming/connectors/rocketmq/table/RocketMQDynamicTableSourceFactoryOffsetTest.java
new file mode 100644
index 0000000..c9db6f1
--- /dev/null
+++ b/flink-connector-rocketmq/src/test/java/org/apache/flink/streaming/connectors/rocketmq/table/RocketMQDynamicTableSourceFactoryOffsetTest.java
@@ -0,0 +1,110 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.flink.streaming.connectors.rocketmq.table;
+
+import org.apache.flink.table.api.Schema;
+import org.apache.flink.table.catalog.CatalogTable;
+import org.apache.flink.table.catalog.Column;
+import org.apache.flink.table.catalog.ObjectIdentifier;
+import org.apache.flink.table.catalog.ResolvedCatalogTable;
+import org.apache.flink.table.catalog.ResolvedSchema;
+import org.apache.flink.table.connector.source.DynamicTableSource;
+import org.apache.flink.table.factories.FactoryUtil;
+
+import org.junit.jupiter.api.Test;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.apache.flink.table.api.DataTypes.BIGINT;
+import static org.apache.flink.table.api.DataTypes.STRING;
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Tests verifying the auto-infer behavior for startup.offset.timestamp in {@link
+ * RocketMQDynamicTableSourceFactory}. When a user sets startup.offset.timestamp without explicitly
+ * setting startup.scan.mode, the factory should auto-infer scan.mode=timestamp.
+ */
+class RocketMQDynamicTableSourceFactoryOffsetTest {
+
+    private static final ResolvedSchema SCHEMA =
+            new ResolvedSchema(
+                    Collections.singletonList(Column.physical("id", BIGINT().notNull())),
+                    new ArrayList<>(),
+                    null);
+
+    private DynamicTableSource createSource(Map<String, String> options) {
+        return FactoryUtil.createTableSource(
+                null,
+                ObjectIdentifier.of("default", "default", "test_table"),
+                new ResolvedCatalogTable(
+                        CatalogTable.newBuilder()
+                                .schema(Schema.newBuilder().fromResolvedSchema(SCHEMA).build())
+                                .comment("")
+                                .partitionKeys(Collections.emptyList())
+                                .options(options)
+                                .build(),
+                        SCHEMA),
+                new org.apache.flink.configuration.Configuration(),
+                Thread.currentThread().getContextClassLoader(),
+                false);
+    }
+
+    private Map<String, String> baseOptions() {
+        Map<String, String> options = new HashMap<>();
+        options.put("connector", "rocketmq");
+        options.put("rocketmq.source.topic", "test-topic");
+        options.put("rocketmq.source.group", "test-group");
+        options.put("rocketmq.client.endpoints", "127.0.0.1:9876");
+        return options;
+    }
+
+    @Test
+    void timestampOffsetShouldAutoSetScanMode() {
+        // When user sets startup.offset.timestamp but NOT startup.scan.mode,
+        // the factory should auto-infer scan.mode=timestamp
+        Map<String, String> options = baseOptions();
+        options.put("rocketmq.source.startup.offset.timestamp", "1700000000000");
+
+        DynamicTableSource source = createSource(options);
+        assertThat(source).isInstanceOf(RocketMQScanTableSource.class);
+    }
+
+    @Test
+    void explicitScanModeWithTimestampShouldBeRejected() {
+        // Factory explicitly rejects setting both scan.mode and offset.timestamp
+        Map<String, String> options = baseOptions();
+        options.put("rocketmq.source.startup.scan.mode", "timestamp");
+        options.put("rocketmq.source.startup.offset.timestamp", "1700000000000");
+
+        org.assertj.core.api.Assertions.assertThatThrownBy(() -> createSource(options))
+                .hasStackTraceContaining("Cannot set");
+    }
+
+    @Test
+    void defaultScanModeShouldBeLatest() {
+        // When neither scan.mode nor timestamp is set, default should be "latest"
+        Map<String, String> options = baseOptions();
+
+        DynamicTableSource source = createSource(options);
+        assertThat(source).isInstanceOf(RocketMQScanTableSource.class);
+    }
+}
diff --git a/src/test/java/org/apache/flink/connector/rocketmq/source/table/RocketMQDynamicTableSourceFactoryTest.java b/flink-connector-rocketmq/src/test/java/org/apache/flink/streaming/connectors/rocketmq/table/RocketMQDynamicTableSourceFactoryTest.java
similarity index 96%
rename from src/test/java/org/apache/flink/connector/rocketmq/source/table/RocketMQDynamicTableSourceFactoryTest.java
rename to flink-connector-rocketmq/src/test/java/org/apache/flink/streaming/connectors/rocketmq/table/RocketMQDynamicTableSourceFactoryTest.java
index dab7f44..5f4eff7 100644
--- a/src/test/java/org/apache/flink/connector/rocketmq/source/table/RocketMQDynamicTableSourceFactoryTest.java
+++ b/flink-connector-rocketmq/src/test/java/org/apache/flink/streaming/connectors/rocketmq/table/RocketMQDynamicTableSourceFactoryTest.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.flink.connector.rocketmq.source.table;
+package org.apache.flink.streaming.connectors.rocketmq.table;
 
 import org.apache.flink.configuration.Configuration;
 import org.apache.flink.connector.rocketmq.source.RocketMQSourceOptions;
@@ -30,7 +30,6 @@ import org.apache.flink.table.catalog.ResolvedSchema;
 import org.apache.flink.table.connector.source.DynamicTableSource;
 import org.apache.flink.table.factories.FactoryUtil;
 
-import org.junit.Ignore;
 import org.junit.Test;
 
 import java.util.ArrayList;
@@ -62,6 +61,7 @@ public class RocketMQDynamicTableSourceFactoryTest {
         options.put("connector", IDENTIFIER);
         options.put(RocketMQSourceOptions.TOPIC.key(), TOPIC);
         options.put(RocketMQSourceOptions.CONSUMER_GROUP.key(), CONSUMER_GROUP);
+        options.put(RocketMQSourceOptions.ENDPOINTS.key(), NAME_SERVER_ADDRESS);
         options.put(
                 RocketMQSourceOptions.OPTIONAL_STARTUP_OFFSET_TIMESTAMP.key(),
                 String.valueOf(System.currentTimeMillis()));
@@ -70,7 +70,6 @@ public class RocketMQDynamicTableSourceFactoryTest {
         assertEquals(RocketMQScanTableSource.class.getName(), tableSource.asSummaryString());
     }
 
-    @Ignore
     @Test(expected = ValidationException.class)
     public void testRocketMQDynamicTableSourceWithoutRequiredOption() {
         final Map<String, String> options = new HashMap<>();
@@ -97,6 +96,7 @@ public class RocketMQDynamicTableSourceFactoryTest {
         options.put("connector", IDENTIFIER);
         options.put(RocketMQSourceOptions.TOPIC.key(), TOPIC);
         options.put(RocketMQSourceOptions.CONSUMER_GROUP.key(), CONSUMER_GROUP);
+        options.put(RocketMQSourceOptions.ENDPOINTS.key(), NAME_SERVER_ADDRESS);
         options.put(
                 RocketMQSourceOptions.OPTIONAL_STARTUP_OFFSET_TIMESTAMP.key(),
                 String.valueOf(System.currentTimeMillis()));
diff --git a/flink-connector-rocketmq/src/test/java/org/apache/flink/streaming/connectors/rocketmq/table/RocketMQParameterChainTest.java b/flink-connector-rocketmq/src/test/java/org/apache/flink/streaming/connectors/rocketmq/table/RocketMQParameterChainTest.java
new file mode 100644
index 0000000..f6759c5
--- /dev/null
+++ b/flink-connector-rocketmq/src/test/java/org/apache/flink/streaming/connectors/rocketmq/table/RocketMQParameterChainTest.java
@@ -0,0 +1,112 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.flink.streaming.connectors.rocketmq.table;
+
+import org.apache.flink.configuration.Configuration;
+import org.apache.flink.connector.rocketmq.common.config.RocketMQOptions;
+import org.apache.flink.connector.rocketmq.sink.RocketMQSinkOptions;
+import org.apache.flink.connector.rocketmq.source.RocketMQSourceOptions;
+
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * End-to-end tests verifying that ConfigOption values flow correctly through the Table API chain:
+ * DDL options -> Factory -> TableSource/Sink -> Configuration.
+ */
+class RocketMQParameterChainTest {
+
+    @Test
+    void sourceFactoryShouldDeclareKeyOptionalOptions() {
+        RocketMQDynamicTableSourceFactory factory = new RocketMQDynamicTableSourceFactory();
+        assertThat(factory.optionalOptions())
+                .contains(
+                        RocketMQSourceOptions.OPTIONAL_TAG,
+                        RocketMQSourceOptions.OPTIONAL_SQL,
+                        RocketMQSourceOptions.OPTIONAL_STARTUP_SCAN_MODE,
+                        RocketMQSourceOptions.OPTIONAL_USE_NEW_API,
+                        RocketMQSourceOptions.PULL_BATCH_SIZE,
+                        RocketMQSourceOptions.ENABLE_MESSAGE_TRACE,
+                        RocketMQSourceOptions.CUSTOMIZED_TRACE_TOPIC);
+    }
+
+    @Test
+    void sinkFactoryShouldDeclareKeyOptionalOptions() {
+        RocketMQDynamicTableSinkFactory factory = new RocketMQDynamicTableSinkFactory();
+        assertThat(factory.optionalOptions())
+                .contains(
+                        RocketMQSinkOptions.SEND_RETRY_TIMES,
+                        RocketMQSinkOptions.SEND_TIMEOUT,
+                        RocketMQSinkOptions.SEND_PENDING_MAX,
+                        RocketMQSinkOptions.TRANSACTION_TIMEOUT);
+    }
+
+    @Test
+    void sinkFactoryShouldNotDeclareSerializeFormat() {
+        RocketMQDynamicTableSinkFactory factory = new RocketMQDynamicTableSinkFactory();
+        assertThat(factory.optionalOptions()).doesNotContain(RocketMQSinkOptions.SERIALIZE_FORMAT);
+    }
+
+    @Test
+    void sourceConfigurationShouldPreserveUserValues() {
+        Configuration config = new Configuration();
+
+        // P0 Source options
+        config.setString(RocketMQSourceOptions.OPTIONAL_TAG, "TagA");
+        config.setString(RocketMQSourceOptions.OPTIONAL_SQL, "region = 'hangzhou'");
+
+        // P1 Source options
+        config.setLong(RocketMQSourceOptions.PULL_BATCH_SIZE, 64L);
+        config.setBoolean(RocketMQSourceOptions.ENABLE_MESSAGE_TRACE, true);
+        config.setString(RocketMQSourceOptions.CUSTOMIZED_TRACE_TOPIC, "my-trace");
+
+        // P2 Common options
+        config.setString(RocketMQOptions.NAMESPACE, "my-ns");
+
+        // Verify all values preserved
+        assertThat(config.getString(RocketMQSourceOptions.OPTIONAL_TAG)).isEqualTo("TagA");
+        assertThat(config.getString(RocketMQSourceOptions.OPTIONAL_SQL))
+                .isEqualTo("region = 'hangzhou'");
+        assertThat(config.getLong(RocketMQSourceOptions.PULL_BATCH_SIZE)).isEqualTo(64L);
+        assertThat(config.getBoolean(RocketMQSourceOptions.ENABLE_MESSAGE_TRACE)).isTrue();
+        assertThat(config.getString(RocketMQSourceOptions.CUSTOMIZED_TRACE_TOPIC))
+                .isEqualTo("my-trace");
+        assertThat(config.getString(RocketMQOptions.NAMESPACE)).isEqualTo("my-ns");
+    }
+
+    @Test
+    void sinkConfigurationShouldPreserveUserValues() {
+        Configuration config = new Configuration();
+
+        // P0 Sink options
+        config.setLong(RocketMQSinkOptions.SEND_TIMEOUT, 8000L);
+        config.setInteger(RocketMQSinkOptions.SEND_RETRY_TIMES, 5);
+        config.setInteger(RocketMQSinkOptions.SEND_PENDING_MAX, 2000);
+
+        // P1 Sink options
+        config.setLong(RocketMQSinkOptions.TRANSACTION_TIMEOUT, 600L);
+
+        // Verify all values preserved
+        assertThat(config.getLong(RocketMQSinkOptions.SEND_TIMEOUT)).isEqualTo(8000L);
+        assertThat(config.getInteger(RocketMQSinkOptions.SEND_RETRY_TIMES)).isEqualTo(5);
+        assertThat(config.getInteger(RocketMQSinkOptions.SEND_PENDING_MAX)).isEqualTo(2000);
+        assertThat(config.getLong(RocketMQSinkOptions.TRANSACTION_TIMEOUT)).isEqualTo(600L);
+    }
+}
diff --git a/flink-connector-rocketmq/src/test/java/org/apache/flink/streaming/connectors/rocketmq/table/RocketMQScanTableSourceFilterTest.java b/flink-connector-rocketmq/src/test/java/org/apache/flink/streaming/connectors/rocketmq/table/RocketMQScanTableSourceFilterTest.java
new file mode 100644
index 0000000..bcf163b
--- /dev/null
+++ b/flink-connector-rocketmq/src/test/java/org/apache/flink/streaming/connectors/rocketmq/table/RocketMQScanTableSourceFilterTest.java
@@ -0,0 +1,125 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.flink.streaming.connectors.rocketmq.table;
+
+import org.apache.flink.table.api.DataTypes;
+import org.apache.flink.table.api.TableSchema;
+import org.apache.flink.table.descriptors.DescriptorProperties;
+
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/** Tests for verifying tag/sql filter configuration in the new API path. */
+class RocketMQScanTableSourceFilterTest {
+
+    @Test
+    void tagFilterShouldBePreservedOnCopy() {
+        DescriptorProperties props = new DescriptorProperties();
+        TableSchema schema =
+                TableSchema.builder()
+                        .field("id", DataTypes.BIGINT())
+                        .field("name", DataTypes.STRING())
+                        .build();
+
+        RocketMQScanTableSource source =
+                new RocketMQScanTableSource(
+                        10L,
+                        props,
+                        schema,
+                        "test-topic",
+                        "test-group",
+                        "127.0.0.1:9876",
+                        null,
+                        null,
+                        "TagA",
+                        null,
+                        Long.MAX_VALUE,
+                        -1L,
+                        -1L,
+                        10000L,
+                        "latest",
+                        -1L,
+                        true);
+
+        RocketMQScanTableSource copy = (RocketMQScanTableSource) source.copy();
+        assertThat(copy).isNotNull();
+        assertThat(copy.asSummaryString()).isEqualTo(source.asSummaryString());
+    }
+
+    @Test
+    void sqlFilterShouldBePreservedOnCopy() {
+        DescriptorProperties props = new DescriptorProperties();
+        TableSchema schema =
+                TableSchema.builder().field("id", DataTypes.BIGINT()).build();
+
+        RocketMQScanTableSource source =
+                new RocketMQScanTableSource(
+                        10L,
+                        props,
+                        schema,
+                        "test-topic",
+                        "test-group",
+                        "127.0.0.1:9876",
+                        null,
+                        null,
+                        "*",
+                        "region = 'hangzhou'",
+                        Long.MAX_VALUE,
+                        -1L,
+                        -1L,
+                        10000L,
+                        "latest",
+                        -1L,
+                        true);
+
+        RocketMQScanTableSource copy = (RocketMQScanTableSource) source.copy();
+        assertThat(copy).isNotNull();
+    }
+
+    @Test
+    void wildcardTagShouldMatchAllMessages() {
+        // "*" is the default tag and should not filter any messages
+        DescriptorProperties props = new DescriptorProperties();
+        TableSchema schema =
+                TableSchema.builder().field("id", DataTypes.BIGINT()).build();
+
+        RocketMQScanTableSource source =
+                new RocketMQScanTableSource(
+                        10L,
+                        props,
+                        schema,
+                        "test-topic",
+                        "test-group",
+                        "127.0.0.1:9876",
+                        null,
+                        null,
+                        "*",
+                        null,
+                        Long.MAX_VALUE,
+                        -1L,
+                        -1L,
+                        10000L,
+                        "latest",
+                        -1L,
+                        true);
+
+        assertThat(source).isNotNull();
+    }
+}
diff --git a/flink-connector-rocketmq/src/test/java/org/apache/flink/streaming/connectors/rocketmq/table/RocketMQScanTableSourceTest.java b/flink-connector-rocketmq/src/test/java/org/apache/flink/streaming/connectors/rocketmq/table/RocketMQScanTableSourceTest.java
new file mode 100644
index 0000000..0000f9f
--- /dev/null
+++ b/flink-connector-rocketmq/src/test/java/org/apache/flink/streaming/connectors/rocketmq/table/RocketMQScanTableSourceTest.java
@@ -0,0 +1,184 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.flink.streaming.connectors.rocketmq.table;
+
+import org.apache.flink.connector.rocketmq.source.RocketMQSource;
+import org.apache.flink.table.api.DataTypes;
+import org.apache.flink.table.api.TableSchema;
+import org.apache.flink.table.connector.source.ScanTableSource;
+import org.apache.flink.table.connector.source.SourceProvider;
+import org.apache.flink.table.descriptors.DescriptorProperties;
+import org.apache.flink.table.runtime.connector.source.ScanRuntimeProviderContext;
+
+import org.junit.jupiter.api.Test;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/** Tests for {@link RocketMQScanTableSource}. */
+class RocketMQScanTableSourceTest {
+
+    @Test
+    void scanRuntimeProviderWithNewApiShouldReturnSourceProviderTest() {
+        DescriptorProperties properties = createBaseProperties();
+        TableSchema schema = createTableSchema();
+
+        RocketMQScanTableSource tableSource =
+                new RocketMQScanTableSource(
+                        30000L, // pollTime
+                        properties,
+                        schema,
+                        "test-topic", // topic
+                        "test-group", // consumerGroup
+                        "127.0.0.1:9876", // nameServerAddress
+                        null, // accessKey
+                        null, // secretKey
+                        "*", // tag
+                        null, // sql
+                        Long.MAX_VALUE, // stopInMs (unbounded)
+                        -1L, // startMessageOffset
+                        -1L, // startTime
+                        10000L, // partitionDiscoveryIntervalMs
+                        "latest", // consumerOffsetMode
+                        System.currentTimeMillis(), // consumerOffsetTimestamp
+                        true); // useNewApi
+
+        ScanTableSource.ScanRuntimeProvider provider =
+                tableSource.getScanRuntimeProvider(ScanRuntimeProviderContext.INSTANCE);
+
+        assertThat(provider).isInstanceOf(SourceProvider.class);
+    }
+
+    @Test
+    void scanRuntimeProviderWithNewApiAndBoundedShouldSucceedTest() {
+        DescriptorProperties properties = createBaseProperties();
+        TableSchema schema = createTableSchema();
+
+        long stopTime = System.currentTimeMillis() + 3600000L;
+
+        RocketMQScanTableSource tableSource =
+                new RocketMQScanTableSource(
+                        30000L,
+                        properties,
+                        schema,
+                        "test-topic",
+                        "test-group",
+                        "127.0.0.1:9876",
+                        null,
+                        null,
+                        "*",
+                        null,
+                        stopTime, // stopInMs (bounded)
+                        -1L,
+                        -1L,
+                        10000L,
+                        "latest",
+                        System.currentTimeMillis(),
+                        true);
+
+        ScanTableSource.ScanRuntimeProvider provider =
+                tableSource.getScanRuntimeProvider(ScanRuntimeProviderContext.INSTANCE);
+
+        assertThat(provider).isInstanceOf(SourceProvider.class);
+    }
+
+    @Test
+    void scanRuntimeProviderWithNewApiAndEarliestOffsetShouldSucceedTest() {
+        DescriptorProperties properties = createBaseProperties();
+        TableSchema schema = createTableSchema();
+
+        RocketMQScanTableSource tableSource =
+                new RocketMQScanTableSource(
+                        30000L,
+                        properties,
+                        schema,
+                        "test-topic",
+                        "test-group",
+                        "127.0.0.1:9876",
+                        null,
+                        null,
+                        "*",
+                        null,
+                        Long.MAX_VALUE,
+                        -1L,
+                        -1L,
+                        10000L,
+                        "earliest",
+                        System.currentTimeMillis(),
+                        true);
+
+        ScanTableSource.ScanRuntimeProvider provider =
+                tableSource.getScanRuntimeProvider(ScanRuntimeProviderContext.INSTANCE);
+
+        assertThat(provider).isInstanceOf(SourceProvider.class);
+    }
+
+    @Test
+    void scanRuntimeProviderWithNewApiAndTimestampOffsetShouldSucceedTest() {
+        DescriptorProperties properties = createBaseProperties();
+        TableSchema schema = createTableSchema();
+
+        long timestamp = 1700000000000L;
+
+        RocketMQScanTableSource tableSource =
+                new RocketMQScanTableSource(
+                        30000L,
+                        properties,
+                        schema,
+                        "test-topic",
+                        "test-group",
+                        "127.0.0.1:9876",
+                        null,
+                        null,
+                        "*",
+                        null,
+                        Long.MAX_VALUE,
+                        -1L,
+                        timestamp,
+                        10000L,
+                        "timestamp",
+                        timestamp,
+                        true);
+
+        ScanTableSource.ScanRuntimeProvider provider =
+                tableSource.getScanRuntimeProvider(ScanRuntimeProviderContext.INSTANCE);
+
+        assertThat(provider).isInstanceOf(SourceProvider.class);
+    }
+
+    private DescriptorProperties createBaseProperties() {
+        Map<String, String> props = new HashMap<>();
+        props.put("connector", "rocketmq");
+        props.put("rocketmq.source.topic", "test-topic");
+        props.put("rocketmq.source.group", "test-group");
+        props.put("rocketmq.client.endpoints", "127.0.0.1:9876");
+        DescriptorProperties descriptorProperties = new DescriptorProperties();
+        descriptorProperties.putProperties(props);
+        descriptorProperties.putTableSchema("schema", createTableSchema());
+        return descriptorProperties;
+    }
+
+    private TableSchema createTableSchema() {
+        return TableSchema.builder()
+                .field("id", DataTypes.BIGINT())
+                .field("name", DataTypes.STRING())
+                .build();
+    }
+}
diff --git a/flink-connector-rocketmq/src/test/resources/META-INF/services/org.apache.flink.table.factories.Factory b/flink-connector-rocketmq/src/test/resources/META-INF/services/org.apache.flink.table.factories.Factory
new file mode 100644
index 0000000..9aea4bc
--- /dev/null
+++ b/flink-connector-rocketmq/src/test/resources/META-INF/services/org.apache.flink.table.factories.Factory
@@ -0,0 +1,2 @@
+org.apache.flink.streaming.connectors.rocketmq.table.RocketMQDynamicTableSourceFactory
+org.apache.flink.streaming.connectors.rocketmq.table.RocketMQDynamicTableSinkFactory
diff --git a/flink-connector-rocketmq/src/test/resources/log4j2-test.xml b/flink-connector-rocketmq/src/test/resources/log4j2-test.xml
new file mode 100644
index 0000000..c0b887d
--- /dev/null
+++ b/flink-connector-rocketmq/src/test/resources/log4j2-test.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Configuration status="WARN">
+    <Appenders>
+        <Console name="Console" target="SYSTEM_OUT">
+            <PatternLayout pattern="%d{HH:mm:ss.SSS} %-5level [%t] %logger{36} - %msg%n"/>
+        </Console>
+    </Appenders>
+    <Loggers>
+        <!-- RocketMQ connector internals -->
+        <Logger name="org.apache.flink.connector.rocketmq" level="DEBUG"/>
+        <!-- Flink runtime source/scheduler -->
+        <Logger name="org.apache.flink.runtime.source" level="DEBUG"/>
+        <Logger name="org.apache.flink.runtime.scheduler" level="INFO"/>
+        <Logger name="org.apache.flink.runtime.executiongraph" level="INFO"/>
+        <Logger name="org.apache.flink.runtime.taskmanager" level="INFO"/>
+        <Logger name="org.apache.flink.streaming" level="INFO"/>
+        <!-- RocketMQ client -->
+        <Logger name="org.apache.rocketmq" level="WARN"/>
+        <!-- Root -->
+        <Root level="INFO">
+            <AppenderRef ref="Console"/>
+        </Root>
+    </Loggers>
+</Configuration>
diff --git a/flink-sql-connector-rocketmq/pom.xml b/flink-sql-connector-rocketmq/pom.xml
new file mode 100644
index 0000000..1724963
--- /dev/null
+++ b/flink-sql-connector-rocketmq/pom.xml
@@ -0,0 +1,160 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.flink</groupId>
+        <artifactId>flink-connector-rocketmq-parent</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>flink-sql-connector-rocketmq</artifactId>
+    <name>Flink : Connectors : RocketMQ : SQL</name>
+    <packaging>jar</packaging>
+
+    <properties>
+        <japicmp.skip>true</japicmp.skip>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.flink</groupId>
+            <artifactId>flink-connector-rocketmq</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.flink</groupId>
+            <artifactId>flink-connector-base</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <!-- Test dependencies -->
+        <dependency>
+            <groupId>org.apache.flink</groupId>
+            <artifactId>flink-test-utils</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.flink</groupId>
+            <artifactId>flink-table-common</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>shade-flink</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <artifactSet>
+                                <includes>
+                                    <include>org.apache.flink:flink-connector-rocketmq</include>
+                                    <include>org.apache.rocketmq:*</include>
+                                    <include>org.apache.rocketmq:schema-registry-client</include>
+                                    <include>commons-lang:commons-lang</include>
+                                    <include>com.google.guava:guava</include>
+                                    <include>com.google.guava:failureaccess</include>
+                                </includes>
+                            </artifactSet>
+                            <filters>
+                                <filter>
+                                    <artifact>*:*</artifact>
+                                    <excludes>
+                                        <exclude>META-INF/*.SF</exclude>
+                                        <exclude>META-INF/*.DSA</exclude>
+                                        <exclude>META-INF/*.RSA</exclude>
+                                    </excludes>
+                                </filter>
+                                <filter>
+                                    <artifact>org.apache.rocketmq:*</artifact>
+                                    <excludes>
+                                        <exclude>LICENSE</exclude>
+                                        <exclude>NOTICE</exclude>
+                                    </excludes>
+                                </filter>
+                            </filters>
+                            <relocations>
+                                <relocation>
+                                    <pattern>org.apache.rocketmq</pattern>
+                                    <shadedPattern>org.apache.flink.rocketmq.shaded.org.apache.rocketmq</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>io.grpc</pattern>
+                                    <shadedPattern>org.apache.flink.rocketmq.shaded.io.grpc</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>io.netty</pattern>
+                                    <shadedPattern>org.apache.flink.rocketmq.shaded.io.netty</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>com.google.protobuf</pattern>
+                                    <shadedPattern>org.apache.flink.rocketmq.shaded.com.google.protobuf</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>com.google.common</pattern>
+                                    <shadedPattern>org.apache.flink.rocketmq.shaded.com.google.common</shadedPattern>
+                                </relocation>
+                            </relocations>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>analyze-deps</id>
+                        <goals>
+                            <goal>analyze</goal>
+                        </goals>
+                        <phase>verify</phase>
+                        <configuration>
+                            <ignoredUnusedDeclaredDependencies>
+                                org.apache.flink:flink-connector-rocketmq
+                            </ignoredUnusedDeclaredDependencies>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory b/flink-sql-connector-rocketmq/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory
similarity index 83%
rename from src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory
rename to flink-sql-connector-rocketmq/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory
index 00a2a7f..8dbf8bf 100644
--- a/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory
+++ b/flink-sql-connector-rocketmq/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory
@@ -13,6 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-org.apache.flink.connector.rocketmq.source.table.RocketMQDynamicTableSourceFactory
-org.apache.flink.connector.rocketmq.sink.table.RocketMQDynamicTableSinkFactory
+org.apache.flink.streaming.connectors.rocketmq.table.RocketMQDynamicTableSourceFactory
+org.apache.flink.streaming.connectors.rocketmq.table.RocketMQDynamicTableSinkFactory
 org.apache.flink.connector.rocketmq.catalog.RocketMQCatalogFactory
diff --git a/pom.xml b/pom.xml
index 2eddd1a..c92cf4f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,378 +1,567 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project
+        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+        xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
     <modelVersion>4.0.0</modelVersion>
 
+    <parent>
+        <groupId>org.apache.flink</groupId>
+        <artifactId>flink-connector-parent</artifactId>
+        <version>1.0.0</version>
+        <relativePath/>
+    </parent>
+
     <groupId>org.apache.flink</groupId>
-    <artifactId>flink-connector-rocketmq</artifactId>
-    <name>Flink : Connectors : RocketMQ</name>
-    <version>1.15.0</version>
-    <packaging>jar</packaging>
+    <artifactId>flink-connector-rocketmq-parent</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <name>Flink : Connectors : RocketMQ : Parent</name>
+    <packaging>pom</packaging>
+    <url>https://flink.apache.org</url>
+    <inceptionYear>2022</inceptionYear>
+
+    <licenses>
+        <license>
+            <name>The Apache Software License, Version 2.0</name>
+            <url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+
+    <mailingLists>
+        <mailingList>
+            <name>Apache Flink Dev Mailing List</name>
+            <subscribe>dev-subscribe@flink.apache.org</subscribe>
+            <unsubscribe>dev-unsubscribe@flink.apache.org</unsubscribe>
+            <post>dev@flink.apache.org</post>
+            <archive>https://lists.apache.org/list.html?dev@flink.apache.org</archive>
+        </mailingList>
+        <mailingList>
+            <name>Apache RocketMQ Dev Mailing List</name>
+            <subscribe>dev-subscribe@rocketmq.apache.org</subscribe>
+            <unsubscribe>dev-unsubscribe@rocketmq.apache.org</unsubscribe>
+            <post>dev@rocketmq.apache.org</post>
+            <archive>https://lists.apache.org/list.html?dev@rocketmq.apache.org</archive>
+        </mailingList>
+    </mailingLists>
+
+    <scm>
+        <url>https://github.com/apache/rocketmq-flink</url>
+        <connection>git@github.com:apache/rocketmq-flink.git</connection>
+        <developerConnection>
+            scm:git:https://gitbox.apache.org/repos/asf/rocketmq-flink.git
+        </developerConnection>
+    </scm>
+
+    <modules>
+        <module>flink-connector-rocketmq</module>
+        <module>flink-sql-connector-rocketmq</module>
+    </modules>
 
     <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <!--maven properties -->
-        <maven.test.skip>false</maven.test.skip>
-        <maven.javadoc.skip>false</maven.javadoc.skip>
-        <!-- compiler settings properties -->
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
-        <!-- rocketmq version -->
+        <flink.parent.artifactId>flink-connector-rocketmq-parent</flink.parent.artifactId>
+
+        <!-- Main Dependencies -->
+        <flink.version>1.20.3</flink.version>
         <rocketmq.version>5.1.1</rocketmq.version>
+        <rocketmq.client.java.version>5.2.1</rocketmq.client.java.version>
         <rocketmq.schema.registry.version>0.1.0</rocketmq.schema.registry.version>
-        <!-- dependency version -->
-        <slf4j-api.version>2.0.5</slf4j-api.version>
-        <logback.version>1.3.5</logback.version>
         <commons-lang.version>2.6</commons-lang.version>
-        <spotless.version>2.13.0</spotless.version>
-        <junit.version>4.13.2</junit.version>
-        <junit-jupiter.version>5.9.2</junit-jupiter.version>
-        <powermock.version>1.7.4</powermock.version>
-        <jaxb-api.version>2.3.1</jaxb-api.version>
+
+        <!-- Other Dependencies -->
+        <jsr305.version>1.3.9</jsr305.version>
+        <slf4j.version>1.7.36</slf4j.version>
+        <log4j.version>2.17.2</log4j.version>
+
+        <!-- Test Dependencies -->
+        <archunit.version>1.4.1</archunit.version>
+        <assertj.version>3.23.1</assertj.version>
+        <guava.version>32.1.3-jre</guava.version>
+        <junit5.version>5.9.2</junit5.version>
+        <mockito.version>4.11.0</mockito.version>
+        <testcontainers.version>1.21.4</testcontainers.version>
+
+        <!-- Plugins -->
+        <japicmp.skip>true</japicmp.skip>
+        <maven.dependency.plugin.version>3.8.1</maven.dependency.plugin.version>
     </properties>
 
     <dependencies>
-        <!-- Core -->
+        <!-- Root dependencies for all projects -->
+
+        <!-- Logging API -->
         <dependency>
-            <groupId>org.apache.flink</groupId>
-            <artifactId>flink-streaming-java</artifactId>
-            <version>${project.version}</version>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
             <scope>provided</scope>
         </dependency>
 
-        <!-- Connectors -->
+        <!-- 'javax.annotation' classes like '@Nullable' -->
         <dependency>
-            <groupId>org.apache.flink</groupId>
-            <artifactId>flink-connector-base</artifactId>
-            <version>${project.version}</version>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
             <scope>provided</scope>
         </dependency>
 
+        <!-- Test dependencies -->
         <dependency>
-            <groupId>org.apache.flink</groupId>
-            <artifactId>flink-clients</artifactId>
-            <version>${project.version}</version>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.flink</groupId>
-            <artifactId>flink-runtime-web</artifactId>
-            <version>${project.version}</version>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
             <scope>test</scope>
         </dependency>
 
-        <!-- Table ecosystem -->
-        <dependency>
-            <groupId>org.apache.flink</groupId>
-            <artifactId>flink-table-runtime</artifactId>
-            <version>${project.version}</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.flink</groupId>
-            <artifactId>flink-avro</artifactId>
-            <version>${project.version}</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <!-- RocketMQ -->
         <dependency>
-            <groupId>org.apache.rocketmq</groupId>
-            <artifactId>rocketmq-client</artifactId>
-            <version>${rocketmq.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>io.github.aliyunmq</groupId>
-                    <artifactId>rocketmq-logback-classic</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>io.github.aliyunmq</groupId>
-                    <artifactId>rocketmq-shaded-slf4j-api-bridge</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.rocketmq</groupId>
-            <artifactId>rocketmq-acl</artifactId>
-            <version>${rocketmq.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>io.github.aliyunmq</groupId>
-                    <artifactId>rocketmq-logback-classic</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>io.github.aliyunmq</groupId>
-                    <artifactId>rocketmq-shaded-slf4j-api-bridge</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.rocketmq</groupId>
-            <artifactId>rocketmq-common</artifactId>
-            <version>${rocketmq.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>io.netty</groupId>
-                    <artifactId>netty-tcnative</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.rocketmq</groupId>
-            <artifactId>rocketmq-tools</artifactId>
-            <version>${rocketmq.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>io.github.aliyunmq</groupId>
-                    <artifactId>rocketmq-logback-classic</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>io.github.aliyunmq</groupId>
-                    <artifactId>rocketmq-shaded-slf4j-api-bridge</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.rocketmq</groupId>
-            <artifactId>schema-registry-client</artifactId>
-            <version>${rocketmq.schema.registry.version}</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>commons-lang</groupId>
-            <artifactId>commons-lang</artifactId>
-            <version>${commons-lang.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-            <version>${slf4j-api.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-            <version>${logback.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-core</artifactId>
-            <version>${logback.version}</version>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <scope>test</scope>
         </dependency>
 
-        <!--test -->
+        <!-- Tests will have log4j as the default logging framework available -->
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>${junit.version}</version>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-slf4j-impl</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.powermock</groupId>
-            <artifactId>powermock-api-mockito</artifactId>
-            <version>${powermock.version}</version>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-api</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.powermock</groupId>
-            <artifactId>powermock-module-junit4</artifactId>
-            <version>${powermock.version}</version>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-core</artifactId>
             <scope>test</scope>
         </dependency>
+
         <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter</artifactId>
-            <version>${junit-jupiter.version}</version>
+            <groupId>org.apache.flink</groupId>
+            <artifactId>flink-test-utils-junit</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
 
+    <dependencyManagement>
+        <dependencies>
+            <!-- RocketMQ dependencies -->
+            <dependency>
+                <groupId>org.apache.rocketmq</groupId>
+                <artifactId>rocketmq-client</artifactId>
+                <version>${rocketmq.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>io.github.aliyunmq</groupId>
+                        <artifactId>rocketmq-logback-classic</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>io.github.aliyunmq</groupId>
+                        <artifactId>rocketmq-shaded-slf4j-api-bridge</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.rocketmq</groupId>
+                <artifactId>rocketmq-acl</artifactId>
+                <version>${rocketmq.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>io.github.aliyunmq</groupId>
+                        <artifactId>rocketmq-logback-classic</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>io.github.aliyunmq</groupId>
+                        <artifactId>rocketmq-shaded-slf4j-api-bridge</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.rocketmq</groupId>
+                <artifactId>rocketmq-common</artifactId>
+                <version>${rocketmq.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>io.netty</groupId>
+                        <artifactId>netty-tcnative</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.rocketmq</groupId>
+                <artifactId>rocketmq-tools</artifactId>
+                <version>${rocketmq.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>io.github.aliyunmq</groupId>
+                        <artifactId>rocketmq-logback-classic</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>io.github.aliyunmq</groupId>
+                        <artifactId>rocketmq-shaded-slf4j-api-bridge</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.rocketmq</groupId>
+                <artifactId>schema-registry-client</artifactId>
+                <version>${rocketmq.schema.registry.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.projectlombok</groupId>
+                        <artifactId>lombok</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+
+            <!-- RocketMQ gRPC client (5.x), self-contained shaded jar -->
+            <dependency>
+                <groupId>org.apache.rocketmq</groupId>
+                <artifactId>rocketmq-client-java</artifactId>
+                <version>${rocketmq.client.java.version}</version>
+            </dependency>
+
+            <!-- Flink dependencies -->
+            <dependency>
+                <groupId>org.apache.flink</groupId>
+                <artifactId>flink-core</artifactId>
+                <version>${flink.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.flink</groupId>
+                <artifactId>flink-streaming-java</artifactId>
+                <version>${flink.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.flink</groupId>
+                <artifactId>flink-connector-base</artifactId>
+                <version>${flink.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.flink</groupId>
+                <artifactId>flink-table-runtime</artifactId>
+                <version>${flink.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.flink</groupId>
+                <artifactId>flink-table-common</artifactId>
+                <version>${flink.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.flink</groupId>
+                <artifactId>flink-table-api-java-bridge</artifactId>
+                <version>${flink.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.flink</groupId>
+                <artifactId>flink-avro</artifactId>
+                <version>${flink.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.flink</groupId>
+                <artifactId>flink-clients</artifactId>
+                <version>${flink.version}</version>
+            </dependency>
+
+            <!-- Flink test-jars -->
+            <dependency>
+                <groupId>org.apache.flink</groupId>
+                <artifactId>flink-core</artifactId>
+                <version>${flink.version}</version>
+                <type>test-jar</type>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.flink</groupId>
+                <artifactId>flink-streaming-java</artifactId>
+                <version>${flink.version}</version>
+                <type>test-jar</type>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.flink</groupId>
+                <artifactId>flink-connector-base</artifactId>
+                <version>${flink.version}</version>
+                <type>test-jar</type>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.flink</groupId>
+                <artifactId>flink-runtime</artifactId>
+                <version>${flink.version}</version>
+                <type>test-jar</type>
+            </dependency>
+
+            <!-- Flink test infrastructure -->
+            <dependency>
+                <groupId>org.apache.flink</groupId>
+                <artifactId>flink-test-utils</artifactId>
+                <version>${flink.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.flink</groupId>
+                <artifactId>flink-test-utils-junit</artifactId>
+                <version>${flink.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.flink</groupId>
+                <artifactId>flink-connector-test-utils</artifactId>
+                <version>${flink.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.flink</groupId>
+                <artifactId>flink-table-test-utils</artifactId>
+                <version>${flink.version}</version>
+            </dependency>
+
+            <!-- Flink ArchUnit -->
+            <dependency>
+                <groupId>com.tngtech.archunit</groupId>
+                <artifactId>archunit</artifactId>
+                <version>${archunit.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.tngtech.archunit</groupId>
+                <artifactId>archunit-junit5-api</artifactId>
+                <version>${archunit.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.flink</groupId>
+                <artifactId>flink-architecture-tests-base</artifactId>
+                <version>${flink.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.flink</groupId>
+                <artifactId>flink-architecture-tests-test</artifactId>
+                <version>${flink.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.flink</groupId>
+                <artifactId>flink-architecture-tests-production</artifactId>
+                <version>${flink.version}</version>
+            </dependency>
+
+            <!-- Common dependencies -->
+            <dependency>
+                <groupId>com.google.code.findbugs</groupId>
+                <artifactId>jsr305</artifactId>
+                <version>${jsr305.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-api</artifactId>
+                <version>${slf4j.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.logging.log4j</groupId>
+                <artifactId>log4j-slf4j-impl</artifactId>
+                <version>${log4j.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.logging.log4j</groupId>
+                <artifactId>log4j-api</artifactId>
+                <version>${log4j.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.logging.log4j</groupId>
+                <artifactId>log4j-core</artifactId>
+                <version>${log4j.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>commons-lang</groupId>
+                <artifactId>commons-lang</artifactId>
+                <version>${commons-lang.version}</version>
+            </dependency>
+
+            <!-- Don't use guava in production code -->
+            <dependency>
+                <groupId>com.google.guava</groupId>
+                <artifactId>guava</artifactId>
+                <version>${guava.version}</version>
+            </dependency>
+
+            <!-- For dependency convergence -->
+            <dependency>
+                <groupId>org.junit</groupId>
+                <artifactId>junit-bom</artifactId>
+                <version>${junit5.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>org.assertj</groupId>
+                <artifactId>assertj-core</artifactId>
+                <version>${assertj.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.mockito</groupId>
+                <artifactId>mockito-core</artifactId>
+                <version>${mockito.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.testcontainers</groupId>
+                <artifactId>testcontainers-bom</artifactId>
+                <version>${testcontainers.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <build>
         <plugins>
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <version>3.2.4</version>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                        <configuration>
-                            <filters>
-                                <filter>
-                                    <artifact>*:*</artifact>
-                                    <excludes>
-                                        <exclude>META-INF/*.SF</exclude>
-                                        <exclude>META-INF/*.DSA</exclude>
-                                        <exclude>META-INF/*.RSA</exclude>
-                                    </excludes>
-                                </filter>
-                            </filters>
-                            <transformers>
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
-                                    <resource>reference.conf</resource>
-                                </transformer>
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                                    <mainClass>org.apache.flink.connector.rocketmq.legacy.example.RocketMQFlinkExample</mainClass>
-                                </transformer>
-                            </transformers>
-                        </configuration>
-                    </execution>
-                </executions>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <inherited>false</inherited>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.apache.flink</groupId>
+                        <artifactId>flink-ci-tools</artifactId>
+                        <version>${flink.version}</version>
+                    </dependency>
+                </dependencies>
             </plugin>
 
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.10.0</version>
-                <configuration>
-                    <source>${maven.compiler.source}</source>
-                    <target>${maven.compiler.target}</target>
-                    <compilerVersion>${maven.compiler.source}</compilerVersion>
-                    <showDeprecation>true</showDeprecation>
-                    <showWarnings>true</showWarnings>
-                </configuration>
+                <artifactId>maven-jar-plugin</artifactId>
             </plugin>
 
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.12.4</version>
-                <configuration>
-                    <skipTests>${maven.test.skip}</skipTests>
-                </configuration>
+                <!-- activate API compatibility checks -->
+                <groupId>io.github.zentol.japicmp</groupId>
+                <artifactId>japicmp-maven-plugin</artifactId>
             </plugin>
 
             <plugin>
                 <groupId>org.apache.rat</groupId>
                 <artifactId>apache-rat-plugin</artifactId>
-                <version>0.12</version>
+                <inherited>false</inherited>
                 <configuration>
                     <excludes>
                         <exclude>.gitignore</exclude>
                         <exclude>.travis.yml</exclude>
                         <exclude>.asf.yaml</exclude>
                         <exclude>README.md</exclude>
+                        <exclude>docs/**</exclude>
                     </excludes>
                 </configuration>
             </plugin>
 
-	        <plugin>
-                <groupId>org.jacoco</groupId>
-                <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.8.7</version>
-                <executions>
-                    <execution>
-                        <id>prepare-agent</id>
-                        <goals>
-                            <goal>prepare-agent</goal>
-                        </goals>
-                    </execution>
-                </executions>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+                <configuration>
+                    <includeTestSourceDirectory>false</includeTestSourceDirectory>
+                    <sourceDirectories>
+                        <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
+                        <sourceDirectory>${project.build.testSourceDirectory}</sourceDirectory>
+                    </sourceDirectories>
+                </configuration>
             </plugin>
 
             <plugin>
-                <groupId>org.eluder.coveralls</groupId>
-                <artifactId>coveralls-maven-plugin</artifactId>
-                <version>4.3.0</version>
-                <dependencies>
-                    <dependency>
-                        <groupId>javax.xml.bind</groupId>
-                        <artifactId>jaxb-api</artifactId>
-                        <version>${jaxb-api.version}</version>
-                    </dependency>
-                </dependencies>
+                <groupId>com.diffplug.spotless</groupId>
+                <artifactId>spotless-maven-plugin</artifactId>
             </plugin>
 
-
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.10.4</version>
+                <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <aggregate>true</aggregate>
-                    <reportOutputDirectory>javadocs</reportOutputDirectory>
-                    <locale>en</locale>
+                    <source>11</source>
+                    <target>11</target>
                 </configuration>
             </plugin>
 
-            <!-- Due to the Flink build setup, "mvn spotless:apply" and "mvn spotless:check"
-				don't work. You have to use the fully qualified name, i.e.
-				"mvn com.diffplug.spotless:spotless-maven-plugin:apply" -->
             <plugin>
-                <groupId>com.diffplug.spotless</groupId>
-                <artifactId>spotless-maven-plugin</artifactId>
-                <version>${spotless.version}</version>
-                <configuration>
-                    <java>
-                        <googleJavaFormat>
-                            <version>1.7</version>
-                            <style>AOSP</style>
-                        </googleJavaFormat>
-
-                        <!-- \# refers to the static imports -->
-                        <importOrder>
-                            <order>org.apache.flink,org.apache.flink.shaded,,javax,java,scala,\#</order>
-                        </importOrder>
-
-                        <removeUnusedImports />
-                    </java>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>spotless-check</id>
-                        <phase>validate</phase>
-                        <goals>
-                            <goal>check</goal>
-                        </goals>
-                    </execution>
-                </executions>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
             </plugin>
 
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-source-plugin</artifactId>
-                <version>3.0.1</version>
+                <artifactId>maven-shade-plugin</artifactId>
+            </plugin>
+
+            <plugin>
+                <groupId>org.commonjava.maven.plugins</groupId>
+                <artifactId>directory-maven-plugin</artifactId>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <version>${maven.dependency.plugin.version}</version>
                 <executions>
                     <execution>
-                        <id>attach-sources</id>
-                        <phase>compile</phase>
+                        <id>analyze-deps</id>
                         <goals>
-                            <goal>jar-no-fork</goal>
+                            <goal>analyze</goal>
                         </goals>
+                        <phase>verify</phase>
+                        <configuration>
+                            <failOnWarning>true</failOnWarning>
+                            <ignoreAllNonTestScoped>true</ignoreAllNonTestScoped>
+                        </configuration>
                     </execution>
                 </executions>
             </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-enforcer-plugin</artifactId>
+            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/MetricUtil.java b/src/main/java/org/apache/flink/connector/rocketmq/MetricUtil.java
deleted file mode 100644
index 528d0fe..0000000
--- a/src/main/java/org/apache/flink/connector/rocketmq/MetricUtil.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.flink.connector.rocketmq;
-
-public class MetricUtil {}
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/legacy/common/watermark/BoundedOutOfOrdernessGenerator.java b/src/main/java/org/apache/flink/connector/rocketmq/legacy/common/watermark/BoundedOutOfOrdernessGenerator.java
deleted file mode 100644
index 68dea07..0000000
--- a/src/main/java/org/apache/flink/connector/rocketmq/legacy/common/watermark/BoundedOutOfOrdernessGenerator.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.flink.connector.rocketmq.legacy.common.watermark;
-
-import org.apache.flink.streaming.api.functions.AssignerWithPeriodicWatermarks;
-import org.apache.flink.streaming.api.watermark.Watermark;
-
-import org.apache.rocketmq.common.message.MessageExt;
-
-public class BoundedOutOfOrdernessGenerator implements AssignerWithPeriodicWatermarks<MessageExt> {
-
-    private long maxOutOfOrderness = 5000; // 5 seconds
-
-    private long currentMaxTimestamp;
-
-    public BoundedOutOfOrdernessGenerator() {}
-
-    public BoundedOutOfOrdernessGenerator(long maxOutOfOrderness) {
-        this.maxOutOfOrderness = maxOutOfOrderness;
-    }
-
-    @Override
-    public long extractTimestamp(MessageExt element, long previousElementTimestamp) {
-        long timestamp = element.getBornTimestamp();
-        currentMaxTimestamp = Math.max(timestamp, currentMaxTimestamp);
-        return timestamp;
-    }
-
-    @Override
-    public Watermark getCurrentWatermark() {
-        // return the watermark as current highest timestamp minus the out-of-orderness bound
-        return new Watermark(currentMaxTimestamp - maxOutOfOrderness);
-    }
-
-    @Override
-    public String toString() {
-        return "BoundedOutOfOrdernessGenerator{"
-                + "maxOutOfOrderness="
-                + maxOutOfOrderness
-                + ", currentMaxTimestamp="
-                + currentMaxTimestamp
-                + '}';
-    }
-}
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/legacy/common/watermark/BoundedOutOfOrdernessGeneratorPerQueue.java b/src/main/java/org/apache/flink/connector/rocketmq/legacy/common/watermark/BoundedOutOfOrdernessGeneratorPerQueue.java
deleted file mode 100644
index 4aeb171..0000000
--- a/src/main/java/org/apache/flink/connector/rocketmq/legacy/common/watermark/BoundedOutOfOrdernessGeneratorPerQueue.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.flink.connector.rocketmq.legacy.common.watermark;
-
-import org.apache.flink.streaming.api.functions.AssignerWithPeriodicWatermarks;
-import org.apache.flink.streaming.api.watermark.Watermark;
-
-import org.apache.rocketmq.common.message.MessageExt;
-
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-public class BoundedOutOfOrdernessGeneratorPerQueue
-        implements AssignerWithPeriodicWatermarks<MessageExt> {
-
-    private Map<String, Long> maxEventTimeTable;
-    private long maxOutOfOrderness = 5000L; // 5 seconds
-
-    public BoundedOutOfOrdernessGeneratorPerQueue() {}
-
-    public BoundedOutOfOrdernessGeneratorPerQueue(long maxOutOfOrderness) {
-        this.maxOutOfOrderness = maxOutOfOrderness;
-        maxEventTimeTable = new ConcurrentHashMap<>();
-    }
-
-    @Override
-    public long extractTimestamp(MessageExt element, long previousElementTimestamp) {
-        String key = element.getBrokerName() + "_" + element.getQueueId();
-        Long maxEventTime = maxEventTimeTable.getOrDefault(key, maxOutOfOrderness);
-        long timestamp = element.getBornTimestamp();
-        maxEventTimeTable.put(key, Math.max(maxEventTime, timestamp));
-        return timestamp;
-    }
-
-    @Override
-    public Watermark getCurrentWatermark() {
-        // return the watermark as current highest timestamp minus the out-of-orderness bound
-        long minTimestamp = 0L;
-        for (Map.Entry<String, Long> entry : maxEventTimeTable.entrySet()) {
-            minTimestamp = Math.min(minTimestamp, entry.getValue());
-        }
-        return new Watermark(minTimestamp - maxOutOfOrderness);
-    }
-
-    @Override
-    public String toString() {
-        return "BoundedOutOfOrdernessGeneratorPerQueue{"
-                + "maxEventTimeTable="
-                + maxEventTimeTable
-                + ", maxOutOfOrderness="
-                + maxOutOfOrderness
-                + '}';
-    }
-}
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/legacy/common/watermark/PunctuatedAssigner.java b/src/main/java/org/apache/flink/connector/rocketmq/legacy/common/watermark/PunctuatedAssigner.java
deleted file mode 100644
index 4991463..0000000
--- a/src/main/java/org/apache/flink/connector/rocketmq/legacy/common/watermark/PunctuatedAssigner.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.flink.connector.rocketmq.legacy.common.watermark;
-
-import org.apache.flink.connector.rocketmq.legacy.RocketMQConfig;
-import org.apache.flink.streaming.api.functions.AssignerWithPunctuatedWatermarks;
-import org.apache.flink.streaming.api.watermark.Watermark;
-
-import org.apache.rocketmq.common.message.MessageExt;
-
-/**
- * With Punctuated Watermarks To generate watermarks whenever a certain event indicates that a new
- * watermark might be generated, use AssignerWithPunctuatedWatermarks. For this class Flink will
- * first call the extractTimestamp(...) method to assign the element a timestamp, and then
- * immediately call the checkAndGetNextWatermark(...) method on that element.
- *
- * <p>The checkAndGetNextWatermark(...) method is passed the timestamp that was assigned in the
- * extractTimestamp(...) method, and can decide whether it wants to generate a watermark. Whenever
- * the checkAndGetNextWatermark(...) method returns a non-null watermark, and that watermark is
- * larger than the latest previous watermark, that new watermark will be emitted.
- */
-public class PunctuatedAssigner implements AssignerWithPunctuatedWatermarks<MessageExt> {
-    @Override
-    public long extractTimestamp(MessageExt element, long previousElementTimestamp) {
-        return element.getBornTimestamp();
-    }
-
-    @Override
-    public Watermark checkAndGetNextWatermark(MessageExt lastElement, long extractedTimestamp) {
-        String lastValue = lastElement.getProperty(RocketMQConfig.WATERMARK);
-        return lastValue != null ? new Watermark(extractedTimestamp) : null;
-    }
-}
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/legacy/common/watermark/TimeLagWatermarkGenerator.java b/src/main/java/org/apache/flink/connector/rocketmq/legacy/common/watermark/TimeLagWatermarkGenerator.java
deleted file mode 100644
index de33fcb..0000000
--- a/src/main/java/org/apache/flink/connector/rocketmq/legacy/common/watermark/TimeLagWatermarkGenerator.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.flink.connector.rocketmq.legacy.common.watermark;
-
-import org.apache.flink.streaming.api.functions.AssignerWithPeriodicWatermarks;
-import org.apache.flink.streaming.api.watermark.Watermark;
-
-import org.apache.rocketmq.common.message.MessageExt;
-
-/**
- * This generator generates watermarks that are lagging behind processing time by a certain amount.
- * It assumes that elements arrive in Flink after at most a certain time.
- */
-public class TimeLagWatermarkGenerator implements AssignerWithPeriodicWatermarks<MessageExt> {
-    private long maxTimeLag = 5000; // 5 seconds
-
-    TimeLagWatermarkGenerator() {}
-
-    TimeLagWatermarkGenerator(long maxTimeLag) {
-        this.maxTimeLag = maxTimeLag;
-    }
-
-    @Override
-    public long extractTimestamp(MessageExt element, long previousElementTimestamp) {
-        return element.getBornTimestamp();
-    }
-
-    @Override
-    public Watermark getCurrentWatermark() {
-        // return the watermark as current time minus the maximum time lag
-        return new Watermark(System.currentTimeMillis() - maxTimeLag);
-    }
-
-    @Override
-    public String toString() {
-        return "TimeLagWatermarkGenerator{" + "maxTimeLag=" + maxTimeLag + '}';
-    }
-}
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/legacy/common/watermark/WaterMarkForAll.java b/src/main/java/org/apache/flink/connector/rocketmq/legacy/common/watermark/WaterMarkForAll.java
deleted file mode 100644
index b8d58c5..0000000
--- a/src/main/java/org/apache/flink/connector/rocketmq/legacy/common/watermark/WaterMarkForAll.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.flink.connector.rocketmq.legacy.common.watermark;
-
-import org.apache.flink.streaming.api.watermark.Watermark;
-
-public class WaterMarkForAll {
-
-    private long maxOutOfOrderness = 5000L; // 5 seconds
-
-    private long maxTimestamp = 0L;
-
-    public WaterMarkForAll() {}
-
-    public WaterMarkForAll(long maxOutOfOrderness) {
-        this.maxOutOfOrderness = maxOutOfOrderness;
-    }
-
-    public void extractTimestamp(long timestamp) {
-        maxTimestamp = Math.max(timestamp, maxTimestamp);
-    }
-
-    public Watermark getCurrentWatermark() {
-        return new Watermark(maxTimestamp - maxOutOfOrderness);
-    }
-}
diff --git a/src/main/java/org/apache/flink/connector/rocketmq/legacy/common/watermark/WaterMarkPerQueue.java b/src/main/java/org/apache/flink/connector/rocketmq/legacy/common/watermark/WaterMarkPerQueue.java
deleted file mode 100644
index fd20322..0000000
--- a/src/main/java/org/apache/flink/connector/rocketmq/legacy/common/watermark/WaterMarkPerQueue.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.flink.connector.rocketmq.legacy.common.watermark;
-
-import org.apache.flink.streaming.api.watermark.Watermark;
-
-import org.apache.rocketmq.common.message.MessageQueue;
-
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-
-public class WaterMarkPerQueue {
-
-    private ConcurrentMap<MessageQueue, Long> maxEventTimeTable;
-
-    private long maxOutOfOrderness = 5000L; // 5 seconds
-
-    public WaterMarkPerQueue() {}
-
-    public WaterMarkPerQueue(long maxOutOfOrderness) {
-        this.maxOutOfOrderness = maxOutOfOrderness;
-        maxEventTimeTable = new ConcurrentHashMap<>();
-    }
-
-    public void extractTimestamp(MessageQueue mq, long timestamp) {
-        long maxEventTime = maxEventTimeTable.getOrDefault(mq, maxOutOfOrderness);
-        maxEventTimeTable.put(mq, Math.max(maxEventTime, timestamp));
-    }
-
-    public Watermark getCurrentWatermark() {
-        // return the watermark as current highest timestamp minus the out-of-orderness bound
-        long minTimestamp = maxOutOfOrderness;
-        for (Map.Entry<MessageQueue, Long> entry : maxEventTimeTable.entrySet()) {
-            minTimestamp = Math.min(minTimestamp, entry.getValue());
-        }
-        return new Watermark(minTimestamp - maxOutOfOrderness);
-    }
-
-    @Override
-    public String toString() {
-        return "WaterMarkPerQueue{"
-                + "maxEventTimeTable="
-                + maxEventTimeTable
-                + ", maxOutOfOrderness="
-                + maxOutOfOrderness
-                + '}';
-    }
-}
diff --git a/src/test/resources/logback-test.xml b/src/test/resources/logback-test.xml
deleted file mode 100644
index 5f4507d..0000000
--- a/src/test/resources/logback-test.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-
-    <property name="SIMPLE_LOG_PATTERN"
-              value="%d{yyy-MM-dd HH:mm:ss,GMT+8} ${LOG_LEVEL_PATTERN:-%5p} [%32.32t] [%32.32logger{40}] %m%n"/>
-
-    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <pattern>${SIMPLE_LOG_PATTERN}</pattern>
-            <charset>utf-8</charset>
-        </encoder>
-    </appender>
-
-    <appender name="file" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <encoder>
-            <pattern>${SIMPLE_LOG_PATTERN}</pattern>
-            <charset>utf-8</charset>
-        </encoder>
-        <file>
-            ${user.home}${file.separator}logs${file.separator}flink-connector-rocketmq${file.separator}connector.log
-        </file>
-        <append>true</append>
-        <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-            <fileNamePattern>
-                ${user.home}${file.separator}logs${file.separator}flink-connector-rocketmq${file.separator}others${file.separator}connector_log.%i.log.gz
-            </fileNamePattern>
-        </rollingPolicy>
-        <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-            <MaxFileSize>100MB</MaxFileSize>
-        </triggeringPolicy>
-    </appender>
-
-    <root level="INFO">
-        <appender-ref ref="console"/>
-        <appender-ref ref="file"/>
-    </root>
-</configuration>
\ No newline at end of file
diff --git a/tools/maven/checkstyle.xml b/tools/maven/checkstyle.xml
new file mode 100644
index 0000000..2048fd1
--- /dev/null
+++ b/tools/maven/checkstyle.xml
@@ -0,0 +1,562 @@
+<?xml version="1.0"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<!DOCTYPE module PUBLIC
+	"-//Puppy Crawl//DTD Check Configuration 1.3//EN"
+	"http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
+
+<!--
+This is a checkstyle configuration file. For descriptions of
+what the following rules do, please see the checkstyle configuration
+page at http://checkstyle.sourceforge.net/config.html.
+
+This file is based on the checkstyle file of Apache Beam.
+-->
+
+<module name="Checker">
+
+	<module name="NewlineAtEndOfFile">
+		<!-- windows can use \r\n vs \n, so enforce the most used one ie UNIx style -->
+		<property name="lineSeparator" value="lf"/>
+	</module>
+
+	<module name="RegexpSingleline">
+		<!-- Checks that TODOs don't have stuff in parenthesis, e.g., username. -->
+		<property name="format" value="((//.*)|(\*.*))TODO\("/>
+		<property name="message" value="TODO comments must not include usernames."/>
+		<property name="severity" value="error"/>
+	</module>
+
+	<module name="RegexpSingleline">
+		<property name="format" value="\s+$"/>
+		<property name="message" value="Trailing whitespace"/>
+		<property name="severity" value="error"/>
+	</module>
+
+	<module name="RegexpSingleline">
+		<property name="format" value="Throwables.propagate\("/>
+		<property name="message" value="Throwables.propagate is deprecated"/>
+		<property name="severity" value="error"/>
+	</module>
+
+	<!-- Prevent *Tests.java as tools may not pick them up -->
+	<!--<module name="RegexpOnFilename">-->
+	<!--<property name="fileNamePattern" value=".*Tests\.java$" />-->
+	<!--</module>-->
+
+	<module name="SuppressionFilter">
+		<property name="file" value="${checkstyle.suppressions.file}" default="suppressions.xml"/>
+	</module>
+
+	<!-- Check that every module has a package-info.java -->
+	<!--<module name="JavadocPackage"/>-->
+
+	<!--
+
+	FLINK CUSTOM CHECKS
+
+	-->
+
+	<module name="FileLength">
+		<property name="max" value="3000"/>
+	</module>
+
+	<!-- All Java AST specific tests live under TreeWalker module. -->
+	<module name="TreeWalker">
+
+		<!-- Allow use of comment to suppress javadocstyle -->
+		<module name="SuppressionCommentFilter">
+			<property name="offCommentFormat" value="CHECKSTYLE.OFF\: ([\w\|]+)"/>
+			<property name="onCommentFormat" value="CHECKSTYLE.ON\: ([\w\|]+)"/>
+			<property name="checkFormat" value="$1"/>
+		</module>
+
+		<!--
+
+		FLINK CUSTOM CHECKS
+
+		-->
+
+		<!-- Prohibit T.getT() methods for standard boxed types -->
+		<module name="Regexp">
+			<property name="format" value="Boolean\.getBoolean"/>
+			<property name="illegalPattern" value="true"/>
+			<property name="message" value="Use System.getProperties() to get system properties."/>
+		</module>
+
+		<module name="Regexp">
+			<property name="format" value="Integer\.getInteger"/>
+			<property name="illegalPattern" value="true"/>
+			<property name="message" value="Use System.getProperties() to get system properties."/>
+		</module>
+
+		<module name="Regexp">
+			<property name="format" value="Long\.getLong"/>
+			<property name="illegalPattern" value="true"/>
+			<property name="message" value="Use System.getProperties() to get system properties."/>
+		</module>
+
+		<!--
+
+		IllegalImport cannot blacklist classes so we have to fall back to Regexp.
+
+		-->
+
+		<!-- forbid use of commons lang validate -->
+		<module name="Regexp">
+			<property name="format" value="org\.apache\.commons\.lang3\.Validate"/>
+			<property name="illegalPattern" value="true"/>
+			<property name="message"
+					  value="Use Guava Checks instead of Commons Validate. Please refer to the coding guidelines."/>
+		</module>
+		<!-- forbid the use of google.common.base.Preconditions -->
+		<module name="Regexp">
+			<property name="format" value="import com\.google\.common\.base\.Preconditions"/>
+			<property name="illegalPattern" value="true"/>
+			<property name="message"
+					  value="Use Flink's Preconditions instead of Guava's Preconditions"/>
+		</module>
+		<!-- forbid the use of com.google.common.annotations.VisibleForTesting -->
+		<module name="Regexp">
+			<property name="format"
+					  value="import com\.google\.common\.annotations\.VisibleForTesting"/>
+			<property name="illegalPattern" value="true"/>
+			<property name="message"
+					  value="Use Flink's VisibleForTesting instead of Guava's VisibleForTesting"/>
+		</module>
+		<module name="Regexp">
+			<property name="format" value="import static com\.google\.common\.base\.Preconditions"/>
+			<property name="illegalPattern" value="true"/>
+			<property name="message"
+					  value="Use Flink's Preconditions instead of Guava's Preconditions"/>
+		</module>
+		<!-- forbid the use of org.apache.commons.lang.SerializationUtils -->
+		<module name="Regexp">
+			<property name="format" value="org\.apache\.commons\.lang\.SerializationUtils"/>
+			<property name="illegalPattern" value="true"/>
+			<property name="message"
+					  value="Use Flink's InstantiationUtil instead of common's SerializationUtils"/>
+		</module>
+		<module name="Regexp">
+			<property name="format" value="org\.apache\.commons\.lang3\.SerializationUtils"/>
+			<property name="illegalPattern" value="true"/>
+			<property name="message"
+					  value="Use Flink's InstantiationUtil instead of common's SerializationUtils"/>
+		</module>
+		<module name="Regexp">
+			<property name="format" value="org\.apache\.commons\.lang\."/>
+			<property name="illegalPattern" value="true"/>
+			<property name="message" value="Use commons-lang3 instead of commons-lang."/>
+		</module>
+		<module name="Regexp">
+			<property name="format" value="org\.codehaus\.jettison"/>
+			<property name="illegalPattern" value="true"/>
+			<property name="message" value="Use com.fasterxml.jackson instead of jettison."/>
+		</module>
+
+		<!-- Enforce Java-style array declarations -->
+		<module name="ArrayTypeStyle"/>
+
+		<module name="TodoComment">
+			<!-- Checks that disallowed strings are not used in comments.  -->
+			<property name="format" value="(FIXME)|(XXX)|(@author)"/>
+		</module>
+
+		<!--
+
+		IMPORT CHECKS
+
+		-->
+
+		<module name="RedundantImport">
+			<!-- Checks for redundant import statements. -->
+			<property name="severity" value="error"/>
+			<message key="import.redundancy"
+					 value="Redundant import {0}."/>
+		</module>
+
+		<module name="ImportOrder">
+			<!-- Checks for out of order import statements. -->
+			<property name="severity" value="error"/>
+			<property name="groups"
+					  value="org.apache.flink,org.apache.flink.shaded,*,javax,java,scala"/>
+			<property name="separated" value="true"/>
+			<property name="sortStaticImportsAlphabetically" value="true"/>
+			<property name="option" value="bottom"/>
+			<property name="tokens" value="STATIC_IMPORT, IMPORT"/>
+			<message key="import.ordering"
+					 value="Import {0} appears after other imports that it should precede"/>
+		</module>
+
+		<module name="AvoidStarImport">
+			<property name="severity" value="error"/>
+		</module>
+
+		<module name="IllegalImport">
+			<property name="illegalPkgs"
+					  value="autovalue.shaded, avro.shaded, com.google.api.client.repackaged, com.google.appengine.repackaged"/>
+		</module>
+		<module name="IllegalImport">
+			<property name="illegalPkgs" value="org.codehaus.jackson"/>
+			<message key="import.illegal" value="{0}; Use flink-shaded-jackson instead."/>
+		</module>
+		<module name="IllegalImport">
+			<property name="illegalPkgs" value="org.objectweb.asm"/>
+			<message key="import.illegal" value="{0}; Use flink-shaded-asm instead."/>
+		</module>
+		<module name="IllegalImport">
+			<property name="illegalPkgs" value="io.netty"/>
+			<message key="import.illegal" value="{0}; Use flink-shaded-netty instead."/>
+		</module>
+		<module name="IllegalImport">
+			<property name="illegalPkgs" value="com.google.common"/>
+			<message key="import.illegal" value="{0}; Use flink-shaded-guava instead."/>
+		</module>
+
+		<module name="RedundantModifier">
+			<!-- Checks for redundant modifiers on various symbol definitions.
+			  See: http://checkstyle.sourceforge.net/config_modifier.html#RedundantModifier
+
+			  We exclude METHOD_DEF to allow final methods in final classes to make them more future-proof.
+			-->
+			<property name="tokens"
+					  value="VARIABLE_DEF, ANNOTATION_FIELD_DEF, INTERFACE_DEF, CLASS_DEF, ENUM_DEF"/>
+		</module>
+
+		<!--
+			IllegalImport cannot blacklist classes, and c.g.api.client.util is used for some shaded
+			code and some useful code. So we need to fall back to Regexp.
+		-->
+		<!--<module name="RegexpSinglelineJava">-->
+		<!--<property name="format" value="com\.google\.api\.client\.util\.(ByteStreams|Charsets|Collections2|Joiner|Lists|Maps|Objects|Preconditions|Sets|Strings|Throwables)"/>-->
+		<!--</module>-->
+
+		<!--
+			 Require static importing from Preconditions.
+		-->
+		<module name="RegexpSinglelineJava">
+			<property name="format" value="^import com.google.common.base.Preconditions;$"/>
+			<property name="message" value="Static import functions from Guava Preconditions"/>
+		</module>
+
+		<module name="UnusedImports">
+			<property name="severity" value="error"/>
+			<property name="processJavadoc" value="true"/>
+			<message key="import.unused"
+					 value="Unused import: {0}."/>
+		</module>
+
+		<!--
+
+		JAVADOC CHECKS
+
+		-->
+
+		<!-- Checks for Javadoc comments.                     -->
+		<!-- See http://checkstyle.sf.net/config_javadoc.html -->
+		<module name="JavadocMethod">
+			<property name="scope" value="protected"/>
+			<property name="severity" value="error"/>
+			<property name="allowMissingJavadoc" value="true"/>
+			<property name="allowMissingParamTags" value="true"/>
+			<property name="allowMissingReturnTag" value="true"/>
+			<property name="allowMissingThrowsTags" value="true"/>
+			<property name="allowThrowsTagsForSubclasses" value="true"/>
+			<property name="allowUndeclaredRTE" value="true"/>
+			<!-- This check sometimes failed for with "Unable to get class information for @throws tag" for custom exceptions -->
+			<property name="suppressLoadErrors" value="true"/>
+		</module>
+
+		<!-- Check that paragraph tags are used correctly in Javadoc. -->
+		<module name="JavadocParagraph"/>
+
+		<module name="JavadocType">
+			<property name="scope" value="protected"/>
+			<property name="severity" value="error"/>
+			<property name="allowMissingParamTags" value="true"/>
+		</module>
+
+		<module name="JavadocStyle">
+			<property name="severity" value="error"/>
+			<property name="checkHtml" value="true"/>
+		</module>
+
+		<!--
+
+		NAMING CHECKS
+
+		-->
+
+		<!-- Item 38 - Adhere to generally accepted naming conventions -->
+
+		<module name="PackageName">
+			<!-- Validates identifiers for package names against the
+			  supplied expression. -->
+			<!-- Here the default checkstyle rule restricts package name parts to
+			  seven characters, this is not in line with common practice at Google.
+			-->
+			<property name="format" value="^[a-z]+(\.[a-z][a-z0-9]{1,})*$"/>
+			<property name="severity" value="error"/>
+		</module>
+
+		<module name="TypeNameCheck">
+			<!-- Validates static, final fields against the
+			expression "^[A-Z][a-zA-Z0-9]*$". -->
+			<metadata name="altname" value="TypeName"/>
+			<property name="severity" value="error"/>
+		</module>
+
+		<module name="ConstantNameCheck">
+			<!-- Validates non-private, static, final fields against the supplied
+			public/package final fields "^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$". -->
+			<metadata name="altname" value="ConstantName"/>
+			<property name="applyToPublic" value="true"/>
+			<property name="applyToProtected" value="true"/>
+			<property name="applyToPackage" value="true"/>
+			<property name="applyToPrivate" value="false"/>
+			<property name="format" value="^([A-Z][A-Z0-9]*(_[A-Z0-9]+)*|FLAG_.*)$"/>
+			<message key="name.invalidPattern"
+					 value="Variable ''{0}'' should be in ALL_CAPS (if it is a constant) or be private (otherwise)."/>
+			<property name="severity" value="error"/>
+		</module>
+
+		<module name="StaticVariableNameCheck">
+			<!-- Validates static, non-final fields against the supplied
+			expression "^[a-z][a-zA-Z0-9]*_?$". -->
+			<metadata name="altname" value="StaticVariableName"/>
+			<property name="applyToPublic" value="true"/>
+			<property name="applyToProtected" value="true"/>
+			<property name="applyToPackage" value="true"/>
+			<property name="applyToPrivate" value="true"/>
+			<property name="format" value="^[a-z][a-zA-Z0-9]*_?$"/>
+			<property name="severity" value="error"/>
+		</module>
+
+		<module name="MemberNameCheck">
+			<!-- Validates non-static members against the supplied expression. -->
+			<metadata name="altname" value="MemberName"/>
+			<property name="applyToPublic" value="true"/>
+			<property name="applyToProtected" value="true"/>
+			<property name="applyToPackage" value="true"/>
+			<property name="applyToPrivate" value="true"/>
+			<property name="format" value="^[a-z][a-zA-Z0-9]*$"/>
+			<property name="severity" value="error"/>
+		</module>
+
+		<module name="MethodNameCheck">
+			<!-- Validates identifiers for method names. -->
+			<metadata name="altname" value="MethodName"/>
+			<property name="format" value="^[a-z][a-zA-Z0-9]*(_[a-zA-Z0-9]+)*$"/>
+			<property name="severity" value="error"/>
+		</module>
+
+		<module name="ParameterName">
+			<!-- Validates identifiers for method parameters against the
+			  expression "^[a-z][a-zA-Z0-9]*$". -->
+			<property name="severity" value="error"/>
+		</module>
+
+		<module name="LocalFinalVariableName">
+			<!-- Validates identifiers for local final variables against the
+			  expression "^[a-z][a-zA-Z0-9]*$". -->
+			<property name="severity" value="error"/>
+		</module>
+
+		<module name="LocalVariableName">
+			<!-- Validates identifiers for local variables against the
+			  expression "^[a-z][a-zA-Z0-9]*$". -->
+			<property name="severity" value="error"/>
+		</module>
+
+		<!-- Type parameters must be either one of the four blessed letters
+		T, K, V, W, X or else be capital-case terminated with a T,
+		such as MyGenericParameterT -->
+		<!--<module name="ClassTypeParameterName">-->
+		<!--<property name="format" value="^(((T|K|V|W|X)[0-9]*)|([A-Z][a-z][a-zA-Z]*T))$"/>-->
+		<!--<property name="severity" value="error"/>-->
+		<!--</module>-->
+
+		<!--<module name="MethodTypeParameterName">-->
+		<!--<property name="format" value="^(((T|K|V|W|X)[0-9]*)|([A-Z][a-z][a-zA-Z]*T))$"/>-->
+		<!--<property name="severity" value="error"/>-->
+		<!--</module>-->
+
+		<!--<module name="InterfaceTypeParameterName">-->
+		<!--<property name="format" value="^(((T|K|V|W|X)[0-9]*)|([A-Z][a-z][a-zA-Z]*T))$"/>-->
+		<!--<property name="severity" value="error"/>-->
+		<!--</module>-->
+
+		<!--
+
+		LENGTH and CODING CHECKS
+
+		-->
+
+		<!--<module name="LineLength">-->
+		<!--&lt;!&ndash; Checks if a line is too long. &ndash;&gt;-->
+		<!--<property name="max" value="100"/>-->
+		<!--<property name="severity" value="error"/>-->
+
+		<!--&lt;!&ndash;-->
+		<!--The default ignore pattern exempts the following elements:-->
+		<!-- - import statements-->
+		<!-- - long URLs inside comments-->
+		<!--&ndash;&gt;-->
+
+		<!--<property name="ignorePattern"-->
+		<!--value="^(package .*;\s*)|(import .*;\s*)|( *\* .*https?://.*)$"/>-->
+		<!--</module>-->
+
+		<!-- Checks for braces around if and else blocks -->
+		<module name="NeedBraces">
+			<property name="severity" value="error"/>
+			<property name="tokens"
+					  value="LITERAL_IF, LITERAL_ELSE, LITERAL_FOR, LITERAL_WHILE, LITERAL_DO"/>
+		</module>
+
+		<module name="UpperEll">
+			<!-- Checks that long constants are defined with an upper ell.-->
+			<property name="severity" value="error"/>
+		</module>
+
+		<module name="FallThrough">
+			<!-- Warn about falling through to the next case statement.  Similar to
+			javac -Xlint:fallthrough, but the check is suppressed if a single-line comment
+			on the last non-blank line preceding the fallen-into case contains 'fall through' (or
+			some other variants that we don't publicized to promote consistency).
+			-->
+			<property name="reliefPattern"
+					  value="fall through|Fall through|fallthru|Fallthru|falls through|Falls through|fallthrough|Fallthrough|No break|NO break|no break|continue on"/>
+			<property name="severity" value="error"/>
+		</module>
+
+		<!-- Checks for over-complicated boolean expressions. -->
+		<module name="SimplifyBooleanExpression"/>
+
+		<!-- Detects empty statements (standalone ";" semicolon). -->
+		<module name="EmptyStatement"/>
+
+		<!-- Detect multiple consecutive semicolons (e.g. ";;"). -->
+		<module name="RegexpSinglelineJava">
+			<property name="format" value=";{2,}"/>
+			<property name="message" value="Use one semicolon"/>
+			<property name="ignoreComments" value="true"/>
+		</module>
+
+		<!--
+
+		MODIFIERS CHECKS
+
+		-->
+
+		<module name="ModifierOrder">
+			<!-- Warn if modifier order is inconsistent with JLS3 8.1.1, 8.3.1, and
+				 8.4.3.  The prescribed order is:
+				 public, protected, private, abstract, static, final, transient, volatile,
+				 synchronized, native, strictfp
+			  -->
+			<property name="severity" value="error"/>
+		</module>
+
+
+		<!--
+
+		WHITESPACE CHECKS
+
+		-->
+
+		<module name="EmptyLineSeparator">
+			<!-- Checks for empty line separator between tokens. The only
+				 excluded token is VARIABLE_DEF, allowing class fields to
+				 be declared on consecutive lines.
+			-->
+			<property name="allowMultipleEmptyLines" value="false"/>
+			<property name="allowMultipleEmptyLinesInsideClassMembers" value="false"/>
+			<property name="tokens" value="PACKAGE_DEF, IMPORT, STATIC_IMPORT, CLASS_DEF,
+        INTERFACE_DEF, ENUM_DEF, STATIC_INIT, INSTANCE_INIT, METHOD_DEF,
+        CTOR_DEF"/>
+		</module>
+
+		<module name="WhitespaceAround">
+			<!-- Checks that various tokens are surrounded by whitespace.
+				 This includes most binary operators and keywords followed
+				 by regular or curly braces.
+			-->
+			<property name="tokens" value="ASSIGN, BAND, BAND_ASSIGN, BOR,
+        BOR_ASSIGN, BSR, BSR_ASSIGN, BXOR, BXOR_ASSIGN, COLON, DIV, DIV_ASSIGN,
+        EQUAL, GE, GT, LAMBDA, LAND, LE, LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE,
+        LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF, LITERAL_RETURN,
+        LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE, LOR, LT, MINUS,
+        MINUS_ASSIGN, MOD, MOD_ASSIGN, NOT_EQUAL, PLUS, PLUS_ASSIGN, QUESTION,
+        SL, SL_ASSIGN, SR_ASSIGN, STAR, STAR_ASSIGN, TYPE_EXTENSION_AND"/>
+			<property name="severity" value="error"/>
+		</module>
+
+		<module name="WhitespaceAfter">
+			<!-- Checks that commas, semicolons and typecasts are followed by
+				 whitespace.
+			-->
+			<property name="tokens" value="COMMA, SEMI, TYPECAST"/>
+		</module>
+
+		<module name="NoWhitespaceAfter">
+			<!-- Checks that there is no whitespace after various unary operators.
+				 Linebreaks are allowed.
+			-->
+			<property name="tokens" value="BNOT, DEC, DOT, INC, LNOT, UNARY_MINUS,
+        UNARY_PLUS"/>
+			<property name="allowLineBreaks" value="true"/>
+			<property name="severity" value="error"/>
+		</module>
+
+		<module name="NoWhitespaceBefore">
+			<!-- Checks that there is no whitespace before various unary operators.
+				 Linebreaks are allowed.
+			-->
+			<property name="tokens" value="SEMI, DOT, POST_DEC, POST_INC"/>
+			<property name="allowLineBreaks" value="true"/>
+			<property name="severity" value="error"/>
+		</module>
+
+		<!--<module name="OperatorWrap">-->
+		<!--&lt;!&ndash; Checks that operators like + and ? appear at newlines rather than-->
+		<!--at the end of the previous line.-->
+		<!--&ndash;&gt;-->
+		<!--<property name="option" value="NL"/>-->
+		<!--<property name="tokens" value="BAND, BOR, BSR, BXOR, DIV, EQUAL,-->
+		<!--GE, GT, LAND, LE, LITERAL_INSTANCEOF, LOR, LT, MINUS, MOD,-->
+		<!--NOT_EQUAL, PLUS, QUESTION, SL, SR, STAR "/>-->
+		<!--</module>-->
+
+		<module name="OperatorWrap">
+			<!-- Checks that assignment operators are at the end of the line. -->
+			<property name="option" value="eol"/>
+			<property name="tokens" value="ASSIGN"/>
+		</module>
+
+		<module name="ParenPad">
+			<!-- Checks that there is no whitespace before close parens or after
+				 open parens.
+			-->
+			<property name="severity" value="error"/>
+		</module>
+
+	</module>
+</module>
+
diff --git a/tools/maven/suppressions.xml b/tools/maven/suppressions.xml
new file mode 100644
index 0000000..38f7a83
--- /dev/null
+++ b/tools/maven/suppressions.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<!DOCTYPE suppressions PUBLIC
+		"-//Puppy Crawl//DTD Suppressions 1.1//EN"
+		"http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
+
+<suppressions>
+	<!-- Legacy connector uses commons-lang (v2) intentionally -->
+	<suppress
+			files="RocketMQConfig.java|RocketMQSourceFunction.java|RocketMQSink.java|SinkMapFunction.java"
+			checks="Regexp"/>
+
+	<!-- target directory is not relevant for checkstyle -->
+	<suppress
+			files="[\\/]target[\\/]"
+			checks=".*"/>
+
+	<!--
+		Pre-existing violations in legacy code (138 total as of 2026-07).
+		New code should still comply with all rules.
+	-->
+
+	<!-- Javadoc: 68 missing type javadoc + 28 style issues -->
+	<suppress files=".*\.java" checks="JavadocType"/>
+	<suppress files=".*\.java" checks="JavadocStyle"/>
+
+	<!-- Import ordering and unused imports -->
+	<suppress files=".*\.java" checks="ImportOrder"/>
+	<suppress files=".*\.java" checks="UnusedImports"/>
+
+	<!-- Whitespace: package not separated from previous statement -->
+	<suppress files=".*\.java" checks="EmptyLineSeparator"/>
+
+	<!-- Package name: sourceFunction has camelCase segment -->
+	<suppress files=".*\.java" checks="PackageName"/>
+</suppressions>