Skip to content

Commit d615c93

Browse files
committed
feat: migrate to Jackson 3.x (tools.jackson 3.2.1) per easy4j-deploy spec
- jackson-bom 3.2.1 (tools.jackson) imported in dependencyManagement - jackson-databind: com.fasterxml.jackson.core -> tools.jackson.core - package migration: com.fasterxml.jackson.databind -> tools.jackson.databind - annotations stay at com.fasterxml.jackson.annotation (BOM manages 2.22) - new ObjectMapper() -> new JsonMapper() in tests - NOTE: mvn test cannot run on this branch pre-existing (pom declares no junit-jupiter dependency, only the version property); verified compile OK and full test suite (374 tests green) with junit-jupiter added temporarily
1 parent 2dc893c commit d615c93

13 files changed

Lines changed: 42 additions & 30 deletions

‎pom.xml‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
<commons-lang3.version>3.20.0</commons-lang3.version>
4747
<fastjson.version>2.0.62</fastjson.version>
4848
<guava.version>33.6.0-jre</guava.version>
49-
<jackson.version>2.22.0</jackson.version>
49+
<jackson-bom.version>3.2.1</jackson-bom.version>
5050
<junit-jupiter.version>6.1.0</junit-jupiter.version>
5151
<lombok.version>1.18.46</lombok.version>
5252
<okhttp.version>4.12.0</okhttp.version>
@@ -63,6 +63,14 @@
6363
<!-- 依赖版本统一管理(dependencyManagement) -->
6464
<dependencyManagement>
6565
<dependencies>
66+
<!-- Jackson BOM -->
67+
<dependency>
68+
<groupId>tools.jackson</groupId>
69+
<artifactId>jackson-bom</artifactId>
70+
<version>${jackson-bom.version}</version>
71+
<type>pom</type>
72+
<scope>import</scope>
73+
</dependency>
6674
<!-- For Lombok -->
6775
<dependency>
6876
<groupId>org.projectlombok</groupId>
@@ -82,12 +90,6 @@
8290
<artifactId>okhttp</artifactId>
8391
<version>${okhttp.version}</version>
8492
</dependency>
85-
<!-- For Jackson -->
86-
<dependency>
87-
<groupId>com.fasterxml.jackson.core</groupId>
88-
<artifactId>jackson-databind</artifactId>
89-
<version>${jackson.version}</version>
90-
</dependency>
9193
<!-- For Guava -->
9294
<dependency>
9395
<groupId>com.google.guava</groupId>
@@ -129,7 +131,7 @@
129131
</dependency>
130132
<!-- For Jackson -->
131133
<dependency>
132-
<groupId>com.fasterxml.jackson.core</groupId>
134+
<groupId>tools.jackson.core</groupId>
133135
<artifactId>jackson-databind</artifactId>
134136
</dependency>
135137
<!-- For Guava -->

‎src/main/java/com/faceplusplus/spring/boot/FaceppOkHttp3Template.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
package com.faceplusplus.spring.boot;
1717

1818
import com.alibaba.fastjson.JSONObject;
19-
import com.fasterxml.jackson.databind.ObjectMapper;
19+
import tools.jackson.databind.ObjectMapper;
2020
import com.faceplusplus.spring.boot.resp.FaceppResponse;
2121
import lombok.extern.slf4j.Slf4j;
2222
import okhttp3.*;

‎src/main/java/com/faceplusplus/spring/boot/FaceppOperations.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616
package com.faceplusplus.spring.boot;
1717

18-
import com.fasterxml.jackson.databind.ObjectMapper;
18+
import tools.jackson.databind.ObjectMapper;
1919
import lombok.extern.slf4j.Slf4j;
2020

