fix

vernedeng · Apr 20, 2024 · 2a52a16 · 2a52a16
1 parent 5315f4c
commit 2a52a16
Show file tree

Hide file tree

Showing 21 changed files with 50 additions and 46 deletions.
diff --git a/inlong-common/pom.xml b/inlong-common/pom.xml
@@ -96,6 +96,10 @@
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.flink</groupId>
+            <artifactId>flink-shaded-jackson</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

diff --git a/...va/org/apache/inlong/common/pojo/sort/dataflow/deserialization/DeserializationConfig.java b/...va/org/apache/inlong/common/pojo/sort/dataflow/deserialization/DeserializationConfig.java
@@ -19,8 +19,8 @@
 
 import org.apache.inlong.common.constant.Constants;
 
-import com.fasterxml.jackson.annotation.JsonSubTypes;
-import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonSubTypes;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonTypeInfo;
 
 import java.io.Serializable;
 

diff --git a/...c/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/ArrayFormatInfo.java b/...c/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/ArrayFormatInfo.java
@@ -17,8 +17,8 @@
 
 package org.apache.inlong.common.pojo.sort.dataflow.field.format;
 
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonCreator;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonProperty;
 
 import javax.annotation.Nonnull;
 

diff --git a/...src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/ArrayTypeInfo.java b/...src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/ArrayTypeInfo.java
@@ -17,8 +17,8 @@
 
 package org.apache.inlong.common.pojo.sort.dataflow.field.format;
 
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonCreator;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonProperty;
 
 import javax.annotation.Nonnull;
 

diff --git a/.../main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/BinaryFormatInfo.java b/.../main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/BinaryFormatInfo.java
@@ -17,8 +17,8 @@
 
 package org.apache.inlong.common.pojo.sort.dataflow.field.format;
 
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonCreator;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonProperty;
 
 import java.nio.charset.StandardCharsets;
 

diff --git a/...rc/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/DateFormatInfo.java b/...rc/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/DateFormatInfo.java
@@ -17,9 +17,9 @@
 
 package org.apache.inlong.common.pojo.sort.dataflow.field.format;
 
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonCreator;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonIgnore;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonProperty;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;

diff --git a/...main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/DecimalFormatInfo.java b/...main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/DecimalFormatInfo.java
@@ -17,8 +17,8 @@
 
 package org.apache.inlong.common.pojo.sort.dataflow.field.format;
 
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonCreator;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonProperty;
 
 import java.math.BigDecimal;
 

diff --git a/...on/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/FormatInfo.java b/...on/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/FormatInfo.java
@@ -17,9 +17,9 @@
 
 package org.apache.inlong.common.pojo.sort.dataflow.field.format;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonSubTypes;
-import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonIgnore;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonSubTypes;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonTypeInfo;
 
 import java.io.Serializable;
 

diff --git a/...n/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/FormatUtils.java b/...n/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/FormatUtils.java
@@ -17,10 +17,10 @@
 
 package org.apache.inlong.common.pojo.sort.dataflow.field.format;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.SerializationFeature;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.JsonProcessingException;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.DeserializationFeature;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.SerializationFeature;
 
 import javax.annotation.Nonnull;
 

diff --git a/...src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/MapFormatInfo.java b/...src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/MapFormatInfo.java
@@ -17,8 +17,8 @@
 
 package org.apache.inlong.common.pojo.sort.dataflow.field.format;
 
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonCreator;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonProperty;
 
 import javax.annotation.Nonnull;
 

diff --git a/...n/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/MapTypeInfo.java b/...n/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/MapTypeInfo.java
@@ -17,8 +17,8 @@
 
 package org.apache.inlong.common.pojo.sort.dataflow.field.format;
 
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonCreator;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonProperty;
 
 import javax.annotation.Nonnull;
 

diff --git a/...src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/RowFormatInfo.java b/...src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/RowFormatInfo.java
@@ -17,8 +17,8 @@
 
 package org.apache.inlong.common.pojo.sort.dataflow.field.format;
 
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonCreator;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonProperty;
 
 import javax.annotation.Nonnull;
 

diff --git a/...n/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/RowTypeInfo.java b/...n/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/RowTypeInfo.java
@@ -17,8 +17,8 @@
 
 package org.apache.inlong.common.pojo.sort.dataflow.field.format;
 
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonCreator;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonProperty;
 
 import javax.annotation.Nonnull;
 

diff --git a/...rc/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/TimeFormatInfo.java b/...rc/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/TimeFormatInfo.java
@@ -17,9 +17,9 @@
 
 package org.apache.inlong.common.pojo.sort.dataflow.field.format;
 
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonCreator;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonIgnore;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonProperty;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;

diff --git a/...in/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/TimestampFormatInfo.java b/...in/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/TimestampFormatInfo.java
@@ -17,9 +17,9 @@
 
 package org.apache.inlong.common.pojo.sort.dataflow.field.format;
 
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonCreator;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonIgnore;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonProperty;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;

diff --git a/...mmon/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/TypeInfo.java b/...mmon/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/TypeInfo.java
@@ -17,8 +17,8 @@
 
 package org.apache.inlong.common.pojo.sort.dataflow.field.format;
 
-import com.fasterxml.jackson.annotation.JsonSubTypes;
-import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonSubTypes;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonTypeInfo;
 
 import java.io.Serializable;
 

diff --git a/...in/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/VarBinaryFormatInfo.java b/...in/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/VarBinaryFormatInfo.java
@@ -17,8 +17,8 @@
 
 package org.apache.inlong.common.pojo.sort.dataflow.field.format;
 
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonCreator;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonProperty;
 
 import java.nio.charset.StandardCharsets;
 

diff --git a/...main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/VarCharFormatInfo.java b/...main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/VarCharFormatInfo.java
@@ -17,8 +17,8 @@
 
 package org.apache.inlong.common.pojo.sort.dataflow.field.format;
 
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonCreator;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonProperty;
 
 /**
  * The format information for varchar.

diff --git a/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/sink/SinkConfig.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/sink/SinkConfig.java
@@ -20,9 +20,9 @@
 import org.apache.inlong.common.constant.Constants;
 import org.apache.inlong.common.pojo.sort.dataflow.field.FieldConfig;
 
-import com.fasterxml.jackson.annotation.JsonSubTypes;
-import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import lombok.Data;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonSubTypes;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonTypeInfo;
 
 import java.io.Serializable;
 import java.util.List;

diff --git a/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/mq/MqClusterConfig.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/mq/MqClusterConfig.java
@@ -19,9 +19,9 @@
 
 import org.apache.inlong.common.constant.Constants;
 
-import com.fasterxml.jackson.annotation.JsonSubTypes;
-import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import lombok.Data;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonSubTypes;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonTypeInfo;
 
 import java.io.Serializable;
 

diff --git a/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/node/NodeConfig.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/node/NodeConfig.java
@@ -19,9 +19,9 @@
 
 import org.apache.inlong.common.constant.Constants;
 
-import com.fasterxml.jackson.annotation.JsonSubTypes;
-import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import lombok.Data;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonSubTypes;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonTypeInfo;
 
 import java.io.Serializable;