Skip to content

Commit 5d8862e

Browse files
[Feature][shade][Jackson] Add seatunnel-jackson module (#3947)
* [Feature][shade][Jackson] Add jackson shade * [Feature][shade][Jackson] Change common modules * [Feature][shade][Jackson] Fix license header * [Feature][shade][Jackson] Revert spark-v2-examples * [Feature][shade][Jackson] Revert seatunnel-e2e * [Feature][shade][Jackson] Update other modules * [Feature][shade][Jackson] Fix dependency * [Improve][shade][jackson] Fix conflict
1 parent 9df0094 commit 5d8862e

File tree

38 files changed

+224
-146
lines changed

38 files changed

+224
-146
lines changed

seatunnel-api/pom.xml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,10 @@
3939
<version>${project.version}</version>
4040
</dependency>
4141
<dependency>
42-
<groupId>com.fasterxml.jackson.dataformat</groupId>
43-
<artifactId>jackson-dataformat-properties</artifactId>
44-
<version>${jackson.version}</version>
42+
<groupId>org.apache.seatunnel</groupId>
43+
<artifactId>seatunnel-jackson</artifactId>
44+
<version>${project.version}</version>
45+
<classifier>optional</classifier>
4546
</dependency>
4647
</dependencies>
4748
</project>

seatunnel-api/src/main/java/org/apache/seatunnel/api/common/metrics/JobMetrics.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919

2020
import static java.util.stream.Collectors.groupingBy;
2121

22-
import com.fasterxml.jackson.core.JsonProcessingException;
23-
import com.fasterxml.jackson.databind.ObjectMapper;
24-
import com.fasterxml.jackson.databind.SerializationFeature;
25-
import com.fasterxml.jackson.databind.node.ObjectNode;
22+
import org.apache.seatunnel.shade.com.fasterxml.jackson.core.JsonProcessingException;
23+
import org.apache.seatunnel.shade.com.fasterxml.jackson.databind.ObjectMapper;
24+
import org.apache.seatunnel.shade.com.fasterxml.jackson.databind.SerializationFeature;
25+
import org.apache.seatunnel.shade.com.fasterxml.jackson.databind.node.ObjectNode;
2626

2727
import java.io.Serializable;
2828
import java.util.ArrayList;

seatunnel-api/src/main/java/org/apache/seatunnel/api/configuration/Option.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
package org.apache.seatunnel.api.configuration;
1919

20-
import com.fasterxml.jackson.core.type.TypeReference;
20+
import org.apache.seatunnel.shade.com.fasterxml.jackson.core.type.TypeReference;
2121

2222
import java.util.Objects;
2323

seatunnel-api/src/main/java/org/apache/seatunnel/api/configuration/Options.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@
1919

2020
import static com.google.common.base.Preconditions.checkArgument;
2121

22-
import com.fasterxml.jackson.core.type.TypeReference;
22+
import org.apache.seatunnel.shade.com.fasterxml.jackson.core.type.TypeReference;
23+
2324
import lombok.NonNull;
2425
import org.apache.commons.lang3.StringUtils;
2526

seatunnel-api/src/main/java/org/apache/seatunnel/api/configuration/ReadonlyConfig.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,12 @@
2222
import static org.apache.seatunnel.api.configuration.util.ConfigUtil.flatteningMap;
2323
import static org.apache.seatunnel.api.configuration.util.ConfigUtil.treeMap;
2424

25+
import org.apache.seatunnel.shade.com.fasterxml.jackson.core.JsonProcessingException;
26+
import org.apache.seatunnel.shade.com.fasterxml.jackson.core.type.TypeReference;
27+
import org.apache.seatunnel.shade.com.fasterxml.jackson.databind.ObjectMapper;
2528
import org.apache.seatunnel.shade.com.typesafe.config.Config;
2629
import org.apache.seatunnel.shade.com.typesafe.config.ConfigRenderOptions;
2730

28-
import com.fasterxml.jackson.core.JsonProcessingException;
29-
import com.fasterxml.jackson.core.type.TypeReference;
30-
import com.fasterxml.jackson.databind.ObjectMapper;
31-
3231
import java.io.Serializable;
3332
import java.util.Collections;
3433
import java.util.HashMap;

seatunnel-api/src/main/java/org/apache/seatunnel/api/configuration/SingleChoiceOption.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717

1818
package org.apache.seatunnel.api.configuration;
1919

20-
import com.fasterxml.jackson.core.type.TypeReference;
20+
import org.apache.seatunnel.shade.com.fasterxml.jackson.core.type.TypeReference;
21+
2122
import lombok.Getter;
2223

2324
import java.util.List;

seatunnel-api/src/main/java/org/apache/seatunnel/api/configuration/util/ConfigUtil.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717

1818
package org.apache.seatunnel.api.configuration.util;
1919

20-
import com.fasterxml.jackson.core.JsonProcessingException;
21-
import com.fasterxml.jackson.core.type.TypeReference;
22-
import com.fasterxml.jackson.databind.ObjectMapper;
23-
import com.fasterxml.jackson.dataformat.javaprop.JavaPropsMapper;
20+
import org.apache.seatunnel.shade.com.fasterxml.jackson.core.JsonProcessingException;
21+
import org.apache.seatunnel.shade.com.fasterxml.jackson.core.type.TypeReference;
22+
import org.apache.seatunnel.shade.com.fasterxml.jackson.databind.ObjectMapper;
23+
import org.apache.seatunnel.shade.com.fasterxml.jackson.dataformat.javaprop.JavaPropsMapper;
2424

2525
import java.util.ArrayList;
2626
import java.util.Arrays;

seatunnel-api/src/main/java/org/apache/seatunnel/api/configuration/util/OptionUtil.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@
1919

2020
import org.apache.seatunnel.api.configuration.Option;
2121

22-
import com.fasterxml.jackson.core.type.TypeReference;
22+
import org.apache.seatunnel.shade.com.fasterxml.jackson.core.type.TypeReference;
23+
2324
import org.apache.commons.lang3.StringUtils;
2425

2526
import java.lang.reflect.Field;

seatunnel-api/src/test/java/org/apache/seatunnel/api/configuration/ReadableConfigTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717

1818
package org.apache.seatunnel.api.configuration;
1919

20+
import org.apache.seatunnel.shade.com.fasterxml.jackson.core.type.TypeReference;
2021
import org.apache.seatunnel.shade.com.typesafe.config.Config;
2122
import org.apache.seatunnel.shade.com.typesafe.config.ConfigFactory;
2223
import org.apache.seatunnel.shade.com.typesafe.config.ConfigResolveOptions;
2324

24-
import com.fasterxml.jackson.core.type.TypeReference;
2525
import org.apache.commons.lang3.StringUtils;
2626
import org.junit.jupiter.api.Assertions;
2727
import org.junit.jupiter.api.BeforeAll;

seatunnel-api/src/test/java/org/apache/seatunnel/api/configuration/util/OptionRuleTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@
2626
import org.apache.seatunnel.api.configuration.OptionTest;
2727
import org.apache.seatunnel.api.configuration.Options;
2828

29-
import com.fasterxml.jackson.core.type.TypeReference;
29+
import org.apache.seatunnel.shade.com.fasterxml.jackson.core.type.TypeReference;
30+
3031
import org.junit.jupiter.api.Assertions;
3132
import org.junit.jupiter.api.Test;
3233
import org.junit.jupiter.api.function.Executable;

0 commit comments

Comments
 (0)