2121
/**

‎src/test/java/com/faceplusplus/spring/boot/FaceppFaceAsyncOperationsTest.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.faceplusplus.spring.boot;
22

3-
import com.fasterxml.jackson.databind.ObjectMapper;
3+
import tools.jackson.databind.ObjectMapper;
4+
import tools.jackson.databind.json.JsonMapper;
45
import okhttp3.OkHttpClient;
56
import org.junit.jupiter.api.BeforeEach;
67
import org.junit.jupiter.api.Test;
@@ -17,7 +18,7 @@ void setUp() {
1718
FaceppProperties properties = new FaceppProperties();
1819
properties.setAppId("test-key");
1920
properties.setAppCertificate("test-secret");
20-
FaceppOkHttp3Template httpTemplate = new FaceppOkHttp3Template(new OkHttpClient(), new ObjectMapper(), properties);
21+
FaceppOkHttp3Template httpTemplate = new FaceppOkHttp3Template(new OkHttpClient(), new JsonMapper(), properties);
2122
template = new FaceppTemplate(httpTemplate, properties);
2223
operations = new FaceppFaceAsyncOperations(template);
2324
}

‎src/test/java/com/faceplusplus/spring/boot/FaceppFaceOperationsCoverageTest.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.faceplusplus.spring.boot;
22

3-
import com.fasterxml.jackson.databind.ObjectMapper;
3+
import tools.jackson.databind.ObjectMapper;
4+
import tools.jackson.databind.json.JsonMapper;
45
import com.faceplusplus.spring.boot.req.*;
56
import com.faceplusplus.spring.boot.resp.*;
67
import okhttp3.OkHttpClient;
@@ -29,7 +30,7 @@ void setUp() {
2930
properties = new FaceppProperties();
3031
properties.setAppId("test-key");
3132
properties.setAppCertificate("test-secret");
32-
stubHttpTemplate = new StubOkHttp3Template(new OkHttpClient(), new ObjectMapper(), properties);
33+
stubHttpTemplate = new StubOkHttp3Template(new OkHttpClient(), new JsonMapper(), properties);
3334
template = new FaceppTemplate(stubHttpTemplate, properties);
3435
operations = new FaceppFaceOperations(template);
3536
}

‎src/test/java/com/faceplusplus/spring/boot/FaceppFaceOperationsTest.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.faceplusplus.spring.boot;
22

3-
import com.fasterxml.jackson.databind.ObjectMapper;
3+
import tools.jackson.databind.ObjectMapper;
4+
import tools.jackson.databind.json.JsonMapper;
45
import okhttp3.OkHttpClient;
56
import org.junit.jupiter.api.BeforeEach;
67
import org.junit.jupiter.api.Test;
@@ -17,7 +18,7 @@ void setUp() {
1718
FaceppProperties properties = new FaceppProperties();
1819
properties.setAppId("test-key");
1920
properties.setAppCertificate("test-secret");
20-
FaceppOkHttp3Template httpTemplate = new FaceppOkHttp3Template(new OkHttpClient(), new ObjectMapper(), properties);
21+
FaceppOkHttp3Template httpTemplate = new FaceppOkHttp3Template(new OkHttpClient(), new JsonMapper(), properties);
2122
template = new FaceppTemplate(httpTemplate, properties);
2223
operations = new FaceppFaceOperations(template);
2324
}

‎src/test/java/com/faceplusplus/spring/boot/FaceppFacesetAsyncOperationsTest.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.faceplusplus.spring.boot;
22

3-
import com.fasterxml.jackson.databind.ObjectMapper;
3+
import tools.jackson.databind.ObjectMapper;
4+
import tools.jackson.databind.json.JsonMapper;
45
import okhttp3.OkHttpClient;
56
import org.junit.jupiter.api.BeforeEach;
67
import org.junit.jupiter.api.Test;
@@ -17,7 +18,7 @@ void setUp() {
1718
FaceppProperties properties = new FaceppProperties();
1819
properties.setAppId("test-key");
1920
properties.setAppCertificate("test-secret");
20-
FaceppOkHttp3Template httpTemplate = new FaceppOkHttp3Template(new OkHttpClient(), new ObjectMapper(), properties);
21+
FaceppOkHttp3Template httpTemplate = new FaceppOkHttp3Template(new OkHttpClient(), new JsonMapper(), properties);
2122
template = new FaceppTemplate(httpTemplate, properties);
2223
operations = new FaceppFacesetAsyncOperations(template);
2324
}

‎src/test/java/com/faceplusplus/spring/boot/FaceppFacesetOperationsCoverageTest.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.faceplusplus.spring.boot;
22

3-
import com.fasterxml.jackson.databind.ObjectMapper;
3+
import tools.jackson.databind.ObjectMapper;
4+
import tools.jackson.databind.json.JsonMapper;
45
import com.faceplusplus.spring.boot.req.*;
56
import com.faceplusplus.spring.boot.resp.*;
67
import okhttp3.OkHttpClient;
@@ -30,7 +31,7 @@ void setUp() {
3031
properties = new FaceppProperties();
3132
properties.setAppId("test-key");
3233
properties.setAppCertificate("test-secret");
33-
stubHttpTemplate = new StubOkHttp3Template(new OkHttpClient(), new ObjectMapper(), properties);
34+
stubHttpTemplate = new StubOkHttp3Template(new OkHttpClient(), new JsonMapper(), properties);
3435
template = new FaceppTemplate(stubHttpTemplate, properties);
3536
operations = new FaceppFacesetOperations(template);
3637
asyncOperations = new FaceppFacesetAsyncOperations(template);

‎src/test/java/com/faceplusplus/spring/boot/FaceppFacesetOperationsTest.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.faceplusplus.spring.boot;
22

3-
import com.fasterxml.jackson.databind.ObjectMapper;
3+
import tools.jackson.databind.ObjectMapper;
4+
import tools.jackson.databind.json.JsonMapper;
45
import okhttp3.OkHttpClient;
56
import org.junit.jupiter.api.BeforeEach;
67
import org.junit.jupiter.api.Test;
@@ -17,7 +18,7 @@ void setUp() {
1718
FaceppProperties properties = new FaceppProperties();
1819
properties.setAppId("test-key");
1920
properties.setAppCertificate("test-secret");
20-
FaceppOkHttp3Template httpTemplate = new FaceppOkHttp3Template(new OkHttpClient(), new ObjectMapper(), properties);
21+
FaceppOkHttp3Template httpTemplate = new FaceppOkHttp3Template(new OkHttpClient(), new JsonMapper(), properties);
2122
template = new FaceppTemplate(httpTemplate, properties);
2223
operations = new FaceppFacesetOperations(template);
2324
}

‎src/test/java/com/faceplusplus/spring/boot/FaceppOkHttp3TemplateRealTest.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.faceplusplus.spring.boot;
22

3-
import com.fasterxml.jackson.databind.ObjectMapper;
3+
import tools.jackson.databind.ObjectMapper;
4+
import tools.jackson.databind.json.JsonMapper;
45
import com.faceplusplus.spring.boot.resp.FaceppResponse;
56
import okhttp3.*;
67
import org.junit.jupiter.api.BeforeEach;
@@ -32,7 +33,7 @@ void setUp() {
3233
properties = new FaceppProperties();
3334
properties.setAppId("test-key");
3435
properties.setAppCertificate("test-secret");
35-
objectMapper = new ObjectMapper();
36+
objectMapper = new JsonMapper();
3637

3738
OkHttpClient client = new OkHttpClient.Builder()
3839
.addInterceptor(chain -> {

0 commit comments

Comments
 (0)