fix

Author: JNSimba

.github/workflows/checkstyle.yaml

@@ -32,12 +32,22 @@ jobs:
           persist-credentials: false
           submodules: recursive
 
-      - name: Setup java
+      - name: Setup java 8
         uses: actions/setup-java@v2
         with:
           distribution: adopt
           java-version: '8'
 
       - name: Run java checkstyle
         run:
-          cd flink-doris-connector && mvn clean compile checkstyle:checkstyle
+          cd flink-doris-connector && mvn clean checkstyle:check -Pflink1 -pl flink-doris-connector-flink1 -am
+
+      - name: Setup java 17
+        uses: actions/setup-java@v2
+        with:
+          distribution: adopt
+          java-version: '17'
+
+      - name: Run java checkstyle
+        run:
+          cd flink-doris-connector && mvn clean checkstyle:check -Pflink2 -pl flink-doris-connector-flink2 -am

.github/workflows/run-e2ecase-flink1.yml

@@ -23,7 +23,7 @@ on:
 
 jobs:
   build-extension:
-    name: "Run E2ECases Flink1.x"
+    name: "Run E2ECases"
     runs-on: ubuntu-latest
     defaults:
       run:

.github/workflows/run-e2ecase-flink2.yml

@@ -23,7 +23,7 @@ on:
 
 jobs:
   build-extension:
-    name: "Run E2ECases Flink2.x"
+    name: "Run E2ECases"
     runs-on: ubuntu-latest
     defaults:
       run:

.github/workflows/run-itcase-flink1.yml

@@ -23,7 +23,7 @@ on:
 
 jobs:
   build-extension:
-    name: "Run ITCases Flink1.x"
+    name: "Run ITCases"
     runs-on: ubuntu-latest
     defaults:
       run:

.github/workflows/run-itcase-flink2.yml

@@ -23,7 +23,7 @@ on:
 
 jobs:
   build-extension:
-    name: "Run ITCases Flink2.x"
+    name: "Run ITCases"
     runs-on: ubuntu-latest
     defaults:
       run:

.licenserc.yaml

@@ -12,6 +12,6 @@ header:
     - '.github/PULL_REQUEST_TEMPLATE.md'
     - '.licenserc.yaml'
     - 'custom_env.sh.tpl'
-    - 'flink-doris-connector/src/test/resources/container/'
+    - 'flink-doris-connector/flink-doris-connector-base/src/test/resources/container/'
 
   comment: on-failure

flink-doris-connector/flink-doris-connector-base/pom.xml

@@ -29,10 +29,9 @@ under the License.
 
     <artifactId>flink-doris-connector-base</artifactId>
     <name>Flink Doris Connector Base</name>
-    <description>Shared code for Flink Doris Connector; built per Flink version via profile (flink-1.20 / flink-2.2)</description>
+    <description>Shared code for Flink Doris Connector; built per Flink version via profile (flink1 / flink2)</description>
     <packaging>jar</packaging>
 
-    <!-- flink.version, maven.compiler.source/target, come from parent profile (-Pflink-1.20 or -Pflink-2.2) -->
     <dependencies>
         <dependency>
             <groupId>org.apache.doris</groupId>

flink-doris-connector/flink-doris-connector-base/src/main/java/org/apache/doris/flink/sink/writer/DorisWriter.java

@@ -52,7 +52,7 @@
  *
  * <p>This is the core implementation that is shared across different Flink versions.
  * Version-specific modules should wrap this class and implement the appropriate Flink sink
- * interfaces there (for example via DorisWriterV1 / DorisWriterV2).
+ * interfaces there (for example via DorisWriterAdapter).
  *
  * @param <IN> record type
  */

flink-doris-connector/flink-doris-connector-flink1/src/main/java/org/apache/doris/flink/sink/DorisSink.java

@@ -112,18 +112,18 @@ public DorisAbstractWriter restoreWriter(
     public DorisAbstractWriter getDorisAbstractWriter(
             InitContext initContext, Collection<DorisWriterState> states) {
         if (WriteMode.STREAM_LOAD.equals(dorisExecutionOptions.getWriteMode())) {
-            return new DorisWriterAdapter(
+            return new DorisWriterAdapter<>(
                     initContext,
                     states,
                     serializer,
                     dorisOptions,
                     dorisReadOptions,
                     dorisExecutionOptions);
         } else if (WriteMode.STREAM_LOAD_BATCH.equals(dorisExecutionOptions.getWriteMode())) {
-            return new DorisBatchWriterAdapter(
+            return new DorisBatchWriterAdapter<>(
                     initContext, serializer, dorisOptions, dorisReadOptions, dorisExecutionOptions);
         } else if (WriteMode.COPY.equals(dorisExecutionOptions.getWriteMode())) {
-            return new DorisCopyWriterAdapter(
+            return new DorisCopyWriterAdapter<>(
                     initContext, serializer, dorisOptions, dorisReadOptions, dorisExecutionOptions);
         }
         throw new IllegalArgumentException(

flink-doris-connector/flink-doris-connector-flink1/src/main/java/org/apache/doris/flink/sink/copy/DorisCopyWriterAdapter.java

@@ -1,3 +1,20 @@
+// 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.doris.flink.sink.copy;
 
 import org.apache.flink.api.connector.sink2.Sink;